summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-13 13:05:59 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-13 23:18:48 (GMT)
commit29d054a9d78fb5aa299d2224e61d2ad1c3eb07be (patch)
tree1eb6c40b46f19c21a69203a619aecf97bc573c44
parent0d9c60f4972fb2f23fbf7e36ddfb50713011c5c4 (diff)
downloadpoky-29d054a9d78fb5aa299d2224e61d2ad1c3eb07be.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.5.bb19
1 files changed, 9 insertions, 10 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
index 13216e3..9232e6f 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 () {
52} 52}
53 53
54CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" 54CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
55PACKAGES =+ "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-l2tp ppp-tools" 55PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools"
56FILES_${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd" 56FILES_${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd"
57FILES_${PN}_nylon = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${sbindir}/tdbread" 57FILES_${PN}_nylon = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${sbindir}/tdbread"
58FILES_${PN}-dbg += "${libdir}/pppd/${PV}/.debug" 58FILES_${PN}-dbg += "${libdir}/pppd/${PV}/.debug"
@@ -64,15 +64,14 @@ FILES_${PN}-minconn = "${libdir}/pppd/${PV}/minconn.so"
64FILES_${PN}-password = "${libdir}/pppd/${PV}/pass*.so" 64FILES_${PN}-password = "${libdir}/pppd/${PV}/pass*.so"
65FILES_${PN}-l2tp = "${libdir}/pppd/${PV}/*l2tp.so" 65FILES_${PN}-l2tp = "${libdir}/pppd/${PV}/*l2tp.so"
66FILES_${PN}-tools = "${sbindir}/pppstats ${sbindir}/pppdump" 66FILES_${PN}-tools = "${sbindir}/pppstats ${sbindir}/pppdump"
67DESCRIPTION_ppp-oa = "Plugin for PPP needed for PPP-over-ATM" 67DESCRIPTION_${PN}-oa = "Plugin for PPP needed for PPP-over-ATM"
68DESCRIPTION_ppp-oe = "Plugin for PPP needed for PPP-over-Ethernet" 68DESCRIPTION_${PN}-oe = "Plugin for PPP needed for PPP-over-Ethernet"
69DESCRIPTION_ppp-radius = "Plugin for PPP that are related to RADIUS" 69DESCRIPTION_${PN}-radius = "Plugin for PPP that are related to RADIUS"
70DESCRIPTION_ppp-winbind = "Plugin for PPP to authenticate against Samba or Windows" 70DESCRIPTION_${PN}-winbind = "Plugin for PPP to authenticate against Samba or Windows"
71DESCRIPTION_ppp-minconn = "Plugin for PPP to specify a minimum connect time before the idle timeout applies" 71DESCRIPTION_${PN}-minconn = "Plugin for PPP to specify a minimum connect time before the idle timeout applies"
72DESCRIPTION_ppp-password = "Plugin for PPP to get passwords via a pipe" 72DESCRIPTION_${PN}-password = "Plugin for PPP to get passwords via a pipe"
73DESCRIPTION_ppp-l2tp = "Plugin for PPP for l2tp support" 73DESCRIPTION_${PN}-l2tp = "Plugin for PPP for l2tp support"
74DESCRIPTION_ppp-tools = "The pppdump and pppstats utitilities" 74DESCRIPTION_${PN}-tools = "The pppdump and pppstats utitilities"
75RDEPENDS_ppp_minconn += "libpcap0.8"
76 75
77pkg_postinst_${PN}() { 76pkg_postinst_${PN}() {
78if test "x$D" != "x"; then 77if test "x$D" != "x"; then