summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2014-03-18 01:00:53 (EDT)
committer P. J. McDermott <pjm@nac.net>2014-03-18 01:00:53 (EDT)
commit302700a2dc252042dc8e25b84d090fb56d769895 (patch)
tree90ee1343b77b97644648d50ccdd7a0f0ee961275
parentf36076b2b303113ef4dba68c4175630ffc5367dd (diff)
bootstrap-prepare.sh: Update config installation.
BusyBox's config file has moved in config-dev.
-rwxr-xr-xbootstrap-prepare.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/bootstrap-prepare.sh b/bootstrap-prepare.sh
index dabab0a..6bb3069 100755
--- a/bootstrap-prepare.sh
+++ b/bootstrap-prepare.sh
@@ -212,7 +212,7 @@ get_pkg()
prepare_file_system()
{
- local ma dir
+ local ma dir bb_ver
if ma=$(dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null); then
log 'Making multiarch directory links...'
@@ -238,7 +238,9 @@ prepare_file_system()
>pkg/gcc-4.7/local.mk
fi
- sudo cp -p "pkg/config-${PLAT}/src/busybox/config" \
+ bb_ver="$(sed 's/^busybox (\(.*\)-.*) .*$/\1/; q;' \
+ pkg/busybox/changelog)"
+ sudo cp -p "pkg/config-${PLAT}/src/busybox/${bb_ver}/busybox.config" \
"/usr/local/share/platconf/${PLAT}/busybox/busybox.config"
}