summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-10-25 12:40:40 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-10-25 12:40:40 +0000
commit7528a04f9dc05b447a0e652722442562df36da11 (patch)
treee12d8c2bd7c2d0b44b24a76233c5495dd3809ab7
parented8ca891d503f638f36f18569cb1ae9a40b4022a (diff)
downloadpoky-7528a04f9dc05b447a0e652722442562df36da11.tar.gz
ppp: sync with OE (no package changes, PR bump)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2964 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/ppp/ppp_2.4.3.bb16
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/packages/ppp/ppp_2.4.3.bb b/meta/packages/ppp/ppp_2.4.3.bb
index 2897f63804..71c68c2fb8 100644
--- a/meta/packages/ppp/ppp_2.4.3.bb
+++ b/meta/packages/ppp/ppp_2.4.3.bb
@@ -3,9 +3,9 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon"
3HOMEPAGE = "http://samba.org/ppp/" 3HOMEPAGE = "http://samba.org/ppp/"
4DEPENDS = "libpcap" 4DEPENDS = "libpcap"
5LICENSE = "BSD GPLv2" 5LICENSE = "BSD GPLv2"
6PR = "r2" 6PR = "r3"
7 7
8SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \ 8SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
9 file://makefile.patch;patch=1 \ 9 file://makefile.patch;patch=1 \
10 file://cifdefroute.patch;patch=1 \ 10 file://cifdefroute.patch;patch=1 \
11 file://pppd-resolv-varrun.patch;patch=1 \ 11 file://pppd-resolv-varrun.patch;patch=1 \
@@ -20,7 +20,7 @@ SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \
20 file://ip-down \ 20 file://ip-down \
21 file://08setupdns \ 21 file://08setupdns \
22 file://92removedns" 22 file://92removedns"
23 23
24SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1" 24SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1"
25 25
26inherit autotools 26inherit autotools
@@ -28,6 +28,10 @@ inherit autotools
28EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin" 28EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin"
29EXTRA_OECONF = "--disable-strip" 29EXTRA_OECONF = "--disable-strip"
30 30
31do_stage () {
32 make INCDIR=${STAGING_INCDIR} install-devel
33}
34
31do_install_append () { 35do_install_append () {
32 make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp 36 make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp
33 mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d 37 mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d
@@ -43,15 +47,11 @@ do_install_append () {
43 rm -rf ${D}/${mandir}/man8/man8 47 rm -rf ${D}/${mandir}/man8/man8
44} 48}
45 49
46do_stage () {
47 make INCDIR=${STAGING_INCDIR} install-devel
48}
49
50CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" 50CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
51PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools" 51PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
52FILES_${PN} = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd" 52FILES_${PN} = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd"
53FILES_${PN}-dbg += "/usr/lib/pppd/2.4.3/.debug"
54FILES_${PN}_nylon = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd /usr/sbin/tdbread" 53FILES_${PN}_nylon = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd /usr/sbin/tdbread"
54FILES_${PN}-dbg += "${libdir}/pppd/2.4.3/.debug"
55FILES_ppp-oa = "/usr/lib/pppd/2.4.3/pppoatm.so" 55FILES_ppp-oa = "/usr/lib/pppd/2.4.3/pppoatm.so"
56FILES_ppp-oe = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so" 56FILES_ppp-oe = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so"
57FILES_ppp-radius = "/usr/lib/pppd/2.4.3/radius.so /usr/lib/pppd/2.4.3/radattr.so /usr/lib/pppd/2.4.3/radrealms.so" 57FILES_ppp-radius = "/usr/lib/pppd/2.4.3/radius.so /usr/lib/pppd/2.4.3/radattr.so /usr/lib/pppd/2.4.3/radrealms.so"