diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-03-30 14:47:57 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-05-05 15:04:57 +0100 |
commit | 838a58ab01a9f325430fe6c4cc1dac7c2255a69c (patch) | |
tree | ca2b0e767dffe00aed392c8fd37be32aeb869d7e /classes/rootfs_rpm.bbclass | |
parent | 692f64df9aa931780b98a9dc8505cfa7b61fbac0 (diff) | |
download | openembedded-838a58ab01a9f325430fe6c4cc1dac7c2255a69c.tar.gz |
bitbake.conf/base.bbclass: Rename the staging directory to sysroots and the populate_staging task to populate_sysroot
This change, pulled from Poky, 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.
This patch also includes fixes for all recipes which reference the directory.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'classes/rootfs_rpm.bbclass')
-rw-r--r-- | classes/rootfs_rpm.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass index e3e306450e..c018a03e2f 100644 --- a/classes/rootfs_rpm.bbclass +++ b/classes/rootfs_rpm.bbclass @@ -6,7 +6,7 @@ ROOTFS_PKGMANAGE = "rpm yum" ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" -do_rootfs[depends] += "rpm-native:do_populate_staging yum-native:do_populate_staging createrepo-native:do_populate_staging fakechroot-native:do_populate_staging" +do_rootfs[depends] += "rpm-native:do_populate_sysroot yum-native:do_populate_sysroot createrepo-native:do_populate_sysroot fakechroot-native:do_populate_sysroot" do_rootfs[recrdeptask] += "do_package_write_rpm" YUMCONF = "${IMAGE_ROOTFS}/etc/yum.conf" @@ -203,7 +203,7 @@ python () { flags = bb.data.getVarFlag('do_rootfs', 'recrdeptask', d) flags = flags.replace("do_package_write_rpm", "") flags = flags.replace("do_deploy", "") - flags = flags.replace("do_populate_staging", "") + flags = flags.replace("do_populate_sysroot", "") bb.data.setVarFlag('do_rootfs', 'recrdeptask', flags, d) bb.data.setVar('RPM_PREPROCESS_COMMANDS', "rpm_insert_feed_uris", d) bb.data.setVar('RPM_POSTPROCESS_COMMANDS', '', d) |