merge of '03be01b188343deda5a2013298d805f52b70faf0'

     and 'b80d9ebb857751a743351b4d94c9d52aadf9785b'

11 files changed, 65 insertions, 4 deletions

diff --git a/packages/images/initramfs-image.bb b/packages/images/initramfs-image.bb
new file mode 100644
index 0000000000..1b60405e74
--- /dev/null
+++ b/packages/images/initramfs-image.bb
@@ -0,0 +1,15 @@
+# Sample initramfs image
+LICENSE = "MIT"
+PR = "r0"
+
+#RDEPENDS = "initramfs-boot busybox kernel-module-uinput uclibc libgcc1"
+RDEPENDS = "initramfs-nfsboot busybox-static kernel-module-uinput"
+
+export IMAGE_BASENAME = "initramfs-image"
+export IMAGE_LINGUAS = ""
+
+PACKAGE_INSTALL = "${RDEPENDS}"
+# Install only ${PACKAGE_INSTALL}, not even deps
+PACKAGE_INSTALL_NO_DEPS = "1"
+
+inherit image
diff --git a/packages/initrdscripts/.mtn2git_empty b/packages/initrdscripts/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/initrdscripts/.mtn2git_empty
diff --git a/packages/initrdscripts/files/.mtn2git_empty b/packages/initrdscripts/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/initrdscripts/files/.mtn2git_empty
diff --git a/packages/initrdscripts/files/nfsboot.sh b/packages/initrdscripts/files/nfsboot.sh
new file mode 100644
index 0000000000..bb689fa3b8
--- /dev/null
+++ b/packages/initrdscripts/files/nfsboot.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo "Starting initramfs boot..."
+mkdir /proc
+mount -t proc proc /proc
+ifconfig eth0 192.168.20.230
+mkdir /mnt
+mount -t nfs 192.168.20.210:/home/nfs/Angstrom-opie-image-test-h4000 /mnt
+cd /mnt
+exec switch_root -c /dev/console /mnt /sbin/init
diff --git a/packages/initrdscripts/initramfs-nfsboot_0.1.bb b/packages/initrdscripts/initramfs-nfsboot_0.1.bb
new file mode 100644
index 0000000000..1a4d48813b
--- /dev/null
+++ b/packages/initrdscripts/initramfs-nfsboot_0.1.bb
@@ -0,0 +1,8 @@
+SRC_URI = "file://nfsboot.sh"
+PR = "r0"
+
+do_install() {
+        install -m 0755 ${WORKDIR}/nfsboot.sh ${D}/init
+}
+
+FILES_${PN} += " /init "
diff --git a/packages/netbase/netbase/interfaces b/packages/netbase/netbase/interfaces
index e6a4574aa9..c9b2faf3f8 100644
--- a/packages/netbase/netbase/interfaces
+++ b/packages/netbase/netbase/interfaces
@@ -28,7 +28,7 @@ iface wlan0 inet dhcp
 #	wireless-key s:My-PlainText-Password
 #	wireless-mode managed                  
 #
-# A WPA encrypted connection locked to a specific access point.
+# A WPA1 or WPA2 encrypted connection locked to a specific access point.
 # The WLAN cards firmware is updated temporarily to allow WPA
 # connections. Your card may or may not need the update.
 #
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index ba5d95b287..6851ae8d9a 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 = "r17"
+PR = "r18"
 
 inherit update-rc.d
 
diff --git a/packages/qsvn/files/.mtn2git_empty b/packages/qsvn/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qsvn/files/.mtn2git_empty
diff --git a/packages/qsvn/files/build.patch b/packages/qsvn/files/build.patch
new file mode 100644
index 0000000000..086f532a70
--- /dev/null
+++ b/packages/qsvn/files/build.patch
@@ -0,0 +1,23 @@
+--- qsvn-0.3.0/qsvn.pro	2007-06-11 00:47:22.514013379 +0200
++++ qsvn-0.3.0/qsvn.pro	2007-06-11 00:47:49.206941206 +0200
+@@ -7,9 +7,6 @@
+   UI_DIR = .ui
+   OBJECTS_DIR = .obj
+ 
+-  INCLUDEPATH += /usr/include/subversion-1 \
+-                 /usr/include/apr-0
+-
+   LIBS += -lsvn_client-1 \
+           -lsvn_delta-1 \
+           -lsvn_diff-1 \
+@@ -18,8 +15,8 @@
+           -lsvn_repos-1 \
+           -lsvn_subr-1 \
+           -lsvn_wc-1 \
+-          -lapr-0 \
+-          -laprutil-0
++          -lapr-1 \
++          -laprutil-1
+ }
+ 
+ win32 {
diff --git a/packages/qsvn/qsvn_0.3.0.bb b/packages/qsvn/qsvn_0.3.0.bb
index 13653ea898..575e9359b7 100644
--- a/packages/qsvn/qsvn_0.3.0.bb
+++ b/packages/qsvn/qsvn_0.3.0.bb
@@ -7,7 +7,8 @@ SECTION = "network"
 DEPENDS = "apr-util subversion"
 PR = "r0"
 
-SRC_URI = "http://download2.berlios.de/qsvn/qsvn-${PV}-src.tar.gz"
+SRC_URI = "http://download2.berlios.de/qsvn/qsvn-${PV}-src.tar.gz \
+        file://build.patch;patch=1"
 
 inherit qmake qt4x11
 
diff --git a/packages/subversion/subversion_1.4.3.bb b/packages/subversion/subversion_1.4.3.bb
index c0a2a02e08..1b73017d25 100644
--- a/packages/subversion/subversion_1.4.3.bb
+++ b/packages/subversion/subversion_1.4.3.bb
@@ -5,7 +5,7 @@ RDEPENDS = "neon"
 LICENSE = "Apache/BSD"
 HOMEPAGE = "http://subversion.tigris.org"
 
-DEFAULT_PREFERENCE = "-1"
+PR = "r1"
 
 SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
            file://disable-revision-install.patch;patch=1 \
@@ -27,3 +27,7 @@ do_configure() {
 	aclocal -I build/ -I build/ac-macros/ && autoconf
 	oe_runconf
 }
+
+do_stage() {
+	autotools_stage_all
+}