Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

29 files changed, 219 insertions, 41 deletions

diff --git a/conf/machine/am180x-evm.conf b/conf/machine/am180x-evm.conf
new file mode 100644
index 0000000000..3a7ca32102
--- /dev/null
+++ b/conf/machine/am180x-evm.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@NAME: AM180x CPUs on an AM180x EVM board
+#@DESCRIPTION: Machine configuration for the TI AM180x EVM board
+
+require conf/machine/include/davinci.inc
+require conf/machine/include/omapl138.inc
+
+UBOOT_MACHINE = "da850_omapl138_evm_config"
+UBOOT_ENTRYPOINT = "0xc0008000"
+UBOOT_LOADADDRESS = "0xc0008000"
+
+MACHINE_FEATURES = "kernel26 serial ethernet"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# # From dmesg:
+# # UBI: smallest flash I/O unit:    2048
+# # UBI: logical eraseblock size:    126976 bytes
+# # from ubiattach stdout:
+# # UBI device number 0, total 971 LEBs (123293696 bytes, 117.6 MiB), available 958 LEBs (121643008 bytes, 116.0 MiB), LEB size 126976 bytes (124.0 KiB)
+# MKUBIFS_ARGS = "-m 2048 -e 126976 -c 948"
+#
+# # do ubiattach /dev/ubi_ctrl -m 4
+# # from dmesg:
+# # UBI: smallest flash I/O unit:    2048
+# # UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# # UBI: sub-page size:              512
+# UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
+SERIAL_CONSOLE = "115200 ttyS2"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 28ded38611..d3c4957106 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r48"
+MACHINE_KERNEL_PR = "r49"
 
 TARGET_ARCH = "arm"
 
diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index 1d3c622f94..3e59466947 100755
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -54,7 +54,24 @@ case "$arch" in
 	"armv4t")
 			machines="acern30 amsdelta at2440evb cs-e9302 ep93xx eteng500 eten-m800 fic-gta01 fic-gta02 gesbc-9302 h1940 h6300 kb9202 ks8695 m8050 micro2440 mini2440 om-gta01 om-gta02 rx1950 rx3000 sarge-at91 simone smdk2440 smdk2443 topas910 ts72xx" ;;
 	"armv5te")
-			machines="a1200 a780 a910 afeb9260 afeb9260-180 akita asus620 asus730 at91cap9adk at91-l9260 at91sam9260ek at91sam9261ek at91sam9263ek at91sam9g10ek at91sam9g20ek at91sam9g45ek at91sam9g45ekes at91sam9rlek aximx50 aximx50v bd-neon c7x0 chumby chumby-falconwing cm-x270 cm-x300 da830-omapl137-evm da850-omapl138-evm davinci-dvevm davinci-sffsdr devkitidp-pxa255 dm355-evm dm355-leopard dm357-evm dm365-evm dm6446-evm dm6467-evm dm6467t-evm dns323 dockstar e680 ea3250 em-x270 er0100 eseries ghi270 gumstix gumstix-connex gumstix-custom-connex gumstix-custom-verdex gumstix-verdex h1910 h2200 h3900 h4000 h5000 hawkboard hipox htcalpine htcapache htcblueangel htchimalaya htcsable htctornado htcuniversal hx2000 hx4700 imote2 ixp4xxle kixrp435 kuropro logicpd-pxa270 looxc550 lspro magician mainstone mh355 mp900c mtx-3 mtx-3a mv2120 mx21ads mx27ads n2100 navman-icn330 netbook-pro neuros-osd neuros-osd2 nhk15 nokia770 nslu2le omap1510inn omap1610h2 omap1710h3 omap5912osk openrd-base openrd-client palmld palmt650 palmt680 palmtc palmtt palmtt3 palmtt5 palmtx palmz31 palmz71 palmz72 poodle qemuarm rokre2 rokr-e2 rokre6 ronetix-pm9261 ronetix-pm9263 sgh-i900 sheevaplug spitz stamp9g20evb topas910 tosa triton ts409 tsx09 tx25 tx27" ;;
+			machines="a1200 a780 a910 afeb9260 afeb9260-180 akita am180x-evm
+ asus620 asus730 at91cap9adk at91-l9260 at91sam9260ek at91sam9261ek
+ at91sam9263ek at91sam9g10ek at91sam9g20ek at91sam9g45ek at91sam9g45ekes
+ at91sam9rlek aximx50 aximx50v bd-neon c7x0 chumby chumby-falconwing cm-x270
+ cm-x300 da830-omapl137-evm da850-omapl138-evm davinci-dvevm davinci-sffsdr
+ devkitidp-pxa255 dm355-evm dm355-leopard dm357-evm dm365-evm dm6446-evm
+ dm6467-evm dm6467t-evm dns323 dockstar e680 ea3250 em-x270 er0100 eseries
+ ghi270 gumstix gumstix-connex gumstix-custom-connex gumstix-custom-verdex
+ gumstix-verdex h1910 h2200 h3900 h4000 h5000 hawkboard hipox htcalpine
+ htcapache htcblueangel htchimalaya htcsable htctornado htcuniversal hx2000
+ hx4700 imote2 ixp4xxle kixrp435 kuropro logicpd-pxa270 looxc550 lspro
+ magician mainstone mh355 mp900c mtx-3 mtx-3a mv2120 mx21ads mx27ads n2100
+ navman-icn330 netbook-pro neuros-osd neuros-osd2 nhk15 nokia770 nslu2le
+ omap1510inn omap1610h2 omap1710h3 omap5912osk openrd-base openrd-client
+ palmld palmt650 palmt680 palmtc palmtt palmtt3 palmtt5 palmtx palmz31
+ palmz71 palmz72 poodle qemuarm rokre2 rokr-e2 rokre6 ronetix-pm9261
+ ronetix-pm9263 sgh-i900 sheevaplug spitz stamp9g20evb topas910 tosa
+ triton ts409 tsx09 tx25 tx27" ;;
 	"armv5teb")
 			machines="fsg3be ixp4xxbe nslu2be" ;;
 	"armv6")
diff --git a/recipes/dzen2/dzen2_svn.bb b/recipes/dzen2/dzen2_svn.bb
index fa1072483b..1ad6e8253e 100644
--- a/recipes/dzen2/dzen2_svn.bb
+++ b/recipes/dzen2/dzen2_svn.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "dzen is a general purpose messaging, notification and menu program."
 LICENSE = "MIT"
 DEPENDS = "virtual/libx11 libxft"
-RDEPENDS = "ttf-dejavu-sans xrandr"
+RDEPENDS_${PN} = "ttf-dejavu-sans xrandr"
 
 SRCREV = "271"
 PV = "0.8.5+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://dzen.googlecode.com/svn/;module=trunk;proto=http \
 	   file://dzen-extras.tar.gz \
diff --git a/recipes/jlime/fileselector_1.1.bb b/recipes/jlime/fileselector_1.1.bb
index 6a4929d642..e5e01cc65a 100644
--- a/recipes/jlime/fileselector_1.1.bb
+++ b/recipes/jlime/fileselector_1.1.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Fileselector is an SDL-based file chooser dialog"
 LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "virtual/libsdl libsdl-ttf"
-RDEPENDS = "ttf-dejavu-sans-condensed"
+RDEPENDS_${PN} = "ttf-dejavu-sans-condensed"
 
 SRC_URI = "http://jlime.com/downloads/development/software/fileselector-${PV}.tar.gz"
 
diff --git a/recipes/jlime/fnkey_1.0.bb b/recipes/jlime/fnkey_1.0.bb
index fc09eeb453..6f24da49a8 100644
--- a/recipes/jlime/fnkey_1.0.bb
+++ b/recipes/jlime/fnkey_1.0.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Emulates Fn key by simulating multiple keypresses."
 LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
 
-RDEPENDS = "xdotool"
+RDEPENDS_${PN} = "xdotool"
 
 SRC_URI = "file://fnkey.c"
 
diff --git a/recipes/jlime/jlime-extras_1.0.1.bb b/recipes/jlime/jlime-extras_1.0.1.bb
index 9b7b907e1c..c3dd483b18 100644
--- a/recipes/jlime/jlime-extras_1.0.1.bb
+++ b/recipes/jlime/jlime-extras_1.0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Various extras for the Jlime userlands"
-PR = "r0"
+PR = "r1"
 
-RRECOMMENDS = "jlime-extras-${MACHINE}"
+RRECOMMENDS_${PN} = "jlime-extras-${MACHINE}"
 
 PACKAGE_ARCH = "all"
 SRC_URI = "http://jlime.com/downloads/development/software/${PN}-${PV}.tar.gz"
diff --git a/recipes/linux/linux-davinci/da830-omapl137-evm/configs/da830_omapl137_defconfig b/recipes/linux/linux-davinci/omapl137/configs/da830_omapl137_defconfig
index 7a3a609ecd..7a3a609ecd 100644
--- a/recipes/linux/linux-davinci/da830-omapl137-evm/configs/da830_omapl137_defconfig
+++ b/recipes/linux/linux-davinci/omapl137/configs/da830_omapl137_defconfig
diff --git a/recipes/linux/linux-davinci/da830-omapl137-evm/defconfig b/recipes/linux/linux-davinci/omapl137/defconfig
index 7a3a609ecd..7a3a609ecd 100644
--- a/recipes/linux/linux-davinci/da830-omapl137-evm/defconfig
+++ b/recipes/linux/linux-davinci/omapl137/defconfig
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/0001-board-da850-evm-Disable-NAND-SUBPAGE.patch b/recipes/linux/linux-davinci/omapl138/0001-board-da850-evm-Disable-NAND-SUBPAGE.patch
index 3653bdf747..3653bdf747 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/0001-board-da850-evm-Disable-NAND-SUBPAGE.patch
+++ b/recipes/linux/linux-davinci/omapl138/0001-board-da850-evm-Disable-NAND-SUBPAGE.patch
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig
index b3120502fa..b3120502fa 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig
+++ b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_mmcpm_stats b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_mmcpm_stats
index 4836640025..4836640025 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_mmcpm_stats
+++ b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_mmcpm_stats
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_nandnommc b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_nandnommc
index 8b5576314f..8b5576314f 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_nandnommc
+++ b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_nandnommc
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocap b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_uivideocap
index 0597147d84..0597147d84 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocap
+++ b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_uivideocap
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocapdis b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_uivideocapdis
index 5f40d99c37..5f40d99c37 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocapdis
+++ b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_uivideocapdis
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig b/recipes/linux/linux-davinci/omapl138/defconfig
index 8462139df5..8462139df5 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig
+++ b/recipes/linux/linux-davinci/omapl138/defconfig
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/logo_linux_clut224.ppm b/recipes/linux/linux-davinci/omapl138/logo_linux_clut224.ppm
index 98fd65687c..98fd65687c 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/logo_linux_clut224.ppm
+++ b/recipes/linux/linux-davinci/omapl138/logo_linux_clut224.ppm
diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb
index 06b4dc89d5..fdccdda9ba 100644
--- a/recipes/linux/linux-davinci_git.bb
+++ b/recipes/linux/linux-davinci_git.bb
@@ -3,7 +3,7 @@ require multi-kernel.inc
 DESCRIPTION = "Linux kernel for DaVinci processors"
 KERNEL_IMAGETYPE = "uImage"
 
-COMPATIBLE_MACHINE = "(dm355-evm|dm365-evm|dm6446-evm|dm6467-evm|dm6467t-evm|da830-omapl137-evm|da850-omapl138-evm|dm355-leopard|davinci-sffsdr|hawkboard)"
+COMPATIBLE_MACHINE = "(dm355-evm|dm365-evm|dm6446-evm|dm6467-evm|dm6467t-evm|omapl137|omapl138|dm355-leopard|davinci-sffsdr|hawkboard)"
 
 DEFAULT_PREFERENCE = "1"
 DEFAULT_PREFERENCE_dm365 = "-1"
@@ -52,34 +52,29 @@ ARAGO_L1_BR  = "master"
 ARAGO_L1_PV  = "2.6.32+2.6.33-rc4-${PR}+gitr${SRCREV}"
 ARAGO_L1_URI = "git://arago-project.org/git/projects/linux-omapl1.git;protocol=git;branch=${BRANCH} "
 
-SRCREV_da830-omapl137-evm         = ${ARAGO_L1_REV}
-SRCREV_da850-omapl138-evm         = ${ARAGO_L1_REV}
+SRCREV_omapl137         = ${ARAGO_L1_REV}
+SRCREV_omapl138         = ${ARAGO_L1_REV}
 SRCREV_hawkboard                  = ${ARAGO_L1_REV}
 
-PV_da830-omapl137-evm             = ${ARAGO_L1_PV}
-PV_da850-omapl138-evm             = ${ARAGO_L1_PV}
-PV_hawkboard                      = ${ARAGO_L1_PV}
+PV_omapl137             = ${ARAGO_L1_PV}
+PV_omapl138             = ${ARAGO_L1_PV}
 
-BRANCH_da830-omapl137-evm         = ${ARAGO_L1_BR}
-BRANCH_da850-omapl138-evm         = ${ARAGO_L1_BR}
-BRANCH_hawkboard                  = ${ARAGO_L1_BR}
+BRANCH_omapl137         = ${ARAGO_L1_BR}
+BRANCH_omapl138         = ${ARAGO_L1_BR}
 
-SRC_URI_append_da830-omapl137-evm = ${ARAGO_L1_URI}
-SRC_URI_append_da850-omapl138-evm = ${ARAGO_L1_URI}
-SRC_URI_append_hawkboard          = ${ARAGO_L1_URI}
+SRC_URI_append_omapl137 = ${ARAGO_L1_URI}
+SRC_URI_append_omapl138 = ${ARAGO_L1_URI}
 
-SRC_URI_append_da850-omapl138-evm = "file://logo_linux_clut224.ppm \
+SRC_URI_append_omapl138 = "file://logo_linux_clut224.ppm \
                                      file://0001-ahci-ti-Fix-currently-harmless-typo-in-SATA-PHY.patch \
                                      file://0002-ahci-ti-Update-SATA-PHY-configuration-RXCDR.patch \
                                      file://0001-board-da850-evm-Disable-NAND-SUBPAGE.patch \
                                      "
 
-SRC_URI_append_hawkboard          = "file://logo_linux_clut224.ppm \
+SRC_URI_append_hawkboard          = " \
                                      file://patch-2.6.33rc4-psp-to-hawkboard.patch \
-                                     file://0001-ahci-ti-Fix-currently-harmless-typo-in-SATA-PHY.patch \
-                                     file://0002-ahci-ti-Update-SATA-PHY-configuration-RXCDR.patch \
                                      file://0001-board-da850-hawk-Disable-NAND-SUBPAGE.patch \
-                                     "
+                                    "
 
 do_configure_prepend_dm355-leopard() {
 	sed -i s:2138:1381:g ${S}/arch/arm/tools/mach-types
diff --git a/recipes/puzzles/stppc2x_svn.bb b/recipes/puzzles/stppc2x_svn.bb
index 380a75398d..8e6d4f2944 100644
--- a/recipes/puzzles/stppc2x_svn.bb
+++ b/recipes/puzzles/stppc2x_svn.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "stppc2x is an SDL port of Simon Tatham's Portable Puzzle Collecti
 LICENSE = "GPLv2"
 
 DEPENDS = "virtual/libsdl libsdl-image libsdl-ttf"
-RDEPENDS = "ttf-dejavu-sans-condensed"
+RDEPENDS_${PN} = "ttf-dejavu-sans-condensed"
 
 SRCREV = "185"
 PV = "1.0+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 FILES_${PN} = "/usr/bin /usr/share"
 
diff --git a/recipes/tasks/task-sdk-native.inc b/recipes/tasks/task-sdk-native.inc
index 9a578ee608..581b91acb7 100644
--- a/recipes/tasks/task-sdk-native.inc
+++ b/recipes/tasks/task-sdk-native.inc
@@ -1,9 +1,10 @@
 DESCRIPTION = "Packages required for native (on-device) SDK"
 LICENSE = "MIT"
-INC_PR = "r12"
+INC_PR = "r13"
 
 inherit task
 
+RPROVIDES_${PN} = "task-native-sdk"
 RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks binutils-symlinks \
 	    make virtual-libc-dev \
 	    task-proper-tools perl-modules flex flex-dev bison gawk sed grep autoconf automake make \
diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb
index 1e3f1aaa43..7e61b21dd2 100644
--- a/recipes/u-boot/u-boot_git.bb
+++ b/recipes/u-boot/u-boot_git.bb
@@ -241,15 +241,15 @@ SRC_URI_dm6467t-evm  = "git://arago-project.org/git/projects/u-boot-dm646x.git;p
 SRCREV_dm6467t-evm   = "98b31e3aae3e3fb772f8d06c18ccdd6265aa0d38"
 PV_dm6467t-evm       = "2009.08+${PR}+gitr${SRCREV}"
 
-# OMAPL1 da380-omapl137/da850-omapl138-evm - PSP 3.20.0.11
+# OMAPL1 omapl137/omapl138 - PSP 3.20.0.11
 
-SRC_URI_da830-omapl137-evm = "git://arago-project.org/git/projects/u-boot-omapl1.git;protocol=git"
-SRCREV_da830-omapl137-evm  = "5f16b8551b125f16cd8d58f278cb25b94272fd9f"
-PV_da830-omapl137-evm      = "2009.11+${PR}+gitr${SRCREV}"
+SRC_URI_omapl137 = "git://arago-project.org/git/projects/u-boot-omapl1.git;protocol=git"
+SRCREV_omapl137  = "5f16b8551b125f16cd8d58f278cb25b94272fd9f"
+PV_omapl137      = "2009.11+${PR}+gitr${SRCREV}"
 
-SRC_URI_da850-omapl138-evm = "git://arago-project.org/git/projects/u-boot-omapl1.git;protocol=git"
-SRCREV_da850-omapl138-evm  = "5f16b8551b125f16cd8d58f278cb25b94272fd9f"
-PV_da850-omapl138-evm      = "2009.11+${PR}+gitr${SRCREV}"
+SRC_URI_omapl138 = "git://arago-project.org/git/projects/u-boot-omapl1.git;protocol=git"
+SRCREV_omapl138  = "5f16b8551b125f16cd8d58f278cb25b94272fd9f"
+PV_omapl138      = "2009.11+${PR}+gitr${SRCREV}"
 
 # hawkboard - master branch (hawk still .07beta)
 
diff --git a/recipes/xorg-lib/libx11-1.1.5/configure.ac-nios2.patch b/recipes/xorg-lib/libx11-1.1.5/configure.ac-nios2.patch
new file mode 100644
index 0000000000..2e2d475acb
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/configure.ac-nios2.patch
@@ -0,0 +1,33 @@
+From affc2488a7f2660a74dc8354fc3e0bff2c4f879c Mon Sep 17 00:00:00 2001
+From: Dan Nicholson <dbn.lists@gmail.com>
+Date: Sat, 06 Nov 2010 21:58:09 +0000
+Subject: config: Fix architecture check for OS/2 to skip nios2 cpu
+
+The OS/2 platform requires some utility functions as well as having a
+non-32 bit wchar_t. Fix the configure check so that it doesn't also
+affect the nios2 cpu, which wouldn't influence these operating system
+issues.
+
+Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+Tested-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 1b4a8b7..01f43fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -246,8 +246,8 @@ dnl AC_PATH_XTRA
+ 
+ # arch specific things
+ WCHAR32="1"
+-case $target_alias in
+-  *os2*) os2="true" ; WCHAR32="0" ;;
++case $target_os in
++  os2*) os2="true" ; WCHAR32="0" ;;
+   *) ;;
+ esac
+ AC_SUBST(WCHAR32)
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/libx11-1.3.2/configure.ac-nios2.patch b/recipes/xorg-lib/libx11-1.3.2/configure.ac-nios2.patch
new file mode 100644
index 0000000000..2e2d475acb
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.2/configure.ac-nios2.patch
@@ -0,0 +1,33 @@
+From affc2488a7f2660a74dc8354fc3e0bff2c4f879c Mon Sep 17 00:00:00 2001
+From: Dan Nicholson <dbn.lists@gmail.com>
+Date: Sat, 06 Nov 2010 21:58:09 +0000
+Subject: config: Fix architecture check for OS/2 to skip nios2 cpu
+
+The OS/2 platform requires some utility functions as well as having a
+non-32 bit wchar_t. Fix the configure check so that it doesn't also
+affect the nios2 cpu, which wouldn't influence these operating system
+issues.
+
+Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+Tested-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 1b4a8b7..01f43fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -246,8 +246,8 @@ dnl AC_PATH_XTRA
+ 
+ # arch specific things
+ WCHAR32="1"
+-case $target_alias in
+-  *os2*) os2="true" ; WCHAR32="0" ;;
++case $target_os in
++  os2*) os2="true" ; WCHAR32="0" ;;
+   *) ;;
+ esac
+ AC_SUBST(WCHAR32)
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/libx11-1.3.6/configure.ac-nios2.patch b/recipes/xorg-lib/libx11-1.3.6/configure.ac-nios2.patch
new file mode 100644
index 0000000000..2e2d475acb
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.6/configure.ac-nios2.patch
@@ -0,0 +1,33 @@
+From affc2488a7f2660a74dc8354fc3e0bff2c4f879c Mon Sep 17 00:00:00 2001
+From: Dan Nicholson <dbn.lists@gmail.com>
+Date: Sat, 06 Nov 2010 21:58:09 +0000
+Subject: config: Fix architecture check for OS/2 to skip nios2 cpu
+
+The OS/2 platform requires some utility functions as well as having a
+non-32 bit wchar_t. Fix the configure check so that it doesn't also
+affect the nios2 cpu, which wouldn't influence these operating system
+issues.
+
+Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+Tested-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 1b4a8b7..01f43fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -246,8 +246,8 @@ dnl AC_PATH_XTRA
+ 
+ # arch specific things
+ WCHAR32="1"
+-case $target_alias in
+-  *os2*) os2="true" ; WCHAR32="0" ;;
++case $target_os in
++  os2*) os2="true" ; WCHAR32="0" ;;
+   *) ;;
+ esac
+ AC_SUBST(WCHAR32)
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/libx11-1.3.99.903/configure.ac-nios2.patch b/recipes/xorg-lib/libx11-1.3.99.903/configure.ac-nios2.patch
new file mode 100644
index 0000000000..2e2d475acb
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.99.903/configure.ac-nios2.patch
@@ -0,0 +1,33 @@
+From affc2488a7f2660a74dc8354fc3e0bff2c4f879c Mon Sep 17 00:00:00 2001
+From: Dan Nicholson <dbn.lists@gmail.com>
+Date: Sat, 06 Nov 2010 21:58:09 +0000
+Subject: config: Fix architecture check for OS/2 to skip nios2 cpu
+
+The OS/2 platform requires some utility functions as well as having a
+non-32 bit wchar_t. Fix the configure check so that it doesn't also
+affect the nios2 cpu, which wouldn't influence these operating system
+issues.
+
+Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+Tested-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 1b4a8b7..01f43fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -246,8 +246,8 @@ dnl AC_PATH_XTRA
+ 
+ # arch specific things
+ WCHAR32="1"
+-case $target_alias in
+-  *os2*) os2="true" ; WCHAR32="0" ;;
++case $target_os in
++  os2*) os2="true" ; WCHAR32="0" ;;
+   *) ;;
+ esac
+ AC_SUBST(WCHAR32)
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/libx11_1.1.5.bb b/recipes/xorg-lib/libx11_1.1.5.bb
index e7755854f0..b44dcc8265 100644
--- a/recipes/xorg-lib/libx11_1.1.5.bb
+++ b/recipes/xorg-lib/libx11_1.1.5.bb
@@ -1,7 +1,8 @@
 require libx11.inc
 DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
+SRC_URI += " file://configure.ac-nios2.patch"
 SRC_URI[archive.md5sum] = "d1512d65dadd4f48c779d4749e7753a8"
 SRC_URI[archive.sha256sum] = "da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82"
 
diff --git a/recipes/xorg-lib/libx11_1.3.2.bb b/recipes/xorg-lib/libx11_1.3.2.bb
index b3d48aba9f..189d1ffdfe 100644
--- a/recipes/xorg-lib/libx11_1.3.2.bb
+++ b/recipes/xorg-lib/libx11_1.3.2.bb
@@ -1,10 +1,11 @@
 require libx11.inc
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 # gcc 4.5 ends up ICEing with thumb and -O1 with -fno-omit-framepointer
 # therefore if we are in thumb mode then we use -Os instead of -O1 for
 # DEBUG_OPTIMIZATION
 
 DEBUG_OPTIMIZATION_thumb_append = " -Os"
 SRC_URI += " file://dolt-fix.patch"
+SRC_URI += " file://configure.ac-nios2.patch"
 SRC_URI[archive.md5sum] = "001d780829f936e34851ef7cd37b4dfd"
 SRC_URI[archive.sha256sum] = "4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2"
diff --git a/recipes/xorg-lib/libx11_1.3.6.bb b/recipes/xorg-lib/libx11_1.3.6.bb
index 625f9065b2..8d9f343948 100644
--- a/recipes/xorg-lib/libx11_1.3.6.bb
+++ b/recipes/xorg-lib/libx11_1.3.6.bb
@@ -1,6 +1,7 @@
 require libx11.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI += " file://dolt-fix.patch"
+SRC_URI += " file://configure.ac-nios2.patch"
 SRC_URI[archive.md5sum] = "8e0a8a466aa78f66e09fe06cb395319f"
 SRC_URI[archive.sha256sum] = "599826765c59a98b1e58b4f6c4ad50dca69eeb0e7bd78aea736ca815f45bea40"
diff --git a/recipes/xorg-lib/libx11_1.3.99.903.bb b/recipes/xorg-lib/libx11_1.3.99.903.bb
index 65ff63c9a2..5ea3291bdc 100644
--- a/recipes/xorg-lib/libx11_1.3.99.903.bb
+++ b/recipes/xorg-lib/libx11_1.3.99.903.bb
@@ -2,7 +2,8 @@ require libx11.inc
 #--without-xcb is not an option anymore
 #http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8
 DEPENDS_virtclass-native = "libxcb-native ${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
+SRC_URI += " file://configure.ac-nios2.patch"
 SRC_URI[archive.md5sum] = "3e8ed7a91f70bb819b5dab9c124a7062"
 SRC_URI[archive.sha256sum] = "50205aad0646c0ab13aff8e8eaec7c5cddff416d3a012f83c5661ad98e49736f"