merge of '6cbf0719a581ec7faecefbc05b3c17d8b1b72d52'

     and '7d51500e1f981f891b494ca3d396c965faecc9e0'

5 files changed, 1 insertions, 89 deletions

diff --git a/packages/netbase/netbase/a780/.mtn2git_empty b/packages/netbase/netbase/a780/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/netbase/netbase/a780/.mtn2git_empty
+++ /dev/null
diff --git a/packages/netbase/netbase/a780/interfaces b/packages/netbase/netbase/a780/interfaces
deleted file mode 100644
index 4e5d85e2c7..0000000000
--- a/packages/netbase/netbase/a780/interfaces
+++ /dev/null
@@ -1,44 +0,0 @@
-# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
- 
-# The loopback interface
-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
-iface eth0 inet dhcp
-iface eth1 inet dhcp
-
-auto usb0
-# Ethernet/RNDIS gadget (g_ether)
-# ... or on host side, usbnet and random hwaddr
-iface usb0 inet static
-	address 192.168.1.2
-	netmask 255.255.255.0
-	network 192.168.1.0
-	gateway 192.168.1.10
-
-
-# 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/packages/netbase/netbase/e680/.mtn2git_empty b/packages/netbase/netbase/e680/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/netbase/netbase/e680/.mtn2git_empty
+++ /dev/null
diff --git a/packages/netbase/netbase/e680/interfaces b/packages/netbase/netbase/e680/interfaces
deleted file mode 100644
index 4e5d85e2c7..0000000000
--- a/packages/netbase/netbase/e680/interfaces
+++ /dev/null
@@ -1,44 +0,0 @@
-# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
- 
-# The loopback interface
-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
-iface eth0 inet dhcp
-iface eth1 inet dhcp
-
-auto usb0
-# Ethernet/RNDIS gadget (g_ether)
-# ... or on host side, usbnet and random hwaddr
-iface usb0 inet static
-	address 192.168.1.2
-	netmask 255.255.255.0
-	network 192.168.1.0
-	gateway 192.168.1.10
-
-
-# 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/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index 4bc77b004b..bfb178d0a0 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/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