Fix passing of packages and files to buildstrap
Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
diff --git a/androdeb b/androdeb
index 1750b82..d5c3552 100755
--- a/androdeb
+++ b/androdeb
@@ -15,10 +15,9 @@
ADB="adb"
# Default packages
-DEFAULT_PACKAGES+="\
-bash
-ca-certificates
-"
+DEFAULT_PACKAGES+="bash
+ca-certificates"
+
EXTRA_FILES="none"
config_full_build() {
@@ -199,8 +198,9 @@
SKIP_COMPRESS=0; if [ ! -z "$BUILD_IMAGE" ]; then SKIP_COMPRESS=1; fi
-sudo $spath/buildstrap $ARCH $DISTRO $TDIR $OUT_TMP "$(make_csv "$PACKAGES")" "$(make_csv "$EXTRA_FILES")"\
- $INSTALL_BCC $SKIP_COMPRESS
+sudo $spath/buildstrap $ARCH $DISTRO $TDIR $OUT_TMP \
+ "$(make_csv "$PACKAGES")"\
+ "$(echo "$EXTRA_FILES" | base64)" $INSTALL_BCC $SKIP_COMPRESS
# If we only wanted to prepare a rootfs and don't have
# a device connected, then just echo that and skip cleanup
diff --git a/buildstrap b/buildstrap
index 6f740e3..da09f01 100755
--- a/buildstrap
+++ b/buildstrap
@@ -9,11 +9,11 @@
TDIR=$3
OUT_TMP=$4
PACKAGES=$5
-EXTRA_FILES=$6
+EXTRA_FILES=$(echo $6 | base64 -d)
INSTALL_BCC=$7
SKIP_COMPRESS=$8
-time qemu-debootstrap --arch $ARCH --include=$(make_csv "$PACKAGES") \
+time qemu-debootstrap --arch $ARCH --include=$PACKAGES \
$DISTRO $OUT_TMP http://deb.debian.org/debian/
# Some reason debootstrap leaves these mounted
diff --git a/packages/bcc b/packages/bcc
index 20a8ef3..5640f74 100644
--- a/packages/bcc
+++ b/packages/bcc
@@ -1,4 +1,4 @@
-PACKAGES+="\
+PACKAGES+="
llvm-6.0-dev
libclang-6.0-dev
libelf-dev
@@ -22,7 +22,7 @@
python-pyroute2
"
-EXTRA_FILES+="\
+EXTRA_FILES+="
bcc/criticalstat.py
"
