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-networking/recipes-support/libtevent | |
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-networking/recipes-support/libtevent')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-libtevent-fix-musl-libc-compile-error.patch | 32 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.37.bb (renamed from meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb) | 10 |
2 files changed, 38 insertions, 4 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-libtevent-fix-musl-libc-compile-error.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-libtevent-fix-musl-libc-compile-error.patch new file mode 100644 index 000000000..e3aeda9c3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-libtevent-fix-musl-libc-compile-error.patch @@ -0,0 +1,32 @@ +From 7ba1de909c587b6773a39ba9f6f9890987f35b24 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 24 Jul 2018 11:30:53 +0800 +Subject: [PATCH] libtevent: fix musl libc compile error + +libldb depend on libtevent, build libldb with musl libc, +will report error: +tevent.h:1440:8: error: unknown type name 'pid_t'; did you mean 'div_t'? + +add missing headers to fix it. + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + tevent.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tevent.h b/tevent.h +index aa6fe0d..2572696 100644 +--- a/tevent.h ++++ b/tevent.h +@@ -32,6 +32,8 @@ + #include <talloc.h> + #include <sys/time.h> + #include <stdbool.h> ++#include <sys/stat.h> ++#include <sys/types.h> + + struct tevent_context; + struct tevent_ops; +-- +2.7.4 + diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.37.bb index c91b221b1..4df251c7f 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.37.bb @@ -8,11 +8,12 @@ RDEPENDS_python-tevent = "python" SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ file://options-0.9.36.patch \ + file://0001-libtevent-fix-musl-libc-compile-error.patch \ " LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b85a" -SRC_URI[md5sum] = "87d67bca75b231814435c47bec0aff8a" -SRC_URI[sha256sum] = "bd2b6be3fd1601ed7f176e99111e322c57d58e425cc149ee80c7dd4fed263b4c" +SRC_URI[md5sum] = "6859cd4081fdb2a76b1cb4bf1c803a59" +SRC_URI[sha256sum] = "168345ed65eac03785cf77b95238e7dc66cbb473a42811693a6b0916e5dae7e0" inherit waf-samba @@ -38,7 +39,8 @@ EXTRA_OECONF += "--disable-rpath \ --without-gettext \ " -PACKAGES += "python-tevent python-tevent-dbg" +PACKAGES += "python-tevent" + +RPROVIDES_${PN}-dbg += "python-tevent-dbg" FILES_python-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -FILES_python-tevent-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug" |