summaryrefslogtreecommitdiffstats
path: root/meta/classes/populate_sdk_rpm.bbclass
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-07-09 14:15:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-29 10:16:14 +0100
commitfa5640d143beea4be101d6622d3fa133d04272f2 (patch)
tree7ca77430c1531399bdde6caec441bae40ac69568 /meta/classes/populate_sdk_rpm.bbclass
parenta73c25d2ded3a72159f2ce527e7307808c734686 (diff)
downloadpoky-fa5640d143beea4be101d6622d3fa133d04272f2.tar.gz
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]. (From OE-Core rev: 72d1048a8381fa4a8c4c0d082047536727b4be47) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/populate_sdk_rpm.bbclass')
-rw-r--r--meta/classes/populate_sdk_rpm.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
index 365a337a05..fac653bd6f 100644
--- a/meta/classes/populate_sdk_rpm.bbclass
+++ b/meta/classes/populate_sdk_rpm.bbclass
@@ -37,6 +37,7 @@ populate_sdk_rpm () {
37 export INSTALL_PACKAGES_LINGUAS_RPM="" 37 export INSTALL_PACKAGES_LINGUAS_RPM=""
38 export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig pkgconfig(pkg-config)" 38 export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig pkgconfig(pkg-config)"
39 export INSTALL_TASK_RPM="populate_sdk-target" 39 export INSTALL_TASK_RPM="populate_sdk-target"
40 export INSTALL_COMPLEMENTARY_RPM=""
40 41
41 # Setup base system configuration 42 # Setup base system configuration
42 mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/ 43 mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/
@@ -74,6 +75,7 @@ EOF
74 export INSTALL_PLATFORM_EXTRA_RPM 75 export INSTALL_PLATFORM_EXTRA_RPM
75 76
76 package_install_internal_rpm 77 package_install_internal_rpm
78 ${POPULATE_SDK_POST_TARGET_COMMAND}
77 populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM} 79 populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM}
78 80
79 ## install nativesdk ## 81 ## install nativesdk ##
@@ -86,6 +88,7 @@ EOF
86 export INSTALL_PACKAGES_LINGUAS_RPM="" 88 export INSTALL_PACKAGES_LINGUAS_RPM=""
87 export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig libGL.so()(64bit) libGL.so" 89 export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig libGL.so()(64bit) libGL.so"
88 export INSTALL_TASK_RPM="populate_sdk_rpm-nativesdk" 90 export INSTALL_TASK_RPM="populate_sdk_rpm-nativesdk"
91 export INSTALL_COMPLEMENTARY_RPM=""
89 92
90 # List must be prefered to least preferred order 93 # List must be prefered to least preferred order
91 INSTALL_PLATFORM_EXTRA_RPM="" 94 INSTALL_PLATFORM_EXTRA_RPM=""