[oe-commits] Hongxu Jia : image.bbclass/populate_sdk_base.bbclass: shift position of sdk complementary install definition
git at git.openembedded.org
git at git.openembedded.org
Tue Feb 11 11:56:28 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 907458935bab391f5bfba8f581ea9835078548d9
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=907458935bab391f5bfba8f581ea9835078548d9
Author: Hongxu Jia <hongxu.jia at windriver.com>
Date: Mon Jan 27 10:05:10 2014 +0800
image.bbclass/populate_sdk_base.bbclass: shift position of sdk complementary install definition
The sdk complementary install operation was defined in image.bbclass,
but the sdk recipe (such as meta-toolchain.bb) didn't inherit this
bbclass but populate_sdk, and both of image and populate_sdk bbclass
inherited populate_sdk_base bbclass, so move the sdk complementary
install definition to populate_sdk_base bbclass fixed this issue.
Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>
---
meta/classes/image.bbclass | 19 -------------------
meta/classes/populate_sdk_base.bbclass | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index e5ec42c..8f4be13 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -35,26 +35,7 @@ FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(oe.dat
SPLASH ?= "psplash"
PACKAGE_GROUP_splash = "${SPLASH}"
-# Wildcards specifying complementary packages to install for every package that has been explicitly
-# installed into the rootfs
-COMPLEMENTARY_GLOB[dev-pkgs] = '*-dev'
-COMPLEMENTARY_GLOB[staticdev-pkgs] = '*-staticdev'
-COMPLEMENTARY_GLOB[doc-pkgs] = '*-doc'
-COMPLEMENTARY_GLOB[dbg-pkgs] = '*-dbg'
-COMPLEMENTARY_GLOB[ptest-pkgs] = '*-ptest'
-
-def complementary_globs(featurevar, d):
- all_globs = d.getVarFlags('COMPLEMENTARY_GLOB')
- globs = []
- features = set((d.getVar(featurevar, True) or '').split())
- for name, glob in all_globs.items():
- if name in features:
- globs.append(glob)
- return ' '.join(globs)
-
IMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("IMAGE_FEATURES", d)}'
-SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs"
-SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}'
def check_image_features(d):
valid_features = (d.getVarFlag('IMAGE_FEATURES', 'validitems', True) or "").split()
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 0c17aac..ee2a7c1 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -1,4 +1,25 @@
inherit meta toolchain-scripts
+
+# Wildcards specifying complementary packages to install for every package that has been explicitly
+# installed into the rootfs
+COMPLEMENTARY_GLOB[dev-pkgs] = '*-dev'
+COMPLEMENTARY_GLOB[staticdev-pkgs] = '*-staticdev'
+COMPLEMENTARY_GLOB[doc-pkgs] = '*-doc'
+COMPLEMENTARY_GLOB[dbg-pkgs] = '*-dbg'
+COMPLEMENTARY_GLOB[ptest-pkgs] = '*-ptest'
+
+def complementary_globs(featurevar, d):
+ all_globs = d.getVarFlags('COMPLEMENTARY_GLOB')
+ globs = []
+ features = set((d.getVar(featurevar, True) or '').split())
+ for name, glob in all_globs.items():
+ if name in features:
+ globs.append(glob)
+ return ' '.join(globs)
+
+SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs"
+SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}'
+
inherit populate_sdk_${IMAGE_PKGTYPE}
SDK_DIR = "${WORKDIR}/sdk"
More information about the Openembedded-commits
mailing list