Patchwork [2/4] useradd.bbclass: do not modify -nativesdk packages

login
register
mail settings
Submitter Scott Garman
Date Nov. 9, 2011, 2:56 a.m.
Message ID <b2e206f9714ff6f7818e42d2efdabb1417132523.1320807056.git.scott.a.garman@intel.com>
Download mbox | patch
Permalink /patch/14597/
State Accepted
Commit 2f057dd905ccb497890ce73ac4e4c256edcf0351
Headers show

Comments

Scott Garman - Nov. 9, 2011, 2:56 a.m.
Exclude the addition of user/group code and RDEPENDS changes for
-nativesdk packages.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 meta/classes/useradd.bbclass |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

Patch

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)
 }