diff options
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 8 |
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}" | |||
12 | PACKAGE_INSTALL_ATTEMPTONLY ?= "" | 12 | PACKAGE_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 |
15 | do_rootfs[recrdeptask] += "do_deploy do_populate_staging" | 15 | do_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. |
18 | EXCLUDE_FROM_WORLD = "1" | 18 | EXCLUDE_FROM_WORLD = "1" |
@@ -23,15 +23,15 @@ PID = "${@os.getpid()}" | |||
23 | 23 | ||
24 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 24 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
25 | 25 | ||
26 | do_rootfs[depends] += "makedevs-native:do_populate_staging fakeroot-native:do_populate_staging ldconfig-native:do_populate_staging" | 26 | do_rootfs[depends] += "makedevs-native:do_populate_sysroot fakeroot-native:do_populate_sysroot ldconfig-native:do_populate_sysroot" |
27 | 27 | ||
28 | python () { | 28 | python () { |
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) |