From 3b93447e350d1ca49670372b8e683445006fb500 Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Tue, 8 Nov 2011 18:40:28 -0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/useradd.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'meta/classes/useradd.bbclass') 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) } -- cgit v1.2.3-54-g00ecf