summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-18 20:09:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-18 21:26:40 +0000
commit21a10406d3ff909aaecc192f1d717e6158c5492c (patch)
tree5283d2ea74ab36096c3fc0e961fe4bd0860f1bfd
parentadd11fa1abfc51f1a793c84f02cd7d85d793fe14 (diff)
downloadpoky-21a10406d3ff909aaecc192f1d717e6158c5492c.tar.gz
zaurusd: Update to new git version
Makefile fix (patch) was merged upsream Out of tree builds were also fixed (From OE-Core rev: 8d8fb11d68fbeebf1c070277e137d3dc1dee6ad6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/zaurusd/zaurusd/fix_makefile.patch19
-rw-r--r--meta/recipes-bsp/zaurusd/zaurusd_git.bb5
2 files changed, 2 insertions, 22 deletions
diff --git a/meta/recipes-bsp/zaurusd/zaurusd/fix_makefile.patch b/meta/recipes-bsp/zaurusd/zaurusd/fix_makefile.patch
deleted file mode 100644
index 9b28202521..0000000000
--- a/meta/recipes-bsp/zaurusd/zaurusd/fix_makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Upstream-Status: Pending
2
3Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10
4Fix following build error:
5
6| Makefile:716: *** missing separator (did you mean TAB instead of 8 spaces?). Stop.
7| ERROR: oe_runmake failed
8
9Index: zaurusd/Makefile.am
10===================================================================
11--- zaurusd.orig/Makefile.am
12+++ zaurusd/Makefile.am
13@@ -4,5 +4,5 @@ SUBDIRS = apps config scripts
14 MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
15
16 snapshot:
17- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
18+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
19
diff --git a/meta/recipes-bsp/zaurusd/zaurusd_git.bb b/meta/recipes-bsp/zaurusd/zaurusd_git.bb
index 3b8cc43bca..79bb0d1dc2 100644
--- a/meta/recipes-bsp/zaurusd/zaurusd_git.bb
+++ b/meta/recipes-bsp/zaurusd/zaurusd_git.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5DEPENDS = "tslib" 5DEPENDS = "tslib"
6RDEPENDS_${PN} = "xrandr" 6RDEPENDS_${PN} = "xrandr"
7 7
8SRCREV = "82b30c7865f007fff81372c3cdc71b2ff6843ccc" 8SRCREV = "85d941d87f0c41b196766a173feaafffa6de2dc2"
9PV = "0.1+git${SRCPV}" 9PV = "0.1+git${SRCPV}"
10PR = "r0" 10PR = "r0"
11 11
12SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ 12SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
13 file://fix_makefile.patch"
14 13
15S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
16 15