summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-03 10:41:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-05 10:22:36 -0800
commitd01dadfb87cfd2284b3e849d35a35fe5df0239c4 (patch)
tree10d3685054f38592b0c1a39452c0e65bc47b945b /meta/classes/package.bbclass
parenta439d32dd843d10a9f65cc858b02422fac7deb50 (diff)
downloadpoky-d01dadfb87cfd2284b3e849d35a35fe5df0239c4.tar.gz
meta/classes: Convert to use appendVar and appendVarFlags
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass16
1 files changed, 5 insertions, 11 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 91c4c6ee12..4ed6972a7c 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -153,12 +153,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
153 the_files.append(aux_files_pattern_verbatim % m.group(1)) 153 the_files.append(aux_files_pattern_verbatim % m.group(1))
154 d.setVar('FILES_' + pkg, " ".join(the_files)) 154 d.setVar('FILES_' + pkg, " ".join(the_files))
155 if extra_depends != '': 155 if extra_depends != '':
156 the_depends = d.getVar('RDEPENDS_' + pkg, True) 156 d.appendVar('RDEPENDS_' + pkg, ' ' + extra_depends)
157 if the_depends:
158 the_depends = '%s %s' % (the_depends, extra_depends)
159 else:
160 the_depends = extra_depends
161 d.setVar('RDEPENDS_' + pkg, the_depends)
162 d.setVar('DESCRIPTION_' + pkg, description % on) 157 d.setVar('DESCRIPTION_' + pkg, description % on)
163 if postinst: 158 if postinst:
164 d.setVar('pkg_postinst_' + pkg, postinst) 159 d.setVar('pkg_postinst_' + pkg, postinst)
@@ -175,15 +170,14 @@ PACKAGE_DEPENDS += "file-native"
175 170
176python () { 171python () {
177 if d.getVar('PACKAGES', True) != '': 172 if d.getVar('PACKAGES', True) != '':
178 deps = d.getVarFlag('do_package', 'depends') or "" 173 deps = ""
179 for dep in (d.getVar('PACKAGE_DEPENDS', True) or "").split(): 174 for dep in (d.getVar('PACKAGE_DEPENDS', True) or "").split():
180 deps += " %s:do_populate_sysroot" % dep 175 deps += " %s:do_populate_sysroot" % dep
181 d.setVarFlag('do_package', 'depends', deps) 176 d.appendVarFlag('do_package', 'depends', deps)
182 177
183 deps = (d.getVarFlag('do_package', 'deptask') or "").split()
184 # shlibs requires any DEPENDS to have already packaged for the *.list files 178 # shlibs requires any DEPENDS to have already packaged for the *.list files
185 deps.append("do_package") 179 d.appendVarFlag('do_package', 'deptask', " do_package")
186 d.setVarFlag('do_package', 'deptask', " ".join(deps)) 180
187 elif not bb.data.inherits_class('image', d): 181 elif not bb.data.inherits_class('image', d):
188 d.setVar("PACKAGERDEPTASK", "") 182 d.setVar("PACKAGERDEPTASK", "")
189} 183}