diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-extended/lcdproc | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/lcdproc')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch | 43 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb | 9 |
2 files changed, 5 insertions, 47 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch deleted file mode 100644 index abdedad5d6..0000000000 --- a/meta-openembedded/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-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb index 96bc826fd9..93a09f28a0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb @@ -9,17 +9,18 @@ DEPENDS = "ncurses lirc" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ file://README.md;beginline=107;md5=5c927ce1742d6d5cddc45b7ad6230f75" -BASEPV = "0.5.8" +BASEPV = "0.5.9" PV = "${BASEPV}+git${SRCPV}" -SRCREV = "f5156e2e41bb418f14761afea22eee8efb49fb85" -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" |