diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-04-11 14:09:25 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-11 12:20:35 +0100 |
| commit | 8b29120a8cdd92a0429f383f4811f7f84c6c350e (patch) | |
| tree | d83f06a3bfb384626458b354ac521eb2db1ea7d1 /meta/recipes-devtools/rpm | |
| parent | 44120a053c0cf2c7134bb1ee29854dddf28e4cf8 (diff) | |
| download | ast2050-yocto-poky-8b29120a8cdd92a0429f383f4811f7f84c6c350e.zip ast2050-yocto-poky-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.bb | 19 |
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 fb05ad6..b551c8d 100644 --- a/meta/recipes-devtools/rpm/rpm-postinsts.bb +++ b/meta/recipes-devtools/rpm/rpm-postinsts.bb @@ -27,15 +27,17 @@ do_compile() { } do_install() { - install -d ${D}/${sysconfdir}/rcS.d - # Stop $i getting expanded below... - i=\$i - cat > ${D}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << EOF -#!/bin/sh + : +} +pkg_postinst_${PN} () { +if [ "x$D" != "x" ] && [ -f $D/var/lib/rpm/Packages ]; then + install -d $D/${sysconfdir}/rcS.d + cat > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << "EOF" +#!/bin/sh . /etc/default/rcS -[ -d /etc/rpm-postinsts ] && for i in \`ls /etc/rpm-postinsts/ \`; do +[ -d /etc/rpm-postinsts ] && for i in `ls /etc/rpm-postinsts/`; do i=/etc/rpm-postinsts/$i echo "Running postinst $i..." if [ -f $i ] && $i ${REDIRECT_CMD}; then @@ -46,5 +48,8 @@ do_install() { done rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts 2>/dev/null EOF - chmod 0755 ${D}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts + chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts +fi } + +ALLOW_EMPTY_${PN} = "1" |
