diff options
| author | Michael Smith <msmith@cbnco.com> | 2009-05-05 00:38:36 -0400 |
|---|---|---|
| committer | Tom Rini <trini@embeddedalley.com> | 2009-05-05 01:18:01 -0400 |
| commit | 53f372bb0c9080ca86100cc342e522da0b9ce68d (patch) | |
| tree | 2e8e46a5489a7cade6e774e138f8588982de7585 | |
| parent | 6923d7073a1eed04518b89b2b31fe33cce21f6fb (diff) | |
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>
| -rw-r--r-- | 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 2768c2afb2..82220661f3 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 |