diff options
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 459d872b4a..fbf7206d04 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -38,7 +38,7 @@ IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs stateless-rootfs em | |||
38 | # Generate companion debugfs? | 38 | # Generate companion debugfs? |
39 | IMAGE_GEN_DEBUGFS ?= "0" | 39 | IMAGE_GEN_DEBUGFS ?= "0" |
40 | 40 | ||
41 | # These pacackages will be installed as additional into debug rootfs | 41 | # These packages will be installed as additional into debug rootfs |
42 | IMAGE_INSTALL_DEBUGFS ?= "" | 42 | IMAGE_INSTALL_DEBUGFS ?= "" |
43 | 43 | ||
44 | # These packages will be removed from a read-only rootfs after all other | 44 | # These packages will be removed from a read-only rootfs after all other |
@@ -115,7 +115,7 @@ def rootfs_command_variables(d): | |||
115 | 'IMAGE_PREPROCESS_COMMAND','RPM_PREPROCESS_COMMANDS','RPM_POSTPROCESS_COMMANDS','DEB_PREPROCESS_COMMANDS','DEB_POSTPROCESS_COMMANDS'] | 115 | 'IMAGE_PREPROCESS_COMMAND','RPM_PREPROCESS_COMMANDS','RPM_POSTPROCESS_COMMANDS','DEB_PREPROCESS_COMMANDS','DEB_POSTPROCESS_COMMANDS'] |
116 | 116 | ||
117 | python () { | 117 | python () { |
118 | variables = rootfs_command_variables(d) + sdk_command_variables(d) | 118 | variables = rootfs_command_variables(d) |
119 | for var in variables: | 119 | for var in variables: |
120 | if d.getVar(var, False): | 120 | if d.getVar(var, False): |
121 | d.setVarFlag(var, 'func', '1') | 121 | d.setVarFlag(var, 'func', '1') |
@@ -124,7 +124,7 @@ python () { | |||
124 | def rootfs_variables(d): | 124 | def rootfs_variables(d): |
125 | from oe.rootfs import variable_depends | 125 | from oe.rootfs import variable_depends |
126 | variables = ['IMAGE_DEVICE_TABLE','IMAGE_DEVICE_TABLES','BUILD_IMAGES_FROM_FEEDS','IMAGE_TYPES_MASKED','IMAGE_ROOTFS_ALIGNMENT','IMAGE_OVERHEAD_FACTOR','IMAGE_ROOTFS_SIZE','IMAGE_ROOTFS_EXTRA_SPACE', | 126 | variables = ['IMAGE_DEVICE_TABLE','IMAGE_DEVICE_TABLES','BUILD_IMAGES_FROM_FEEDS','IMAGE_TYPES_MASKED','IMAGE_ROOTFS_ALIGNMENT','IMAGE_OVERHEAD_FACTOR','IMAGE_ROOTFS_SIZE','IMAGE_ROOTFS_EXTRA_SPACE', |
127 | 'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS', 'IMAGE_LINGUAS_COMPLEMENTARY', | 127 | 'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS', 'IMAGE_LINGUAS_COMPLEMENTARY', 'IMAGE_LOCALES_ARCHIVE', |
128 | 'MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS', | 128 | 'MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS', |
129 | 'PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS', | 129 | 'PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS', |
130 | 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED', 'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY', 'REPRODUCIBLE_TIMESTAMP_ROOTFS', 'IMAGE_INSTALL_DEBUGFS'] | 130 | 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED', 'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY', 'REPRODUCIBLE_TIMESTAMP_ROOTFS', 'IMAGE_INSTALL_DEBUGFS'] |
@@ -176,10 +176,15 @@ IMAGE_LINGUAS ?= "de-de fr-fr en-gb" | |||
176 | 176 | ||
177 | LINGUAS_INSTALL ?= "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS').split()))}" | 177 | LINGUAS_INSTALL ?= "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS').split()))}" |
178 | 178 | ||
179 | # per default create a locale archive | ||
180 | IMAGE_LOCALES_ARCHIVE ?= '1' | ||
181 | |||
179 | # Prefer image, but use the fallback files for lookups if the image ones | 182 | # Prefer image, but use the fallback files for lookups if the image ones |
180 | # aren't yet available. | 183 | # aren't yet available. |
181 | PSEUDO_PASSWD = "${IMAGE_ROOTFS}:${STAGING_DIR_NATIVE}" | 184 | PSEUDO_PASSWD = "${IMAGE_ROOTFS}:${STAGING_DIR_NATIVE}" |
182 | 185 | ||
186 | PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/intercept_scripts,${WORKDIR}/oe-rootfs-repo,${WORKDIR}/sstate-build-image_complete" | ||
187 | |||
183 | PACKAGE_EXCLUDE ??= "" | 188 | PACKAGE_EXCLUDE ??= "" |
184 | PACKAGE_EXCLUDE[type] = "list" | 189 | PACKAGE_EXCLUDE[type] = "list" |
185 | 190 | ||
@@ -306,7 +311,7 @@ fakeroot python do_image_qa () { | |||
306 | except oe.utils.ImageQAFailed as e: | 311 | except oe.utils.ImageQAFailed as e: |
307 | qamsg = qamsg + '\tImage QA function %s failed: %s\n' % (e.name, e.description) | 312 | qamsg = qamsg + '\tImage QA function %s failed: %s\n' % (e.name, e.description) |
308 | except Exception as e: | 313 | except Exception as e: |
309 | qamsg = qamsg + '\tImage QA function %s failed\n' % cmd | 314 | qamsg = qamsg + '\tImage QA function %s failed: %s\n' % (cmd, e) |
310 | 315 | ||
311 | if qamsg: | 316 | if qamsg: |
312 | imgname = d.getVar('IMAGE_NAME') | 317 | imgname = d.getVar('IMAGE_NAME') |
@@ -432,7 +437,7 @@ python () { | |||
432 | localdata.delVar('DATETIME') | 437 | localdata.delVar('DATETIME') |
433 | localdata.delVar('DATE') | 438 | localdata.delVar('DATE') |
434 | localdata.delVar('TMPDIR') | 439 | localdata.delVar('TMPDIR') |
435 | vardepsexclude = (d.getVarFlag('IMAGE_CMD_' + realt, 'vardepsexclude', True) or '').split() | 440 | vardepsexclude = (d.getVarFlag('IMAGE_CMD_' + realt, 'vardepsexclude') or '').split() |
436 | for dep in vardepsexclude: | 441 | for dep in vardepsexclude: |
437 | localdata.delVar(dep) | 442 | localdata.delVar(dep) |
438 | 443 | ||
@@ -660,7 +665,7 @@ reproducible_final_image_task () { | |||
660 | fi | 665 | fi |
661 | # Set mtime of all files to a reproducible value | 666 | # Set mtime of all files to a reproducible value |
662 | bbnote "reproducible_final_image_task: mtime set to $REPRODUCIBLE_TIMESTAMP_ROOTFS" | 667 | bbnote "reproducible_final_image_task: mtime set to $REPRODUCIBLE_TIMESTAMP_ROOTFS" |
663 | find ${IMAGE_ROOTFS} -exec touch -h --date=@$REPRODUCIBLE_TIMESTAMP_ROOTFS {} \; | 668 | find ${IMAGE_ROOTFS} -print0 | xargs -0 touch -h --date=@$REPRODUCIBLE_TIMESTAMP_ROOTFS |
664 | fi | 669 | fi |
665 | } | 670 | } |
666 | 671 | ||