netbase: Cleanup qemu network config, add for nokia800

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

4 files changed, 6 insertions, 71 deletions

diff --git a/meta/packages/netbase/netbase/nokia800/interfaces b/meta/packages/netbase/netbase/nokia800/interfaces
new file mode 100644
index 0000000000..16967763e5
--- /dev/null
+++ b/meta/packages/netbase/netbase/nokia800/interfaces
@@ -0,0 +1,5 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
diff --git a/meta/packages/netbase/netbase/qemuarm/interfaces b/meta/packages/netbase/netbase/qemuarm/interfaces
index 9259c1d8f5..f657944f0f 100644
--- a/meta/packages/netbase/netbase/qemuarm/interfaces
+++ b/meta/packages/netbase/netbase/qemuarm/interfaces
@@ -4,12 +4,6 @@
 auto lo
 iface lo inet loopback
 
-# Wireless interfaces
-iface wlan0 inet dhcp
-wireless_mode managed
-wireless_essid any
-iface atml0 inet dhcp
-
 # Wired or wireless interfaces
 auto eth0
 iface eth0 inet static
@@ -17,33 +11,3 @@ iface eth0 inet static
 	netmask 255.255.255.0
 	network 192.168.7.0
 	gateway 192.168.7.1
-
-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
-	netmask 255.255.255.0
-	network 192.168.0.0
-	gateway 192.168.0.200
-
-
-# Zaurus 2.4 Lineo net_fd; obsolete
-iface usbd0 inet static
-	address 192.168.129.201
-	netmask 255.255.255.0
-	network 192.168.129.0
-	gateway 192.168.129.200
-
-# iPAQ 2.4 mach-sa1100/usb-eth
-# (192.168.0.202 is the iPAQ's IP, 192.168.0.200 is the host's IP)
-iface usbf inet static
-        address 192.168.0.202
-        netmask 255.255.255.0
-        network 192.168.0.0
-        gateway 192.168.0.200
-
-# Bluetooth networking
-iface bnep0 inet dhcp
-
diff --git a/meta/packages/netbase/netbase/qemux86/interfaces b/meta/packages/netbase/netbase/qemux86/interfaces
index 9259c1d8f5..9b442355fd 100644
--- a/meta/packages/netbase/netbase/qemux86/interfaces
+++ b/meta/packages/netbase/netbase/qemux86/interfaces
@@ -4,12 +4,6 @@
 auto lo
 iface lo inet loopback
 
-# Wireless interfaces
-iface wlan0 inet dhcp
-wireless_mode managed
-wireless_essid any
-iface atml0 inet dhcp
-
 # Wired or wireless interfaces
 auto eth0
 iface eth0 inet static
@@ -18,32 +12,4 @@ iface eth0 inet static
 	network 192.168.7.0
 	gateway 192.168.7.1
 
-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
-	netmask 255.255.255.0
-	network 192.168.0.0
-	gateway 192.168.0.200
-
-
-# Zaurus 2.4 Lineo net_fd; obsolete
-iface usbd0 inet static
-	address 192.168.129.201
-	netmask 255.255.255.0
-	network 192.168.129.0
-	gateway 192.168.129.200
-
-# iPAQ 2.4 mach-sa1100/usb-eth
-# (192.168.0.202 is the iPAQ's IP, 192.168.0.200 is the host's IP)
-iface usbf inet static
-        address 192.168.0.202
-        netmask 255.255.255.0
-        network 192.168.0.0
-        gateway 192.168.0.200
-
-# 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 265da46360..d5393d0cf1 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 = "r14"
+PR = "r15"
 
 inherit update-rc.d