merge of '124fe75a3b9c5f57669cab2b1f729871b642205b'

     and 'e7392dcc74d2fbda5883939005e2fad09efab025'

10 files changed, 125 insertions, 24 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 67be27eae3..0e4285f633 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -148,6 +148,7 @@ require conf/distro/include/preferred-e-versions.inc
 
 
 # Virtuals:
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
@@ -177,6 +178,7 @@ PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
 PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
 
 # Others:
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_esound 		?= "pulseaudio"
 PREFERRED_PROVIDER_gconf                ?= "gconf-dbus"
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 0159c7dd0b..bc03465bd5 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -103,6 +103,7 @@ require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
 
 
 # Virtuals:
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
@@ -132,6 +133,7 @@ PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
 PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
 
 # Others:
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_esound 		?= "pulseaudio"
 PREFERRED_PROVIDER_gconf                ?= "gconf-dbus"
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index e4b083dd86..72533c65e5 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -776,7 +776,7 @@ PREFERRED_VERSION_keymap-locales ?= "1.0"
 PREFERRED_VERSION_keymaps ?= "1.0"
 PREFERRED_VERSION_keyring ?= "0.6.8"
 PREFERRED_VERSION_kf ?= "0.5.4.1"
-PREFERRED_VERSION_kismet ?= "2007-01-R1b"
+PREFERRED_VERSION_kismet ?= "2007-10-R1"
 PREFERRED_VERSION_klibc ?= "1.1.1"
 PREFERRED_VERSION_klimt ?= "0.6.1"
 PREFERRED_VERSION_knights ?= "1.14"
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
new file mode 100755
index 0000000000..7f594298b9
--- /dev/null
+++ b/contrib/angstrom/build-release.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# No graphics
+for i in ep93xx ixp4xxle ixp4xxbe gumstix-connex efika 
+        do
+          echo "MACHINE = \"$i\"" > conf/auto.conf
+      	  bitbake minimal-image ; bitbake console-image
+        done
+
+for i in ixp4xxle ixp4xxbe 
+       do
+         echo "MACHINE = \"$i\"" > conf/auto.conf
+         bitbake nslu2-minimal-image
+       done	 
+
+# build altboot images for zaurus
+for i in c7x0 poodle tosa akita spitz collie
+        do
+	  echo "MACHINE = \"$i\"" > conf/auto.conf
+	  bitbake altboot-console-image
+#	  echo ANGSTROM_MODE = \"uclibc\" >> conf/auto.conf
+#	  bitbake altboot-console-image
+	done  
+
+# graphics, flash storage
+for i in fic-gta01 a780 at91sam9263ek qemuarm h2200 h4000 omap5912osk poodle tosa hx4700 c7x0 spitz akita collie 
+        do
+	  echo "MACHINE = \"$i\"" > conf/auto.conf
+	  bitbake minimal-image ; bitbake console-image ; bitbake x11-image 
+        done
+
+# graphics, disk storage	
+for i in spitz 
+       do
+         echo "MACHINE = \"$i\"" > conf/auto.conf
+	 bitbake -c clean qmake2-native ; bitbake x11-gpe-image ; bitbake x11-pimlico-image ; bitbake x11-office-image
+#         echo ANGSTROM_MODE = \"uclibc\" >> conf/auto.conf
+#	 bitbake x11-gpe-mage ; bitbake x11-pimlico-image ; bitbake x11-office-image
+       done 
+
+
+#phones
+for i in fic-gta01 a780 
+        do
+         echo "MACHINE = \"$i\"" > conf/auto.conf
+	 bitbake -c clean qmake2-native ;bitbake openmoko-image
+#	 echo ANGSTROM_MODE = \"uclibc\" >> conf/auto.conf
+#	 bitbake openmoko-image
+       done	 
+
diff --git a/packages/images/console-mipv6-image.bb b/packages/images/console-mipv6-image.bb
new file mode 100644
index 0000000000..3c9995cf2e
--- /dev/null
+++ b/packages/images/console-mipv6-image.bb
@@ -0,0 +1,7 @@
+# This image is for testing the ipv6 mobility extensions
+
+require console-image.bb
+IMAGE_INSTALL += " task-mipl "
+
+export IMAGE_BASENAME = "console-mobile-ipv6-image"
+
diff --git a/packages/mipl-mipv6/mipv6_2.0.2.bb b/packages/mipl-mipv6/mipv6_2.0.2.bb
new file mode 100644
index 0000000000..8bbcb4cb75
--- /dev/null
+++ b/packages/mipl-mipv6/mipv6_2.0.2.bb
@@ -0,0 +1,22 @@
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel"
+RRECOMMENDS = "kernel-module-mip6 kernel-module-ipv6"
+
+SRC_URI = "http://www.mobile-ipv6.org/software/download/mipv6-${PV}.tar.gz"
+
+inherit autotools module-base
+
+CFLAGS =+ "-I${S}/include -I${STAGING_KERNEL_DIR}/include"
+
+do_compile() {
+        oe_runmake CFLAGS="${CFLAGS}"
+}
+
+do_install() {
+        install -d ${D}${sbindir}
+        install -d ${D}${sysconfdir}/init.d
+        oe_runmake sbindir="${D}${sbindir}" initdir="${D}${sysconfdir}/init.d" mandir="${D}${mandir}" docdir="${D}${docdir}/mobile-ip6" NETWORK_MIP6_CONF="${D}${sysconfdir}" install
+}
+
+PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+
diff --git a/packages/sofia-sip/sofia-sip.inc b/packages/sofia-sip/sofia-sip.inc
new file mode 100644
index 0000000000..f2bc57688f
--- /dev/null
+++ b/packages/sofia-sip/sofia-sip.inc
@@ -0,0 +1,21 @@
+DESCRIPTION = "Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF RFC3261 specification."
+HOMEPAGE = "http://sofia-sip.sourceforge.net/"
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 openssl"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+PACKAGES += " ${PN}-bin ${PN}-glib"
+
+FILES_${PN}-bin = "${bindir}"
+FILES_${PN} = "${libdir}/libsofia-sip-ua.so.*"
+FILES_${PN}-dev += "${datadir}/sofia-sip/*.awk"
+FILES_${PN}-glib = "${libdir}/libsofia-sip-ua-glib.so.*" 
+
+LEAD_SONAME = "libsofia-sip-ua.so"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/sofia-sip/sofia-sip_1.11.7.bb b/packages/sofia-sip/sofia-sip_1.11.7.bb
index d7b24cd0f6..accc58784f 100644
--- a/packages/sofia-sip/sofia-sip_1.11.7.bb
+++ b/packages/sofia-sip/sofia-sip_1.11.7.bb
@@ -1,13 +1,3 @@
-DESCRIPTION = "Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF RFC3261 specification."
-HOMEPAGE = "http://sofia-sip.sourceforge.net/"
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0 openssl"
-PR = "r1"
+require sofia-sip.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage () {
-	autotools_stage_all
-}
+PR = "r2"
diff --git a/packages/sofia-sip/sofia-sip_1.12.7.bb b/packages/sofia-sip/sofia-sip_1.12.7.bb
index 91c93fd07e..4c3eff14df 100644
--- a/packages/sofia-sip/sofia-sip_1.12.7.bb
+++ b/packages/sofia-sip/sofia-sip_1.12.7.bb
@@ -1,12 +1,3 @@
-DESCRIPTION = "Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF RFC3261 specification."
-HOMEPAGE = "http://sofia-sip.sourceforge.net/"
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0 openssl"
+require sofia-sip.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage () {
-	autotools_stage_all
-}
+PR = "r1"
diff --git a/packages/tasks/task-mipl.bb b/packages/tasks/task-mipl.bb
new file mode 100644
index 0000000000..9e2dce52f1
--- /dev/null
+++ b/packages/tasks/task-mipl.bb
@@ -0,0 +1,16 @@
+# Tasks for IPv6 Mobility extensions, needs:
+# CONFIG_IPV6_MIP6=y
+# CONFIG_IPV6=y
+# in the kernel .config
+
+DESCRIPTION = "Mobile ipv6 extensions"
+
+inherit task
+
+PACKAGE_ARCH = "all"
+
+RDEPENDS = "mipv6"
+RRECOMMENDS = "kernel-module-ipv6 \
+               kernel-module-mip6 \
+              "
+