summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-04-10 11:21:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-10 16:49:24 +0100
commitaa22868eba066a7bcea8f20bd0c70e215fd6424d (patch)
tree55aeac6df7bd58606117f4227658f97544bb01bb /meta
parentb52a4d3f088136c1347bf4d2ad2cc052d87ba2b6 (diff)
downloadpoky-aa22868eba066a7bcea8f20bd0c70e215fd6424d.tar.gz
rpm-postinsts: don't create broken postinst script
Not only was the variable reference in this line broken, but it wasn't going to work anyway - we install the script directly into /etc/rcS.d and not into /etc/init.d, so the code in update-rc.d.bbclass couldn't find anything there. This resulted in a postinstall script for rpm-postinsts being created in /etc/rpm-postinsts which can't work when the root filesystem is read-only. To simplify things just remove the use of update-rc.d.bbclass since we don't really need the added complexity here. Fixes [YOCTO #4222]. (From OE-Core rev: d196d08acafe599c16a7ac8e04121039b1216ba6) 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/rpm/rpm-postinsts.bb5
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/recipes-devtools/rpm/rpm-postinsts.bb b/meta/recipes-devtools/rpm/rpm-postinsts.bb
index 27ef2aa384..0a62da0c3c 100644
--- a/meta/recipes-devtools/rpm/rpm-postinsts.bb
+++ b/meta/recipes-devtools/rpm/rpm-postinsts.bb
@@ -5,15 +5,12 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1
5 5
6RDEPENDS_${PN} = "base-files" 6RDEPENDS_${PN} = "base-files"
7 7
8inherit update-rc.d allarch 8inherit allarch
9# 9#
10# Allow distributions to alter when [postponed] package install scripts are run 10# Allow distributions to alter when [postponed] package install scripts are run
11# 11#
12POSTINSTALL_INITPOSITION ?= "98" 12POSTINSTALL_INITPOSITION ?= "98"
13 13
14INITSCRIPT_NAME = "run-postinsts"
15INITSCRIPT_PARAMS = "start ${{POSTINSTALL_INITPOSITION} S ."
16
17POSTLOG ?= "/var/log/postinstall.log" 14POSTLOG ?= "/var/log/postinstall.log"
18REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>>${POSTLOG} 2>&1', '', d)}" 15REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>>${POSTLOG} 2>&1', '', d)}"
19 16