summaryrefslogtreecommitdiffstats
path: root/meta/classes/image.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r--meta/classes/image.bbclass20
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 14726d2537..4642fa63e2 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -74,17 +74,17 @@ IMAGE_TYPE = ${@base_contains("IMAGE_FSTYPES", "live", "live", "empty", d)}
74inherit image-${IMAGE_TYPE} 74inherit image-${IMAGE_TYPE}
75 75
76python () { 76python () {
77 deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or "" 77 deps = d.getVarFlag('do_rootfs', 'depends') or ""
78 for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split(): 78 for type in (d.getVar('IMAGE_FSTYPES', True) or "").split():
79 for dep in ((bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or "").split() or []): 79 for dep in ((d.getVar('IMAGE_DEPENDS_%s' % type) or "").split() or []):
80 deps += " %s:do_populate_sysroot" % dep 80 deps += " %s:do_populate_sysroot" % dep
81 for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split(): 81 for dep in (d.getVar('EXTRA_IMAGEDEPENDS', True) or "").split():
82 deps += " %s:do_populate_sysroot" % dep 82 deps += " %s:do_populate_sysroot" % dep
83 bb.data.setVarFlag('do_rootfs', 'depends', deps, d) 83 d.setVarFlag('do_rootfs', 'depends', deps)
84 84
85 # If we don't do this we try and run the mapping hooks while parsing which is slow 85 # If we don't do this we try and run the mapping hooks while parsing which is slow
86 # bitbake should really provide something to let us know this... 86 # bitbake should really provide something to let us know this...
87 if bb.data.getVar('BB_WORKERCONTEXT', d, True) is not None: 87 if d.getVar('BB_WORKERCONTEXT', True) is not None:
88 runtime_mapping_rename("PACKAGE_INSTALL", d) 88 runtime_mapping_rename("PACKAGE_INSTALL", d)
89 runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", d) 89 runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", d)
90} 90}
@@ -98,15 +98,15 @@ python () {
98# is searched for in the BBPATH (same as the old version.) 98# is searched for in the BBPATH (same as the old version.)
99# 99#
100def get_devtable_list(d): 100def get_devtable_list(d):
101 devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1) 101 devtable = d.getVar('IMAGE_DEVICE_TABLE', 1)
102 if devtable != None: 102 if devtable != None:
103 return devtable 103 return devtable
104 str = "" 104 str = ""
105 devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1) 105 devtables = d.getVar('IMAGE_DEVICE_TABLES', 1)
106 if devtables == None: 106 if devtables == None:
107 devtables = 'files/device_table-minimal.txt' 107 devtables = 'files/device_table-minimal.txt'
108 for devtable in devtables.split(): 108 for devtable in devtables.split():
109 str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable) 109 str += " %s" % bb.which(d.getVar('BBPATH', 1), devtable)
110 return str 110 return str
111 111
112IMAGE_CLASSES ?= "image_types" 112IMAGE_CLASSES ?= "image_types"
@@ -119,7 +119,7 @@ ROOTFS_POSTPROCESS_COMMAND ?= ""
119# some default locales 119# some default locales
120IMAGE_LINGUAS ?= "de-de fr-fr en-gb" 120IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
121 121
122LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVar('IMAGE_LINGUAS', d, 1).split()))}" 122LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS', 1).split()))}"
123 123
124do_rootfs[nostamp] = "1" 124do_rootfs[nostamp] = "1"
125do_rootfs[dirs] = "${TOPDIR}" 125do_rootfs[dirs] = "${TOPDIR}"