From 92a9d59fccdfb6587fbd12f686899a8ace5e1d2f Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 9 Feb 2011 18:13:50 -0600 Subject: recipes: pre/post actions A number of the recipes did not properly label their pre and post actions, causing the actions to occur in all split packages. This was corrected by defaulting to _${PN} in most cases. Signed-off-by: Mark Hatle --- meta/recipes-bsp/hostap/hostap-conf_1.0.bb | 4 ++-- meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb | 4 ++-- meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb | 4 ++-- meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb | 4 ++-- meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb | 4 ++-- meta/recipes-core/base-passwd/base-passwd_3.5.22.bb | 2 +- meta/recipes-core/dropbear/dropbear.inc | 4 ++-- meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb | 4 ++-- meta/recipes-extended/bash/bash.inc | 2 +- meta/recipes-extended/bash/bash_3.2.48.bb | 2 +- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb | 2 +- meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb | 2 +- meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb | 2 +- meta/recipes-kernel/update-modules/update-modules_1.0.bb | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) (limited to 'meta') diff --git a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb index fa29470485..de72b769a9 100644 --- a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb +++ b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb @@ -19,13 +19,13 @@ do_install() { install -m 0644 ${WORKDIR}/hostap_cs.modalias ${D}${sysconfdir}/modutils/hostap_cs.conf } -pkg_postinst () { +pkg_postinst_${PN} () { if [ -n "$D" ]; then exit 1 fi update-modules || true } -pkg_postrm () { +pkg_postrm_${PN} () { update-modules || true } diff --git a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb index 6d08084b19..4cefdb7966 100644 --- a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb +++ b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb @@ -28,13 +28,13 @@ do_install() { install -m 0755 src/lrz src/lsz ${D}${bindir}/ } -pkg_postinst() { +pkg_postinst_${PN}() { for util in rz rx rb sz sx sb; do update-alternatives --install ${bindir}/$util $util lrz 100 done } -pkg_postrm() { +pkg_postrm_${PN}() { for util in rz rx rb sz sx sb; do update-alternatives --remove $util ${bindir}/lrz done diff --git a/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb b/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb index a24d004adb..1c25e02dcc 100644 --- a/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb +++ b/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb @@ -15,13 +15,13 @@ do_install() { install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/ } -pkg_postinst () { +pkg_postinst_${PN} () { if [ -n "$D" ]; then exit 1 fi update-modules || true } -pkg_postrm () { +pkg_postrm_${PN} () { update-modules || true } diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb index 4c94d2aeaf..b04b20abee 100644 --- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb +++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb @@ -25,14 +25,14 @@ DEBIANNAME_${PN} = "libnss-mdns" EXTRA_OECONF = "--libdir=/lib --disable-lynx --enable-avahi" # TODO: pattern based configuration update -pkg_postinst () { +pkg_postinst_${PN} () { cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { cat /etc/nsswitch.conf | sed 's/hosts:\s*files dns/& mdns4/' > /tmp/nsswitch.conf mv /tmp/nsswitch.conf /etc/nsswitch.conf } } -pkg_prerm () { +pkg_prerm_${PN} () { cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns4$" > /dev/null && { cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files dns\) mdns4*/\1/' > /tmp/nsswitch.conf mv /tmp/nsswitch.conf /etc/nsswitch.conf diff --git a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb index aa3684a440..f57597d80c 100644 --- a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb @@ -20,7 +20,7 @@ do_install() { PACKAGE_ARCH = "all" -pkg_postinst() { +pkg_postinst_${PN} () { if test "x$D" != "x"; then exit 1 else @@ -28,7 +28,7 @@ else fi } -pkg_postrm() { +pkg_postrm_${PN} () { if test "x$D" != "x"; then exit 1 else diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb index b8263671de..aed84914bf 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb @@ -40,7 +40,7 @@ do_install_append_openmn() { } -pkg_postinst () { +pkg_postinst_${PN} () { set -e if [ ! -e $D${sysconfdir}/passwd ] ; then diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index dd2f0c5b53..ab7719c469 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc @@ -63,12 +63,12 @@ do_install() { chmod 755 ${D}${sysconfdir}/init.d/dropbear } -pkg_postinst () { +pkg_postinst_${PN} () { update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20 update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20 } -pkg_postrm_append () { +pkg_postrm_append_${PN} () { if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then rm ${sysconfdir}/dropbear/dropbear_rsa_host_key fi diff --git a/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb b/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb index 92014a80ee..63e0acdba7 100644 --- a/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb +++ b/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb @@ -31,7 +31,7 @@ do_compile_append() { FILES_sgml-common_append = " ${datadir}/sgml" -pkg_postinst() { +pkg_postinst_${PN}() { install-catalog \ --add ${sysconfdir}/sgml/sgml-ent.cat \ ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog @@ -41,7 +41,7 @@ pkg_postinst() { ${sysconfdir}/sgml/sgml-ent.cat } -pkg_postrm() { +pkg_postrm_${PN}() { install-catalog \ --remove ${sysconfdir}/sgml/sgml-ent.cat \ ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index a87b87ff4b..ecbd75dadd 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc @@ -27,7 +27,7 @@ do_configure () { oe_runconf } -pkg_postinst () { +pkg_postinst_${PN} () { touch $D${sysconfdir}/shells grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb index e5a3e3643d..0912ad6aa8 100644 --- a/meta/recipes-extended/bash/bash_3.2.48.bb +++ b/meta/recipes-extended/bash/bash_3.2.48.bb @@ -28,7 +28,7 @@ do_configure () { oe_runconf } -pkg_postinst () { +pkg_postinst_${PN} () { touch $D${sysconfdir}/shells grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 1407bf10c5..6a04a9c0b0 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -23,7 +23,7 @@ do_configure_prepend () { fi } -pkg_postinst() { +pkg_postinst_${PN} () { if [ "x$D" != "x" ]; then exit 1 fi diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb index 12d9d86721..c50d6eb3ff 100644 --- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb +++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb @@ -32,7 +32,7 @@ do_install () { install -m 0644 License.txt ${D}${datadir}/doc/${PN}/ } -pkg_postinst () { +pkg_postinst_${PN} () { #!/bin/sh fc-cache } diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb index 887536a4f0..f6bf0ce66f 100644 --- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb +++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb @@ -33,7 +33,7 @@ do_install () { install -m 0644 License.txt ${D}${datadir}/doc/${PN}/ } -pkg_postinst () { +pkg_postinst_${PN} () { #!/bin/sh fc-cache } diff --git a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb index b9a75a77bb..bdeb4c19b5 100644 --- a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb +++ b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb @@ -31,7 +31,7 @@ do_install () { done } -pkg_postinst () { +pkg_postinst_${PN} () { #!/bin/sh fc-cache } diff --git a/meta/recipes-kernel/update-modules/update-modules_1.0.bb b/meta/recipes-kernel/update-modules/update-modules_1.0.bb index a473bb58c7..a8ebbdaebd 100644 --- a/meta/recipes-kernel/update-modules/update-modules_1.0.bb +++ b/meta/recipes-kernel/update-modules/update-modules_1.0.bb @@ -10,7 +10,7 @@ PR = "r8" SRC_URI = "file://update-modules \ file://COPYING.GPL" -pkg_postinst() { +pkg_postinst_${PN} () { if [ "x$D" != "x" ]; then exit 1 fi -- cgit v1.2.3-54-g00ecf