summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/ppp
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-07-01 18:17:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-01 22:27:25 (GMT)
commita3afabae30134312791536b003aa4a48b7f3bb19 (patch)
tree4779b1a3cc1139bc4109255435dfd8f0999b3c92 /meta/recipes-connectivity/ppp
parent46c11ac20e226a1ebb3947ae948339ab16e6dbc9 (diff)
downloadpoky-a3afabae30134312791536b003aa4a48b7f3bb19.tar.gz
ppp: sync packaging with OE .dev
This fixes the QA errors and the 2.4.3 vs 2.4.5 copy/paste mistake (From OE-Core rev: 5318816a018165052f1aa647e3b7e2a1e6c701f7) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/ppp')
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.5.bb26
1 files changed, 14 insertions, 12 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
index b865afd..72464bf 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"
13PR = "r1" 13PR = "r2"
14 14
15SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ 15SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
16 file://makefile.patch \ 16 file://makefile.patch \
@@ -31,7 +31,8 @@ SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230
31 31
32inherit autotools 32inherit autotools
33 33
34EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin" 34TARGET_CC_ARCH += " ${LDFLAGS}"
35EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}"
35EXTRA_OECONF = "--disable-strip" 36EXTRA_OECONF = "--disable-strip"
36 37
37do_install_append () { 38do_install_append () {
@@ -50,16 +51,17 @@ do_install_append () {
50} 51}
51 52
52CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" 53CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
53PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools" 54PACKAGES =+ "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
54FILES_${PN} = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd" 55FILES_${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd"
55FILES_${PN}-dbg += "${libdir}/pppd/2.4.3/.debug" 56FILES_${PN}_nylon = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${sbindir}/tdbread"
56FILES_ppp-oa = "/usr/lib/pppd/2.4.3/pppoatm.so" 57FILES_${PN}-dbg += "${libdir}/pppd/${PV}/.debug"
57FILES_ppp-oe = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so" 58FILES_${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so"
58FILES_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" 59FILES_${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/rp-pppoe.so"
59FILES_ppp-winbind = "/usr/lib/pppd/2.4.3/winbind.so" 60FILES_${PN}-radius = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so"
60FILES_ppp-minconn = "/usr/lib/pppd/2.4.3/minconn.so" 61FILES_${PN}-winbind = "${libdir}/pppd/${PV}/winbind.so"
61FILES_ppp-password = "/usr/lib/pppd/2.4.3/pass*.so" 62FILES_${PN}-minconn = "${libdir}/pppd/${PV}/minconn.so"
62FILES_ppp-tools = "/usr/sbin/pppstats /usr/sbin/pppdump" 63FILES_${PN}-password = "${libdir}/pppd/${PV}/pass*.so"
64FILES_${PN}-tools = "${sbindir}/pppstats ${sbindir}/pppdump"
63DESCRIPTION_ppp-oa = "Plugin for PPP needed for PPP-over-ATM" 65DESCRIPTION_ppp-oa = "Plugin for PPP needed for PPP-over-ATM"
64DESCRIPTION_ppp-oe = "Plugin for PPP needed for PPP-over-Ethernet" 66DESCRIPTION_ppp-oe = "Plugin for PPP needed for PPP-over-Ethernet"
65DESCRIPTION_ppp-radius = "Plugin for PPP that are related to RADIUS" 67DESCRIPTION_ppp-radius = "Plugin for PPP that are related to RADIUS"