diff options
| author |   Michael Smith <msmith@cbnco.com> | 2009-06-22 22:56:27 +0000 |
|---|---|---|
| committer |   Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-07-01 16:08:18 +0200 |
| commit | 305831b6c23e98112fbbb37484c1c7a5f1826b24 (patch) | |
| tree | 36bc94f1395c2b80a20655eb720c6fc1c240576a /classes | |
| parent | 56abc5c11e2e7371ee2059426aedf8ab917130e5 (diff) | |
| download | openembedded-305831b6c23e98112fbbb37484c1c7a5f1826b24.tar.gz | |
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>
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Acked-by: Koen Kooi <koen@openembedded.org>
Diffstat (limited to 'classes')
| -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 |