Update
Signed-off-by: Joel Fernandes <joel@linuxinternals.org>
diff --git a/addons/device-unpack b/addons/device-unpack
index 1dcb578..14ba258 100755
--- a/addons/device-unpack
+++ b/addons/device-unpack
@@ -25,4 +25,4 @@
tar -zxf /data/androdeb/deb.tar.gz -C /data/androdeb/ || die 2 "Couldn't unpack due to tar -x errors"
rm /data/androdeb/deb.tar.gz
-echo "Unpack of rootfs successful! Go forth and hack."
+echo "Unpack of rootfs successful!"
diff --git a/addons/run b/addons/run
index 6a083fa..faee212 100755
--- a/addons/run
+++ b/addons/run
@@ -11,8 +11,8 @@
mount --bind /sys debian/sys/ > /dev/null
mount --bind /sys/kernel/debug/ debian/sys/kernel/debug/ > /dev/null
mount --bind /sys/kernel/debug/tracing/ debian/sys/kernel/debug/tracing/
-if [ -d /system/ ]; then; mount --bind /system debian/system/; fi
-if [ -d /vendor/ ]; then; mount --bind /vendor debian/vendor/; fi
+if [ -d /system/ ]; then mount --bind /system debian/system/; fi
+if [ -d /vendor/ ]; then mount --bind /vendor debian/vendor/; fi
chroot debian/ /bin/bash
# tear everything down
diff --git a/androdeb b/androdeb
index b23cfcc..e90843a 100755
--- a/androdeb
+++ b/androdeb
@@ -79,6 +79,10 @@
adb shell rm /data/androdeb/kh.tgz
}
+function all_done_banner() {
+ echo "All done! Run \"androdeb shell\" to enter environment"
+}
+
# Prepare is the last command checked
if [ -z "$PREPARE" ]; then usage; fi
@@ -86,9 +90,10 @@
if [ ! -z "$TARF" ] && [ ! -f $TARF ] && [ -z "$DOWNLOAD" ]; then die 7 "archive provided doesn't exist"; fi
-if [[ ! -z ${INSTALL_BCC+x} ]] && [[ -z ${KERNELSRC+x} ]]; then die 4 "--kernelsrc must be provided with --bcc"; fi
+if [ ! -z "$INSTALL_BCC" ] && [ -z "$KERNELSRC" ] && [ -z "$TARDIR" ];
+ then die 4 "--kernelsrc must be provided with --bcc (unless --buildtar is provided)."; fi
-if [[ ! -z ${KERNELSRC+x} ]] && [[ ! -d ${KERNELSRC} ]]; then die 5 "Kernel source directory provided doesn't exist"; fi
+if [ ! -z "$KERNELSRC" ] && [ ! -d $KERNELSRC ]; then die 5 "Kernel source directory provided doesn't exist"; fi
print_prepare_banner
@@ -107,14 +112,15 @@
# Package kernel headers
if [ ! -z "$KERNELSRC" ]; then
- $spath/bcc/build-kheaders-targz.sh ${KERNELSRC} $TDIR_ABS/kh.tgz ||
- die 6 "Failed to package kernel headers"
+ echo "Building and updating kernel headers from kernel source dir ($KERNELSRC)"
+ $spath/bcc/build-kheaders-targz.sh ${KERNELSRC} $TDIR_ABS/kh.tgz > /dev/null
+
# Is header update the only thing left to do?
if [[ -z "$PACKAGES" ]] && [[ -z "$TARF" ]]; then
- push_unpack_headers; do_cleanup; exit 0; fi
+ push_unpack_headers; do_cleanup; all_done_banner; exit 0; fi
mkdir $OUT_TMP/kernel-headers
- tar -xvf $TDIR_ABS/kh.tgz -C $OUT_TMP/kernel-headers/
+ tar -xvf $TDIR_ABS/kh.tgz -C $OUT_TMP/kernel-headers/ > /dev/null
fi
# Build FS from existing tar, very simple.
@@ -127,8 +133,7 @@
if [ ! -z "$KERNELSRC" ]; then push_unpack_headers; fi
- do_cleanup
- exit 0
+ do_cleanup; all_done_banner; exit 0
fi
PACKAGES+="$DEFAULT_PACKAGES"
@@ -191,5 +196,4 @@
adb pull /data/androdeb/androdeb-fs.tgz $TARDIR/
adb shell rm /data/androdeb/androdeb-fs.tgz; fi
-# Use --foreign and --variant=minbase to build minimal deb first stage
-# Use fakeroot tar to build tar with root files
+all_done_banner
