From 29d054a9d78fb5aa299d2224e61d2ad1c3eb07be Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 13 Mar 2012 13:05:59 +0000 Subject: ppp: Clean up PACKAGES vs. variable mismatch and drop unused RDEPENDS The RPDEPENDS format is wrong and couldn't have been doing anything useful. The mismatch between PACKAGES and the DESCRIPTION_* and FILES_* variable names could confuse the system under certain conditions so this is a good cleanup to make. (From OE-Core rev: 24f7351f6ac0408a1682893faf56b9145d698c1b) Signed-off-by: Richard Purdie --- meta/recipes-connectivity/ppp/ppp_2.4.5.bb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'meta/recipes-connectivity/ppp') diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb index 13216e3fdc..9232e6fdce 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb @@ -52,7 +52,7 @@ 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-l2tp ppp-tools" +PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-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" @@ -64,15 +64,14 @@ FILES_${PN}-minconn = "${libdir}/pppd/${PV}/minconn.so" FILES_${PN}-password = "${libdir}/pppd/${PV}/pass*.so" FILES_${PN}-l2tp = "${libdir}/pppd/${PV}/*l2tp.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" -DESCRIPTION_ppp-winbind = "Plugin for PPP to authenticate against Samba or Windows" -DESCRIPTION_ppp-minconn = "Plugin for PPP to specify a minimum connect time before the idle timeout applies" -DESCRIPTION_ppp-password = "Plugin for PPP to get passwords via a pipe" -DESCRIPTION_ppp-l2tp = "Plugin for PPP for l2tp support" -DESCRIPTION_ppp-tools = "The pppdump and pppstats utitilities" -RDEPENDS_ppp_minconn += "libpcap0.8" +DESCRIPTION_${PN}-oa = "Plugin for PPP needed for PPP-over-ATM" +DESCRIPTION_${PN}-oe = "Plugin for PPP needed for PPP-over-Ethernet" +DESCRIPTION_${PN}-radius = "Plugin for PPP that are related to RADIUS" +DESCRIPTION_${PN}-winbind = "Plugin for PPP to authenticate against Samba or Windows" +DESCRIPTION_${PN}-minconn = "Plugin for PPP to specify a minimum connect time before the idle timeout applies" +DESCRIPTION_${PN}-password = "Plugin for PPP to get passwords via a pipe" +DESCRIPTION_${PN}-l2tp = "Plugin for PPP for l2tp support" +DESCRIPTION_${PN}-tools = "The pppdump and pppstats utitilities" pkg_postinst_${PN}() { if test "x$D" != "x"; then -- cgit v1.2.3-54-g00ecf