do not bzip2 cdebootstrap.tar

The APK itself is compressed, and the bzip2 file is hard to make
deterministic.

.gitignore

@@ -8,6 +8,6 @@ proguard.cfg
 proguard-project.txt
 #
 assets/busybox
-assets/cdebootstrap.tar.bz2
+assets/cdebootstrap.tar
 external/cdebootstrap/cdebootstrap-static-0.*/
-external/cdebootstrap/cdebootstrap.tar.bz2
+external/cdebootstrap/cdebootstrap.tar

README.txt

@@ -94,7 +94,7 @@ cdebootstrap
 http://packages.debian.org/unstable/cdebootstrap
 
 cdebootstrap is downloaded directly from Debian, extracted, and then
-tar-bzipped into the included tarball assets/cdebootstrap.tar.bz2. See
+tar'ed into the included tarball assets/cdebootstrap.tar. See
 external/cdebootstrap/Makefile for details.
 
 

assets/create-debian-setup.sh

@@ -82,7 +82,7 @@ if test -d $mnt && test -e $image_path; then
     /system/xbin/losetup
     mount -o loop,noatime,errors=remount-ro $loopdev $mnt || exit
     cd $mnt
-    tar xjf $app_bin/cdebootstrap.tar.bz2
+    tar xf $app_bin/cdebootstrap.tar
 else
     echo "No mount dir found ($mnt) or no image_path ($image_path)"
     exit 1

external/Makefile

@@ -66,7 +66,7 @@ all: $(EXTERNAL_ROOT)/busybox/busybox
 
 assets: all
 	install $(EXTERNAL_ROOT)/busybox/busybox \
-		$(EXTERNAL_ROOT)/cdebootstrap/cdebootstrap.tar.bz2 \
+		$(EXTERNAL_ROOT)/cdebootstrap/cdebootstrap.tar \
 		$(ASSETS)/
 
 
@@ -94,4 +94,4 @@ clean:
 
 distclean: clean
 	rm -f -- $(ASSETS)/busybox
-	rm -f -- $(ASSETS)/cdebootstrap.tar.bz2
+	rm -f -- $(ASSETS)/cdebootstrap.tar

external/cdebootstrap/Makefile

@@ -7,12 +7,11 @@ PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/c/cdebootstrap
 
 DL_DIR=$(PKG_NAME)-$(PKG_VERSION)
 
-all: cdebootstrap.tar.bz2
+all: cdebootstrap.tar
 
-
-cdebootstrap.tar.bz2: $(DL_DIR)/usr/bin/cdebootstrap-static
+cdebootstrap.tar: $(DL_DIR)/usr/bin/cdebootstrap-static
 	cd $(DL_DIR) && \
-		tar cjpf ../cdebootstrap.tar.bz2 usr/
+		tar --create --file ../cdebootstrap.tar usr/
 
 $(DL_DIR)/usr/bin/cdebootstrap-static: $(DL_DIR)/$(PKG_SOURCE)
 	cd $(DL_DIR) && \
@@ -37,6 +36,6 @@ $(DL_DIR):
 
 clean:
 	-rm -rf -- $(DL_DIR)
-	-rm -f -- cdebootstrap.tar.bz2
+	-rm -f -- cdebootstrap.tar
 
 .PHONY: clean

src/info/guardianproject/lildebi/NativeHelper.java

@@ -179,7 +179,7 @@ public static void unzipDebiFiles(Context context) {
 		} catch (IOException e) {
 			Log.e(LilDebi.TAG, "Can't unzip", e);
 		}
-		chmod(0644, new File(app_bin, "cdebootstrap.tar.bz2"));
+		chmod(0644, new File(app_bin, "cdebootstrap.tar"));
 		chmod(0644, new File(app_bin, "lildebi-common"));
 		chmod(0755, new File(app_bin, "create-debian-setup.sh"));
 		chmod(0755, new File(app_bin, "complete-debian-setup.sh"));