diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-10 14:55:23 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-13 12:15:42 +0000 |
commit | b772c8cde5a8d53de5588ff5d2771c1bd3eb259f (patch) | |
tree | 60251b8473d901544fb39acae4d0b9b780e81575 /meta/classes/package_rpm.bbclass | |
parent | 6c92cfc02014a55c4d3a40d70ff29308ad6255e7 (diff) | |
download | poky-b772c8cde5a8d53de5588ff5d2771c1bd3eb259f.tar.gz |
bitbake.conf/base.bbclass: Rename the staging directory to sysroots and the populate_staging task to populate_sysroot
This change makes the purpose of the staging directory more obvious and
the taskname more true to what it now actually does.
The layout version number is increased due to the change in layout
but code to convert existing directories and insert a symlink for
backwards compatibility is included.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 49e84678b8..0e7bfa0f44 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -210,8 +210,8 @@ python do_package_rpm () { | |||
210 | python () { | 210 | python () { |
211 | if bb.data.getVar('PACKAGES', d, True) != '': | 211 | if bb.data.getVar('PACKAGES', d, True) != '': |
212 | deps = (bb.data.getVarFlag('do_package_write_rpm', 'depends', d) or "").split() | 212 | deps = (bb.data.getVarFlag('do_package_write_rpm', 'depends', d) or "").split() |
213 | deps.append('rpm-native:do_populate_staging') | 213 | deps.append('rpm-native:do_populate_sysroot') |
214 | deps.append('fakeroot-native:do_populate_staging') | 214 | deps.append('fakeroot-native:do_populate_sysroot') |
215 | bb.data.setVarFlag('do_package_write_rpm', 'depends', " ".join(deps), d) | 215 | bb.data.setVarFlag('do_package_write_rpm', 'depends', " ".join(deps), d) |
216 | } | 216 | } |
217 | 217 | ||