summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-11-08 18:40:28 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 11:37:12 +0000
commit3b93447e350d1ca49670372b8e683445006fb500 (patch)
tree761a6df26b8736fed9248a02e642370321b739a0
parent67a2c3553090ce3f74f48f6a46c7cbb1bcb2100d (diff)
downloadpoky-3b93447e350d1ca49670372b8e683445006fb500.tar.gz
poky-3b93447e350d1ca49670372b8e683445006fb500.tar.bz2
poky-3b93447e350d1ca49670372b8e683445006fb500.zip
useradd.bbclass: do not modify -nativesdk packages
Exclude the addition of user/group code and RDEPENDS changes for -nativesdk packages. (From OE-Core rev: 2f057dd905ccb497890ce73ac4e4c256edcf0351) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/useradd.bbclass9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 3b2d1dbfe8..64d6861644 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)
}