From d7fd56df0a4954954d6d0764ae06beb869e6b99a Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Thu, 11 Apr 2013 14:09:25 +0300 Subject: 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] Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- meta/recipes-devtools/dpkg/dpkg.inc | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'meta/recipes-devtools/dpkg') diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 6bb1e16617..555492089f 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -39,15 +39,6 @@ POSTLOG ?= "/var/log/postinstall.log" REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}" DPKG_INIT_POSITION ?= "98" -do_install_prepend () { - install -d ${D}/${sysconfdir}/rcS.d - # this happens at S98 where our good 'ole packages script used to run - echo "#!/bin/sh -dpkg --configure -a ${REDIRECT_CMD} -rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts -" > ${D}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts - chmod 0755 ${D}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts -} do_install_append () { if [ "${PN}" = "dpkg-native" ]; then @@ -67,6 +58,20 @@ do_install_append_class-native () { done } +pkg_postinst_${PN} () { +#!/bin/sh +if [ "x$D" != "x" ] && [ -f $D/var/lib/dpkg/status ]; then + install -d ${D}/${sysconfdir}/rcS.d + + # this happens at S98 where our good 'ole packages script used to run + echo "#!/bin/sh +dpkg --configure -a ${REDIRECT_CMD} +rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts +" > ${D}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts + chmod 0755 ${D}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts +fi +} + PROV = "virtual/update-alternatives" PROV_class-native = "" -- cgit v1.2.3