diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-04-21 15:04:58 +0100 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-05-04 22:12:27 -0700 |
commit | ea2cd4b8e9bc013a007fe2a1a605ecb59db5a896 (patch) | |
tree | 75cf5498db3845589f63ac82e75e0577f4e77cfd /meta/recipes-connectivity | |
parent | 72567733033347b662d9baa07432985fd2da3efa (diff) | |
download | openembedded-core-ea2cd4b8e9bc013a007fe2a1a605ecb59db5a896.tar.gz openembedded-core-ea2cd4b8e9bc013a007fe2a1a605ecb59db5a896.tar.bz2 openembedded-core-ea2cd4b8e9bc013a007fe2a1a605ecb59db5a896.zip |
Remove distro-specific metadata for distros not in oe-core
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp3.inc | 4 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp4.inc | 4 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp_2.4.5.bb | 5 |
4 files changed, 2 insertions, 13 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp3.inc b/meta/recipes-connectivity/dhcp/dhcp3.inc index 3f68f452d2..6c7483eae1 100644 --- a/meta/recipes-connectivity/dhcp/dhcp3.inc +++ b/meta/recipes-connectivity/dhcp/dhcp3.inc @@ -47,7 +47,3 @@ FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${ RDEPENDS_dhcp-client = "bash" FILES_dhcp-omshell = "${bindir}/omshell" - -CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf" -CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay" -CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf" diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc index e7cff3e038..159ae89354 100644 --- a/meta/recipes-connectivity/dhcp/dhcp4.inc +++ b/meta/recipes-connectivity/dhcp/dhcp4.inc @@ -60,7 +60,3 @@ FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${ RDEPENDS_dhcp-client = "bash" FILES_dhcp-omshell = "${bindir}/omshell" - -CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf" -CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay" -CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf" diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb index c273b2c0b9..85f473df17 100644 --- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb +++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb @@ -1,6 +1,6 @@ require dhcp4.inc -PR = "r1" +PR = "r2" SRC_URI += "file://fixincludes.patch \ file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb index bbbcb3236a..785eab11aa 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 = "r0" +PR = "r1" SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ file://makefile.patch \ @@ -29,8 +29,6 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57" SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505" -SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1" - 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" @@ -54,7 +52,6 @@ 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}_nylon = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd /usr/sbin/tdbread" 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" |