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-support/asio | |
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-support/asio')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch | 46 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/asio/asio/0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch | 64 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/asio/asio_1.10.6.bb | 11 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.1.bb (renamed from meta-openembedded/meta-oe/recipes-support/asio/asio.inc) | 7 |
4 files changed, 7 insertions, 121 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch b/meta-openembedded/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch deleted file mode 100644 index 4244b97a8..000000000 --- a/meta-openembedded/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 45c855400842fd40f200ae9b7abf9debf4ab5436 Mon Sep 17 00:00:00 2001 -From: Christopher Kohlhoff <chris@kohlhoff.com> -Date: Sun, 28 Aug 2016 09:21:53 +1000 -Subject: [PATCH] Automatically handle glibc variant of strerror_r without - #ifdefs. - ---- -Upstream-Status: Backport https://github.com/chriskohlhoff/asio/commit/443bc17d13eb5e37de780ea6e23157493cf7b3b9 - include/asio/impl/error_code.ipp | 16 +++++++--------- - 1 file changed, 7 insertions(+), 9 deletions(-) - -diff --git a/include/asio/impl/error_code.ipp b/include/asio/impl/error_code.ipp -index ccb70dd..a117658 100644 ---- a/include/asio/impl/error_code.ipp -+++ b/include/asio/impl/error_code.ipp -@@ -97,20 +97,18 @@ public: - #if defined(__sun) || defined(__QNX__) || defined(__SYMBIAN32__) - using namespace std; - return strerror(value); --#elif defined(__MACH__) && defined(__APPLE__) \ -- || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) \ -- || defined(_AIX) || defined(__hpux) || defined(__osf__) \ -- || defined(__ANDROID__) -- char buf[256] = ""; -- using namespace std; -- strerror_r(value, buf, sizeof(buf)); -- return buf; - #else - char buf[256] = ""; -- return strerror_r(value, buf, sizeof(buf)); -+ using namespace std; -+ return strerror_result(strerror_r(value, buf, sizeof(buf)), buf); - #endif - #endif // defined(ASIO_WINDOWS) - } -+ -+private: -+ // Helper function to adapt the result from glibc's variant of strerror_r. -+ static const char* strerror_result(int, const char* s) { return s; } -+ static const char* strerror_result(const char* s, const char*) { return s; } - }; - - } // namespace detail --- -2.9.3 - diff --git a/meta-openembedded/meta-oe/recipes-support/asio/asio/0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch b/meta-openembedded/meta-oe/recipes-support/asio/asio/0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch deleted file mode 100644 index 7f95f5a25..000000000 --- a/meta-openembedded/meta-oe/recipes-support/asio/asio/0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch +++ /dev/null @@ -1,64 +0,0 @@ -From dac36a170188917e2f61b0394ba8a2f6509ddf3a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com> -Date: Tue, 8 Nov 2016 20:39:55 +0000 -Subject: [PATCH] use POSIX poll.h instead of sys/poll.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -POSIX specifies that <poll.h> is the correct header to -include for poll() - http://pubs.opengroup.org/onlinepubs/009695399/functions/poll.html -whereas <sys/poll.h> is only needed for ancient glibc (<2.3), -so let's follow POSIX instead. - -As a side-effect, this silences numerous compilation warnings -when compiling against the musl C-library: - -In file included from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/socket_types.hpp:57:0, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/impl/error_code.ipp:29, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/error_code.hpp:185, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/throw_error.hpp:19, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/impl/posix_tss_ptr.ipp:23, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/posix_tss_ptr.hpp:74, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/tss_ptr.hpp:27, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/call_stack.hpp:20, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/impl/handler_alloc_hook.ipp:19, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/handler_alloc_hook.hpp:78, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/handler_alloc_helpers.hpp:21, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/bind_handler.hpp:19, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/wrapped_handler.hpp:18, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/io_service.hpp:24, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/basic_io_object.hpp:19, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/basic_socket.hpp:20, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/basic_datagram_socket.hpp:20, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio.hpp:19, - from ../../../../asio-1.10.6/src/examples/cpp03/buffers/reference_counted.cpp:11: -<sysroot>/usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp] - #warning redirecting incorrect #include <sys/poll.h> to <poll.h> - ^~~~~~~ - -etc. - -Signed-off-by: André Draszik <adraszik@tycoint.com> ---- -Upstream-Status: Submitted https://svn.boost.org/trac/boost/ticket/12419 - include/asio/detail/socket_types.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/asio/detail/socket_types.hpp b/include/asio/detail/socket_types.hpp -index f2600c2..cb61b8e 100644 ---- a/include/asio/detail/socket_types.hpp -+++ b/include/asio/detail/socket_types.hpp -@@ -54,7 +54,7 @@ - #else - # include <sys/ioctl.h> - # if !defined(__SYMBIAN32__) --# include <sys/poll.h> -+# include <poll.h> - # endif - # include <sys/types.h> - # include <sys/stat.h> --- -2.10.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.10.6.bb b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.10.6.bb deleted file mode 100644 index 565603984..000000000 --- a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.10.6.bb +++ /dev/null @@ -1,11 +0,0 @@ -require asio.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=fede5286a78559dd646e355ab0cc8f04" - -SRC_URI[md5sum] = "85d014a356a6e004cd30ccd4c9b6a5c2" -SRC_URI[sha256sum] = "e0d71c40a7b1f6c1334008fb279e7361b32a063e020efd21e40d9d8ff037195e" - -SRC_URI += "\ - file://0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch \ - file://0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch \ -" diff --git a/meta-openembedded/meta-oe/recipes-support/asio/asio.inc b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.1.bb index 54f78e41d..28cd9c0e1 100644 --- a/meta-openembedded/meta-oe/recipes-support/asio/asio.inc +++ b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.1.bb @@ -13,3 +13,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" inherit autotools ALLOW_EMPTY_${PN} = "1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3e73f311a3af69e6df275e8c3b1c09b5" + +SRC_URI[md5sum] = "037854d113024f57c9753d6326b339bc" +SRC_URI[sha256sum] = "a9091b4de847539fa5b2259bf76a5355339c7eaaa5e33d7d4ae74d614c21965a" + +SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" |