Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010

Conflicts:
	recipes/linux/linux-openmoko-devel_git.bb
	recipes/openmoko-3rdparty/pisi_0.5.2.bb
	recipes/openmoko-3rdparty/pisi_0.5.3.bb
	recipes/openmoko-3rdparty/pisi_0.5.bb
	recipes/uclibc/uclibc_nptl.bb

14 files changed, 30 insertions, 13 deletions

diff --git a/recipes/xorg-app/xdm_1.1.10.bb b/recipes/xorg-app/xdm_1.1.10.bb
new file mode 100644
index 0000000000..28202b7dfb
--- /dev/null
+++ b/recipes/xorg-app/xdm_1.1.10.bb
@@ -0,0 +1,17 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "r1"
+
+DESCRIPTION = "X display manager"
+
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt libxaw"
+
+EXTRA_OECONF += "\
+	--with-random-device=/dev/urandom --with-utmp-file=/var/run/utmp \
+	--with-wtmp-file=/var/log/wtmp \
+	"
+
+FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
+
+SRC_URI[archive.md5sum] = "329383040cdbda5b5c8ce6c7e1120c97"
+SRC_URI[archive.sha256sum] = "1487f7168e65fb7ea8cf21e99cdec412e643680c5dac9688aad5f87beba4f97f"
diff --git a/recipes/xorg-app/xdpyinfo_1.0.2.bb b/recipes/xorg-app/xdpyinfo_1.0.2.bb
index ecd7a57990..60cb11b9d8 100644
--- a/recipes/xorg-app/xdpyinfo_1.0.2.bb
+++ b/recipes/xorg-app/xdpyinfo_1.0.2.bb
@@ -6,7 +6,7 @@ DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender
 PR = "r1"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 EXTRA_OECONF = "--disable-xkb"
 
diff --git a/recipes/xorg-app/xdpyinfo_1.0.3.bb b/recipes/xorg-app/xdpyinfo_1.0.3.bb
index 8f5ad00eee..c515c77ef9 100644
--- a/recipes/xorg-app/xdpyinfo_1.0.3.bb
+++ b/recipes/xorg-app/xdpyinfo_1.0.3.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 EXTRA_OECONF = "--disable-xkb"
 
diff --git a/recipes/xorg-app/xdpyinfo_1.1.0.bb b/recipes/xorg-app/xdpyinfo_1.1.0.bb
index 62ae800377..d9641b24ff 100644
--- a/recipes/xorg-app/xdpyinfo_1.1.0.bb
+++ b/recipes/xorg-app/xdpyinfo_1.1.0.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 EXTRA_OECONF = "--disable-xkb"
 
diff --git a/recipes/xorg-app/xev_1.0.2.bb b/recipes/xorg-app/xev_1.0.2.bb
index 0342415c9e..8c22a1418c 100644
--- a/recipes/xorg-app/xev_1.0.2.bb
+++ b/recipes/xorg-app/xev_1.0.2.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "X Event Viewer"
 LICENSE = "MIT"
 PE = "1"
 
-SRC_URI += "file://diet-x11.patch;patch=1"
+SRC_URI += "file://diet-x11.patch"
 
 SRC_URI[archive.md5sum] = "e3008eb0655da3026c162a5597d70869"
 SRC_URI[archive.sha256sum] = "cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053"
diff --git a/recipes/xorg-app/xev_1.0.3.bb b/recipes/xorg-app/xev_1.0.3.bb
index 1b7dde3d4e..cb6e7cdd0f 100644
--- a/recipes/xorg-app/xev_1.0.3.bb
+++ b/recipes/xorg-app/xev_1.0.3.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "X Event Viewer"
 LICENSE = "MIT"
 PE = "1"
 
-SRC_URI += "file://diet-x11.patch;patch=1"
+SRC_URI += "file://diet-x11.patch"
 
 SRC_URI[archive.md5sum] = "a9532c3d1683c99bb5df1895cb3a60b1"
 SRC_URI[archive.sha256sum] = "d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a"
diff --git a/recipes/xorg-app/xev_1.0.4.bb b/recipes/xorg-app/xev_1.0.4.bb
index 92986a8b29..4823517a7b 100644
--- a/recipes/xorg-app/xev_1.0.4.bb
+++ b/recipes/xorg-app/xev_1.0.4.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "X Event Viewer"
 LICENSE = "MIT"
 PE = "1"
 
-SRC_URI += "file://diet-x11.patch;patch=1"
+SRC_URI += "file://diet-x11.patch"
 
 SRC_URI[archive.md5sum] = "5f98c0a2725a33d60ef4956befe078fb"
 SRC_URI[archive.sha256sum] = "7fad9c9755a624e677f44633dee218e9c22b4ba9a83e6709a6cbf8c1a501fde8"
diff --git a/recipes/xorg-app/xrandr_1.2.2.bb b/recipes/xorg-app/xrandr_1.2.2.bb
index 28e439400d..bac668e12c 100644
--- a/recipes/xorg-app/xrandr_1.2.2.bb
+++ b/recipes/xorg-app/xrandr_1.2.2.bb
@@ -5,7 +5,7 @@ LICENSE= "BSD-X"
 DEPENDS += "libxrandr libxrender"
 PE = "1"
 
-SRC_URI += "file://resolve_symbol_clash.patch;patch=1"
+SRC_URI += "file://resolve_symbol_clash.patch"
 
 SRC_URI[archive.md5sum] = "c6ec9dc42396e3b3a2da932f3feca6ec"
 SRC_URI[archive.sha256sum] = "632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303"
diff --git a/recipes/xorg-app/xrandr_1.2.3.bb b/recipes/xorg-app/xrandr_1.2.3.bb
index 902faee6ee..a972f55944 100644
--- a/recipes/xorg-app/xrandr_1.2.3.bb
+++ b/recipes/xorg-app/xrandr_1.2.3.bb
@@ -5,7 +5,7 @@ LICENSE= "BSD-X"
 DEPENDS += "libxrandr libxrender"
 PE = "1"
 
-SRC_URI += "file://resolve_symbol_clash.patch;patch=1"
+SRC_URI += "file://resolve_symbol_clash.patch"
 
 SRC_URI[archive.md5sum] = "41a9d0cc073fa6165a31fbf9e85f68a6"
 SRC_URI[archive.sha256sum] = "ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207"
diff --git a/recipes/xorg-app/xrandr_1.3.2.bb b/recipes/xorg-app/xrandr_1.3.2.bb
index 7c2e87f60b..0c937c663a 100644
--- a/recipes/xorg-app/xrandr_1.3.2.bb
+++ b/recipes/xorg-app/xrandr_1.3.2.bb
@@ -5,7 +5,7 @@ LICENSE= "BSD-X"
 DEPENDS += "libxrandr libxrender"
 PE = "1"
 
-SRC_URI += "file://resolve_symbol_clash.patch;patch=1"
+SRC_URI += "file://resolve_symbol_clash.patch"
 
 SRC_URI[archive.md5sum] = "2cb19bb1c19ccf77c40032b03dbe06f0"
 SRC_URI[archive.sha256sum] = "34d4334644a6494573141bb8647feb8f91c0ce8c8d3b6883b4861e038e912249"
diff --git a/recipes/xorg-app/xset_1.0.2.bb b/recipes/xorg-app/xset_1.0.2.bb
index 499bb0ee64..19dbaa9280 100644
--- a/recipes/xorg-app/xset_1.0.2.bb
+++ b/recipes/xorg-app/xset_1.0.2.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 CFLAGS += "-D_GNU_SOURCE"
 EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/xorg-app/xset_1.0.3.bb b/recipes/xorg-app/xset_1.0.3.bb
index 9a67ea006b..303489fd69 100644
--- a/recipes/xorg-app/xset_1.0.3.bb
+++ b/recipes/xorg-app/xset_1.0.3.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 CFLAGS += "-D_GNU_SOURCE"
 EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/xorg-app/xset_1.0.4.bb b/recipes/xorg-app/xset_1.0.4.bb
index adb1a4a54f..ac6e5bb705 100644
--- a/recipes/xorg-app/xset_1.0.4.bb
+++ b/recipes/xorg-app/xset_1.0.4.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 CFLAGS += "-D_GNU_SOURCE"
 EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/xorg-app/xset_1.1.0.bb b/recipes/xorg-app/xset_1.1.0.bb
index 824a281d7a..e568597544 100644
--- a/recipes/xorg-app/xset_1.1.0.bb
+++ b/recipes/xorg-app/xset_1.1.0.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 CFLAGS += "-D_GNU_SOURCE"
 EXTRA_OECONF = "--disable-xkb"