diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2018-09-11 18:31:03 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-09-11 22:48:22 -0700 |
| commit | 205d83988e82ec0358bba237218cc5d3b7f62d4a (patch) | |
| tree | aad3aac4200be44b9f14022a72367e932e02caf3 /meta-oe | |
| parent | aee5ef8906978314f30d3a4c02c90ecedee5a43a (diff) | |
| download | meta-openembedded-contrib-205d83988e82ec0358bba237218cc5d3b7f62d4a.tar.gz | |
lcdproc: Update to master tip
* Do not build on musl/arm since it does not build due to musl not
implementing ioperm() function on ARM
Drop 0001-include-asm-ioctl.h-explicitly.patch its fixed differently
upstream already
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch | 43 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/lcdproc/lcdproc_git.bb | 7 |
2 files changed, 4 insertions, 46 deletions
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch b/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch deleted file mode 100644 index abdedad5d6..0000000000 --- a/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b5ca64c7398d516e9845d849e8306df7ac024bc4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 11 Apr 2017 13:59:34 -0700 -Subject: [PATCH] include asm/ioctl.h explicitly - -Needed for _IOC* defines - -helps compiling with musl where this file is -not included indirectly - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - server/drivers/hd44780-pifacecad.c | 1 + - server/drivers/hd44780-spi.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/server/drivers/hd44780-pifacecad.c b/server/drivers/hd44780-pifacecad.c -index 43db19c..e2798ad 100644 ---- a/server/drivers/hd44780-pifacecad.c -+++ b/server/drivers/hd44780-pifacecad.c -@@ -54,6 +54,7 @@ - #include <unistd.h> - #include <fcntl.h> - #include <sys/ioctl.h> -+#include <asm/ioctl.h> - #include <stdint.h> - #include <linux/spi/spidev.h> - -diff --git a/server/drivers/hd44780-spi.c b/server/drivers/hd44780-spi.c -index 5f94333..8a4015b 100644 ---- a/server/drivers/hd44780-spi.c -+++ b/server/drivers/hd44780-spi.c -@@ -29,6 +29,7 @@ - #include <unistd.h> - #include <fcntl.h> - #include <sys/ioctl.h> -+#include <asm/ioctl.h> - #include <stdint.h> - #include <linux/spi/spidev.h> - --- -2.12.2 - diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb index fad1d616c3..93a09f28a0 100644 --- a/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb @@ -11,15 +11,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ BASEPV = "0.5.9" PV = "${BASEPV}+git${SRCPV}" -SRCREV = "79fa538647c3e09a87ecc86aae1abbb82e0a25c5" -SRC_URI = "git://github.com/lcdproc/lcdproc;branch=lcdproc-${BASEPV} \ - file://0001-include-asm-ioctl.h-explicitly.patch \ +SRCREV = "a4b5a7e058fdd0d914a61138748b589c0128b45b" +SRC_URI = "git://github.com/lcdproc/lcdproc \ " S = "${WORKDIR}/git" inherit autotools pkgconfig update-rc.d +COMPATIBLE_HOST_arm_libc-musl = "null" + LCD_DRIVERS ?= "all,!irman,!svga" LCD_DEFAULT_DRIVER ?= "curses" |