* [meta-handheld][PATCH 1/2] zaurusd: sync recipe with OE-Core
@ 2014-03-05 0:03 Paul Eggleton
2014-03-05 0:03 ` [meta-handheld][PATCH 2/2] zaurusd: enable support for collie Paul Eggleton
0 siblings, 1 reply; 2+ messages in thread
From: Paul Eggleton @ 2014-03-05 0:03 UTC (permalink / raw)
To: openembedded-devel
* Update to latest master for out-of-tree build fix
* Drop new-make.patch (merged upstream)
* Set SUMMARY instead of DESCRIPTION for one-line description
* Properly indent SRC_URI
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
recipes-bsp/zaurusd/zaurusd/new-make.patch | 11 ---------
recipes-bsp/zaurusd/zaurusd_git.bb | 36 ++++++++++++++----------------
2 files changed, 17 insertions(+), 30 deletions(-)
delete mode 100644 recipes-bsp/zaurusd/zaurusd/new-make.patch
diff --git a/recipes-bsp/zaurusd/zaurusd/new-make.patch b/recipes-bsp/zaurusd/zaurusd/new-make.patch
deleted file mode 100644
index dcc83fe..0000000
--- a/recipes-bsp/zaurusd/zaurusd/new-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: zaurusd/Makefile.am
-===================================================================
---- zaurusd.orig/Makefile.am
-+++ zaurusd/Makefile.am
-@@ -4,5 +4,4 @@ SUBDIRS = apps config scripts
- MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
-
- snapshot:
-- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
--
-+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
diff --git a/recipes-bsp/zaurusd/zaurusd_git.bb b/recipes-bsp/zaurusd/zaurusd_git.bb
index 821dbec..468b8f2 100644
--- a/recipes-bsp/zaurusd/zaurusd_git.bb
+++ b/recipes-bsp/zaurusd/zaurusd_git.bb
@@ -1,30 +1,28 @@
-DESCRIPTION = "Daemon to handle device specific features."
+SUMMARY = "Daemon to handle device-specific features"
SECTION = "base"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "tslib"
PE = "1"
-PV = "0.0+gitr${SRCPV}"
-PR = "r26"
+PV = "0.1+git${SRCPV}"
-SRCREV = "82b30c7865f007fff81372c3cdc71b2ff6843ccc"
-SRC_URI = "git://git.yoctoproject.org/zaurusd;protocol=git \
+SRCREV = "85d941d87f0c41b196766a173feaafffa6de2dc2"
+SRC_URI = "git://git.yoctoproject.org/${BPN} \
file://zaurus-hinge.in \
- file://add-poodle.patch \
- file://alsa-cxx00-default.state.patch \
- file://alsa-6000x-default.state.patch \
- file://disable-alsa-handling.patch \
- file://avoid-rotated-server.patch \
- file://new-make.patch \
- file://scripts_pidof.patch \
- file://zaurus-hinge.matchbox-portrait \
- file://zaurus-hinge.matchbox-landscape \
- file://zaurus-hinge.bl-on \
- file://zaurus-hinge.bl-off \
- file://01-check-toggle-landscape \
- file://01-check-toggle-portait \
- file://use-ts-symlink-instead-of-hardcoding.diff "
+ file://add-poodle.patch \
+ file://alsa-cxx00-default.state.patch \
+ file://alsa-6000x-default.state.patch \
+ file://disable-alsa-handling.patch \
+ file://avoid-rotated-server.patch \
+ file://scripts_pidof.patch \
+ file://zaurus-hinge.matchbox-portrait \
+ file://zaurus-hinge.matchbox-landscape \
+ file://zaurus-hinge.bl-on \
+ file://zaurus-hinge.bl-off \
+ file://01-check-toggle-landscape \
+ file://01-check-toggle-portait \
+ file://use-ts-symlink-instead-of-hardcoding.diff "
S = "${WORKDIR}/git"
--
1.8.5.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [meta-handheld][PATCH 2/2] zaurusd: enable support for collie
2014-03-05 0:03 [meta-handheld][PATCH 1/2] zaurusd: sync recipe with OE-Core Paul Eggleton
@ 2014-03-05 0:03 ` Paul Eggleton
0 siblings, 0 replies; 2+ messages in thread
From: Paul Eggleton @ 2014-03-05 0:03 UTC (permalink / raw)
To: openembedded-devel
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../0001-zaurusd-add-support-for-collie.patch | 50 ++++++++++++++++++++++
recipes-bsp/zaurusd/zaurusd_git.bb | 3 +-
2 files changed, 52 insertions(+), 1 deletion(-)
create mode 100644 recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
diff --git a/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch b/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
new file mode 100644
index 0000000..36ded13
--- /dev/null
+++ b/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/recipes-bsp/zaurusd/zaurusd_git.bb b/recipes-bsp/zaurusd/zaurusd_git.bb
index 468b8f2..9eb8b1a 100644
--- a/recipes-bsp/zaurusd/zaurusd_git.bb
+++ b/recipes-bsp/zaurusd/zaurusd_git.bb
@@ -22,7 +22,8 @@ SRC_URI = "git://git.yoctoproject.org/${BPN} \
file://zaurus-hinge.bl-off \
file://01-check-toggle-landscape \
file://01-check-toggle-portait \
- file://use-ts-symlink-instead-of-hardcoding.diff "
+ file://use-ts-symlink-instead-of-hardcoding.diff \
+ file://0001-zaurusd-add-support-for-collie.patch"
S = "${WORKDIR}/git"
--
1.8.5.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-05 0:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-05 0:03 [meta-handheld][PATCH 1/2] zaurusd: sync recipe with OE-Core Paul Eggleton
2014-03-05 0:03 ` [meta-handheld][PATCH 2/2] zaurusd: enable support for collie Paul Eggleton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.