summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-02-10 00:13:50 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-12 00:31:43 (GMT)
commit92a9d59fccdfb6587fbd12f686899a8ace5e1d2f (patch)
treeee21a7f2eff64edb141297e75cfda174b8e45bf9
parent6f6bffe5df1edf10056f42d2c95ae68b6bb918f9 (diff)
downloadpoky-92a9d59fccdfb6587fbd12f686899a8ace5e1d2f.tar.gz
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 <mark.hatle@windriver.com>
-rw-r--r--meta/recipes-bsp/hostap/hostap-conf_1.0.bb4
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb4
-rw-r--r--meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb4
-rw-r--r--meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb4
-rw-r--r--meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb4
-rw-r--r--meta/recipes-core/base-passwd/base-passwd_3.5.22.bb2
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc4
-rw-r--r--meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb4
-rw-r--r--meta/recipes-extended/bash/bash.inc2
-rw-r--r--meta/recipes-extended/bash/bash_3.2.48.bb2
-rw-r--r--meta/recipes-extended/sudo/sudo.inc2
-rw-r--r--meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb2
-rw-r--r--meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb2
-rw-r--r--meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb2
-rw-r--r--meta/recipes-kernel/update-modules/update-modules_1.0.bb2
15 files changed, 22 insertions, 22 deletions
diff --git a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
index fa29470..de72b76 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() {
19 install -m 0644 ${WORKDIR}/hostap_cs.modalias ${D}${sysconfdir}/modutils/hostap_cs.conf 19 install -m 0644 ${WORKDIR}/hostap_cs.modalias ${D}${sysconfdir}/modutils/hostap_cs.conf
20} 20}
21 21
22pkg_postinst () { 22pkg_postinst_${PN} () {
23 if [ -n "$D" ]; then 23 if [ -n "$D" ]; then
24 exit 1 24 exit 1
25 fi 25 fi
26 update-modules || true 26 update-modules || true
27} 27}
28 28
29pkg_postrm () { 29pkg_postrm_${PN} () {
30 update-modules || true 30 update-modules || true
31} 31}
diff --git a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
index 6d08084..4cefdb7 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() {
28 install -m 0755 src/lrz src/lsz ${D}${bindir}/ 28 install -m 0755 src/lrz src/lsz ${D}${bindir}/
29} 29}
30 30
31pkg_postinst() { 31pkg_postinst_${PN}() {
32 for util in rz rx rb sz sx sb; do 32 for util in rz rx rb sz sx sb; do
33 update-alternatives --install ${bindir}/$util $util lrz 100 33 update-alternatives --install ${bindir}/$util $util lrz 100
34 done 34 done
35} 35}
36 36
37pkg_postrm() { 37pkg_postrm_${PN}() {
38 for util in rz rx rb sz sx sb; do 38 for util in rz rx rb sz sx sb; do
39 update-alternatives --remove $util ${bindir}/lrz 39 update-alternatives --remove $util ${bindir}/lrz
40 done 40 done
diff --git a/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb b/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb
index a24d004..1c25e02 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() {
15 install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/ 15 install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/
16} 16}
17 17
18pkg_postinst () { 18pkg_postinst_${PN} () {
19 if [ -n "$D" ]; then 19 if [ -n "$D" ]; then
20 exit 1 20 exit 1
21 fi 21 fi
22 update-modules || true 22 update-modules || true
23} 23}
24 24
25pkg_postrm () { 25pkg_postrm_${PN} () {
26 update-modules || true 26 update-modules || true
27} 27}
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 4c94d2a..b04b20a 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"
25EXTRA_OECONF = "--libdir=/lib --disable-lynx --enable-avahi" 25EXTRA_OECONF = "--libdir=/lib --disable-lynx --enable-avahi"
26 26
27# TODO: pattern based configuration update 27# TODO: pattern based configuration update
28pkg_postinst () { 28pkg_postinst_${PN} () {
29 cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { 29 cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && {
30 cat /etc/nsswitch.conf | sed 's/hosts:\s*files dns/& mdns4/' > /tmp/nsswitch.conf 30 cat /etc/nsswitch.conf | sed 's/hosts:\s*files dns/& mdns4/' > /tmp/nsswitch.conf
31 mv /tmp/nsswitch.conf /etc/nsswitch.conf 31 mv /tmp/nsswitch.conf /etc/nsswitch.conf
32 } 32 }
33} 33}
34 34
35pkg_prerm () { 35pkg_prerm_${PN} () {
36 cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns4$" > /dev/null && { 36 cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns4$" > /dev/null && {
37 cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files dns\) mdns4*/\1/' > /tmp/nsswitch.conf 37 cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files dns\) mdns4*/\1/' > /tmp/nsswitch.conf
38 mv /tmp/nsswitch.conf /etc/nsswitch.conf 38 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 aa3684a..f57597d 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() {
20 20
21PACKAGE_ARCH = "all" 21PACKAGE_ARCH = "all"
22 22
23pkg_postinst() { 23pkg_postinst_${PN} () {
24if test "x$D" != "x"; then 24if test "x$D" != "x"; then
25 exit 1 25 exit 1
26else 26else
@@ -28,7 +28,7 @@ else
28fi 28fi
29} 29}
30 30
31pkg_postrm() { 31pkg_postrm_${PN} () {
32if test "x$D" != "x"; then 32if test "x$D" != "x"; then
33 exit 1 33 exit 1
34else 34else
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 b826367..aed8491 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() {
40} 40}
41 41
42 42
43pkg_postinst () { 43pkg_postinst_${PN} () {
44 set -e 44 set -e
45 45
46 if [ ! -e $D${sysconfdir}/passwd ] ; then 46 if [ ! -e $D${sysconfdir}/passwd ] ; then
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index dd2f0c5..ab7719c 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -63,12 +63,12 @@ do_install() {
63 chmod 755 ${D}${sysconfdir}/init.d/dropbear 63 chmod 755 ${D}${sysconfdir}/init.d/dropbear
64} 64}
65 65
66pkg_postinst () { 66pkg_postinst_${PN} () {
67 update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20 67 update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20
68 update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20 68 update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20
69} 69}
70 70
71pkg_postrm_append () { 71pkg_postrm_append_${PN} () {
72 if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then 72 if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
73 rm ${sysconfdir}/dropbear/dropbear_rsa_host_key 73 rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
74 fi 74 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 92014a8..63e0acd 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() {
31 31
32FILES_sgml-common_append = " ${datadir}/sgml" 32FILES_sgml-common_append = " ${datadir}/sgml"
33 33
34pkg_postinst() { 34pkg_postinst_${PN}() {
35 install-catalog \ 35 install-catalog \
36 --add ${sysconfdir}/sgml/sgml-ent.cat \ 36 --add ${sysconfdir}/sgml/sgml-ent.cat \
37 ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog 37 ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog
@@ -41,7 +41,7 @@ pkg_postinst() {
41 ${sysconfdir}/sgml/sgml-ent.cat 41 ${sysconfdir}/sgml/sgml-ent.cat
42} 42}
43 43
44pkg_postrm() { 44pkg_postrm_${PN}() {
45 install-catalog \ 45 install-catalog \
46 --remove ${sysconfdir}/sgml/sgml-ent.cat \ 46 --remove ${sysconfdir}/sgml/sgml-ent.cat \
47 ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog 47 ${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 a87b87f..ecbd75d 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -27,7 +27,7 @@ do_configure () {
27 oe_runconf 27 oe_runconf
28} 28}
29 29
30pkg_postinst () { 30pkg_postinst_${PN} () {
31 touch $D${sysconfdir}/shells 31 touch $D${sysconfdir}/shells
32 grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells 32 grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells
33 grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells 33 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 e5a3e36..0912ad6 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 () {
28 oe_runconf 28 oe_runconf
29} 29}
30 30
31pkg_postinst () { 31pkg_postinst_${PN} () {
32 touch $D${sysconfdir}/shells 32 touch $D${sysconfdir}/shells
33 grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells 33 grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells
34 grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells 34 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 1407bf1..6a04a9c 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -23,7 +23,7 @@ do_configure_prepend () {
23 fi 23 fi
24} 24}
25 25
26pkg_postinst() { 26pkg_postinst_${PN} () {
27 if [ "x$D" != "x" ]; then 27 if [ "x$D" != "x" ]; then
28 exit 1 28 exit 1
29 fi 29 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 12d9d86..c50d6eb 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 () {
32 install -m 0644 License.txt ${D}${datadir}/doc/${PN}/ 32 install -m 0644 License.txt ${D}${datadir}/doc/${PN}/
33} 33}
34 34
35pkg_postinst () { 35pkg_postinst_${PN} () {
36#!/bin/sh 36#!/bin/sh
37fc-cache 37fc-cache
38} 38}
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 887536a..f6bf0ce 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 () {
33 install -m 0644 License.txt ${D}${datadir}/doc/${PN}/ 33 install -m 0644 License.txt ${D}${datadir}/doc/${PN}/
34} 34}
35 35
36pkg_postinst () { 36pkg_postinst_${PN} () {
37#!/bin/sh 37#!/bin/sh
38fc-cache 38fc-cache
39} 39}
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 b9a75a7..bdeb4c1 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 () {
31 done 31 done
32} 32}
33 33
34pkg_postinst () { 34pkg_postinst_${PN} () {
35#!/bin/sh 35#!/bin/sh
36fc-cache 36fc-cache
37} 37}
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 a473bb5..a8ebbda 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"
10SRC_URI = "file://update-modules \ 10SRC_URI = "file://update-modules \
11 file://COPYING.GPL" 11 file://COPYING.GPL"
12 12
13pkg_postinst() { 13pkg_postinst_${PN} () {
14if [ "x$D" != "x" ]; then 14if [ "x$D" != "x" ]; then
15 exit 1 15 exit 1
16fi 16fi