Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/25 00:06:56+00:00 nexus.co.uk!pb
apply patch from Paul Eggleton to forward port usbnet-related net.agent changes from Familiar 0.7

2005/01/25 00:05:03+00:00 nexus.co.uk!pb
apply patch from Paul Eggleton to restore usbnet behaviour from Familiar 0.7

2005/01/24 23:59:26+00:00 nexus.co.uk!pb
add scap to handheld-common BOOTSTRAP_EXTRA_DEPENDS/RRECOMMENDS

2005/01/24 23:57:03+00:00 nexus.co.uk!pb
add scap


BKrev: 41f65176bucCL0CGF5e7FYURgLdgRw

5 files changed, 52 insertions, 4 deletions

diff --git a/packages/hotplug/hotplug-20040920/hotplug-net-agent-usb.patch b/packages/hotplug/hotplug-20040920/hotplug-net-agent-usb.patch
index e69de29bb2..e8cc2b3c9a 100644
--- a/packages/hotplug/hotplug-20040920/hotplug-net-agent-usb.patch
+++ b/packages/hotplug/hotplug-20040920/hotplug-net-agent-usb.patch
@@ -0,0 +1,43 @@
+--- net.agent	2005-01-13 21:12:47.143597392 +1300
++++ net.agent	2005-01-13 21:17:57.095477544 +1300
+@@ -41,6 +41,9 @@
+ 	    debug_mesg assuming $INTERFACE is already up
+ 	    exit 0
+ 	    ;;
++	# interfaces that don't go up until attached
++	usbf)
++	    ;;
+ 	# interfaces that are registered then brought up
+ 	*)
+ 	    # NOTE:  network configuration relies on administered state,
+@@ -83,6 +86,13 @@
+     mesg $1 $ACTION event not handled
+     ;;
+ 
++attach)
++    # ifupdown is dumb and won't bring up an interface that it thinks
++    # might already be configured.
++    /sbin/ifdown $INTERFACE
++    exec /sbin/ifup $INTERFACE
++    ;;
++
+ remove|unregister)
+     case $INTERFACE in
+ 	# interfaces that are unregistered after being "down" (?)
+@@ -105,6 +115,16 @@
+     mesg $1 $ACTION event not handled
+     ;;
+ 
++detach)
++    if [ -x /sbin/ifdown ]; then
++        debug_mesg invoke ifdown $INTERFACE
++        exec /sbin/ifdown $INTERFACE
++    else
++        mesg "E: /sbin/ifdown not found. You need to install ifupdown package"
++    fi
++    mesg $1 $ACTION event not handled
++    ;;
++
+ *)
+     debug_mesg NET $ACTION event for $INTERFACE not supported
+     exit 1 ;;
diff --git a/packages/hotplug/hotplug_20040920.bb b/packages/hotplug/hotplug_20040920.bb
index a30c2ed62f..5b796dc27c 100644
--- a/packages/hotplug/hotplug_20040920.bb
+++ b/packages/hotplug/hotplug_20040920.bb
@@ -4,7 +4,7 @@ and use them immediately."
 HOMEPAGE = "http://linux-hotplug.sourceforge.net/"
 LICENSE = "GPL"
 SECTION = "base"
-PR = "r7"
+PR = "r8"
 RSUGGESTS = "pciutils usbutils"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \
diff --git a/packages/netbase/netbase/interfaces b/packages/netbase/netbase/interfaces
index 4afec0ff74..63d2a93f55 100644
--- a/packages/netbase/netbase/interfaces
+++ b/packages/netbase/netbase/interfaces
@@ -17,8 +17,13 @@ iface eth1 inet dhcp
 # Zaurus usbnet
 iface usbd0 inet dhcp
 
-# iPAQ usbnet
-iface usbf inet dhcp
+# iPAQ usb network
+# (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.19.bb b/packages/netbase/netbase_4.19.bb
index 525ba4e4ad..4765503561 100644
--- a/packages/netbase/netbase_4.19.bb
+++ b/packages/netbase/netbase_4.19.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
 
 inherit update-rc.d
 
diff --git a/packages/scap/scap_0.1.bb b/packages/scap/scap_0.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/scap/scap_0.1.bb