summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-04-11 14:09:25 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-11 12:20:35 +0100
commit8b29120a8cdd92a0429f383f4811f7f84c6c350e (patch)
treed83f06a3bfb384626458b354ac521eb2db1ea7d1 /meta/recipes-devtools/rpm
parent44120a053c0cf2c7134bb1ee29854dddf28e4cf8 (diff)
downloadpoky-8b29120a8cdd92a0429f383f4811f7f84c6c350e.tar.gz
dpkg, opkg, rpm-postinst: fix overwriting the run-postinstall script
If multiple package managers are installed in the image, they will overwrite each other's run-postinsts script, resulting in postinstalls not beeing run at all at first boot. What this patch does: * checks whether opkg/dpks/rpm is actually used to install the packages and, only after, creates the run-postinsts script; * brings dpkg recipe in sync with opkg: moves the script creation from do_install to postinstall; * move creation of run-postinsts script (rpm-postinsts recipe) to the postinstall scriptlet in order to better control the creation of the script according to the package manager used; [YOCTO #4231] [YOCTO #4179] (From OE-Core rev: d7fd56df0a4954954d6d0764ae06beb869e6b99a) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm')
-rw-r--r--meta/recipes-devtools/rpm/rpm-postinsts.bb19
1 files changed, 12 insertions, 7 deletions
diff --git a/meta/recipes-devtools/rpm/rpm-postinsts.bb b/meta/recipes-devtools/rpm/rpm-postinsts.bb
index fb05ad6d51..b551c8d4f0 100644
--- a/meta/recipes-devtools/rpm/rpm-postinsts.bb
+++ b/meta/recipes-devtools/rpm/rpm-postinsts.bb
@@ -27,15 +27,17 @@ do_compile() {
27} 27}
28 28
29do_install() { 29do_install() {
30 install -d ${D}/${sysconfdir}/rcS.d 30 :
31 # Stop $i getting expanded below... 31}
32 i=\$i
33 cat > ${D}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << EOF
34#!/bin/sh
35 32
33pkg_postinst_${PN} () {
34if [ "x$D" != "x" ] && [ -f $D/var/lib/rpm/Packages ]; then
35 install -d $D/${sysconfdir}/rcS.d
36 cat > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << "EOF"
37#!/bin/sh
36. /etc/default/rcS 38. /etc/default/rcS
37 39
38[ -d /etc/rpm-postinsts ] && for i in \`ls /etc/rpm-postinsts/ \`; do 40[ -d /etc/rpm-postinsts ] && for i in `ls /etc/rpm-postinsts/`; do
39 i=/etc/rpm-postinsts/$i 41 i=/etc/rpm-postinsts/$i
40 echo "Running postinst $i..." 42 echo "Running postinst $i..."
41 if [ -f $i ] && $i ${REDIRECT_CMD}; then 43 if [ -f $i ] && $i ${REDIRECT_CMD}; then
@@ -46,5 +48,8 @@ do_install() {
46done 48done
47rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts 2>/dev/null 49rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts 2>/dev/null
48EOF 50EOF
49 chmod 0755 ${D}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts 51 chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
52fi
50} 53}
54
55ALLOW_EMPTY_${PN} = "1"