[PATCH 1/3] zaurusd: enable support for collie

[PATCH 1/3] zaurusd: enable support for collie

[Dmitry Eremin-Solenikov]

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 .../0001-zaurusd-add-support-for-collie.patch      |   50 ++++++++++++++++++++
 meta/recipes-bsp/zaurusd/zaurusd_git.bb            |    3 +-
 2 files changed, 52 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch

diff --git a/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch b/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
new file mode 100644
index 0000000..36ded13
--- /dev/null
+++ b/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
@@ -0,0 +1,50 @@
+From 85b94bed1feab70bc529a59fb80c26da825b9abe Mon Sep 17 00:00:00 2001
+From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+Date: Fri, 5 Aug 2011 16:00:10 +0400
+Subject: [PATCH] zaurusd: add support for collie
+Upstream-Status: Pending
+
+Note: alsa mixer support is disabled, as collie doesn't support sound (yet).
+
+Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+---
+ config/mach-config/mach-collie-functions |    4 ++++
+ config/mach-config/mach-collie-vars.in   |    3 +++
+ configure.ac                             |    1 +
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+ create mode 100644 config/mach-config/mach-collie-functions
+ create mode 100644 config/mach-config/mach-collie-vars.in
+
+diff --git a/config/mach-config/mach-collie-functions b/config/mach-config/mach-collie-functions
+new file mode 100644
+index 0000000..4d77c53
+--- /dev/null
++++ b/config/mach-config/mach-collie-functions
+@@ -0,0 +1,4 @@
++HAVE_INPUT_SWITCHES=0
++HAVE_TSKEYS=0
++HAVE_ALSA_MIXER=0
++
+diff --git a/config/mach-config/mach-collie-vars.in b/config/mach-config/mach-collie-vars.in
+new file mode 100644
+index 0000000..ec1bfb8
+--- /dev/null
++++ b/config/mach-config/mach-collie-vars.in
+@@ -0,0 +1,3 @@
++MACHINE=collie
++
++ALSA_MIXER_INIT=@appconfdir@/alsa/5500-default.state
+diff --git a/configure.ac b/configure.ac
+index 78ea2ae..5160fab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,6 +65,7 @@ AC_CONFIG_FILES([
+   config/config
+   config/mach-config/mach-akita-vars
+   config/mach-config/mach-borzoi-vars
++  config/mach-config/mach-collie-vars
+   config/mach-config/mach-corgi-vars
+   config/mach-config/mach-husky-vars
+   config/mach-config/mach-poodle-vars
+--
+1.7.2.5
diff --git a/meta/recipes-bsp/zaurusd/zaurusd_git.bb b/meta/recipes-bsp/zaurusd/zaurusd_git.bb
index 3b8cc43..ebc3c66 100644
--- a/meta/recipes-bsp/zaurusd/zaurusd_git.bb
+++ b/meta/recipes-bsp/zaurusd/zaurusd_git.bb
@@ -7,9 +7,10 @@ RDEPENDS_${PN} = "xrandr"
 
 SRCREV = "82b30c7865f007fff81372c3cdc71b2ff6843ccc"
 PV = "0.1+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
+	file://0001-zaurusd-add-support-for-collie.patch \
 	file://fix_makefile.patch"
 
 S = "${WORKDIR}/git"
-- 
1.7.2.5

[PATCH 2/3] icu-3.6: fix building with big make -j

[Dmitry Eremin-Solenikov]

icu-3.6 buildsystem contains small problem which causes some parallel
builds to fail. Fix that.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 .../icu/files/fix-parallel-build.patch             |   19 +++++++++++++++++++
 meta/recipes-support/icu/icu-3.6.inc               |    1 +
 2 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-support/icu/files/fix-parallel-build.patch

diff --git a/meta/recipes-support/icu/files/fix-parallel-build.patch b/meta/recipes-support/icu/files/fix-parallel-build.patch
new file mode 100644
index 0000000..5b01a4c
--- /dev/null
+++ b/meta/recipes-support/icu/files/fix-parallel-build.patch
@@ -0,0 +1,19 @@
+Upstream-Status: pending
+
+Fix parallel builds
+
+Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+
+Index: source/data/Makefile.in
+===================================================================
+--- source.orig/data/Makefile.in	2011-09-02 02:03:37.000000000 +0400
++++ source/data/Makefile.in	2011-09-02 02:06:26.000000000 +0400
+@@ -351,8 +351,8 @@
+ endif
+
+
+-build-dir: $(BUILD_DIRS)
+-$(BUILD_DIRS):
++$(MAINBUILDDIR) $(BUILD_DIRS): build-dir
++build-dir:
+	-$(MKINSTALLDIRS) $(BUILD_DIRS)
diff --git a/meta/recipes-support/icu/icu-3.6.inc b/meta/recipes-support/icu/icu-3.6.inc
index 1c611bd..18efd16 100644
--- a/meta/recipes-support/icu/icu-3.6.inc
+++ b/meta/recipes-support/icu/icu-3.6.inc
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www-01.ibm.com/software/globalization/icu/index.jsp"
 
 BASE_SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \
            file://gccfix.patch;apply=yes \
+           file://fix-parallel-build.patch \
            file://use-g++-for-linking.patch;apply=yes"
 SRC_URI = "${BASE_SRC_URI} \
            file://noldlibpath.patch;apply=yes"
-- 
1.7.2.5

[PATCH 3/3] qt-demo-init: fix init script

[Dmitry Eremin-Solenikov]

qt-demo-init initscript lacks some quotes, which makes it bave not fulle
correct. Fix that.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init |    8 ++++----
 meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb      |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init b/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
index affb958..0748fcd 100644
--- a/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
+++ b/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
@@ -14,11 +14,11 @@ case "$1" in
 	if [ -f /etc/profile.d/tslib.sh ]; then
 		source /etc/profile.d/tslib.sh
 	fi
-	if [ -e $TSLIB_TSDEVICE ]; then
+	if [ -e "$TSLIB_TSDEVICE" ]; then
 		if [ ! -f /etc/pointercal ]; then
 			/usr/bin/ts_calibrate
 		fi
-		if [ $QTDEMO == qtdemo ]; then
+		if [ "$QTDEMO" == qtdemo ]; then
 			Xorg &
 			export DISPLAY=:0
 			$QTDEMO &
@@ -26,7 +26,7 @@ case "$1" in
 			QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO &
 		fi
 	else
-		if [ $QTDEMO == qtdemo ]; then
+		if [ "$QTDEMO" == qtdemo ]; then
 			Xorg &
 			export DISPLAY=:0
 		fi
@@ -35,7 +35,7 @@ case "$1" in
 	;;
   stop)
 	echo "Stopping qtdemo"
-	if [ $QTDEMO == qtdemo ]; then
+	if [ "$QTDEMO" == qtdemo ]; then
 		killall Xorg
 		killall qtdemo
 	else
diff --git a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
index 8d0dd19..0f089ad 100644
--- a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
+++ b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Init script for qtdemo"
 LICENSE = "MIT"
 SRC_URI = "file://qtdemo-init"
-PR = "r2"
+PR = "r3"
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-- 
1.7.2.5

Re: [PATCH 1/3] zaurusd: enable support for collie

[Koen Kooi]

shouldn't this move to meta-zaurus now that oe-core is qemu only?

Op 3 sep. 2011, om 20:22 heeft Dmitry Eremin-Solenikov het volgende geschreven:

> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
> .../0001-zaurusd-add-support-for-collie.patch      |   50 ++++++++++++++++++++
> meta/recipes-bsp/zaurusd/zaurusd_git.bb            |    3 +-
> 2 files changed, 52 insertions(+), 1 deletions(-)
> create mode 100644 meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
> 
> diff --git a/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch b/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
> new file mode 100644
> index 0000000..36ded13
> --- /dev/null
> +++ b/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
> @@ -0,0 +1,50 @@
> +From 85b94bed1feab70bc529a59fb80c26da825b9abe Mon Sep 17 00:00:00 2001
> +From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> +Date: Fri, 5 Aug 2011 16:00:10 +0400
> +Subject: [PATCH] zaurusd: add support for collie
> +Upstream-Status: Pending
> +
> +Note: alsa mixer support is disabled, as collie doesn't support sound (yet).
> +
> +Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> +---
> + config/mach-config/mach-collie-functions |    4 ++++
> + config/mach-config/mach-collie-vars.in   |    3 +++
> + configure.ac                             |    1 +
> + 3 files changed, 8 insertions(+), 0 deletions(-)
> + create mode 100644 config/mach-config/mach-collie-functions
> + create mode 100644 config/mach-config/mach-collie-vars.in
> +
> +diff --git a/config/mach-config/mach-collie-functions b/config/mach-config/mach-collie-functions
> +new file mode 100644
> +index 0000000..4d77c53
> +--- /dev/null
> ++++ b/config/mach-config/mach-collie-functions
> +@@ -0,0 +1,4 @@
> ++HAVE_INPUT_SWITCHES=0
> ++HAVE_TSKEYS=0
> ++HAVE_ALSA_MIXER=0
> ++
> +diff --git a/config/mach-config/mach-collie-vars.in b/config/mach-config/mach-collie-vars.in
> +new file mode 100644
> +index 0000000..ec1bfb8
> +--- /dev/null
> ++++ b/config/mach-config/mach-collie-vars.in
> +@@ -0,0 +1,3 @@
> ++MACHINE=collie
> ++
> ++ALSA_MIXER_INIT=@appconfdir@/alsa/5500-default.state
> +diff --git a/configure.ac b/configure.ac
> +index 78ea2ae..5160fab 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -65,6 +65,7 @@ AC_CONFIG_FILES([
> +   config/config
> +   config/mach-config/mach-akita-vars
> +   config/mach-config/mach-borzoi-vars
> ++  config/mach-config/mach-collie-vars
> +   config/mach-config/mach-corgi-vars
> +   config/mach-config/mach-husky-vars
> +   config/mach-config/mach-poodle-vars
> +--
> +1.7.2.5
> diff --git a/meta/recipes-bsp/zaurusd/zaurusd_git.bb b/meta/recipes-bsp/zaurusd/zaurusd_git.bb
> index 3b8cc43..ebc3c66 100644
> --- a/meta/recipes-bsp/zaurusd/zaurusd_git.bb
> +++ b/meta/recipes-bsp/zaurusd/zaurusd_git.bb
> @@ -7,9 +7,10 @@ RDEPENDS_${PN} = "xrandr"
> 
> SRCREV = "82b30c7865f007fff81372c3cdc71b2ff6843ccc"
> PV = "0.1+git${SRCPV}"
> -PR = "r0"
> +PR = "r1"
> 
> SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
> +	file://0001-zaurusd-add-support-for-collie.patch \
> 	file://fix_makefile.patch"
> 
> S = "${WORKDIR}/git"
> -- 
> 1.7.2.5
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 1/3] zaurusd: enable support for collie

[Dmitry Eremin-Solenikov]

On 9/3/11, Koen Kooi <koen@dominion.thruhere.net> wrote:
> shouldn't this move to meta-zaurus now that oe-core is qemu only?

Maybe. IIUC, currently the plan is to push meta-zaurus into meta-hh as published
by Paul Eggleton. On the other hand we didn't start this move (yet).
So please ignore
this patch for now.

BTW: Probably this patch and fix-makefile.patch should just be applied
into main git?

-- 
With best wishes
Dmitry

Re: [PATCH 1/3] zaurusd: enable support for collie

[Richard Purdie]

On Sat, 2011-09-03 at 23:04 +0400, Dmitry Eremin-Solenikov wrote:
> On 9/3/11, Koen Kooi <koen@dominion.thruhere.net> wrote:
> > shouldn't this move to meta-zaurus now that oe-core is qemu only?
> 
> Maybe. IIUC, currently the plan is to push meta-zaurus into meta-hh as published
> by Paul Eggleton. On the other hand we didn't start this move (yet).
> So please ignore
> this patch for now.
> 
> BTW: Probably this patch and fix-makefile.patch should just be applied
> into main git?

We should apply these patches straight into git, yes.

I'm also wondering if there is still a use case for renaming zaurusd and
turning it into something less machine specific (which was always its
intent).

One place it can really help is where you have several revisions of a
board and need a slightly different audio config for each as it allows
doing this with one OE 'machine' entry.

Cheers,

Richard

Re: [PATCH 3/3] qt-demo-init: fix init script

[Richard Purdie]

On Sat, 2011-09-03 at 22:22 +0400, Dmitry Eremin-Solenikov wrote:
> qt-demo-init initscript lacks some quotes, which makes it bave not fulle
> correct. Fix that.
> 
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
>  meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init |    8 ++++----
>  meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb      |    2 +-
>  2 files changed, 5 insertions(+), 5 deletions(-)

Merged to master, thanks.

Richard

Re: [PATCH 2/3] icu-3.6: fix building with big make -j

[Richard Purdie]

On Sat, 2011-09-03 at 22:22 +0400, Dmitry Eremin-Solenikov wrote:
> icu-3.6 buildsystem contains small problem which causes some parallel
> builds to fail. Fix that.
> 
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
>  .../icu/files/fix-parallel-build.patch             |   19 +++++++++++++++++++
>  meta/recipes-support/icu/icu-3.6.inc               |    1 +
>  2 files changed, 20 insertions(+), 0 deletions(-)
>  create mode 100644 meta/recipes-support/icu/files/fix-parallel-build.patch

Merged to master, thanks.

Richard