dpkg, opkg, rpm-postinsts: avoid repackaging when changing IMAGE_FEATURES

PATCH New Paul Eggleton 1 participant 1 message Apr 11, 2013

Share & tools

Paul Eggleton

author

2013-04-11 15:13 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 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(+)

meta/recipes-devtools/dpkg/dpkg.inc +1 -0

index 5554920..35cd6e7 100644
@@ -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"

meta/recipes-devtools/opkg/opkg.inc +1 -0

index ff26b04..c1798b1 100644
@@ -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

meta/recipes-devtools/rpm/rpm-postinsts.bb +1 -0

index b551c8d..a5310b5 100644
@@ -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() {
 	:

Signature · 1 line

1.7.10.4