[oe-commits] Scott Garman : useradd.bbclass: do not modify -nativesdk packages

git at git.openembedded.org git at git.openembedded.org
Wed Nov 9 14:57:45 UTC 2011


Module: openembedded-core.git
Branch: master-next
Commit: 159cf136357322674c60a77b5ba4c25b8811f18b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=159cf136357322674c60a77b5ba4c25b8811f18b

Author: Scott Garman <scott.a.garman at intel.com>
Date:   Tue Nov  8 18:40:28 2011 -0800

useradd.bbclass: do not modify -nativesdk packages

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





More information about the Openembedded-commits mailing list