[oe-commits] Paul Eggleton : dpkg, opkg, rpm-postinsts: avoid repackaging when changing IMAGE_FEATURES

git at git.openembedded.org git at git.openembedded.org
Thu Apr 11 15:11:59 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: b4fbe4095de447ef4e426128bafaf8a292fa63e1
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b4fbe4095de447ef4e426128bafaf8a292fa63e1

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Thu Apr 11 15:55:15 2013 +0100

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].

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/dpkg/dpkg.inc        |    1 +
 meta/recipes-devtools/opkg/opkg.inc        |    1 +
 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 5554920..35cd6e7 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -37,6 +37,7 @@ do_configure () {
 
 POSTLOG ?= "/var/log/postinstall.log"
 REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}"
+REDIRECT_CMD[vardepsexclude] += "IMAGE_FEATURES POSTLOG"
 
 DPKG_INIT_POSITION ?= "98"
 
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index ff26b04..c1798b1 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -59,6 +59,7 @@ do_install_append_class-native() {
 
 POSTLOG ?= "/var/log/postinstall.log"
 REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}"
+REDIRECT_CMD[vardepsexclude] += "IMAGE_FEATURES POSTLOG"
 
 pkg_postinst_${PN} () {
 #!/bin/sh
diff --git a/meta/recipes-devtools/rpm/rpm-postinsts.bb b/meta/recipes-devtools/rpm/rpm-postinsts.bb
index b551c8d..a5310b5 100644
--- a/meta/recipes-devtools/rpm/rpm-postinsts.bb
+++ b/meta/recipes-devtools/rpm/rpm-postinsts.bb
@@ -13,6 +13,7 @@ POSTINSTALL_INITPOSITION ?= "98"
 
 POSTLOG ?= "/var/log/postinstall.log"
 REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>>${POSTLOG} 2>&1', '', d)}"
+REDIRECT_CMD[vardepsexclude] += "IMAGE_FEATURES POSTLOG"
 
 do_fetch() {
 	:





More information about the Openembedded-commits mailing list