Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...

[vuplus_openembedded] / classes / rootfs_deb.bbclass

diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 6bc251f..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
@@ -119,13 +121,13 @@ fakeroot rootfs_deb_do_rootfs () {
        set -e
 
        # Hacks to allow opkg's update-alternatives and opkg to coexist for now
-       mkdir -p ${IMAGE_ROOTFS}/usr/lib/opkg
+       mkdir -p ${IMAGE_ROOTFS}${libdir}/opkg
        if [ -e ${IMAGE_ROOTFS}/var/dpkg/alternatives ]; then
                rmdir ${IMAGE_ROOTFS}/var/dpkg/alternatives
        fi
-       ln -s /usr/lib/opkg/alternatives ${IMAGE_ROOTFS}/var/dpkg/alternatives
-       ln -s /var/dpkg/info ${IMAGE_ROOTFS}/usr/lib/opkg/info
-       ln -s /var/dpkg/status ${IMAGE_ROOTFS}/usr/lib/opkg/status
+       ln -s ${libdir}/opkg/alternatives ${IMAGE_ROOTFS}/var/dpkg/alternatives
+       ln -s /var/dpkg/info ${IMAGE_ROOTFS}${libdir}/opkg/info
+       ln -s /var/dpkg/status ${IMAGE_ROOTFS}${libdir}/opkg/status
 
        ${ROOTFS_POSTPROCESS_COMMAND}
 
@@ -153,6 +155,6 @@ rootfs_deb_log_check() {
 }
 
 remove_packaging_data_files() {
-       rm -rf ${IMAGE_ROOTFS}/usr/lib/opkg/
+       rm -rf ${IMAGE_ROOTFS}${libdir}/opkg/
        rm -rf ${IMAGE_ROOTFS}/usr/dpkg/
 }