From 302700a2dc252042dc8e25b84d090fb56d769895 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Tue, 18 Mar 2014 01:00:53 -0400 Subject: bootstrap-prepare.sh: Update config installation. BusyBox's config file has moved in config-dev. --- 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" } -- cgit v0.9.1