diff options
author | Roxana Ciobanu <roxana.ciobanu@intel.com> | 2014-07-21 18:55:13 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-23 21:59:13 +0100 |
commit | 56bfda20f4d38373395b455d1e4b79b46d111a20 (patch) | |
tree | 9ec44d3da13f337346468eaf6176e4903ce20b77 /meta/classes | |
parent | f4456df240054dc96d19da5d117614f736da6b94 (diff) | |
download | poky-56bfda20f4d38373395b455d1e4b79b46d111a20.tar.gz |
image.bbclass/rootfs.py: add variables to rootfs[vardeps]
Added base variables and package backend specific variables to
rootfs[vardeps] in order for rootfs to rebuild when changes are made.
Set some variables as [func] to inform bitbake that they are shell
scripts, so that it invokes its shell dependency parsing. Without
marking them as functions, changes in the actual function body would
not trigger rootfs rebuilds.
[YOCTO #6502]
(From OE-Core rev: b8b6214b885a0757f0e628937f8fe21c92c45155)
Signed-off-by: Roxana Ciobanu <roxana.ciobanu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/image.bbclass | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 772c3ed993..da13bb8df9 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -75,7 +75,32 @@ LDCONFIGDEPEND_libc-musl = "" | |||
75 | do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}" | 75 | do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}" |
76 | do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot" | 76 | do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot" |
77 | do_rootfs[recrdeptask] += "do_packagedata" | 77 | do_rootfs[recrdeptask] += "do_packagedata" |
78 | do_rootfs[vardeps] += "BAD_RECOMMENDATIONS NO_RECOMMENDATIONS" | 78 | |
79 | def command_variables(d): | ||
80 | return ['ROOTFS_POSTPROCESS_COMMAND','ROOTFS_PREPROCESS_COMMAND','ROOTFS_POSTINSTALL_COMMAND','OPKG_PREPROCESS_COMMANDS','OPKG_POSTPROCESS_COMMANDS','IMAGE_POSTPROCESS_COMMAND', | ||
81 | 'IMAGE_PREPROCESS_COMMAND','ROOTFS_POSTPROCESS_COMMAND','POPULATE_SDK_POST_HOST_COMMAND','POPULATE_SDK_POST_TARGET_COMMAND','SDK_POSTPROCESS_COMMAND','RPM_PREPROCESS_COMMANDS', | ||
82 | 'RPM_POSTPROCESS_COMMANDS'] | ||
83 | |||
84 | python () { | ||
85 | variables = command_variables(d) | ||
86 | for var in variables: | ||
87 | if d.getVar(var): | ||
88 | d.setVarFlag(var, 'func', '1') | ||
89 | } | ||
90 | |||
91 | def rootfs_variables(d): | ||
92 | from oe.rootfs import variable_depends | ||
93 | variables = ['IMAGE_DEVICE_TABLES','BUILD_IMAGES_FROM_FEEDS','IMAGE_TYPEDEP_','IMAGE_TYPES_MASKED','IMAGE_ROOTFS_ALIGNMENT','IMAGE_OVERHEAD_FACTOR','IMAGE_ROOTFS_SIZE','IMAGE_ROOTFS_EXTRA_SPACE', | ||
94 | 'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','RM_OLD_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS','SDK_OS', | ||
95 | 'SDK_OUTPUT','SDKPATHNATIVE','SDKTARGETSYSROOT','SDK_DIR','SDK_VENDOR','SDKIMAGE_INSTALL_COMPLEMENTARY','SDK_PACKAGE_ARCHS','SDK_OUTPUT','SDKTARGETSYSROOT','MULTILIBRE_ALLOW_REP', | ||
96 | 'MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS','PACKAGE_ARCHS', | ||
97 | 'PACKAGE_CLASSES','TARGET_VENDOR','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','BUILDNAME','USE_DEVFS', | ||
98 | 'STAGING_KERNEL_DIR','COMPRESSIONTYPES'] | ||
99 | variables.extend(command_variables(d)) | ||
100 | variables.extend(variable_depends(d)) | ||
101 | return " ".join(variables) | ||
102 | |||
103 | do_rootfs[vardeps] += "${@rootfs_variables(d)}" | ||
79 | 104 | ||
80 | do_build[depends] += "virtual/kernel:do_deploy" | 105 | do_build[depends] += "virtual/kernel:do_deploy" |
81 | 106 | ||