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

9 files changed, 82 insertions, 68 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index f10591948a..3cc807b4fc 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -21238,7 +21238,7 @@ sha256=554456550ca6e792297d6d39367120af5b2bd6181d514a43faf4e2f565721908
 md5=dc0f37d933b0b6c713ad617e09441f3b
 sha256=257722380b39e84e700e9f2d2f6600ba724723f1ed59327bfce47a57d293eeee
 
-[ftp://ftp.ruby-lang.org/pub/ruby/ruby-1.8.5.tar.gz]
+[ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.5.tar.gz]
 md5=3fbb02294a8ca33d4684055adba5ed6f
 sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
 
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 9930c89c6a..6f71787fa1 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -21,3 +21,7 @@ MACHINE_DISPLAY_PPI = "216"
 UBOOT_MACHINE = "akita_config"
 UBOOT_ENTRYPOINT = "0xA1000000"
 UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
+
+# xserver-kdrive 1.3.0.0 is still the only working version:
+XSERVER = "xserver-kdrive-1300-fbdev"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc
index 2ca00da9c7..d9f1c1ba85 100644
--- a/conf/machine/include/zaurus-kernel.inc
+++ b/conf/machine/include/zaurus-kernel.inc
@@ -6,13 +6,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 PREFERRED_PROVIDER_virtual/kernel_collie = "linux"
 PREFERRED_PROVIDER_virtual/kernel_tosa = "linux"
 
-# Increase PR everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r11"
-MACHINE_KERNEL_PR_collie = "r8"
-MACHINE_KERNEL_PR_tosa = "r4"
-
-MACHINE_KERNEL_PR_pn-linux-kexecboot = "r13"
-
 KERNEL_IMAGE_MAXSIZE = "1294336"
 KERNEL_IMAGE_MAXSIZE_collie = "1048576"
 
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 4fe62b5f43..dde1bd1499 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -27,3 +27,7 @@ MACHINE_DISPLAY_PPI = "216"
 UBOOT_MACHINE = "akita_config"
 UBOOT_ENTRYPOINT = "0xA1000000"
 UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
+
+# xserver-kdrive 1.3.0.0 is still the only working version:
+XSERVER = "xserver-kdrive-1300-fbdev"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
diff --git a/recipes/pax-utils/pax-utils-native_0.1.13.bb b/recipes/pax-utils/pax-utils-native_0.1.13.bb
index 5a56c01aa4..633e0781f0 100644
--- a/recipes/pax-utils/pax-utils-native_0.1.13.bb
+++ b/recipes/pax-utils/pax-utils-native_0.1.13.bb
@@ -3,7 +3,7 @@ inherit native
 require pax-utils_${PV}.bb
 
 do_stage() {
-    oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_prefix} install
+    oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_exec_prefix} install
 }
 
 do_install() {
diff --git a/recipes/pax-utils/pax-utils-native_0.1.19.bb b/recipes/pax-utils/pax-utils-native_0.1.19.bb
index 5a56c01aa4..633e0781f0 100644
--- a/recipes/pax-utils/pax-utils-native_0.1.19.bb
+++ b/recipes/pax-utils/pax-utils-native_0.1.19.bb
@@ -3,7 +3,7 @@ inherit native
 require pax-utils_${PV}.bb
 
 do_stage() {
-    oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_prefix} install
+    oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_exec_prefix} install
 }
 
 do_install() {
diff --git a/recipes/ruby/ruby.inc b/recipes/ruby/ruby.inc
index 978bf4b229..4fdfdca976 100644
--- a/recipes/ruby/ruby.inc
+++ b/recipes/ruby/ruby.inc
@@ -4,7 +4,8 @@ SECTION = "devel/ruby"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz \
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
            file://extmk_run.patch;patch=1 \
            file://openssl.patch;patch=1 \
            file://disable_wide_getaddrinfo_check.patch;patch=1"
diff --git a/recipes/xorg-xserver/xserver-kdrive-1300_1.3.0.0.bb b/recipes/xorg-xserver/xserver-kdrive-1300_1.3.0.0.bb
new file mode 100644
index 0000000000..36ea30955d
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1300_1.3.0.0.bb
@@ -0,0 +1,10 @@
+# Build xserver-kdrive as xserver-kdrive-1300 to allow them to co-exist in feeds.
+# akita and spitz needs them:
+FILESPATH = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xserver-kdrive-1.3.0.0:${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xserver-kdrive:${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files"
+
+PKGN = xserver-kdrive-1300
+require xserver-kdrive_1.3.0.0.bb
+
+RPROVIDES_${PN} += xserver-kdrive
+RPROVIDES_${PN}-dev += xserver-kdrive-dev
+RPROVIDES_${PN}-doc += xserver-kdrive-doc
diff --git a/recipes/xorg-xserver/xserver-kdrive-common.inc b/recipes/xorg-xserver/xserver-kdrive-common.inc
index bcd3d684eb..b00893da6d 100644
--- a/recipes/xorg-xserver/xserver-kdrive-common.inc
+++ b/recipes/xorg-xserver/xserver-kdrive-common.inc
@@ -2,72 +2,74 @@ LICENSE = "MIT"
 DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto scrnsaverproto xineramaproto videoproto xextproto xproto \
 	libxau libxext libxdmcp libxfont libxrandr tslib virtual/libx11 xtrans"
 
+PKGN ?= "xserver-kdrive"
+
 PROVIDES = "virtual/xserver"
-PACKAGES =+ "xserver-kdrive-fbdev \
-             xserver-kdrive-sdl \
-             xserver-kdrive-fake \
-             xserver-kdrive-xephyr \
-             xserver-kdrive-epson \
-             xserver-kdrive-ati \
-             xserver-kdrive-chips \
-             xserver-kdrive-i810 \
-             xserver-kdrive-mach64 \
-             xserver-kdrive-mga \
-             xserver-kdrive-neomagic \
-             xserver-kdrive-nvidia \
-             xserver-kdrive-pm2 \
-             xserver-kdrive-r128 \
-             xserver-kdrive-smi \
-             xserver-kdrive-vesa \
-             xserver-kdrive-via \
-             xserver-kdrive-w100 \	
- 	"
+PACKAGES =+ "${PKGN}-fbdev \
+             ${PKGN}-sdl \
+             ${PKGN}-fake \
+             ${PKGN}-xephyr \
+             ${PKGN}-epson \
+             ${PKGN}-ati \
+             ${PKGN}-chips \
+             ${PKGN}-i810 \
+             ${PKGN}-mach64 \
+             ${PKGN}-mga \
+             ${PKGN}-neomagic \
+             ${PKGN}-nvidia \
+             ${PKGN}-pm2 \
+             ${PKGN}-r128 \
+             ${PKGN}-smi \
+             ${PKGN}-vesa \
+             ${PKGN}-via \
+             ${PKGN}-w100 \
+        "
 
 SECTION = "x11/base"
 DESCRIPTION = "X server from freedesktop.org"
-DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
-DESCRIPTION_xserver-kdrive-fake = "Fake X server"
-DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
-DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
-DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version"
-DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset"
-DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
-DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets"
-DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets"
-DESCRIPTION_xserver-kdrive-imageon = "X server from freedesktop.org, supporting the ATI imageon 100 chipset"
-DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting mach64 chipsets"
-DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting mga chipsets"
-DESCRIPTION_xserver-kdrive-neomagic = "X server from freedesktop.org, supporting neomagic chipsets"
-DESCRIPTION_xserver-kdrive-nvidia = "X server from freedesktop.org, supporting nvidia devices"
-DESCRIPTION_xserver-kdrive-pm2 = "X server from freedesktop.org, supporting Permedia2 chipsets"
-DESCRIPTION_xserver-kdrive-r128 = "X server from freedesktop.org, supporting rage128 chipsets"
-DESCRIPTION_xserver-kdrive-smi = "X server from freedesktop.org, supporting Silicon Motion devices"
-DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting any card with a VESA, VGA or even EGA BIOS. x86 hardware only"
-DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA chipsets"
+DESCRIPTION_${PKGN}-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
+DESCRIPTION_${PKGN}-fake = "Fake X server"
+DESCRIPTION_${PKGN}-xephyr = "X server in an X window"
+DESCRIPTION_${PKGN}-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
+DESCRIPTION_${PKGN}-sdl = "X server from freedesktop.org, SDL version"
+DESCRIPTION_${PKGN}-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset"
+DESCRIPTION_${PKGN}-ati = "X server from freedesktop.org, supporting ATI devices"
+DESCRIPTION_${PKGN}-chips = "X server from freedesktop.org, supporting Chips chipsets"
+DESCRIPTION_${PKGN}-i810 = "X server from freedesktop.org, supporting Intel chipsets"
+DESCRIPTION_${PKGN}-imageon = "X server from freedesktop.org, supporting the ATI imageon 100 chipset"
+DESCRIPTION_${PKGN}-mach64 = "X server from freedesktop.org, supporting mach64 chipsets"
+DESCRIPTION_${PKGN}-mga = "X server from freedesktop.org, supporting mga chipsets"
+DESCRIPTION_${PKGN}-neomagic = "X server from freedesktop.org, supporting neomagic chipsets"
+DESCRIPTION_${PKGN}-nvidia = "X server from freedesktop.org, supporting nvidia devices"
+DESCRIPTION_${PKGN}-pm2 = "X server from freedesktop.org, supporting Permedia2 chipsets"
+DESCRIPTION_${PKGN}-r128 = "X server from freedesktop.org, supporting rage128 chipsets"
+DESCRIPTION_${PKGN}-smi = "X server from freedesktop.org, supporting Silicon Motion devices"
+DESCRIPTION_${PKGN}-vesa = "X server from freedesktop.org, supporting any card with a VESA, VGA or even EGA BIOS. x86 hardware only"
+DESCRIPTION_${PKGN}-via = "X server from freedesktop.org, supporting VIA chipsets"
 
 PACKAGES =+ "xserver-security-policy"
 FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy"
 RRECOMMENDS_${PN} += "xserver-security-policy"
 
-FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
-FILES_xserver-kdrive-fake = "${bindir}/Xfake"
-FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
-FILES_xserver-kdrive-epson = "${bindir}/Xepson"
-FILES_xserver-kdrive-sdl = "${bindir}/Xsdl"
-FILES_xserver-kdrive-w100 = "${bindir}/Xw100"
-FILES_xserver-kdrive-ati = "${bindir}/Xati"
-FILES_xserver-kdrive-chips = "${bindir}/Xchips"
-FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
-FILES_xserver-kdrive-imageon = "${bindir}/Ximageon"
-FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
-FILES_xserver-kdrive-mga = "${bindir}/Xmga"
-FILES_xserver-kdrive-neomagic = "${bindir}/Xneomagic"
-FILES_xserver-kdrive-nvidia = "${bindir}/Xnvidia"
-FILES_xserver-kdrive-pm2 = "${bindir}/Xpm2"
-FILES_xserver-kdrive-r128 = "${bindir}/Xr128"
-FILES_xserver-kdrive-smi = "${bindir}/Xsmi"
-FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
-FILES_xserver-kdrive-via = "${bindir}/Xvia"
+FILES_${PKGN}-fbdev = "${bindir}/Xfbdev"
+FILES_${PKGN}-fake = "${bindir}/Xfake"
+FILES_${PKGN}-xephyr = "${bindir}/Xephyr"
+FILES_${PKGN}-epson = "${bindir}/Xepson"
+FILES_${PKGN}-sdl = "${bindir}/Xsdl"
+FILES_${PKGN}-w100 = "${bindir}/Xw100"
+FILES_${PKGN}-ati = "${bindir}/Xati"
+FILES_${PKGN}-chips = "${bindir}/Xchips"
+FILES_${PKGN}-i810 = "${bindir}/Xi810"
+FILES_${PKGN}-imageon = "${bindir}/Ximageon"
+FILES_${PKGN}-mach64 = "${bindir}/Xmach64"
+FILES_${PKGN}-mga = "${bindir}/Xmga"
+FILES_${PKGN}-neomagic = "${bindir}/Xneomagic"
+FILES_${PKGN}-nvidia = "${bindir}/Xnvidia"
+FILES_${PKGN}-pm2 = "${bindir}/Xpm2"
+FILES_${PKGN}-r128 = "${bindir}/Xr128"
+FILES_${PKGN}-smi = "${bindir}/Xsmi"
+FILES_${PKGN}-vesa = "${bindir}/Xvesa"
+FILES_${PKGN}-via = "${bindir}/Xvia"
 
 SRC_URI ?= "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES}"