summaryrefslogtreecommitdiffstats
path: root/meta/classes/image.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-10 14:55:23 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-13 12:15:42 +0000
commitb772c8cde5a8d53de5588ff5d2771c1bd3eb259f (patch)
tree60251b8473d901544fb39acae4d0b9b780e81575 /meta/classes/image.bbclass
parent6c92cfc02014a55c4d3a40d70ff29308ad6255e7 (diff)
downloadpoky-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/image.bbclass')
-rw-r--r--meta/classes/image.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index c5a2dd2c50..e4e8900f98 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -12,7 +12,7 @@ export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
12PACKAGE_INSTALL_ATTEMPTONLY ?= "" 12PACKAGE_INSTALL_ATTEMPTONLY ?= ""
13 13
14# We need to recursively follow RDEPENDS and RRECOMMENDS for images 14# We need to recursively follow RDEPENDS and RRECOMMENDS for images
15do_rootfs[recrdeptask] += "do_deploy do_populate_staging" 15do_rootfs[recrdeptask] += "do_deploy do_populate_sysroot"
16 16
17# Images are generally built explicitly, do not need to be part of world. 17# Images are generally built explicitly, do not need to be part of world.
18EXCLUDE_FROM_WORLD = "1" 18EXCLUDE_FROM_WORLD = "1"
@@ -23,15 +23,15 @@ PID = "${@os.getpid()}"
23 23
24PACKAGE_ARCH = "${MACHINE_ARCH}" 24PACKAGE_ARCH = "${MACHINE_ARCH}"
25 25
26do_rootfs[depends] += "makedevs-native:do_populate_staging fakeroot-native:do_populate_staging ldconfig-native:do_populate_staging" 26do_rootfs[depends] += "makedevs-native:do_populate_sysroot fakeroot-native:do_populate_sysroot ldconfig-native:do_populate_sysroot"
27 27
28python () { 28python () {
29 deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or "" 29 deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or ""
30 for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split(): 30 for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split():
31 for dep in ((bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or "").split() or []): 31 for dep in ((bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or "").split() or []):
32 deps += " %s:do_populate_staging" % dep 32 deps += " %s:do_populate_sysroot" % dep
33 for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split(): 33 for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split():
34 deps += " %s:do_populate_staging" % dep 34 deps += " %s:do_populate_sysroot" % dep
35 bb.data.setVarFlag('do_rootfs', 'depends', deps, d) 35 bb.data.setVarFlag('do_rootfs', 'depends', deps, d)
36 36
37 runtime_mapping_rename("PACKAGE_INSTALL", d) 37 runtime_mapping_rename("PACKAGE_INSTALL", d)