[oe-commits] Michael Smith : rootfs_deb: make Packages.gz, not Packages.bz2.

[git version control]

Module: openembedded.git
Branch: stable/2009
Commit: 305831b6c23e98112fbbb37484c1c7a5f1826b24
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=305831b6c23e98112fbbb37484c1c7a5f1826b24

Author: Michael Smith <msmith at cbnco.com>
Date:   Mon Jun 22 22:56:27 2009 +0000

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 at cbnco.com>
Signed-off-by: Marcin Juszkiewicz <marcin at juszkiewicz.com.pl>
Acked-by: Koen Kooi <koen at openembedded.org>

---

 classes/rootfs_deb.bbclass |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 2768c2a..8222066 100644
--- 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