From: Richard Purdie <richard@openedhand.com>
Date: Mon, 29 Sep 2008 13:32:50 +0000 (+0000)
Subject: netbase: Disable networkmanager for eth0 on qemux86/qemuarm
X-Git-Tag: 2011-1~8209
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0307391afcf4c0d0c75ac686c492d1f9bfb7ea5b;p=openembedded-core.git

netbase: Disable networkmanager for eth0 on qemux86/qemuarm

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5308 311d38ba-8fff-0310-9ca6-ca027cbcb966
---

diff --git a/meta/packages/netbase/netbase_4.21.bb b/meta/packages/netbase/netbase_4.21.bb
index 17c6bb9f3d..1769a47a6b 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 = "r22"
+PR = "r23"
 
 inherit update-rc.d
 
@@ -38,7 +38,7 @@ do_install () {
 
 	# Disable network manager on machines that commonly do NFS booting
 	case "${MACHINE}" in
-		"omap-3430sdp" | "omap-3430ldp" | "omap-2430sdp")
+		"omap-3430sdp" | "omap-3430ldp" | "omap-2430sdp" | "qemuarm" | "qemux86" )
 			touch ${D}${sysconfdir}/network/nm-disabled-eth0
 			;;
 		*)
@@ -51,3 +51,5 @@ CONFFILES_${PN} = "${sysconfdir}/hosts ${sysconfdir}/network/interfaces"
 PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}"
 PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}"
 PACKAGE_ARCH_omap-2430sdp = "${MACHINE_ARCH}"
+PACKAGE_ARCH_qemuarm = "${MACHINE_ARCH}"
+PACKAGE_ARCH_qemux86 = "${MACHINE_ARCH}"