summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-04-21 14:04:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-05 11:26:30 (GMT)
commitbbd6999a7249b7b99e434a4a01c8cedf540279bd (patch)
treecd3e60cbf3f0c8c7a96d5d6cdbb3a720ccc759f2 /meta/recipes-connectivity
parentcdf878387ad460f7c6b7a58dcc996918bcd07a0a (diff)
downloadpoky-bbd6999a7249b7b99e434a4a01c8cedf540279bd.tar.gz
Remove distro-specific metadata for distros not in oe-core
(From OE-Core rev: ea2cd4b8e9bc013a007fe2a1a605ecb59db5a896) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp3.inc4
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp4.inc4
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb2
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.5.bb5
4 files changed, 2 insertions, 13 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp3.inc b/meta/recipes-connectivity/dhcp/dhcp3.inc
index 3f68f45..6c7483e 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 ${
47RDEPENDS_dhcp-client = "bash" 47RDEPENDS_dhcp-client = "bash"
48 48
49FILES_dhcp-omshell = "${bindir}/omshell" 49FILES_dhcp-omshell = "${bindir}/omshell"
50
51CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf"
52CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay"
53CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf"
diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc
index e7cff3e..159ae89 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 ${
60RDEPENDS_dhcp-client = "bash" 60RDEPENDS_dhcp-client = "bash"
61 61
62FILES_dhcp-omshell = "${bindir}/omshell" 62FILES_dhcp-omshell = "${bindir}/omshell"
63
64CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf"
65CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay"
66CONFFILES_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 c273b2c..85f473d 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 @@
1require dhcp4.inc 1require dhcp4.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI += "file://fixincludes.patch \ 5SRC_URI += "file://fixincludes.patch \
6 file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ 6 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 bbbcb32..785eab1 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 = "r0" 13PR = "r1"
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 \
@@ -29,8 +29,6 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
29SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57" 29SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57"
30SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505" 30SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505"
31 31
32SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1"
33
34inherit autotools 32inherit autotools
35 33
36EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin" 34EXTRA_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 () {
54CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" 52CONFFILES_${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-tools" 53PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
56FILES_${PN} = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd" 54FILES_${PN} = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd"
57FILES_${PN}_nylon = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd /usr/sbin/tdbread"
58FILES_${PN}-dbg += "${libdir}/pppd/2.4.3/.debug" 55FILES_${PN}-dbg += "${libdir}/pppd/2.4.3/.debug"
59FILES_ppp-oa = "/usr/lib/pppd/2.4.3/pppoatm.so" 56FILES_ppp-oa = "/usr/lib/pppd/2.4.3/pppoatm.so"
60FILES_ppp-oe = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so" 57FILES_ppp-oe = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so"