From patchwork Thu Nov 10 07:43:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, (v2), 24/33] useradd.bbclass: do not modify -nativesdk packages Date: Thu, 10 Nov 2011 07:43:06 -0000 From: Saul Wold X-Patchwork-Id: 14733 Message-Id: <75889c8d53b4220146d737c59cfe923784a2739b.1320910946.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Scott Garman Exclude the addition of user/group code and RDEPENDS changes for -nativesdk packages. Signed-off-by: Scott Garman --- 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) }