diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2011-07-01 20:17:47 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-01 23:08:34 +0100 |
| commit | 5318816a018165052f1aa647e3b7e2a1e6c701f7 (patch) | |
| tree | 1607feb96d41805a593ede847cb4e80797b51ac6 /meta/recipes-connectivity/ppp | |
| parent | a67e0c0e01a22718a617a82f54575b77928249ee (diff) | |
| download | openembedded-core-5318816a018165052f1aa647e3b7e2a1e6c701f7.tar.gz openembedded-core-5318816a018165052f1aa647e3b7e2a1e6c701f7.tar.bz2 openembedded-core-5318816a018165052f1aa647e3b7e2a1e6c701f7.tar.xz openembedded-core-5318816a018165052f1aa647e3b7e2a1e6c701f7.zip | |
ppp: sync packaging with OE .dev
This fixes the QA errors and the 2.4.3 vs 2.4.5 copy/paste mistake
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.bb | 26 |
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 b865afdd7..72464bffa 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 file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2" -PR = "r1" +PR = "r2" SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ file://makefile.patch \ @@ -31,7 +31,8 @@ SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230 inherit autotools -EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin" +TARGET_CC_ARCH += " ${LDFLAGS}" +EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}" EXTRA_OECONF = "--disable-strip" do_install_append () { @@ -50,16 +51,17 @@ do_install_append () { } CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" -PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools" -FILES_${PN} = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd" -FILES_${PN}-dbg += "${libdir}/pppd/2.4.3/.debug" -FILES_ppp-oa = "/usr/lib/pppd/2.4.3/pppoatm.so" -FILES_ppp-oe = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so" -FILES_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" -FILES_ppp-winbind = "/usr/lib/pppd/2.4.3/winbind.so" -FILES_ppp-minconn = "/usr/lib/pppd/2.4.3/minconn.so" -FILES_ppp-password = "/usr/lib/pppd/2.4.3/pass*.so" -FILES_ppp-tools = "/usr/sbin/pppstats /usr/sbin/pppdump" +PACKAGES =+ "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools" +FILES_${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd" +FILES_${PN}_nylon = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${sbindir}/tdbread" +FILES_${PN}-dbg += "${libdir}/pppd/${PV}/.debug" +FILES_${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so" +FILES_${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/rp-pppoe.so" +FILES_${PN}-radius = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so" +FILES_${PN}-winbind = "${libdir}/pppd/${PV}/winbind.so" +FILES_${PN}-minconn = "${libdir}/pppd/${PV}/minconn.so" +FILES_${PN}-password = "${libdir}/pppd/${PV}/pass*.so" +FILES_${PN}-tools = "${sbindir}/pppstats ${sbindir}/pppdump" DESCRIPTION_ppp-oa = "Plugin for PPP needed for PPP-over-ATM" DESCRIPTION_ppp-oe = "Plugin for PPP needed for PPP-over-Ethernet" DESCRIPTION_ppp-radius = "Plugin for PPP that are related to RADIUS" |