summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-04-11 15:55:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-11 16:14:01 +0100
commitc14122abe2acebeac5134fee71b1931bde736b85 (patch)
treebccc66f22b93d734bc445c32f2e13960621d1b0d /meta
parent83cc3abf34ddffd6b59d6f7ec8da077532a32f2f (diff)
downloadpoky-c14122abe2acebeac5134fee71b1931bde736b85.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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc1
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc1
-rw-r--r--meta/recipes-devtools/rpm/rpm-postinsts.bb1
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
38POSTLOG ?= "/var/log/postinstall.log" 38POSTLOG ?= "/var/log/postinstall.log"
39REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}" 39REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}"
40REDIRECT_CMD[vardepsexclude] += "IMAGE_FEATURES POSTLOG"
40 41
41DPKG_INIT_POSITION ?= "98" 42DPKG_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
60POSTLOG ?= "/var/log/postinstall.log" 60POSTLOG ?= "/var/log/postinstall.log"
61REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}" 61REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}"
62REDIRECT_CMD[vardepsexclude] += "IMAGE_FEATURES POSTLOG"
62 63
63pkg_postinst_${PN} () { 64pkg_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
14POSTLOG ?= "/var/log/postinstall.log" 14POSTLOG ?= "/var/log/postinstall.log"
15REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>>${POSTLOG} 2>&1', '', d)}" 15REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>>${POSTLOG} 2>&1', '', d)}"
16REDIRECT_CMD[vardepsexclude] += "IMAGE_FEATURES POSTLOG"
16 17
17do_fetch() { 18do_fetch() {
18 : 19 :