diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-04-11 15:55:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-11 16:13:58 +0100 |
commit | f3dbf8f674930cc9035e5f7da5528611cf1c6d25 (patch) | |
tree | ee759ffc03fc6a816321dbb5f7eba1e3e55f6188 | |
parent | 2d94f1bde7c63b56b33bef34573211ecbeffaf44 (diff) | |
download | poky-f3dbf8f674930cc9035e5f7da5528611cf1c6d25.tar.gz |
dpkg, opkg, rpm-postinsts: avoid repackaging when changing IMAGE_FEATURES
Recipes cannot depend on the value of IMAGE_FEATURES; in this case the
result is do_package task signatures changing every time IMAGE_FEATURES
changes, causing a large number of task re-executions. The
implementation of the log capturing really needs to be changed to
capture these in a different place and possibly not even conditional
upon IMAGE_FEATURES at all, but this will be invasive at this point in
the development cycle. For now, remove the variable dependencies to fix
the immediate problem.
Fixes [YOCTO #4246].
(From OE-Core rev: b4fbe4095de447ef4e426128bafaf8a292fa63e1)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg/opkg.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpm-postinsts.bb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 555492089f..35cd6e71b8 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc | |||
@@ -37,6 +37,7 @@ do_configure () { | |||
37 | 37 | ||
38 | POSTLOG ?= "/var/log/postinstall.log" | 38 | POSTLOG ?= "/var/log/postinstall.log" |
39 | REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}" | 39 | REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}" |
40 | REDIRECT_CMD[vardepsexclude] += "IMAGE_FEATURES POSTLOG" | ||
40 | 41 | ||
41 | DPKG_INIT_POSITION ?= "98" | 42 | DPKG_INIT_POSITION ?= "98" |
42 | 43 | ||
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc index ff26b04b6e..c1798b1623 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc | |||
@@ -59,6 +59,7 @@ do_install_append_class-native() { | |||
59 | 59 | ||
60 | POSTLOG ?= "/var/log/postinstall.log" | 60 | POSTLOG ?= "/var/log/postinstall.log" |
61 | REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}" | 61 | REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}" |
62 | REDIRECT_CMD[vardepsexclude] += "IMAGE_FEATURES POSTLOG" | ||
62 | 63 | ||
63 | pkg_postinst_${PN} () { | 64 | pkg_postinst_${PN} () { |
64 | #!/bin/sh | 65 | #!/bin/sh |
diff --git a/meta/recipes-devtools/rpm/rpm-postinsts.bb b/meta/recipes-devtools/rpm/rpm-postinsts.bb index b551c8d4f0..a5310b53bf 100644 --- a/meta/recipes-devtools/rpm/rpm-postinsts.bb +++ b/meta/recipes-devtools/rpm/rpm-postinsts.bb | |||
@@ -13,6 +13,7 @@ POSTINSTALL_INITPOSITION ?= "98" | |||
13 | 13 | ||
14 | POSTLOG ?= "/var/log/postinstall.log" | 14 | POSTLOG ?= "/var/log/postinstall.log" |
15 | REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>>${POSTLOG} 2>&1', '', d)}" | 15 | REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>>${POSTLOG} 2>&1', '', d)}" |
16 | REDIRECT_CMD[vardepsexclude] += "IMAGE_FEATURES POSTLOG" | ||
16 | 17 | ||
17 | do_fetch() { | 18 | do_fetch() { |
18 | : | 19 | : |