diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2012-03-23 17:37:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-23 17:47:40 +0000 |
commit | 180d7d391dab2dd1666d4524e558cc45d2c647fc (patch) | |
tree | ae0b18190f60a5f7bdfb61e53e2e8902155c11f4 | |
parent | e86605c69c66a047b60c2ee0638d71ca46dadf24 (diff) | |
download | poky-180d7d391dab2dd1666d4524e558cc45d2c647fc.tar.gz |
ppp: drop unneeded pkg-postinst
* pkg-postinst was used to make pppd setuid root, which
can now be done in do_install() instead.
(From OE-Core rev: bc5d5457ab2d7191db343cfcb2bf3a5c8cd24a93)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp_2.4.5.bb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb index 9232e6fdce..6af0d42e22 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77 | |||
10 | file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ | 10 | file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ |
11 | file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ | 11 | file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ |
12 | file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2" | 12 | file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2" |
13 | PR = "r3" | 13 | PR = "r4" |
14 | 14 | ||
15 | SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ | 15 | SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ |
16 | file://makefile.patch \ | 16 | file://makefile.patch \ |
@@ -49,6 +49,7 @@ do_install_append () { | |||
49 | install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/ | 49 | install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/ |
50 | install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/ | 50 | install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/ |
51 | rm -rf ${D}/${mandir}/man8/man8 | 51 | rm -rf ${D}/${mandir}/man8/man8 |
52 | chmod u+s ${D}${sbindir}/pppd | ||
52 | } | 53 | } |
53 | 54 | ||
54 | CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" | 55 | CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" |
@@ -72,11 +73,3 @@ DESCRIPTION_${PN}-minconn = "Plugin for PPP to specify a minimum connect time b | |||
72 | DESCRIPTION_${PN}-password = "Plugin for PPP to get passwords via a pipe" | 73 | DESCRIPTION_${PN}-password = "Plugin for PPP to get passwords via a pipe" |
73 | DESCRIPTION_${PN}-l2tp = "Plugin for PPP for l2tp support" | 74 | DESCRIPTION_${PN}-l2tp = "Plugin for PPP for l2tp support" |
74 | DESCRIPTION_${PN}-tools = "The pppdump and pppstats utitilities" | 75 | DESCRIPTION_${PN}-tools = "The pppdump and pppstats utitilities" |
75 | |||
76 | pkg_postinst_${PN}() { | ||
77 | if test "x$D" != "x"; then | ||
78 | exit 1 | ||
79 | else | ||
80 | chmod u+s ${sbindir}/pppd | ||
81 | fi | ||
82 | } | ||