From 72d1048a8381fa4a8c4c0d082047536727b4be47 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 9 Jul 2012 14:15:08 +0100 Subject: Rework installation of dev, dbg, doc, and locale packages Use a similar mechanism that was previously used to install locales at rootfs generation time to install other "complementary" packages (e.g. *-dev packages) - i.e. install all of the explicitly requested packages and their dependencies, then get a list of the packages that were installed, and use that list to install the complementary packages. This has been implemented by using a list of globs which should make it easier to extend in future. The previous locale package installation code assumed that the locale packages did not have any dependencies that were not already installed; now that we are installing non-locale packages this is no longer correct. In practice only the rpm backend actually made use of this assumption, so it needed to be changed to call into the existing package backend code to do the complementary package installation rather than calling rpm directly. This fixes the doc-pkgs IMAGE_FEATURES feature to work correctly, and also ensures that all dev/dbg packages get installed for dev-pkgs/dbg-pkgs respectively even if the dependency chains between those packages was not ensuring that already. The code has also been adapted to work correctly with the new SDK-from-image functionality. To that end, an SDKIMAGE_FEATURES variable has been added to allow specifying what extra image features should go into the SDK (extra, because by virtue of installing all of the packages in the image into the target part of the SDK, we already include all of IMAGE_FEATURES) with a default value of "dev-pkgs dbg-pkgs". Fixes [YOCTO #2614]. Signed-off-by: Paul Eggleton --- meta/classes/rootfs_deb.bbclass | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'meta/classes/rootfs_deb.bbclass') diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index 67871a9087..a002b1ec02 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass @@ -10,7 +10,7 @@ do_rootfs[recrdeptask] += "do_package_write_deb" do_rootfs[lockfiles] += "${WORKDIR}/deb.lock" -DEB_POSTPROCESS_COMMANDS = "rootfs_install_all_locales; " +DEB_POSTPROCESS_COMMANDS = "" opkglibdir = "${localstatedir}/lib/opkg" @@ -42,6 +42,8 @@ fakeroot rootfs_deb_do_rootfs () { package_install_internal_deb ${DEB_POSTPROCESS_COMMANDS} + rootfs_install_complementary + export D=${IMAGE_ROOTFS} export OFFLINE_ROOT=${IMAGE_ROOTFS} export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} @@ -87,10 +89,16 @@ remove_packaging_data_files() { rm -rf ${IMAGE_ROOTFS}/usr/dpkg/ } -DPKG_QUERY_COMMAND = "${STAGING_BINDIR_NATIVE}/dpkg --admindir=${IMAGE_ROOTFS}/var/lib/dpkg" +# This will of course only work after rootfs_deb_do_rootfs has been called +DPKG_QUERY_COMMAND = "${STAGING_BINDIR_NATIVE}/dpkg-query --admindir=$INSTALL_ROOTFS_DEB/var/lib/dpkg" list_installed_packages() { - ${DPKG_QUERY_COMMAND} -l | grep ^ii | awk '{ print $2 }' + if [ "$1" = "arch" ] ; then + # Here we want the PACKAGE_ARCH not the deb architecture + ${DPKG_QUERY_COMMAND} -W -f='${Package} ${PackageArch}\n' + else + ${DPKG_QUERY_COMMAND} -W -f='${Package}\n' + fi } get_package_filename() { @@ -110,16 +118,9 @@ list_package_recommends() { ${DPKG_QUERY_COMMAND} -s $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g' } -rootfs_check_package_exists() { - if [ `apt-cache policy $1 | wc -l` -gt 4 ]; then - echo $1 - fi -} - rootfs_install_packages() { - ${STAGING_BINDIR_NATIVE}/apt-get install $@ --force-yes --allow-unauthenticated + ${STAGING_BINDIR_NATIVE}/apt-get install `cat $1` --force-yes --allow-unauthenticated - for pkg in $@ ; do - deb_package_setflag installed $pkg - done + # Mark all packages installed + sed -i -e "s/Status: install ok unpacked/Status: install ok installed/;" $INSTALL_ROOTFS_DEB/var/lib/dpkg/status } -- cgit 1.2.3-korg