rootfs_deb: make Packages.gz, not Packages.bz2.

apt ignores Packages.bz2 unless bzip2 exists in /bin/bzip2 (!!).
If it's in /usr/bin/bzip2 (e.g. SuSE build host) the image fails to build.

Also, remove commented-out check for DEPLOY_KEEP_PACKAGES.

Signed-off-by: Michael Smith <msmith@cbnco.com>

diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 2768c2a..8222066 100644 (file)
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -24,10 +24,12 @@ fakeroot rootfs_deb_do_rootfs () {
                        continue;
                fi
                cd ${DEPLOY_DIR_DEB}/$arch
-               # if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
-                       rm -f Packages.gz Packages Packages.bz2
-               # fi
-               dpkg-scanpackages . | bzip2 > Packages.bz2
+               rm -f Packages.gz Packages Packages.bz2
+
+               # apt-native ignores Packages.bz2 unless /bin/bzip2 exists
+               # on the build host, so stick with gzip
+               dpkg-scanpackages . | gzip > Packages.gz
+
                echo "Label: $arch" > Release
 
                echo "deb file:${DEPLOY_DIR_DEB}/$arch/ ./" >> ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev