summaryrefslogtreecommitdiffstats
path: root/meta/classes/useradd.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-09 15:00:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 11:51:19 +0000
commitc8dee9b92dfd545852ecac8dc2adfc95ac02e957 (patch)
tree5f1b86954646a0f3bb914407994388a6a4346769 /meta/classes/useradd.bbclass
parent5d3860f4a8abb8e95442b04f8b84a333af362fcd (diff)
downloadpoky-c8dee9b92dfd545852ecac8dc2adfc95ac02e957.tar.gz
Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata: sed \ -e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` (From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/useradd.bbclass')
-rw-r--r--meta/classes/useradd.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index f3dd8236ee..928f619b7c 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -107,11 +107,11 @@ def update_useradd_after_parse(d):
107 useradd_packages = d.getVar('USERADD_PACKAGES', True) 107 useradd_packages = d.getVar('USERADD_PACKAGES', True)
108 108
109 if not useradd_packages: 109 if not useradd_packages:
110 raise bb.build.FuncFailed, "%s inherits useradd but doesn't set USERADD_PACKAGES" % bb.data.getVar('FILE', d) 110 raise bb.build.FuncFailed, "%s inherits useradd but doesn't set USERADD_PACKAGES" % d.getVar('FILE')
111 111
112 for pkg in useradd_packages.split(): 112 for pkg in useradd_packages.split():
113 if not d.getVar('USERADD_PARAM_%s' % pkg, True) and not d.getVar('GROUPADD_PARAM_%s' % pkg, True): 113 if not d.getVar('USERADD_PARAM_%s' % pkg, True) and not d.getVar('GROUPADD_PARAM_%s' % pkg, True):
114 raise bb.build.FuncFailed, "%s inherits useradd but doesn't set USERADD_PARAM or GROUPADD_PARAM for package %s" % (bb.data.getVar('FILE', d), pkg) 114 raise bb.build.FuncFailed, "%s inherits useradd but doesn't set USERADD_PARAM or GROUPADD_PARAM for package %s" % (d.getVar('FILE'), pkg)
115 115
116python __anonymous() { 116python __anonymous() {
117 update_useradd_after_parse(d) 117 update_useradd_after_parse(d)
@@ -147,12 +147,12 @@ fakeroot python populate_packages_prepend () {
147 if not preinst: 147 if not preinst:
148 preinst = '#!/bin/sh\n' 148 preinst = '#!/bin/sh\n'
149 preinst += d.getVar('useradd_preinst', True) 149 preinst += d.getVar('useradd_preinst', True)
150 bb.data.setVar('pkg_preinst_%s' % pkg, preinst, d) 150 d.setVar('pkg_preinst_%s' % pkg, preinst)
151 151
152 # RDEPENDS setup 152 # RDEPENDS setup
153 rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or "" 153 rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
154 rdepends += " base-passwd shadow" 154 rdepends += " base-passwd shadow"
155 bb.data.setVar("RDEPENDS_%s" % pkg, rdepends, d) 155 d.setVar("RDEPENDS_%s" % pkg, rdepends)
156 156
157 # Add the user/group preinstall scripts and RDEPENDS requirements 157 # Add the user/group preinstall scripts and RDEPENDS requirements
158 # to packages specified by USERADD_PACKAGES 158 # to packages specified by USERADD_PACKAGES