summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-07-16 08:42:36 +0000
committerRichard Purdie <richard@openedhand.com>2008-07-16 08:42:36 +0000
commit0ef4807ef815231ea8564b154d4aa014269c1e08 (patch)
treea1da0a3595325bb637fdf3b2b738b1c84ffbbd24 /meta
parent33d99387eb822c9133c244d1789122eb4787ccbc (diff)
downloadpoky-0ef4807ef815231ea8564b154d4aa014269c1e08.tar.gz
netbase: Disable networkmanager on eth0 for omap-3430ldp
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4844 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/netbase/netbase/interfaces6
-rw-r--r--meta/packages/netbase/netbase_4.21.bb9
2 files changed, 11 insertions, 4 deletions
diff --git a/meta/packages/netbase/netbase/interfaces b/meta/packages/netbase/netbase/interfaces
index dc6b823002..b06924fa94 100644
--- a/meta/packages/netbase/netbase/interfaces
+++ b/meta/packages/netbase/netbase/interfaces
@@ -20,10 +20,10 @@ iface eth1 inet dhcp
20# Ethernet/RNDIS gadget (g_ether) 20# Ethernet/RNDIS gadget (g_ether)
21# ... or on host side, usbnet and random hwaddr 21# ... or on host side, usbnet and random hwaddr
22iface usb0 inet static 22iface usb0 inet static
23 address 192.168.0.202 23 address 192.168.7.2
24 netmask 255.255.255.0 24 netmask 255.255.255.0
25 network 192.168.0.0 25 network 192.168.7.0
26 gateway 192.168.0.200 26 gateway 192.168.7.1
27 27
28# Bluetooth networking 28# Bluetooth networking
29iface bnep0 inet dhcp 29iface bnep0 inet dhcp
diff --git a/meta/packages/netbase/netbase_4.21.bb b/meta/packages/netbase/netbase_4.21.bb
index a9df13d17a..c629da1d74 100644
--- a/meta/packages/netbase/netbase_4.21.bb
+++ b/meta/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \
2infrastructure for basic TCP/IP based networking." 2infrastructure for basic TCP/IP based networking."
3SECTION = "base" 3SECTION = "base"
4LICENSE = "GPL" 4LICENSE = "GPL"
5PR = "r17" 5PR = "r18"
6 6
7inherit update-rc.d 7inherit update-rc.d
8 8
@@ -37,6 +37,13 @@ do_install () {
37 install -m 0755 update-inetd ${D}${sbindir}/ 37 install -m 0755 update-inetd ${D}${sbindir}/
38 install -m 0644 update-inetd.8 ${D}${mandir}/man8/ 38 install -m 0644 update-inetd.8 ${D}${mandir}/man8/
39 install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces 39 install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces
40
41 # Disable network manager on machines that commonly do NFS booting
42 if [ "${MACHINE}" = "omap-3430ldp" ]; then
43 touch ${D}${sysconfdir}/network/nm-disabled-eth0
44 fi
40} 45}
41 46
42CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces" 47CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces"
48
49PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}"