summaryrefslogtreecommitdiff
path: root/meta/packages/netbase
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/packages/netbase
parent33d99387eb822c9133c244d1789122eb4787ccbc (diff)
downloadopenembedded-core-0ef4807ef815231ea8564b154d4aa014269c1e08.tar.gz
openembedded-core-0ef4807ef815231ea8564b154d4aa014269c1e08.tar.bz2
openembedded-core-0ef4807ef815231ea8564b154d4aa014269c1e08.zip
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/packages/netbase')
-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
# Ethernet/RNDIS gadget (g_ether)
# ... or on host side, usbnet and random hwaddr
iface usb0 inet static
- address 192.168.0.202
+ address 192.168.7.2
netmask 255.255.255.0
- network 192.168.0.0
- gateway 192.168.0.200
+ network 192.168.7.0
+ gateway 192.168.7.1
# Bluetooth networking
iface 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 \
infrastructure for basic TCP/IP based networking."
SECTION = "base"
LICENSE = "GPL"
-PR = "r17"
+PR = "r18"
inherit update-rc.d
@@ -37,6 +37,13 @@ do_install () {
install -m 0755 update-inetd ${D}${sbindir}/
install -m 0644 update-inetd.8 ${D}${mandir}/man8/
install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces
+
+ # Disable network manager on machines that commonly do NFS booting
+ if [ "${MACHINE}" = "omap-3430ldp" ]; then
+ touch ${D}${sysconfdir}/network/nm-disabled-eth0
+ fi
}
CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces"
+
+PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}"