diff options
Diffstat (limited to 'recipes')
17 files changed, 311 insertions, 21 deletions
diff --git a/recipes/dri/libdrm_2.4.11.bb b/recipes/dri/libdrm_2.4.11.bb index 0ea2396372..4f2af1ed73 100644 --- a/recipes/dri/libdrm_2.4.11.bb +++ b/recipes/dri/libdrm_2.4.11.bb @@ -3,9 +3,14 @@ DEPENDS = "libpthread-stubs" LICENSE = "MIT" SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" PROVIDES = "drm" +PR = "r1" inherit autotools pkgconfig do_stage() { autotools_stage_all } + +PACKAGES =+ "${PN}-intel" + +FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" diff --git a/recipes/imagemagick/imagemagick_6.3.5-10.bb b/recipes/imagemagick/imagemagick_6.3.5-10.bb index 7b92a8252e..cf9e82f3e2 100644 --- a/recipes/imagemagick/imagemagick_6.3.5-10.bb +++ b/recipes/imagemagick/imagemagick_6.3.5-10.bb @@ -2,7 +2,7 @@ DESCRIPTION = "ImageMagick is an image convertion tools" SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "tiff" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \ file://PerlMagic_MakePatch;patch=1 \ diff --git a/recipes/libtool/libtool-cross_2.2.4.bb b/recipes/libtool/libtool-cross_2.2.4.bb index fab8aa4d42..dd8b598fde 100644 --- a/recipes/libtool/libtool-cross_2.2.4.bb +++ b/recipes/libtool/libtool-cross_2.2.4.bb @@ -1,6 +1,6 @@ require libtool.inc require libtool_${PV}.bb -PR = "r23" +PR = "r24" SRC_URI += "\ file://cross_compile.patch;patch=1 \ @@ -22,6 +22,11 @@ prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" bindir = "${STAGING_BINDIR_NATIVE}" +# skip ac_cv_... setting for cross build: host paths must be used +do_configure_prepend () { + export LIBTOOL_BB_DO_NOT_SET_PATHS=1 +} + do_compile () { : } diff --git a/recipes/libtool/libtool-cross_2.2.6a.bb b/recipes/libtool/libtool-cross_2.2.6a.bb index 8030df3aaa..1b2defb43f 100644 --- a/recipes/libtool/libtool-cross_2.2.6a.bb +++ b/recipes/libtool/libtool-cross_2.2.6a.bb @@ -1,6 +1,6 @@ require libtool.inc require libtool_${PV}.bb -PR = "r0" +PR = "r1" SRC_URI += "\ file://cross_compile.patch;patch=1 \ @@ -20,6 +20,11 @@ prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" bindir = "${STAGING_BINDIR_NATIVE}" +# skip ac_cv_... setting for cross build: host paths must be used +do_configure_prepend () { + export LIBTOOL_BB_DO_NOT_SET_PATHS=1 +} + do_compile () { : } diff --git a/recipes/libtool/libtool-sdk_2.2.4.bb b/recipes/libtool/libtool-sdk_2.2.4.bb index e92c4dbfaf..f2c3c628b0 100644 --- a/recipes/libtool/libtool-sdk_2.2.4.bb +++ b/recipes/libtool/libtool-sdk_2.2.4.bb @@ -1,7 +1,7 @@ require libtool.inc require libtool_${PV}.bb -PR = "r1" +PR = "r2" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" SRC_URI_append = " file://cross_compile.patch;patch=1" @@ -9,6 +9,11 @@ S = "${WORKDIR}/libtool-${PV}" inherit sdk +# skip ac_cv_... setting for cross build: host paths must be used +do_configure_prepend () { + export LIBTOOL_BB_DO_NOT_SET_PATHS=1 +} + do_install () { install -d ${D}${bindir}/ install -m 0755 libtool ${D}${bindir}/ diff --git a/recipes/libtool/libtool-sdk_2.2.6a.bb b/recipes/libtool/libtool-sdk_2.2.6a.bb index 26248147c5..88ec4df8c0 100644 --- a/recipes/libtool/libtool-sdk_2.2.6a.bb +++ b/recipes/libtool/libtool-sdk_2.2.6a.bb @@ -1,11 +1,16 @@ require libtool.inc require libtool_${PV}.bb -PR = "r0" +PR = "r1" SRC_URI_append = " file://cross_compile.patch;patch=1" inherit sdk +# skip ac_cv_... setting for cross build: host paths must be used +do_configure_prepend () { + export LIBTOOL_BB_DO_NOT_SET_PATHS=1 +} + do_install () { install -d ${D}${bindir}/ install -m 0755 libtool ${D}${bindir}/ diff --git a/recipes/libtool/libtool_2.2.4.bb b/recipes/libtool/libtool_2.2.4.bb index 5d59ce006d..8e6682f096 100644 --- a/recipes/libtool/libtool_2.2.4.bb +++ b/recipes/libtool/libtool_2.2.4.bb @@ -1,5 +1,5 @@ require libtool.inc -PR = "r16" +PR = "r17" SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz" S = "${WORKDIR}/libtool-${PV}" @@ -17,10 +17,12 @@ EXTRA_AUTORECONF = "--exclude=libtoolize" do_configure_prepend () { # Skip this for native build: if test -n "$CONFIG_SITE" ; then - export ac_cv_path_SED="${ac_cv_path_GREP=/bin/sed}" - export ac_cv_path_GREP="${ac_cv_path_GREP=/bin/grep}" - export ac_cv_path_EGREP="${ac_cv_path_EGREP=/bin/grep -E}" - export ac_cv_path_FGREP="${ac_cv_path_FGREP=/bin/grep -F}" + if test -z "$LIBTOOL_BB_DO_NOT_SET_PATHS" ; then + export ac_cv_path_SED="${ac_cv_path_SED=/bin/sed}" + export ac_cv_path_GREP="${ac_cv_path_GREP=/bin/grep}" + export ac_cv_path_EGREP="${ac_cv_path_EGREP=/bin/grep -E}" + export ac_cv_path_FGREP="${ac_cv_path_FGREP=/bin/grep -F}" + fi fi } diff --git a/recipes/libtool/libtool_2.2.6a.bb b/recipes/libtool/libtool_2.2.6a.bb index 3eb2080f2f..e2996c7198 100644 --- a/recipes/libtool/libtool_2.2.6a.bb +++ b/recipes/libtool/libtool_2.2.6a.bb @@ -19,10 +19,12 @@ EXTRA_AUTORECONF = "--exclude=libtoolize" do_configure_prepend () { # Skip this for native build: if test -n "$CONFIG_SITE" ; then - export ac_cv_path_SED="${ac_cv_path_SED=/bin/sed}" - export ac_cv_path_GREP="${ac_cv_path_GREP=/bin/grep}" - export ac_cv_path_EGREP="${ac_cv_path_EGREP=/bin/grep -E}" - export ac_cv_path_FGREP="${ac_cv_path_FGREP=/bin/grep -F}" + if test -z "$LIBTOOL_BB_DO_NOT_SET_PATHS" ; then + export ac_cv_path_SED="${ac_cv_path_SED=/bin/sed}" + export ac_cv_path_GREP="${ac_cv_path_GREP=/bin/grep}" + export ac_cv_path_EGREP="${ac_cv_path_EGREP=/bin/grep -E}" + export ac_cv_path_FGREP="${ac_cv_path_FGREP=/bin/grep -F}" + fi fi } diff --git a/recipes/meta/meta-toolchain-qte.bb b/recipes/meta/meta-toolchain-qte.bb index 49ed35ee0f..70c4087211 100644 --- a/recipes/meta/meta-toolchain-qte.bb +++ b/recipes/meta/meta-toolchain-qte.bb @@ -1,11 +1,12 @@ # Qt Embedded toolchain - -require meta-toolchain.bb - +PR = "r1" TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host" TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target" +require meta-toolchain.bb SDK_SUFFIX = "toolchain-qte" + + QT_DIR_NAME = "qtopia" do_populate_sdk_append() { diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index 79240eda12..50dd1d8760 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -123,11 +123,11 @@ do_configure() { unset QMAKESPEC unset QTDIR - if [! -e bin/qmake]; then + if [ ! -e bin/qmake ]; then ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake fi - if [! -e mkspecs/${TARGET_OS}-oe-g++]; then + if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ fi diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb index 90fbb1a8f4..d288091ea1 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb +++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Machine specific xorg.conf files" -PR = "r6" +PR = "r7" SRC_URI = "file://xorg.conf" @@ -9,4 +9,4 @@ do_install() { } CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf" - +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes/xserver-common/xserver-common-1.30/0018-zaurus-fixed-machine-names.patch b/recipes/xserver-common/xserver-common-1.30/0018-zaurus-fixed-machine-names.patch new file mode 100644 index 0000000000..d6d6aa80f1 --- /dev/null +++ b/recipes/xserver-common/xserver-common-1.30/0018-zaurus-fixed-machine-names.patch @@ -0,0 +1,35 @@ +From a287e6414a765926fc7b169617bc1174370bc183 Mon Sep 17 00:00:00 2001 +From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> +Date: Mon, 20 Jul 2009 18:57:56 +0200 +Subject: [PATCH 18/22] zaurus: fixed machine names + + +Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> +--- + X11/Xinit.d/11zaurus | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/X11/Xinit.d/11zaurus b/X11/Xinit.d/11zaurus +index 02090be..54ea6f5 100644 +--- a/X11/Xinit.d/11zaurus ++++ b/X11/Xinit.d/11zaurus +@@ -13,14 +13,14 @@ fi + $CHCK -e + if [ $? = 12 ]; then + case `machine_id` in +- *Spitz | *Akita | *Borzoi) ++ *spitz | *akita | *borzoi) + DIRECTION="normal" ;; + *) + DIRECTION="right" ;; + esac + else + case `machine_id` in +- *Spitz | *Akita | *Borzoi) ++ *spitz | *akita | *borzoi) + # Xfbdev needs to settle + sleep 2 + DIRECTION="right" ;; +-- +1.6.3.3 + diff --git a/recipes/xserver-common/xserver-common-1.30/0019-keymap-fixed-machine-names.patch b/recipes/xserver-common/xserver-common-1.30/0019-keymap-fixed-machine-names.patch new file mode 100644 index 0000000000..9a4e561518 --- /dev/null +++ b/recipes/xserver-common/xserver-common-1.30/0019-keymap-fixed-machine-names.patch @@ -0,0 +1,59 @@ +From e564699c60d69148e19150dc9d2105734b1df7e1 Mon Sep 17 00:00:00 2001 +From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> +Date: Mon, 20 Jul 2009 18:58:54 +0200 +Subject: [PATCH 19/22] keymap: fixed machine names + + +Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> +--- + X11/Xinit.d/12keymap | 18 +++++++++--------- + 1 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/X11/Xinit.d/12keymap b/X11/Xinit.d/12keymap +index 0a909d0..cfa9750 100644 +--- a/X11/Xinit.d/12keymap ++++ b/X11/Xinit.d/12keymap +@@ -1,31 +1,31 @@ + #!/bin/sh + +-MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo` ++. /etc/init.d/functions + + # since kdrive 1.4 there is no default keymap in server + xmodmap - </etc/X11/xmodmap/default.xmodmap + +-case $MACHINE in +- "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") ++case `machine_id` in ++ "sharp shepherd" | "sharp husky" | "sharp corgi") + xmodmap - < /etc/X11/xmodmap/shepherd.xmodmap + ;; +- "SHARP Akita" | "SHARP Borzoi" | "SHARP Spitz") ++ "sharp akita" | "sharp borzoi" | "sharp spitz") + xmodmap - < /etc/X11/xmodmap/slcXXXX.xmodmap + ;; +- "SHARP Poodle") ++ "sharp poodle") + xmodmap - < /etc/X11/xmodmap/poodle.xmodmap + ;; +- "Sharp-Collie") ++ "sharp-collie") + xmodmap - < /etc/X11/xmodmap/collie.xmodmap + ;; +- "HP iPAQ h6300") ++ "hp ipaq h6300") + xmodmap - < /etc/X11/xmodmap/h6300.xmodmap + ;; +- "TI-OSK") ++ "ti-osk") + xmodmap - < /etc/X11/xmodmap/omap5912osk.xmodmap + ;; + # All the rest of keyboardless PDA machines use common buttonmap +- "Simpad" | "HP iPAQ"* | "Asus MyPal"*) ++ "simpad" | "hp ipaq"* | "asus mypal"*) + xmodmap - < /etc/X11/xmodmap/keyboardless.xmodmap + ;; + esac +-- +1.6.3.3 + diff --git a/recipes/xserver-common/xserver-common-1.30/0020-keymap-fixed-machine-names-again.patch b/recipes/xserver-common/xserver-common-1.30/0020-keymap-fixed-machine-names-again.patch new file mode 100644 index 0000000000..f14f5ae3b2 --- /dev/null +++ b/recipes/xserver-common/xserver-common-1.30/0020-keymap-fixed-machine-names-again.patch @@ -0,0 +1,50 @@ +From f216da13941685575786e617c2cc072edd5b210c Mon Sep 17 00:00:00 2001 +From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> +Date: Mon, 20 Jul 2009 19:01:08 +0200 +Subject: [PATCH 20/22] keymap: fixed machine names again + + +Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> +--- + X11/Xinit.d/12keymap | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/X11/Xinit.d/12keymap b/X11/Xinit.d/12keymap +index cfa9750..7eac296 100644 +--- a/X11/Xinit.d/12keymap ++++ b/X11/Xinit.d/12keymap +@@ -6,26 +6,26 @@ + xmodmap - </etc/X11/xmodmap/default.xmodmap + + case `machine_id` in +- "sharp shepherd" | "sharp husky" | "sharp corgi") ++ "sharp_shepherd" | "sharp_husky" | "sharp_corgi") + xmodmap - < /etc/X11/xmodmap/shepherd.xmodmap + ;; +- "sharp akita" | "sharp borzoi" | "sharp spitz") ++ "sharp_akita" | "sharp_borzoi" | "sharp_spitz") + xmodmap - < /etc/X11/xmodmap/slcXXXX.xmodmap + ;; +- "sharp poodle") ++ "sharp_poodle") + xmodmap - < /etc/X11/xmodmap/poodle.xmodmap + ;; + "sharp-collie") + xmodmap - < /etc/X11/xmodmap/collie.xmodmap + ;; +- "hp ipaq h6300") ++ "hp_ipaq_h6300") + xmodmap - < /etc/X11/xmodmap/h6300.xmodmap + ;; + "ti-osk") + xmodmap - < /etc/X11/xmodmap/omap5912osk.xmodmap + ;; + # All the rest of keyboardless PDA machines use common buttonmap +- "simpad" | "hp ipaq"* | "asus mypal"*) ++ "simpad" | "hp_ipaq"* | "asus_mypal"*) + xmodmap - < /etc/X11/xmodmap/keyboardless.xmodmap + ;; + esac +-- +1.6.3.3 + diff --git a/recipes/xserver-common/xserver-common-1.30/0021-xserver-introduced-MOUSE-variable-for-mouse-argument.patch b/recipes/xserver-common/xserver-common-1.30/0021-xserver-introduced-MOUSE-variable-for-mouse-argument.patch new file mode 100644 index 0000000000..4d9bfa21e8 --- /dev/null +++ b/recipes/xserver-common/xserver-common-1.30/0021-xserver-introduced-MOUSE-variable-for-mouse-argument.patch @@ -0,0 +1,63 @@ +From 3ada7e341334766f6be27164dbb43a3715faf580 Mon Sep 17 00:00:00 2001 +From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> +Date: Tue, 21 Jul 2009 13:36:17 +0200 +Subject: [PATCH 21/22] xserver: introduced MOUSE variable for "-mouse" argument + +MOUSE is not passed in ARGS if Xorg server is used as it is KDrive only. + +Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> +--- + X11/Xserver | 13 +++++++++---- + 1 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/X11/Xserver b/X11/Xserver +index 25ce816..e7e88d9 100755 +--- a/X11/Xserver ++++ b/X11/Xserver +@@ -46,19 +46,20 @@ export XSERVER_DEFAULT_ORIENTATION=normal + + ARGS="-br -pn $INPUT_EXTRA_ARGS" + DPI="100" ++MOUSE="" + + # use ucb 1x00 touchscreen if present + if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then +- ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00" ++ MOUSE="-mouse /dev/touchscreen/ucb1x00" + fi + + # kdrive 1.4 onwards needs -mouse args + # Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically + if [ -e "$TSLIB_TSDEVICE" ] ; then +- ARGS="$ARGS -mouse tslib" ++ MOUSE="-mouse tslib" + else + if [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then +- ARGS="$ARGS -mouse mouse" ++ MOUSE="-mouse mouse" + fi + fi + +@@ -103,7 +104,7 @@ else + ARGS="$ARGS -rgba rgb" + DPI="100" ;; + "generic_omap1510/1610/1710") +- ARGS="$ARGS -mouse /dev/input/event0" ++ MOUSE="-mouse /dev/input/event0" + DPI="220" ;; + "ti-osk") + DPI="100" ;; +@@ -183,6 +184,10 @@ else + esac + fi + ++if [ "$XSERVER" != "Xorg" ] ; then ++ ARGS="$ARGS $MOUSE" ++fi ++ + echo "tslib: $TSLIB_TSDEVICE" + echo "exec $XSERVER $ARGS -dpi $DPI $*" + exec $XSERVER $ARGS -dpi $DPI $* +-- +1.6.3.3 + diff --git a/recipes/xserver-common/xserver-common-1.30/0022-xserver-fix-syntax-error.patch b/recipes/xserver-common/xserver-common-1.30/0022-xserver-fix-syntax-error.patch new file mode 100644 index 0000000000..e96fabf064 --- /dev/null +++ b/recipes/xserver-common/xserver-common-1.30/0022-xserver-fix-syntax-error.patch @@ -0,0 +1,27 @@ +From 00cbc2b27c7df84d7837760e05ac13b686e6bfa9 Mon Sep 17 00:00:00 2001 +From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> +Date: Thu, 23 Jul 2009 12:04:12 +0200 +Subject: [PATCH 22/22] xserver: fix syntax error + + +Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> +--- + X11/Xserver | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/X11/Xserver b/X11/Xserver +index e7e88d9..3d93a0a 100755 +--- a/X11/Xserver ++++ b/X11/Xserver +@@ -63,7 +63,7 @@ else + fi + fi + +-if [ -e /etc/default/xserver ] ++if [ -e /etc/default/xserver ] ; then + . /etc/default/xserver + else + # start off server in conventional location. +-- +1.6.3.3 + diff --git a/recipes/xserver-common/xserver-common_1.30.bb b/recipes/xserver-common/xserver-common_1.30.bb new file mode 100644 index 0000000000..3f3e7f889f --- /dev/null +++ b/recipes/xserver-common/xserver-common_1.30.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" +PR = "r2" + +PACKAGE_ARCH = "all" +DEFAULT_PREFERENCE = "-1" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh \ + file://89xdgautostart.sh \ +file://0018-zaurus-fixed-machine-names.patch;patch=1 \ +file://0019-keymap-fixed-machine-names.patch;patch=1 \ +file://0020-keymap-fixed-machine-names-again.patch;patch=1 \ +file://0021-xserver-introduced-MOUSE-variable-for-mouse-argument.patch;patch=1 \ +file://0022-xserver-fix-syntax-error.patch;patch=1 \ +" + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" + install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xsession.d/89xdgautostart" + sed -i 's:^BINDIR=.*$:BINDIR=${bindir}:' ${D}/etc/X11/Xserver +} |