[OE-core] [CONSOLIDATED PULL (v2) 24/33] useradd.bbclass: do not modify -nativesdk packages
Saul Wold
sgw at linux.intel.com
Thu Nov 10 07:43:06 UTC 2011
From: Scott Garman <scott.a.garman at intel.com>
Exclude the addition of user/group code and RDEPENDS changes for
-nativesdk packages.
Signed-off-by: Scott Garman <scott.a.garman at intel.com>
---
meta/classes/useradd.bbclass | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 3b2d1db..64d6861 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -153,10 +153,11 @@ fakeroot python populate_packages_prepend () {
rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
rdepends += " base-passwd shadow"
bb.data.setVar("RDEPENDS_%s" % pkg, rdepends, d)
-
+
# Add the user/group preinstall scripts and RDEPENDS requirements
# to packages specified by USERADD_PACKAGES
- useradd_packages = d.getVar('USERADD_PACKAGES', True) or ""
- for pkg in useradd_packages.split():
- update_useradd_package(pkg)
+ if not bb.data.inherits_class('nativesdk', d):
+ useradd_packages = d.getVar('USERADD_PACKAGES', True) or ""
+ for pkg in useradd_packages.split():
+ update_useradd_package(pkg)
}
--
1.7.6.4
More information about the Openembedded-core
mailing list