diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2011-02-09 18:13:50 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-12 00:31:43 +0000 |
| commit | 92a9d59fccdfb6587fbd12f686899a8ace5e1d2f (patch) | |
| tree | ee21a7f2eff64edb141297e75cfda174b8e45bf9 /meta/recipes-connectivity | |
| parent | 6f6bffe5df1edf10056f42d2c95ae68b6bb918f9 (diff) | |
| download | poky-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>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb | 4 |
2 files changed, 4 insertions, 4 deletions
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" | |||
| 25 | EXTRA_OECONF = "--libdir=/lib --disable-lynx --enable-avahi" | 25 | EXTRA_OECONF = "--libdir=/lib --disable-lynx --enable-avahi" |
| 26 | 26 | ||
| 27 | # TODO: pattern based configuration update | 27 | # TODO: pattern based configuration update |
| 28 | pkg_postinst () { | 28 | pkg_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 | ||
| 35 | pkg_prerm () { | 35 | pkg_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 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() { | |||
| 20 | 20 | ||
| 21 | PACKAGE_ARCH = "all" | 21 | PACKAGE_ARCH = "all" |
| 22 | 22 | ||
| 23 | pkg_postinst() { | 23 | pkg_postinst_${PN} () { |
| 24 | if test "x$D" != "x"; then | 24 | if test "x$D" != "x"; then |
| 25 | exit 1 | 25 | exit 1 |
| 26 | else | 26 | else |
| @@ -28,7 +28,7 @@ else | |||
| 28 | fi | 28 | fi |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | pkg_postrm() { | 31 | pkg_postrm_${PN} () { |
| 32 | if test "x$D" != "x"; then | 32 | if test "x$D" != "x"; then |
| 33 | exit 1 | 33 | exit 1 |
| 34 | else | 34 | else |
