diff options
Diffstat (limited to 'meta-oe/recipes-support')
974 files changed, 26798 insertions, 32389 deletions
diff --git a/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb b/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb new file mode 100644 index 0000000000..6d64ab71bf --- /dev/null +++ b/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Ace is a code editor written in JavaScript." +SUMMARY = "Ace is a code editor written in JavaScript. This repository has only generated files" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=794d11c5219c59c9efa2487c2b4066b2" + +SRC_URI = "git://github.com/ajaxorg/ace-builds.git;protocol=https;branch=master" + +PV = "02.07.17+git" +SRCREV = "812e2c56aed246931a667f16c28b096e34597016" + +FILES:${PN} = "${datadir}/ace-builds" + +S = "${WORKDIR}/git" + +DEPENDS += "rsync-native" + +do_install () { + install -d ${D}/${datadir}/ace-builds/src-noconflict + rsync -r --exclude=".*" ${S}/src-noconflict/* ${D}/${datadir}/ace-builds/src-noconflict +} + diff --git a/meta-oe/recipes-support/anthy/anthy/2ch_t.patch b/meta-oe/recipes-support/anthy/anthy/2ch_t.patch index bf9bdb63d7..a0d3f9c25e 100644 --- a/meta-oe/recipes-support/anthy/anthy/2ch_t.patch +++ b/meta-oe/recipes-support/anthy/anthy/2ch_t.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + source: shamelessly stolen from debian ;-) purpose: add some entries particularly useful in Japanese 2channel anonymous website (at least that is my understanding ;-)) diff --git a/meta-oe/recipes-support/anthy/anthy/native-helpers.patch b/meta-oe/recipes-support/anthy/anthy/native-helpers.patch index 291b66b37b..0b2df01aba 100644 --- a/meta-oe/recipes-support/anthy/anthy/native-helpers.patch +++ b/meta-oe/recipes-support/anthy/anthy/native-helpers.patch @@ -1,22 +1,28 @@ +Upstream-Status: Pending + upstream: not applicable author: pH5 comment: Stage the native anthy helpers mkfiledic, mkdepgraph, mkworddic, comment: calctrans and proccorpus. ---- anthy-7811/mkanthydic/Makefile.am~ 2006-05-13 18:28:35.000000000 +0900 -+++ anthy-7811/mkanthydic/Makefile.am 2006-06-18 10:56:25.770000000 +0900 -@@ -3,7 +3,7 @@ +Index: anthy-9100h/mkanthydic/Makefile.am +=================================================================== +--- anthy-9100h.orig/mkanthydic/Makefile.am ++++ anthy-9100h/mkanthydic/Makefile.am +@@ -3,7 +3,7 @@ noinst_SCRIPTS = CLEANFILES = anthy.dic - INCLUDES = -I$(top_srcdir)/include -DSRCDIR=\"$(srcdir)\" + INCLUDES = -I$(top_srcdir)/ -DSRCDIR=\"$(srcdir)\" -noinst_PROGRAMS = mkfiledic +bin_PROGRAMS = mkfiledic mkfiledic_SOURCES = mkfiledic.c mkfiledic_LDADD = ../src-diclib/libdiclib.la ---- anthy-7811/depgraph/Makefile.am~ 2006-06-02 00:20:54.000000000 +0900 -+++ anthy-7811/depgraph/Makefile.am 2006-06-18 10:57:19.420000000 +0900 -@@ -9,7 +9,7 @@ +Index: anthy-9100h/depgraph/Makefile.am +=================================================================== +--- anthy-9100h.orig/depgraph/Makefile.am ++++ anthy-9100h/depgraph/Makefile.am +@@ -9,7 +9,7 @@ CLEANFILES = anthy.dep EXTRA_DIST = indepword.txt $(DEPWORDS) # Generate the dictionary @@ -25,10 +31,12 @@ comment: calctrans and proccorpus. mkdepgraph_SOURCES = mkdepgraph.c mkdepgraph_LDADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la ---- anthy-7811/mkworddic/Makefile.am~ 2006-05-13 18:29:07.000000000 +0900 -+++ anthy-7811/mkworddic/Makefile.am 2006-06-18 11:21:56.300000000 +0900 -@@ -16,7 +16,8 @@ - udict dict.args.in +Index: anthy-9100h/mkworddic/Makefile.am +=================================================================== +--- anthy-9100h.orig/mkworddic/Makefile.am ++++ anthy-9100h/mkworddic/Makefile.am +@@ -26,7 +26,8 @@ DIC_FILES = @top_srcdir@/alt-cannadic/gc + @top_srcdir@/mkworddic/udict # Generate the dictionary -noinst_PROGRAMS = mkworddic @@ -36,10 +44,12 @@ comment: calctrans and proccorpus. +bin_PROGRAMS = mkworddic mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h mkworddic_LDADD = ../src-worddic/libanthydic.la - ---- anthy-9100e.orig/calctrans/Makefile.am 2008-05-08 15:04:13.000000000 +0200 -+++ anthy-9100e/calctrans/Makefile.am 2008-05-08 15:04:24.000000000 +0200 -@@ -3,7 +3,7 @@ + +Index: anthy-9100h/calctrans/Makefile.am +=================================================================== +--- anthy-9100h.orig/calctrans/Makefile.am ++++ anthy-9100h/calctrans/Makefile.am +@@ -3,7 +3,7 @@ EXTRA_DIST =\ corpus.3.txt corpus.4.txt corpus.5.txt\ corpus_info weak_words diff --git a/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch b/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch index bf748f3c60..bedb5e0498 100644 --- a/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch +++ b/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch @@ -1,12 +1,15 @@ +Upstream-Status: Pending + upstream: not applicable source: stolen from debian -diff -Naur anthy-7811/src-util.orig/Makefile.am anthy-7811/src-util/Makefile.am ---- anthy-7811/src-util.orig/Makefile.am 2006-06-18 10:47:55.790000000 +0900 -+++ anthy-7811/src-util/Makefile.am 2006-06-18 10:48:23.860000000 +0900 -@@ -6,7 +6,8 @@ +Index: anthy-9100h/src-util/Makefile.am +=================================================================== +--- anthy-9100h.orig/src-util/Makefile.am ++++ anthy-9100h/src-util/Makefile.am +@@ -8,7 +8,8 @@ ELISP_FILES = anthy.el anthy-dic.el anth anthy-isearch.el anthy-azik.el anthy-kyuri.el - EXTRA_DIST = $(ELISP_FILES) typetab dic-tool-usage.txt rcsize.rb + EXTRA_DIST = $(ELISP_FILES) typetab dic-tool-usage.txt anthy.i bin_PROGRAMS = anthy-dic-tool anthy-agent anthy-morphological-analyzer -ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc +#ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc diff --git a/meta-oe/recipes-support/anthy/anthy/target-helpers.patch b/meta-oe/recipes-support/anthy/anthy/target-helpers.patch index d22c3562a5..fc5c72c051 100644 --- a/meta-oe/recipes-support/anthy/anthy/target-helpers.patch +++ b/meta-oe/recipes-support/anthy/anthy/target-helpers.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Nurp anthy-9100h.org/calctrans/Makefile.am anthy-9100h/calctrans/Makefile.am --- anthy-9100h.org/calctrans/Makefile.am 2007-10-27 23:02:59.000000000 +0900 +++ anthy-9100h/calctrans/Makefile.am 2014-11-11 17:14:42.152999991 +0900 diff --git a/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-oe/recipes-support/anthy/anthy_9100h.bb index a65d324eae..ed87b3de43 100644 --- a/meta-oe/recipes-support/anthy/anthy_9100h.bb +++ b/meta-oe/recipes-support/anthy/anthy_9100h.bb @@ -1,43 +1,47 @@ DESCRIPTION="Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text." -AUTHOR = "Anthy Developers <anthy-dev@lists.sourceforge.jp>" HOMEPAGE = "http://anthy.sourceforge.jp" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a \ + file://alt-cannadic/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ +" SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \ file://not_build_elc.patch \ file://2ch_t.patch \ " -SRC_URI_append_class-target = "file://target-helpers.patch" -SRC_URI_append_class-native = "file://native-helpers.patch" +SRC_URI:append:class-target = " file://target-helpers.patch" +SRC_URI:append:class-native = " file://native-helpers.patch" SRC_URI[md5sum] = "1f558ff7ed296787b55bb1c6cf131108" SRC_URI[sha256sum] = "d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547" -DEPENDS_class-target = "anthy-native" -RDEPENDS_${PN}_class-target = "libanthy0" +UPSTREAM_CHECK_URI = "https://osdn.net/projects/anthy/releases/" +UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>(\d+)+(\w*))" + +DEPENDS:class-target = "anthy-native" +RDEPENDS:${PN}:class-target = "libanthy0" inherit autotools pkgconfig PACKAGES += "${PN}-el libanthy0 libanthy-dev" -FILES_${PN}-dbg += "${libdir}/.debug" -FILES_libanthy0 = "${libdir}/libanthy.so.* \ +FILES:${PN}-dbg += "${libdir}/.debug" +FILES:libanthy0 = "${libdir}/libanthy.so.* \ ${libdir}/libanthydic.so.* \ ${libdir}/libanthyinput.so.* \ " -FILES_libanthy-dev = "${libdir}/libanthy*.la \ +FILES:libanthy-dev = "${libdir}/libanthy*.la \ ${libdir}/libanthy*.a \ ${libdir}/libanthy*.so \ ${includedir}/anthy \ ${libdir}/pkgconfig/anthy.pc \ " -FILES_${PN}-el = "${datadir}/emacs/*" -FILES_${PN} = "${datadir}/* \ +FILES:${PN}-el = "${datadir}/emacs/*" +FILES:${PN} = "${datadir}/* \ ${bindir}/* \ ${sysconfdir}/anthy-conf \ " diff --git a/meta-oe/recipes-support/asio/asio.inc b/meta-oe/recipes-support/asio/asio.inc deleted file mode 100644 index 54f78e41d1..0000000000 --- a/meta-oe/recipes-support/asio/asio.inc +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Asio is a cross-platform C++ library for network and low-level \ - I/O programming that provides developers with a consistent asynchronous \ - model using a modern C++ approach." -AUTHOR = "Christopher M. Kohlhoff (chris at kohlhoff dot com)" -HOMEPAGE = "http://think-async.com/Asio" -SECTION = "libs" -LICENSE = "BSL-1.0" - -DEPENDS = "boost openssl" - -SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" - -inherit autotools - -ALLOW_EMPTY_${PN} = "1" diff --git a/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch b/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch deleted file mode 100644 index 4244b97a8c..0000000000 --- a/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-oe/recipes-support/asio/asio/0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch b/meta-oe/recipes-support/asio/asio/0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch deleted file mode 100644 index 7f95f5a25e..0000000000 --- a/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-oe/recipes-support/asio/asio_1.10.6.bb b/meta-oe/recipes-support/asio/asio_1.10.6.bb deleted file mode 100644 index 5656039846..0000000000 --- a/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-oe/recipes-support/asio/asio_1.30.2.bb b/meta-oe/recipes-support/asio/asio_1.30.2.bb new file mode 100644 index 0000000000..6930381ecd --- /dev/null +++ b/meta-oe/recipes-support/asio/asio_1.30.2.bb @@ -0,0 +1,25 @@ +SUMMARY = "Asio is C++ library for network and low-level I/O programming" +DESCRIPTION = "Asio is a cross-platform C++ library for network and low-level \ + I/O programming that provides developers with a consistent asynchronous \ + model using a modern C++ approach." +HOMEPAGE = "http://think-async.com/Asio" +SECTION = "libs" +LICENSE = "BSL-1.0" + +DEPENDS = "openssl" + +SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" + +inherit autotools + +ALLOW_EMPTY:${PN} = "1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=2bfc909e030aeafefa72f764165b8d07" + +SRC_URI[sha256sum] = "9f12cef05c0477eace9c68ccabd19f9e3a04b875d4768c323714cbd3a5fa3c2b" + +PACKAGECONFIG ??= "boost" + +PACKAGECONFIG[boost] = "--with-boost=${STAGING_LIBDIR},--without-boost,boost" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch b/meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch new file mode 100644 index 0000000000..facb257be6 --- /dev/null +++ b/meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch @@ -0,0 +1,67 @@ +From ffc8ba8d324243a923abe48e9758adecb03d24a4 Mon Sep 17 00:00:00 2001 +From: Peter Kjellerstedt <pkj@axis.com> +Date: Tue, 12 Feb 2019 21:25:23 +0100 +Subject: [PATCH] atop.daily, atop.init, atop-pm.sh: Avoid using bash + +Avoid using bash and bashisms when not necesary. On some systems, +e.g., embedded products, bash may not be available by default. + +Upstream-Status: Submitted [https://github.com/Atoptool/atop/pull/50] +Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> +--- + atop-pm.sh | 2 +- + atop.daily | 4 ++-- + atop.init | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/atop-pm.sh b/atop-pm.sh +index 7f41a86..3ff4ab5 100755 +--- a/atop-pm.sh ++++ b/atop-pm.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + case "$1" in + pre) /usr/bin/systemctl stop atop +diff --git a/atop.daily b/atop.daily +index 57a9507..fe5a11b 100755 +--- a/atop.daily ++++ b/atop.daily +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + LOGOPTS="-R" # default options + LOGINTERVAL=600 # default interval in seconds +@@ -38,7 +38,7 @@ then + + while ps -p `cat "$PIDFILE"` > /dev/null + do +- let CNT+=1 ++ CNT=$((CNT + 1)) + + if [ $CNT -gt 5 ] + then +diff --git a/atop.init b/atop.init +index e6e11dc..03c3f02 100755 +--- a/atop.init ++++ b/atop.init +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # atop Startup script for the Atop process logging in background + # +@@ -47,7 +47,7 @@ case "$1" in + + while ps -p `cat $PIDFILE` > /dev/null + do +- let CNT+=1 ++ CNT=$((CNT + 1)) + + if [ $CNT -gt 5 ] + then +-- +2.12.0 + diff --git a/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch b/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch deleted file mode 100644 index 3708f60ba0..0000000000 --- a/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 7b651793269b6b86f12c43c30b751b86def27222 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 18 Mar 2017 17:56:40 -0700 -Subject: [PATCH] include missing header files - -fixes build with musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - deviate.c | 1 + - procdbase.c | 2 +- - showgeneric.c | 2 +- - showlinux.c | 2 +- - showprocs.c | 2 +- - showsys.c | 2 +- - 6 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/deviate.c b/deviate.c -index 7cf1b49..8e615af 100644 ---- a/deviate.c -+++ b/deviate.c -@@ -178,6 +178,7 @@ static const char rcsid[] = "$Id: deviate.c,v 1.45 2010/10/23 14:02:03 gerlof Ex - #include <stdio.h> - #include <errno.h> - #include <fcntl.h> -+#include <stdlib.h> - #include <unistd.h> - #include <limits.h> - #include <memory.h> -diff --git a/procdbase.c b/procdbase.c -index 9cab347..0487d26 100644 ---- a/procdbase.c -+++ b/procdbase.c -@@ -67,7 +67,7 @@ static const char rcsid[] = "$Id: procdbase.c,v 1.8 2010/04/23 12:19:35 gerlof E - #include <fcntl.h> - #include <unistd.h> - #include <string.h> --#include <malloc.h> -+#include <stdlib.h> - - #include "atop.h" - #include "photoproc.h" -diff --git a/showgeneric.c b/showgeneric.c -index 775afa8..3d5be0e 100644 ---- a/showgeneric.c -+++ b/showgeneric.c -@@ -268,7 +268,7 @@ static const char rcsid[] = "$Id: showgeneric.c,v 1.71 2010/10/25 19:08:32 gerlo - #include <errno.h> - #include <fcntl.h> - #include <string.h> --#include <termio.h> -+#include <termios.h> - #include <unistd.h> - #include <stdarg.h> - #include <curses.h> -diff --git a/showlinux.c b/showlinux.c -index 6e60754..aba2ee6 100644 ---- a/showlinux.c -+++ b/showlinux.c -@@ -274,7 +274,7 @@ static const char rcsid[] = "$Id: showlinux.c,v 1.70 2010/10/23 14:04:12 gerlof - #include <string.h> - #include <errno.h> - #include <fcntl.h> --#include <termio.h> -+#include <termios.h> - #include <unistd.h> - #include <stdarg.h> - #include <curses.h> -diff --git a/showprocs.c b/showprocs.c -index 5194524..f0169ad 100644 ---- a/showprocs.c -+++ b/showprocs.c -@@ -94,7 +94,7 @@ static const char rcsid[] = "$Id: showprocs.c,v 1.15 2011/09/05 11:44:16 gerlof - #include <string.h> - #include <errno.h> - #include <fcntl.h> --#include <termio.h> -+#include <termios.h> - #include <unistd.h> - #include <stdarg.h> - #include <curses.h> -diff --git a/showsys.c b/showsys.c -index 26331be..5a05fe5 100644 ---- a/showsys.c -+++ b/showsys.c -@@ -80,7 +80,7 @@ static const char rcsid[] = "XXXXXX"; - #include <string.h> - #include <errno.h> - #include <fcntl.h> --#include <termio.h> -+#include <termios.h> - #include <unistd.h> - #include <stdarg.h> - #include <curses.h> --- -2.12.0 - diff --git a/meta-oe/recipes-support/atop/atop/fix-permissions.patch b/meta-oe/recipes-support/atop/atop/fix-permissions.patch index ee74199939..8488b38000 100644 --- a/meta-oe/recipes-support/atop/atop/fix-permissions.patch +++ b/meta-oe/recipes-support/atop/atop/fix-permissions.patch @@ -1,15 +1,22 @@ -Update permissions of executable files that remove setuid bit and make everyone -could read. +From d9498d10d0e8241749835dbc9fa229465d4fdfd7 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 6 Feb 2019 13:58:04 +0000 +Subject: [PATCH] Fix permissions -Upstream-Status: Inappropriate [embedded specific] +Update permissions of executable files that remove setuid bit and make +everyone could read. +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Kai Kang <kai.kang@windriver.com> --- + Makefile | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + diff --git a/Makefile b/Makefile -index a65b9b6..21d9828 100644 +index 3bf5929..1221ee4 100644 --- a/Makefile +++ b/Makefile -@@ -66,7 +66,7 @@ systemdinstall: genericinstall +@@ -72,7 +72,7 @@ systemdinstall: genericinstall chmod 0644 $(DESTDIR)$(SYSDPATH)/atopacct.service cp atop.cronsystemd $(DESTDIR)$(CRNPATH)/atop cp atop-pm.sh $(DESTDIR)$(PMPATHD) @@ -18,7 +25,7 @@ index a65b9b6..21d9828 100644 # # only when making on target system: # -@@ -91,11 +91,11 @@ sysvinstall: genericinstall +@@ -97,11 +97,11 @@ sysvinstall: genericinstall # if [ -d $(DESTDIR)$(PMPATH1) ]; \ then cp 45atoppm $(DESTDIR)$(PMPATH1); \ @@ -32,7 +39,7 @@ index a65b9b6..21d9828 100644 fi # # -@@ -139,7 +139,7 @@ genericinstall: atop atopacctd +@@ -145,7 +145,7 @@ genericinstall: atop atopacctd atopconvert # cp atop $(DESTDIR)$(BINPATH)/atop chown root $(DESTDIR)$(BINPATH)/atop @@ -41,12 +48,12 @@ index a65b9b6..21d9828 100644 ln -sf atop $(DESTDIR)$(BINPATH)/atopsar cp atopacctd $(DESTDIR)$(SBINPATH)/atopacctd chown root $(DESTDIR)$(SBINPATH)/atopacctd -@@ -147,7 +147,7 @@ genericinstall: atop atopacctd - cp atop $(DESTDIR)$(BINPATH)/atop-$(VERS) - ln -sf atop-$(VERS) $(DESTDIR)$(BINPATH)/atopsar-$(VERS) +@@ -159,7 +159,7 @@ genericinstall: atop atopacctd atopconvert + chown root $(DESTDIR)$(BINPATH)/atopconvert + chmod 0711 $(DESTDIR)$(BINPATH)/atopconvert cp atop.daily $(DESTDIR)$(SCRPATH) - chmod 0711 $(DESTDIR)$(SCRPATH)/atop.daily + chmod 0755 $(DESTDIR)$(SCRPATH)/atop.daily cp man/atop.1 $(DESTDIR)$(MAN1PATH) cp man/atopsar.1 $(DESTDIR)$(MAN1PATH) - cp man/atoprc.5 $(DESTDIR)$(MAN5PATH) + cp man/atopconvert.1 $(DESTDIR)$(MAN1PATH) diff --git a/meta-oe/recipes-support/atop/atop/remove-bashisms.patch b/meta-oe/recipes-support/atop/atop/remove-bashisms.patch deleted file mode 100644 index f1fcbfed76..0000000000 --- a/meta-oe/recipes-support/atop/atop/remove-bashisms.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -diff --git a/atop-pm.sh b/atop-pm.sh -index 7f41a86..3ff4ab5 100755 ---- a/atop-pm.sh -+++ b/atop-pm.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - case "$1" in - pre) /usr/bin/systemctl stop atop -diff --git a/atop.daily b/atop.daily -index 24d33bd..f29bd94 100755 ---- a/atop.daily -+++ b/atop.daily -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - CURDAY=`date +%Y%m%d` - LOGPATH=/var/log/atop -@@ -16,7 +16,7 @@ then - - while ps -p `cat $PIDFILE` > /dev/null - do -- let CNT+=1 -+ CNT=$((CNT+1)) - - if [ $CNT -gt 5 ] - then diff --git a/meta-oe/recipes-support/atop/atop/sysvinit-implement-status.patch b/meta-oe/recipes-support/atop/atop/sysvinit-implement-status.patch index 5994d3e08e..1145a24934 100644 --- a/meta-oe/recipes-support/atop/atop/sysvinit-implement-status.patch +++ b/meta-oe/recipes-support/atop/atop/sysvinit-implement-status.patch @@ -1,11 +1,18 @@ +From bdd068873ed0979027c21773939bdb18046a8756 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 6 Feb 2019 13:58:04 +0000 +Subject: [PATCH] sysvinit: Implement status + Implement the sub-command status. Upstream-Status: Pending - Signed-off-by: Kai Kang <kai.kang@windriver.com> --- + atop.init | 3 +++ + 1 file changed, 3 insertions(+) + diff --git a/atop.init b/atop.init -index 108bdc5..9f89fad 100755 +index e6e11dc..e7b226d 100755 --- a/atop.init +++ b/atop.init @@ -18,6 +18,8 @@ diff --git a/meta-oe/recipes-support/atop/atop_2.2.3.bb b/meta-oe/recipes-support/atop/atop_2.4.0.bb index 1ab9e7cf9e..df45eede23 100644 --- a/meta-oe/recipes-support/atop/atop_2.2.3.bb +++ b/meta-oe/recipes-support/atop/atop_2.4.0.bb @@ -10,26 +10,24 @@ utilization, priority, username, state, and exit code." HOMEPAGE = "http://www.atoptool.nl" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "ncurses zlib" -ATOP_VER = "${@'-'.join(d.getVar('PV').rsplit('.', 1))}" +SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \ + file://fix-permissions.patch \ + file://sysvinit-implement-status.patch \ + file://0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch \ + " +SRC_URI[md5sum] = "1077da884ed94f2bc3c81ac3ab970436" +SRC_URI[sha256sum] = "be1c010a77086b7d98376fce96514afcd73c3f20a8d1fe01520899ff69a73d69" -SRC_URI = " \ - http://www.atoptool.nl/download/${BPN}-${ATOP_VER}.tar.gz \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \ - file://0001-include-missing-header-files.patch \ - file://remove-bashisms.patch \ - file://fix-permissions.patch \ - file://sysvinit-implement-status.patch \ -" +UPSTREAM_CHECK_URI = "https://atoptool.nl/downloadatop.php" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+).tar" -SRC_URI[md5sum] = "034dc1544f2ec4e4d2c739d320dc326d" -SRC_URI[sha256sum] = "c785b8a2355be28b3de6b58a8ea4c4fcab8fadeaa57a99afeb03c66fac8e055d" - -S = "${WORKDIR}/${BPN}-${ATOP_VER}" +CVE_STATUS[CVE-2011-3618] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." do_compile() { oe_runmake all @@ -37,27 +35,31 @@ do_compile() { do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - make DESTDIR=${D} VERS=${ATOP_VER} SYSDPATH=${systemd_system_unitdir} \ + make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \ PMPATHD=${systemd_unitdir}/system-sleep systemdinstall install -d ${D}${sysconfdir}/tmpfiles.d - install -m 644 ${WORKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf + install -m 644 ${UNPACKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf rm -f ${D}${systemd_system_unitdir}/atopacct.service else - make DESTDIR=${D} VERS=${ATOP_VER} sysvinstall + make DESTDIR=${D} VERS=${PV} sysvinstall install -d ${D}${sysconfdir}/default/volatiles - install -m 644 ${WORKDIR}/volatiles.99_atop ${D}${sysconfdir}/default/volatiles/99_atop + install -m 644 ${UNPACKDIR}/volatiles.99_atop ${D}${sysconfdir}/default/volatiles/99_atop rm -f ${D}${sysconfdir}/init.d/atopacct fi + # /var/log/atop will be created in runtime + rm -rf ${D}${localstatedir}/log + rmdir --ignore-fail-on-non-empty ${D}${localstatedir} + # remove atopacct related files rm -rf ${D}${sbindir} ${D}${mandir}/man8 } inherit systemd -SYSTEMD_SERVICE_${PN} = "atop.service" +SYSTEMD_SERVICE:${PN} = "atop.service atopgpu.service" SYSTEMD_AUTO_ENABLE = "disable" -FILES_${PN} += "${systemd_unitdir}/system-sleep" +FILES:${PN} += "${systemd_unitdir}/system-sleep" -RDEPENDS_${PN} = "procps" +RDEPENDS:${PN} = "procps" diff --git a/meta-oe/recipes-support/augeas/augeas.inc b/meta-oe/recipes-support/augeas/augeas.inc deleted file mode 100644 index 185abae18d..0000000000 --- a/meta-oe/recipes-support/augeas/augeas.inc +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Augeas configuration API" -HOMEPAGE = "http://augeas.net/" -BUGTRACKER = "https://fedorahosted.org/augeas/report/1" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff" - -SRC_URI = "http://download.augeas.net/${BP}.tar.gz \ - file://add-missing-argz-conditional.patch \ - file://sepbuildfix.patch \ - file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ - " - -DEPENDS = "readline libxml2" - -inherit autotools pkgconfig - -PACKAGES =+ "${PN}-lenses lib${BPN}" - -FILES_${PN}-lenses = "${datadir}/augeas/lenses" -FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}" - -RDEPENDS_lib${BPN} += "${PN}-lenses" -RRECOMMENDS_lib${BPN} += "${PN}" - -LEAD_SONAME = "libaugeas.so" - -do_install_append() { - rm -fr ${D}${datadir}/vim -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libselinux] = "--with-selinux,--without-selinux,libselinux" diff --git a/meta-oe/recipes-support/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta-oe/recipes-support/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted file mode 100644 index 9a19876aa6..0000000000 --- a/meta-oe/recipes-support/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 13 Apr 2015 17:02:13 -0700 -Subject: [PATCH] Unset need_charset_alias when building for musl - -localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 -which actually shoudl be fixed in gnulib and then all downstream -projects will get it eventually. For now we apply the fix to -coreutils - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/gnulib.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: augeas-1.2.0/gnulib/lib/Makefile.am -=================================================================== ---- augeas-1.2.0.orig/gnulib/lib/Makefile.am -+++ augeas-1.2.0/gnulib/lib/Makefile.am -@@ -463,7 +463,7 @@ install-exec-localcharset: all-local - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ diff --git a/meta-oe/recipes-support/augeas/augeas/0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch b/meta-oe/recipes-support/augeas/augeas/0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch new file mode 100644 index 0000000000..9424be2aa6 --- /dev/null +++ b/meta-oe/recipes-support/augeas/augeas/0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch @@ -0,0 +1,34 @@ +From e5ccf769c2dc7283b56a597fffdb5dc1558e3ce8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 3 Sep 2022 01:23:28 -0700 +Subject: [PATCH] src/internal: Use __GLIBC__ to check for GNU extention + implementation + +__USE_GNU is defined by _GNU_SOURCE and configure explicitly sets this +macro and it does have meaning on musl too, where it may have some level +of GNU compatibility but strerror_r is not one of them. Therefore we +have to check for libc implementation for this to be sure. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/internal.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/internal.c b/src/internal.c +index ef83b71..fb326fa 100644 +--- a/src/internal.c ++++ b/src/internal.c +@@ -431,7 +431,7 @@ char *cleanpath(char *path) { + + const char *xstrerror(int errnum, char *buf, size_t len) { + #ifdef HAVE_STRERROR_R +-# ifdef __USE_GNU ++# ifdef __GLIBC__ + /* Annoying linux specific API contract */ + return strerror_r(errnum, buf, len); + # else +-- +2.37.3 + diff --git a/meta-oe/recipes-support/augeas/augeas/add-missing-argz-conditional.patch b/meta-oe/recipes-support/augeas/augeas/add-missing-argz-conditional.patch deleted file mode 100644 index abbdbaa63b..0000000000 --- a/meta-oe/recipes-support/augeas/augeas/add-missing-argz-conditional.patch +++ /dev/null @@ -1,20 +0,0 @@ -Add missing GL_GENERATE_ARGZ_H conditional - -- GL_GENERATE_ARGZ_H is used in gnulib/lib/Makefile.am - -Upstream-Status: Pending -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Index: augeas-1.0.0/configure.ac -=================================================================== ---- augeas-1.0.0.orig/configure.ac -+++ augeas-1.0.0/configure.ac -@@ -55,6 +55,8 @@ AC_ARG_WITH([failmalloc], - - AM_CONDITIONAL([WITH_FAILMALLOC], [test x$with_failmalloc != xno]) - -+AM_CONDITIONAL([GL_GENERATE_ARGZ_H], [test -n "$ARGZ_H"]) -+ - dnl --enable-debug=(yes|no) - AC_ARG_ENABLE([debug], - [AC_HELP_STRING([--enable-debug=no/yes], diff --git a/meta-oe/recipes-support/augeas/augeas/sepbuildfix.patch b/meta-oe/recipes-support/augeas/augeas/sepbuildfix.patch index b82a3ee2cb..2b18618fbc 100644 --- a/meta-oe/recipes-support/augeas/augeas/sepbuildfix.patch +++ b/meta-oe/recipes-support/augeas/augeas/sepbuildfix.patch @@ -1,15 +1,24 @@ -Ensure that builds in separate builddirs (${B} != ${S}) correctly install the +From 8a277957a2579e7149c1850675441b288192077c Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Fri, 15 Jul 2016 10:04:48 +0300 +Subject: [PATCH] augeas: fix separate builddirs + +Ensure that builds in separate builddirs (${B} != ${S}) correctly install the lenses files. Upstream-Status: Pending RP 2013/4/17 -Index: augeas-1.0.0/Makefile.am -=================================================================== ---- augeas-1.0.0.orig/Makefile.am 2012-11-02 15:20:11.000000000 +0000 -+++ augeas-1.0.0/Makefile.am 2013-04-17 10:36:24.033400125 +0000 -@@ -5,8 +5,8 @@ +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 87d511a..7710b3b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -5,8 +5,8 @@ ACLOCAL_AMFLAGS = -I gnulib/m4 lensdir=$(datadir)/augeas/lenses/dist lenstestdir=$(datadir)/augeas/lenses/dist/tests @@ -18,5 +27,5 @@ Index: augeas-1.0.0/Makefile.am +dist_lens_DATA=$(wildcard $(top_srcdir)/lenses/*.aug) +dist_lenstest_DATA=$(wildcard $(top_srcdir)lenses/tests/*.aug) - EXTRA_DIST=augeas.spec build/aux/move-if-change Makefile.am HACKING + EXTRA_DIST=augeas.spec build/ac-aux/move-if-change Makefile.am HACKING.md diff --git a/meta-oe/recipes-support/augeas/augeas_1.12.0.bb b/meta-oe/recipes-support/augeas/augeas_1.12.0.bb new file mode 100644 index 0000000000..2c6d4cdc88 --- /dev/null +++ b/meta-oe/recipes-support/augeas/augeas_1.12.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "Augeas configuration API" +HOMEPAGE = "http://augeas.net/" +BUGTRACKER = "https://fedorahosted.org/augeas/report/1" + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff" + +SRC_URI = "http://download.augeas.net/${BP}.tar.gz \ + file://sepbuildfix.patch \ + file://0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch \ + " +SRC_URI[md5sum] = "74f1c7b8550f4e728486091f6b907175" +SRC_URI[sha256sum] = "321942c9cc32185e2e9cb72d0a70eea106635b50269075aca6714e3ec282cb87" + +DEPENDS = "readline libxml2" + +inherit autotools pkgconfig + +PACKAGES =+ "${PN}-lenses lib${BPN}" + +FILES:${PN}-lenses = "${datadir}/augeas/lenses" +FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}" + +RDEPENDS:lib${BPN} += "${PN}-lenses" +RRECOMMENDS:lib${BPN} += "${PN}" + +LEAD_SONAME = "libaugeas.so" + +do_install:append() { + rm -fr ${D}${datadir}/vim +} + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" + +EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" diff --git a/meta-oe/recipes-support/augeas/augeas_1.5.0.bb b/meta-oe/recipes-support/augeas/augeas_1.5.0.bb deleted file mode 100644 index c4f62e7470..0000000000 --- a/meta-oe/recipes-support/augeas/augeas_1.5.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require augeas.inc - -SRC_URI[md5sum] = "01190e455c513124a2dae29a1182c113" -SRC_URI[sha256sum] = "223bb6e6fe3e9e92277dafd5d34e623733eb969a72a382998d204feab253f73f" diff --git a/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch b/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch new file mode 100644 index 0000000000..bcfafdda55 --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch @@ -0,0 +1,86 @@ +From 6be1c45e1f7ee78499bdca76c25ec23a61317134 Mon Sep 17 00:00:00 2001 +From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com> +Date: Wed, 20 Mar 2024 14:58:27 +0000 +Subject: [PATCH] Remove cpp unittest compilation + +Upstream-Status: Inappropriate [oe-specific] + +--- + lang/c++/CMakeLists.txt | 61 ----------------------------------------- + 1 file changed, 61 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a3793152..d94ba42d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -131,70 +131,9 @@ set_target_properties (avrocpp_s PROPERTIES + target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) + target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR}) + +-add_executable (precompile test/precompile.cc) +- +-target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) +- +-macro (gen file ns) +- add_custom_command (OUTPUT ${file}.hh +- COMMAND avrogencpp +- -p - +- -i ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file} +- -o ${file}.hh -n ${ns} -U +- DEPENDS avrogencpp ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file}) +- add_custom_target (${file}_hh DEPENDS ${file}.hh) +-endmacro (gen) +- +-gen (empty_record empty) +-gen (bigrecord testgen) +-gen (bigrecord_r testgen_r) +-gen (bigrecord2 testgen2) +-gen (tweet testgen3) +-gen (union_array_union uau) +-gen (union_map_union umu) +-gen (union_conflict uc) +-gen (recursive rec) +-gen (reuse ru) +-gen (circulardep cd) +-gen (tree1 tr1) +-gen (tree2 tr2) +-gen (crossref cr) +-gen (primitivetypes pt) +-gen (cpp_reserved_words cppres) +- + add_executable (avrogencpp impl/avrogencpp.cc) + target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) + +-enable_testing() +- +-macro (unittest name) +- add_executable (${name} test/${name}.cc) +- target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) +- add_test (NAME ${name} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${name}) +-endmacro (unittest) +- +-unittest (buffertest) +-unittest (unittest) +-unittest (SchemaTests) +-unittest (LargeSchemaTests) +-unittest (CodecTests) +-unittest (StreamTests) +-unittest (SpecificTests) +-unittest (DataFileTests) +-unittest (JsonTests) +-unittest (AvrogencppTests) +-unittest (CompilerTests) +-unittest (AvrogencppTestReservedWords) +- +-add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh) +- +-add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh +- tweet_hh +- union_array_union_hh union_map_union_hh union_conflict_hh +- recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh +- primitivetypes_hh empty_record_hh) +- + include (InstallRequiredSystemLibraries) + + set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}") diff --git a/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch b/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch new file mode 100644 index 0000000000..437a3fa138 --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch @@ -0,0 +1,84 @@ +From 86aa3f2333a9b8e6f1c631e6d5cb7296b6e8380b Mon Sep 17 00:00:00 2001 +From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com> +Date: Fri, 22 Mar 2024 13:27:38 +0000 +Subject: [PATCH] Add package configuration files + +Upstream-Status: Pending + +--- + lang/c++/CMakeLists.txt | 45 ++++++++++++++++++++++++------ + lang/c++/cmake/AvroCppConfig.cmake | 5 ++++ + 2 files changed, 42 insertions(+), 8 deletions(-) + create mode 100644 lang/c++/cmake/AvroCppConfig.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d94ba42d3..4748b111d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -140,14 +140,18 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}") + + include (CPack) + +-install (TARGETS avrocpp avrocpp_s +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib +- RUNTIME DESTINATION lib) +- +-install (TARGETS avrogencpp RUNTIME DESTINATION bin) +- +-install (DIRECTORY api/ DESTINATION include/avro ++install (TARGETS avrocpp ++ EXPORT AvroCppTargets ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ INCLUDES DESTINATION include) ++ ++install (TARGETS avrogencpp ++ EXPORT AvroCppTargets ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ ++install (DIRECTORY api/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/avro + FILES_MATCHING PATTERN *.hh) + + if (NOT CMAKE_BUILD_TYPE) +@@ -155,3 +159,28 @@ if (NOT CMAKE_BUILD_TYPE) + "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." + FORCE) + endif (NOT CMAKE_BUILD_TYPE) ++ ++# Create cmake config files ++include(CMakePackageConfigHelpers) ++write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfigVersion.cmake" ++ VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH} ++ COMPATIBILITY AnyNewerVersion ++) ++ ++configure_file(cmake/AvroCppConfig.cmake ++ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfig.cmake" ++ COPYONLY ++) ++ ++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/avrocpp) ++install(EXPORT AvroCppTargets ++ FILE AvroCppTargets.cmake ++ NAMESPACE AvroCpp:: ++ DESTINATION ${ConfigPackageLocation} ++) ++install(FILES ++ "cmake/AvroCppConfig.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfigVersion.cmake" ++ DESTINATION ${ConfigPackageLocation} ++ COMPONENT Devel) +diff --git a/cmake/AvroCppConfig.cmake b/cmake/AvroCppConfig.cmake +new file mode 100644 +index 000000000..deb8aaa31 +--- /dev/null ++++ b/cmake/AvroCppConfig.cmake +@@ -0,0 +1,5 @@ ++include(CMakeFindDependencyMacro) ++find_dependency(Boost 1.38 REQUIRED ++ COMPONENTS filesystem iostreams program_options regex system) ++ ++include("${CMAKE_CURRENT_LIST_DIR}/AvroCppTargets.cmake") diff --git a/meta-oe/recipes-support/avro/avro-c++/0003-Update-CXX-standard-to-CXX14.patch b/meta-oe/recipes-support/avro/avro-c++/0003-Update-CXX-standard-to-CXX14.patch new file mode 100644 index 0000000000..3e65cb7a72 --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c++/0003-Update-CXX-standard-to-CXX14.patch @@ -0,0 +1,24 @@ +From 66c08ade24e4472b5af5dca48097ed9a2ec035ec Mon Sep 17 00:00:00 2001 +From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com> +Date: Fri, 5 Apr 2024 11:33:51 +0000 +Subject: [PATCH] Update CXX standard to CXX14 + +Upstream-Status: Inappropriate [oe-specific] + +--- + lang/c++/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4748b111d..1e45c13d5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,7 +21,7 @@ cmake_minimum_required (VERSION 3.1) + set (CMAKE_LEGACY_CYGWIN_WIN32 0) + + if (NOT DEFINED CMAKE_CXX_STANDARD) +- set(CMAKE_CXX_STANDARD 11) ++ set(CMAKE_CXX_STANDARD 14) + endif() + + set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb b/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb new file mode 100644 index 0000000000..0ac1decccf --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb @@ -0,0 +1,27 @@ +SUMMARY = "Apache Avro data serialization system." +HOMEPAGE = "https://avro.apache.org/" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=43abf34d8b9908494f83c55d213a7f89" + +DEPENDS = "boost zlib xz" + +BRANCH = "branch-1.11" +SRCREV = "35ff8b997738e4d983871902d47bfb67b3250734" +SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \ + file://0001-Remove-cpp-unittest-compilation.patch \ + file://0002-Add-package-configuration-files.patch \ + file://0003-Update-CXX-standard-to-CXX14.patch \ + " + +S = "${WORKDIR}/git/lang/c++" + +inherit cmake pkgconfig + +BBCLASSEXTEND = "native nativesdk" + +# http://errors.yoctoproject.org/Errors/Details/766913/ +# avro-c++/1.11.3/git/lang/c++/impl/Compiler.cc:304:18: error: possibly dangling reference to a temporary [-Werror=dangling-reference] +# avro-c++/1.11.3/git/lang/c++/impl/Compiler.cc:370:18: error: possibly dangling reference to a temporary [-Werror=dangling-reference] +CXXFLAGS += "-Wno-error=dangling-reference" diff --git a/meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch b/meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch deleted file mode 100644 index 01235d8ef3..0000000000 --- a/meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 518bb8ccfb3f3fc143fbd571782f3e40573d01b5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 10 Apr 2017 09:15:04 -0700 -Subject: [PATCH] avro-c: Fix build with clang compiler - -Clang advertizes itself to be compatible with gcc 4.2.1 -while that was true several years ago, it now supports -a lot more newer features, the test to just check gcc -version should be supplanted with clang check as well -so atomic support in clang can be asserted as well - -Fixes - -lang/c/src/avro/refcount.h:301:2: error: "No atomic implementation!" - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lang/c/src/avro/refcount.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lang/c/src/avro/refcount.h b/lang/c/src/avro/refcount.h -index 69afa4fc..d76ba057 100644 ---- a/lang/c/src/avro/refcount.h -+++ b/lang/c/src/avro/refcount.h -@@ -118,7 +118,8 @@ avro_refcount_dec(volatile int *refcount) - * GCC intrinsics - */ - --#elif (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40500 -+#elif (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40500 \ -+|| defined(__clang__) - - static inline void - avro_refcount_set(volatile int *refcount, int value) --- -2.12.2 - diff --git a/meta-oe/recipes-support/avro/avro-c_1.11.3.bb b/meta-oe/recipes-support/avro/avro-c_1.11.3.bb new file mode 100644 index 0000000000..bf84242e29 --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c_1.11.3.bb @@ -0,0 +1,23 @@ +SUMMARY = "Apache Avro data serialization system." +HOMEPAGE = "https://avro.apache.org/" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae" + +DEPENDS = "jansson zlib xz" + +BRANCH = "branch-1.11" +SRCREV = "35ff8b997738e4d983871902d47bfb67b3250734" +SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \ + " + +S = "${WORKDIR}/git/lang/c" + +inherit cmake pkgconfig + +# http://errors.yoctoproject.org/Errors/Details/766902/ +# avro-c/1.11.3/git/lang/c/examples/quickstop.c:123:61: error: passing argument 3 of 'first_value.iface->get_string' from incompatible pointer type [-Wincompatible-pointer-types] +# avro-c/1.11.3/git/lang/c/examples/quickstop.c:127:60: error: passing argument 3 of 'last_value.iface->get_string' from incompatible pointer type [-Wincompatible-pointer-types] +# avro-c/1.11.3/git/lang/c/examples/quickstop.c:131:61: error: passing argument 3 of 'phone_value.iface->get_string' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/avro/avro-c_1.8.1.bb b/meta-oe/recipes-support/avro/avro-c_1.8.1.bb deleted file mode 100644 index 276fe2b5ae..0000000000 --- a/meta-oe/recipes-support/avro/avro-c_1.8.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Apache Avro data serialization system." -HOMEPAGE = "http://apr.apache.org/" -SECTION = "libs" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=73bdf70f268f0b3b9c5a83dd7a6f3324" - -DEPENDS = "jansson zlib xz" -PV .= "+git${SRCPV}" - -SRCREV = "4b3677c32b879e0e7f717eb95f9135ac654da760" -SRC_URI = "git://github.com/apache/avro \ - file://0001-avro-c-Fix-build-with-clang-compiler.patch;patchdir=../../ \ -" - -S = "${WORKDIR}/git/lang/c" - -LDFLAGS_append_libc-uclibc = " -lm" - -inherit cmake diff --git a/meta-oe/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch b/meta-oe/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch deleted file mode 100644 index 8ef774f0f2..0000000000 --- a/meta-oe/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch +++ /dev/null @@ -1,29 +0,0 @@ -configure.ac: add check for NO_GETCONTEXT definition - -Signed-off-by: Samuel Martin <s.martin49@gmail.com> -[yann.morin.1998@free.fr: add a comment, change variable name, use - AS_IF, remove debug traces, use AC_CHECK_FUNCS (as suggested by - Thomas)] -Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> -Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - ---- -Upstream-Status: Pending - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- bdwgc-7.2f.orig/configure.ac 2014-06-01 19:00:47.000000000 +0200 -+++ bdwgc-7.2f/configure.ac 2014-12-23 14:13:11.585716713 +0100 -@@ -365,6 +365,12 @@ - AC_MSG_RESULT($ac_cv_fno_strict_aliasing) - fi - -+# Check for getcontext (uClibc can be configured without it, for example) -+AC_CHECK_FUNCS([getcontext]) -+AS_IF([test "$ac_cv_func_getcontext" = "no"], -+ [CFLAGS="$CFLAGS -DNO_GETCONTEXT" -+ CPPFLAGS="$CPPFLAGS -DNO_GETCONTEXT"]) -+ - case "$host" in - # While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64 - # and unnecessary everywhere. diff --git a/meta-oe/recipes-support/bdwgc/bdwgc/musl_header_fix.patch b/meta-oe/recipes-support/bdwgc/bdwgc/musl_header_fix.patch deleted file mode 100644 index 4a18496650..0000000000 --- a/meta-oe/recipes-support/bdwgc/bdwgc/musl_header_fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -Add missing header to avoid: - -| 1472659610.016355: ../git/pthread_stop_world.c: In function 'GC_brief_async_signal_safe_sleep': -| 1472659610.0540252: ../git/pthread_stop_world.c:397:22: error: storage size of 'tv' isn't known -| 1472659610.0540252: struct timeval tv; -| 1472659610.0540252: ^~ -| 1472659610.054099: ../git/pthread_stop_world.c:397:22: warning: unused variable 'tv' [-Wunused-variable] -| 1472659610.054099: struct timeval tv; -| 1472659610.054099: ^~ -| 1472659610.054099: Makefile:1530: recipe for target 'pthread_stop_world.lo' failed - -in musl builds. - -Upstream-Status: Pending - -Index: git/pthread_stop_world.c -=================================================================== ---- git.orig/pthread_stop_world.c -+++ git/pthread_stop_world.c -@@ -45,6 +45,7 @@ - #include <semaphore.h> - #include <errno.h> - #include <unistd.h> -+#include <sys/time.h> - #include "atomic_ops.h" - - /* It's safe to call original pthread_sigmask() here. */ diff --git a/meta-oe/recipes-support/bdwgc/bdwgc_7.6.0.bb b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.8.bb index dcb68f0282..fe51c1029d 100644 --- a/meta-oe/recipes-support/bdwgc/bdwgc_7.6.0.bb +++ b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.8.bb @@ -16,27 +16,22 @@ DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\ by replacing malloc with GC_malloc calls, replacing realloc with GC_realloc\ calls, and removing free calls." -HOMEPAGE = "http://www.hboehm.info/gc/" +HOMEPAGE = "https://www.hboehm.info/gc/" SECTION = "devel" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.QUICK;md5=4f81f24ec69726c312487c2ac740e9e3" +LIC_FILES_CHKSUM = "file://README.QUICK;md5=dd27361ad00943bb27bc3e0589037075" -SRCREV = "8ac1d84a40eb7a431fec1b8097e3f24b48fb23fa" -SRC_URI = "git://github.com/ivmai/bdwgc.git \ - file://0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch \ - file://musl_header_fix.patch \ - " +DEPENDS = "libatomic-ops" -FILES_${PN}-doc = "${datadir}" +SRCREV = "ee59af3722e56de8404de6cd0c21c2493cc4d855" +SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https" S = "${WORKDIR}/git" -ARM_INSTRUCTION_SET = "arm" - inherit autotools pkgconfig -# by default use external libatomic-ops -PACKAGECONFIG ??= "libatomic-ops" -PACKAGECONFIG[libatomic-ops] = "--with-libatomic-ops=yes,--with-libatomic-ops=no,libatomic-ops" +EXTRA_OECONF += "--enable-cplusplus" + +FILES:${PN}-doc = "${datadir}" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/boost-sml/boost-sml_1.1.11.bb b/meta-oe/recipes-support/boost-sml/boost-sml_1.1.11.bb new file mode 100644 index 0000000000..a48195a15d --- /dev/null +++ b/meta-oe/recipes-support/boost-sml/boost-sml_1.1.11.bb @@ -0,0 +1,25 @@ +SUMMARY = "[Boost::ext].SML (State Machine Language)" +DESCRIPTION = "Your scalable C++14 one header only State Machine Library with no dependencies" +HOMEPAGE = "https://github.com/boost-ext/sml" +BUGTRACKER = "https://github.com/boost-ext/sml/issues" +SECTION = "libs" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=e4224ccaecb14d942c71d31bef20d78c" + +DEPENDS += "boost qemu-native" + +SRC_URI = "git://github.com/boost-ext/sml.git;protocol=https;branch=master" +SRCREV = "b7df6180d20422b2724d26007aebb24066f2a6a9" + +S = "${WORKDIR}/git" + +inherit cmake + +# Building benchmarks takes a lot of time and requires additional headers (euml2.hpp) +# Building examples fail with gcc-12 +EXTRA_OECMAKE:append = " -DSML_BUILD_BENCHMARKS:bool=OFF -DSML_BUILD_EXAMPLES=OFF" + +# [boost::ext].XML is a header only C++ library, so the main package will be empty. +ALLOW_EMPTY:${PN} = "1" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta-oe/recipes-support/btop/btop_1.3.2.bb b/meta-oe/recipes-support/btop/btop_1.3.2.bb new file mode 100644 index 0000000000..c473bf0a35 --- /dev/null +++ b/meta-oe/recipes-support/btop/btop_1.3.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "Resource monitor that shows usage and stats for processor, memory, disks, network and processes." +HOMEPAGE = "https://github.com/aristocratos/btop" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +SECTION = "console/utils" + +SRC_URI = "git://github.com/aristocratos/btop.git;protocol=https;branch=main" +SRCREV = "fd2a2acdad6fbaad76846cb5e802cf2ae022d670" + +S = "${WORKDIR}/git" + +inherit cmake + +FILES:${PN} += " \ + ${datadir}/icons \ + ${datadir}/icons/hicolor \ + ${datadir}/icons/hicolor/48x48 \ + ${datadir}/icons/hicolor/scalable \ + ${datadir}/icons/hicolor/48x48/apps \ + ${datadir}/icons/hicolor/48x48/apps/btop.png \ + ${datadir}/icons/hicolor/scalable/apps \ + ${datadir}/icons/hicolor/scalable/apps/btop.svg \ +" diff --git a/meta-oe/recipes-support/c-ares/c-ares/run-ptest b/meta-oe/recipes-support/c-ares/c-ares/run-ptest new file mode 100644 index 0000000000..66ffd53889 --- /dev/null +++ b/meta-oe/recipes-support/c-ares/c-ares/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh +./arestest --gtest_filter=-*.Live* --gtest_print_time=0 | sed -E '/^\[ RUN/d ; s/\[ OK \]/PASS: / ; s/\[ DISABLED \]/SKIP: / ; s/\[ FAILED \]/FAIL: /' + diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb b/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb new file mode 100644 index 0000000000..ddd081e115 --- /dev/null +++ b/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb @@ -0,0 +1,30 @@ +# Copyright (c) 2012-2014 LG Electronics, Inc. +SUMMARY = "c-ares is a C library that resolves names asynchronously." +HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fdbc58a6da11a9f68aa73c453818decc" + +SRC_URI = "https://github.com/c-ares/c-ares/releases/download/cares-1_27_0/${BPN}-${PV}.tar.gz \ + file://run-ptest" +SRC_URI[sha256sum] = "0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b" + +PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" +PACKAGECONFIG[manpages] = "" +PACKAGECONFIG[tests] = "-DCARES_BUILD_TESTS=ON,-DCARES_BUILD_TESTS=OFF,googletest" + +inherit cmake manpages pkgconfig ptest + +EXTRA_OECMAKE = "-DCARES_STATIC=${@ 'ON' if d.getVar('DISABLE_STATIC') == '' else 'OFF' }" + +do_install_ptest () { + install -d ${D}${PTEST_PATH} + install -m 0755 ${B}/bin/arestest ${D}${PTEST_PATH} + install -m 0755 ${UNPACKDIR}/run-ptest ${D}${PTEST_PATH} +} + +PACKAGE_BEFORE_PN = "${PN}-utils" + +FILES:${PN}-utils = "${bindir}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb b/meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb new file mode 100644 index 0000000000..8e38517448 --- /dev/null +++ b/meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "C-Periphery lib used to access GPIO, LED, PWM, SPI, I2C, MMIO, Serial" +DESCRIPTION = "A C library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux" + +HOMEPAGE = "https://github.com/vsergeev/c-periphery" + +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=be30d45bdc453f70a494c149c2168289" + +SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https;branch=master" +SRCREV = "91f9678d2a35a3af3c633f20165bdde8bea32209" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-oe/recipes-support/cabextract/cabextract/fix-fnmatch.patch b/meta-oe/recipes-support/cabextract/cabextract/fix-fnmatch.patch new file mode 100644 index 0000000000..bd486283b6 --- /dev/null +++ b/meta-oe/recipes-support/cabextract/cabextract/fix-fnmatch.patch @@ -0,0 +1,40 @@ +From - Mon Jun 11 00:00:00 2024 +From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> +Subject: [PATCH] Don't play with fnmatch.c replacement + +Currently fnmatch.c, even if it is selected, conditionally disables compilation +of fnmatch() funciton even though the rest of the code expects to get it (e.g. +because Autoconf didn't detect the working implementation and enabled fnmatch.c +to replace it). Drop the extra conditionals, to fix Autoconf magic. + +Observed error: + +ld: src/cabextract.o: in function `process_cabinet': +/usr/src/debug/cabextract/1.11/src/cabextract.c:499:(.text.startup+0xf1c): undefined reference to `rpl_fnmatch' +collect2: error: ld returned 1 exit status + +Upstream-Status: Submitted [https://github.com/kyz/libmspack/pull/51] +Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> + +Index: cabextract-1.11/fnmatch.c +=================================================================== +--- cabextract-1.11.orig/fnmatch.c ++++ cabextract-1.11/fnmatch.c +@@ -49,11 +49,6 @@ static const char rcsid[] = + it is simpler to just do this in the source for each such file. + */ + +-#if defined (_LIBC) || !defined (__GNU_LIBRARY__) +- +-#if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS) +-#endif +- + /* Match STRING against the filename pattern PATTERN, returning zero if + it matches, nonzero if not. */ + int +@@ -216,5 +211,3 @@ int flags; + + return FNM_NOMATCH; + } +- +-#endif /* _LIBC or not __GNU_LIBRARY__. */ diff --git a/meta-oe/recipes-support/cabextract/cabextract_1.11.bb b/meta-oe/recipes-support/cabextract/cabextract_1.11.bb new file mode 100644 index 0000000000..0f06489ca9 --- /dev/null +++ b/meta-oe/recipes-support/cabextract/cabextract_1.11.bb @@ -0,0 +1,22 @@ +SUMMARY = "Software for extracting Microsoft cabinet files" +DESCRIPTION = "tool for extracting Microsoft cabinet files" +HOMEPAGE = "http://www.cabextract.org.uk/" +SECTION = "console/utils" + +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://src/cabextract.c;beginline=4;endline=11;md5=b0a10c6d3843f262114e7ecf91fc7e78" + +SRC_URI = "\ + https://www.cabextract.org.uk/cabextract-${PV}.tar.gz \ + file://fix-fnmatch.patch \ +" + +SRC_URI[sha256sum] = "b5546db1155e4c718ff3d4b278573604f30dd64c3c5bfd4657cd089b823a3ac6" + +DEPENDS = "libmspack" + +EXTRA_OECONF = "--with-external-libmspack" + +inherit autotools pkgconfig + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb b/meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb new file mode 100644 index 0000000000..169a5f271b --- /dev/null +++ b/meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb @@ -0,0 +1,16 @@ +SUMMARY = "A library for Microsoft compression formats" +DESCRIPTION = "The library provides compressors and decompressors,\ +archivers and dearchivers for Microsoft compression formats: CAB, CHM, WIM,\ +LIT, HLP, KWAJ and SZDD." +HOMEPAGE = "http://www.cabextract.org.uk/libmspack/" +SECTION = "lib" +LICENSE = "LGPL-2.1-only" + +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI = "https://www.cabextract.org.uk/libmspack/libmspack-${PV}.tar.gz" +SRC_URI[sha256sum] = "70dd1fb2f0aecc36791b71a1e1840e62173079eadaa081192d1c323a0eeea21b" + +inherit autotools + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb b/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb index da1a2a36f1..bf62e8416e 100644 --- a/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb +++ b/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb @@ -2,16 +2,21 @@ SUMMARY = "Frame handles simultaneous touches" HOMEPAGE = "https://launchpad.net/frame" -LICENSE = "GPLv3 & LGPLv3" +LICENSE = "GPL-3.0-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " -inherit autotools pkgconfig +inherit autotools pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}" SRC_URI = "https://launchpad.net/${BPN}/trunk/v${PV}/+download/${BPN}-${PV}.tar.gz \ file://pessimizing-move.patch" + +UPSTREAM_CHECK_URI = "https://launchpad.net/frame/trunk" + SRC_URI[md5sum] = "02baa941091c5d198cd1623b3ad36e68" SRC_URI[sha256sum] = "cfb9ab52cdccd926f1822a457264d0014c7eb9f4600a72626063dd073b26256f" @@ -19,6 +24,6 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[x11] = "--enable-x11, --disable-x11, libxi xext virtual/xserver" PACKAGE_BEFORE_PN += "${PN}-test" -FILES_${PN}-test = "${bindir}/frame-test*" +FILES:${PN}-test = "${bindir}/frame-test*" SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch b/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch index 3b3acab245..4a9d25f326 100644 --- a/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch +++ b/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch @@ -13,6 +13,8 @@ fixes Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + libgeis/geis_v1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/canonical-multitouch/geis/0001-provide-function-declaration-with-prototypes.patch b/meta-oe/recipes-support/canonical-multitouch/geis/0001-provide-function-declaration-with-prototypes.patch new file mode 100644 index 0000000000..ddad1404f9 --- /dev/null +++ b/meta-oe/recipes-support/canonical-multitouch/geis/0001-provide-function-declaration-with-prototypes.patch @@ -0,0 +1,690 @@ +From 05fe9751dfb370b0fb726e95bc36674468116db4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Sep 2022 16:57:51 -0700 +Subject: [PATCH] provide function declaration with prototypes + +Fixes build with clang-15+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libgeis/backend/grail/geis_grail_window_grab.c | 2 +- + libgeis/backend/grail/geis_ugsubscription_store.c | 2 +- + libgeis/backend/grail/geis_ugsubscription_store.h | 2 +- + libgeis/backend/test_fixture/geis_backend_test_fixture.c | 4 ++-- + libgeis/geis.c | 2 +- + libgeis/geis_backend_multiplexor.c | 4 ++-- + libgeis/geis_backend_multiplexor.h | 2 +- + libgeis/geis_class.c | 2 +- + libgeis/geis_class.h | 2 +- + libgeis/geis_device.c | 2 +- + libgeis/geis_device.h | 2 +- + libgeis/geis_event_queue.c | 2 +- + libgeis/geis_event_queue.h | 2 +- + libgeis/geis_filter.c | 2 +- + libgeis/geis_filter.h | 2 +- + libgeis/geis_filterable.c | 2 +- + libgeis/geis_filterable.h | 2 +- + libgeis/geis_frame.c | 2 +- + libgeis/geis_frame.h | 2 +- + libgeis/geis_group.c | 2 +- + libgeis/geis_group.h | 2 +- + libgeis/geis_region.c | 2 +- + libgeis/geis_region.h | 2 +- + libgeis/geis_touch.c | 2 +- + libgeis/geis_touch.h | 2 +- + libgeis/server/geis_dbus_client_proxy.c | 2 +- + libgeis/server/geis_dbus_proxy_box.c | 2 +- + libgeis/server/geis_dbus_proxy_box.h | 2 +- + libs/geis-dbus/geis_dbus_dispatcher.c | 2 +- + libs/geis-util/geis_logging.c | 2 +- + testsuite/geis1/check_gesture_attrs.c | 2 +- + testsuite/geis1/check_gesture_types.c | 2 +- + testsuite/geis1/check_instance.c | 2 +- + testsuite/geis1/check_subscription.c | 2 +- + testsuite/geis2/check_attr.c | 2 +- + testsuite/geis2/check_class.c | 2 +- + testsuite/geis2/check_config.c | 2 +- + testsuite/geis2/check_device.c | 2 +- + testsuite/geis2/check_error_codes.c | 2 +- + testsuite/geis2/check_event.c | 2 +- + testsuite/geis2/check_filter.c | 2 +- + testsuite/geis2/check_frame.c | 2 +- + testsuite/geis2/check_geis_new.c | 2 +- + testsuite/geis2/check_general_types.c | 2 +- + testsuite/geis2/check_region.c | 2 +- + testsuite/geis2/check_subscription.c | 2 +- + tools/geis-server/geis-server.c | 2 +- + 47 files changed, 49 insertions(+), 49 deletions(-) + +diff --git a/libgeis/backend/grail/geis_grail_window_grab.c b/libgeis/backend/grail/geis_grail_window_grab.c +index 003adee..f8480ac 100644 +--- a/libgeis/backend/grail/geis_grail_window_grab.c ++++ b/libgeis/backend/grail/geis_grail_window_grab.c +@@ -49,7 +49,7 @@ static const GeisFloat _geis_grail_window_grab_store_growth_factor = 1.7; + + + static GeisGrailWindowGrabStore +-_window_grab_allocate() ++_window_grab_allocate(void) + { + GeisGrailWindowGrabStore wgs = malloc(sizeof(struct GeisGrailWindowGrabStore)); + if (!wgs) +diff --git a/libgeis/backend/grail/geis_ugsubscription_store.c b/libgeis/backend/grail/geis_ugsubscription_store.c +index bb1f0bb..cb7e620 100644 +--- a/libgeis/backend/grail/geis_ugsubscription_store.c ++++ b/libgeis/backend/grail/geis_ugsubscription_store.c +@@ -42,7 +42,7 @@ static const GeisFloat _geis_grail_ugsubscription_store_growth_factor = 1.7; + * Creates a new, empty grail subscription store. + */ + GeisUGSubscriptionStore +-geis_ugsubscription_store_new() ++geis_ugsubscription_store_new(void) + { + GeisUGSubscriptionStore store = geis_bag_new(sizeof(struct GeisUGSubscription), + _geis_grail_ugsubscription_store_default_size, +diff --git a/libgeis/backend/grail/geis_ugsubscription_store.h b/libgeis/backend/grail/geis_ugsubscription_store.h +index a93e1b6..06273ef 100644 +--- a/libgeis/backend/grail/geis_ugsubscription_store.h ++++ b/libgeis/backend/grail/geis_ugsubscription_store.h +@@ -41,7 +41,7 @@ typedef GeisBag GeisUGSubscriptionStore; + * @returns a pointer to a valid store, or NULL to indicate failure. + */ + GeisUGSubscriptionStore +-geis_ugsubscription_store_new(); ++geis_ugsubscription_store_new(void); + + /** + * Destroys a grail subscription store. +diff --git a/libgeis/backend/test_fixture/geis_backend_test_fixture.c b/libgeis/backend/test_fixture/geis_backend_test_fixture.c +index 5912acb..099cde4 100644 +--- a/libgeis/backend/test_fixture/geis_backend_test_fixture.c ++++ b/libgeis/backend/test_fixture/geis_backend_test_fixture.c +@@ -434,7 +434,7 @@ _token_free_subscription_pdata(GeisBackendToken gbtoken GEIS_UNUSED, + } + + __attribute__((constructor)) +-static void _register_test_fixture() ++static void _register_test_fixture(void) + { + geis_register_backend(GEIS_INIT_MOCK_BACKEND, + sizeof(struct GeisBackendTestFixture), +@@ -444,6 +444,6 @@ static void _register_test_fixture() + + /* A dummy routine to force linkage of this module without dlopening it */ + void +-geis_include_backend_test_fixture() ++geis_include_backend_test_fixture(void) + { + } +diff --git a/libgeis/geis.c b/libgeis/geis.c +index 4290d19..3f7bd12 100644 +--- a/libgeis/geis.c ++++ b/libgeis/geis.c +@@ -402,7 +402,7 @@ geis_filterable_attribute_foreach(Geis geis, + * Creates a new empty Geis API instance. + */ + static Geis +-geis_new_empty() ++geis_new_empty(void) + { + geis_error_clear(NULL); + Geis geis = calloc(1, sizeof(struct _Geis)); +diff --git a/libgeis/geis_backend_multiplexor.c b/libgeis/geis_backend_multiplexor.c +index 3f80080..0f76198 100644 +--- a/libgeis/geis_backend_multiplexor.c ++++ b/libgeis/geis_backend_multiplexor.c +@@ -60,7 +60,7 @@ struct _GeisBackendMultiplexor + * Creates a new container for callback info. + */ + static CallbackInfoBag +-_callback_info_bag_new() ++_callback_info_bag_new(void) + { + CallbackInfoBag cbib = calloc(1, sizeof(struct CallbackInfoBag)); + if (!cbib) +@@ -209,7 +209,7 @@ _callback_info_bag_release(CallbackInfoBag cbib, int fd) + * Creates a new backend multiplexor. + */ + GeisBackendMultiplexor +-geis_backend_multiplexor_new() ++geis_backend_multiplexor_new(void) + { + GeisBackendMultiplexor mx = calloc(1, sizeof(struct _GeisBackendMultiplexor)); + if (!mx) +diff --git a/libgeis/geis_backend_multiplexor.h b/libgeis/geis_backend_multiplexor.h +index ff4c318..8e7102e 100644 +--- a/libgeis/geis_backend_multiplexor.h ++++ b/libgeis/geis_backend_multiplexor.h +@@ -74,7 +74,7 @@ typedef void (*GeisBackendFdEventCallback)(int fd, + /** + * Constructs a new back end multiplexor. + */ +-GeisBackendMultiplexor geis_backend_multiplexor_new(); ++GeisBackendMultiplexor geis_backend_multiplexor_new(void); + + /** + * A reasonable default value for the max_events_per_pump parameter to +diff --git a/libgeis/geis_class.c b/libgeis/geis_class.c +index e889e4b..5c26a87 100644 +--- a/libgeis/geis_class.c ++++ b/libgeis/geis_class.c +@@ -46,7 +46,7 @@ static const int gesture_class_bag_growth_constant = 2; + * Creates a new class bag, + */ + GeisGestureClassBag +-geis_gesture_class_bag_new() ++geis_gesture_class_bag_new(void) + { + GeisGestureClassBag bag = calloc(1, sizeof(struct _GeisGestureClassBag)); + if (!bag) +diff --git a/libgeis/geis_class.h b/libgeis/geis_class.h +index 1d60998..724c353 100644 +--- a/libgeis/geis_class.h ++++ b/libgeis/geis_class.h +@@ -35,7 +35,7 @@ typedef struct _GeisGestureClassBag *GeisGestureClassBag; + /** + * Creates a new class bag, + */ +-GeisGestureClassBag geis_gesture_class_bag_new(); ++GeisGestureClassBag geis_gesture_class_bag_new(void); + + /** + * Destroys a gesture class bag. +diff --git a/libgeis/geis_device.c b/libgeis/geis_device.c +index 1f61fc1..ff3216b 100644 +--- a/libgeis/geis_device.c ++++ b/libgeis/geis_device.c +@@ -44,7 +44,7 @@ static const int device_bag_growth_constant = 2; + + + GeisDeviceBag +-geis_device_bag_new() ++geis_device_bag_new(void) + { + GeisDeviceBag bag = calloc(1, sizeof(struct _GeisDeviceBag)); + if (!bag) +diff --git a/libgeis/geis_device.h b/libgeis/geis_device.h +index c411e54..707943b 100644 +--- a/libgeis/geis_device.h ++++ b/libgeis/geis_device.h +@@ -35,7 +35,7 @@ typedef struct _GeisDeviceBag *GeisDeviceBag; + /** + * Creates a new device bag, + */ +-GeisDeviceBag geis_device_bag_new(); ++GeisDeviceBag geis_device_bag_new(void); + + /** + * Destroys a device bag. +diff --git a/libgeis/geis_event_queue.c b/libgeis/geis_event_queue.c +index 0b7d0fb..f357683 100644 +--- a/libgeis/geis_event_queue.c ++++ b/libgeis/geis_event_queue.c +@@ -50,7 +50,7 @@ struct _GeisEventQueue + * Creates a new Geis Event queue. + */ + GeisEventQueue +-geis_event_queue_new() ++geis_event_queue_new(void) + { + GeisEventQueue queue = calloc(1, sizeof(struct _GeisEventQueue)); + if (!queue) +diff --git a/libgeis/geis_event_queue.h b/libgeis/geis_event_queue.h +index e4c186d..5f3da1d 100644 +--- a/libgeis/geis_event_queue.h ++++ b/libgeis/geis_event_queue.h +@@ -41,7 +41,7 @@ typedef struct _GeisEventQueue *GeisEventQueue; + /** + * Creates a new Geis Event queue. + */ +-GeisEventQueue geis_event_queue_new(); ++GeisEventQueue geis_event_queue_new(void); + + /** + * Destroys a Geis Event queue. +diff --git a/libgeis/geis_filter.c b/libgeis/geis_filter.c +index 4fe5da6..83d65a8 100644 +--- a/libgeis/geis_filter.c ++++ b/libgeis/geis_filter.c +@@ -57,7 +57,7 @@ static GeisSize s_filter_oid = 0; + * Creates a new filter bag, + */ + GeisFilterBag +-geis_filter_bag_new() ++geis_filter_bag_new(void) + { + GeisFilterBag bag = calloc(1, sizeof(struct _GeisFilterBag)); + if (!bag) +diff --git a/libgeis/geis_filter.h b/libgeis/geis_filter.h +index 7b613bf..f825bb7 100644 +--- a/libgeis/geis_filter.h ++++ b/libgeis/geis_filter.h +@@ -42,7 +42,7 @@ typedef GeisFilter *GeisFilterIterator; + /** + * Creates a new filter bag, + */ +-GeisFilterBag geis_filter_bag_new(); ++GeisFilterBag geis_filter_bag_new(void); + + /** + * Destroys a filter bag. +diff --git a/libgeis/geis_filterable.c b/libgeis/geis_filterable.c +index 57bd4ac..5fb4b0c 100644 +--- a/libgeis/geis_filterable.c ++++ b/libgeis/geis_filterable.c +@@ -40,7 +40,7 @@ struct FilterableAttributeBag + * Constructs a new filterable attribute bag. + */ + FilterableAttributeBag +-geis_filterable_attribute_bag_new() ++geis_filterable_attribute_bag_new(void) + { + FilterableAttributeBag bag = calloc(1, sizeof(struct FilterableAttributeBag)); + if (!bag) +diff --git a/libgeis/geis_filterable.h b/libgeis/geis_filterable.h +index 6d400fc..63c563d 100644 +--- a/libgeis/geis_filterable.h ++++ b/libgeis/geis_filterable.h +@@ -86,7 +86,7 @@ geis_filterable_attribute_init(GeisFilterableAttribute fa, + * Constructs a new filterable attribute bag. + */ + FilterableAttributeBag +-geis_filterable_attribute_bag_new(); ++geis_filterable_attribute_bag_new(void); + + /** + * Destroys a filterable attribute bag. +diff --git a/libgeis/geis_frame.c b/libgeis/geis_frame.c +index ebe11a1..068d9aa 100644 +--- a/libgeis/geis_frame.c ++++ b/libgeis/geis_frame.c +@@ -57,7 +57,7 @@ struct _GeisFrameSet + * Creates a new, empty frame set. + */ + GeisFrameSet +-geis_frameset_new() ++geis_frameset_new(void) + { + GeisFrameSet frameset = calloc(1, sizeof(struct _GeisFrameSet)); + if (!frameset) +diff --git a/libgeis/geis_frame.h b/libgeis/geis_frame.h +index e0d1eb6..4a4b0ba 100644 +--- a/libgeis/geis_frame.h ++++ b/libgeis/geis_frame.h +@@ -32,7 +32,7 @@ typedef struct _GeisFrameSet *GeisFrameSet; + /** + * Creates a new, empty frame set. + */ +-GeisFrameSet geis_frameset_new(); ++GeisFrameSet geis_frameset_new(void); + + /** + * Destroys a frame set and all framees contained in it. +diff --git a/libgeis/geis_group.c b/libgeis/geis_group.c +index 0829bd4..4c51a39 100644 +--- a/libgeis/geis_group.c ++++ b/libgeis/geis_group.c +@@ -42,7 +42,7 @@ struct _GeisGroupSet + * Creates a new, empty group set. + */ + GeisGroupSet +-geis_groupset_new() ++geis_groupset_new(void) + { + GeisGroupSet groupset = calloc(1, sizeof(struct _GeisGroupSet)); + if (!groupset) +diff --git a/libgeis/geis_group.h b/libgeis/geis_group.h +index 76e0efc..c44ce62 100644 +--- a/libgeis/geis_group.h ++++ b/libgeis/geis_group.h +@@ -31,7 +31,7 @@ + /** + * Creates a new, empty group set. + */ +-GeisGroupSet geis_groupset_new(); ++GeisGroupSet geis_groupset_new(void); + + /** + * Destroys a group set and all groups contained in it. +diff --git a/libgeis/geis_region.c b/libgeis/geis_region.c +index fc8cc1e..18181cb 100644 +--- a/libgeis/geis_region.c ++++ b/libgeis/geis_region.c +@@ -52,7 +52,7 @@ static const int region_bag_growth_constant = 2; + * Constructs a region bag. + */ + GeisRegionBag +-geis_region_bag_new() ++geis_region_bag_new(void) + { + GeisRegionBag bag = calloc(1, sizeof(struct _GeisRegionBag)); + if (!bag) +diff --git a/libgeis/geis_region.h b/libgeis/geis_region.h +index 53a52b8..18d908f 100644 +--- a/libgeis/geis_region.h ++++ b/libgeis/geis_region.h +@@ -49,7 +49,7 @@ typedef struct _GeisRegionBag *GeisRegionBag; + /** + * Creates a new region bag. + */ +-GeisRegionBag geis_region_bag_new(); ++GeisRegionBag geis_region_bag_new(void); + + /** + * Destroys a region bag. +diff --git a/libgeis/geis_touch.c b/libgeis/geis_touch.c +index 74d1b3e..be0f1a7 100644 +--- a/libgeis/geis_touch.c ++++ b/libgeis/geis_touch.c +@@ -43,7 +43,7 @@ struct _GeisTouchSet + * Creates a new, empty touch set. + */ + GeisTouchSet +-geis_touchset_new() ++geis_touchset_new(void) + { + GeisTouchSet touchset = calloc(1, sizeof(struct _GeisTouchSet)); + if (!touchset) +diff --git a/libgeis/geis_touch.h b/libgeis/geis_touch.h +index 62af610..b64c755 100644 +--- a/libgeis/geis_touch.h ++++ b/libgeis/geis_touch.h +@@ -30,7 +30,7 @@ + /** + * Creates a new, empty touch set. + */ +-GeisTouchSet geis_touchset_new(); ++GeisTouchSet geis_touchset_new(void); + + /** + * Destroys a touch set and all touches contained in it. +diff --git a/libgeis/server/geis_dbus_client_proxy.c b/libgeis/server/geis_dbus_client_proxy.c +index 3f1af47..65f229b 100644 +--- a/libgeis/server/geis_dbus_client_proxy.c ++++ b/libgeis/server/geis_dbus_client_proxy.c +@@ -52,7 +52,7 @@ struct GeisDBusClientProxy + * failure. + */ + GeisDBusClientProxy +-_client_proxy_allocate() ++_client_proxy_allocate(void) + { + GeisDBusClientProxy proxy = calloc(1, sizeof(struct GeisDBusClientProxy)); + return proxy; +diff --git a/libgeis/server/geis_dbus_proxy_box.c b/libgeis/server/geis_dbus_proxy_box.c +index 4c7752a..f129bc3 100644 +--- a/libgeis/server/geis_dbus_proxy_box.c ++++ b/libgeis/server/geis_dbus_proxy_box.c +@@ -49,7 +49,7 @@ struct GeisDBusProxyBox + * Constructs a %GeisDBusProxyBox. + */ + GeisDBusProxyBox +-geis_dbus_proxy_box_new() ++geis_dbus_proxy_box_new(void) + { + GeisDBusProxyBox box = calloc(1, sizeof(struct GeisDBusProxyBox)); + if (!box) +diff --git a/libgeis/server/geis_dbus_proxy_box.h b/libgeis/server/geis_dbus_proxy_box.h +index d8a70f5..47e84b7 100644 +--- a/libgeis/server/geis_dbus_proxy_box.h ++++ b/libgeis/server/geis_dbus_proxy_box.h +@@ -47,7 +47,7 @@ typedef struct GeisDBusProxyBoxNode *GeisDBusProxyBoxIterator; + * @returns a valid %GeisDBusProxyBox or NULL on failure. + */ + GeisDBusProxyBox +-geis_dbus_proxy_box_new(); ++geis_dbus_proxy_box_new(void); + + /** + * Destroys a %GeisDBusProxyBox. +diff --git a/libs/geis-dbus/geis_dbus_dispatcher.c b/libs/geis-dbus/geis_dbus_dispatcher.c +index 10c4134..d8a3f9d 100644 +--- a/libs/geis-dbus/geis_dbus_dispatcher.c ++++ b/libs/geis-dbus/geis_dbus_dispatcher.c +@@ -82,7 +82,7 @@ struct GeisDBusDispatcher + * assumption that if you're creating a bag you're going to use it. + */ + static GeisDBusWatchBag +-_geis_dbus_watch_bag_new() ++_geis_dbus_watch_bag_new(void) + { + GeisDBusWatchBag bag = calloc(1, sizeof(struct GeisDBusWatchBag)); + if (!bag) +diff --git a/libs/geis-util/geis_logging.c b/libs/geis-util/geis_logging.c +index a02077b..030a591 100644 +--- a/libs/geis-util/geis_logging.c ++++ b/libs/geis-util/geis_logging.c +@@ -31,7 +31,7 @@ static const char *error_marker = "error"; + + + static int +-reporting_level() ++reporting_level(void) + { + char *level = getenv("GEIS_DEBUG"); + if (level) +diff --git a/testsuite/geis1/check_gesture_attrs.c b/testsuite/geis1/check_gesture_attrs.c +index 2228d2f..d990c7c 100644 +--- a/testsuite/geis1/check_gesture_attrs.c ++++ b/testsuite/geis1/check_gesture_attrs.c +@@ -169,7 +169,7 @@ END_TEST + + + Suite * +-geis1_gesture_attrs_new() ++geis1_gesture_attrs_new(void) + { + Suite *s = suite_create("geis1_gesture_attrs"); + TCase *test; +diff --git a/testsuite/geis1/check_gesture_types.c b/testsuite/geis1/check_gesture_types.c +index 3492062..980f8fb 100644 +--- a/testsuite/geis1/check_gesture_types.c ++++ b/testsuite/geis1/check_gesture_types.c +@@ -62,7 +62,7 @@ START_TEST(gesture_types) + END_TEST + + Suite * +-geis1_gesture_types_new() ++geis1_gesture_types_new(void) + { + Suite *s = suite_create("geis1_gesture_types"); + TCase *test; +diff --git a/testsuite/geis1/check_instance.c b/testsuite/geis1/check_instance.c +index ac897ab..584abfd 100644 +--- a/testsuite/geis1/check_instance.c ++++ b/testsuite/geis1/check_instance.c +@@ -44,7 +44,7 @@ END_TEST + + + Suite * +-geis1_instance_suite_new() ++geis1_instance_suite_new(void) + { + TCase *create; + Suite *s = suite_create("geis1_instance_suite"); +diff --git a/testsuite/geis1/check_subscription.c b/testsuite/geis1/check_subscription.c +index 0797337..e69c332 100644 +--- a/testsuite/geis1/check_subscription.c ++++ b/testsuite/geis1/check_subscription.c +@@ -146,7 +146,7 @@ END_TEST + + + Suite * +-geis1_subscription_new() ++geis1_subscription_new(void) + { + Suite *s = suite_create("geis1_subscription"); + TCase *test; +diff --git a/testsuite/geis2/check_attr.c b/testsuite/geis2/check_attr.c +index 9e01219..58c8ebc 100644 +--- a/testsuite/geis2/check_attr.c ++++ b/testsuite/geis2/check_attr.c +@@ -42,7 +42,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_attr_suite_new() ++geis2_attr_suite_new(void) + { + Suite *s = suite_create("geis2_attr"); + +diff --git a/testsuite/geis2/check_class.c b/testsuite/geis2/check_class.c +index ca7accd..b60d827 100644 +--- a/testsuite/geis2/check_class.c ++++ b/testsuite/geis2/check_class.c +@@ -92,7 +92,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_gesture_class_suite_new() ++geis2_gesture_class_suite_new(void) + { + TCase *gesture_class; + TCase *usage; +diff --git a/testsuite/geis2/check_config.c b/testsuite/geis2/check_config.c +index a9fc9c1..03b3137 100644 +--- a/testsuite/geis2/check_config.c ++++ b/testsuite/geis2/check_config.c +@@ -48,7 +48,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_config_suite_new() ++geis2_config_suite_new(void) + { + Suite *s = suite_create("geis2_configuration"); + +diff --git a/testsuite/geis2/check_device.c b/testsuite/geis2/check_device.c +index 8b3b7be..9583cb5 100644 +--- a/testsuite/geis2/check_device.c ++++ b/testsuite/geis2/check_device.c +@@ -99,7 +99,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_device_suite_new() ++geis2_device_suite_new(void) + { + TCase *device; + TCase *usage; +diff --git a/testsuite/geis2/check_error_codes.c b/testsuite/geis2/check_error_codes.c +index 9c7508d..57e7fc7 100644 +--- a/testsuite/geis2/check_error_codes.c ++++ b/testsuite/geis2/check_error_codes.c +@@ -20,7 +20,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_error_codes_suite_new() ++geis2_error_codes_suite_new(void) + { + Suite *s = suite_create("geis2_error_codes"); + +diff --git a/testsuite/geis2/check_event.c b/testsuite/geis2/check_event.c +index 8ecda1d..c752a30 100644 +--- a/testsuite/geis2/check_event.c ++++ b/testsuite/geis2/check_event.c +@@ -43,7 +43,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_event_suite_new() ++geis2_event_suite_new(void) + { + Suite *s = suite_create("geis2_event"); + +diff --git a/testsuite/geis2/check_filter.c b/testsuite/geis2/check_filter.c +index 3272a2a..afa23e5 100644 +--- a/testsuite/geis2/check_filter.c ++++ b/testsuite/geis2/check_filter.c +@@ -67,7 +67,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_filter_suite_new() ++geis2_filter_suite_new(void) + { + TCase *filter; + TCase *usage; +diff --git a/testsuite/geis2/check_frame.c b/testsuite/geis2/check_frame.c +index dce6faf..3ea3db0 100644 +--- a/testsuite/geis2/check_frame.c ++++ b/testsuite/geis2/check_frame.c +@@ -172,7 +172,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_gesture_frame_suite_new() ++geis2_gesture_frame_suite_new(void) + { + Suite *s = suite_create("geis2_gesture_frame"); + TCase *gesture_frame; +diff --git a/testsuite/geis2/check_geis_new.c b/testsuite/geis2/check_geis_new.c +index 1fb8de2..36cd3e9 100644 +--- a/testsuite/geis2/check_geis_new.c ++++ b/testsuite/geis2/check_geis_new.c +@@ -32,7 +32,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_geis_new_suite_new() ++geis2_geis_new_suite_new(void) + { + Suite *s = suite_create("geis2_geis_init"); + +diff --git a/testsuite/geis2/check_general_types.c b/testsuite/geis2/check_general_types.c +index 79e29bb..0f463d4 100644 +--- a/testsuite/geis2/check_general_types.c ++++ b/testsuite/geis2/check_general_types.c +@@ -20,7 +20,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_general_types_suite_new() ++geis2_general_types_suite_new(void) + { + Suite *s = suite_create("geis2_general_types"); + TCase *create; +diff --git a/testsuite/geis2/check_region.c b/testsuite/geis2/check_region.c +index 3e64e0c..606350a 100644 +--- a/testsuite/geis2/check_region.c ++++ b/testsuite/geis2/check_region.c +@@ -48,7 +48,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_region_suite_new() ++geis2_region_suite_new(void) + { + Suite *s = suite_create("geis2_region"); + TCase *creation; +diff --git a/testsuite/geis2/check_subscription.c b/testsuite/geis2/check_subscription.c +index a45c4ad..17a6779 100644 +--- a/testsuite/geis2/check_subscription.c ++++ b/testsuite/geis2/check_subscription.c +@@ -161,7 +161,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_subscription_suite_new() ++geis2_subscription_suite_new(void) + { + TCase *create; + TCase *usage; +diff --git a/tools/geis-server/geis-server.c b/tools/geis-server/geis-server.c +index 97c8b99..6600d8f 100644 +--- a/tools/geis-server/geis-server.c ++++ b/tools/geis-server/geis-server.c +@@ -23,7 +23,7 @@ + + + int +-main() ++main(void) + { + GeisStatus status; + +-- +2.37.3 + diff --git a/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch b/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch index 389e1b3fd7..7f55ed9eaf 100644 --- a/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch +++ b/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- geis-2.2.17/libgeis/geis_subscription.c.orig 2016-06-17 12:04:21.062938443 -0400 +++ geis-2.2.17/libgeis/geis_subscription.c 2016-06-17 12:05:02.934939172 -0400 @@ -237,9 +237,10 @@ diff --git a/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb b/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb index 976aafb4fc..139649b975 100644 --- a/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb +++ b/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb @@ -7,30 +7,33 @@ system-wide input gesture recognition mechanism." HOMEPAGE = "https://launchpad.net/geis" -LICENSE = "GPLv3 & LGPLv3" +LICENSE = "GPL-3.0-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://COPYING.GPL;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ " -inherit autotools pkgconfig python3native lib_package distro_features_check +inherit autotools pkgconfig python3native lib_package features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 opengl" DEPENDS += "grail dbus-glib python3 virtual/libx11 libxext libxi libxcb dbus frame" SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.xz \ file://fix-indentation-for-gcc6.patch \ file://0001-libgeis-Compare-the-first-character-of-string-to-nul.patch \ + file://0001-provide-function-declaration-with-prototypes.patch \ " + +UPSTREAM_CHECK_URI = "https://launchpad.net/geis/trunk" + SRC_URI[md5sum] = "2ff9d76a3ea5794516bb02c9d1924faf" SRC_URI[sha256sum] = "8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb" EXTRA_OECONF = "--disable-integration-tests" -FILES_${PN}-bin = "${bindir}" -RDEPENDS_${PN}-bin = " \ - python3-argparse \ +FILES:${PN}-bin = "${bindir}" +RDEPENDS:${PN}-bin = " \ python3-compression \ python3-core \ python3-crypt \ @@ -40,19 +43,17 @@ RDEPENDS_${PN}-bin = " \ python3-pickle \ python3-shell \ python3-stringold \ - python3-subprocess \ - python3-textutils \ python3-threading \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/geisview \ - ${libdir}/${PYTHON_DIR}/site-packages/geis* \ - ${libdir}/${PYTHON_DIR}/site-packages/_*.so \ + ${PYTHON_SITEPACKAGES_DIR}/geis* \ + ${PYTHON_SITEPACKAGES_DIR}/_*.so \ " -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" +FILES:${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug" -FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/site-packages/_*.la" +FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/_*.la" -FILES_${PN}-staticdev += "${libdir}/${PYTHON_DIR}/site-packages/_*.a" +FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_*.a" diff --git a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb index 22fd0f48e2..067052c036 100644 --- a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb +++ b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb @@ -2,23 +2,28 @@ SUMMARY = "Gesture Recognition And Instantiation Library" HOMEPAGE = "https://launchpad.net/grail" -LICENSE = "GPLv3 & LGPLv3" +LICENSE = "GPL-3.0-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " -inherit autotools pkgconfig +inherit autotools pkgconfig features_check DEPENDS = "frame" -CXXFLAGS_append_toolchain-clang = " -Wno-pessimizing-move" +CXXFLAGS:append:toolchain-clang = " -Wno-pessimizing-move" SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.bz2" + +UPSTREAM_CHECK_URI = "https://launchpad.net/grail/trunk" + SRC_URI[md5sum] = "0df1b3ec6167920f310e2effe6e2ad44" SRC_URI[sha256sum] = "5eed1f650f042481daa3a2de5e7d43261fe343b2a1b1e240f3b7fc26572c9df3" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}" + PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[x11] = "--with-x11, --without-x11, libxi" PACKAGE_BEFORE_PN += "${PN}-test" -FILES_${PN}-test = "${bindir}/grail-test*" +FILES:${PN}-test = "${bindir}/grail-test*" SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch b/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch new file mode 100644 index 0000000000..e39e7ddd3d --- /dev/null +++ b/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch @@ -0,0 +1,24 @@ +From c82680a21c7411ba63e5815786eeb471720faa29 Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +Date: Wed, 6 Nov 2019 20:10:09 +0800 +Subject: [PATCH] Add build rule for README. + +fix do_configure error: +Makefile.am: required file `./README' not found + +Upstream-Status: Pending +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> + +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index e77c4c4..fd77ecd 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -27,3 +27,4 @@ libtool: $(LIBTOOL_DEPS) + ChangeLog: + git log --stat --decorate=short > $@ + ++README: README.md diff --git a/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch b/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch deleted file mode 100644 index 477cc31ad2..0000000000 --- a/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch +++ /dev/null @@ -1,18 +0,0 @@ -No need to link with libfl. - -Upstream-Status: Pending -Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se> - -Index: ccid-1.4.8/src/Makefile.am -=================================================================== ---- ccid-1.4.8.orig/src/Makefile.am -+++ ccid-1.4.8/src/Makefile.am -@@ -53,7 +53,7 @@ PROVIDED_BY_PCSC = debug.c - endif - - libccid_la_SOURCES = $(COMMON) $(USB) $(TOKEN_PARSER) $(PROVIDED_BY_PCSC) $(T1) --libccid_la_LIBADD = $(LEXLIB) $(LIBUSB_LIBS) $(PTHREAD_LIBS) -+libccid_la_LIBADD = $(LIBUSB_LIBS) $(PTHREAD_LIBS) - libccid_la_CFLAGS = $(PCSC_CFLAGS) $(LIBUSB_CFLAGS) $(PTHREAD_CFLAGS) \ - $(SYMBOL_VISIBILITY) -D$(CCID_VERSION) -DSIMCLIST_NO_DUMPRESTORE - libccid_la_LDFLAGS = -avoid-version diff --git a/meta-oe/recipes-support/ccid/ccid_1.4.24.bb b/meta-oe/recipes-support/ccid/ccid_1.4.24.bb deleted file mode 100644 index 31145d0efd..0000000000 --- a/meta-oe/recipes-support/ccid/ccid_1.4.24.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Generic USB CCID smart card reader driver" -HOMEPAGE = "http://pcsclite.alioth.debian.org/ccid.html" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -DEPENDS = "virtual/libusb0 pcsc-lite" -RDEPENDS_${PN} = "pcsc-lite" - -SRC_URI = "https://alioth.debian.org/frs/download.php/file/4171/ccid-${PV}.tar.bz2 \ - file://no-dep-on-libfl.patch \ -" - -SRC_URI[md5sum] = "915a03cda85b60fefbe3654cbdc68ca9" -SRC_URI[sha256sum] = "62cb73c6c009c9799c526f05a05e25f00f0ad86d50f82a714dedcfbf4a7e4176" - -inherit autotools pkgconfig - -FILES_${PN} += "${libdir}/pcsc/" -FILES_${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug" diff --git a/meta-oe/recipes-support/ccid/ccid_1.5.5.bb b/meta-oe/recipes-support/ccid/ccid_1.5.5.bb new file mode 100644 index 0000000000..e76881916e --- /dev/null +++ b/meta-oe/recipes-support/ccid/ccid_1.5.5.bb @@ -0,0 +1,18 @@ +SUMMARY = "Generic USB CCID smart card reader driver" +HOMEPAGE = "https://ccid.apdu.fr/" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = "autoconf-archive-native virtual/libusb0 pcsc-lite" +RDEPENDS:${PN} = "pcsc-lite" + +SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ + file://0001-Add-build-rule-for-README.patch \ +" + +SRC_URI[sha256sum] = "194708f75fe369d45dd7c15e8b3e8a7db8b49cfc5557574ca2a2e76ef12ca0ca" + +inherit autotools pkgconfig + +FILES:${PN} += "${libdir}/pcsc/" +FILES:${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug" diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.13.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.13.bb deleted file mode 100644 index e883c70d1d..0000000000 --- a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.13.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Ceres Solver is an open source C++ library for modeling and solving large, complicated optimization problems." -AUTHOR = "Sameer Agarwal and Keir Mierle and Others" -HOMEPAGE = "http://ceres-solver.org/" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=35e00f0c4c96a0820a03e0b31e6416be" - -SRC_URI = "git://github.com/ceres-solver/ceres-solver.git" -SRCREV = "19333b0f55c8462381038e70d42af43b52941128" - -S = "${WORKDIR}/git" - -DEPENDS = "libeigen glog" - -inherit cmake - -# Only a static library and headers are created -ALLOW_EMPTY_${PN} = "1" - -FILES_${PN}-dev += "${libdir}/cmake/*" diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb new file mode 100644 index 0000000000..18db0721de --- /dev/null +++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Ceres Solver is an open source C++ library for modeling and solving large, complicated optimization problems." +HOMEPAGE = "http://ceres-solver.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3585a26c9cd9ec0cb36a7d65542878ca" + +DEPENDS = "libeigen glog" + +SRC_URI = "git://github.com/ceres-solver/ceres-solver.git;branch=master;protocol=https" +SRCREV = "85331393dc0dff09f6fb9903ab0c4bfa3e134b01" + +S = "${WORKDIR}/git" + +inherit cmake + +do_configure:prepend() { + # otherwise https://github.com/ceres-solver/ceres-solver/blob/0b748597889f460764f6c980a00c6f502caa3875/cmake/AddGerritCommitHook.cmake#L68 + # will try to fetch https://ceres-solver-review.googlesource.com/tools/hooks/commit-msg durind do_configure + # which sometimes gets stuck (as there is no TIMEOUT set in DOWNLOAD) + # and we really don't need Gerrit's Change-Id tags when just building this + touch ${S}/.git/hooks/commit-msg +} + +# We don't want path to eigen3 in ceres-solver RSS to be +# used by components which use CeresConfig.cmake from their +# own RSS +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: set(Eigen3_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/share/eigen3/cmake) +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: list(APPEND EIGEN_INCLUDE_DIR_HINTS ceres-solver/1.14-r0/recipe-sysroot/usr/include/eigen3) +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: set(glog_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/lib/cmake/glog) +SSTATE_SCAN_FILES += "*.cmake" + +PACKAGECONFIG ??= "" + +# suitesparse* recipes will be in meta-ros layer +PACKAGECONFIG[suitesparse] = "-DSUITESPARSE=ON,-DSUITESPARSE=OFF,suitesparse-config suitesparse-amd suitesparse-camd suitesparse-colamd suitesparse-ccolamd suitesparse-cholmod suitesparse-metis suitesparse-spqr" +PACKAGECONFIG[cxsparse] = "-DCXSPARSE=ON,-DCXSPARSE=OFF,suitesparse-cxsparse" +PACKAGECONFIG[lapack] = "-DLAPACK=ON,-DLAPACK=OFF,lapack" + +# Only a static library and headers are created +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dev = "${PN}-staticdev" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-oe/recipes-support/ckermit/ckermit/0001-Fix-function-prototype-errors.patch b/meta-oe/recipes-support/ckermit/ckermit/0001-Fix-function-prototype-errors.patch new file mode 100644 index 0000000000..306a2ee52a --- /dev/null +++ b/meta-oe/recipes-support/ckermit/ckermit/0001-Fix-function-prototype-errors.patch @@ -0,0 +1,106 @@ +From f73eade85b7a1b93f7b9ef6ca9ead9d2441f8f84 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 19:01:38 -0700 +Subject: [PATCH] Fix function prototype errors + +Clang 15 is strict, therefore ensure that right headers are pulled in +and also right function prototypes are used. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ckcmai.c | 4 ++++ + ckucmd.c | 2 +- + ckucmd.h | 2 -- + ckucon.c | 2 +- + ckufio.c | 2 +- + ckuusx.c | 2 +- + 6 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/ckcmai.c b/ckcmai.c +index a5640e5..a4e322d 100644 +--- a/ckcmai.c ++++ b/ckcmai.c +@@ -561,6 +561,10 @@ ACKNOWLEDGMENTS: + #include "ckntap.h" + #endif /* NT */ + ++#ifndef VMS ++#include <time.h> /* time() */ ++#endif ++ + #ifndef NOSERVER + /* Text message definitions.. each should be 256 chars long, or less. */ + #ifdef MINIX +diff --git a/ckucmd.c b/ckucmd.c +index 274dc2d..730f20d 100644 +--- a/ckucmd.c ++++ b/ckucmd.c +@@ -7356,7 +7356,7 @@ cmdgetc(timelimit) int timelimit; { /* Get a character from the tty. */ + Returns 0 or greater always. + */ + int +-cmdconchk() { ++cmdconchk(void) { + int x = 0, y; + y = pushc ? 1 : 0; /* Have command character pushed? */ + #ifdef OS2 +diff --git a/ckucmd.h b/ckucmd.h +index 7cd4ced..5c43cc4 100644 +--- a/ckucmd.h ++++ b/ckucmd.h +@@ -280,9 +280,7 @@ _PROTOTYP( int cmdsquo, (int) ); + _PROTOTYP( int cmdgquo, (void) ); + _PROTOTYP( char * ckcvtdate, (char *, int) ); + _PROTOTYP( int cmdgetc, (int)); +-#ifndef NOARROWKEYS + _PROTOTYP( int cmdconchk, (void) ); +-#endif /* NOARROWKEYS */ + + #ifdef CK_RECALL + _PROTOTYP( char * cmgetcmd, (char *) ); +diff --git a/ckucon.c b/ckucon.c +index 50ceb7e..954719e 100644 +--- a/ckucon.c ++++ b/ckucon.c +@@ -39,8 +39,8 @@ _PROTOTYP( static VOID concld, (void) ); + + #ifdef NEXT + #undef NSIG +-#include <sys/wait.h> /* For wait() */ + #endif /* NEXT */ ++#include <sys/wait.h> /* For wait() */ + + #include <signal.h> /* Signals */ + +diff --git a/ckufio.c b/ckufio.c +index b5bfaae..2a8d4e5 100644 +--- a/ckufio.c ++++ b/ckufio.c +@@ -142,8 +142,8 @@ _PROTOTYP( int parser, ( int ) ); + + #ifdef UNIX /* Pointer arg to wait() allowed */ + #define CK_CHILD /* Assume this is safe in all UNIX */ ++#include <sys/wait.h> /* wait() API */ + #endif /* UNIX */ +- + extern int binary, recursive, stathack; + #ifdef CK_CTRLZ + extern int eofmethod; +diff --git a/ckuusx.c b/ckuusx.c +index d332bed..253f992 100644 +--- a/ckuusx.c ++++ b/ckuusx.c +@@ -9144,7 +9144,7 @@ char *s; /* a string */ + #ifndef CK_CURPOS + /* Dummies for when cursor control is not supported */ + int +-ck_curpos(row, col) { ++ck_curpos(int row, int col) { + return(-1); + } + +-- +2.37.3 + diff --git a/meta-oe/recipes-support/ckermit/ckermit_302.bb b/meta-oe/recipes-support/ckermit/ckermit_302.bb index 61c08ee276..e32aba93ce 100644 --- a/meta-oe/recipes-support/ckermit/ckermit_302.bb +++ b/meta-oe/recipes-support/ckermit/ckermit_302.bb @@ -8,10 +8,14 @@ SECTION = "console/network" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.TXT;md5=932ca542d6c6cb8a59a0bcd76ab67cc3" -SRC_URI = "http://www.kermitproject.org/ftp/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV}" +SRC_URI = "http://www.kermitproject.org/ftp/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV} \ + file://0001-Fix-function-prototype-errors.patch \ + " SRC_URI[md5sum] = "eac4dbf18b45775e4cdee5a7c74762b0" SRC_URI[sha256sum] = "0d5f2cd12bdab9401b4c836854ebbf241675051875557783c332a6a40dac0711" +UPSTREAM_CHECK_URI = "https://www.kermitproject.org/ck90.html" +UPSTREAM_CHECK_REGEX = "cku(?P<pver>\d+)\.tar" export CC2 = "${CC}" export BINDIR = "${bindir}" @@ -20,12 +24,6 @@ export INFODIR = "${infodir}" EXTRA_OEMAKE = "-e MAKEFLAGS=" -# Additional flags. For uclibc we add -DNOARROWKEYS which stops ckermit -# trying to look inside the stdio headers. -CKERMIT_ADDITIONAL = "" -CKERMIT_ADDITIONAL_libc-uclibc = "-DNOARROWKEYS" -CKERMIT_ADDITIONAL_libc-musl = "-DNOARROWKEYS" - TARGET_CC_ARCH += "${LDFLAGS}" do_compile () { @@ -49,7 +47,7 @@ do_compile () { -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \ -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \ -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \ - ${CKERMIT_ADDITIONAL}" + -DNOARROWKEYS -DMAINTYPE=int" } do_install () { @@ -59,3 +57,11 @@ do_install () { rm ${D}${BINDIR}/kermit-sshsub (cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb) } + +# This one is reproducible only on 32bit MACHINEs +# http://errors.yoctoproject.org/Errors/Details/766966/ +# ckutio.c:12057:10: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types] +# ckutio.c:12058:20: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types] +# ckufio.c:5043:32: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types] +# ckufio.c:5263:32: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch b/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch new file mode 100644 index 0000000000..7e6611b6a8 --- /dev/null +++ b/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch @@ -0,0 +1,41 @@ +From 93557d5c5acf9ebb2c0fa708658e1d36621dd23a Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Wed, 7 Sep 2022 10:05:15 +0900 +Subject: [PATCH] Do not download the catch framework during configure. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + tests/CMakeLists.txt | 15 --------------- + 1 file changed, 15 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 80c4f6a..ae210db 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -74,21 +74,6 @@ if(Catch2_FOUND) + endif() + message(STATUS "Found Catch2") + target_link_libraries(catch_main PUBLIC Catch2::Catch2) +-else() +- message(STATUS "Downloading Catch2") +- +- # FetchContent would be better, but requires newer CMake. +- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/catch2") +- set(url https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp) +- file( +- DOWNLOAD ${url} "${CMAKE_CURRENT_BINARY_DIR}/catch2/catch.hpp" +- STATUS status +- EXPECTED_HASH SHA256=ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc) +- list(GET status 0 error) +- if(error) +- message(FATAL_ERROR "Could not download ${url}, and Catch2 not found on your system.") +- endif() +- target_include_directories(catch_main PUBLIC "${CMAKE_CURRENT_BINARY_DIR}") + endif() + + # Target must already exist +-- +2.25.1 + diff --git a/meta-oe/recipes-support/cli11/cli11_2.3.2.bb b/meta-oe/recipes-support/cli11/cli11_2.3.2.bb new file mode 100644 index 0000000000..ef3c951bbf --- /dev/null +++ b/meta-oe/recipes-support/cli11/cli11_2.3.2.bb @@ -0,0 +1,26 @@ +SUMMARY = "C++11 command line parser" +DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface." +HOMEPAGE = "https://github.com/CLIUtils/CLI11" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=afb20fe5f67e21074b10b864d9563c11" +SRCREV = "291c58789c031208f08f4f261a858b5b7083e8e2" +PV .= "+git" + +SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=main;protocol=https \ + https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp \ + file://0001-Do-not-download-the-catch-framework-during-configure.patch" + +SRC_URI[sha256sum] = "ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc" +S = "${WORKDIR}/git" + +do_configure:prepend() { + mkdir -p ${S}/tests/catch2 + cp ${DL_DIR}/catch.hpp ${S}/tests/catch2/catch.hpp +} + +inherit cmake + +# cli11 is a header only C++ library, so the main package will be empty. +RDEPENDS:${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/cmark/cmark_0.31.1.bb b/meta-oe/recipes-support/cmark/cmark_0.31.1.bb new file mode 100644 index 0000000000..1edb95e455 --- /dev/null +++ b/meta-oe/recipes-support/cmark/cmark_0.31.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "CommonMark parsing and rendering library and program in C" +HOMEPAGE = "https://github.com/commonmark/cmark" +LICENSE = "BSD-2-Clause & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" + +SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https" +SRCREV = "bb3678d7a73cb02d35c8876ecd097072636200a8" +S = "${WORKDIR}/git" + +inherit cmake lib_package + +EXTRA_OECMAKE += " \ + -DCMARK_TESTS=OFF \ + -DCMARK_STATIC=OFF \ +" diff --git a/meta-oe/recipes-support/colord/colord-native.bb b/meta-oe/recipes-support/colord/colord-native.bb new file mode 100644 index 0000000000..64dd94a9ed --- /dev/null +++ b/meta-oe/recipes-support/colord/colord-native.bb @@ -0,0 +1,64 @@ +require ${BPN}.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-native:" + +inherit meson pkgconfig native + +DEPENDS += " \ + meson-native \ + glib-2.0-native \ + lcms-native \ +" + +SRC_URI += " \ + file://0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch \ + file://Makefile;subdir=${BPN}-${PV} \ +" + +do_configure() { + # we expect meson to fail - but before it extracts project's version in log file + meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON} > /dev/null 2>&1 || true + + # extract and split version + version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'` + major=`echo $version | cut -d. -f1` + minor=`echo $version | cut -d. -f2` + micro=`echo $version | cut -d. -f3` + echo "Project version: $major.$minor.$micro" + + # extract project name + proj_name=`grep 'Project name:' ${B}/meson-logs/meson-log.txt | sed 's|Project name: ||'` + + # create cd-version.h + mkdir -p ${B}/colord + sed ${S}/lib/colord/cd-version.h.in \ + -e 's:@CD_MAJOR_VERSION_PRIVATE@:1:g' \ + -e 's:@CD_MINOR_VERSION_PRIVATE@:4:g' \ + -e 's:@CD_MICRO_VERSION_PRIVATE@:4:g' \ + > ${B}/colord/cd-version.h + + # create config.h based on target build and add what's necessary only + localedir=`echo ${datadir}/locale | sed 's:${prefix}/::g'` + echo "#define LOCALEDIR \"$localedir\"" >> ${B}/config.h + echo "#define GETTEXT_PACKAGE \"colord\"" >> ${B}/config.h + echo "#define PACKAGE_NAME \"$proj_name\"" >> ${B}/config.h + echo "#define PACKAGE_VERSION \"$version\"" >> ${B}/config.h +} + +do_compile() { + oe_runmake -C${S} DESTDIR=${B} +} + +do_install() { + version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'` + major=`echo $version | cut -d. -f1` + + install -d ${D}${libdir} + install -m 755 ${B}/libcolord.so ${D}${libdir}/libcolord.so.$version + ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so" + ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so.$major" + + install -d ${D}${bindir} + install -m 755 ${B}/cd_create_profile ${D}${bindir}/ + install -m 755 ${B}/cd_idt8 ${D}${bindir}/ +} diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch new file mode 100644 index 0000000000..a120b73114 --- /dev/null +++ b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch @@ -0,0 +1,163 @@ +From d16aed3118bee1e0a7d0bc9e0f34c427a405a6d8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 12 May 2019 21:58:02 +0200 +Subject: [PATCH] Move the function cd_icc_create_from_edid to avoid udev + dependeny +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We do not have udev-native so it is a dependeny we cannot satisfy + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + lib/colord/cd-edid.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ + lib/colord/cd-icc.c | 62 ------------------------------------------- + 2 files changed, 63 insertions(+), 62 deletions(-) + +diff --git a/lib/colord/cd-edid.c b/lib/colord/cd-edid.c +index a5e2328..dec509a 100644 +--- a/lib/colord/cd-edid.c ++++ b/lib/colord/cd-edid.c +@@ -687,3 +687,66 @@ cd_edid_new (void) + edid = g_object_new (CD_TYPE_EDID, NULL); + return CD_EDID (edid); + } ++ ++/** ++ * cd_icc_create_from_edid_data: ++ * @icc: A valid #CdIcc ++ * @edid: EDID data ++ * @error: A #GError, or %NULL ++ * ++ * Creates an ICC profile from EDID data. ++ * ++ * Return value: %TRUE for success ++ * ++ * Since: 1.1.2 ++ **/ ++gboolean ++cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error) ++{ ++ CdIccPrivate *priv = GET_PRIVATE (icc); ++ const gchar *data; ++ ++ /* not loaded */ ++ if (priv->lcms_profile != NULL) { ++ g_set_error_literal (error, ++ CD_ICC_ERROR, ++ CD_ICC_ERROR_FAILED_TO_CREATE, ++ "already loaded or generated"); ++ return FALSE; ++ } ++ ++ /* create from parsed object */ ++ if (!cd_icc_create_from_edid (icc, ++ cd_edid_get_gamma (edid), ++ cd_edid_get_red (edid), ++ cd_edid_get_green (edid), ++ cd_edid_get_blue (edid), ++ cd_edid_get_white (edid), ++ error)) { ++ return FALSE; ++ } ++ ++ /* set copyright */ ++ cd_icc_set_copyright (icc, NULL, ++ /* deliberately not translated */ ++ "This profile is free of known copyright restrictions."); ++ ++ /* set 'ICC meta Tag for Monitor Profiles' data */ ++ data = cd_edid_get_checksum (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data); ++ data = cd_edid_get_monitor_name (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data); ++ data = cd_edid_get_serial_number (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data); ++ data = cd_edid_get_pnp_id (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data); ++ data = cd_edid_get_vendor_name (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data); ++ return TRUE; ++} ++ +diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c +index 3937d8a..daf6f4d 100644 +--- a/lib/colord/cd-icc.c ++++ b/lib/colord/cd-icc.c +@@ -3117,68 +3117,6 @@ cd_icc_create_default (CdIcc *icc, GError **error) + return cd_icc_create_default_full (icc, CD_ICC_LOAD_FLAGS_NONE, error); + } + +-/** +- * cd_icc_create_from_edid_data: +- * @icc: A valid #CdIcc +- * @edid: EDID data +- * @error: A #GError, or %NULL +- * +- * Creates an ICC profile from EDID data. +- * +- * Return value: %TRUE for success +- * +- * Since: 1.1.2 +- **/ +-gboolean +-cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error) +-{ +- CdIccPrivate *priv = GET_PRIVATE (icc); +- const gchar *data; +- +- /* not loaded */ +- if (priv->lcms_profile != NULL) { +- g_set_error_literal (error, +- CD_ICC_ERROR, +- CD_ICC_ERROR_FAILED_TO_CREATE, +- "already loaded or generated"); +- return FALSE; +- } +- +- /* create from parsed object */ +- if (!cd_icc_create_from_edid (icc, +- cd_edid_get_gamma (edid), +- cd_edid_get_red (edid), +- cd_edid_get_green (edid), +- cd_edid_get_blue (edid), +- cd_edid_get_white (edid), +- error)) { +- return FALSE; +- } +- +- /* set copyright */ +- cd_icc_set_copyright (icc, NULL, +- /* deliberately not translated */ +- "This profile is free of known copyright restrictions."); +- +- /* set 'ICC meta Tag for Monitor Profiles' data */ +- data = cd_edid_get_checksum (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data); +- data = cd_edid_get_monitor_name (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data); +- data = cd_edid_get_serial_number (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data); +- data = cd_edid_get_pnp_id (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data); +- data = cd_edid_get_vendor_name (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data); +- return TRUE; +-} +- + /** + * cd_icc_create_from_edid: + * @icc: A valid #CdIcc diff --git a/meta-oe/recipes-support/colord/colord-native/Makefile b/meta-oe/recipes-support/colord/colord-native/Makefile new file mode 100644 index 0000000000..1e29e4f670 --- /dev/null +++ b/meta-oe/recipes-support/colord/colord-native/Makefile @@ -0,0 +1,48 @@ +# For native build cd_idt8, cd_create_profile and a tiny version of libcolord.so +# only. By reducing the library to what's necessary, we avoid dependencies on +# naitve udev and libgudev + +CFLAGS+=$(shell pkg-config-native --cflags gio-2.0) +CFLAGS+=$(shell pkg-config-native --cflags lcms2) +CFLAGS+=-std=c99 -I./lib -I./lib/colord -I$(DESTDIR) -DCD_COMPILATION + +LDFLAGS+=$(shell pkg-config-native --libs gio-2.0) +LDFLAGS+=$(shell pkg-config-native --libs lcms2) +LDFLAGS+=-lm + +all: cd_idt8 cd_create_profile + +LIBSOURCES = \ + lib/colord/cd-it8.c \ + lib/colord/cd-color.c \ + lib/colord/cd-spectrum.c \ + lib/colord/cd-math.c \ + lib/colord/cd-interp-akima.c \ + lib/colord/cd-context-lcms.c \ + lib/colord/cd-interp.c \ + lib/colord/cd-interp-linear.c \ + lib/colord/cd-it8-utils.c \ + lib/colord/cd-enum.c \ + lib/colord/cd-icc.c \ + lib/colord/cd-icc-utils.c \ + lib/colord/cd-dom.c + +libcolord.so: $(LIBSOURCES) + $(CC) $(CFLAGS) -L$(DESTDIR) -fPIC -shared -Wl,-soname,$@ $^ -o $(DESTDIR)/$@ $(LDFLAGS) + +cd_idt8.o: client/cd-it8.c + $(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@ + +cd_idt8: libcolord.so cd_idt8.o + $(CC) $(DESTDIR)/cd_idt8.o -o $(DESTDIR)/$@ -L$(DESTDIR) -lcolord $(LDFLAGS) + +cd_create_profile.o: client/cd-create-profile.c + $(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@ + +cd_create_profile: libcolord.so cd_create_profile.o + $(CC) $(DESTDIR)/cd_create_profile.o -o $(DESTDIR)/$@ -L$(DESTDIR) -lcolord $(LDFLAGS) + +.PHONY: clean + +clean: + rm -f $(DESTDIR)/libcolord.so $(DESTDIR)/*.o $(DESTDIR)/cd_idt8 $(DESTDIR)/cd_create_profile diff --git a/meta-oe/recipes-support/colord/colord.bb b/meta-oe/recipes-support/colord/colord.bb new file mode 100644 index 0000000000..6eb9db8dab --- /dev/null +++ b/meta-oe/recipes-support/colord/colord.bb @@ -0,0 +1,51 @@ +require ${BPN}.inc + +inherit meson gobject-introspection gsettings gtk-doc gettext bash-completion systemd features_check useradd pkgconfig + +# polkit and gobject-introspection are mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" +GIR_MESON_OPTION = "" + +DEPENDS += " \ + ${BPN}-native \ + dbus \ + glib-2.0 \ + lcms \ + libgudev \ + libgusb \ + polkit \ + sqlite3 \ +" + +RDEPENDS:${PN} += "hwdata" + +SRC_URI += " \ + file://0001-Run-native-cd_idt8-cd_create_profile.patch \ + file://08a32b2379fb5582f4312e59bf51a2823df56276.patch \ +" + +EXTRA_OEMESON += " \ + -Dman=false \ + -Ddaemon_user=colord \ + -Dpnp_ids=${datadir}/hwdata/pnp.ids \ +" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" + +SYSTEMD_SERVICE:${PN} = "colord.service" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ + ${datadir}/glib-2.0 \ + ${datadir}/color \ + ${systemd_user_unitdir} \ + ${nonarch_libdir}/tmpfiles.d \ + ${libdir}/colord-plugins \ + ${libdir}/colord-sensors \ +" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --user-group -s /bin/false colord" + diff --git a/meta-oe/recipes-support/colord/colord.inc b/meta-oe/recipes-support/colord/colord.inc new file mode 100644 index 0000000000..cafbaaa696 --- /dev/null +++ b/meta-oe/recipes-support/colord/colord.inc @@ -0,0 +1,12 @@ +SUMMARY = "Making color management just work" +HOMEPAGE = "https://www.freedesktop.org/software/colord/" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \ +" + +PV = "1.4.7" +SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "de02d9910634ae159547585cec414e450f711c27235453b4f9b38a9f2361a653" + diff --git a/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch b/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch new file mode 100644 index 0000000000..4b52aa3379 --- /dev/null +++ b/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch @@ -0,0 +1,59 @@ +From 5aad8831c0fb71940d6c4f982b0b30ffb6ae33b3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 12 May 2019 22:47:05 +0200 +Subject: [PATCH] Run native cd_idt8/cd_create_profile +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + data/cmf/meson.build | 2 +- + data/illuminant/meson.build | 2 +- + data/profiles/meson.build | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/data/cmf/meson.build b/data/cmf/meson.build +index a693cd7..1ae3613 100644 +--- a/data/cmf/meson.build ++++ b/data/cmf/meson.build +@@ -2,7 +2,7 @@ foreach arg: [ 'CIE1964-10deg-XYZ', 'CIE1931-2deg-XYZ' ] + custom_target(arg, + input: arg + '.csv', + output: arg + '.cmf', +- command: [ cd_idt8, 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ], ++ command: [ 'cd_idt8', 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ], + install: true, + install_dir: join_paths(datadir, 'colord', 'cmf') + ) +diff --git a/data/illuminant/meson.build b/data/illuminant/meson.build +index f8dfa07..ad7dced 100644 +--- a/data/illuminant/meson.build ++++ b/data/illuminant/meson.build +@@ -24,7 +24,7 @@ foreach arg: generated_spectra + custom_target(arg, + input: arg + '.csv', + output: arg + '.sp', +- command: [ cd_idt8, 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ], ++ command: [ 'cd_idt8', 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ], + install: true, + install_dir: join_paths(datadir, 'colord', 'illuminant') + ) +diff --git a/data/profiles/meson.build b/data/profiles/meson.build +index 591b97d..2cef011 100644 +--- a/data/profiles/meson.build ++++ b/data/profiles/meson.build +@@ -59,7 +59,7 @@ foreach arg: icc_profiles + generated_icc = custom_target(arg + '.icc', + input: xml_i18n, + output: arg + '.icc', +- command: [ cd_create_profile, '--output=@OUTPUT@', '@INPUT@' ], ++ command: [ 'cd_create_profile', '--output=@OUTPUT@', '@INPUT@' ], + install: true, + install_dir: join_paths(datadir, 'color', 'icc', 'colord'), + ) +-- +2.20.1 + diff --git a/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch b/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch new file mode 100644 index 0000000000..860e6ab4af --- /dev/null +++ b/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch @@ -0,0 +1,28 @@ +From 08a32b2379fb5582f4312e59bf51a2823df56276 Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@hughsie.com> +Date: Mon, 29 Jan 2024 10:37:11 +0000 +Subject: [PATCH] Fix writing to the database with ProtectSystem=strict + +Fixes https://github.com/hughsie/colord/issues/166 + +Upstream-Status: Backport [https://github.com/hughsie/colord/commit/08a32b2379fb5582f4312e59bf51a2823df56276] +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + data/colord.service.in | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/data/colord.service.in b/data/colord.service.in +index 6825d944..c358dc4b 100644 +--- a/data/colord.service.in ++++ b/data/colord.service.in +@@ -17,6 +17,10 @@ ProtectControlGroups=true + RestrictRealtime=true + RestrictAddressFamilies=AF_UNIX + ++ConfigurationDirectory=colord ++StateDirectory=colord ++CacheDirectory=colord ++ + # drop all capabilities + CapabilityBoundingSet=~CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER CAP_IPC_OWNER CAP_NET_ADMIN CAP_SYS_RAWIO CAP_SYS_TIME CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE CAP_KILL CAP_MKNOD CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYS_RESOURCE CAP_MAC_ADMIN CAP_MAC_OVERRIDE CAP_SYS_BOOT CAP_LINUX_IMMUTABLE CAP_IPC_LOCK CAP_SYS_CHROOT CAP_BLOCK_SUSPEND CAP_LEASE CAP_SYS_PACCT CAP_SYS_TTY_CONFIG CAP_WAKE_ALARM + diff --git a/meta-oe/recipes-support/composefs/composefs_1.0.5.bb b/meta-oe/recipes-support/composefs/composefs_1.0.5.bb new file mode 100644 index 0000000000..14133fdcb6 --- /dev/null +++ b/meta-oe/recipes-support/composefs/composefs_1.0.5.bb @@ -0,0 +1,30 @@ +SUMMARY = "Tools to handle creating and mounting composefs images" +DESCRIPTION = "The composefs project combines several underlying Linux \ +features to provide a very flexible mechanism to support read-only mountable \ +filesystem trees, stacking on top of an underlying "lower" Linux filesystem." +HOMEPAGE = "https://github.com/containers/composefs" +LICENSE = "GPL-3.0-or-later & LGPL-2.0-or-later & Apache-2.0" +LIC_FILES_CHKSUM = "\ + file://BSD-2-Clause.txt;md5=121c8a0a8fa5961a26b7863034ebcce8 \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ +" + +SRCREV = "098d985a1b9a15ac828d7b2382297a6955e31e40" +SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" + +inherit meson + +DEPENDS = "openssl" + +EXTRA_OEMESON += " \ + -Dman=disabled \ + -Dfuse=disabled \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/consolation/consolation_0.0.9.bb b/meta-oe/recipes-support/consolation/consolation_0.0.9.bb new file mode 100644 index 0000000000..17981b6e9b --- /dev/null +++ b/meta-oe/recipes-support/consolation/consolation_0.0.9.bb @@ -0,0 +1,29 @@ +SUMMARY = "copy-paste for the Linux console" +DESCRIPTION = "Consolation is a daemon that provides copy-paste and scrolling \ +support to the Linux console. It is based on the libinput library and \ +supports all pointer devices and settings provided by this library. Similar \ +software include gpm and jamd." +HOMEPAGE = "https://salsa.debian.org/consolation-team/consolation" +SECTION = "console/utils" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7df9eea2f4dfdda489c116099e6fc062" + +DEPENDS = " \ + libevdev \ + libinput \ + udev \ +" + +SRC_URI = "git://salsa.debian.org/consolation-team/consolation.git;branch=master" +SRCREV = "5ef08f0cd6ede62de14de477b74fc3611108c676" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig systemd + +do_install:append() { + install -d ${D}${systemd_system_unitdir} + install -m 644 ${B}/consolation.service ${D}${systemd_system_unitdir} +} + +SYSTEMD_SERVICE:${PN} = "consolation.service" diff --git a/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch b/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch new file mode 100644 index 0000000000..c93b76619c --- /dev/null +++ b/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch @@ -0,0 +1,30 @@ +From a53f123040998744602f190944464af0e159ea19 Mon Sep 17 00:00:00 2001 +From: jjll <jjll@gmv.com> +Date: Wed, 6 Sep 2023 20:47:41 +0200 +Subject: [PATCH] Compatibility with boost 1.83 + +Upstream-Status: Backport [https://github.com/cpp-netlib/cpp-netlib/pull/902] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libs/network/src/server_request_parsers_impl.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/boost/network/protocol/http/server/impl/parsers.ipp ++++ b/boost/network/protocol/http/server/impl/parsers.ipp +@@ -13,6 +13,7 @@ + #include <tuple> + #include <boost/fusion/include/std_tuple.hpp> + #include <boost/network/protocol/http/message/header.hpp> ++#include <boost/regex/pending/unicode_iterator.hpp> + + #ifdef BOOST_NETWORK_NO_LIB + #ifndef BOOST_NETWORK_INLINE +@@ -32,7 +33,7 @@ typedef std::basic_string<uint32_t> u32_ + template <> // <typename Attrib, typename T, typename Enable> + struct assign_to_container_from_value<std::string, u32_string, void> { + static void call(u32_string const& val, std::string& attr) { +- u32_to_u8_iterator<u32_string::const_iterator> begin = val.begin(), ++ boost::u32_to_u8_iterator<u32_string::const_iterator> begin = val.begin(), + end = val.end(); + for (; begin != end; ++begin) attr += *begin; + } diff --git a/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb b/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb new file mode 100644 index 0000000000..bda5177fc4 --- /dev/null +++ b/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Modern C++ network programming libraries." + +# This library provides general purpose network functionality such as +# socket communication to agent libraries. It was designed to be merged +# into boost at some point and follows similar header library approach +# for most functionality. + +SECTION = "libs" +LICENSE = "BSL-1.0 & MIT & Python-2.0" +LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" +PV = "0.13.0" + +SRCREV = "31d304cdf52b485f465ada433d8905171b61cbff" +SRC_URI = "\ + git://github.com/cpp-netlib/cpp-netlib.git;protocol=https;branch=0.13-release \ + file://a53f123040998744602f190944464af0e159ea19.patch \ +" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +DEPENDS = "zlib boost openssl" + +EXTRA_OECMAKE:append = " -DCPP-NETLIB_BUILD_TESTS=OFF -DCPP-NETLIB_BUILD_EXAMPLES=OFF" + +do_install:append() { + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibConfig.cmake + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibTargets-noconfig.cmake +} diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch new file mode 100644 index 0000000000..b956db22fd --- /dev/null +++ b/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch @@ -0,0 +1,27 @@ +Upstream-Status: Pending + +Description: new toolchain might have increased the float precision +Author: Gianfranco Costamagna <locutusofborg@debian.org> +Last-Update: 2017-10-28 +Forwarded: https://github.com/Microsoft/cpprestsdk/issues/576 + +Index: cpprest/Release/tests/functional/streams/istream_tests.cpp +=================================================================== +--- cpprest.orig/Release/tests/functional/streams/istream_tests.cpp ++++ cpprest/Release/tests/functional/streams/istream_tests.cpp +@@ -1297,6 +1297,7 @@ + void compare_double(double expected, double actual) { compare_floating(expected, actual, DBL_EPSILON); } + void compare_float(float expected, float actual) { compare_floating(expected, actual, FLT_EPSILON); } + ++ /* + TEST(extract_floating_point) + { + std::string test_string; +@@ -1343,6 +1344,7 @@ + if (expected == 0) VERIFY_ARE_EQUAL(1 / expected, 1 / actual); + } while (!std_istream.eof()); + } ++ */ + + TEST(extract_floating_point_with_exceptions) + { diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch new file mode 100644 index 0000000000..961eaf7646 --- /dev/null +++ b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch @@ -0,0 +1,129 @@ +Upstream-Status: Pending + +Description: Debian forbids calls to external websites. + +Author: Gianfranco Costamagna <locutus@debian.org> +Origin: Debian +Forwarded: not-needed +Reviewed-By: Gianfranco Costamagna <locutusofborg@debian.org> +Last-Update: 2015-11-25 + +Index: cpprest/Release/tests/functional/http/client/CMakeLists.txt +=================================================================== +--- cpprest.orig/Release/tests/functional/http/client/CMakeLists.txt ++++ cpprest/Release/tests/functional/http/client/CMakeLists.txt +@@ -12,7 +12,6 @@ + multiple_requests.cpp + oauth1_tests.cpp + oauth2_tests.cpp +- outside_tests.cpp + pipeline_stage_tests.cpp + progress_handler_tests.cpp + proxy_tests.cpp +Index: cpprest/Release/tests/functional/http/client/authentication_tests.cpp +=================================================================== +--- cpprest.orig/Release/tests/functional/http/client/authentication_tests.cpp ++++ cpprest/Release/tests/functional/http/client/authentication_tests.cpp +@@ -675,9 +675,9 @@ + VERIFY_ARE_EQUAL(return_code, response.status_code()); + } + +- TEST(auth_no_data) { auth_test_impl(false); } ++ //TEST(auth_no_data) { auth_test_impl(false); } + +- TEST(unsuccessful_auth_with_basic_cred) { auth_test_impl(true); } ++ //TEST(unsuccessful_auth_with_basic_cred) { auth_test_impl(true); } + + TEST_FIXTURE(uri_address, set_user_options_asio_http) + { +@@ -695,6 +695,7 @@ + VERIFY_ARE_EQUAL(200, response.status_code()); + } + ++ /* + TEST_FIXTURE(uri_address, set_user_options_asio_https) + { + handle_timeout([] { +@@ -714,6 +715,7 @@ + VERIFY_IS_FALSE(v.empty()); + }); + } ++ */ + + #endif + +Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.cpp +=================================================================== +--- cpprest.orig/Release/tests/functional/websockets/client/authentication_tests.cpp ++++ cpprest/Release/tests/functional/websockets/client/authentication_tests.cpp +@@ -93,6 +93,7 @@ SUITE(authentication_tests) + return false; + } + ++ /* + TEST(ssl_test) + { + websocket_client client; +@@ -127,6 +128,7 @@ SUITE(authentication_tests) + throw; + } + } ++ */ + + void handshake_error_test_impl(const ::utility::string_t& host) + { +@@ -148,11 +150,11 @@ SUITE(authentication_tests) + } + } + +- TEST(self_signed_cert) { handshake_error_test_impl(U("wss://self-signed.badssl.com/")); } ++ //TEST(self_signed_cert) { handshake_error_test_impl(U("wss://self-signed.badssl.com/")); } + +- TEST(hostname_mismatch) { handshake_error_test_impl(U("wss://wrong.host.badssl.com/")); } ++ //TEST(hostname_mismatch) { handshake_error_test_impl(U("wss://wrong.host.badssl.com/")); } + +- TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } ++ //TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } + + } // SUITE(authentication_tests) + +Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp +=================================================================== +--- cpprest.orig/Release/tests/functional/http/client/connections_and_errors.cpp ++++ cpprest/Release/tests/functional/http/client/connections_and_errors.cpp +@@ -408,6 +408,7 @@ + } + #endif + ++ /* + // Try to connect to a server on a closed port and cancel the operation. + TEST_FIXTURE(uri_address, cancel_bad_port) + { +@@ -439,6 +440,7 @@ + + VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled); + } ++ */ + + } // SUITE(connections_and_errors) + +--- cpprest-2.10.16.orig/Release/tests/functional/http/client/redirect_tests.cpp ++++ cpprest-2.10.16/Release/tests/functional/http/client/redirect_tests.cpp +@@ -159,7 +159,7 @@ SUITE(redirect_tests) + VERIFY_NO_THROWS(reply.get()); + } + } +- ++/* + TEST(does_not_follow_https_to_http_by_default) + { + handle_timeout([] { +@@ -182,7 +182,7 @@ SUITE(redirect_tests) + ); + }); + } +- ++*/ + TEST_FIXTURE(uri_address, follows_permanent_redirect) + { + #if USING_WINHTTP diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb new file mode 100644 index 0000000000..aec7286404 --- /dev/null +++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb @@ -0,0 +1,19 @@ +SUMMARY = "Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design." +SECTION = "libs/network" +HOMEPAGE = "https://github.com/Microsoft/cpprestsdk/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${S}/license.txt;md5=a2e15b954769218ff912468eecd6a02f" +DEPENDS = "openssl websocketpp zlib boost brotli" + +EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake/cpprestsdk -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF" + +SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \ + file://disable-float-tests.patch \ + file://disable-outside-tests.patch " + +# tag 2.10.19 +SRCREV= "411a109150b270f23c8c97fa4ec9a0a4a98cdecf" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig diff --git a/meta-oe/recipes-support/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch b/meta-oe/recipes-support/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch deleted file mode 100644 index fb2f07f073..0000000000 --- a/meta-oe/recipes-support/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- git.old/Makefile 2012-04-17 13:29:46.280435340 +0200 -+++ git/Makefile 2012-04-17 13:31:13.664433470 +0200 -@@ -77,17 +77,7 @@ INSTALL_PROGRAM = ${INSTALL} - INSTALL_DATA = ${INSTALL} -m 644 - INSTALL_SCRIPT = ${INSTALL_PROGRAM} - --# If you are running a cross compiler, you may want to set this --# to something more interesting, like "arm-linux-". If you want --# to compile vs uClibc, that can be done here as well. --CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- --CC = $(CROSS)gcc --LD = $(CROSS)gcc --AR = $(CROSS)ar --STRIP = $(CROSS)strip --RANLIB = $(CROSS)ranlib --HOSTCC = gcc -- -+HOSTCC = $(BUILD_CC) - - # Now we set up the build system - # -@@ -95,7 +85,7 @@ HOSTCC = gcc - # set up PWD so that older versions of make will work with our build. - PWD = $(shell pwd) - --export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS -+export CFLAGS LDFLAGS LIB_OBJS - - # check if compiler option is supported - cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;} diff --git a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb b/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb deleted file mode 100644 index 88fcc0200f..0000000000 --- a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "To make access to the Linux kernel cpufreq subsystem easier for users and cpufreq userspace tools, a cpufrequtils package was created" - -inherit gettext - -DEPENDS = "libtool-cross" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRCREV = "a2f0c39d5f21596bb9f5223e895c0ff210b265d0" -# SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/cpufreq/cpufrequtils.git - -SRC_URI = "git://github.com/emagii/cpufrequtils.git \ - file://0001-dont-unset-cflags.patch \ -" - -EXTRA_OEMAKE_append = " ${@['', 'NLS=false']['${USE_NLS}' == 'no']} " - -PR = "r5" - -S = "${WORKDIR}/git" - -TARGET_CC_ARCH += "${LDFLAGS}" - -EXTRA_OEMAKE = "V=1 CROSS=${TARGET_PREFIX} LIBTOOL='${HOST_SYS}-libtool --tag cc' STRIPCMD=echo 'CP=cp'" - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake -e install DESTDIR=${D} - rm -f ${D}${libdir}/libcpufreq.so.0 ${D}${libdir}/libcpufreq.so - ln -s libcpufreq.so.0.0.0 ${D}${libdir}/libcpufreq.so.0 - ln -s libcpufreq.so.0.0.0 ${D}${libdir}/libcpufreq.so -} - diff --git a/meta-oe/recipes-support/cpulimit/cpulimit/0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch b/meta-oe/recipes-support/cpulimit/cpulimit/0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch new file mode 100644 index 0000000000..50d0342ec7 --- /dev/null +++ b/meta-oe/recipes-support/cpulimit/cpulimit/0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch @@ -0,0 +1,41 @@ +From 41cfba0840f58555593fd4bee07db77221043e0b Mon Sep 17 00:00:00 2001 +From: Portia <stephensportia@gmail.com> +Date: Sun, 1 May 2022 12:43:35 +1000 +Subject: [PATCH] Remove sys/sysctl.h and add missing libgen.h include + +- sys/sysctl.h has been deprecated and should be removed +- Adds missing libgen.h include when calling basename() + +Upstream-Status: Inactive-Upstream [2015] +Signed-off-by: Portia <stephensportia@gmail.com> +--- + src/cpulimit.c | 1 - + src/process_group.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cpulimit.c b/src/cpulimit.c +index 50eabea..5b0ec49 100644 +--- a/src/cpulimit.c ++++ b/src/cpulimit.c +@@ -38,7 +38,6 @@ + #include <string.h> + #include <sys/stat.h> + #include <sys/time.h> +-#include <sys/sysctl.h> + #include <sys/resource.h> + #include <sys/types.h> + #include <sys/wait.h> +diff --git a/src/process_group.c b/src/process_group.c +index 06d73a6..d4f6fab 100644 +--- a/src/process_group.c ++++ b/src/process_group.c +@@ -24,6 +24,7 @@ + #include <limits.h> + #include <sys/time.h> + #include <signal.h> ++#include <libgen.h> + + #include <assert.h> + +-- +2.25.1 diff --git a/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb b/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb new file mode 100644 index 0000000000..f88d3b6ca1 --- /dev/null +++ b/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "cpulimit is a tool which limits the CPU usage of a process" +DESCRIPTION = "cpulimit is a simple program that attempts to limit the CPU usage of a process (expressed in percentage, not in CPU time). This is useful to control batch jobs, when you don't want them to eat too much CPU. It does not act on the nice value or other priority stuff, but on the real CPU usage. Besides it is able to adapt itself to the overall system load, dynamically and quickly." +HOMEPAGE = "http://cpulimit.sourceforge.net" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86c1c0d961a437e529db93aa3bb32dc4" +SRCREV ?= "f4d2682804931e7aea02a869137344bb5452a3cd" + +SRC_URI = "git://github.com/opsengine/cpulimit.git;protocol=https;branch=master \ + file://0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch \ + " + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake all +} +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${B}/src/${BPN} ${D}${sbindir}/ +} + +CFLAGS += "-D_GNU_SOURCE ${LDFLAGS}" + diff --git a/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb new file mode 100644 index 0000000000..4247263b5a --- /dev/null +++ b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb @@ -0,0 +1,20 @@ +SUMMARY = "Utility that provides userspace support for reading and writing to the i.MX fuses" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=201414b6610203caed355323b1ab3116" + +GO_IMPORT = "github.com/usbarmory/crucible" +SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master;destsuffix=${GO_SRCURI_DESTSUFFIX}" + +GO_INSTALL = "\ + ${GO_IMPORT}/cmd/crucible \ + ${GO_IMPORT}/cmd/habtool \ +" +SRCREV = "dec27cd4e0e0db106c0a21d429c04ca8d36bbdd5" + +export GOPROXY = "https://proxy.golang.org,direct" +# Workaround for network access issue during compile step. +# This needs to be fixed in the recipes buildsystem so that +# it can be accomplished during do_fetch task. +do_compile[network] = "1" + +inherit go-mod diff --git a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.4.bb b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.4.bb deleted file mode 100644 index c13b764f79..0000000000 --- a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.4.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Manage plain dm-crypt and LUKS encrypted volumes" -DESCRIPTION = "Cryptsetup is used to conveniently setup dm-crypt managed \ -device-mapper mappings. These include plain dm-crypt volumes and \ -LUKS volumes. The difference is that LUKS uses a metadata header \ -and can hence offer more features than plain dm-crypt. On the other \ -hand, the header is visible and vulnerable to damage." -HOMEPAGE = "http://code.google.com/p/cryptsetup/" -SECTION = "console" -LICENSE = "GPL-2.0-with-OpenSSL-exception" -LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" - -DEPENDS = "util-linux libdevmapper popt libgcrypt" - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v1.7/${BP}.tar.xz" -SRC_URI[md5sum] = "058ed35c5b776032c2a036838f9e22a7" -SRC_URI[sha256sum] = "7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016" - -inherit autotools gettext pkgconfig - -# Use openssl because libgcrypt drops root privileges -# if libgcrypt is linked with libcap support -PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[openssl] = "--with-crypto_backend=openssl,,openssl" -PACKAGECONFIG[gcrypt] = "--with-crypto_backend=gcrypt,,libgcrypt" - -RRECOMMENDS_${PN} = "kernel-module-aes-generic \ - kernel-module-dm-crypt \ - kernel-module-md5 \ - kernel-module-cbc \ - kernel-module-sha256-generic \ - kernel-module-xts \ -" - -EXTRA_OECONF = "--enable-static" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb index 3a049e76da..ece30a598b 100644 --- a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb +++ b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb @@ -2,16 +2,18 @@ SUMMARY = "Common files and packaging infrastructure for CT-API modules" HOMEPAGE = "http://fedoraproject.org/" SECTION = "System Environment/Libraries" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://../ctapi-common.LICENSE;md5=8744cd52545ecb45befebd0da6f70f0a" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/ctapi-common.LICENSE;md5=8744cd52545ecb45befebd0da6f70f0a" -SRC_URI = "http://ftp.riken.jp/Linux/fedora/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.LICENSE \ - http://ftp.riken.jp/Linux/fedora/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README" -SRC_URI[md5sum] = "5b7259ef1c8cd9ae801fca7a5cb548c1" +SRC_URI = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.LICENSE \ + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README" SRC_URI[sha256sum] = "87a74eb0a66055c34ba2c5c919e74f3211c5950ae1c2cbab967fdf4137f5de91" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_compile() { - install -pm 644 ${WORKDIR}/ctapi-common.LICENSE LICENSE - install -pm 644 ${WORKDIR}/ctapi-common.README README + install -pm 644 ${UNPACKDIR}/ctapi-common.LICENSE LICENSE + install -pm 644 ${UNPACKDIR}/ctapi-common.README README echo ${libdir}/ctapi > ctapi.conf } @@ -20,4 +22,4 @@ do_install() { install -dm 755 ${D}${libdir}/ctapi } -FILES_${PN} += "${libdir}/ctapi" +FILES:${PN} += "${libdir}/ctapi" diff --git a/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb b/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb new file mode 100644 index 0000000000..f63348a328 --- /dev/null +++ b/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb @@ -0,0 +1,27 @@ +SUMMARY = "Cyaml library" +DESCRIPTION = "LibCYAML is a library for reading and writing structured YAML documents." +HOMEPAGE = "https://github.com/tlsa/libcyaml" +SECTION = "libs" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fe6f0e49348c87bddd5d27803dceaaf0" +DEPENDS = " \ + libyaml \ +" +SRCREV = "07ff8654a270ec9b410acd3152b60de9e9f941af" + +SRC_URI = "git://github.com/tlsa/libcyaml.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" + +inherit pkgconfig + +EXTRA_OEMAKE = "'PREFIX=""' 'DESTDIR=${D}' 'CFLAGS=${CFLAGS}' 'LIBDIR=${libdir}' 'INCLUDEDIR=${includedir}' 'VARIANT=release'" + +do_compile() { + oe_runmake +} +do_install() { + oe_runmake install +} + +CFLAGS += "-pedantic -Wall -Wextra -O3 -Iinclude"
\ No newline at end of file diff --git a/meta-oe/recipes-support/daemonize/daemonize_git.bb b/meta-oe/recipes-support/daemonize/daemonize_git.bb index 4790883a7d..f46dec59fc 100644 --- a/meta-oe/recipes-support/daemonize/daemonize_git.bb +++ b/meta-oe/recipes-support/daemonize/daemonize_git.bb @@ -1,14 +1,14 @@ SUMMARY = "A tool to run a command as a daemon" HOMEPAGE = "http://software.clapper.org/daemonize/" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=3cf9084faa88bc8554a9139d8d7dd35f" -PV = "1.7.7+git${SRCPV}" +PV = "1.7.8" inherit autotools -SRCREV = "6b10308b13c13e7b911e75e27bf7e65c30d58799" -SRC_URI = "git://github.com/bmc/daemonize.git \ - file://fix-ldflags-for-gnuhash.patch" +SRCREV = "18869a797dab12bf1c917ba3b4782fef484c407c" +SRC_URI = "git://github.com/bmc/daemonize.git;branch=master;protocol=https \ +" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/daemonize/files/fix-ldflags-for-gnuhash.patch b/meta-oe/recipes-support/daemonize/files/fix-ldflags-for-gnuhash.patch deleted file mode 100644 index 4fa2ee1b3b..0000000000 --- a/meta-oe/recipes-support/daemonize/files/fix-ldflags-for-gnuhash.patch +++ /dev/null @@ -1,23 +0,0 @@ -Add the LDFLAGS to the final link to avoid errors with missing GNU_HASH - -Upstream-Status: Submitted [https://github.com/bmc/daemonize/pull/22] - -Signed-off-by: Derek Straka <derek@asterius.io> - -diff --git a/Makefile.in b/Makefile.in -index 8a4d078..40d3dee 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -24,10 +24,10 @@ LDFLAGS = @LDFLAGS@ - all: daemonize - - daemonize: daemonize.o getopt.o $(MISSING_OBJECTS) -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ - - testdaemon: testdaemon.o -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ - - psman: daemonize.ps - diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-Fix-signature-of-main-function.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-Fix-signature-of-main-function.patch new file mode 100644 index 0000000000..4b332a000e --- /dev/null +++ b/meta-oe/recipes-support/daemontools/daemontools/0001-Fix-signature-of-main-function.patch @@ -0,0 +1,209 @@ +From 269f18d5e6698fdd34fec2798f10c6fe072f3cd5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 23:36:52 -0700 +Subject: [PATCH] Fix signature of main function + +Clang-15 errors out otherewise. +Include needed headers for missing functions + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/chkshsgr.c | 2 +- + src/tai64n.c | 2 +- + src/tai64nlocal.c | 2 +- + src/trycpp.c | 5 +++-- + src/tryflock.c | 4 ++-- + src/trymkffo.c | 2 +- + src/trypoll.c | 3 ++- + src/trysgact.c | 4 ++-- + src/trysgprm.c | 4 ++-- + src/tryshsgr.c | 3 ++- + src/tryulong64.c | 4 ++-- + src/trywaitp.c | 4 ++-- + src/x86cpuid.c | 2 +- + 13 files changed, 22 insertions(+), 19 deletions(-) + +diff --git a/src/chkshsgr.c b/src/chkshsgr.c +index 038afe9..9547a4c 100644 +--- a/src/chkshsgr.c ++++ b/src/chkshsgr.c +@@ -5,7 +5,7 @@ + #include <grp.h> + #include <unistd.h> + +-int main() ++int main(int argc, char *argv[]) + { + gid_t x[4]; + +diff --git a/src/tai64n.c b/src/tai64n.c +index 17bdb82..7096ab3 100644 +--- a/src/tai64n.c ++++ b/src/tai64n.c +@@ -27,7 +27,7 @@ buffer in = BUFFER_INIT(myread,0,inbuf,sizeof inbuf); + + char stamp[TIMESTAMP + 1]; + +-int main() ++int main(int argc, char *argv[]) + { + char ch; + +diff --git a/src/tai64nlocal.c b/src/tai64nlocal.c +index ce16ad8..2435737 100644 +--- a/src/tai64nlocal.c ++++ b/src/tai64nlocal.c +@@ -28,7 +28,7 @@ unsigned long nanosecs; + unsigned long u; + struct tm *t; + +-int main() ++int main(int argc, char *argv[]) + { + char ch; + +diff --git a/src/trycpp.c b/src/trycpp.c +index e4503d4..d96c955 100644 +--- a/src/trycpp.c ++++ b/src/trycpp.c +@@ -1,6 +1,7 @@ + /* Public domain. */ +- +-int main() ++#include <stdio.h> ++#include <stdlib.h> ++int main(int argc, char *argv[]) + { + #ifdef NeXT + printf("nextstep\n"); exit(0); +diff --git a/src/tryflock.c b/src/tryflock.c +index a82ffc2..5ca97d3 100644 +--- a/src/tryflock.c ++++ b/src/tryflock.c +@@ -3,8 +3,8 @@ + #include <sys/types.h> + #include <sys/file.h> + #include <fcntl.h> +- +-main() ++void ++main(int argc, char *argv[]) + { + flock(0,LOCK_EX | LOCK_UN | LOCK_NB); + } +diff --git a/src/trymkffo.c b/src/trymkffo.c +index 9356342..f92414a 100644 +--- a/src/trymkffo.c ++++ b/src/trymkffo.c +@@ -3,7 +3,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + +-void main() ++void main(int argc, char *argv[]) + { + mkfifo("temp-trymkffo",0); + } +diff --git a/src/trypoll.c b/src/trypoll.c +index 6506617..cb888cc 100644 +--- a/src/trypoll.c ++++ b/src/trypoll.c +@@ -3,8 +3,9 @@ + #include <sys/types.h> + #include <fcntl.h> + #include <poll.h> ++#include <unistd.h> + +-int main() ++int main(int argc, char *argv[]) + { + struct pollfd x; + +diff --git a/src/trysgact.c b/src/trysgact.c +index e264ef2..25da013 100644 +--- a/src/trysgact.c ++++ b/src/trysgact.c +@@ -1,8 +1,8 @@ + /* Public domain. */ + + #include <signal.h> +- +-main() ++void ++main(int argc, char *argv[]) + { + struct sigaction sa; + sa.sa_handler = 0; +diff --git a/src/trysgprm.c b/src/trysgprm.c +index a46c82c..5a9491c 100644 +--- a/src/trysgprm.c ++++ b/src/trysgprm.c +@@ -1,8 +1,8 @@ + /* Public domain. */ + + #include <signal.h> +- +-main() ++void ++main(int argc, char *argv[]) + { + sigset_t ss; + +diff --git a/src/tryshsgr.c b/src/tryshsgr.c +index c5ed6d6..d111e40 100644 +--- a/src/tryshsgr.c ++++ b/src/tryshsgr.c +@@ -1,6 +1,7 @@ + /* Public domain. */ + +-int main() ++#include <unistd.h> ++int main(int argc, char *argv[]) + { + short x[4]; + +diff --git a/src/tryulong64.c b/src/tryulong64.c +index 003548a..20a3a40 100644 +--- a/src/tryulong64.c ++++ b/src/tryulong64.c +@@ -1,6 +1,6 @@ + /* Public domain. */ +- +-int main() ++#include <unistd.h> ++int main(int argc, char *argv[]) + { + unsigned long u; + u = 1; +diff --git a/src/trywaitp.c b/src/trywaitp.c +index 319b81f..90bc5aa 100644 +--- a/src/trywaitp.c ++++ b/src/trywaitp.c +@@ -2,8 +2,8 @@ + + #include <sys/types.h> + #include <sys/wait.h> +- +-main() ++void ++main(int argc, char *argv[]) + { + waitpid(0,0,0); + } +diff --git a/src/x86cpuid.c b/src/x86cpuid.c +index f81c593..1cb1ea6 100644 +--- a/src/x86cpuid.c ++++ b/src/x86cpuid.c +@@ -7,7 +7,7 @@ void nope() + exit(1); + } + +-int main() ++int main(int argc, char *argv[]) + { + unsigned long x[4]; + unsigned long y[4]; +-- +2.37.3 + diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch index 30e37cb1d3..139ff30f2e 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch +++ b/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch @@ -9,6 +9,8 @@ ERROR: daemontools-0.76-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binar Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + src/conf-ld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch deleted file mode 100644 index 8d9577d5ff..0000000000 --- a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a43a3327ccd4b06a3bcf0c87d518a97c6b39ac02 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Sat, 6 Aug 2016 02:09:53 +0900 -Subject: [PATCH] daemontools: Fix a warning - -To fix the warning as following: - -WARNING: daemontools-native-0.76-r0 do_populate_sysroot: File '/build-poky/tmp/sysroots/x86_64-linux/usr/bin/chkshsgr' from daemontools-native was already stripped, this will prevent future debugging! - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - src/conf-ld | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/conf-ld b/src/conf-ld -index 59a0de7..1d0518a 100644 ---- a/src/conf-ld -+++ b/src/conf-ld -@@ -1,3 +1,3 @@ --gcc -s -+gcc - - This will be used to link .o files into an executable. --- -2.7.4 - diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff b/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff index ce1959782a..b5eb7d8b1a 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff +++ b/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff @@ -4,6 +4,8 @@ Date: Wed, 12 Dec 2007 13:44:15 +0000 Subject: [PATCH] error.h: '#include <errno.h>' instead of 'extern int errno;' --- +Upstream-Status: Pending + daemontools-0.76/src/error.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff b/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff index 73dce90726..16a0148546 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff +++ b/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff @@ -4,6 +4,8 @@ Date: Sun, 24 Feb 2008 10:54:26 +0000 Subject: [PATCH] supervise.c: ./supervise may be a symlink, if it's dangling, create link target --- +Upstream-Status: Pending + daemontools-0.76/src/supervise.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch b/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch index f164c2d10d..98d4a5e45b 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch +++ b/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + make sure it can be compiled for cross target 1. never try to compile target binary by native gcc @@ -30,7 +32,7 @@ diff -Nurp daemontools-0.76.orig/src/Makefile daemontools-0.76/src/Makefile hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \ tryshsgr.c warn-shsgr - ./chkshsgr || ( cat warn-shsgr; exit 1 ) -+ chkshsgr || ( cat warn-shsgr; exit 1 ) ++ echo "Warning: We can not run test on cross target. - ignoring ./chkshsgr || ( cat warn-shsgr; exit 1 )" ./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c @@ -39,7 +41,7 @@ diff -Nurp daemontools-0.76.orig/src/Makefile daemontools-0.76/src/Makefile readproctitle rts.tests setlock setuidgid softlimit supervise svc \ svok svscan svscanboot svstat tai64n tai64nlocal - env - /bin/sh rts.tests 2>&1 | cat -v > rts -+ echo "Warning: We can not run test on cross target." ++ echo "Warning: We can not run test on cross target. - ignoring env - /bin/sh rts.tests 2>&1 | cat -v > rts" scan_ulong.o: compile scan.h scan_ulong.c ./compile scan_ulong.c diff --git a/meta-oe/recipes-support/daemontools/daemontools/warnings.patch b/meta-oe/recipes-support/daemontools/daemontools/warnings.patch new file mode 100644 index 0000000000..5c9c7114b9 --- /dev/null +++ b/meta-oe/recipes-support/daemontools/daemontools/warnings.patch @@ -0,0 +1,76 @@ +Upstream-Status: Pending + +Fixup misc warnings + +Patch by RiverRat + +http://bugs.gentoo.org/124487 + +--- a/src/chkshsgr.c ++++ b/src/chkshsgr.c +@@ -1,10 +1,13 @@ + /* Public domain. */ + ++#include <sys/types.h> ++#include <stdlib.h> ++#include <grp.h> + #include <unistd.h> + + int main() + { +- short x[4]; ++ gid_t x[4]; + + x[0] = x[1] = 0; + if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1); +--- a/src/matchtest.c ++++ b/src/matchtest.c +@@ -1,3 +1,4 @@ ++#include <unistd.h> + #include "match.h" + #include "buffer.h" + #include "str.h" +--- a/src/multilog.c ++++ b/src/multilog.c +@@ -1,3 +1,4 @@ ++#include <stdio.h> + #include <unistd.h> + #include <sys/types.h> + #include <sys/stat.h> +--- a/src/prot.c ++++ b/src/prot.c +@@ -1,5 +1,8 @@ + /* Public domain. */ + ++#include <sys/types.h> ++#include <unistd.h> ++#include <grp.h> + #include "hasshsgr.h" + #include "prot.h" + +--- a/src/seek_set.c ++++ b/src/seek_set.c +@@ -1,6 +1,7 @@ + /* Public domain. */ + + #include <sys/types.h> ++#include <unistd.h> + #include "seek.h" + + #define SET 0 /* sigh */ +--- a/src/supervise.c ++++ b/src/supervise.c +@@ -1,3 +1,4 @@ ++#include <stdio.h> + #include <unistd.h> + #include <sys/types.h> + #include <sys/stat.h> +--- a/src/pathexec_run.c ++++ b/src/pathexec_run.c +@@ -1,5 +1,6 @@ + /* Public domain. */ + ++#include <unistd.h> + #include "error.h" + #include "stralloc.h" + #include "str.h" diff --git a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb index 84e9bca0ee..6561a4ae02 100644 --- a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb +++ b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb @@ -12,25 +12,26 @@ data." SECTION = "System/Servers" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/PD;md5=b3597d12946881e13cb3b548d1173851" +LIC_FILES_CHKSUM = "file://src/prot.c;beginline=1;endline=1;md5=96964cadf07e8f8c1e2ffb3b507dd647" LICENSE = "PD" -SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \ - file://0001-error.h-include-errno.h-instead-of-extern-int.diff \ - file://0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff " - -SRC_URI_append_class-target = "file://cross-compile.patch \ - file://0001-daemontools-Fix-QA-Issue.patch " +DEPENDS += "coreutils" -SRC_URI_append_class-native = "file://0001-daemontools-native-Fix-a-warning.patch " +SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \ + file://0001-error.h-include-errno.h-instead-of-extern-int.diff \ + file://0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff \ + file://cross-compile.patch \ + file://0001-daemontools-Fix-QA-Issue.patch \ + file://warnings.patch \ + file://0001-Fix-signature-of-main-function.patch \ +" SRC_URI[md5sum] = "1871af2453d6e464034968a0fbcb2bfc" SRC_URI[sha256sum] = "a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f" -S = "${WORKDIR}/admin/${BPN}-${PV}" +UPSTREAM_CHECK_URI = "http://cr.yp.to/daemontools/install.html" -DEPENDS += "daemontools-native" -DEPENDS_class-native = "" +S = "${WORKDIR}/admin/${BP}" do_compile() { ./package/compile @@ -40,12 +41,17 @@ do_install() { install -d ${D}/${bindir} } -do_install_append_class-native() { - install -m 755 ${S}/compile/chkshsgr ${D}/${bindir} -} - -do_install_append_class-target() { +do_install:append:class-target() { install -m755 ${S}/command/* ${D}/${bindir} } -BBCLASSEXTEND = "native" +inherit update-alternatives +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = "svc svok" + +# http://errors.yoctoproject.org/Errors/Details/766886/ +# pathexec_run.c:19:17: error: passing argument 2 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] +# pathexec_run.c:19:22: error: passing argument 3 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] +# pathexec_run.c:36:18: error: passing argument 2 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] +# pathexec_run.c:36:23: error: passing argument 3 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] +CC += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb b/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb new file mode 100644 index 0000000000..a8fd88a9ad --- /dev/null +++ b/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "Double conversion libraries" +DESCRIPTION = "This provides binary-decimal and decimal-binary routines for IEEE doubles." +HOMEPAGE = "https://github.com/google/double-conversion.git" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1ea35644f0ec0d9767897115667e901f" + + +S = "${WORKDIR}/git" + +SRC_URI = " \ + git://github.com/google/double-conversion.git;protocol=https;branch=master \ + file://run-ptest \ +" +SRCREV = "4f7a25d8ced8c7cf6eee6fd09d6788eaa23c9afe" + +inherit cmake ptest + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" + +# These ptest use ctest (provided by cmake) +RDEPENDS:${PN}-ptest += "cmake" +# Build tests only if ptest is enabled +EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DBUILD_TESTING=ON', '', d)}" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + cp -rf ${B}/test ${D}${PTEST_PATH} + install -m 0644 ${B}/CTestTestfile.cmake ${D}${PTEST_PATH}/ + files=" + CTestTestfile.cmake + test/CTestTestfile.cmake + test/cmake_install.cmake + test/cctest/CTestTestfile.cmake + test/cctest/cmake_install.cmake + " + for file in $files; do + sed -i -e "s|${B}|${PTEST_PATH}|g" -e "s|${S}|${PTEST_PATH}|g" -e "s|${WORKDIR}/recipe-sysroot-native||g" "${D}${PTEST_PATH}/${file}" + done + +} diff --git a/meta-oe/recipes-support/dc/files/run-ptest b/meta-oe/recipes-support/dc/files/run-ptest new file mode 100644 index 0000000000..9240a3f851 --- /dev/null +++ b/meta-oe/recipes-support/dc/files/run-ptest @@ -0,0 +1,23 @@ +#!/bin/sh + +# This script runs tests taken from the github CI for the Double-Conversion library. +# For more information, please see: https://github.com/google/double-conversion/blob/master/.github/workflows/ci.yml#L60 + +# Count the number of failed tests +NUM_FAILS=0 + +# Run all tests using ctest +ctest -V + +# VCount the number of failed tests by checking the LastTest.log file generated by ctest +NUM_FAILS=$(grep -c "Failed" Testing/Temporary/LastTest.log) + +# Run the tests directly as well, just in case we forgot to add it to ctest +test/cctest/cctest +if [ $? -ne 0 ]; then + # If the test failed, increment the number of failed tests + NUM_FAILS=$(expr $NUM_FAILS + 1) +fi + +# Return the number of failed tests +exit $NUM_FAILS diff --git a/meta-oe/recipes-support/debsums/debsums_2.2.2.bb b/meta-oe/recipes-support/debsums/debsums_2.2.2.bb deleted file mode 100644 index 13f20eb944..0000000000 --- a/meta-oe/recipes-support/debsums/debsums_2.2.2.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Miscellaneous utilities specific to Debian" -SUMMARY_${PN}-cron = "Cron scripts to control automatic debsum checking" -DESCRIPTION = "A tool for verification of installed package files against \ -MD5 checksums debsums can verify the integrity of installed package files \ -against MD5 checksums installed by the package, or generated from a .deb \ -archive." -DESCRIPTION_${PN}-cron = "Cron scripts to control automatic system integrity \ -checking via debsums." -SECTION = "base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=770d751553e6559e9eaefd2e11ccf7e9" - -SRC_URI = "http://snapshot.debian.org/archive/debian/20170530T212108Z/pool/main/d/debsums/debsums_2.2.2.tar.xz" -SRC_URI[md5sum] = "82b0710855a7e5212d4358163a269e79" -SRC_URI[sha256sum] = "aa61896f93a6bbfe0161c21dcd67529ae8e1ec8c3ccf244523c52c4ad8253d97" - -# the package is taken from snapshots.debian.org; that source is static and goes stale -# so we check the latest upstream from a directory that does get updated -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/" - -inherit perlnative gettext - -do_install() { - install -d ${D}/${sysconfdir}/cron.daily ${D}/${sysconfdir}/cron.weekly - install -d ${D}/${sysconfdir}/cron.monthly ${D}${sbindir} ${D}${bindir} - install -d ${D}${mandir}/man1 ${D}${mandir}/man8 - install -m 0755 debsums ${D}${bindir}/ - install -m 0755 rdebsums ${D}${bindir}/ - install -m 0755 debsums_init ${D}${sbindir} - install -m 0644 man/debsums.1 ${D}${mandir}/man1/ - install -m 0644 man/rdebsums.1 ${D}${mandir}/man1/ - install -m 0644 man/debsums_init.8 ${D}${mandir}/man8/ - install -m 0644 debian/cron.daily \ - ${D}/${sysconfdir}/cron.daily/debsums - install -m 0644 debian/cron.weekly \ - ${D}/${sysconfdir}/cron.weekly/debsums - install -m 0644 debian/cron.monthly \ - ${D}/${sysconfdir}/cron.monthly/debsums - # Must exist, defaults to empty. - touch ${D}/${sysconfdir}/debsums-ignore -} - -PACKAGES =+ "${PN}-cron" - -RDEPENDS_${PN} = "dpkg dpkg-perl libfile-fnmatch-perl perl \ - perl-module-constant perl-module-digest-md5 \ - perl-module-errno perl-module-fcntl \ - perl-module-file-basename perl-module-file-copy \ - perl-module-file-find perl-module-file-glob \ - perl-module-file-path perl-module-file-spec \ - perl-module-file-temp perl-module-getopt-long \ - perl-module-posix" - -FILES_${PN}-cron = "${sysconfdir}/cron.*" diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb deleted file mode 100644 index c86eb2e4bb..0000000000 --- a/meta-oe/recipes-support/devmem2/devmem2.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Simple program to read/write from/to any location in memory" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf" -PR = "r7" - -SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \ - file://devmem2-fixups-2.patch;apply=yes;striplevel=0" -S = "${WORKDIR}" - -CFLAGS += "-DFORCE_STRICT_ALIGNMENT" - -python do_unpack_append() { - os.rename("devmem2-new.c", "devmem2.c") -} - -do_compile() { - ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS} -} - -do_install() { - install -d ${D}${bindir} - install devmem2 ${D}${bindir} -} - -SRC_URI[md5sum] = "e23f236e94be4c429aa1ceac0f01544b" -SRC_URI[sha256sum] = "3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639" diff --git a/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch b/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch deleted file mode 100644 index 4517797fc7..0000000000 --- a/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- devmem2.c 2004-08-05 01:55:25.000000000 +0200 -+++ devmem2_modif.c 2011-01-13 15:48:37.798799784 +0100 -@@ -45,12 +45,16 @@ - #define MAP_SIZE 4096UL - #define MAP_MASK (MAP_SIZE - 1) - -+static inline void *fixup_addr(void *addr, size_t size); -+ - int main(int argc, char **argv) { - int fd; - void *map_base, *virt_addr; -- unsigned long read_result, writeval; -+ unsigned long read_result, write_val; - off_t target; - int access_type = 'w'; -+ char fmt_str[128]; -+ size_t data_size; - - if(argc < 2) { - fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n" -@@ -79,38 +83,51 @@ - virt_addr = map_base + (target & MAP_MASK); - switch(access_type) { - case 'b': -+ data_size = sizeof(unsigned char); -+ virt_addr = fixup_addr(virt_addr, data_size); - read_result = *((unsigned char *) virt_addr); - break; - case 'h': -+ data_size = sizeof(unsigned short); -+ virt_addr = fixup_addr(virt_addr, data_size); - read_result = *((unsigned short *) virt_addr); - break; - case 'w': -+ data_size = sizeof(unsigned long); -+ virt_addr = fixup_addr(virt_addr, data_size); - read_result = *((unsigned long *) virt_addr); - break; - default: - fprintf(stderr, "Illegal data type '%c'.\n", access_type); - exit(2); - } -- printf("Value at address 0x%X (%p): 0x%X\n", target, virt_addr, read_result); -+ sprintf(fmt_str, "Read at address 0x%%08lX (%%p): 0x%%0%dlX\n", 2*data_size); -+ printf(fmt_str, (unsigned long)target, virt_addr, read_result); - fflush(stdout); - - if(argc > 3) { -- writeval = strtoul(argv[3], 0, 0); -+ write_val = strtoul(argv[3], 0, 0); - switch(access_type) { - case 'b': -- *((unsigned char *) virt_addr) = writeval; -+ virt_addr = fixup_addr(virt_addr, sizeof(unsigned char)); -+ *((unsigned char *) virt_addr) = write_val; - read_result = *((unsigned char *) virt_addr); - break; - case 'h': -- *((unsigned short *) virt_addr) = writeval; -+ virt_addr = fixup_addr(virt_addr, sizeof(unsigned short)); -+ *((unsigned short *) virt_addr) = write_val; - read_result = *((unsigned short *) virt_addr); - break; - case 'w': -- *((unsigned long *) virt_addr) = writeval; -+ virt_addr = fixup_addr(virt_addr, sizeof(unsigned long)); -+ *((unsigned long *) virt_addr) = write_val; - read_result = *((unsigned long *) virt_addr); - break; - } -- printf("Written 0x%X; readback 0x%X\n", writeval, read_result); -+ sprintf(fmt_str, "Write at address 0x%%08lX (%%p): 0x%%0%dlX, " -+ "readback 0x%%0%dlX\n", 2*data_size, 2*data_size); -+ printf(fmt_str, (unsigned long)target, virt_addr, -+ write_val, read_result); - fflush(stdout); - } - -@@ -119,3 +136,12 @@ - return 0; - } - -+static inline void *fixup_addr(void *addr, size_t size) -+{ -+#ifdef FORCE_STRICT_ALIGNMENT -+ unsigned long aligned_addr = (unsigned long)addr; -+ aligned_addr &= ~(size - 1); -+ addr = (void *)aligned_addr; -+#endif -+ return addr; -+} diff --git a/meta-oe/recipes-support/devmem2/devmem2_2.0.bb b/meta-oe/recipes-support/devmem2/devmem2_2.0.bb new file mode 100644 index 0000000000..5d2e8463e2 --- /dev/null +++ b/meta-oe/recipes-support/devmem2/devmem2_2.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "Simple program to read/write from/to any location in memory" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf" + +SRC_URI = "git://github.com/denix0/devmem2.git;protocol=https;branch=main" +SRCREV = "5b395a946894eb4f4ef5d07c80a50a88573a541e" + +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + +S = "${WORKDIR}/git" + +CFLAGS += "-DFORCE_STRICT_ALIGNMENT" + +do_compile() { + ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS} +} + +do_install() { + install -d ${D}${bindir} + install devmem2 ${D}${bindir} +} diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.11.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.11.bb new file mode 100644 index 0000000000..4641b0181a --- /dev/null +++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.11.bb @@ -0,0 +1,24 @@ +require dfu-util_${PV}.bb + +inherit deploy native + +DEPENDS = "libusb1-native" + +PACKAGECONFIG ??= "" + +PACKAGECONFIG[static] = "CFLAGS='${CFLAGS} -pthread -static',," + +do_deploy() { + install -m 0755 src/dfu-util ${DEPLOYDIR}/dfu-util-${PV} + rm -f ${DEPLOYDIR}/dfu-util + ln -sf ./dfu-util-${PV} ${DEPLOYDIR}/dfu-util +} + +addtask deploy before do_package after do_install + +# cleandirs should possibly be in deploy.bbclass but we need it +do_deploy[cleandirs] = "${DEPLOYDIR}" +# clear stamp-extra-info since MACHINE_ARCH is normally put there by +# deploy.bbclass +do_deploy[stamp-extra-info] = "" + diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb deleted file mode 100644 index aeca23bf2d..0000000000 --- a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb +++ /dev/null @@ -1,15 +0,0 @@ -require dfu-util_${PV}.bb - -inherit native deploy - -DEPENDS = "libusb1-native" - -SRC_URI += "file://0001-Revert-Makefile.am-Drop-static-dfu-util.patch" - -do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" -do_deploy() { - install -m 0755 src/dfu-util_static ${DEPLOYDIR}/dfu-util-${PV} - rm -f ${DEPLOYDIR}/dfu-util - ln -sf ./dfu-util-${PV} ${DEPLOYDIR}/dfu-util -} -addtask deploy before do_package after do_install diff --git a/meta-oe/recipes-support/dfu-util/dfu-util/0001-Revert-Makefile.am-Drop-static-dfu-util.patch b/meta-oe/recipes-support/dfu-util/dfu-util/0001-Revert-Makefile.am-Drop-static-dfu-util.patch deleted file mode 100644 index 1c6ad0807e..0000000000 --- a/meta-oe/recipes-support/dfu-util/dfu-util/0001-Revert-Makefile.am-Drop-static-dfu-util.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c2aab3b9ae1febcb6b4c6561a59df1930a57b394 Mon Sep 17 00:00:00 2001 -From: Martin JaMa Jansa <Martin.Jansa@gmail.com> -Date: Thu, 11 Aug 2011 11:19:52 +0200 -Subject: [PATCH] Revert "Makefile.am: Drop static dfu-util" - -This reverts commit fe0426ddc04f503d148c5e5f931f16b8f674f071. - -Signed-off-by: Martin JaMa Jansa <Martin.Jansa@gmail.com> ---- - configure.ac | 2 +- - src/Makefile.am | 22 +++++++++++++++++++++- - 2 files changed, 22 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f5a43b8..6a3757e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,7 +21,7 @@ AS_IF([test x$native_libusb = xno], [ - AC_MSG_ERROR([*** Required libusb-1.0 >= 1.0.0 not installed ***])) - ]) - --LIBS="$LIBS $USB_LIBS" -+LIBS="$LIBS $USB_LIBS -lpthread" - CFLAGS="$CFLAGS $USB_CFLAGS" - - # Checks for header files. -diff --git a/src/Makefile.am b/src/Makefile.am -index 70179c4..e8736ee 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,6 +1,6 @@ - AM_CFLAGS = -Wall -Wextra - --bin_PROGRAMS = dfu-util dfu-suffix dfu-prefix -+bin_PROGRAMS = dfu-util dfu-util_static dfu-suffix dfu-prefix - dfu_util_SOURCES = main.c \ - portable.h \ - dfu_load.c \ -@@ -19,6 +19,26 @@ dfu_util_SOURCES = main.c \ - quirks.c \ - quirks.h - -+dfu_util_static_SOURCES = main.c \ -+ portable.h \ -+ dfu_load.c \ -+ dfu_load.h \ -+ dfu_util.c \ -+ dfu_util.h \ -+ dfuse.c \ -+ dfuse.h \ -+ dfuse_mem.c \ -+ dfuse_mem.h \ -+ dfu.c \ -+ dfu.h \ -+ usb_dfu.h \ -+ dfu_file.c \ -+ dfu_file.h \ -+ quirks.c \ -+ quirks.h -+ -+dfu_util_static_LDFLAGS = -static -+ - dfu_suffix_SOURCES = suffix.c \ - dfu_file.h \ - dfu_file.c --- -2.7.2 - diff --git a/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb b/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb new file mode 100644 index 0000000000..23913e31f7 --- /dev/null +++ b/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "USB Device Firmware Upgrade utility" +HOMEPAGE = "http://dfu-util.sourceforge.net" +SECTION = "devel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "libusb1" + +SRC_URI = "http://dfu-util.sourceforge.net/releases/${BP}.tar.gz" +SRC_URI[sha256sum] = "b4b53ba21a82ef7e3d4c47df2952adf5fa494f499b6b0b57c58c5d04ae8ff19e" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "nativesdk" diff --git a/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb deleted file mode 100644 index 76e1552c0c..0000000000 --- a/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "USB Device Firmware Upgrade utility" -HOMEPAGE = "http://dfu-util.sourceforge.net" -SECTION = "devel" -AUTHOR = "Harald Welte <laforge@openmoko.org>" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI = "http://dfu-util.gnumonks.org/releases/${BP}.tar.gz" - -inherit autotools pkgconfig - -DEPENDS = "libusb1" - -SRC_URI[md5sum] = "233bb1e08ef4b405062445d84e28fde6" -SRC_URI[sha256sum] = "36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833" diff --git a/meta-oe/recipes-support/dhex/dhex_0.69.bb b/meta-oe/recipes-support/dhex/dhex_0.69.bb new file mode 100644 index 0000000000..3cc870481f --- /dev/null +++ b/meta-oe/recipes-support/dhex/dhex_0.69.bb @@ -0,0 +1,25 @@ +SUMMARY = "dhex is a hex editor that includes a diff mode" +SECTION = "console/utils" +HOMEPAGE = "http://www.dettus.net/dhex/" + +DEPENDS = "ncurses" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://README.txt;beginline=229;endline=241;md5=6f252a421b65bcecf624382ba3c899da" + +SRC_URI = "http://www.dettus.net/dhex/dhex_0.69.tar.gz" +SRC_URI[md5sum] = "64d557437fe110c19f23ed3e9bbcdd54" +SRC_URI[sha256sum] = "52730bcd1cf16bd4dae0de42531be9a4057535ec61ca38c0804eb8246ea6c41b" + +S = "${WORKDIR}/dhex_${PV}" + +EXTRA_OEMAKE += "'CC=${CC}' 'LDFLAGS=${LDFLAGS}' 'CPPFLAGS=${CPPFLAGS}'" + +do_compile() { + oe_runmake +} + +do_install() { + install -m 0755 -d ${D}${bindir} + install -m 0755 ${S}/dhex ${D}${bindir}/ +} diff --git a/meta-oe/recipes-support/digitemp/digitemp_git.bb b/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb index 460aa14384..6565097334 100644 --- a/meta-oe/recipes-support/digitemp/digitemp_git.bb +++ b/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb @@ -1,14 +1,12 @@ SUMMARY = "read temperature sensors in a 1-Wire net" SECTION = "util" DEPENDS = "libusb1" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0" -PV = "3.7.1+git${SRCPV}" +SRC_URI = "git://github.com/bcl/digitemp;branch=master;protocol=https" -SRC_URI = "git://github.com/bcl/digitemp" - -SRCREV = "389f67655efa1674f595106c3a47b5ad082609a7" +SRCREV = "a162e63aad35358aab325388f3d5e88121606419" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/dool/dool_1.3.2.bb b/meta-oe/recipes-support/dool/dool_1.3.2.bb new file mode 100644 index 0000000000..f7e403018c --- /dev/null +++ b/meta-oe/recipes-support/dool/dool_1.3.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "Dool is a Python3 compatible fork of Dstat" +DESCRIPTION = "Dool is a command line tool to monitor many aspects of your system: \ +CPU, Memory, Network, Load Average, etc. It also includes a robust plug-in architecture \ +to allow monitoring other system metrics." +HOMEPAGE = "http://dag.wiee.rs/home-made/dstat" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464" + +DEPENDS += "asciidoc-native xmlto-native" +RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell python3-six python3-unixadmin" + +SRC_URI = "git://github.com/scottchiefbaker/dool.git;branch=master;protocol=https \ + " + +SRCREV = "b2862905be841232c9e36ce1e059d3fe34ef0cdf" + +S = "${WORKDIR}/git" + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + + diff --git a/meta-oe/recipes-support/dos2unix/dos2unix_7.4.0.bb b/meta-oe/recipes-support/dos2unix/dos2unix_7.4.0.bb deleted file mode 100644 index 8d3c578d0d..0000000000 --- a/meta-oe/recipes-support/dos2unix/dos2unix_7.4.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Convert text file line endings between CRLF and LF" -DESCRIPTION = "The Dos2unix package includes utilities dos2unix and \ -unix2dos to convert plain text files in DOS or Mac format to Unix \ -format and vice versa." -HOMEPAGE = "http://waterlan.home.xs4all.nl/dos2unix.html" -SECTION = "support" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=1b78fca784db24f4a40e30b300787f3f" - -SRC_URI = "git://git.code.sf.net/p/dos2unix/dos2unix" - -# Release 7.4.0 -SRCREV = "1182533bde3c1fe65be2ead465e87671faa2c027" - -S = "${WORKDIR}/git/dos2unix" - -inherit gettext perlnative - -# The dos2unix NLS relies on po4a-native, while po4a recipe is -# provided by meta-perl layer, so make it optional here, you -# need have meta-perl in bblayers.conf before enabling nls in -# PACKAGECONFIG. -PACKAGECONFIG ??= "" -PACKAGECONFIG[nls] = "ENABLE_NLS=1,ENABLE_NLS=,po4a-native" - -EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS} LDFLAGS_USER='${LDFLAGS}'" -EXTRA_OEMAKE_class-native = "ENABLE_NLS=" - -do_install () { - oe_runmake DESTDIR="${D}${base_prefix}" install -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/driverctl/driverctl_0.115.bb b/meta-oe/recipes-support/driverctl/driverctl_0.115.bb new file mode 100644 index 0000000000..970844f982 --- /dev/null +++ b/meta-oe/recipes-support/driverctl/driverctl_0.115.bb @@ -0,0 +1,26 @@ +SUMMARY = "driverctl is a device driver control utility for Linux" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +REQUIRED_DISTRO_FEATURES = "systemd" + +DEPENDS = "systemd" +RDEPENDS:${PN} += "bash bash-completion" + +SRC_URI = "git://gitlab.com/driverctl/driverctl.git;branch=master;protocol=https" +SRCREV = "2ba60536eb20ca0a6a751bd8b6501dba84ec45d3" + +S = "${WORKDIR}/git" + +inherit pkgconfig systemd features_check + +do_install () { + oe_runmake install DESTDIR=${D} +} + +FILES:${PN} += " \ + ${libdir} \ + ${datadir} \ + ${systemd_system_unitdir} \ +" + diff --git a/meta-oe/recipes-support/dstat/dstat_0.7.3.bb b/meta-oe/recipes-support/dstat/dstat_0.7.3.bb deleted file mode 100644 index 18af738fa8..0000000000 --- a/meta-oe/recipes-support/dstat/dstat_0.7.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "versatile resource statics tool" -DESCRIPTION = "Dstat is a versatile replacement for vmstat, iostat, netstat and ifstat. \ -Dstat overcomes some of their limitations and adds some extra features, more counters \ -and flexibility. Dstat is handy for monitoring systems during performance tuning tests, \ -benchmarks or troubleshooting." -HOMEPAGE = "http://dag.wiee.rs/home-made/dstat" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS += "asciidoc-native xmlto-native" - -SRC_URI = "git://github.com/dagwieers/dstat.git" - -SRCREV = "ebace6d4177f8748f35cec87f7a49946046b0a20" - -S = "${WORKDIR}/git" - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -RDEPENDS_${PN} += "python-core python-misc python-resource python-shell python-unixadmin" diff --git a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb b/meta-oe/recipes-support/edac-utils/edac-utils_git.bb deleted file mode 100644 index 2c0914d30a..0000000000 --- a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Userspace helper for Linux kernel EDAC drivers" -HOMEPAGE = "https://github.com/grondo/edac-utils" -SECTION = "Applications/System" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = " sysfsutils" - -SRCREV = "f9aa96205f610de39a79ff43c7478b7ef02e3138" -PV = "0.18+git${SRCPV}" - -S = "${WORKDIR}/git" - -SRC_URI = "git://github.com/grondo/edac-utils \ - file://make-init-script-be-able-to-automatically-load-EDAC-.patch \ - file://add-restart-to-initscript.patch \ - file://edac.service \ -" - -inherit autotools-brokensep systemd - -do_configure_prepend () { - touch ${S}/ChangeLog - ${S}/bootstrap -} - -RDEPENDS_${PN}_x86 = "dmidecode" -RDEPENDS_${PN}_x86-64 = "dmidecode" -RDEPENDS_${PN}_arm = "dmidecode" -RDEPENDS_${PN}_aarch64 = "dmidecode" -RDEPENDS_${PN}_powerpc = "dmidecode" -RDEPENDS_${PN}_powerpc64 = "dmidecode" -RDEPENDS_${PN}_append = " \ - perl-module-file-basename perl-module-file-find perl-module-getopt-long perl-module-posix \ - perl-module-overload \ - perl-module-overloading \ - perl-module-file-glob \ -" - -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/edac.service ${D}/${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}/${systemd_unitdir}/system/edac.service -} - -SYSTEMD_SERVICE_${PN} = "edac.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" diff --git a/meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch b/meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch deleted file mode 100644 index 87051da906..0000000000 --- a/meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3ade837f64de0cfe2aed5bc52f7919760f350531 Mon Sep 17 00:00:00 2001 -From: Wenzong Fan <wenzong.fan@windriver.com> -Date: Fri, 7 Mar 2014 00:57:12 -0500 -Subject: [PATCH] edac: add restart to initscript - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> ---- - src/etc/edac.init.in | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/etc/edac.init.in b/src/etc/edac.init.in -index adf76ee..007a519 100644 ---- a/src/etc/edac.init.in -+++ b/src/etc/edac.init.in -@@ -155,8 +155,12 @@ case "$1" in - status) - service_status - ;; -+ restart) -+ service_stop -+ service_start -+ ;; - *) -- COMMANDS="start|stop|status" -+ COMMANDS="start|stop|status|restart" - echo "Usage: $0 {${COMMANDS}}" - exit 2 - ;; --- -1.7.9.5 - diff --git a/meta-oe/recipes-support/edac-utils/files/edac.service b/meta-oe/recipes-support/edac-utils/files/edac.service deleted file mode 100644 index f6b211e91b..0000000000 --- a/meta-oe/recipes-support/edac-utils/files/edac.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Initialize EDAC Drivers For Machine Hardware - -[Service] -Type=oneshot -ExecStart=@SBINDIR@/edac-ctl --register-labels -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch b/meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch deleted file mode 100644 index fddc25f601..0000000000 --- a/meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch +++ /dev/null @@ -1,98 +0,0 @@ -make init script be able to automatically load EDAC module. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> ---- - src/etc/edac.init.in | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 47 insertions(+), 2 deletions(-) - -diff --git a/src/etc/edac.init.in b/src/etc/edac.init.in -index 7a51da9..5b568c4 100644 ---- a/src/etc/edac.init.in -+++ b/src/etc/edac.init.in -@@ -42,7 +42,6 @@ for dir in "$sysconfdir/default" "$sysconfdir/sysconfig"; do - [ -f "$dir/$SERVICE" ] && . "$dir/$SERVICE" - done - -- - ############################################################################### - - service_start () -@@ -52,6 +51,46 @@ service_start () - # Assume that if EDAC_DRIVER is not set, then EDAC is configured - # automatically, thus return successfully, but don't do anything. - # -+ if [ ! -f /etc/edac/edac-driver ]; then -+ [ -d /sys/bus/edac/devices/mc/mc0 ] && \ -+ echo `lsmod | grep _edac | cut -d" " -f1` > /etc/edac/edac-driver -+ fi -+ -+ [ -f /etc/edac/edac-driver ] && EDAC_DRIVER=`cat /etc/edac/edac-driver` -+ -+ if [ -z "$EDAC_DRIVER" ]; then -+ -+ DRIVER_PATH=/lib/modules/`uname -r`/kernel/drivers/edac -+ oldpath=`pwd` -+ if [ -d $DRIVER_PATH ]; then -+ -+ cd $DRIVER_PATH -+ -+ for i in $(/bin/ls | /usr/bin/cut -d. -f1) ; do -+ /sbin/modprobe $i 2>/dev/null -+ if [ -d /sys/bus/edac/devices/mc/mc0 ]; then -+ echo $i> /etc/edac/edac-driver -+ EDAC_DRIVER=$i -+ break -+ fi -+ /sbin/modprobe -r $i 2>/dev/null -+ done -+ -+ cd "$oldpath" -+ -+ -+ if [ -z "$EDAC_DRIVER" ]; then -+ echo "This board may not support EDAC, or EDAC module may not be compiled in" -+ exit -+ fi -+ -+ else -+ echo "This board may not support EDAC, or EDAC module may not be compiled in" -+ exit -+ fi -+ -+ fi -+ - if [ -n "$EDAC_DRIVER" ]; then - echo -n "Starting ${SERVICE}: " - modprobe $EDAC_DRIVER -@@ -76,12 +115,15 @@ service_start () - service_stop () - { - echo -n "Disabling ${SERVICE}: " -+ -+ [ -f /etc/edac/edac-driver ] && EDAC_DRIVER=`cat /etc/edac/edac-driver` -+ - if [ -n "$EDAC_DRIVER" ]; then - modprobe -r $EDAC_DRIVER - STATUS=$? - [ $STATUS -eq 0 ] && echo success || echo failure - else -- echo "Not supported for this configuration." -+ echo "Not supported for this configuration, or EDAC Module is not loaded." - STATUS=6 - fi - } -@@ -92,6 +134,9 @@ service_status () - { - # Print the current status of the service. Required by LSB. - # -+ [ -f /etc/edac/edac-driver ] && EDAC_DRIVER=`cat /etc/edac/edac-driver` -+ [ -z "$EDAC_DRIVER" ] && STATUS=1 && exit -+ - edac-ctl --status - STATUS=0 - } --- -1.7.10.4 - diff --git a/meta-oe/recipes-support/edid-decode/edid-decode_git.bb b/meta-oe/recipes-support/edid-decode/edid-decode_git.bb new file mode 100644 index 0000000000..37fe0e1bdc --- /dev/null +++ b/meta-oe/recipes-support/edid-decode/edid-decode_git.bb @@ -0,0 +1,22 @@ +SUMMARY = "Decode EDID data in human-readable format" +DESCRIPTION = "edid-decode decodes EDID monitor description data in human-readable format." +HOMEPAGE = "https://hverkuil.home.xs4all.nl/edid-decode/edid-decode.html" + +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ef696d66c156139232201f223c22592" + +SRC_URI= "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master" +SRCREV = "5920bf2a756b2f748c49ff6a08b9f421026473c5" +PV = "0.0+git" + +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + +S = "${WORKDIR}/git" + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/eject/eject/0001-eject-Include-sys-sysmacros.h-for-major-minor.patch b/meta-oe/recipes-support/eject/eject/0001-eject-Include-sys-sysmacros.h-for-major-minor.patch new file mode 100644 index 0000000000..055128706c --- /dev/null +++ b/meta-oe/recipes-support/eject/eject/0001-eject-Include-sys-sysmacros.h-for-major-minor.patch @@ -0,0 +1,27 @@ +From 433ffb21119a0f39e882dd3fea4742e64aadcc40 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 11 Aug 2018 09:56:40 -0700 +Subject: [PATCH] eject: Include sys/sysmacros.h for major/minor + +Fixes +arm-bec-linux-gnueabi/gcc/arm-bec-linux-gnueabi/8.2.0/ld: eject.o: in function `GetMajorMinor': +/usr/src/debug/eject/2.1.5-r1/eject-2.1.5/../../../../../../../workspace/sources/eject/eject.c:866: undefined reference to `major' + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + eject.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/eject.c b/eject.c +index 47e09fe..b171218 100644 +--- a/eject.c ++++ b/eject.c +@@ -54,6 +54,7 @@ + #include <sys/wait.h> + #include <sys/mtio.h> + #include <sys/mount.h> ++#include <sys/sysmacros.h> + + #if defined(__linux__) + #include <linux/version.h> diff --git a/meta-oe/recipes-support/eject/eject/eject-timeout.patch b/meta-oe/recipes-support/eject/eject/eject-timeout.patch index de8146f32a..4511e17069 100644 --- a/meta-oe/recipes-support/eject/eject/eject-timeout.patch +++ b/meta-oe/recipes-support/eject/eject/eject-timeout.patch @@ -1,6 +1,6 @@ allow a longer timeout -Upstream-Status: Backport +Upstream-Status: Backport Signed-off-by: Morgan Little <morgan.little@windriver.com> diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb index 49a3d74f6f..dd5489e7db 100644 --- a/meta-oe/recipes-support/eject/eject_2.1.5.bb +++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Eject allows removable media (typically a CD-ROM, floppy disk, tape, or JAZ or ZIP disk) to be ejected under software control." HOMEPAGE = "http://eject.sourceforge.net/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" inherit autotools gettext update-alternatives @@ -10,16 +10,16 @@ SRC_URI = "http://sources.openembedded.org/${BP}.tar.gz \ file://eject-2.1.1-verbose.patch \ file://eject-2.1.5-spaces.patch \ file://eject-timeout.patch \ -" + file://0001-eject-Include-sys-sysmacros.h-for-major-minor.patch \ + " SRC_URI[md5sum] = "b96a6d4263122f1711db12701d79f738" SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55" S = "${WORKDIR}/${BPN}" -PR = "r1" -do_compile_prepend() { +do_compile:prepend() { # PO subdir must be in build directory if [ ! ${S} = ${B} ]; then mkdir -p ${B}/po @@ -27,11 +27,11 @@ do_compile_prepend() { fi } -ALTERNATIVE_${PN} = "volname eject" +ALTERNATIVE:${PN} = "volname eject" ALTERNATIVE_LINK_NAME[volname] = "${bindir}/volname" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_PRIORITY[volname] = "100" ALTERNATIVE_PRIORITY[eject] = "100" -ALTERNATIVE_${PN}-doc = "eject.1" +ALTERNATIVE:${PN}-doc = "eject.1" ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" diff --git a/meta-oe/recipes-support/emacs/emacs_29.1.bb b/meta-oe/recipes-support/emacs/emacs_29.1.bb new file mode 100644 index 0000000000..5cbe4551c0 --- /dev/null +++ b/meta-oe/recipes-support/emacs/emacs_29.1.bb @@ -0,0 +1,311 @@ +SUMMARY = "Emacs is the extensible, customizable, self-documenting real-time display editor" +HOMEPAGE = "https://www.gnu.org/software/emacs/" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +SRC_URI = "https://ftp.gnu.org/pub/gnu/emacs/emacs-${PV}.tar.xz \ + " +SRC_URI:append:class-target = " \ + file://use-emacs-native-tools-for-cross-compiling.patch \ + file://avoid-running-host-binaries-for-sanity.patch \ +" + +SRC_URI[sha256sum] = "d2f881a5cc231e2f5a03e86f4584b0438f83edd7598a09d24a21bd8d003e2e01" + +CVE_STATUS[CVE-2007-6109] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." + +PACKAGECONFIG[gnutls] = "--with-gnutls=yes,--with-gnutls=no,gnutls" +PACKAGECONFIG[kerberos] = "--with-kerberos=yes,--with-kerberos=no,krb5" +PACKAGECONFIG[libgmp] = "--with-libgmp=yes,--with-libgmp=no,gmp" +PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" + +PACKAGECONFIG ??= "gnutls kerberos libgmp" + +# We could use --without-all but its better to +# split it into several packages (size of minimal doesnt change) +EXTRA_OECONF = " --with-x=no --with-dumping=none --disable-build-details" + +# Disable seccomp, as its a default dependency for gnutls but it doesnt work when cross-compiling emacs +EXTRA_OECONF:append = " ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'ac_cv_have_decl_SECCOMP_FILTER_FLAG_TSYNC=no ac_cv_have_decl_SECCOMP_SET_MODE_FILTER=no', '', d)}" + + +DEPENDS = "ncurses" +DEPENDS:append:class-target = " emacs-native" + +inherit autotools mime-xdg pkgconfig + + +# Create the required native tools for the target build +do_compile:class-native (){ + cd ${B}/lib-src + oe_runmake make-docfile + oe_runmake make-fingerprint + cd ${B}/src + oe_runmake bootstrap-emacs +} + +do_install:class-native(){ + install -d ${D}${bindir} + install -m 755 ${B}/lib-src/make-docfile ${D}/${bindir}/ + install -m 755 ${B}/lib-src/make-fingerprint ${D}/${bindir}/ + install -m 755 ${B}/src/bootstrap-emacs ${D}/${bindir}/ +} + +do_compile:prepend:class-target () { + # export EMACS env variables for the native tools to use to allow calling bootstrap-emacs + export EMACSLOADPATH=${S}/lisp + export EMACSDATA=${S}/etc +} + + +do_install:prepend:class-target(){ + # export EMACS env variables for the native tools to use to allow calling bootstrap-emacs + export EMACSLOADPATH=${S}/lisp + export EMACSDATA=${S}/etc +} + +# Remove build host references to avoid target pollution +do_compile:prepend () { + sed -i -e 's|${TMPDIR}||g' ${B}/src/config.h + sed -i -e 's|${B}||g' ${B}/src/epaths.h +} + +do_install:append(){ + # Delete systemd stuff, extend using DISTRO_FEATURES? + rm -rf ${D}/${libdir} + # Extra stuff which isnt needed + rm -rf ${D}/${datadir}/metainfo + rm -rf ${D}/${datadir}/info + # Emacs copies files to ${D} while building, which were unpacked + # by a different user, we need to restore those + chown -R root:root ${D}${datadir} +} + +# Use a similar strategy to how we build python: +# Create three packages +# minimal - A working lisp based text editor +# base - What would probably work for most +# full - A fully working emacs +# The lists of files are long but are worth it +# Installing "emacs" installs the base package +PACKAGE_BEFORE_PN = "${PN}-minimal ${PN}-base ${PN}-full" +RPROVIDES:${PN}-base = "${PN}" +RDEPENDS:${PN}-base:class-target = "${PN}-minimal" +RDEPENDS:${PN}-full:class-target = "${PN}" + + +# A minimal version of emacs that works +# These are kept sorted in alphabetical order +FILES:${PN}-minimal = " \ + ${bindir}/emacs* \ + ${datadir}/${BPN}/${PV}/etc/charsets/ \ + ${datadir}/${BPN}/${PV}/lisp/abbrev.elc \ + ${datadir}/${BPN}/${PV}/lisp/bindings.elc \ + ${datadir}/${BPN}/${PV}/lisp/buff-menu.elc \ + ${datadir}/${BPN}/${PV}/lisp/button.elc \ + ${datadir}/${BPN}/${PV}/lisp/case-table.elc \ + ${datadir}/${BPN}/${PV}/lisp/composite.elc \ + ${datadir}/${BPN}/${PV}/lisp/cus-face.elc \ + ${datadir}/${BPN}/${PV}/lisp/cus-start.elc \ + ${datadir}/${BPN}/${PV}/lisp/custom.elc \ + ${datadir}/${BPN}/${PV}/lisp/disp-table.elc \ + ${datadir}/${BPN}/${PV}/lisp/electric.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/backquote.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/byte-opt.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/byte-run.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/bytecomp.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cconv.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-generic.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-lib.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-macs.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-preloaded.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-seq.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/debug-early.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/easy-mmode.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/easymenu.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eldoc.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/float-sup.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/gv.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/inline.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/lisp-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/lisp.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/macroexp.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/map-ynp.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/map.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/nadvice.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/oclosure.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/pcase.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/regexp-opt.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/rmc.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/rx.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/seq.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/shorthands.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/subr-x.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/syntax.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/tabulated-list.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/timer.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/vc/warnings.elc \ + ${datadir}/${BPN}/${PV}/lisp/env.elc \ + ${datadir}/${BPN}/${PV}/lisp/epa-hook.elc \ + ${datadir}/${BPN}/${PV}/lisp/facemenu.elc \ + ${datadir}/${BPN}/${PV}/lisp/faces.elc \ + ${datadir}/${BPN}/${PV}/lisp/files.elc \ + ${datadir}/${BPN}/${PV}/lisp/font-core.elc \ + ${datadir}/${BPN}/${PV}/lisp/font-lock.elc \ + ${datadir}/${BPN}/${PV}/lisp/format.elc \ + ${datadir}/${BPN}/${PV}/lisp/frame.elc \ + ${datadir}/${BPN}/${PV}/lisp/help.elc \ + ${datadir}/${BPN}/${PV}/lisp/image.elc \ + ${datadir}/${BPN}/${PV}/lisp/indent.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/characters.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/charprop.el \ + ${datadir}/${BPN}/${PV}/lisp/international/charscript.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/cp51932.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/emoji-zwj.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/eucjp-ms.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/iso-transl.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/mule-cmds.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/mule-conf.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/mule.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/uni*.el \ + ${datadir}/${BPN}/${PV}/lisp/isearch.elc \ + ${datadir}/${BPN}/${PV}/lisp/jit-lock.elc \ + ${datadir}/${BPN}/${PV}/lisp/jka-cmpr-hook.elc \ + ${datadir}/${BPN}/${PV}/lisp/jka-compr.elc \ + ${datadir}/${BPN}/${PV}/lisp/keymap.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/burmese.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/cham.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/chinese.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/cyrillic.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/czech.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/english.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/ethiopic.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/european.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/georgian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/greek.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/hebrew.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/indian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/indonesian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/japanese.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/khmer.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/korean.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/lao.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/misc-lang.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/philippine.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/romanian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/sinhala.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/slovak.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/tai-viet.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/thai.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/tibetan.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/utf-8-lang.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/vietnamese.elc \ + ${datadir}/${BPN}/${PV}/lisp/ldefs-boot.el \ + ${datadir}/${BPN}/${PV}/lisp/loaddefs.el \ + ${datadir}/${BPN}/${PV}/lisp/loadup.el \ + ${datadir}/${BPN}/${PV}/lisp/menu-bar.elc \ + ${datadir}/${BPN}/${PV}/lisp/minibuffer.elc \ + ${datadir}/${BPN}/${PV}/lisp/mouse.elc \ + ${datadir}/${BPN}/${PV}/lisp/newcomment.elc \ + ${datadir}/${BPN}/${PV}/lisp/obarray.elc \ + ${datadir}/${BPN}/${PV}/lisp/paren.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/elisp-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/prog-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/register.elc \ + ${datadir}/${BPN}/${PV}/lisp/replace.elc \ + ${datadir}/${BPN}/${PV}/lisp/rfn-eshadow.elc \ + ${datadir}/${BPN}/${PV}/lisp/select.elc \ + ${datadir}/${BPN}/${PV}/lisp/simple.elc \ + ${datadir}/${BPN}/${PV}/lisp/startup.elc \ + ${datadir}/${BPN}/${PV}/lisp/subr.elc \ + ${datadir}/${BPN}/${PV}/lisp/tab-bar.elc \ + ${datadir}/${BPN}/${PV}/lisp/term/tty-colors.elc \ + ${datadir}/${BPN}/${PV}/lisp/term/xterm.elc \ + ${datadir}/${BPN}/${PV}/lisp/textmodes/fill.elc \ + ${datadir}/${BPN}/${PV}/lisp/textmodes/page.elc \ + ${datadir}/${BPN}/${PV}/lisp/textmodes/paragraphs.elc \ + ${datadir}/${BPN}/${PV}/lisp/textmodes/text-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/thingatpt.elc \ + ${datadir}/${BPN}/${PV}/lisp/tooltip.elc \ + ${datadir}/${BPN}/${PV}/lisp/uniquify.elc \ + ${datadir}/${BPN}/${PV}/lisp/vc/ediff-hook.elc \ + ${datadir}/${BPN}/${PV}/lisp/vc/vc-hooks.elc \ + ${datadir}/${BPN}/${PV}/lisp/version.elc \ + ${datadir}/${BPN}/${PV}/lisp/widget.elc \ + ${datadir}/${BPN}/${PV}/lisp/window.elc \ + ${prefix}/libexec \ +" + +# What works for "most" is relative, but this can be easily extended if needed +FILES:${PN}-base = " \ + ${datadir}/${BPN}/${PV}/etc/e \ + ${datadir}/${BPN}/${PV}/etc/forms \ + ${datadir}/${BPN}/${PV}/etc/srecode \ + ${datadir}/${BPN}/${PV}/etc/themes/adwaita-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/deeper-blue-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/light-blue-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/misterioso-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/tango-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/wheatgrass-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/wombat-theme.el \ + ${datadir}/${BPN}/${PV}/lisp/ansi-color.elc \ + ${datadir}/${BPN}/${PV}/lisp/auth-source.elc \ + ${datadir}/${BPN}/${PV}/lisp/calendar/iso8601.elc \ + ${datadir}/${BPN}/${PV}/lisp/calendar/parse-time.elc \ + ${datadir}/${BPN}/${PV}/lisp/calendar/time-date.elc \ + ${datadir}/${BPN}/${PV}/lisp/cedet \ + ${datadir}/${BPN}/${PV}/lisp/comint.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-lib.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-macs.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-seq.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eieio-core.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eieio.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/inline.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/pcase.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/ring.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/smie.elc \ + ${datadir}/${BPN}/${PV}/lisp/files-x.elc \ + ${datadir}/${BPN}/${PV}/lisp/format-spec.elc \ + ${datadir}/${BPN}/${PV}/lisp/json.elc \ + ${datadir}/${BPN}/${PV}/lisp/ls-lisp.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-compat.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-integration.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-loaddefs.el \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-sh.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/trampver.elc \ + ${datadir}/${BPN}/${PV}/lisp/password-cache.elc \ + ${datadir}/${BPN}/${PV}/lisp/pcomplete.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/*asm* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/*perl* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-align.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-cmds.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-defs.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-engine.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-fonts.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-guess.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-menus.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-styles.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-vars.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cpp* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/executable* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/make* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/prog* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/python* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/sh-script* \ + ${datadir}/${BPN}/${PV}/lisp/shell.elc \ + ${datadir}/${BPN}/${PV}/lisp/subdirs.el \ + ${datadir}/${BPN}/${PV}/site-lisp/ \ +" + +# Restore FILES for the full package to catch everything left +FILES:${PN}-full = "${FILES:${PN}}" +FILES:${PN}-full:append = " ${datadir}/icons" + + +# The following does NOT build a native emacs. +# It only builds some parts of it that are +# required to by the build for target emacs. +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/emacs/files/avoid-running-host-binaries-for-sanity.patch b/meta-oe/recipes-support/emacs/files/avoid-running-host-binaries-for-sanity.patch new file mode 100644 index 0000000000..719ee4bce9 --- /dev/null +++ b/meta-oe/recipes-support/emacs/files/avoid-running-host-binaries-for-sanity.patch @@ -0,0 +1,38 @@ +Upstream-Status: Inappropriate [OE-Specific] + +Emacs introduced a sanity-check for the build artifacts, where it +runs the newly built emacs to perform some checks. + +This is not going to work for us since we are cross-compiling, +we need to avoid running target binaries on the host + +Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org> + +Index: emacs-29.1/Makefile.in +=================================================================== +--- emacs-29.1.orig/Makefile.in ++++ emacs-29.1/Makefile.in +@@ -416,19 +416,10 @@ advice-on-failure: + @exit ${exit-status} + + sanity-check: +- @[ -f .no-advice-on-failure ] && exit 0; true +- @v=$$(src/emacs${EXEEXT} --batch --eval \ +- '(progn (defun f (n) (if (= 0 n) 1 (* n (f (- n 1))))) (princ (f 10)))' \ +- 2> /dev/null); \ +- [ "X$$v" = "X3628800" ] && exit 0; \ +- echo >&2 '***'; \ +- echo >&2 '*** '"\"make ${make-target}\" succeeded, but Emacs is not functional."; \ +- echo >&2 '***'; \ +- cat Makefile | \ +- sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q;};' | \ +- sed 's/^# /*** /' | grep -v '^\*\*\* ADVICE-ON-FAILURE-' >&2; \ +- echo >&2 '***'; \ +- exit 1 ++# The Makefile will try to call the newly built emacs to perform some checks ++# this is not going to work since it was (probably) built for a different architecture. ++# Avoid calling target binaries from the host and simply assume our build artifacts work. ++ exit 0 + + .PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 epaths-force-ns-self-contained etc-emacsver + diff --git a/meta-oe/recipes-support/emacs/files/use-emacs-native-tools-for-cross-compiling.patch b/meta-oe/recipes-support/emacs/files/use-emacs-native-tools-for-cross-compiling.patch new file mode 100644 index 0000000000..df5e4bd258 --- /dev/null +++ b/meta-oe/recipes-support/emacs/files/use-emacs-native-tools-for-cross-compiling.patch @@ -0,0 +1,106 @@ +Upstream-Status: Inappropriate [OE-Specific] + +When building emacs, it builds some tools for the HOST +that are then used to build for target, such as +make-fingerprint and make-docfile and bootstrap-emacs, +this needs to be adapted to be used by bitbake, otherwise +the compiled executables arent compatible with the HOST. + +We also need to be able to use emacs env variables to +control how bootstrap-emacs is used when cross-compiling. + +Use the above mentioned tools provided by the native +version of the recipe instead. + +Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> + +Index: emacs-29.1/src/Makefile.in +=================================================================== +--- emacs-29.1.orig/src/Makefile.in ++++ emacs-29.1/src/Makefile.in +@@ -1,3 +1,4 @@ ++ + ### @configure_input@ + + # Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2023 Free Software +@@ -508,7 +509,7 @@ ifeq ($(CHECK_STRUCTS),true) + pdumper.o: dmpstruct.h + endif + dmpstruct.h: $(srcdir)/dmpstruct.awk +-dmpstruct.h: $(libsrc)/make-fingerprint$(EXEEXT) $(dmpstruct_headers) ++dmpstruct.h: $(dmpstruct_headers) + $(AM_V_GEN)POSIXLY_CORRECT=1 awk -f $(srcdir)/dmpstruct.awk \ + $(dmpstruct_headers) > $@ + +@@ -610,8 +611,7 @@ SYSTEM_TYPE = @SYSTEM_TYPE@ + ## Strictly speaking, emacs does not depend directly on all of $lisp, + ## since not all pieces are used on all platforms. But DOC depends + ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. +-emacs$(EXEEXT): temacs$(EXEEXT) \ +- lisp.mk $(etc)/DOC $(lisp) \ ++emacs$(EXEEXT): lisp.mk $(etc)/DOC $(lisp) \ + $(lispsource)/international/charprop.el ${charsets} + ifeq ($(SYSTEM_TYPE),cygwin) + find ${top_builddir} -name '*.eln' | rebase -v -O -T - +@@ -654,7 +654,7 @@ endif + $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(doc_obj) + $(AM_V_GEN)$(MKDIR_P) $(etc) + $(AM_V_at)rm -f $(etc)/DOC +- $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \ ++ make-docfile -d $(srcdir) \ + $(SOME_MACHINE_OBJECTS) $(doc_obj) > $(etc)/DOC + + $(libsrc)/make-docfile$(EXEEXT) $(libsrc)/make-fingerprint$(EXEEXT): \ +@@ -671,7 +671,7 @@ buildobj.h: Makefile + GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) + + gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) +- $(AM_V_GLOBALS)$(libsrc)/make-docfile -d $(srcdir) -g $(doc_obj) > globals.tmp ++ make-docfile -d $(srcdir) -g $(doc_obj) > globals.tmp + $(AM_V_at)$(top_srcdir)/build-aux/move-if-change globals.tmp globals.h + $(AM_V_at)echo timestamp > $@ + +@@ -685,7 +685,7 @@ $(LIBEGNU_ARCHIVE): $(config_h) + $(MAKE) -C $(dir $@) all + + ifeq ($(HAVE_PDUMPER),yes) +-MAKE_PDUMPER_FINGERPRINT = $(libsrc)/make-fingerprint$(EXEEXT) ++MAKE_PDUMPER_FINGERPRINT = make-fingerprint + else + MAKE_PDUMPER_FINGERPRINT = + endif +Index: emacs-29.1/lisp/Makefile.in +=================================================================== +--- emacs-29.1.orig/lisp/Makefile.in ++++ emacs-29.1/lisp/Makefile.in +@@ -53,7 +53,7 @@ FIND_DELETE = @FIND_DELETE@ + # We never change directory before running Emacs, so a relative file + # name is fine, and makes life easier. If we need to change + # directory, we can use emacs --chdir. +-EMACS = ../src/emacs${EXEEXT} ++EMACS = bootstrap-emacs + + # Command line flags for Emacs. + +@@ -109,7 +109,7 @@ MAIN_FIRST = ./emacs-lisp/eieio.el ./ema + ./org/oc.el ./org/ol.el ./emacs-lisp/cl-lib.el + + # Prevent any settings in the user environment causing problems. +-unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++unexport EMACSDOC EMACSPATH + + # The actual Emacs command run in the targets below. + emacs = '$(EMACS)' $(EMACSOPT) +Index: emacs-29.1/Makefile.in +=================================================================== +--- emacs-29.1.orig/Makefile.in ++++ emacs-29.1/Makefile.in +@@ -328,7 +328,7 @@ GLIB_COMPILE_SCHEMAS = glib-compile-sche + TRANSFORM = @program_transform_name@ + + # Prevent any settings in the user environment causing problems. +-unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++unexport EMACSDOC EMACSPATH + + # What emacs should be called when installed. + EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'` diff --git a/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch b/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch new file mode 100644 index 0000000000..32fa239084 --- /dev/null +++ b/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch @@ -0,0 +1,30 @@ +From c6a59d512706978e8c67f9a2d84ec650f8763368 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 8 May 2023 18:02:52 -0700 +Subject: [PATCH] Do not use $MKTEMP_PROG in cross-build + +$MKTEMP_PROG points to native location which could be absolute path that +wont exist on target rootfs. Therefore use it from PATH + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4852a2f..d23b384 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -186,7 +186,7 @@ ye_PATH_LOCALE_ALIAS + + dnl Random filename generation in scripts + if test -n "$MKTEMP_PROG"; then +- SHELL_RANDOM_FILENAME='`'$MKTEMP_PROG' /tmp/enca-$$-XXXXXXXX`' ++ SHELL_RANDOM_FILENAME='`mktemp /tmp/enca-$$-XXXXXXXX`' + else + SHELL_RANDOM_FILENAME='/tmp/enca-$$-$RANDOM' + fi +-- +2.40.1 + diff --git a/meta-oe/recipes-support/enca/enca/configure-hack.patch b/meta-oe/recipes-support/enca/enca/configure-hack.patch deleted file mode 100644 index 85abcdcf02..0000000000 --- a/meta-oe/recipes-support/enca/enca/configure-hack.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- enca-1.9/configure.ac.orig 2006-02-15 00:57:39.000000000 -0800 -+++ enca-1.9/configure.ac 2006-02-15 00:57:46.000000000 -0800 -@@ -92,9 +92,6 @@ - dnl And for gtk-doc - gtk_CHECK_GTK_DOC - --dnl Check for good random number sources --AC_CHECK_FILES(/dev/random /dev/urandom /dev/srandom /dev/arandom) -- - dnl Dirty path hack. Helps some people with badly set up search paths. - if test "$prefix" = "NONE"; then - LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" diff --git a/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch b/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch deleted file mode 100644 index 6f6f3e320e..0000000000 --- a/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- enca-1.9/configure.ac.orig 2006-06-29 15:30:44.000000000 +0100 -+++ enca-1.9/configure.ac 2006-06-29 15:31:41.000000000 +0100 -@@ -92,14 +92,15 @@ - dnl And for gtk-doc - gtk_CHECK_GTK_DOC - --dnl Dirty path hack. Helps some people with badly set up search paths. --if test "$prefix" = "NONE"; then -- LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" -- CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" --else -- LDFLAGS="$LDFLAGS -L$prefix/lib" -- CPPFLAGS="$CPPFLAGS -I$prefix/include" --fi -+# This is really dumb code -+#dnl Dirty path hack. Helps some people with badly set up search paths. -+#if test "$prefix" = "NONE"; then -+# LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" -+# CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" -+#else -+# LDFLAGS="$LDFLAGS -L$prefix/lib" -+# CPPFLAGS="$CPPFLAGS -I$prefix/include" -+#fi - - dnl Checks for libraries. - ye_CHECK_LIBM diff --git a/meta-oe/recipes-support/enca/enca/dont-run-tests.patch b/meta-oe/recipes-support/enca/enca/dont-run-tests.patch index 321d1e6201..1d0170bd73 100644 --- a/meta-oe/recipes-support/enca/enca/dont-run-tests.patch +++ b/meta-oe/recipes-support/enca/enca/dont-run-tests.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: enca-1.9/Makefile.am =================================================================== --- enca-1.9.orig/Makefile.am 2005-11-24 11:21:32.000000000 +0100 diff --git a/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch b/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch index dbf0fb8ea7..2112d8cfab 100644 --- a/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch +++ b/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch @@ -8,6 +8,8 @@ This patch come straight from the Buildroot source tree. Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> --- +Upstream-Status: Pending + m4/libiconv.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -17,12 +19,12 @@ index fc8c6f8..3a59549 100644 +++ b/m4/libiconv.m4 @@ -17,7 +17,7 @@ AC_REQUIRE([AC_C_CONST])dnl dnl - + dnl Use standard iconv test -AM_ICONV +m4_pattern_allow([AM_ICONV]) - CONVERTOR_LIBS="$CONVERTOR_LIBS $LIBICONV" - + CONVERTER_LIBS="$CONVERTER_LIBS $LIBICONV" + dnl Compile iconvcap.c and run it to determine what encodings iconv actually -- 1.9.3 diff --git a/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch b/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch index accfbccd6b..756745d839 100644 --- a/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch +++ b/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch @@ -1,7 +1,8 @@ ---- enca-1.9/Makefile.am.orig 2006-06-29 15:34:55.000000000 +0100 -+++ enca-1.9/Makefile.am 2006-06-29 15:35:20.000000000 +0100 -@@ -1,8 +1,8 @@ - # @(#) $Id: Makefile.am,v 1.35 2005/11/24 10:21:32 yeti Exp $ +Upstream-Status: Pending + +--- enca-1.19/Makefile.am.orig 2006-06-29 15:34:55.000000000 +0100 ++++ enca-1.19/Makefile.am 2006-06-29 15:35:20.000000000 +0100 +@@ -1,7 +1,7 @@ if MAINTAINER_MODE -SUBDIRS = tools data script lib src devel-docs test +SUBDIRS = data script lib src devel-docs test diff --git a/meta-oe/recipes-support/enca/enca_1.9.bb b/meta-oe/recipes-support/enca/enca_1.19.bb index bf19843b2f..774f05f7c4 100644 --- a/meta-oe/recipes-support/enca/enca_1.9.bb +++ b/meta-oe/recipes-support/enca/enca_1.19.bb @@ -1,30 +1,27 @@ SUMMARY = "Enca is an Extremely Naive Charset Analyser" SECTION = "libs" -HOMEPAGE = "http://trific.ath.cx/software/enca/" +HOMEPAGE = "https://cihar.com/software/enca/" DEPENDS += "gettext-native" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4" -SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}.tar.bz2 \ - file://configure-hack.patch \ +SRC_URI = "https://dl.cihar.com/enca/enca-${PV}.tar.gz \ file://dont-run-tests.patch \ - file://configure-remove-dumbness.patch \ file://makefile-remove-tools.patch \ - file://libenca-003-iconv.patch " - -SRC_URI[md5sum] = "b3581e28d68d452286fb0bfe58bed3b3" -SRC_URI[sha256sum] = "02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d" + file://libenca-003-iconv.patch \ + file://0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch" +SRC_URI[sha256sum] = "4c305cc59f3e57f2cfc150a6ac511690f43633595760e1cb266bf23362d72f8a" inherit autotools -do_configure_prepend() { +do_configure:prepend() { # remove failing test which checks for something that isn't even used sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' ${S}/configure.ac } -do_configure_append() { +do_configure:append() { sed -i s:-I/usr/include::g ${B}/Makefile sed -i s:-I/usr/include::g ${B}/*/Makefile } diff --git a/meta-oe/recipes-support/engine-pkcs11/engine-pkcs11_0.2.2.bb b/meta-oe/recipes-support/engine-pkcs11/engine-pkcs11_0.2.2.bb deleted file mode 100644 index 047f701102..0000000000 --- a/meta-oe/recipes-support/engine-pkcs11/engine-pkcs11_0.2.2.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "A PKCS" -DESCRIPTION = "\ -Engine_pkcs11 is an implementation of an engine for OpenSSL. It can be \ -loaded using code, config file or command line and will pass any function \ -call by openssl to a PKCS cards and software for using smart cards in PKCS" -HOMEPAGE = "https://github.com/OpenSC/engine_pkcs11" -SECTION = "Development/Libraries" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://src/engine_pkcs11.h;startline=1;endline=26;md5=973a19f8a6105de047f2adfbbfc04c33" -DEPENDS = "openssl libp11" - -SRC_URI = "git://github.com/OpenSC/engine_pkcs11.git" -SRCREV = "132fcf2c8b319f9f4b2ebdc8dcb54ff496dc0519" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -EXTRA_OECONF = "\ - --disable-static \ - --libdir ${libdir}/engines \ -" - -do_install_append () { - rm -f ${D}${libdir}/engines/libpkcs11.la -} - -FILES_${PN} += "${libdir}/engines/libpkcs11${SOLIBSDEV}" -FILES_${PN}-dbg += "${libdir}/engines/.debug/" - -RDEPENDS_${PN} += "openssl libp11 opensc" diff --git a/meta-oe/recipes-support/epeg/epeg/0001-configure-Fix-checks-for-libjpeg-and-libexif.patch b/meta-oe/recipes-support/epeg/epeg/0001-configure-Fix-checks-for-libjpeg-and-libexif.patch new file mode 100644 index 0000000000..1568fe96e1 --- /dev/null +++ b/meta-oe/recipes-support/epeg/epeg/0001-configure-Fix-checks-for-libjpeg-and-libexif.patch @@ -0,0 +1,32 @@ +From 4e0c62634b0db6dbad0d41377bb71a8012abd75b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 12:56:54 -0700 +Subject: [PATCH] configure: Fix checks for libjpeg and libexif + +Use the functions from the respective library instead of using main +function which is not part of library + +Upstream-Status: Submitted [https://github.com/mattes/epeg/pull/27] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a4f6ebd..e474b1d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -31,8 +31,8 @@ AC_SUBST(version_info) + dnl AC_CHECK_FUNCS(fmemopen) + dnl AC_CHECK_FUNCS(open_memstream) + +-AC_CHECK_LIB([jpeg], [main], [], [echo "libjpeg library not found. Please install it before proceeding"; exit -1]) +-AC_CHECK_LIB([exif], [main], [], [echo "libexif library not found. Please install it before proceeding"; exit -1]) ++AC_CHECK_LIB([jpeg], [jpeg_simple_progression], [], [echo "libjpeg library not found. Please install it before proceeding"; exit -1]) ++AC_CHECK_LIB([exif], [exif_data_new_from_file], [], [echo "libexif library not found. Please install it before proceeding"; exit -1]) + + my_includes="" + my_libs="-ljpeg -lexif" +-- +2.37.3 + diff --git a/meta-oe/recipes-support/epeg/epeg_git.bb b/meta-oe/recipes-support/epeg/epeg_git.bb index 6b23bbf78c..e5277b1579 100644 --- a/meta-oe/recipes-support/epeg/epeg_git.bb +++ b/meta-oe/recipes-support/epeg/epeg_git.bb @@ -5,8 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7732a9290ea1e4b034fdc15cf49968d \ file://COPYING-PLAIN;md5=f59cacc08235a546b0c34a5422133035" DEPENDS = "jpeg libexif" -SRC_URI = "git://github.com/mattes/epeg.git" -SRCREV = "337f55346425fbf2d283e794b702318ef2a74bcb" +SRC_URI = "git://github.com/mattes/epeg.git;branch=master;protocol=https \ + file://0001-configure-Fix-checks-for-libjpeg-and-libexif.patch \ + " +SRCREV = "9a175cd67eaa61fe45413d8da82da72936567047" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb b/meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb deleted file mode 100644 index 79b2cc1f41..0000000000 --- a/meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb +++ /dev/null @@ -1,24 +0,0 @@ -require espeak.inc - -inherit native - -PACKAGES = "${PN}" -FILES_${PN} = "${layout_datadir}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -TARGET_ARCH = "${MACHINE_ARCH}" - -do_compile() { - # Fixing byte order of phoneme data files - cd "${S}/platforms/big_endian" - sed -i '/^ *CC *=/d' Makefile - sed -i 's/\(.*BYTE_ORDER\)/#undef BYTE_ORDER\n#define BYTE_ORDER BIG_ENDIAN\n\1/' espeak-phoneme-data.c - oe_runmake - ./espeak-phoneme-data "${S}/espeak-data" - cp -f phondata phonindex phontab "${S}/espeak-data" -} - -do_install() { - install -d ${D}${layout_datadir}/espeak-data - install -m 0644 ${S}/espeak-data/phon* ${D}${layout_datadir}/espeak-data -} diff --git a/meta-oe/recipes-support/espeak/espeak.inc b/meta-oe/recipes-support/espeak/espeak.inc deleted file mode 100644 index 60b3f73c81..0000000000 --- a/meta-oe/recipes-support/espeak/espeak.inc +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "eSpeak is a compact open source software speech synthesizer" -SECTION = "base" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://License.txt;md5=cb7a20edb4c9f5f478de6523dcd7362c" - -SRC_URI = "http://downloads.sourceforge.net/espeak/espeak-1.48.04-source.zip \ - file://gcc-narrowing-warning-fix.patch \ -" -SRC_URI[md5sum] = "cadd7482eaafe9239546bdc09fa244c3" -SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659" - -S = "${WORKDIR}/espeak-${PV}-source" - -DEPENDS = "portaudio-v19" diff --git a/meta-oe/recipes-support/espeak/espeak_1.48.04.bb b/meta-oe/recipes-support/espeak/espeak_1.48.04.bb index 552f40413b..147a8069fa 100644 --- a/meta-oe/recipes-support/espeak/espeak_1.48.04.bb +++ b/meta-oe/recipes-support/espeak/espeak_1.48.04.bb @@ -1,22 +1,53 @@ -require espeak.inc -inherit siteinfo +DESCRIPTION = "eSpeak is a compact open source software speech synthesizer" +SECTION = "base" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://License.txt;md5=cb7a20edb4c9f5f478de6523dcd7362c" + +SRC_URI = "http://downloads.sourceforge.net/espeak/espeak-1.48.04-source.zip \ + file://0001-Fix-build-of-shared-library-on-architectures-needing.patch \ + file://0002-tr_languages-cast-string_ordinal-init-values.patch \ + file://0001-Drop-using-register-keyword-for-storage-classifier.patch \ +" +SRC_URI[md5sum] = "cadd7482eaafe9239546bdc09fa244c3" +SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659" + +S = "${WORKDIR}/espeak-${PV}-source" + +DEPENDS = "portaudio-v19 qemu-helper-native" +inherit siteinfo qemu -EXTRA_PHONEMES = '${@bb.utils.contains("SITEINFO_ENDIANNESS", "be", "espeak-data (= ${PV})", "", d)}' -RDEPENDS_${PN} = "portaudio-v19 ${EXTRA_PHONEMES}" CXXFLAGS += "-DUSE_PORTAUDIO" TARGET_CC_ARCH += "${LDFLAGS}" -FILES_${PN} += "${datadir}/espeak-data" +FILES:${PN} += "${datadir}/espeak-data" do_configure() { # "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19, use V19 - cp "${S}/src/portaudio19.h" "${S}/src/portaudio.h" + install -m 0644 "${S}/src/portaudio19.h" "${S}/src/portaudio.h" } do_compile() { cd src oe_runmake + + cd "${S}/platforms/big_endian" + qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}', ['${S}/platforms/big_endian', '${STAGING_DIR_TARGET}${base_libdir}'])}" + cat >qemuwrapper <<EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x qemuwrapper + sed -i '/^ *CC *=/d' Makefile + # Fixing byte order of phoneme data files + if [ "${SITEINFO_ENDIANNESS}" = "be" ]; then + sed -i 's/\(.*BYTE_ORDER\)/#undef BYTE_ORDER\n#define BYTE_ORDER BIG_ENDIAN\n\1/' espeak-phoneme-data.c + else + sed -i 's/\(.*BYTE_ORDER\)/#undef BYTE_ORDER\n#define BYTE_ORDER LITTLE_ENDIAN\n\1/' espeak-phoneme-data.c + fi + oe_runmake + ./qemuwrapper ./espeak-phoneme-data "${S}/espeak-data" "." "${S}/espeak-data/phondata-manifest" + cp -f phondata phonindex phontab "${S}/espeak-data" } do_install() { @@ -31,11 +62,7 @@ do_install() { ln -sf espeak/espeak.h ${D}${includedir}/ oe_libinstall -so -C src libespeak ${D}${libdir} - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - # the big-endian phon* files are provided by the package espeak-data - rm -f ${S}/espeak-data/phon* - fi - - cp -prf ${S}/espeak-data/* ${D}${datadir}/espeak-data - chown -R root:root ${D}${datadir}/espeak-data + cp -R --no-dereference --preserve=mode,links ${S}/espeak-data/* ${D}${datadir}/espeak-data } + +RDEPENDS:${PN} = "portaudio-v19" diff --git a/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch b/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch new file mode 100644 index 0000000000..d9c0d08ec9 --- /dev/null +++ b/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch @@ -0,0 +1,38 @@ +From bad6131463275bd8013a82c28fb0b27e882bc801 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 16:07:35 -0800 +Subject: [PATCH] Drop using 'register' keyword for storage classifier + +Its gone from C++17 and newer + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/klatt.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/klatt.cpp b/src/klatt.cpp +index b15f77c..9c51bc5 100755 +--- a/src/klatt.cpp ++++ b/src/klatt.cpp +@@ -167,7 +167,7 @@ Output = (rnz.a * input) + (rnz.b * oldin1) + (rnz.c * oldin2) + #ifdef deleted + static double antiresonator(resonator_ptr r, double input) + { +- register double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; ++ double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; + r->p2 = (double)r->p1; + r->p1 = (double)input; + return (double)x; +@@ -176,7 +176,7 @@ static double antiresonator(resonator_ptr r, double input) + + static double antiresonator2(resonator_ptr r, double input) + { +- register double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; ++ double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; + r->p2 = (double)r->p1; + r->p1 = (double)input; + +-- +2.39.1 + diff --git a/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch b/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch new file mode 100644 index 0000000000..144c30a62f --- /dev/null +++ b/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch @@ -0,0 +1,33 @@ +From 08a464e2b6bd31bb2bf4e258ebfa9b9d65805abf Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Fri, 27 Nov 2015 15:17:02 +0100 +Subject: [PATCH] Fix build of shared library on architectures needing -fPIC + +Certain architectures, like Sparc and Sparc64 require objects to be +built with -fPIC (and not just -fpic) to be usable in shared +libraries. On other architectures, -fPIC is the same as -fpic so this +patch doesn't affect such architectures. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- +Upstream-Status: Pending + + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 95fe549..c293611 100755 +--- a/src/Makefile ++++ b/src/Makefile +@@ -110,7 +110,7 @@ $(BIN2_NAME): $(OBJS3) $(LIB_NAME) + + + x_%.o: %.cpp +- $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -fpic -fvisibility=hidden -pedantic \ ++ $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -fPIC -fvisibility=hidden -pedantic \ + -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o + + $(LIB_NAME): $(OBJS2) +-- +2.6.3 + diff --git a/meta-oe/recipes-support/espeak/files/0002-tr_languages-cast-string_ordinal-init-values.patch b/meta-oe/recipes-support/espeak/files/0002-tr_languages-cast-string_ordinal-init-values.patch new file mode 100644 index 0000000000..cef360eaef --- /dev/null +++ b/meta-oe/recipes-support/espeak/files/0002-tr_languages-cast-string_ordinal-init-values.patch @@ -0,0 +1,34 @@ +From 451330d09a6a3500b40bc4f5896ba790ab46cd6c Mon Sep 17 00:00:00 2001 +From: Romain Naour <romain.naour@gmail.com> +Date: Sun, 15 Jan 2017 19:37:31 +0100 +Subject: [PATCH 2/2] tr_languages: cast string_ordinal init values + +On some architecture, "char" is signed (x86_64, nios2...) so the +compiler try to convert int 0xc2 and 0xba to a signed char. +This is an error since gcc6 (Wnarrowing). + +Fixes: +http://autobuild.buildroot.net/results/bae/baef9888b1979d18171668a675985e3f3b45fda6 + +Upstream-Status: Pending [imported from BR] +Signed-off-by: Romain Naour <romain.naour@gmail.com> +--- + src/tr_languages.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp +index 5c80286..dbc6e36 100644 +--- a/src/tr_languages.cpp ++++ b/src/tr_languages.cpp +@@ -200,7 +200,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = { + 0x200d, 1, // zero width joiner + 0, 0 }; + +-const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8 ++const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8 + + + static Translator* NewTranslator(void) +-- +2.9.3 + diff --git a/meta-oe/recipes-support/espeak/files/gcc-narrowing-warning-fix.patch b/meta-oe/recipes-support/espeak/files/gcc-narrowing-warning-fix.patch deleted file mode 100644 index 2a9b4607d9..0000000000 --- a/meta-oe/recipes-support/espeak/files/gcc-narrowing-warning-fix.patch +++ /dev/null @@ -1,56 +0,0 @@ -From f09c83640b9173552fd9277c3a48619b903fa436 Mon Sep 17 00:00:00 2001 -From: "Reece H. Dunn" <msclrhd@gmail.com> -Date: Wed, 20 Jan 2016 20:48:29 +0000 -Subject: [PATCH] Fix GCC -Wnarrowing warnings. - ---- - src/tr_languages.cpp | 7 ++++--- - src/translate.h | 2 +- - 2 files changed, 5 insertions(+), 4 deletions(-) - -Index: espeak-1.48.04-source/src/tr_languages.cpp -=================================================================== ---- espeak-1.48.04-source.orig/src/tr_languages.cpp -+++ espeak-1.48.04-source/src/tr_languages.cpp -@@ -198,8 +198,8 @@ static const unsigned short chars_ignore - 0x200d, 1, // zero width joiner - 0, 0 }; - --const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8 -- -+const unsigned char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8 -+const unsigned char utf8_null[] = { 0 }; // null string, UTF-8 - - static Translator* NewTranslator(void) - {//=================================== -@@ -296,7 +296,7 @@ static const char transpose_map_latin[] - tr->langopts.replace_chars = NULL; - tr->langopts.ascii_language[0] = 0; // Non-Latin alphabet languages, use this language to speak Latin words, default is English - tr->langopts.alt_alphabet_lang = L('e','n'); -- tr->langopts.roman_suffix = ""; -+ tr->langopts.roman_suffix = utf8_null; - - SetLengthMods(tr,201); - // tr->langopts.length_mods = length_mods_en; -@@ -758,7 +758,7 @@ Translator *SelectTranslator(const char - tr->langopts.stress_flags = S_FINAL_SPANISH | S_FINAL_DIM_ONLY | S_FINAL_NO_2; - tr->langopts.numbers = NUM_SINGLE_STRESS | NUM_DECIMAL_COMMA | NUM_AND_UNITS | NUM_OMIT_1_HUNDRED | NUM_OMIT_1_THOUSAND | NUM_ROMAN | NUM_ROMAN_ORDINAL; - tr->langopts.numbers2 = NUM2_ORDINAL_NO_AND; -- tr->langopts.roman_suffix = string_ordinal; -+ tr->langopts.roman_suffix = utf8_null; - } - else - if(name2 == L_pap) -Index: espeak-1.48.04-source/src/translate.h -=================================================================== ---- espeak-1.48.04-source.orig/src/translate.h -+++ espeak-1.48.04-source/src/translate.h -@@ -545,7 +545,7 @@ typedef struct { - int decimal_sep; - int max_digits; // max number of digits which can be spoken as an integer number (rather than individual digits) - const char *ordinal_indicator; // UTF-8 string -- const char *roman_suffix; // add this (ordinal) suffix to Roman numbers (LANG=an) -+ const unsigned char *roman_suffix; // add this (ordinal) suffix to Roman numbers (LANG=an) - - // bit 0, accent name before the letter name, bit 1 "capital" after letter name - int accents; diff --git a/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb b/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb new file mode 100644 index 0000000000..491f10dda0 --- /dev/null +++ b/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "Kernel evdev device emulation" +DESCRIPTION = "The evemu library and tools are used to describe devices, record data, create devices and replay data from kernel evdev devices." +HOMEPAGE = "https://www.freedesktop.org/wiki/Evemu" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +DEPENDS = "libevdev" + +SRCREV = "86a5627dbeac8d9d9bc34326a758d6a477e876e4" +SRC_URI = "git://git@gitlab.freedesktop.org/libevdev/evemu.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" +PV = "2.7.0+git" + +inherit autotools pkgconfig + +PACKAGES =+ "${PN}-python" +FILES:${PN}-python = "${libdir}/python*/site-packages/*" +RDEPENDS:${PN}-python = "python3" + diff --git a/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb b/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb deleted file mode 100644 index 59b01b69b6..0000000000 --- a/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Replacement syslog API" -HOMEPAGE = "http://www.balabit.com/network-security/syslog-ng/opensource-logging-system" -DESCRIPTION = "The EventLog library aims to be a replacement of the \ - simple syslog() API provided on UNIX systems. The \ - major difference between EventLog and syslog is that \ - EventLog tries to add structure to messages. EventLog \ - provides an interface to build, format and output an \ - event record. The exact format and output method can \ - be customized by the administrator via a configuration \ - file. his package is the runtime part of the library. \ -" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=b8ba8e77bcda9a53fac0fe39fe957767" - -SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.4.2/source/${BPN}_${PV}.tar.gz" - -inherit autotools pkgconfig - -SRC_URI[md5sum] = "68ec8d1ea3b98fa35002bb756227c315" -SRC_URI[sha256sum] = "7cb4e6f316daede4fa54547371d5c986395177c12dbdec74a66298e684ac8b85" diff --git a/meta-oe/recipes-support/evtest/evtest_git.bb b/meta-oe/recipes-support/evtest/evtest_git.bb deleted file mode 100644 index fa0d6e2fe5..0000000000 --- a/meta-oe/recipes-support/evtest/evtest_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Simple tool for input event debugging" -HOMEPAGE = "http://people.freedesktop.org/~whot/evtest/" -AUTHOR = "Vojtech Pavlik <vojtech@suse.cz>" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = "libxml2" - -SRCREV = "ab140a2dab1547f7deb5233be6d94a388cf08b26" -SRC_URI = "git://anongit.freedesktop.org/evtest;protocol=git" - -PV = "1.33+${SRCPV}" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb b/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb new file mode 100644 index 0000000000..3e33ab7953 --- /dev/null +++ b/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb @@ -0,0 +1,11 @@ +SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +DEPENDS = "zlib expat brotli libinih" + +SRC_URI = "git://github.com/Exiv2/exiv2.git;protocol=https;branch=0.28.x" +SRCREV = "a6a79ef064f131ffd03c110acce2d3edb84ffa2e" +S = "${WORKDIR}/git" + +inherit cmake gettext diff --git a/meta-oe/recipes-support/farsight/libnice_0.1.13.bb b/meta-oe/recipes-support/farsight/libnice_0.1.13.bb deleted file mode 100644 index 48c8221a3b..0000000000 --- a/meta-oe/recipes-support/farsight/libnice_0.1.13.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Interactive Connectivity Establishment library" -DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactive Connectivity Establishment standard (ICE)." -HOMEPAGE = "http://nice.freedesktop.org/wiki/" -SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz" -SRC_URI[md5sum] = "3226faeaf48a9150ada00da2e2865959" -SRC_URI[sha256sum] = "61112d9f3be933a827c8365f20551563953af6718057928f51f487bfe88419e1" - -LICENSE = "LGPLv2.1 & MPLv1.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ - file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ -" - -DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gupnp] = "--enable-gupnp,--disable-gupnp,gupnp-igd" - -inherit autotools pkgconfig gtk-doc gobject-introspection - -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" -FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" - -do_configure_prepend() { - mkdir ${S}/m4 || true -} - -do_compile_append() { - for i in $(find ${B} -name "*.pc") ; do - sed -i -e s:${STAGING_DIR_TARGET}::g \ - -e s:/${TARGET_SYS}::g \ - $i - done -} diff --git a/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch b/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch index 82b1c61e9c..730bb7a965 100644 --- a/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch +++ b/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- fbset-2.1/Makefile.orig 2006-05-28 04:04:27.412095480 +0200 +++ fbset-2.1/Makefile 2006-05-28 04:14:05.379231120 +0200 @@ -2,7 +2,7 @@ diff --git a/meta-oe/recipes-support/fbset/fbset-modes.bb b/meta-oe/recipes-support/fbset/fbset-modes.bb index 5f6f9909b9..fcaf31795b 100644 --- a/meta-oe/recipes-support/fbset/fbset-modes.bb +++ b/meta-oe/recipes-support/fbset/fbset-modes.bb @@ -4,20 +4,19 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PV = "0.1.0" -PR = "r6" SRC_URI = "file://fb.modes" -S = "${WORKDIR}" + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install() { install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/fb.modes ${D}${sysconfdir} + install -m 0644 ${UNPACKDIR}/fb.modes ${D}${sysconfdir} } -inherit allarch - # fb.modes file is MACHINE_ARCH, base.bbclass correctly changes it to MACHINE_ARCH, but too late for allarch.bbclass # to disable "all" behavior (found when comparing qemuarm and qemux86 signatures) PACKAGE_ARCH = "${MACHINE_ARCH}" -CONFFILES_${PN} = "${sysconfdir}/fb.modes" +CONFFILES:${PN} = "${sysconfdir}/fb.modes" diff --git a/meta-oe/recipes-support/fbset/fbset_2.1.bb b/meta-oe/recipes-support/fbset/fbset_2.1.bb index fbf834da18..690fee0df3 100644 --- a/meta-oe/recipes-support/fbset/fbset_2.1.bb +++ b/meta-oe/recipes-support/fbset/fbset_2.1.bb @@ -7,14 +7,13 @@ SUMMARY = "The fbset console tool" HOMEPAGE = "http://users.telenet.be/geertu/Linux/fbdev/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://fbset.c;endline=19;md5=bf326f82cdfcac391af208f019c5603f" -RRECOMMENDS_${PN} = "fbset-modes" +RRECOMMENDS:${PN} = "fbset-modes" DEPENDS = "bison-native flex-native" -PR = "r4" -SRC_URI = "http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/f/fbset/fbset_2.1.orig.tar.gz \ file://makefile.patch \ file://fbset-2.1-fix-makefile-dep.patch \ file://0001-fbset-including-asm-types.h-is-needed-on-all-linux-s.patch \ @@ -29,7 +28,7 @@ do_install() { install -m 0644 ${B}/*.8 ${D}${datadir}/man/man8 } -ALTERNATIVE_fbset = "fbset" +ALTERNATIVE:fbset = "fbset" ALTERNATIVE_LINK_NAME[fbset] = "${sbindir}/fbset" ALTERNATIVE_TARGET[fbset] = "${sbindir}/fbset.real" ALTERNATIVE_PRIORITY[fbset] = "55" diff --git a/meta-oe/recipes-support/fbtest/fb-test_git.bb b/meta-oe/recipes-support/fbtest/fb-test_git.bb deleted file mode 100644 index 6a9d4b2787..0000000000 --- a/meta-oe/recipes-support/fbtest/fb-test_git.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Test suite for Linux framebuffer" - -PV = "1.1.0" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" - -SRCREV = "063ec650960c2d79ac51f5c5f026cb05343a33e2" -SRC_URI = "git://github.com/prpplague/fb-test-app.git" - -S = "${WORKDIR}/git" - -do_install() { - install -d ${D}${bindir} - install -m 0755 fb-test ${D}${bindir} - # avoid collisions with perf (perf) and mesa-demos (offset) - for prog in perf rect offset ; do - install -m 0755 $prog ${D}${bindir}/fb-$prog - done -} diff --git a/meta-oe/recipes-support/fftw/fftw/install-bench.patch b/meta-oe/recipes-support/fftw/fftw/install-bench.patch new file mode 100644 index 0000000000..237c1c0c5c --- /dev/null +++ b/meta-oe/recipes-support/fftw/fftw/install-bench.patch @@ -0,0 +1,43 @@ +Upstream-Status: Pending + +--- ./tests/Makefile.am.orig 2021-03-23 11:45:12.756371739 -0400 ++++ ./tests/Makefile.am 2021-03-23 19:29:19.692180793 -0400 +@@ -1,21 +1,21 @@ + AM_CPPFLAGS = -I $(top_srcdir) +-noinst_PROGRAMS = bench ++bin_PROGRAMS = bench@PREC_SUFFIX@ + EXTRA_DIST = check.pl README + + if THREADS +-bench_CFLAGS = $(PTHREAD_CFLAGS) ++bench@PREC_SUFFIX@_CFLAGS = $(PTHREAD_CFLAGS) + if !COMBINED_THREADS + LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_threads.la + endif + else + if OPENMP +-bench_CFLAGS = $(OPENMP_CFLAGS) ++bench@PREC_SUFFIX@_CFLAGS = $(OPENMP_CFLAGS) + LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_omp.la + endif + endif + +-bench_SOURCES = bench.c hook.c fftw-bench.c fftw-bench.h +-bench_LDADD = $(LIBFFTWTHREADS) \ ++bench@PREC_SUFFIX@_SOURCES = bench.c hook.c fftw-bench.c fftw-bench.h ++bench@PREC_SUFFIX@_LDADD = $(LIBFFTWTHREADS) \ + $(top_builddir)/libfftw3@PREC_SUFFIX@.la \ + $(top_builddir)/libbench2/libbench2.a $(THREADLIBS) + +--- ./tools/Makefile.am.orig 2021-03-24 08:22:31.845581620 -0400 ++++ ./tools/Makefile.am 2021-03-24 08:24:26.454053573 -0400 +@@ -24,7 +24,7 @@ + endif + + fftw@PREC_SUFFIX@_wisdom_SOURCES = fftw-wisdom.c +-fftw@PREC_SUFFIX@_wisdom_LDADD = $(top_builddir)/tests/bench-bench.o \ +-$(top_builddir)/tests/bench-fftw-bench.o $(LIBFFTWTHREADS) \ ++fftw@PREC_SUFFIX@_wisdom_LDADD = $(top_builddir)/tests/bench@PREC_SUFFIX@-bench.o \ ++$(top_builddir)/tests/bench@PREC_SUFFIX@-fftw-bench.o $(LIBFFTWTHREADS) \ + $(top_builddir)/libfftw3@PREC_SUFFIX@.la \ + $(top_builddir)/libbench2/libbench2.a $(THREADLIBS) diff --git a/meta-oe/recipes-support/fftw/fftw/run-ptest b/meta-oe/recipes-support/fftw/fftw/run-ptest new file mode 100644 index 0000000000..4d19057975 --- /dev/null +++ b/meta-oe/recipes-support/fftw/fftw/run-ptest @@ -0,0 +1,27 @@ +#!/bin/sh + +cd fftw +/usr/bin/perl -w ./check.pl -r -c=30 -v `pwd`/bench +fftw_result=$? +cd ../fftwf +/usr/bin/perl -w ./check.pl -r -c=30 -v `pwd`/benchf +fftwf_result=$? +cd ../fftwl +/usr/bin/perl -w ./check.pl -r -c=30 -v `pwd`/benchl +fftwl_result=$? + +if [ $fftw_result = "0" ]; then + echo "PASS: fftw" +else + echo "FAIL: fftw" +fi +if [ $fftwf_result = "0" ]; then + echo "PASS: fftwf" +else + echo "FAIL: fftwf" +fi +if [ $fftwl_result = "0" ]; then + echo "PASS: fftwl" +else + echo "FAIL: fftwl" +fi diff --git a/meta-oe/recipes-support/fftw/fftw_3.3.10.bb b/meta-oe/recipes-support/fftw/fftw_3.3.10.bb new file mode 100644 index 0000000000..52122b9c0c --- /dev/null +++ b/meta-oe/recipes-support/fftw/fftw_3.3.10.bb @@ -0,0 +1,105 @@ +DESCRIPTION = "FFTW" +SECTION = "libs" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +SRC_URI = " \ + http://www.fftw.org/fftw-${PV}.tar.gz \ + file://0001-NEON-autodetection-segfaults-assume-neon-present.patch \ + file://install-bench.patch \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467" + +UPSTREAM_CHECK_URI = "http://www.fftw.org/download.html" + +inherit autotools pkgconfig ptest + +# we had multiple recipes in the past +PROVIDES = "fftwl fftwf" + +EXTRA_OECONF = "--disable-fortran --enable-shared --enable-threads" + +CFLAGS += "-D_GNU_SOURCE" + +# neon is optional for arm version < 8 -> check tune features +FFTW_NEON = "${@bb.utils.contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)}" +# neon is suppored for arm version = 8 -> enable +FFTW_NEON:aarch64 = "--enable-neon" +FFTW_NEON:class-native = "" + +do_configure() { + # configure fftw + rm -rf ${WORKDIR}/build-fftw + mkdir -p ${B} + cd ${B} + # full (re)configure + autotools_do_configure + mv ${B} ${WORKDIR}/build-fftw + + # configure fftwl + rm -rf ${WORKDIR}/build-fftwl + mkdir -p ${B} + cd ${B} + # configure only + oe_runconf --enable-long-double + mv ${B} ${WORKDIR}/build-fftwl + + # configure fftwf + rm -rf ${WORKDIR}/build-fftwf + mkdir -p ${B} + cd ${B} + # configure only + oe_runconf --enable-single ${FFTW_NEON} + mv ${B} ${WORKDIR}/build-fftwf +} + +do_compile() { + for lib in fftw fftwl fftwf; do + cd ${WORKDIR}/build-$lib + test -n "${TOOLCHAIN_OPTIONS}" && sed -i -e 's|${TOOLCHAIN_OPTIONS}||g' config.h + autotools_do_compile + done +} + +do_install() { + for lib in fftw fftwl fftwf; do + cd ${WORKDIR}/build-$lib + autotools_do_install + done +} + +do_install_ptest() { + for lib in fftw fftwl fftwf; do + install -d ${D}${PTEST_PATH}/$lib + install -m 0755 ${S}/tests/check.pl ${D}${PTEST_PATH}/$lib + cd ${WORKDIR}/build-$lib + if [ $lib = "fftw" ]; then + mv ${D}${bindir}/bench ${D}${PTEST_PATH}/$lib + fi + if [ $lib = "fftwl" ]; then + mv ${D}${bindir}/benchl ${D}${PTEST_PATH}/$lib + fi + if [ $lib = "fftwf" ]; then + mv ${D}${bindir}/benchf ${D}${PTEST_PATH}/$lib + fi + done +} + +PACKAGES =+ "libfftw libfftwl libfftwf" +FILES:libfftw = "${libdir}/libfftw3.so.* ${libdir}/libfftw3_*.so.*" +FILES:libfftwl = "${libdir}/libfftw3l.so.* ${libdir}/libfftw3l_*.so.*" +FILES:libfftwf = "${libdir}/libfftw3f.so.* ${libdir}/libfftw3f_*.so.*" + +PACKAGES =+ "fftw-wisdom fftwl-wisdom fftwf-wisdom fftw-wisdom-to-conf" +FILES:fftw-wisdom = "${bindir}/fftw-wisdom" +FILES:fftwl-wisdom = "${bindir}/fftwl-wisdom" +FILES:fftwf-wisdom = "${bindir}/fftwf-wisdom" +FILES:fftw-wisdom-to-conf = "${bindir}/fftw-wisdom-to-conf" + +FILES:${PN}-dev += "${libdir}/cmake" +RDEPENDS:${PN}-dev = "libfftw libfftwl libfftwf" +RDEPENDS:${PN}-ptest += "perl" +RDEPENDS:${PN}-ptest:remove = "fftw" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/fftw/fftw_3.3.7.bb b/meta-oe/recipes-support/fftw/fftw_3.3.7.bb deleted file mode 100644 index aae6ec952a..0000000000 --- a/meta-oe/recipes-support/fftw/fftw_3.3.7.bb +++ /dev/null @@ -1,80 +0,0 @@ -DESCRIPTION = "FFTW" -SECTION = "libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -SRC_URI = " \ - http://www.fftw.org/fftw-${PV}.tar.gz \ - file://0001-NEON-autodetection-segfaults-assume-neon-present.patch \ -" -SRC_URI[md5sum] = "0d5915d7d39b3253c1cc05030d79ac47" -SRC_URI[sha256sum] = "3b609b7feba5230e8f6dd8d245ddbefac324c5a6ae4186947670d9ac2cd25573" - -inherit autotools pkgconfig - -# we had multiple recipes in the past -PROVIDES = "fftwl fftwf" - -EXTRA_OECONF = "--disable-fortran --enable-shared --enable-threads" - -CFLAGS += "-D_GNU_SOURCE" - -FFTW_NEON = "${@bb.utils.contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)}" -FFTW_NEON_class-native = "" - -do_configure() { - # configure fftw - rm -rf ${WORKDIR}/build-fftw - mkdir -p ${B} - cd ${B} - # full (re)configure - autotools_do_configure - mv ${B} ${WORKDIR}/build-fftw - - # configure fftwl - rm -rf ${WORKDIR}/build-fftwl - mkdir -p ${B} - cd ${B} - # configure only - oe_runconf --enable-long-double - mv ${B} ${WORKDIR}/build-fftwl - - # configure fftwf - rm -rf ${WORKDIR}/build-fftwf - mkdir -p ${B} - cd ${B} - # configure only - oe_runconf --enable-single ${FFTW_NEON} - mv ${B} ${WORKDIR}/build-fftwf -} - -do_compile() { - for lib in fftw fftwl fftwf; do - cd ${WORKDIR}/build-$lib - autotools_do_compile - done -} - -do_install() { - for lib in fftw fftwl fftwf; do - cd ${WORKDIR}/build-$lib - autotools_do_install - done -} - - -PACKAGES =+ "libfftw libfftwl libfftwf" -FILES_libfftw = "${libdir}/libfftw3.so.* ${libdir}/libfftw3_*.so.*" -FILES_libfftwl = "${libdir}/libfftw3l.so.* ${libdir}/libfftw3l_*.so.*" -FILES_libfftwf = "${libdir}/libfftw3f.so.* ${libdir}/libfftw3f_*.so.*" - -PACKAGES =+ "fftw-wisdom fftwl-wisdom fftwf-wisdom fftw-wisdom-to-conf" -FILES_fftw-wisdom = "${bindir}/fftw-wisdom" -FILES_fftwl-wisdom = "${bindir}/fftwl-wisdom" -FILES_fftwf-wisdom = "${bindir}/fftwf-wisdom" -FILES_fftw-wisdom-to-conf = "${bindir}/fftw-wisdom-to-conf" - -FILES_${PN}-dev += "${libdir}/cmake" -RDEPENDS_${PN}-dev = "libfftw libfftwl libfftwf" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff b/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff deleted file mode 100644 index b3e4b7aae4..0000000000 --- a/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff +++ /dev/null @@ -1,6615 +0,0 @@ -Index: lang/usenglish/Makefile -=================================================================== ---- flite-1.3-release/lang/usenglish/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/usenglish/Makefile (.../release-1.2) (revision 7) -@@ -38,6 +38,7 @@ - DIRNAME=lang/usenglish - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - H = usenglish.h us_int_accent_cart.h us_int_tone_cart.h us_durz_cart.h \ - us_ffeatures.h us_phrasing_cart.h us_text.h us_f0.h us_nums_cart.h - SRCS = us_int_accent_cart.c us_int_tone_cart.c us_f0_model.c \ -@@ -45,7 +46,11 @@ - us_phoneset.c us_ffeatures.c us_phrasing_cart.c \ - us_gpos.c us_text.c us_expand.c us_postlex.c \ - us_nums_cart.c us_aswd.c usenglish.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_usenglish -Index: lang/cmu_us_kal/Makefile -=================================================================== ---- flite-1.3-release/lang/cmu_us_kal/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmu_us_kal/Makefile (.../release-1.2) (revision 7) -@@ -43,7 +43,12 @@ - cmu_us_kal_lpc.c \ - cmu_us_kal_res.c \ - cmu_us_kal_residx.c --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_cmu_us_kal -Index: lang/cmu_us_kal16/Makefile -=================================================================== ---- flite-1.3-release/lang/cmu_us_kal16/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmu_us_kal16/Makefile (.../release-1.2) (revision 7) -@@ -44,7 +44,12 @@ - cmu_us_kal16_lpc.c \ - cmu_us_kal16_res.c \ - cmu_us_kal16_residx.c --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_cmu_us_kal16 -Index: lang/cmu_time_awb/Makefile -=================================================================== ---- flite-1.3-release/lang/cmu_time_awb/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmu_time_awb/Makefile (.../release-1.2) (revision 7) -@@ -45,7 +45,12 @@ - cmu_time_awb_mcep.c \ - cmu_time_awb_lpc.c \ - cmu_time_awb_lex_entry.c --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_cmu_time_awb -Index: lang/cmulex/Makefile -=================================================================== ---- flite-1.3-release/lang/cmulex/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmulex/Makefile (.../release-1.2) (revision 7) -@@ -38,13 +38,20 @@ - DIRNAME=lang/cmulex - BUILD_DIRS = - ALL_DIRS= -+ - H = cmu_lts_model.h cmulex.h - SRCS = cmu_lts_rules.c cmu_lts_model.c \ - cmu_lex.c cmu_lex_entries.c cmu_lex_data.c - LEX_DATA_INCLUDES = cmu_lex_data_raw.c cmu_lex_num_bytes.c \ - cmu_lex_phones_huff_table.c cmu_lex_entries_huff_table.c - --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif -+ - SCRIPTS=make_cmulex - - SCM= -Index: configure -=================================================================== ---- flite-1.3-release/configure (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/configure (.../release-1.2) (revision 7) -@@ -1,324 +1,38 @@ - #! /bin/sh -+ - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.57. -+# Generated automatically using autoconf version 2.13 -+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. - # --# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --# Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix --fi -- --# Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false --fi -- -- --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH --PS1='$ ' --PS2='> ' --PS4='+ ' -- --# NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -- fi --done -- --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -- as_basename=basename --else -- as_basename=false --fi -- -- --# Name of the executable. --as_me=`$as_basename "$0" || --$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -- --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -- --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; --esac -- --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -- as_ln_s='ln -s' -- fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln --else -- as_ln_s='cp -p' --fi --rm -f conf$$ conf$$.exe conf$$.file -- --if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: --else -- as_mkdir_p=false --fi -- --as_executable_p="test -f" -- --# Sed expression to map a string onto a valid CPP name. --as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -- --# Sed expression to map a string onto a valid variable name. --as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -- -- --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- -- --# Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, --# so uname gets run too. --ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -- --exec 6>&1 -- --# --# Initializations. --# -+# Defaults: -+ac_help= - ac_default_prefix=/usr/local --ac_config_libobj_dir=. --cross_compiling=no --subdirs= --MFLAGS= --MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} -+# Any additions from configure.in: -+ac_help="$ac_help -+ --disable-shared without shared library support" -+ac_help="$ac_help -+ --disable-sockets without socket support" -+ac_help="$ac_help -+ --with-audio with specific audio support (none linux freebsd etc) " -+ac_help="$ac_help -+ --with-lang with language " -+ac_help="$ac_help -+ --with-vox with vox " -+ac_help="$ac_help -+ --with-lex with lexicon " - --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} -- --# Identity of this package. --PACKAGE_NAME= --PACKAGE_TARNAME= --PACKAGE_VERSION= --PACKAGE_STRING= --PACKAGE_BUGREPORT= -- --ac_unique_file="include/flite.h" --# Factoring default headers for most tests. --ac_includes_default="\ --#include <stdio.h> --#if HAVE_SYS_TYPES_H --# include <sys/types.h> --#endif --#if HAVE_SYS_STAT_H --# include <sys/stat.h> --#endif --#if STDC_HEADERS --# include <stdlib.h> --# include <stddef.h> --#else --# if HAVE_STDLIB_H --# include <stdlib.h> --# endif --#endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H --# include <memory.h> --# endif --# include <string.h> --#endif --#if HAVE_STRINGS_H --# include <strings.h> --#endif --#if HAVE_INTTYPES_H --# include <inttypes.h> --#else --# if HAVE_STDINT_H --# include <stdint.h> --# endif --#endif --#if HAVE_UNISTD_H --# include <unistd.h> --#endif" -- --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR ac_ct_AR TARGET_OS TARGET_CPU M68KCC LEXDEFS VOXDEFS HOST_OS HOST_CPU OTHERLIBS SHFLAGS MMAPTYPE STDIOTYPE CPP EGREP AUDIODRIVER AUDIODEFS AUDIOLIBS FL_LANG FL_VOX FL_LEX LIBOBJS LTLIBOBJS' --ac_subst_files='' -- - # Initialize some variables set by options. --ac_init_help= --ac_init_version=false - # The variables have the same names as the options, with - # dashes changed to underlines. --cache_file=/dev/null -+build=NONE -+cache_file=./config.cache - exec_prefix=NONE -+host=NONE - no_create= -+nonopt=NONE - no_recursion= - prefix=NONE - program_prefix=NONE -@@ -327,15 +41,10 @@ - silent= - site= - srcdir= -+target=NONE - verbose= - x_includes=NONE - x_libraries=NONE -- --# Installation directory options. --# These are left unexpanded so users can "make install exec_prefix=/foo" --# and all the variables that are supposed to be based on exec_prefix --# by default will actually change. --# Use braces instead of parens because sh, perl, etc. also accept them. - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' -@@ -349,9 +58,17 @@ - infodir='${prefix}/info' - mandir='${prefix}/man' - -+# Initialize some other variables. -+subdirs= -+MFLAGS= MAKEFLAGS= -+SHELL=${CONFIG_SHELL-/bin/sh} -+# Maximum number of lines to put in a shell here document. -+ac_max_here_lines=12 -+ - ac_prev= - for ac_option - do -+ - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" -@@ -359,59 +76,59 @@ - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case "$ac_option" in -+ -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -+ *) ac_optarg= ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) -- bindir=$ac_optarg ;; -+ bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) -- ac_prev=build_alias ;; -+ ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) -- build_alias=$ac_optarg ;; -+ build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -- cache_file=$ac_optarg ;; -+ cache_file="$ac_optarg" ;; - -- --config-cache | -C) -- cache_file=config.cache ;; -- - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) -- datadir=$ac_optarg ;; -+ datadir="$ac_optarg" ;; - - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then -+ { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } -+ fi -+ ac_feature=`echo $ac_feature| sed 's/-/_/g'` -+ eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -+ if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then -+ { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } -+ fi -+ ac_feature=`echo $ac_feature| sed 's/-/_/g'` -+ case "$ac_option" in -+ *=*) ;; - *) ac_optarg=yes ;; - esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -420,47 +137,95 @@ - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) -- exec_prefix=$ac_optarg ;; -+ exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - -- -help | --help | --hel | --he | -h) -- ac_init_help=long ;; -- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) -- ac_init_help=recursive ;; -- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) -- ac_init_help=short ;; -+ -help | --help | --hel | --he) -+ # Omit some internal or obsolete options to make the list less imposing. -+ # This message is too long to be a string in the A/UX 3.1 sh. -+ cat << EOF -+Usage: configure [options] [host] -+Options: [defaults in brackets after descriptions] -+Configuration: -+ --cache-file=FILE cache test results in FILE -+ --help print this message -+ --no-create do not create output files -+ --quiet, --silent do not print \`checking...' messages -+ --version print the version of autoconf that created configure -+Directory and file names: -+ --prefix=PREFIX install architecture-independent files in PREFIX -+ [$ac_default_prefix] -+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -+ [same as prefix] -+ --bindir=DIR user executables in DIR [EPREFIX/bin] -+ --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] -+ --libexecdir=DIR program executables in DIR [EPREFIX/libexec] -+ --datadir=DIR read-only architecture-independent data in DIR -+ [PREFIX/share] -+ --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data in DIR -+ [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] -+ --libdir=DIR object code libraries in DIR [EPREFIX/lib] -+ --includedir=DIR C header files in DIR [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] -+ --infodir=DIR info documentation in DIR [PREFIX/info] -+ --mandir=DIR man documentation in DIR [PREFIX/man] -+ --srcdir=DIR find the sources in DIR [configure dir or ..] -+ --program-prefix=PREFIX prepend PREFIX to installed program names -+ --program-suffix=SUFFIX append SUFFIX to installed program names -+ --program-transform-name=PROGRAM -+ run sed PROGRAM on installed program names -+EOF -+ cat << EOF -+Host type: -+ --build=BUILD configure for building on BUILD [BUILD=HOST] -+ --host=HOST configure for HOST [guessed] -+ --target=TARGET configure for TARGET [TARGET=HOST] -+Features and packages: -+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) -+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --x-includes=DIR X include files are in DIR -+ --x-libraries=DIR X library files are in DIR -+EOF -+ if test -n "$ac_help"; then -+ echo "--enable and --with options recognized:$ac_help" -+ fi -+ exit 0 ;; - - -host | --host | --hos | --ho) -- ac_prev=host_alias ;; -+ ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) -- host_alias=$ac_optarg ;; -+ host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) -- includedir=$ac_optarg ;; -+ includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -- infodir=$ac_optarg ;; -+ infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) -- libdir=$ac_optarg ;; -+ libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) -- libexecdir=$ac_optarg ;; -+ libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ -@@ -469,19 +234,19 @@ - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -- localstatedir=$ac_optarg ;; -+ localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -- mandir=$ac_optarg ;; -+ mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -- | --no-cr | --no-c | -n) -+ | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -@@ -495,26 +260,26 @@ - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) -- oldincludedir=$ac_optarg ;; -+ oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -- prefix=$ac_optarg ;; -+ prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) -- program_prefix=$ac_optarg ;; -+ program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) -- program_suffix=$ac_optarg ;; -+ program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ -@@ -531,7 +296,7 @@ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) -- program_transform_name=$ac_optarg ;; -+ program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) -@@ -541,7 +306,7 @@ - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) -- sbindir=$ac_optarg ;; -+ sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ -@@ -552,57 +317,58 @@ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) -- sharedstatedir=$ac_optarg ;; -+ sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) -- site=$ac_optarg ;; -+ site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -- srcdir=$ac_optarg ;; -+ srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) -- sysconfdir=$ac_optarg ;; -+ sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) -- ac_prev=target_alias ;; -+ ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -- target_alias=$ac_optarg ;; -+ target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - -- -version | --version | --versio | --versi | --vers | -V) -- ac_init_version=: ;; -+ -version | --version | --versio | --versi | --vers) -+ echo "configure generated by autoconf version 2.13" -+ exit 0 ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -+ if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then -+ { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } -+ fi - ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -+ case "$ac_option" in -+ *=*) ;; - *) ac_optarg=yes ;; - esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then -+ { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } -+ fi -+ ac_package=`echo $ac_package| sed 's/-/_/g'` -+ eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. -@@ -613,110 +379,99 @@ - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) -- x_includes=$ac_optarg ;; -+ x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) -- x_libraries=$ac_optarg ;; -+ x_libraries="$ac_optarg" ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - -- *=*) -- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` -- # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -- export $ac_envvar ;; -- - *) -- # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then -+ echo "configure: warning: $ac_option: invalid host type" 1>&2 -+ fi -+ if test "x$nonopt" != xNONE; then -+ { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } -+ fi -+ nonopt="$ac_option" - ;; - - esac - done - - if test -n "$ac_prev"; then -- ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -- esac --done -+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+# File descriptor usage: -+# 0 standard input -+# 1 file creation -+# 2 errors and warnings -+# 3 some systems may open it to /dev/tty -+# 4 used on the Kubota Titan -+# 6 checking for... messages and results -+# 5 compiler messages saved in config.log -+if test "$silent" = yes; then -+ exec 6>/dev/null -+else -+ exec 6>&1 -+fi -+exec 5>./config.log -+ -+echo "\ -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+" 1>&5 -+ -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Also quote any args containing shell metacharacters. -+ac_configure_args= -+for ac_arg - do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ case "$ac_arg" in -+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -+ | --no-cr | --no-c) ;; -+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; -+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) -+ ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac - done - --# There might be people who depend on the old broken behavior: `$host' --# used to hold the argument of --host etc. --# FIXME: To remove some day. --build=$build_alias --host=$host_alias --target=$target_alias -+# NLS nuisances. -+# Only set these to C if already set. These must not be set unconditionally -+# because not all systems understand e.g. LANG=C (notably SCO). -+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -+# Non-C LC_CTYPE values break the ctype check. -+if test "${LANG+set}" = set; then LANG=C; export LANG; fi -+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - --# FIXME: To remove some day. --if test "x$host_alias" != x; then -- if test "x$build_alias" = x; then -- cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used." >&2 -- elif test "x$build_alias" != "x$host_alias"; then -- cross_compiling=yes -- fi --fi -+# confdefs.h avoids OS command line length limits that DEFS can exceed. -+rm -rf conftest* confdefs.h -+# AIX cpp loses on an empty file, so make sure it contains at least a newline. -+echo > confdefs.h - --ac_tool_prefix= --test -n "$host_alias" && ac_tool_prefix=$host_alias- -+# A filename unique to this package, relative to the directory that -+# configure is in, which we can look for to find out if srcdir is correct. -+ac_unique_file=include/flite.h - --test "$silent" = yes && exec 6>/dev/null -- -- - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ ac_prog=$0 -+ ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` -+ test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. -@@ -726,441 +481,13 @@ - fi - if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -+ { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -+ { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi - fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - --# --# Report the --help message. --# --if test "$ac_init_help" = "long"; then -- # Omit some internal or obsolete options to make the list less imposing. -- # This message is too long to be a string in the A/UX 3.1 sh. -- cat <<_ACEOF --\`configure' configures this package to adapt to many kinds of systems. -- --Usage: $0 [OPTION]... [VAR=VALUE]... -- --To assign environment variables (e.g., CC, CFLAGS...), specify them as --VAR=VALUE. See below for descriptions of some of the useful variables. -- --Defaults for the options are specified in brackets. -- --Configuration: -- -h, --help display this help and exit -- --help=short display options specific to this package -- --help=recursive display the short help of all the included packages -- -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking...' messages -- --cache-file=FILE cache test results in FILE [disabled] -- -C, --config-cache alias for \`--cache-file=config.cache' -- -n, --no-create do not create output files -- --srcdir=DIR find the sources in DIR [configure dir or \`..'] -- --_ACEOF -- -- cat <<_ACEOF --Installation directories: -- --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -- --By default, \`make install' will install all the files in --\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify --an installation prefix other than \`$ac_default_prefix' using \`--prefix', --for instance \`--prefix=\$HOME'. -- --For better control, use the options below. -- --Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] --_ACEOF -- -- cat <<\_ACEOF -- --System types: -- --build=BUILD configure for building on BUILD [guessed] -- --host=HOST cross-compile to build programs to run on HOST [BUILD] -- --target=TARGET configure for building compilers for TARGET [HOST] --_ACEOF --fi -- --if test -n "$ac_init_help"; then -- -- cat <<\_ACEOF -- --Optional Features: -- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) -- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -- --disable-shared without shared library support -- --disable-sockets without socket support -- --Optional Packages: -- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -- --with-audio with specific audio support (none linux freebsd etc) -- --with-lang with language -- --with-vox with vox -- --with-lex with lexicon -- --Some influential environment variables: -- CC C compiler command -- CFLAGS C compiler flags -- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a -- nonstandard directory <lib dir> -- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have -- headers in a nonstandard directory <include dir> -- CPP C preprocessor -- --Use these variables to override the choices made by `configure' or to help --it to find libraries and programs with nonstandard names/locations. -- --_ACEOF --fi -- --if test "$ac_init_help" = "recursive"; then -- # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` -- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -- ac_builddir=. -- --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -- --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac --# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be --# absolute. --ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` --ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` --ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` -- -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -- else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -- done --fi -- --test -n "$ac_init_help" && exit 0 --if $ac_init_version; then -- cat <<\_ACEOF -- --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --Free Software Foundation, Inc. --This configure script is free software; the Free Software Foundation --gives unlimited permission to copy, distribute and modify it. --_ACEOF -- exit 0 --fi --exec 5>config.log --cat >&5 <<_ACEOF --This file contains any messages produced by compilers while --running configure, to aid debugging if configure makes a mistake. -- --It was created by $as_me, which was --generated by GNU Autoconf 2.57. Invocation command line was -- -- $ $0 $@ -- --_ACEOF --{ --cat <<_ASUNAME --## --------- ## --## Platform. ## --## --------- ## -- --hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` --uname -m = `(uname -m) 2>/dev/null || echo unknown` --uname -r = `(uname -r) 2>/dev/null || echo unknown` --uname -s = `(uname -s) 2>/dev/null || echo unknown` --uname -v = `(uname -v) 2>/dev/null || echo unknown` -- --/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` --/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -- --/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` --/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` --/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` --/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` --/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` --/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -- --_ASUNAME -- --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done -- --} >&5 -- --cat >&5 <<_ACEOF -- -- --## ----------- ## --## Core tests. ## --## ----------- ## -- --_ACEOF -- -- --# Keep a trace of the command line. --# Strip out --no-create and --no-recursion so they do not pile up. --# Strip out --silent because we don't want to record it for future runs. --# Also quote any args containing shell meta-characters. --# Make two passes to allow for proper duplicate-argument suppression. --ac_configure_args= --ac_configure_args0= --ac_configure_args1= --ac_sep= --ac_must_keep_next=false --for ac_pass in 1 2 --do -- for ac_arg -- do -- case $ac_arg in -- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -- | -silent | --silent | --silen | --sile | --sil) -- continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -- 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -- if test $ac_must_keep_next = true; then -- ac_must_keep_next=false # Got value, back to normal. -- else -- case $ac_arg in -- *=* | --config-cache | -C | -disable-* | --disable-* \ -- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -- | -with-* | --with-* | -without-* | --without-* | --x) -- case "$ac_configure_args0 " in -- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -- esac -- ;; -- -* ) ac_must_keep_next=true ;; -- esac -- fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -- ;; -- esac -- done --done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -- --# When interrupted or exit'd, cleanup temporary files, and complete --# config.log. We remove comments because anyway the quotes in there --# would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. --trap 'exit_status=$? -- # Save into config.log some information that might help in debugging. -- { -- echo -- -- cat <<\_ASBOX --## ---------------- ## --## Cache variables. ## --## ---------------- ## --_ASBOX -- echo -- # The following way of writing the cache mishandles newlines in values, --{ -- (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -- *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -- ;; -- esac; --} -- echo -- -- cat <<\_ASBOX --## ----------------- ## --## Output variables. ## --## ----------------- ## --_ASBOX -- echo -- for ac_var in $ac_subst_vars -- do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -- done | sort -- echo -- -- if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## --_ASBOX -- echo -- for ac_var in $ac_subst_files -- do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -- done | sort -- echo -- fi -- -- if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## --## confdefs.h. ## --## ----------- ## --_ASBOX -- echo -- sed "/^$/d" confdefs.h | sort -- echo -- fi -- test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -- } >&5 -- rm -f core core.* *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -- exit $exit_status -- ' 0 --for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal --done --ac_signal=0 -- --# confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -- --# Predefined preprocessor variables. -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_NAME "$PACKAGE_NAME" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_TARNAME "$PACKAGE_TARNAME" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_VERSION "$PACKAGE_VERSION" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_STRING "$PACKAGE_STRING" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" --_ACEOF -- -- --# Let the site file select an alternate cache file if it wants to. - # Prefer explicitly selected file to automatically selected ones. - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then -@@ -1171,106 +498,42 @@ - fi - for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -- sed 's/^/| /' "$ac_site_file" >&5 -+ echo "loading site script $ac_site_file" - . "$ac_site_file" - fi - done - - if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -- case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -- esac -- fi -+ echo "loading cache $cache_file" -+ . $cache_file - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -- >$cache_file -+ echo "creating cache $cache_file" -+ > $cache_file - fi - --# Check that the precious variables saved in the cache have kept the same --# value. --ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -- eval ac_old_set=\$ac_cv_env_${ac_var}_set -- eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -- case $ac_old_set,$ac_new_set in -- set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -- ac_cache_corrupted=: ;; -- ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -- ac_cache_corrupted=: ;; -- ,);; -- *) -- if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -- fi;; -- esac -- # Pass precious variables to config.status. -- if test "$ac_new_set" = set; then -- case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -- *) ac_arg=$ac_var=$ac_new_val ;; -- esac -- case " $ac_configure_args " in -- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -- esac -- fi --done --if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } --fi -- - ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross - -+ac_exeext= -+ac_objext=o -+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then -+ # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. -+ if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then -+ ac_n= ac_c=' -+' ac_t=' ' -+ else -+ ac_n=-n ac_c= ac_t= -+ fi -+else -+ ac_n= ac_c='\c' ac_t= -+fi - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - ac_aux_dir= - for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then -@@ -1281,740 +544,312 @@ - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/shtool install -c" -- break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} -- { (exit 1); exit 1; }; } -+ { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ac_config_guess=$ac_aux_dir/config.guess -+ac_config_sub=$ac_aux_dir/config.sub -+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - --# Make sure we can run config.sub. --$ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 --echo "$as_me: error: cannot run $ac_config_sub" >&2;} -- { (exit 1); exit 1; }; } - --echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6 --if test "${ac_cv_build+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_build_alias=$build_alias --test -z "$ac_cv_build_alias" && -- ac_cv_build_alias=`$ac_config_guess` --test -z "$ac_cv_build_alias" && -- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -- { (exit 1); exit 1; }; } --ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+# Do some error checking and defaulting for the host and target type. -+# The inputs are: -+# configure --host=HOST --target=TARGET --build=BUILD NONOPT -+# -+# The rules are: -+# 1. You are not allowed to specify --host, --target, and nonopt at the -+# same time. -+# 2. Host defaults to nonopt. -+# 3. If nonopt is not specified, then host defaults to the current host, -+# as determined by config.guess. -+# 4. Target and build default to nonopt. -+# 5. If nonopt is not specified, then target and build default to host. - -+# The aliases save the names the user supplied, while $host etc. -+# will get canonicalized. -+case $host---$target---$nonopt in -+NONE---*---* | *---NONE---* | *---*---NONE) ;; -+*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; -+esac -+ -+ -+# Make sure we can run config.sub. -+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } - fi --echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6 --build=$ac_cv_build --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -+echo $ac_n "checking host system type""... $ac_c" 1>&6 -+echo "configure:585: checking host system type" >&5 - --echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 --if test "${ac_cv_host+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_host_alias=$host_alias --test -z "$ac_cv_host_alias" && -- ac_cv_host_alias=$ac_cv_build_alias --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+host_alias=$host -+case "$host_alias" in -+NONE) -+ case $nonopt in -+ NONE) -+ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : -+ else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } -+ fi ;; -+ *) host_alias=$nonopt ;; -+ esac ;; -+esac - --fi --echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 --host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$host" 1>&6 - -+echo $ac_n "checking target system type""... $ac_c" 1>&6 -+echo "configure:606: checking target system type" >&5 - --echo "$as_me:$LINENO: checking target system type" >&5 --echo $ECHO_N "checking target system type... $ECHO_C" >&6 --if test "${ac_cv_target+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_target_alias=$target_alias --test "x$ac_cv_target_alias" = "x" && -- ac_cv_target_alias=$ac_cv_host_alias --ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+target_alias=$target -+case "$target_alias" in -+NONE) -+ case $nonopt in -+ NONE) target_alias=$host_alias ;; -+ *) target_alias=$nonopt ;; -+ esac ;; -+esac - --fi --echo "$as_me:$LINENO: result: $ac_cv_target" >&5 --echo "${ECHO_T}$ac_cv_target" >&6 --target=$ac_cv_target --target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` -+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$target" 1>&6 - -+echo $ac_n "checking build system type""... $ac_c" 1>&6 -+echo "configure:624: checking build system type" >&5 - --# The aliases save the names the user supplied, while $host etc. --# will get canonicalized. --test -n "$target_alias" && -+build_alias=$build -+case "$build_alias" in -+NONE) -+ case $nonopt in -+ NONE) build_alias=$host_alias ;; -+ *) build_alias=$nonopt ;; -+ esac ;; -+esac -+ -+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$build" 1>&6 -+ -+test "$host_alias" != "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. --set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$CC"; then -- ac_cv_prog_CC="$CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_CC="${ac_tool_prefix}gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done - --fi --fi --CC=$ac_cv_prog_CC --if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "gcc", so it can be a program name with args. -+# Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:649: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi -- --if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. --set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_CC="${ac_tool_prefix}cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="gcc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" - fi - fi --CC=$ac_cv_prog_CC -+CC="$ac_cv_prog_CC" - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ echo "$ac_t""$CC" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi - --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi -- --fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:679: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then -- ac_prog_rejected=yes -- continue -- fi -- ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then -+ ac_prog_rejected=yes -+ continue -+ fi -+ ac_cv_prog_CC="cc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift -- if test $# != 0; then -+ if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift -- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" -+ set dummy "$ac_dir/$ac_word" "$@" -+ shift -+ ac_cv_prog_CC="$@" - fi - fi - fi - fi --CC=$ac_cv_prog_CC -+CC="$ac_cv_prog_CC" - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ echo "$ac_t""$CC" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi - --fi --if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -- do -- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. --set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ if test -z "$CC"; then -+ case "`uname -s`" in -+ *win32* | *WIN32*) -+ # Extract the first word of "cl", so it can be a program name with args. -+set dummy cl; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:730: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="cl" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" - fi - fi --CC=$ac_cv_prog_CC -+CC="$ac_cv_prog_CC" - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ echo "$ac_t""$CC" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi -- -- test -n "$CC" && break -- done --fi --if test -z "$CC"; then -- ac_ct_CC=$CC -- for ac_prog in cl --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -+ ;; -+ esac - fi --done --done -- -+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } - fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi - -- test -n "$ac_ct_CC" && break --done -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:762: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - -- CC=$ac_ct_CC --fi -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross - --fi -+cat > conftest.$ac_ext << EOF - -+#line 773 "configure" -+#include "confdefs.h" - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- --# Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 -- (eval $ac_compiler --version </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 -- (eval $ac_compiler -v </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 -- (eval $ac_compiler -V </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -- --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" --# Try to create an executable without -o first, disregard a.out. --# It will help us diagnose broken compilers, and finding out an intuition --# of exeext. --echo "$as_me:$LINENO: checking for C compiler default output" >&5 --echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -- --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out --do -- test -f "$ac_file" || continue -- case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -- ;; -- [ab].out ) -- # We found the default executable, but exeext='' is most -- # certainly right. -- break;; -- *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -- break;; -- * ) -- break;; -- esac --done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables --See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables --See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } --fi -- --ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 -- --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 --# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cross_compiling=no -+main(){return(0);} -+EOF -+if { (eval echo configure:778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ ac_cv_prog_cc_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_cc_cross=no - else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- fi -+ ac_cv_prog_cc_cross=yes - fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_cc_works=no - fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+rm -fr conftest* -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross - --rm -f a.out a.exe conftest$ac_cv_exeext b.out --ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # If both `conftest.exe' and `conftest' are `present' (well, observable) --# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will --# work properly (i.e., refer to `conftest.exe'), while it won't with --# `rm'. --for ac_file in conftest.exe conftest conftest.*; do -- test -f "$ac_file" || continue -- case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext -- break;; -- * ) break;; -- esac --done --else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -+if test $ac_cv_prog_cc_works = no; then -+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:804: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -+cross_compiling=$ac_cv_prog_cc_cross - --rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -- --rm -f conftest.$ac_ext --EXEEXT=$ac_cv_exeext --ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 --if test "${ac_cv_objext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -+echo "configure:809: checking whether we are using GNU C" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -- case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` -- break;; -- esac --done -+ cat > conftest.c <<EOF -+#ifdef __GNUC__ -+ yes; -+#endif -+EOF -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+ ac_cv_prog_gcc=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ ac_cv_prog_gcc=no - fi -- --rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 --OBJEXT=$ac_cv_objext --ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 --if test "${ac_cv_c_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --int --main () --{ --#ifndef __GNUC__ -- choke me --#endif -+echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_compiler_gnu=yes -+if test $ac_cv_prog_gcc = yes; then -+ GCC=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ GCC= - fi --rm -f conftest.$ac_objext conftest.$ac_ext --ac_cv_c_compiler_gnu=$ac_compiler_gnu - --fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 --GCC=`test $ac_compiler_gnu = yes && echo yes` --ac_test_CFLAGS=${CFLAGS+set} --ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ac_test_CFLAGS="${CFLAGS+set}" -+ac_save_CFLAGS="$CFLAGS" -+CFLAGS= -+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -+echo "configure:837: checking whether ${CC-cc} accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ echo 'void f(){}' > conftest.c -+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_prog_cc_g=no -+fi -+rm -f conftest* - --ac_cv_prog_cc_g=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+ -+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then -- CFLAGS=$ac_save_CFLAGS -+ CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" -@@ -2028,304 +863,37 @@ - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_prog_cc_stdc=no --ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdarg.h> --#include <stdio.h> --#include <sys/types.h> --#include <sys/stat.h> --/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ --struct buf { int x; }; --FILE * (*rcsopen) (struct buf *, struct stat *, int); --static char *e (p, i) -- char **p; -- int i; --{ -- return p[i]; --} --static char *f (char * (*g) (char **, int), char **p, ...) --{ -- char *s; -- va_list v; -- va_start (v,p); -- s = g (p, va_arg (v,int)); -- va_end (v); -- return s; --} --int test (int i, double x); --struct s1 {int (*f) (int a);}; --struct s2 {int (*f) (double a);}; --int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); --int argc; --char **argv; --int --main () --{ --return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -- ; -- return 0; --} --_ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" --do -- CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --fi --rm -f conftest.$ac_objext --done --rm -f conftest.$ac_ext conftest.$ac_objext --CC=$ac_save_CC -- --fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -- *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; --esac -- --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- ''\ -- '#include <stdlib.h>' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdlib.h> --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : -+# Extract the first word of "ranlib", so it can be a program name with args. -+set dummy ranlib; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:871: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --continue --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.$ac_objext conftest.$ac_ext --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. --set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_RANLIB="ranlib" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" - fi - fi --RANLIB=$ac_cv_prog_RANLIB -+RANLIB="$ac_cv_prog_RANLIB" - if test -n "$RANLIB"; then -- echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 -+ echo "$ac_t""$RANLIB" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi - --fi --if test -z "$ac_cv_prog_RANLIB"; then -- ac_ct_RANLIB=$RANLIB -- # Extract the first word of "ranlib", so it can be a program name with args. --set dummy ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_RANLIB"; then -- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_RANLIB="ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" --fi --fi --ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB --if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- RANLIB=$ac_ct_RANLIB --else -- RANLIB="$ac_cv_prog_RANLIB" --fi -- - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or - # incompatible versions: -@@ -2333,306 +901,158 @@ - # SunOS /usr/etc/install - # IRIX /sbin/install - # AIX /bin/install --# AmigaOS /C/install, which installs bootblocks on floppy discs - # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag - # AFS /usr/afsws/bin/install, which mishandles nonexistent args - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -+echo "configure:910: checking for a BSD compatible install" >&5 - if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- # Account for people who put trailing slashes in PATH elements. --case $as_dir/ in -- ./ | .// | /cC/* | \ -- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -- /usr/ucb/* ) ;; -- *) -- # OSF1 and SCO ODT 3.0 have their own names for install. -- # Don't use installbsd from OSF since it installs stuff as root -- # by default. -- for ac_prog in ginstall scoinst install; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -- if test $ac_prog = install && -- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # AIX install. It has an incompatible calling convention. -- : -- elif test $ac_prog = install && -- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # program-specific install script used by HP pwplus--don't use. -- : -- else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -- fi -- fi -+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" -+ for ac_dir in $PATH; do -+ # Account for people who put trailing slashes in PATH elements. -+ case "$ac_dir/" in -+ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; -+ *) -+ # OSF1 and SCO ODT 3.0 have their own names for install. -+ # Don't use installbsd from OSF since it installs stuff as root -+ # by default. -+ for ac_prog in ginstall scoinst install; do -+ if test -f $ac_dir/$ac_prog; then -+ if test $ac_prog = install && -+ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then -+ # AIX install. It has an incompatible calling convention. -+ : -+ else -+ ac_cv_path_install="$ac_dir/$ac_prog -c" -+ break 2 -+ fi -+ fi - done -- done -- ;; --esac --done -+ ;; -+ esac -+ done -+ IFS="$ac_save_IFS" - -- - fi - if test "${ac_cv_path_install+set}" = set; then -- INSTALL=$ac_cv_path_install -+ INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. -- INSTALL=$ac_install_sh -+ INSTALL="$ac_install_sh" - fi - fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -+echo "$ac_t""$INSTALL" 1>&6 - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. - test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - --test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -+if test $host != $build; then -+ ac_tool_prefix=${host_alias}- -+else -+ ac_tool_prefix= -+fi -+ -+# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_AR+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:971: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_AR="${ac_tool_prefix}ar" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar" - fi - fi --AR=$ac_cv_prog_AR -+AR="$ac_cv_prog_AR" - if test -n "$AR"; then -- echo "$as_me:$LINENO: result: $AR" >&5 --echo "${ECHO_T}$AR" >&6 -+ echo "$ac_t""$AR" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi - --fi --if test -z "$ac_cv_prog_AR"; then -- ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_AR+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_AR"; then -- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done - --fi --fi --ac_ct_AR=$ac_cv_prog_ac_ct_AR --if test -n "$ac_ct_AR"; then -- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 --echo "${ECHO_T}$ac_ct_AR" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi - -- AR=$ac_ct_AR -+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -+echo "configure:1001: checking whether byte ordering is bigendian" >&5 -+if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- AR="$ac_cv_prog_AR" --fi -- -- --echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 --echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 --if test "${ac_cv_c_bigendian+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- # See if sys/param.h defines the BYTE_ORDER macro. --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ ac_cv_c_bigendian=unknown -+# See if sys/param.h defines the BYTE_ORDER macro. -+cat > conftest.$ac_ext <<EOF -+#line 1008 "configure" -+#include "confdefs.h" - #include <sys/types.h> - #include <sys/param.h> -+int main() { - --int --main () --{ - #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN - bogus endian macros - #endif -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+; return 0; } -+EOF -+if { (eval echo configure:1019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* - # It does; now see whether it defined to BIG_ENDIAN or not. --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+cat > conftest.$ac_ext <<EOF -+#line 1023 "configure" -+#include "confdefs.h" - #include <sys/types.h> - #include <sys/param.h> -+int main() { - --int --main () --{ - #if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+; return 0; } -+EOF -+if { (eval echo configure:1034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* - ac_cv_c_bigendian=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_c_bigendian=no -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_c_bigendian=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest* - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --# It does not; compile a test program. --if test "$cross_compiling" = yes; then -- # try to guess the endianness by grepping values into an object file -- ac_cv_c_bigendian=unknown -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; --short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; --void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } --short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; --short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; --void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } --int --main () --{ -- _ascii (); _ebcdic (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then -- ac_cv_c_bigendian=yes -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - fi --if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then -- if test "$ac_cv_c_bigendian" = unknown; then -- ac_cv_c_bigendian=no -- else -- # finding both strings is unlikely to happen, but who knows? -- ac_cv_c_bigendian=unknown -- fi --fi -+rm -f conftest* -+if test $ac_cv_c_bigendian = unknown; then -+if test "$cross_compiling" = yes; then -+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.$ac_objext conftest.$ac_ext --else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --int --main () --{ -+ cat > conftest.$ac_ext <<EOF -+#line 1054 "configure" -+#include "confdefs.h" -+main () { - /* Are we little or big endian? From Harbison&Steele. */ - union - { -@@ -2642,52 +1062,31 @@ - u.l = 1; - exit (u.c[sizeof (long) - 1] == 1); - } --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+EOF -+if { (eval echo configure:1067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - ac_cv_c_bigendian=no - else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --ac_cv_c_bigendian=yes -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_c_bigendian=yes - fi --rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -fr conftest* - fi -+ - fi --rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 --echo "${ECHO_T}$ac_cv_c_bigendian" >&6 --case $ac_cv_c_bigendian in -- yes) - --cat >>confdefs.h <<\_ACEOF -+echo "$ac_t""$ac_cv_c_bigendian" 1>&6 -+if test $ac_cv_c_bigendian = yes; then -+ cat >> confdefs.h <<\EOF - #define WORDS_BIGENDIAN 1 --_ACEOF -- ;; -- no) -- ;; -- *) -- { { echo "$as_me:$LINENO: error: unknown endianness --presetting ac_cv_c_bigendian=no (or yes) will help" >&5 --echo "$as_me: error: unknown endianness --presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} -- { (exit 1); exit 1; }; } ;; --esac -+EOF - -+fi - -+ - if test "x$GCC" = "xyes"; then - CFLAGS="$CFLAGS -Wall" - fi -@@ -2697,14 +1096,13 @@ - case "${enableval}" in - yes) shared=true ;; - no) shared=false ;; -- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for shared options" >&5 --echo "$as_me: error: bad value ${enableval} for shared options" >&2;} -- { (exit 1); exit 1; }; } ;; -+ *) { echo "configure: error: bad value ${enableval} for shared options" 1>&2; exit 1; } ;; - esac - else - shared=false --fi; -+fi - -+ - case "$target_cpu" in - i386|i486|i586|i686) - TARGET_CPU=i386 -@@ -2712,7 +1110,7 @@ - *) - TARGET_CPU=$target_cpu - ;; --esac -+esac - TARGET_OS=$target_os - - M68KCC= -@@ -2726,7 +1124,7 @@ - M68KCC=/usr/m68k-palmos/bin/gcc - # Generic build is ARM or M68K (probably ARM though) - CC="/usr/$TARGET_CPU-palmos/bin/gcc" -- if test "$target_cpu" = "arm" -+ if test "$target_cpu" = "arm" - then - CC="$CC -fPIC -march=armv4t" - fi -@@ -2762,7 +1160,7 @@ - *) - HOST_CPU=$host_cpu - ;; --esac -+esac - HOST_OS=$host_os - - -@@ -2800,138 +1198,91 @@ - case "${enableval}" in - yes) sockets=true ;; - no) sockets=false ;; -- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for sockets options" >&5 --echo "$as_me: error: bad value ${enableval} for sockets options" >&2;} -- { (exit 1); exit 1; }; } ;; -+ *) { echo "configure: error: bad value ${enableval} for sockets options" 1>&2; exit 1; } ;; - esac - else - sockets=true --fi; -+fi -+ - if test "$sockets" = false; then -- cat >>confdefs.h <<\_ACEOF -+ cat >> confdefs.h <<\EOF - #define CST_NO_SOCKETS 1 --_ACEOF -+EOF - - fi - --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+cat > conftest.$ac_ext <<EOF -+#line 1216 "configure" -+#include "confdefs.h" - #include <stdio.h> --int --main () --{ -+int main() { - struct a { union { float b; int c; } d; }; -- const struct a e = { .d={ .b=3.14 } }; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ const struct a e = { .d={ .b=3.14 } }; -+; return 0; } -+EOF -+if { (eval echo configure:1224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* - unioninit=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --unioninit=no -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ unioninit=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest* - if test "$unioninit" = no; then -- cat >>confdefs.h <<\_ACEOF -+ cat >> confdefs.h <<\EOF - #define NO_UNION_INITIALIZATION 1 --_ACEOF -+EOF - - fi - --echo "$as_me:$LINENO: checking for mmap" >&5 --echo $ECHO_N "checking for mmap... $ECHO_C" >&6 --if test "${ac_cv_func_mmap+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking for mmap""... $ac_c" 1>&6 -+echo "configure:1242: checking for mmap" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_mmap'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ cat > conftest.$ac_ext <<EOF -+#line 1247 "configure" -+#include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char mmap (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -+ which can conflict with char mmap(); below. */ -+#include <assert.h> - /* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif - /* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char mmap (); -+ builtin and then its argument prototype would still apply. */ -+char mmap(); -+ -+int main() { -+ - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ - #if defined (__stub_mmap) || defined (__stub___mmap) - choke me - #else --char (*f) () = mmap; -+mmap(); - #endif --#ifdef __cplusplus --} --#endif - --int --main () --{ --return f != mmap; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_mmap=yes -+; return 0; } -+EOF -+if { (eval echo configure:1270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_mmap=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_func_mmap=no -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_mmap=no" - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest* - fi --echo "$as_me:$LINENO: result: $ac_cv_func_mmap" >&5 --echo "${ECHO_T}$ac_cv_func_mmap" >&6 --if test $ac_cv_func_mmap = yes; then -+ -+if eval "test \"`echo '$ac_cv_func_'mmap`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - MMAPTYPE=posix -+else -+ echo "$ac_t""no" 1>&6 - fi - - -@@ -2956,1028 +1307,266 @@ - - - AUDIODRIVER=none --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+echo "configure:1312: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- # Double quotes because CPP needs to be expanded -- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -- do -- ac_preproc_ok=false --for ac_c_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -+ # This must be in double quotes, not single quotes, because CPP may get -+ # substituted into the Makefile and "${CC-cc}" will confuse make. -+ CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ # not just through cpp. -+ cat > conftest.$ac_ext <<EOF -+#line 1327 "configure" -+#include "confdefs.h" -+#include <assert.h> -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then - : - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether non-existent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- # Broken: success on invalid input. --continue --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- break --fi -- -- done -- ac_cv_prog_CPP=$CPP -- --fi -- CPP=$ac_cv_prog_CPP --else -- ac_cv_prog_CPP=$CPP --fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 --ac_preproc_ok=false --for ac_c_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -E -traditional-cpp" -+ cat > conftest.$ac_ext <<EOF -+#line 1344 "configure" -+#include "confdefs.h" -+#include <assert.h> -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then - : - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether non-existent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- # Broken: success on invalid input. --continue --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -nologo -E" -+ cat > conftest.$ac_ext <<EOF -+#line 1361 "configure" -+#include "confdefs.h" -+#include <assert.h> -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then - : - else -- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP=/lib/cpp - fi -- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- --echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -- fi -+rm -f conftest* - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep -- -- --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 --if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdlib.h> --#include <stdarg.h> --#include <string.h> --#include <float.h> -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_header_stdc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_header_stdc=no --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- --if test $ac_cv_header_stdc = yes; then -- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <string.h> -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : --else -- ac_cv_header_stdc=no --fi - rm -f conftest* -- - fi -- --if test $ac_cv_header_stdc = yes; then -- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdlib.h> -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : --else -- ac_cv_header_stdc=no --fi - rm -f conftest* -- -+ ac_cv_prog_CPP="$CPP" - fi -- --if test $ac_cv_header_stdc = yes; then -- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -- : -+ CPP="$ac_cv_prog_CPP" - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ctype.h> --#if ((' ' & 0x0FF) == 0x020) --# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) --#else --# define ISLOWER(c) \ -- (('a' <= (c) && (c) <= 'i') \ -- || ('j' <= (c) && (c) <= 'r') \ -- || ('s' <= (c) && (c) <= 'z')) --# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) --#endif -- --#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) --int --main () --{ -- int i; -- for (i = 0; i < 256; i++) -- if (XOR (islower (i), ISLOWER (i)) -- || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); --} --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --ac_cv_header_stdc=no -+ ac_cv_prog_CPP="$CPP" - fi --rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi --fi --fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 --if test $ac_cv_header_stdc = yes; then -+echo "$ac_t""$CPP" 1>&6 - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF -- --fi -- --# On IRIX 5.3, sys/types and inttypes.h are conflicting. -- -- -- -- -- -- -- -- -- --for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -- inttypes.h stdint.h unistd.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ac_safe=`echo "sys/soundcard.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for sys/soundcard.h""... $ac_c" 1>&6 -+echo "configure:1393: checking for sys/soundcard.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- -- --if test "${ac_cv_header_sys_soundcard_h+set}" = set; then -- echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 --echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6 --if test "${ac_cv_header_sys_soundcard_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking sys/soundcard.h usability" >&5 --echo $ECHO_N "checking sys/soundcard.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -+ cat > conftest.$ac_ext <<EOF -+#line 1398 "configure" -+#include "confdefs.h" - #include <sys/soundcard.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking sys/soundcard.h presence" >&5 --echo $ECHO_N "checking sys/soundcard.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <sys/soundcard.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes -+rm -f conftest* - fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- no:yes ) -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: sys/soundcard.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 --echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6 --if test "${ac_cv_header_sys_soundcard_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_sys_soundcard_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6 -- --fi --if test $ac_cv_header_sys_soundcard_h = yes; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - AUDIODRIVER="oss" - AUDIODEFS=-DCST_AUDIO_LINUX -+else -+ echo "$ac_t""no" 1>&6 - fi - -- --if test "${ac_cv_header_machine_soundcard_h+set}" = set; then -- echo "$as_me:$LINENO: checking for machine/soundcard.h" >&5 --echo $ECHO_N "checking for machine/soundcard.h... $ECHO_C" >&6 --if test "${ac_cv_header_machine_soundcard_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_machine_soundcard_h" >&5 --echo "${ECHO_T}$ac_cv_header_machine_soundcard_h" >&6 -+ac_safe=`echo "machine/soundcard.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for machine/soundcard.h""... $ac_c" 1>&6 -+echo "configure:1427: checking for machine/soundcard.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- # Is the header compilable? --echo "$as_me:$LINENO: checking machine/soundcard.h usability" >&5 --echo $ECHO_N "checking machine/soundcard.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -+ cat > conftest.$ac_ext <<EOF -+#line 1432 "configure" -+#include "confdefs.h" - #include <machine/soundcard.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking machine/soundcard.h presence" >&5 --echo $ECHO_N "checking machine/soundcard.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <machine/soundcard.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes -+rm -f conftest* - fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: machine/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- no:yes ) -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: machine/soundcard.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: machine/soundcard.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for machine/soundcard.h" >&5 --echo $ECHO_N "checking for machine/soundcard.h... $ECHO_C" >&6 --if test "${ac_cv_header_machine_soundcard_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_machine_soundcard_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_machine_soundcard_h" >&5 --echo "${ECHO_T}$ac_cv_header_machine_soundcard_h" >&6 -- --fi --if test $ac_cv_header_machine_soundcard_h = yes; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - AUDIODRIVER="oss" - AUDIODEFS=-DCST_AUDIO_FREEBSD -+else -+ echo "$ac_t""no" 1>&6 - fi - -- --if test "${ac_cv_header_sys_audioio_h+set}" = set; then -- echo "$as_me:$LINENO: checking for sys/audioio.h" >&5 --echo $ECHO_N "checking for sys/audioio.h... $ECHO_C" >&6 --if test "${ac_cv_header_sys_audioio_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_audioio_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_audioio_h" >&6 -+ac_safe=`echo "sys/audioio.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for sys/audioio.h""... $ac_c" 1>&6 -+echo "configure:1461: checking for sys/audioio.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- # Is the header compilable? --echo "$as_me:$LINENO: checking sys/audioio.h usability" >&5 --echo $ECHO_N "checking sys/audioio.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -+ cat > conftest.$ac_ext <<EOF -+#line 1466 "configure" -+#include "confdefs.h" - #include <sys/audioio.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking sys/audioio.h presence" >&5 --echo $ECHO_N "checking sys/audioio.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <sys/audioio.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes -+rm -f conftest* - fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: sys/audioio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- no:yes ) -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: sys/audioio.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: sys/audioio.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for sys/audioio.h" >&5 --echo $ECHO_N "checking for sys/audioio.h... $ECHO_C" >&6 --if test "${ac_cv_header_sys_audioio_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_sys_audioio_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_audioio_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_audioio_h" >&6 -- --fi --if test $ac_cv_header_sys_audioio_h = yes; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - AUDIODRIVER="sun" - AUDIODEFS=-DCST_AUDIO_SUNOS -+else -+ echo "$ac_t""no" 1>&6 - fi - -- --if test "${ac_cv_header_mmsystem_h+set}" = set; then -- echo "$as_me:$LINENO: checking for mmsystem.h" >&5 --echo $ECHO_N "checking for mmsystem.h... $ECHO_C" >&6 --if test "${ac_cv_header_mmsystem_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_mmsystem_h" >&5 --echo "${ECHO_T}$ac_cv_header_mmsystem_h" >&6 -+ ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6 -+echo "configure:1495: checking for alsa/asoundlib.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- # Is the header compilable? --echo "$as_me:$LINENO: checking mmsystem.h usability" >&5 --echo $ECHO_N "checking mmsystem.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <mmsystem.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -+ cat > conftest.$ac_ext <<EOF -+#line 1500 "configure" -+#include "confdefs.h" -+#include <alsa/asoundlib.h> -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking mmsystem.h presence" >&5 --echo $ECHO_N "checking mmsystem.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <mmsystem.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes -+rm -f conftest* - fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ AUDIODRIVER="alsa" -+ AUDIODEFS=-DCST_AUDIO_ALSA -+ AUDIOLIBS=-lasound - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no -+ echo "$ac_t""no" 1>&6 - fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: mmsystem.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- no:yes ) -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: mmsystem.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: mmsystem.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for mmsystem.h" >&5 --echo $ECHO_N "checking for mmsystem.h... $ECHO_C" >&6 --if test "${ac_cv_header_mmsystem_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ac_safe=`echo "mmsystem.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for mmsystem.h""... $ac_c" 1>&6 -+echo "configure:1530: checking for mmsystem.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- ac_cv_header_mmsystem_h=$ac_header_preproc -+ cat > conftest.$ac_ext <<EOF -+#line 1535 "configure" -+#include "confdefs.h" -+#include <mmsystem.h> -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --echo "$as_me:$LINENO: result: $ac_cv_header_mmsystem_h" >&5 --echo "${ECHO_T}$ac_cv_header_mmsystem_h" >&6 -- -+rm -f conftest* - fi --if test $ac_cv_header_mmsystem_h = yes; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - AUDIODRIVER="wince" - AUDIODEFS=-DCST_AUDIO_WINCE - AUDIOLIBS=-lwinmm -+else -+ echo "$ac_t""no" 1>&6 - fi - - -- -- - # Check whether --with-audio or --without-audio was given. - if test "${with_audio+set}" = set; then - withval="$with_audio" -- AUDIODRIVER=$with_audio --fi; -+ AUDIODRIVER=$with_audio -+fi - -+ - if test "x$AUDIODEFS" = x; then - case "$AUDIODRIVER" in - linux|oss) -@@ -4006,34 +1595,34 @@ - - - -- - # Check whether --with-lang or --without-lang was given. - if test "${with_lang+set}" = set; then - withval="$with_lang" -- FL_LANG=$with_lang --fi; -+ FL_LANG=$with_lang -+fi -+ - if test "x$with_lang" = "x"; then - FL_LANG="usenglish" - fi - - -- - # Check whether --with-vox or --without-vox was given. - if test "${with_vox+set}" = set; then - withval="$with_vox" -- FL_VOX=$with_vox --fi; -+ FL_VOX=$with_vox -+fi -+ - if test "x$with_vox" = "x"; then - FL_VOX="cmu_us_kal" - fi - - -- - # Check whether --with-lex or --without-lex was given. - if test "${with_lex+set}" = set; then - withval="$with_lex" -- FL_LEX=$with_lex --fi; -+ FL_LEX=$with_lex -+fi -+ - if test "x$with_lex" = "x"; then - FL_LEX="cmulex" - fi -@@ -4041,921 +1630,300 @@ - - - -- ac_config_files="$ac_config_files config/config config/system.mak" --cat >confcache <<\_ACEOF -+trap '' 1 2 15 -+cat > confcache <<\EOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure --# scripts and configure runs, see configure's option --config-cache. --# It is not useful on other systems. If it contains results you don't --# want to keep, you may remove or edit it. -+# scripts and configure runs. It is not useful on other systems. -+# If it contains results you don't want to keep, you may remove or edit it. - # --# config.status only pays attention to the cache file if you give it --# the --recheck option to rerun configure. -+# By default, configure uses ./config.cache as the cache file, -+# creating it if it does not exist already. You can give configure -+# the --cache-file=FILE option to use a different cache file; that is -+# what configure does when it calls configure scripts in -+# subdirectories, so they share the cache. -+# Giving --cache-file=/dev/null disables caching, for debugging configure. -+# config.status only pays attention to the cache file if you give it the -+# --recheck option to rerun configure. - # --# `ac_cv_env_foo' variables (set or unset) will be overridden when --# loading this file, other *unset* `ac_cv_foo' will be assigned the --# following values. -- --_ACEOF -- -+EOF - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. - # So, don't put newlines in cache variables' values. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -- (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \). -- sed -n \ -- "s/'/'\\\\''/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -- *) -- # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -- ;; -- esac; --} | -- sed ' -- t clear -- : clear -- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ -- t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -+(set) 2>&1 | -+ case `(ac_space=' '; set | grep ac_space) 2>&1` in -+ *ac_space=\ *) -+ # `set' does not quote correctly, so add quotes (double-quote substitution -+ # turns \\\\ into \\, and sed turns \\ into \). -+ sed -n \ -+ -e "s/'/'\\\\''/g" \ -+ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" -+ ;; -+ *) -+ # `set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' -+ ;; -+ esac >> confcache -+if cmp -s $cache_file confcache; then -+ : -+else - if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -- cat confcache >$cache_file -+ echo "updating cache $cache_file" -+ cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi - fi - rm -f confcache - -+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 -+ - test "x$prefix" = xNONE && prefix=$ac_default_prefix - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). -+# Any assignment to VPATH causes Sun make to only execute -+# the first set of double-colon rules, so remove it if not needed. -+# If there is a colon in the path, we need to keep it. - if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' -+ ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' - fi - -+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 -+ - # Transform confdefs.h into DEFS. - # Protect against shell expansion while executing Makefile rules. - # Protect against Makefile macro expansion. --# --# If the first sed substitution is executed (which looks for macros that --# take arguments), then we branch to the quote section. Otherwise, --# look for a macro that doesn't take arguments. --cat >confdef2opt.sed <<\_ACEOF --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g --t quote --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g --t quote --d --: quote --s,[ `~#$^&*(){}\\|;'"<>?],\\&,g --s,\[,\\&,g --s,\],\\&,g --s,\$,$$,g --p --_ACEOF --# We use echo to avoid assuming a particular line-breaking character. --# The extra dot is to prevent the shell from consuming trailing --# line-breaks from the sub-command output. A line-break within --# single-quotes doesn't work because, if this script is created in a --# platform that uses two characters for line-breaks (e.g., DOS), tr --# would break. --ac_LF_and_DOT=`echo; echo .` --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` --rm -f confdef2opt.sed -+cat > conftest.defs <<\EOF -+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -+s%\[%\\&%g -+s%\]%\\&%g -+s%\$%$$%g -+EOF -+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -+rm -f conftest.defs - - --ac_libobjs= --ac_ltlibobjs= --for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue -- # 1. Remove the extension, and $U if already installed. -- ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' --done --LIBOBJS=$ac_libobjs -- --LTLIBOBJS=$ac_ltlibobjs -- -- -- -+# Without the "./", some shells look in PATH for config.status. - : ${CONFIG_STATUS=./config.status} --ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF --#! $SHELL --# Generated by $as_me. -+ -+echo creating $CONFIG_STATUS -+rm -f $CONFIG_STATUS -+cat > $CONFIG_STATUS <<EOF -+#! /bin/sh -+# Generated automatically by configure. - # Run this file to recreate the current configuration. -+# This directory was configured as follows, -+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+# -+# $0 $ac_configure_args -+# - # Compiler output produced by configure, useful for debugging --# configure, is in config.log if it exists. -+# configure, is in ./config.log if it exists. - --debug=false --ac_cs_recheck=false --ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_ACEOF -- --cat >>$CONFIG_STATUS <<\_ACEOF --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -- --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix --fi -- --# Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false --fi -- -- --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH --PS1='$ ' --PS2='> ' --PS4='+ ' -- --# NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME -+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -+for ac_option - do -- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -- fi -+ case "\$ac_option" in -+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" -+ exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -+ -version | --version | --versio | --versi | --vers | --ver | --ve | --v) -+ echo "$CONFIG_STATUS generated by autoconf version 2.13" -+ exit 0 ;; -+ -help | --help | --hel | --he | --h) -+ echo "\$ac_cs_usage"; exit 0 ;; -+ *) echo "\$ac_cs_usage"; exit 1 ;; -+ esac - done - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -+ac_given_srcdir=$srcdir -+ac_given_INSTALL="$INSTALL" - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -- as_basename=basename --else -- as_basename=false --fi -+trap 'rm -fr `echo "config/config config/system.mak" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -+EOF -+cat >> $CONFIG_STATUS <<EOF - -+# Protect against being on the right side of a sed subst in config.status. -+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; -+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF -+$ac_vpsub -+$extrasub -+s%@SHELL@%$SHELL%g -+s%@CFLAGS@%$CFLAGS%g -+s%@CPPFLAGS@%$CPPFLAGS%g -+s%@CXXFLAGS@%$CXXFLAGS%g -+s%@FFLAGS@%$FFLAGS%g -+s%@DEFS@%$DEFS%g -+s%@LDFLAGS@%$LDFLAGS%g -+s%@LIBS@%$LIBS%g -+s%@exec_prefix@%$exec_prefix%g -+s%@prefix@%$prefix%g -+s%@program_transform_name@%$program_transform_name%g -+s%@bindir@%$bindir%g -+s%@sbindir@%$sbindir%g -+s%@libexecdir@%$libexecdir%g -+s%@datadir@%$datadir%g -+s%@sysconfdir@%$sysconfdir%g -+s%@sharedstatedir@%$sharedstatedir%g -+s%@localstatedir@%$localstatedir%g -+s%@libdir@%$libdir%g -+s%@includedir@%$includedir%g -+s%@oldincludedir@%$oldincludedir%g -+s%@infodir@%$infodir%g -+s%@mandir@%$mandir%g -+s%@host@%$host%g -+s%@host_alias@%$host_alias%g -+s%@host_cpu@%$host_cpu%g -+s%@host_vendor@%$host_vendor%g -+s%@host_os@%$host_os%g -+s%@target@%$target%g -+s%@target_alias@%$target_alias%g -+s%@target_cpu@%$target_cpu%g -+s%@target_vendor@%$target_vendor%g -+s%@target_os@%$target_os%g -+s%@build@%$build%g -+s%@build_alias@%$build_alias%g -+s%@build_cpu@%$build_cpu%g -+s%@build_vendor@%$build_vendor%g -+s%@build_os@%$build_os%g -+s%@CC@%$CC%g -+s%@RANLIB@%$RANLIB%g -+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -+s%@INSTALL_DATA@%$INSTALL_DATA%g -+s%@AR@%$AR%g -+s%@TARGET_OS@%$TARGET_OS%g -+s%@TARGET_CPU@%$TARGET_CPU%g -+s%@M68KCC@%$M68KCC%g -+s%@LEXDEFS@%$LEXDEFS%g -+s%@VOXDEFS@%$VOXDEFS%g -+s%@HOST_OS@%$HOST_OS%g -+s%@HOST_CPU@%$HOST_CPU%g -+s%@OTHERLIBS@%$OTHERLIBS%g -+s%@SHFLAGS@%$SHFLAGS%g -+s%@MMAPTYPE@%$MMAPTYPE%g -+s%@STDIOTYPE@%$STDIOTYPE%g -+s%@CPP@%$CPP%g -+s%@AUDIODRIVER@%$AUDIODRIVER%g -+s%@AUDIODEFS@%$AUDIODEFS%g -+s%@AUDIOLIBS@%$AUDIOLIBS%g -+s%@FL_LANG@%$FL_LANG%g -+s%@FL_VOX@%$FL_VOX%g -+s%@FL_LEX@%$FL_LEX%g -+s%@EXEEXT@%$EXEEXT%g - --# Name of the executable. --as_me=`$as_basename "$0" || --$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+CEOF -+EOF - -+cat >> $CONFIG_STATUS <<\EOF - --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -- --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -+# Split the substitutions into bite-sized pieces for seds with -+# small command number limits, like on Digital OSF/1 and HP-UX. -+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -+ac_file=1 # Number of current file. -+ac_beg=1 # First line for current file. -+ac_end=$ac_max_sed_cmds # Line after last line for current file. -+ac_more_lines=: -+ac_sed_cmds="" -+while $ac_more_lines; do -+ if test $ac_beg -gt 1; then -+ sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else -- PATH_SEPARATOR=: -+ sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; --esac -- --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -+ if test ! -s conftest.s$ac_file; then -+ ac_more_lines=false -+ rm -f conftest.s$ac_file - else -- as_ln_s='ln -s' -+ if test -z "$ac_sed_cmds"; then -+ ac_sed_cmds="sed -f conftest.s$ac_file" -+ else -+ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" -+ fi -+ ac_file=`expr $ac_file + 1` -+ ac_beg=$ac_end -+ ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln --else -- as_ln_s='cp -p' --fi --rm -f conf$$ conf$$.exe conf$$.file -- --if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: --else -- as_mkdir_p=false --fi -- --as_executable_p="test -f" -- --# Sed expression to map a string onto a valid CPP name. --as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -- --# Sed expression to map a string onto a valid variable name. --as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -- -- --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- --exec 6>&1 -- --# Open the log real soon, to keep \$[0] and so on meaningful, and to --# report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- --This file was extended by $as_me, which was --generated by GNU Autoconf 2.57. Invocation command line was -- -- CONFIG_FILES = $CONFIG_FILES -- CONFIG_HEADERS = $CONFIG_HEADERS -- CONFIG_LINKS = $CONFIG_LINKS -- CONFIG_COMMANDS = $CONFIG_COMMANDS -- $ $0 $@ -- --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 --_ACEOF -- --# Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -- --cat >>$CONFIG_STATUS <<\_ACEOF -- --ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -- --Usage: $0 [OPTIONS] [FILE]... -- -- -h, --help print this help, then exit -- -V, --version print version number, then exit -- -q, --quiet do not print progress messages -- -d, --debug don't remove temporary files -- --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -- --Configuration files: --$config_files -- --Report bugs to <bug-autoconf@gnu.org>." --_ACEOF -- --cat >>$CONFIG_STATUS <<_ACEOF --ac_cs_version="\\ --config.status --configured by $0, generated by GNU Autoconf 2.57, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -- --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. --This config.status script is free software; the Free Software Foundation --gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir --INSTALL="$INSTALL" --_ACEOF -- --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. --ac_need_defaults=: --while test $# != 0 --do -- case $1 in -- --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -- ac_shift=: -- ;; -- -*) -- ac_option=$1 -- ac_optarg=$2 -- ac_shift=shift -- ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; -- esac -- -- case $ac_option in -- # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -- ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -- debug=: ;; -- --file | --fil | --fi | --f ) -- $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -- ac_need_defaults=false;; -- --header | --heade | --head | --hea ) -- $ac_shift -- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -- ac_need_defaults=false;; -- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -- | -silent | --silent | --silen | --sile | --sil | --si | --s) -- ac_cs_silent=: ;; -- -- # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -- -- *) ac_config_targets="$ac_config_targets $1" ;; -- -- esac -- shift - done -- --ac_configure_extra_args= -- --if $ac_cs_silent; then -- exec 6>/dev/null -- ac_configure_extra_args="$ac_configure_extra_args --silent" -+if test -z "$ac_sed_cmds"; then -+ ac_sed_cmds=cat - fi -+EOF - --_ACEOF --cat >>$CONFIG_STATUS <<_ACEOF --if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion --fi -+cat >> $CONFIG_STATUS <<EOF - --_ACEOF -- -- -- -- -- --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_config_target in $ac_config_targets --do -- case "$ac_config_target" in -- # Handling of arguments. -- "config/config" ) CONFIG_FILES="$CONFIG_FILES config/config" ;; -- "config/system.mak" ) CONFIG_FILES="$CONFIG_FILES config/system.mak" ;; -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+CONFIG_FILES=\${CONFIG_FILES-"config/config config/system.mak"} -+EOF -+cat >> $CONFIG_STATUS <<\EOF -+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then -+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -+ case "$ac_file" in -+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` -+ ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; -+ *) ac_file_in="${ac_file}.in" ;; - esac --done - --# If the user did not use the arguments to specify the items to instantiate, --# then the envvar interface is used. Set only those that are not. --# We use the long form for the default assignment because of an extremely --# bizarre bug on SunOS 4.1.3. --if $ac_need_defaults; then -- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files --fi -+ # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - --# Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, --# creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. --$debug || --{ -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 --} -- --# Create a (secure) tmp directory for tmp files. -- --{ -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -- test -n "$tmp" && test -d "$tmp" --} || --{ -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) --} || --{ -- echo "$me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } --} -- --_ACEOF -- --cat >>$CONFIG_STATUS <<_ACEOF -- --# --# CONFIG_FILES section. --# -- --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@build@,$build,;t t --s,@build_cpu@,$build_cpu,;t t --s,@build_vendor@,$build_vendor,;t t --s,@build_os@,$build_os,;t t --s,@host@,$host,;t t --s,@host_cpu@,$host_cpu,;t t --s,@host_vendor@,$host_vendor,;t t --s,@host_os@,$host_os,;t t --s,@target@,$target,;t t --s,@target_cpu@,$target_cpu,;t t --s,@target_vendor@,$target_vendor,;t t --s,@target_os@,$target_os,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@RANLIB@,$RANLIB,;t t --s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t --s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t --s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t --s,@INSTALL_DATA@,$INSTALL_DATA,;t t --s,@AR@,$AR,;t t --s,@ac_ct_AR@,$ac_ct_AR,;t t --s,@TARGET_OS@,$TARGET_OS,;t t --s,@TARGET_CPU@,$TARGET_CPU,;t t --s,@M68KCC@,$M68KCC,;t t --s,@LEXDEFS@,$LEXDEFS,;t t --s,@VOXDEFS@,$VOXDEFS,;t t --s,@HOST_OS@,$HOST_OS,;t t --s,@HOST_CPU@,$HOST_CPU,;t t --s,@OTHERLIBS@,$OTHERLIBS,;t t --s,@SHFLAGS@,$SHFLAGS,;t t --s,@MMAPTYPE@,$MMAPTYPE,;t t --s,@STDIOTYPE@,$STDIOTYPE,;t t --s,@CPP@,$CPP,;t t --s,@EGREP@,$EGREP,;t t --s,@AUDIODRIVER@,$AUDIODRIVER,;t t --s,@AUDIODEFS@,$AUDIODEFS,;t t --s,@AUDIOLIBS@,$AUDIOLIBS,;t t --s,@FL_LANG@,$FL_LANG,;t t --s,@FL_VOX@,$FL_VOX,;t t --s,@FL_LEX@,$FL_LEX,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF -- --_ACEOF -- -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -- fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -+ # Remove last slash and all that follows it. Not all systems have dirname. -+ ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` -+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then -+ # The file is in a subdirectory. -+ test ! -d "$ac_dir" && mkdir "$ac_dir" -+ ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" -+ # A "../" for each directory in $ac_dir_suffix. -+ ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` -+ else -+ ac_dir_suffix= ac_dots= - fi --fi # test -n "$CONFIG_FILES" - --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+ case "$ac_given_srcdir" in -+ .) srcdir=. -+ if test -z "$ac_dots"; then top_srcdir=. -+ else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; -+ /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; -+ *) # Relative path. -+ srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" -+ top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || --$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -+ case "$ac_given_INSTALL" in -+ [/$]*) INSTALL="$ac_given_INSTALL" ;; -+ *) INSTALL="$ac_dots$ac_given_INSTALL" ;; -+ esac - -- ac_builddir=. -- --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -- --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac --# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be --# absolute. --ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` --ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` --ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` -- -- -- case $INSTALL in -- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; -+ echo creating "$ac_file" -+ rm -f "$ac_file" -+ configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." -+ case "$ac_file" in -+ *Makefile*) ac_comsub="1i\\ -+# $configure_input" ;; -+ *) ac_comsub= ;; - esac - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -- else -- configure_input="$ac_file. " -- fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` -+ sed -e "$ac_comsub -+s%@configure_input@%$configure_input%g -+s%@srcdir@%$srcdir%g -+s%@top_srcdir@%$top_srcdir%g -+s%@INSTALL@%$INSTALL%g -+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -+fi; done -+rm -f conftest.s* - -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo $f;; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo $f -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo $srcdir/$f -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } --_ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub --$extrasub --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --:t --/@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --s,@INSTALL@,$ac_INSTALL,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -+EOF -+cat >> $CONFIG_STATUS <<EOF - --done --_ACEOF -+EOF -+cat >> $CONFIG_STATUS <<\EOF - --cat >>$CONFIG_STATUS <<\_ACEOF -- --{ (exit 0); exit 0; } --_ACEOF -+exit 0 -+EOF - chmod +x $CONFIG_STATUS --ac_clean_files=$ac_clean_files_save -+rm -fr confdefs* $ac_clean_files -+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - -- --# configure is writing to config.log, and then calls config.status. --# config.status does its own redirection, appending to config.log. --# Unfortunately, on DOS this fails, as config.log is still kept open --# by configure, so config.status won't be able to write to it; its --# output is simply discarded. So we exec the FD to /dev/null, --# effectively closing config.log, so it can be properly (re)opened and --# appended to by config.status. When coming back to configure, we --# need to make the FD available again. --if test "$no_create" != yes; then -- ac_cs_success=: -- ac_config_status_args= -- test "$silent" = yes && -- ac_config_status_args="$ac_config_status_args --quiet" -- exec 5>/dev/null -- $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false -- exec 5>>config.log -- # Use ||, not &&, to avoid exiting from the if with $? = 1, which -- # would make configure fail if this is the last instruction. -- $ac_cs_success || { (exit 1); exit 1; } --fi -- -Index: configure.in -=================================================================== ---- flite-1.3-release/configure.in (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/configure.in (.../release-1.2) (revision 7) -@@ -206,10 +206,10 @@ - AC_CHECK_HEADER(sys/audioio.h, - [AUDIODRIVER="sun" - AUDIODEFS=-DCST_AUDIO_SUNOS]) --dnl AC_CHECK_HEADER(sys/asoundlib.h, --dnl [AUDIODRIVER="alsa" --dnl AUDIODEFS=-DCST_AUDIO_ALSA --dnl AUDIOLIBS=-lasound]) -+ AC_CHECK_HEADER(alsa/asoundlib.h, -+ [AUDIODRIVER="alsa" -+ AUDIODEFS=-DCST_AUDIO_ALSA -+ AUDIOLIBS=-lasound]) - AC_CHECK_HEADER(mmsystem.h, - [AUDIODRIVER="wince" - AUDIODEFS=-DCST_AUDIO_WINCE -Index: src/hrg/Makefile -=================================================================== ---- flite-1.3-release/src/hrg/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/hrg/Makefile (.../release-1.2) (revision 7) -@@ -39,9 +39,14 @@ - BUILD_DIRS = - ALL_DIRS= - H = -+include $(TOP)/config/config - SRCS = cst_utterance.c cst_relation.c cst_item.c cst_ffeature.c \ - cst_rel_io.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: src/utils/Makefile -=================================================================== ---- flite-1.3-release/src/utils/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/utils/Makefile (.../release-1.2) (revision 7) -@@ -44,8 +44,13 @@ - cst_tokenstream.c cst_val.c cst_features.c \ - cst_endian.c cst_socket.c cst_val_const.c \ - cst_val_user.c cst_args.c -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) $(MMAPTYPE:%=cst_mmap_%.os) \ -+ $(STDIOTYPE:%=cst_file_%.os) -+else - OBJS := $(SRCS:.c=.o) $(MMAPTYPE:%=cst_mmap_%.o) \ - $(STDIOTYPE:%=cst_file_%.o) -+endif - FILES = Makefile $(H) $(SRCS) \ - cst_mmap_posix.c cst_mmap_win32.c cst_mmap_none.c \ - cst_file_stdio.c cst_file_wince.c cst_file_palmos.c -Index: src/audio/au_alsa.c -=================================================================== ---- flite-1.3-release/src/audio/au_alsa.c (.../flite-1.3-orig) (revision 0) -+++ flite-1.3-release/src/audio/au_alsa.c (.../release-1.2) (revision 7) -@@ -0,0 +1,311 @@ -+/*************************************************************************/ -+/* */ -+/* Language Technologies Institute */ -+/* Carnegie Mellon University */ -+/* Copyright (c) 2000 */ -+/* All Rights Reserved. */ -+/* */ -+/* Permission is hereby granted, free of charge, to use and distribute */ -+/* this software and its documentation without restriction, including */ -+/* without limitation the rights to use, copy, modify, merge, publish, */ -+/* distribute, sublicense, and/or sell copies of this work, and to */ -+/* permit persons to whom this work is furnished to do so, subject to */ -+/* the following conditions: */ -+/* 1. The code must retain the above copyright notice, this list of */ -+/* conditions and the following disclaimer. */ -+/* 2. Any modifications must be clearly marked as such. */ -+/* 3. Original authors' names are not deleted. */ -+/* 4. The authors' names are not used to endorse or promote products */ -+/* derived from this software without specific prior written */ -+/* permission. */ -+/* */ -+/* CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK */ -+/* DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING */ -+/* ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT */ -+/* SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE */ -+/* FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES */ -+/* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN */ -+/* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, */ -+/* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF */ -+/* THIS SOFTWARE. */ -+/* */ -+/*********************************************************************** */ -+/* Author: Lukas Loehrer ( */ -+/* Date: January 2005 */ -+/*************************************************************************/ -+/* */ -+/* Native access to alsa audio devices on Linux */ -+/* Tested with libasound version 1.0.10 */ -+/*************************************************************************/ -+ -+#include <stdlib.h> -+#include <unistd.h> -+#include <sys/types.h> -+#include <assert.h> -+#include <errno.h> -+ -+#include "cst_string.h" -+#include "cst_wave.h" -+#include "cst_audio.h" -+ -+#include <alsa/asoundlib.h> -+ -+ -+/*static char *pcm_dev_name = "hw:0,0"; */ -+static char *pcm_dev_name ="default"; -+ -+static inline void print_pcm_state(snd_pcm_t *handle, char *msg) -+{ -+ fprintf(stderr, "PCM state at %s = %s\n", msg, -+ snd_pcm_state_name(snd_pcm_state(handle))); -+} -+ -+cst_audiodev *audio_open_alsa(int sps, int channels, cst_audiofmt fmt) -+{ -+ cst_audiodev *ad; -+ unsigned int real_rate; -+ int err; -+ -+ /* alsa specific stuff */ -+ snd_pcm_t *pcm_handle; -+ snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK; -+ snd_pcm_hw_params_t *hwparams; -+ snd_pcm_format_t format; -+ snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED; -+ -+ /* Allocate the snd_pcm_hw_params_t structure on the stack. */ -+ snd_pcm_hw_params_alloca(&hwparams); -+ -+ /* Open pcm device */ -+ err = snd_pcm_open(&pcm_handle, pcm_dev_name, stream, 0); -+ if (err < 0) -+ { -+ cst_errmsg("audio_open_alsa: failed to open audio device %s. %s\n", -+ pcm_dev_name, snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Init hwparams with full configuration space */ -+ err = snd_pcm_hw_params_any(pcm_handle, hwparams); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to get hardware parameters from audio device. %s\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Set access mode */ -+ err = snd_pcm_hw_params_set_access(pcm_handle, hwparams, access); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set access mode. %s.\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Determine matching alsa sample format */ -+ /* This could be implemented in a more */ -+ /* flexible way (byte order conversion). */ -+ switch (fmt) -+ { -+ case CST_AUDIO_LINEAR16: -+ if (CST_LITTLE_ENDIAN) -+ format = SND_PCM_FORMAT_S16_LE; -+ else -+ format = SND_PCM_FORMAT_S16_BE; -+ break; -+ case CST_AUDIO_LINEAR8: -+ format = SND_PCM_FORMAT_U8; -+ break; -+ case CST_AUDIO_MULAW: -+ format = SND_PCM_FORMAT_MU_LAW; -+ break; -+ default: -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to find suitable format.\n"); -+ return NULL; -+ break; -+ } -+ -+ /* Set samble format */ -+ err = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format); -+ if (err <0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set format. %s.\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Set sample rate near the disired rate */ -+ real_rate = sps; -+ err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &real_rate, 0); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set sample rate near %d. %s.\n", sps, snd_strerror(err)); -+ return NULL; -+ } -+ /*FIXME: This is probably too strict */ -+ assert(sps == real_rate); -+ -+ /* Set number of channels */ -+ assert(channels >0); -+ err = snd_pcm_hw_params_set_channels(pcm_handle, hwparams, channels); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set number of channels to %d. %s.\n", channels, snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Commit hardware parameters */ -+ err = snd_pcm_hw_params(pcm_handle, hwparams); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set hw parameters. %s.\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Make sure the device is ready to accept data */ -+ assert(snd_pcm_state(pcm_handle) == SND_PCM_STATE_PREPARED); -+ -+ /* Write hardware parameters to flite audio device data structure */ -+ ad = cst_alloc(cst_audiodev, 1); -+ assert(ad != NULL); -+ ad->real_sps = ad->sps = sps; -+ ad->real_channels = ad->channels = channels; -+ ad->real_fmt = ad->fmt = fmt; -+ ad->platform_data = (void *) pcm_handle; -+ -+ return ad; -+} -+ -+int audio_close_alsa(cst_audiodev *ad) -+{ -+ int result; -+ snd_pcm_t *pcm_handle; -+ -+ if (ad == NULL) -+ return 0; -+ -+ pcm_handle = (snd_pcm_t *) ad->platform_data; -+ result = snd_pcm_close(pcm_handle); -+ if (result < 0) -+ { -+ cst_errmsg("audio_close_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ cst_free(ad); -+ return result; -+} -+ -+/* Returns zero if recovery was successful. */ -+static int recover_from_error(snd_pcm_t *pcm_handle, ssize_t res) -+{ -+ if (res == -EPIPE) /* xrun */ -+ { -+ res = snd_pcm_prepare(pcm_handle); -+ if (res < 0) -+ { -+ /* Failed to recover from xrun */ -+ cst_errmsg("recover_from_write_error: failed to recover from xrun. %s\n.", snd_strerror(res)); -+ return res; -+ } -+ } -+ else if (res == -ESTRPIPE) /* Suspend */ -+ { -+ while ((res = snd_pcm_resume(pcm_handle)) == -EAGAIN) -+ { -+ snd_pcm_wait(pcm_handle, 1000); -+ } -+ if (res < 0) -+ { -+ res = snd_pcm_prepare(pcm_handle); -+ if (res <0) -+ { -+ /* Resume failed */ -+ cst_errmsg("audio_recover_from_write_error: failed to resume after suspend. %s\n.", snd_strerror(res)); -+ return res; -+ } -+ } -+ } -+ else if (res < 0) -+ { -+ /* Unknown failure */ -+ cst_errmsg("audio_recover_from_write_error: %s.\n", snd_strerror(res)); -+ return res; -+ } -+ return 0; -+} -+ -+int audio_write_alsa(cst_audiodev *ad, void *samples, int num_bytes) -+{ -+ size_t frame_size; -+ ssize_t num_frames, res; -+ snd_pcm_t *pcm_handle; -+ char *buf = (char *) samples; -+ -+ /* Determine frame size in bytes */ -+ frame_size = audio_bps(ad->real_fmt) * ad->real_channels; -+ /* Require that only complete frames are handed in */ -+ assert((num_bytes % frame_size) == 0); -+ num_frames = num_bytes / frame_size; -+ pcm_handle = (snd_pcm_t *) ad->platform_data; -+ -+ while (num_frames > 0) -+ { -+ res = snd_pcm_writei(pcm_handle, buf, num_frames); -+ if (res != num_frames) -+ { -+ if (res == -EAGAIN || (res > 0 && res < num_frames)) -+ { -+ snd_pcm_wait(pcm_handle, 100); -+ } -+ else if (recover_from_error(pcm_handle, res) < 0) -+ { -+ return -1; -+ } -+ } -+ -+ if (res >0) -+ { -+ num_frames -= res; -+ buf += res * frame_size; -+ } -+ } -+ return num_bytes; -+} -+ -+int audio_flush_alsa(cst_audiodev *ad) -+{ -+ int result; -+ result = snd_pcm_drain((snd_pcm_t *) ad->platform_data); -+ if (result < 0) -+ { -+ cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ /* Prepare device for more data */ -+ result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data); -+if (result < 0) -+ { -+ cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ return result; -+} -+ -+int audio_drain_alsa(cst_audiodev *ad) -+{ -+ int result; -+ result = snd_pcm_drop((snd_pcm_t *) ad->platform_data); -+ if (result < 0) -+ { -+ cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+/* Prepare device for more data */ -+ result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data); -+if (result < 0) -+ { -+ cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ return result; -+} -Index: src/audio/Makefile -=================================================================== ---- flite-1.3-release/src/audio/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/audio/Makefile (.../release-1.2) (revision 7) -@@ -43,9 +43,13 @@ - - BASESRCS = auclient.c auserver.c audio.c - SRCS = $(BASESRCS) $(AUDIODRIVER:%=au_%.c) --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(BASESRCS) au_command.c au_none.c \ -- au_oss.c au_sun.c au_wince.c au_palmos.c -+ au_oss.c au_sun.c au_wince.c au_palmos.c au_alsa.c - LIBNAME = flite - - LOCAL_INCLUDES = -I. $(AUDIODEFS) -Index: src/lexicon/Makefile -=================================================================== ---- flite-1.3-release/src/lexicon/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/lexicon/Makefile (.../release-1.2) (revision 7) -@@ -38,8 +38,13 @@ - DIRNAME=src/lexicon - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_lexicon.c cst_lts.c cst_lts_rewrites.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(SRCS) - LIBNAME = flite - -Index: src/synth/Makefile -=================================================================== ---- flite-1.3-release/src/synth/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/synth/Makefile (.../release-1.2) (revision 7) -@@ -38,9 +38,14 @@ - DIRNAME=src/synth - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_synth.c cst_utt_utils.c cst_voice.c cst_phoneset.c \ - flite.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(SRCS) - LIBNAME = flite - -Index: src/speech/Makefile -=================================================================== ---- flite-1.3-release/src/speech/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/speech/Makefile (.../release-1.2) (revision 7) -@@ -39,9 +39,14 @@ - BUILD_DIRS = - ALL_DIRS= - H = -+include $(TOP)/config/config - SRCS = cst_wave.c cst_wave_io.c cst_track.c cst_track_io.c \ - cst_wave_utils.c cst_lpcres.c rateconv.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: src/wavesynth/Makefile -=================================================================== ---- flite-1.3-release/src/wavesynth/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/wavesynth/Makefile (.../release-1.2) (revision 7) -@@ -38,9 +38,14 @@ - DIRNAME=src/wavesynth - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_units.c cst_sigpr.c cst_clunits.c cst_diphone.c \ - cst_sigprFP.c cst_sts.c cst_reflpc.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - LIBNAME = flite - FILES = Makefile $(SRCS) - -Index: src/regex/Makefile -=================================================================== ---- flite-1.3-release/src/regex/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/regex/Makefile (.../release-1.2) (revision 7) -@@ -42,8 +42,13 @@ - DIRNAME=src/regex - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_regex.c regexp.c regsub.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: src/stats/Makefile -=================================================================== ---- flite-1.3-release/src/stats/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/stats/Makefile (.../release-1.2) (revision 7) -@@ -39,8 +39,13 @@ - BUILD_DIRS = - ALL_DIRS= - H = -+include $(TOP)/config/config - SRCS = cst_cart.c cst_viterbi.c cst_ss.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: config/common_make_rules -=================================================================== ---- flite-1.3-release/config/common_make_rules (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/config/common_make_rules (.../release-1.2) (revision 7) -@@ -73,12 +73,13 @@ - ifdef SHFLAGS - SOOBJS = $(OBJS:.o=.os) - FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%) --ifdef LIBNAME --ALL += $(OBJDIR)/.build_so -+#ifdef LIBNAME -+#ALL += $(OBJDIR)/.build_so -+#endif - endif --endif - ifdef LIBNAME - ALL += $(OBJDIR)/.build_lib -+ALL += $(OBJDIR)/.build_so - endif - # Only do some directories when you are not cross compiling - ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM)) -@@ -117,14 +118,17 @@ - @ touch $(OBJDIR)/.build_so - - # Used in the lib/ directory and in building new voices --$(OBJDIR)/%.so: %.shared.a -+#$(OBJDIR)/%.so: %.shared.a -+%.so: %.shared.a - @ echo making $@ - @ rm -rf shared_os && mkdir shared_os - @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} - @ (cd shared_os && ar x ../$<) - @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) -- @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} -- @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ -+ #@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} -+ #@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ -+ @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} -+ @ ln -s $@.${PROJECT_SHLIB_VERSION} $@ - @ rm -rf shared_os - - $(OBJDIR)/.make_build_dirs: -Index: lib/Makefile -=================================================================== ---- flite-1.3-release/lib/Makefile (.../flite-1.3-orig) (revision 0) -+++ flite-1.3-release/lib/Makefile (.../release-1.2) (revision 7) -@@ -0,0 +1,70 @@ -+########################################################################### -+## ## -+## Language Technologies Institute ## -+## Carnegie Mellon University ## -+## Copyright (c) 1999 ## -+## All Rights Reserved. ## -+## ## -+## Permission is hereby granted, free of charge, to use and distribute ## -+## this software and its documentation without restriction, including ## -+## without limitation the rights to use, copy, modify, merge, publish, ## -+## distribute, sublicense, and/or sell copies of this work, and to ## -+## permit persons to whom this work is furnished to do so, subject to ## -+## the following conditions: ## -+## 1. The code must retain the above copyright notice, this list of ## -+## conditions and the following disclaimer. ## -+## 2. Any modifications must be clearly marked as such. ## -+## 3. Original authors' names are not deleted. ## -+## 4. The authors' names are not used to endorse or promote products ## -+## derived from this software without specific prior written ## -+## permission. ## -+## ## -+## CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK ## -+## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## -+## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## -+## SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE ## -+## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## -+## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## -+## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## -+## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## -+## THIS SOFTWARE. ## -+## ## -+########################################################################### -+## ## -+## FLITE libraries ## -+## ## -+########################################################################### -+TOP=.. -+DIRNAME=lib -+BUILD_DIRS = -+ALL_DIRS= -+FILES = Makefile -+LIBNAMES = flite flite_cmulex flite_usenglish \ -+ flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb -+ -+STATICLIBS= $(LIBNAMES:%=lib%.a) -+SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a) -+#SHAREDLIBS = $(LIBNAMES:%=lib%.so) -+SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so) -+VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \ -+ $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION}) -+ALL_LIBS = $(STATICLIBS) $(SHAREDLIBS) $(VERSIONSHAREDLIBS) -+ -+ALL = shared_libs -+ -+LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION} -+ -+include $(TOP)/config/common_make_rules -+ -+ifdef SHFLAGS -+shared_libs: $(SHAREDLIBS) -+else -+shared_libs: nothing -+endif -+ -+install: -+ @ cp -vf $(LIBDIR)/* . -+ @ $(MAKE) shared_libs -+ @ echo ARLIBS: $(SHAREDARLIBS) -+ @ echo SHARLIBS: $(SHAREDLIBS) -+ @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -) diff --git a/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-oe/recipes-support/fltk/fltk-native.bb index 2636287e3a..322a28430f 100644 --- a/meta-oe/recipes-support/fltk/fltk-native.bb +++ b/meta-oe/recipes-support/fltk/fltk-native.bb @@ -2,6 +2,10 @@ require ${BPN}.inc DEPENDS = "zlib-native jpeg-native libpng-native libxext-native libxft-native" +SRC_URI += "file://fltk-native-link-libdl.patch" + +UPSTREAM_CHECK_URI = "https://www.fltk.org/software.php" + inherit native EXTRA_OECMAKE += " \ @@ -9,13 +13,13 @@ EXTRA_OECMAKE += " \ -DOPTION_USE_THREADS=OFF \ -DOPTION_USE_XDBE=OFF \ -DOPTION_USE_XFT=OFF \ - -DOPTION_BUILD_EXAMPLES=OFF \ + -DFLTK_BUILD_TEST=OFF \ -DOPTION_USE_XINERAMA=OFF \ -DOPTION_USE_XFIXES=OFF \ -DOPTION_USE_XCURSOR=OFF \ " -do_install_append() { +do_install:append() { # make sure native fltk-config is not used accidentaly rm -f ${D}${bindir}/fltk-config } diff --git a/meta-oe/recipes-support/fltk/fltk.bb b/meta-oe/recipes-support/fltk/fltk.bb index 6a3d1c9f93..4278a2fa3d 100644 --- a/meta-oe/recipes-support/fltk/fltk.bb +++ b/meta-oe/recipes-support/fltk/fltk.bb @@ -2,13 +2,17 @@ require ${BPN}.inc DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" -inherit binconfig lib_package gtk-icon-cache mime +inherit features_check binconfig lib_package gtk-icon-cache mime mime-xdg +REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += "file://0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch" +SRC_URI += "file://0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch" + +UPSTREAM_CHECK_URI = "https://www.fltk.org/software.php" EXTRA_OECMAKE = " \ -DOPTION_BUILD_SHARED_LIBS=ON \ -DOPTION_USE_THREADS=ON \ + -DFLTK_BUILD_TEST=OFF \ -DOPTION_USE_XDBE=ON \ -DOPTION_USE_XFT=ON \ -DFLTK_CONFIG_PATH=${libdir}/cmake \ @@ -16,22 +20,31 @@ EXTRA_OECMAKE = " \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" -PACKAGECONFIG[examples] = "-DOPTION_BUILD_EXAMPLES=ON,-DOPTION_BUILD_EXAMPLES=OFF," PACKAGECONFIG[cairo] = "-DOPTION_CAIRO=ON,-DOPTION_CAIRO=OFF,cairo" PACKAGECONFIG[opengl] = "-DOPTION_USE_GL=ON,-DOPTION_USE_GL=OFF,virtual/libgl" PACKAGECONFIG[xinerama] = "-DOPTION_USE_XINERAMA=ON,-DOPTION_USE_XINERAMA=OFF,libxinerama" PACKAGECONFIG[xfixes] = "-DOPTION_USE_XFIXES=ON,-DOPTION_USE_XFIXES=OFF,libxfixes" PACKAGECONFIG[xcursor] = "-DOPTION_USE_XCURSOR=ON,-DOPTION_USE_XCURSOR=OFF,libxcursor" -do_install_append() { - sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${bindir}/fltk-config +do_install:append() { + sed -i -e 's,${TMPDIR},,g' ${D}${bindir}/fltk-config + sed -i -e 's,${TMPDIR},,g' ${D}${datadir}/fltk/UseFLTK.cmake + sed -i -e 's,${TMPDIR},,g' ${D}${datadir}/fltk/FLTK-Targets.cmake } -python populate_packages_prepend () { +python populate_packages:prepend () { if (d.getVar('DEBIAN_NAMES')): - d.setVar('PKG_${BPN}', 'libfltk${PV}') + d.setVar('PKG:${BPN}', 'libfltk${PV}') } LEAD_SONAME = "libfltk.so" -FILES_${PN} += "${datadir}/mime" +# .desktop / icons / mime only necessary for fluid app +FILES:${PN}-bin += " \ + ${datadir}/applications \ + ${datadir}/icons \ + ${datadir}/mime \ +" + +# cmake files +FILES:${PN}-dev += "${datadir}/fltk" diff --git a/meta-oe/recipes-support/fltk/fltk.inc b/meta-oe/recipes-support/fltk/fltk.inc index dbe700af01..0b2921095c 100644 --- a/meta-oe/recipes-support/fltk/fltk.inc +++ b/meta-oe/recipes-support/fltk/fltk.inc @@ -1,20 +1,18 @@ SUMMARY = "FLTK is a cross-platform C++ GUI toolkit" HOMEPAGE = "http://www.fltk.org" SECTION = "libs" -LICENSE = "LGPLv2 & FLTK" +LICENSE = "LGPL-2.0-only & FLTK" LIC_FILES_CHKSUM = "file://COPYING;md5=f6b26344a24a941a01a5b0826e80b5ca" SRC_URI = " \ - http://fltk.org/pub/fltk/1.3.4/${BP}-source.tar.gz \ + http://fltk.org/pub/fltk/${PV}/${BP}-source.tar.bz2 \ file://disable_test.patch \ - file://fltk-no-freetype-config.patch \ file://0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch \ file://0002-always-build-fluid-and-export-pointers.patch \ " -PV = "1.3.4-1" -SRC_URI[md5sum] = "d7fcd27ab928648e1a1366dd2e273970" -SRC_URI[sha256sum] = "7fb2c8882433ce694e6900c94fda505e8f4ed3fa9c7e597007098a33b85c53f4" +PV = "1.3.9" +SRC_URI[sha256sum] = "103441134915402808fd45424d4061778609437e804334434e946cfd26b196c2" inherit cmake pkgconfig diff --git a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch index e6e68a0cb8..0d47dac2dd 100644 --- a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch +++ b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch @@ -16,6 +16,8 @@ Content-Transfer-Encoding: 8bit | ^ | src/CMakeFiles/fltk.dir/build.make:1217: recipe for target 'src/CMakeFiles/fltk.dir/Fl_Preferences.cxx.o' failed +Upstream-Status: Pending + Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- src/Fl_Preferences.cxx | 2 +- diff --git a/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch b/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch index cca977c66d..0d91aab3a1 100644 --- a/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch +++ b/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch @@ -1,6 +1,6 @@ From 16010cb1a69ea2326d8102b7f1e34b65aca4b278 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 28 Feb 2017 01:20:42 +0100 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 22 May 2021 12:33:15 +0200 Subject: [PATCH] always build fluid and export pointers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -8,24 +8,24 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- CMake/export.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/export.cmake b/CMake/export.cmake -index 968186a..95e04eb 100644 +index 6e8bc5d..71b6f6c 100644 --- a/CMake/export.cmake +++ b/CMake/export.cmake -@@ -21,7 +21,7 @@ - # final config and export +@@ -20,7 +20,7 @@ ####################################################################### + # Set the fluid executable path --if(CMAKE_CROSSCOMPILING) -+if(FALSE) - find_file(FLUID_PATH - NAMES fluid fluid.exe - PATHS ENV PATH +-if (CMAKE_CROSSCOMPILING) ++if (FALSE) + find_file(FLUID_PATH + NAMES fluid fluid.exe + PATHS ENV PATH -- -2.9.3 +2.31.1 diff --git a/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch b/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch deleted file mode 100644 index 1f2f8aecf7..0000000000 --- a/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch +++ /dev/null @@ -1,41 +0,0 @@ -From bc38fb41044503c9debf5710910c51dd29674b6a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Fri, 15 Dec 2017 22:14:01 +0100 -Subject: [PATCH] CMake build: Force shared libs with unsuffixed names -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -For windows build sake CMake complains when a project wants to build shared and -static libraries with same name. This caused the authors of fltk to generate -libraries with names suffixed by '_SHARED' when building fltk with cmake - -autotools builds do not suffix. - -Reasons to build shared libs with correct names: - -* Shared libraries are the preferred choice for embedded devices -* There are projects (e.g yoshimi) expecting shared libraries with unsuffixed - names - as created by autotools build. These projects link against static - libraries by accident causing unusable binaries. - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - CMake/macros.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMake/macros.cmake b/CMake/macros.cmake -index 4def62d..ab675f0 100644 ---- a/CMake/macros.cmake -+++ b/CMake/macros.cmake -@@ -49,7 +49,7 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES) - PROPERTIES - VERSION ${FLTK_VERSION_FULL} - SOVERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} -- PREFIX "lib" # for MSVC static/shared coexistence -+ OUTPUT_NAME ${LIBNAME} CLEAN_DIRECT_OUTPUT 1 - ) - endif (${LIBTYPE} STREQUAL "SHARED") - --- -2.9.5 - diff --git a/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch b/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch new file mode 100644 index 0000000000..72bb48a32c --- /dev/null +++ b/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch @@ -0,0 +1,42 @@ +From b6985abcb03fb09685da4044963e8f085035b208 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 19 Aug 2021 08:06:45 +0200 +Subject: [PATCH] fluid/CMakeLists.txt: Do not export fluid target +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It does not work for us: The executable 'fluid' is not installed in +receipe-sysroot. So fltk cmake config contains an invalid reference. +Consumers of fltk using cmake will fail during configure for this invalid +reference with something like: + +| CMake Error at <...>/recipe-sysroot/usr/share/fltk/FLTK-Targets.cmake:129 (message): +| The imported target "fluid" references the file +| +| "<...>/recipe-sysroot/usr/bin/fluid" +| +| but this file does not exist. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + fluid/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt +index 472c84c..f971121 100644 +--- a/fluid/CMakeLists.txt ++++ b/fluid/CMakeLists.txt +@@ -86,7 +86,6 @@ if (APPLE AND (NOT OPTION_APPLE_X11)) + install (TARGETS fluid DESTINATION ${FLTK_BINDIR}) + else() + install (TARGETS fluid +- EXPORT FLTK-Targets + RUNTIME DESTINATION ${FLTK_BINDIR} + LIBRARY DESTINATION ${FLTK_LIBDIR} + ARCHIVE DESTINATION ${FLTK_LIBDIR} +-- +2.31.1 + diff --git a/meta-oe/recipes-support/fltk/fltk/disable_test.patch b/meta-oe/recipes-support/fltk/fltk/disable_test.patch index 1f5fd25e04..fe8be5a652 100644 --- a/meta-oe/recipes-support/fltk/fltk/disable_test.patch +++ b/meta-oe/recipes-support/fltk/fltk/disable_test.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/Makefile.orig 2015-11-26 15:35:31.485357862 +0800 +++ b/Makefile 2015-11-26 15:35:37.037357764 +0800 @@ -18,7 +18,7 @@ diff --git a/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch b/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch new file mode 100644 index 0000000000..e140ce2166 --- /dev/null +++ b/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch @@ -0,0 +1,44 @@ +Upstream-Status: Inappropriate [cross build specific] + +It fails to build fltk-native on Ubuntu 20.04 with glibc 2.31: + +| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `fl_dlopen(char const*, char const*)': +| Fl_Native_File_Chooser.cxx:(.text+0x61a): undefined reference to `dlopen' +| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `Fl_GTK_File_Chooser::probe_for_GTK_libs()': +| Fl_Native_File_Chooser.cxx:(.text+0xf92): undefined reference to `dlerror' + +The original fix in fltk-native recipe does not work any more because '-ldl' +appears before lib/libfltk.a and causes dlopen() unresolved. The reason why it +doesn't fail on other hosts is that the functions dlopen(), dlerror() etc. have +been moved to libc.so since glibc 2.34 via the commits in glibc: + +0c1c3a771e dlfcn: Move dlopen into libc +add8d7ea01 dlfcn: Move dlvsym into libc +6dfc0207eb dlfcn: Move dlinfo into libc +492560a32e dlfcn: Move dladdr1 into libc +6a1ed32789 dlfcn: Move dlmopen into libc +77f876c0e3 dlfcn: Move dlsym into libc +602252b553 dlfcn: Move dladdr into libc +d8cce17d2a dlfcn: Move dlclose into libc + +Append 'dl' to fltk link items explictly to fix the error. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d153b1c..0fe5c11 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -306,7 +306,7 @@ endif (USE_XFT) + ####################################################################### + + FL_ADD_LIBRARY (fltk STATIC "${STATIC_FILES}") +-target_link_libraries (fltk ${OPTIONAL_LIBS}) ++target_link_libraries (fltk ${OPTIONAL_LIBS} dl) + + ####################################################################### + diff --git a/meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch b/meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch deleted file mode 100644 index 2a9915bea7..0000000000 --- a/meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 699420d306cadbb5285942e09f4383d84b01985d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 13 Jan 2017 13:21:23 +0100 -Subject: [PATCH] replace freetype-config by pkg-config -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f0efd48..3af5ecb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1006,12 +1006,12 @@ case $host_os_gui in - - xft_found=no - if test x$enable_xft != xno; then -- AC_PATH_PROG(FTCONFIG, freetype-config) -+ AC_PATH_PROG(PKGCONFIG,pkg-config) - -- if test "x$FTCONFIG" != x; then -- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS" -- CFLAGS="`$FTCONFIG --cflags` $CFLAGS" -- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS" -+ if test "x$PKGCONFIG" != x; then -+ CPPFLAGS="`$PKGCONFIG --cflags xft` $CPPFLAGS" -+ CFLAGS="`$PKGCONFIG --cflags xft` $CFLAGS" -+ CXXFLAGS="`$PKGCONFIG --cflags xft` $CXXFLAGS" - - AC_CHECK_LIB(fontconfig, FcPatternCreate) - AC_CHECK_HEADER(X11/Xft/Xft.h, --- -2.7.4 - diff --git a/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-undeclared-function-errors.patch b/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-undeclared-function-errors.patch new file mode 100644 index 0000000000..43e905f33a --- /dev/null +++ b/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-undeclared-function-errors.patch @@ -0,0 +1,48 @@ +From 3018aa9822c680663ebd19542bcd757dc9baf20a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 8 Sep 2024 20:16:49 -0700 +Subject: [PATCH] Fix undeclared function errors + +e.g. + +ipmi-sel-string-supermicro-x10dimm-common.c:87:14: error: call to undeclared function 'sel_string_output_supermicro_dimm_event_d + | 87 | if ((ret = sel_string_output_supermicro_dimm_event_data2_event_data3 (ctx, + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/freeipmi-devel/2024-09/msg00001.html] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ipmi-sensors/ipmi-sensors-oem-intel.c | 1 + + libfreeipmi/sel/ipmi-sel-string-supermicro-common.h | 9 +++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/ipmi-sensors/ipmi-sensors-oem-intel.c b/ipmi-sensors/ipmi-sensors-oem-intel.c +index 5e0f373..872a730 100644 +--- a/ipmi-sensors/ipmi-sensors-oem-intel.c ++++ b/ipmi-sensors/ipmi-sensors-oem-intel.c +@@ -36,6 +36,7 @@ + #include "ipmi-sensors-oem-intel-s2600jf.h" + #include "ipmi-sensors-oem-intel-quanta-qssc-s4r.h" + #include "ipmi-sensors-oem-intel-node-manager.h" ++#include "ipmi-sensors-oem-intel-s2600wp.h" + + #include "freeipmi-portability.h" + #include "pstdout.h" +diff --git a/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h b/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h +index 5785f2b..9e29bd6 100644 +--- a/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h ++++ b/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h +@@ -39,4 +39,13 @@ int sel_string_output_supermicro_overheat_event_data1_class_oem (ipmi_sel_ctx_t + unsigned int *wlen, + struct ipmi_sel_system_event_record_data *system_event_record_data); + ++int sel_string_output_supermicro_dimm_event_data2_event_data3 (ipmi_sel_ctx_t ctx, ++ struct ipmi_sel_entry *sel_entry, ++ uint8_t sel_record_type, ++ char *buf, ++ unsigned int buflen, ++ unsigned int flags, ++ unsigned int *wlen, ++ struct ipmi_sel_system_event_record_data *system_event_record_data, ++ int *oem_rv); + #endif /* IPMI_SEL_STRING_SUPERMICRO_COMMON_H */ diff --git a/meta-oe/recipes-support/freeipmi/freeipmi_1.6.14.bb b/meta-oe/recipes-support/freeipmi/freeipmi_1.6.14.bb new file mode 100644 index 0000000000..e9b28cee38 --- /dev/null +++ b/meta-oe/recipes-support/freeipmi/freeipmi_1.6.14.bb @@ -0,0 +1,26 @@ +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ZRESEARCH;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.bmc-watchdog;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmi-dcmi;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmi-fru;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmiconsole;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmidetect;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmimonitoring;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmiping;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmipower;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmiseld;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.pstdout;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.sunbmc;md5=c03f21cd76ff5caba6b890d1213cbfbb" + +SRC_URI = "${GNU_MIRROR}/freeipmi/freeipmi-${PV}.tar.gz \ + file://0001-Fix-undeclared-function-errors.patch" +SRC_URI[sha256sum] = "1a3dac5c76b7ccc4d4f86aa12b8ef9b212baef7489bf05e899b89abb7e14edb5" + +DEPENDS = "libgcrypt" +DEPENDS:append:libc-musl = " argp-standalone" + +inherit pkgconfig autotools + +EXTRA_OECONF = "--without-random-device" + diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch new file mode 100644 index 0000000000..87a456d16d --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch @@ -0,0 +1,57 @@ +From 761b4df04a141cc8c9507c741e4046c6c6b00491 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Mon, 11 Sep 2023 09:00:39 +0000 +Subject: [PATCH] Fix const qualifier error + +Fixes clang error +error: incompatible function pointer types assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(void *)') from 'void *(const void *)' [-Wincompatible-function-pointer-types] +| obj->fnObjectNew = uwac_event_clone; +| ^ ~~~~~~~~~~~~~~~~ + +https://github.com/FreeRDP/FreeRDP/commit/6e3c00725aae99d03a0baa65430eceddebd9dee8 +Upstream-Status: Backport + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + libfreerdp/codec/rfx.c | 4 ++-- + winpr/include/winpr/collections.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c +index ccbc5af..eec7365 100644 +--- a/libfreerdp/codec/rfx.c ++++ b/libfreerdp/codec/rfx.c +@@ -153,7 +153,7 @@ static void rfx_tile_init(void* obj) + } + } + +-static void* rfx_decoder_tile_new(void* val) ++static void* rfx_decoder_tile_new(const void* val) + { + RFX_TILE* tile = NULL; + WINPR_UNUSED(val); +@@ -184,7 +184,7 @@ static void rfx_decoder_tile_free(void* obj) + } + } + +-static void* rfx_encoder_tile_new(void* val) ++static void* rfx_encoder_tile_new(const void* val) + { + WINPR_UNUSED(val); + return calloc(1, sizeof(RFX_TILE)); +diff --git a/winpr/include/winpr/collections.h b/winpr/include/winpr/collections.h +index 807f011..b8c8d9d 100644 +--- a/winpr/include/winpr/collections.h ++++ b/winpr/include/winpr/collections.h +@@ -36,7 +36,7 @@ extern "C" + { + #endif + +- typedef void* (*OBJECT_NEW_FN)(void* val); ++ typedef void* (*OBJECT_NEW_FN)(const void* val); + typedef void (*OBJECT_INIT_FN)(void* obj); + typedef void (*OBJECT_UNINIT_FN)(void* obj); + typedef void (*OBJECT_FREE_FN)(void* obj); +-- +2.34.1 + diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch deleted file mode 100644 index a567cba925..0000000000 --- a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 368989526c32cdf9d680a397fede3cb773fa2609 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Fri, 28 Jul 2017 16:31:41 -0400 -Subject: [PATCH] Fix gstreamer-1.0 detection - -Upstream State: Backport - ---- - cmake/FindGStreamer_1_0.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake -index 3aa8fc6..6fbc0ec 100644 ---- a/cmake/FindGStreamer_1_0.cmake -+++ b/cmake/FindGStreamer_1_0.cmake -@@ -59,7 +59,7 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library) - - string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}") - if ("${CMAKE_MATCH_2}" STREQUAL "") -- pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}") -+ pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GSTREAMER_1_0_MINIMUM_VERSION}") - else () - pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name}) - endif () --- -2.7.4 - diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch new file mode 100644 index 0000000000..62600cddab --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch @@ -0,0 +1,72 @@ +From 130094de3244d5039e463e1142e1ec487c1104ef Mon Sep 17 00:00:00 2001 +From: Armin Novak <armin.novak@thincast.com> +Date: Tue, 22 Feb 2022 12:05:08 +0100 +Subject: [PATCH] Fixed compilation warnings in ainput channel + +Upstream-Status: Backport [130094de3 Fixed compilation warnings in ainput channel] +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- + channels/ainput/server/ainput_main.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/channels/ainput/server/ainput_main.c b/channels/ainput/server/ainput_main.c +index bc1737ee1..17d2ec681 100644 +--- a/channels/ainput/server/ainput_main.c ++++ b/channels/ainput/server/ainput_main.c +@@ -192,7 +192,7 @@ static UINT ainput_server_recv_mouse_event(ainput_server* ainput, wStream* s) + + static HANDLE ainput_server_get_channel_handle(ainput_server* ainput) + { +- BYTE* buffer = NULL; ++ void* buffer = NULL; + DWORD BytesReturned = 0; + HANDLE ChannelEvent = NULL; + +@@ -389,7 +389,7 @@ ainput_server_context* ainput_server_context_new(HANDLE vcm) + goto fail; + return &ainput->context; + fail: +- ainput_server_context_free(ainput); ++ ainput_server_context_free(&ainput->context); + return NULL; + } + +@@ -496,17 +496,23 @@ UINT ainput_server_context_poll_int(ainput_server_context* context) + break; + case AINPUT_OPENED: + { +- BYTE* buffer = NULL; ++ union ++ { ++ BYTE* pb; ++ void* pv; ++ } buffer; + DWORD BytesReturned = 0; + +- if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer, ++ buffer.pv = NULL; ++ ++ if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer.pv, + &BytesReturned) != TRUE) + { + WLog_ERR(TAG, "WTSVirtualChannelReady failed,"); + } + else + { +- if (*buffer != 0) ++ if (*buffer.pb != 0) + { + error = ainput_server_send_version(ainput); + if (error) +@@ -518,7 +524,7 @@ UINT ainput_server_context_poll_int(ainput_server_context* context) + else + error = CHANNEL_RC_OK; + } +- WTSFreeMemory(buffer); ++ WTSFreeMemory(buffer.pv); + } + break; + case AINPUT_VERSION_SENT: +-- +2.43.0 + diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch new file mode 100644 index 0000000000..7fae2703f8 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch @@ -0,0 +1,27 @@ +From 75fa1fa5bd5ef2350390564245fd0984209ac092 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 4 Jul 2022 14:34:46 +0200 +Subject: [PATCH] Fixed compilation warnings + +Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/2da280b8a1748052b70b3f5a1ef0d8e932c33adc] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + client/X11/xf_graphics.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c +index 5aa1fd48b..fe81e0ed9 100644 +--- a/client/X11/xf_graphics.c ++++ b/client/X11/xf_graphics.c +@@ -438,7 +438,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer) + + #endif + fail: +- WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : -1); ++ WLog_DBG(TAG, "%s: %p", __func__, rc ? pointer : NULL); + return rc; + } + +-- +2.45.0 + diff --git a/meta-oe/recipes-support/freerdp/freerdp/0002-Do-not-install-tools-a-CMake-targets.patch b/meta-oe/recipes-support/freerdp/freerdp/0002-Do-not-install-tools-a-CMake-targets.patch new file mode 100644 index 0000000000..2e5e6a4240 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0002-Do-not-install-tools-a-CMake-targets.patch @@ -0,0 +1,45 @@ +From 0ddaeae351295e48365657482f165652051bbca2 Mon Sep 17 00:00:00 2001 +From: Andreas Cord-Landwehr <cordlandwehr@kde.org> +Date: Wed, 17 Jan 2024 20:00:58 +0100 +Subject: [PATCH] Do not install tools a CMake targets + +The cli tools are installed manually and thus are missing in the sysroot +folder. Do not export their targets because they do not exist and make +CMake fail when searching for the library. + +Upstream-Status: Inappropriate +Signed-off-by: Andreas Cord-Landwehr <cordlandwehr@kde.org> +--- + winpr/tools/hash-cli/CMakeLists.txt | 2 +- + winpr/tools/makecert-cli/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/winpr/tools/hash-cli/CMakeLists.txt b/winpr/tools/hash-cli/CMakeLists.txt +index 9f8c7a8a0..b6d048fec 100644 +--- a/winpr/tools/hash-cli/CMakeLists.txt ++++ b/winpr/tools/hash-cli/CMakeLists.txt +@@ -43,7 +43,7 @@ set(${MODULE_PREFIX}_LIBS winpr) + + target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) + +-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets) ++install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools) + + if (WITH_DEBUG_SYMBOLS AND MSVC) + install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols) +diff --git a/winpr/tools/makecert-cli/CMakeLists.txt b/winpr/tools/makecert-cli/CMakeLists.txt +index 48fda5b5e..c7cf4bfaf 100644 +--- a/winpr/tools/makecert-cli/CMakeLists.txt ++++ b/winpr/tools/makecert-cli/CMakeLists.txt +@@ -46,7 +46,7 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} winpr) + + set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools") + +-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets) ++install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools) + if (WITH_DEBUG_SYMBOLS AND MSVC) + install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols) + endif() +-- +2.40.1 + diff --git a/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch b/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch index 0d7dcc28d7..914f08087b 100644 --- a/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch +++ b/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch @@ -9,16 +9,18 @@ Update it for 2.0.0. Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh> Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + winpr/tools/makecert-cli/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/winpr/tools/makecert-cli/CMakeLists.txt b/winpr/tools/makecert-cli/CMakeLists.txt -index 74afa09..8d00ef1 100644 ---- a/winpr/tools/makecert-cli/CMakeLists.txt -+++ b/winpr/tools/makecert-cli/CMakeLists.txt +Index: git/winpr/tools/makecert-cli/CMakeLists.txt +=================================================================== +--- git.orig/winpr/tools/makecert-cli/CMakeLists.txt ++++ git/winpr/tools/makecert-cli/CMakeLists.txt @@ -44,6 +44,9 @@ set(${MODULE_PREFIX}_LIBS winpr-tools) - target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) + target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} winpr) +set_target_properties(${MODULE_NAME} PROPERTIES + BUILD_WITH_INSTALL_RPATH 1) @@ -26,6 +28,3 @@ index 74afa09..8d00ef1 100644 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools") install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets) --- -2.7.4 - diff --git a/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb new file mode 100644 index 0000000000..b6974af739 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb @@ -0,0 +1,61 @@ +DESCRIPTION = "FreeRDP RDP client & server library" +HOMEPAGE = "http://www.freerdp.com" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +DEPENDS = "openssl libusb1 uriparser cairo icu pkcs11-helper zlib jpeg" + +inherit pkgconfig cmake + +SRCREV = "eda5c99686e15327f2f37b9cadf307e852b96adf" +SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pam pulseaudio wayland x11', d)} \ + ${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'ffmpeg', '', d)} \ + gstreamer cups pcsc \ +" + +EXTRA_OECMAKE = " \ + -DRDTK_FORCE_STATIC_BUILD=ON \ + -DUWAC_FORCE_STATIC_BUILD=ON \ + -DWITH_ADD=ON \ + -DWITH_BINARY_VERSIONING=ON \ + -DWITH_CHANNELS=ON \ + -DWITH_CLIENT_CHANNELS=ON \ + -DWITH_JPEG=ON \ + -DWITH_PKCS11=ON \ + -DWITH_SERVER_CHANNELS=ON \ + -DWITH_SERVER=ON \ + -DPKG_CONFIG_RELOCATABLE=OFF \ + -DWITH_ALSA=OFF \ + -DWITH_CLIENT_SDL=OFF \ + -DWITH_SAMPLE=OFF \ + " + +X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" +PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XFIXES=ON -DWITH_XDAMAGE=ON -DWITH_XRANDR=ON -DWITH_XKBFILE=ON,-DWITH_X11=OFF -DWITH_SHADOW=OFF,${X11_DEPS}" +PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland wayland-native libxkbcommon" +PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam" +PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio" +PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" +PACKAGECONFIG[fuse] = "-DWITH_FUSE=ON,-DWITH_FUSE=OFF,fuse3,fuse3" +PACKAGECONFIG[pcsc] = "-DWITH_PCSC=ON,-DWITH_PCSC=OFF,pcsc-lite" +PACKAGECONFIG[manpages] = "-DWITH_MANPAGES=ON,-DWITH_MANPAGES=OFF, libxslt-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[ffmpeg] = "-DWITH_DSP_FFMPEG=ON -DWITH_FFMPEG=ON -DWITH_SWSCALE=ON, -DWITH_DSP_FFMPEG=OFF -DWITH_FFMPEG=OFF -DWITH_SWSCALE=OFF,ffmpeg" +PACKAGECONFIG[krb5] = "-DWITH_KRB5=ON -DWITH_KRB5_NO_NTLM_FALLBACK=OFF,-DWITH_KRB5=OFF,krb5" +PACKAGECONFIG[openh264] = "-DWITH_OPENH264=ON,-DWITH_OPENH264=OFF,openh264" +PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-icd-loader" +PACKAGECONFIG[lame] = "-DWITH_LAME=ON,-DWITH_LAME=OFF,lame" +PACKAGECONFIG[faad] = "-DWITH_FAAD=ON,-DWITH_FAAD=OFF,faad2" +PACKAGECONFIG[faac] = "-DWITH_FAAC=ON,-DWITH_FAAC=OFF,faac" + +do_configure:append() { + sed -i -e 's|${WORKDIR}||g' ${B}/include/freerdp/buildflags.h + sed -i -e 's|${WORKDIR}||g' ${B}/winpr/include/winpr/buildflags.h +} + +FILES:${PN} += "${datadir}" diff --git a/meta-oe/recipes-support/freerdp/freerdp_git.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb index 88aec9c415..ee4d4530d6 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_git.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb @@ -3,83 +3,91 @@ DESCRIPTION = "FreeRDP RDP client & server library" HOMEPAGE = "http://www.freerdp.com" -DEPENDS = "openssl alsa-lib pcsc-lite" +DEPENDS = "openssl alsa-lib libusb1" SECTION = "net" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit pkgconfig cmake gitpkgv -PV = "2.0.0+gitr${SRCPV}" +PE = "1" PKGV = "${GITPKGVTAG}" -SRCREV = "1648deb435ad52206f7aa2afe4b4dff71d9329bc" -SRC_URI = "git://github.com/FreeRDP/FreeRDP.git \ - file://winpr-makecert-Build-with-install-RPATH.patch \ - file://0001-Fix-gstreamer-1.0-detection.patch \ -" +SRCREV = "efa899d3deb8595a29fabb2a2251722f9d7e0d7f" +SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ + file://winpr-makecert-Build-with-install-RPATH.patch \ + file://0001-Fixed-compilation-warnings.patch \ + file://0001-Fix-const-qualifier-error.patch \ + file://0002-Do-not-install-tools-a-CMake-targets.patch \ + file://0001-Fixed-compilation-warnings-in-ainput-channel.patch \ + " S = "${WORKDIR}/git" EXTRA_OECMAKE += " \ -DWITH_ALSA=ON \ - -DWITH_PCSC=ON \ -DWITH_FFMPEG=OFF \ -DWITH_CUNIT=OFF \ -DWITH_NEON=OFF \ -DBUILD_STATIC_LIBS=OFF \ -DCMAKE_POSITION_INDEPENDANT_CODE=ON \ -DWITH_MANPAGES=OFF \ + -DPROXY_PLUGINDIR=${libdir}/freerdp/proxy/plugins \ " PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'directfb pam pulseaudio wayland x11', d)}\ - gstreamer cups \ + gstreamer cups pcsc server \ " X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XFIXES=ON -DWITH_XDAMAGE=ON -DWITH_XRANDR=ON -DWITH_XKBFILE=ON,-DWITH_X11=OFF,${X11_DEPS}" -PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland" +PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland wayland-native libxkbcommon" PACKAGECONFIG[directfb] = "-DWITH_DIRECTFB=ON,-DWITH_DIRECTFB=OFF,directfb" PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam" +PACKAGECONFIG[pcsc] = "-DWITH_PCSC=ON,-DWITH_PCSC=OFF,pcsc-lite" PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio" PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" +PACKAGECONFIG[server] = "-DWITH_SERVER=ON,-DWITH_SERVER=OFF" PACKAGES =+ "libfreerdp" LEAD_SONAME = "libfreerdp.so" -FILES_libfreerdp = "${libdir}/lib*${SOLIBS}" +FILES:libfreerdp = "${libdir}/lib*${SOLIBS}" PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" +do_configure:append() { + sed -i -e 's|${WORKDIR}||g' ${B}/buildflags.h +} + # we will need winpr-makecert to generate TLS certificates -do_install_append () { +do_install:append () { install -d ${D}${bindir} install -m755 winpr/tools/makecert-cli/winpr-makecert ${D}${bindir} - rm -rf ${D}${libdir}/cmake rm -rf ${D}${libdir}/freerdp } -python populate_packages_prepend () { +python populate_packages:prepend () { freerdp_root = d.expand('${libdir}/freerdp') - do_split_packages(d, freerdp_root, '^(audin_.*)\.so$', + do_split_packages(d, freerdp_root, r'^(audin_.*)\.so$', output_pattern='libfreerdp-plugin-%s', description='FreeRDP plugin %s', prepend=True, extra_depends='libfreerdp-plugin-audin') - do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$', + do_split_packages(d, freerdp_root, r'^(rdpsnd_.*)\.so$', output_pattern='libfreerdp-plugin-%s', description='FreeRDP plugin %s', prepend=True, extra_depends='libfreerdp-plugin-rdpsnd') - do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$', + do_split_packages(d, freerdp_root, r'^(tsmf_.*)\.so$', output_pattern='libfreerdp-plugin-%s', description='FreeRDP plugin %s', prepend=True, extra_depends='libfreerdp-plugin-tsmf') - do_split_packages(d, freerdp_root, '^([^-]*)\.so$', + do_split_packages(d, freerdp_root, r'^([^-]*)\.so$', output_pattern='libfreerdp-plugin-%s', description='FreeRDP plugin %s', prepend=True, extra_depends='') diff --git a/meta-oe/recipes-support/function2/function2_4.2.4.bb b/meta-oe/recipes-support/function2/function2_4.2.4.bb new file mode 100644 index 0000000000..98d05f6e25 --- /dev/null +++ b/meta-oe/recipes-support/function2/function2_4.2.4.bb @@ -0,0 +1,21 @@ +SUMMARY = "Improved drop-in replacement for std::function" +DESCRIPTION = "Provides improved implementations of std::function." +HOMEPAGE = "https://naios.github.io/function2" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" +SRCREV = "a354bd093d2b6e50c9325dbce84d20b4e77aabc6" +PV .= "+git" + +SRC_URI += "gitsm://github.com/Naios/function2;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit cmake +inherit ptest + +# Installs some data to incorrect top-level /usr directory +do_install:append() { + mkdir -p ${D}/${datadir}/function2 + mv ${D}/${prefix}/Readme.md ${D}/${datadir}/function2/ + mv ${D}/${prefix}/LICENSE.txt ${D}/${datadir}/function2/ +} diff --git a/meta-oe/recipes-support/fuse/fuse3/fuse3.conf b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf new file mode 100644 index 0000000000..a517c488f3 --- /dev/null +++ b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf @@ -0,0 +1 @@ +fuse diff --git a/meta-oe/recipes-support/fuse/fuse3/run-ptest b/meta-oe/recipes-support/fuse/fuse3/run-ptest new file mode 100644 index 0000000000..b63c4de0d9 --- /dev/null +++ b/meta-oe/recipes-support/fuse/fuse3/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb new file mode 100644 index 0000000000..47b070557d --- /dev/null +++ b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb @@ -0,0 +1,98 @@ +SUMMARY = "Implementation of a fully functional filesystem in a userspace program" +DESCRIPTION = "FUSE (Filesystem in Userspace) is a simple interface for userspace \ + programs to export a virtual filesystem to the Linux kernel. FUSE \ + also aims to provide a secure method for non privileged users to \ + create and mount their own filesystem implementations. \ + " +HOMEPAGE = "https://github.com/libfuse/libfuse" +SECTION = "libs" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" +LIC_FILES_CHKSUM = " \ + file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LGPL2.txt;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE;md5=a55c12a2d7d742ecb41ca9ae0a6ddc66 \ +" + +SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.gz" +SRC_URI[sha256sum] = "f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87" + +S = "${WORKDIR}/fuse-${PV}" + +UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" +UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>3(\.\d+)+).tar.xz" + +CVE_PRODUCT = "fuse_project:fuse" + +inherit meson pkgconfig ptest + +SRC_URI += " \ + file://run-ptest \ + file://fuse3.conf \ +" + +RDEPENDS:${PN}-ptest += " \ + python3-pytest \ + python3-looseversion \ + bash \ +" +RRECOMMENDS:${PN}-ptest += " kernel-module-cuse" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + install -d ${D}${PTEST_PATH}/example + install -d ${D}${PTEST_PATH}/util + cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ + + example_excutables=`find ${B}/example -type f -executable` + util_excutables=`find ${B}/util -type f -executable` + test_excutables=`find ${B}/test -type f -executable` + + for e in $example_excutables + do + cp -rf $e ${D}${PTEST_PATH}/example/ + done + + for e in $util_excutables + do + cp -rf $e ${D}${PTEST_PATH}/util/ + done + + for e in $test_excutables + do + cp -rf $e ${D}${PTEST_PATH}/test + done +} + +DEPENDS = "udev" + +PACKAGES =+ "fuse3-utils" + +RPROVIDES:${PN}-dbg += "fuse3-utils-dbg" + +RRECOMMENDS:${PN}:class-target = "kernel-module-fuse fuse3-utils" + +FILES:${PN} += "${libdir}/libfuse3.so.*" +FILES:${PN}-dev += "${libdir}/libfuse3*.la" + +# Forbid auto-renaming to libfuse3-utils +FILES:fuse3-utils = "${bindir} ${base_sbindir}" +DEBIAN_NOAUTONAME:fuse3-utils = "1" +DEBIAN_NOAUTONAME:${PN}-dbg = "1" + +SYSTEMD_SERVICE:${PN} = "" + +do_install:append() { + rm -rf ${D}${base_prefix}/dev + + # systemd class remove the sysv_initddir only if systemd_system_unitdir + # contains anything, but it's not needed if sysvinit is not in DISTRO_FEATURES + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then + rm -rf ${D}${sysconfdir}/init.d/ + fi + + # Install systemd related configuration file + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/modules-load.d + install -m 0644 ${UNPACKDIR}/fuse3.conf ${D}${sysconfdir}/modules-load.d + fi +} diff --git a/meta-oe/recipes-support/gd/gd/0001-Fix-deprecared-function-prototypes.patch b/meta-oe/recipes-support/gd/gd/0001-Fix-deprecared-function-prototypes.patch new file mode 100644 index 0000000000..5ac5170721 --- /dev/null +++ b/meta-oe/recipes-support/gd/gd/0001-Fix-deprecared-function-prototypes.patch @@ -0,0 +1,115 @@ +From 6379331cd0647fc6f149f55e4505a9a92e4f159f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 22 Aug 2022 22:43:26 -0700 +Subject: [PATCH] Fix deprecared function prototypes + +Fixes following errors: +error: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype] + +Upstream-Status: Submitted [https://github.com/libgd/libgd/pull/835] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/gd_nnquant.c | 32 +++++++------------------------- + src/gd_tiff.c | 4 +--- + 2 files changed, 8 insertions(+), 28 deletions(-) + +diff --git a/src/gd_nnquant.c b/src/gd_nnquant.c +index 8b9aa794..013f7160 100644 +--- a/src/gd_nnquant.c ++++ b/src/gd_nnquant.c +@@ -112,12 +112,7 @@ typedef struct { + + /* Initialise network in range (0,0,0,0) to (255,255,255,255) and set parameters + ----------------------------------------------------------------------- */ +-static void initnet(nnq, thepic, len, sample, colours) +-nn_quant *nnq; +-unsigned char *thepic; +-int len; +-int sample; +-int colours; ++static void initnet(nn_quant *nnq, unsigned char *thepic, int len, int sample, int colours) + { + register int i; + register int *p; +@@ -163,9 +158,7 @@ static void unbiasnet(nn_quant *nnq) + } + + /* Output colormap to unsigned char ptr in RGBA format */ +-static void getcolormap(nnq, map) +-nn_quant *nnq; +-unsigned char *map; ++static void getcolormap(nn_quant *nnq, unsigned char *map) + { + int i,j; + for(j=0; j < nnq->netsize; j++) { +@@ -232,9 +225,7 @@ static void inxbuild(nn_quant *nnq) + + /* Search for ABGR values 0..255 (after net is unbiased) and return colour index + ---------------------------------------------------------------------------- */ +-static unsigned int inxsearch(nnq, al,b,g,r) +-nn_quant *nnq; +-register int al, b, g, r; ++static unsigned int inxsearch(nn_quant *nnq, int al, int b, int g, int r) + { + register int i, j, dist, a, bestd; + register int *p; +@@ -306,9 +297,7 @@ register int al, b, g, r; + + /* Search for biased ABGR values + ---------------------------- */ +-static int contest(nnq, al,b,g,r) +-nn_quant *nnq; +-register int al,b,g,r; ++static int contest(nn_quant *nnq, int al, int b, int g, int r) + { + /* finds closest neuron (min dist) and updates freq */ + /* finds best neuron (min dist-bias) and returns position */ +@@ -362,9 +351,7 @@ register int al,b,g,r; + /* Move neuron i towards biased (a,b,g,r) by factor alpha + ---------------------------------------------------- */ + +-static void altersingle(nnq, alpha,i,al,b,g,r) +-nn_quant *nnq; +-register int alpha,i,al,b,g,r; ++static void altersingle(nn_quant *nnq, int alpha, int i,int al, int b, int g, int r) + { + register int *n; + +@@ -382,10 +369,7 @@ register int alpha,i,al,b,g,r; + /* Move adjacent neurons by precomputed alpha*(1-((i-j)^2/[r]^2)) in radpower[|i-j|] + --------------------------------------------------------------------------------- */ + +-static void alterneigh(nnq, rad,i,al,b,g,r) +-nn_quant *nnq; +-int rad,i; +-register int al,b,g,r; ++static void alterneigh(nn_quant *nnq, int rad, int i, int al,int b,int g, int r) + { + register int j,k,lo,hi,a; + register int *p, *q; +@@ -429,9 +413,7 @@ register int al,b,g,r; + /* Main Learning Loop + ------------------ */ + +-static void learn(nnq, verbose) /* Stu: N.B. added parameter so that main() could control verbosity. */ +-nn_quant *nnq; +-int verbose; ++static void learn(nn_quant *nnq, int verbose) /* Stu: N.B. added parameter so that main() could control verbosity. */ + { + register int i,j,al,b,g,r; + int radius,rad,alpha,step,delta,samplepixels; +diff --git a/src/gd_tiff.c b/src/gd_tiff.c +index 7f72b610..3d90e61a 100644 +--- a/src/gd_tiff.c ++++ b/src/gd_tiff.c +@@ -446,9 +446,7 @@ BGD_DECLARE(void) gdImageTiffCtx(gdImagePtr image, gdIOCtx *out) + } + + /* Check if we are really in 8bit mode */ +-static int checkColorMap(n, r, g, b) +-int n; +-uint16_t *r, *g, *b; ++static int checkColorMap(int n, uint16_t *r, uint16_t *g, uint16_t *b) + { + while (n-- > 0) + if (*r++ >= 256 || *g++ >= 256 || *b++ >= 256) diff --git a/meta-oe/recipes-support/gd/gd_2.2.5.bb b/meta-oe/recipes-support/gd/gd_2.3.3.bb index 63d9acf05d..cc2c1571e6 100644 --- a/meta-oe/recipes-support/gd/gd_2.2.5.bb +++ b/meta-oe/recipes-support/gd/gd_2.3.3.bb @@ -5,18 +5,19 @@ images, and flood fills, and to write out the result as a PNG or JPEG file. \ This is particularly useful in Web applications, where PNG and JPEG are two \ of the formats accepted for inline images by most browsers. Note that gd is not \ a paint program." -HOMEPAGE = "http://libgd.bitbucket.org/" +HOMEPAGE = "http://libgd.github.io/" SECTION = "libs" LICENSE = "GD" -LIC_FILES_CHKSUM = "file://COPYING;md5=07384b3aa2e0d39afca0d6c40286f545" +LIC_FILES_CHKSUM = "file://COPYING;md5=ace63adfdac78400fc30fa22ee9c1bb1" DEPENDS = "freetype libpng jpeg zlib tiff" -SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \ - " +SRC_URI = "git://github.com/libgd/libgd.git;nobranch=1;protocol=https \ + file://0001-Fix-deprecared-function-prototypes.patch \ + " -SRCREV = "8255231b68889597d04d451a72438ab92a405aba" +SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc" S = "${WORKDIR}/git" @@ -33,16 +34,22 @@ EXTRA_OECONF += " --disable-rpath \ EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"' -do_install_append() { +DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized" + +do_install:append:class-target() { # cleanup buildpaths from gdlib.pc sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/gdlib.pc } PACKAGES += "${PN}-tools" -FILES_${PN} = "${libdir}/lib*${SOLIBS}" -FILES_${PN}-tools = "${bindir}/*" +FILES:${PN} = "${libdir}/lib*${SOLIBS}" +FILES:${PN}-tools = "${bindir}/*" PROVIDES += "${PN}-tools" -RPROVIDES_${PN}-tools = "${PN}-tools" -RDEPENDS_${PN}-tools = "perl perl-module-strict" +RPROVIDES:${PN}-tools = "${PN}-tools" +RDEPENDS:${PN}-tools = "perl perl-module-strict" + +CVE_PRODUCT = "libgd" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb b/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb new file mode 100644 index 0000000000..4d97b1a419 --- /dev/null +++ b/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb @@ -0,0 +1,18 @@ +SUMMARY = "skeleton main.c generator" +DESCRIPTION = "Gengetopt is a tool to write command line option parsing code for C programs." +SECTION = "utils" +HOMEPAGE = "https://www.gnu.org/software/gengetopt/gengetopt.html" + +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb" + +SRC_URI = "${GNU_MIRROR}/gengetopt/${BPN}-${PV}.tar.xz" + +SRC_URI[md5sum] = "ea165d618640dbdecb42ae4491337965" +SRC_URI[sha256sum] = "b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac" + +inherit autotools texinfo + +CXXFLAGS += "-std=c++14" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/genimage/genimage_18.bb b/meta-oe/recipes-support/genimage/genimage_18.bb new file mode 100644 index 0000000000..23169f5d44 --- /dev/null +++ b/meta-oe/recipes-support/genimage/genimage_18.bb @@ -0,0 +1,22 @@ +SUMMARY = "genimage - The image creation tool" +DESCRIPTION = "Genimage is a tool for generating filesystem and disk/flash images \ +from a root filesystem tree or existing filesystem images." +HOMEPAGE = "https://github.com/pengutronix/genimage" + +SECTION = "base" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libconfuse" + +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/genimage-${PV}.tar.xz" +SRC_URI[sha256sum] = "ebc3f886c4d80064dd6c6d5e3c2e98e5a670078264108ce2f89ada8a2e13fedd" + +EXTRA_OECONF = "--enable-largefile" + +inherit pkgconfig autotools gettext github-releases + +GITHUB_BASE_URI = "https://github.com/pengutronix/genimage/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)*)" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/gflags/gflags_2.2.0.bb b/meta-oe/recipes-support/gflags/gflags_2.2.2.bb index 28b652a640..a9a867b575 100644 --- a/meta-oe/recipes-support/gflags/gflags_2.2.0.bb +++ b/meta-oe/recipes-support/gflags/gflags_2.2.2.bb @@ -1,23 +1,20 @@ DESCRIPTION = "The gflags package contains a C++ library that implements commandline flags processing. It includes built-in support for standard types such as string and the ability to define flags in the source file in which they are used" - HOMEPAGE = "https://github.com/gflags/gflags" - LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df" -SRC_URI = "git://github.com/gflags/gflags.git" -SRCREV = "f8a0efe03aa69b3336d8e228b37d4ccb17324b88" +SRC_URI = "git://github.com/gflags/gflags.git;branch=master;protocol=https" +SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" S = "${WORKDIR}/git" -FILES_${PN}-dev += "${libdir}/cmake" - inherit cmake EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTALL_DIR=${baselib}" PACKAGES =+ "${PN}-bash-completion" -FILES_${PN}-bash-completion += "${bindir}/gflags_completions.sh" -RDEPENDS_${PN}-bash-completion = "bash bash-completion" +FILES:${PN}-bash-completion += "${bindir}/gflags_completions.sh" + +RDEPENDS:${PN}-bash-completion = "bash bash-completion" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch b/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch new file mode 100644 index 0000000000..3732c62cd0 --- /dev/null +++ b/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch @@ -0,0 +1,33 @@ +From 176230435cb4b64ff7f2d97f77a04579ad9ca239 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 18 Feb 2023 13:14:14 -0800 +Subject: [PATCH] Change SleepForMilliseconds parameter from unsigned int -> long + +Fixes following error on 32bit platforms + +src/googletest.h:631:35: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'long' in initializer list [-Wc++11-narrowing] + const struct timespec req = {0, t * 1000 * 1000}; + ^~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/google/glog/pull/894] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/googletest.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/googletest.h b/src/googletest.h +index 5761361..836b06c 100644 +--- a/src/googletest.h ++++ b/src/googletest.h +@@ -625,7 +625,7 @@ class Thread { + #endif + }; + +-static inline void SleepForMilliseconds(unsigned t) { ++static inline void SleepForMilliseconds(long t) { + #ifndef GLOG_OS_WINDOWS + # if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L + const struct timespec req = {0, t * 1000 * 1000}; +-- +2.39.2 + diff --git a/meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch b/meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch deleted file mode 100644 index 596281ff68..0000000000 --- a/meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0fabde0515e180c53961c27346dd7a79cffa4c1f Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> -Date: Thu, 11 Aug 2016 11:49:36 +0200 -Subject: [PATCH] configure.ac: Allow user to disable gflags - -Under some circumstances like cross-compilation, the user might not want -to enable support for gflags. - -This patch allows support for --without-gflags - -Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7b4d21e7ae8a..eba5e5cda1ea 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -136,7 +136,11 @@ AC_ARG_WITH(gflags, AS_HELP_STRING[--with-gflags=GFLAGS_DIR], - CFLAGS="$CFLAGS $GFLAGS_CFLAGS" - LIBS="$LIBS $GFLAGS_LIBS" - ) --AC_CHECK_LIB(gflags, main, ac_cv_have_libgflags=1, ac_cv_have_libgflags=0) -+if test x"$with_gflags" = x"no"; then -+ ac_cv_have_libgflags=0 -+else -+ AC_CHECK_LIB(gflags, main, ac_cv_have_libgflags=1, ac_cv_have_libgflags=0) -+fi - if test x"$ac_cv_have_libgflags" = x"1"; then - AC_DEFINE(HAVE_LIB_GFLAGS, 1, [define if you have google gflags library]) - if test x"$GFLAGS_LIBS" = x""; then --- -2.8.1 - diff --git a/meta-oe/recipes-support/glog/glog/libexecinfo.patch b/meta-oe/recipes-support/glog/glog/libexecinfo.patch new file mode 100644 index 0000000000..a791a40dbc --- /dev/null +++ b/meta-oe/recipes-support/glog/glog/libexecinfo.patch @@ -0,0 +1,40 @@ +From 19d00c15710840910a7397252c14d612746631fe Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 8 Mar 2021 14:58:40 -0800 +Subject: [PATCH] Link libexecinfo if its found, this is needed for musl based + systems + +Fixes +ld: libglog.so.0.4.0: undefined reference to `backtrace' +| collect2: error: ld returned 1 exit status + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 846b444..1553358 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -162,6 +162,7 @@ cmake_pop_check_state () + check_cxx_symbol_exists (snprintf cstdio HAVE_SNPRINTF) + + check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP) ++check_library_exists (execinfo backtrace "" HAVE_EXECINFO) + + check_cxx_source_compiles (" + #include <cstdlib> +@@ -629,6 +630,10 @@ if (Unwind_FOUND) + set (Unwind_DEPENDENCY "find_dependency (Unwind ${Unwind_VERSION})") + endif (Unwind_FOUND) + ++if (HAVE_EXECINFO) ++ target_link_libraries (glog PUBLIC execinfo) ++endif (HAVE_EXECINFO) ++ + if (HAVE_DBGHELP) + target_link_libraries (glog PRIVATE dbghelp) + set (glog_libraries_options_for_static_linking "${glog_libraries_options_for_static_linking} -ldbghelp") diff --git a/meta-oe/recipes-support/glog/glog_0.3.4.bb b/meta-oe/recipes-support/glog/glog_0.3.4.bb deleted file mode 100644 index d7c1974c68..0000000000 --- a/meta-oe/recipes-support/glog/glog_0.3.4.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "The glog library implements application-level logging. This \ -library provides logging APIs based on C++-style streams and various helper \ -macros." -HOMEPAGE = "https://github.com/google/glog" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" - -DEPENDS = "libunwind" - -SRC_URI = " \ - git://github.com/google/glog.git \ - file://0001-configure.ac-Allow-user-to-disable-gflags.patch \ -" - -SRCREV = "d8cb47f77d1c31779f3ff890e1a5748483778d6a" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gflags] = ",--without-gflags,gflags," - -inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/glog/glog_0.6.0.bb b/meta-oe/recipes-support/glog/glog_0.6.0.bb new file mode 100644 index 0000000000..ec39604f44 --- /dev/null +++ b/meta-oe/recipes-support/glog/glog_0.6.0.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "The glog library implements application-level logging. This \ +library provides logging APIs based on C++-style streams and various helper \ +macros." +HOMEPAGE = "https://github.com/google/glog" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" + +SRC_URI = " \ + git://github.com/google/glog.git;branch=master;protocol=https \ + file://libexecinfo.patch \ + file://0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch \ +" + +SRCREV = "b33e3bad4c46c8a6345525fd822af355e5ef9446" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGECONFIG ?= "shared unwind 64bit-atomics" +PACKAGECONFIG:remove:riscv64 = "unwind" +PACKAGECONFIG:remove:riscv32 = "unwind 64bit-atomics" +PACKAGECONFIG:remove:mipsarch = "64bit-atomics" +PACKAGECONFIG:remove:armv5 = "64bit-atomics" +PACKAGECONFIG:remove:armv6 = "64bit-atomics" + +PACKAGECONFIG:append:libc-musl:riscv64 = " execinfo" +PACKAGECONFIG:append:libc-musl:riscv32 = " execinfo" + +PACKAGECONFIG[unwind] = "-DWITH_UNWIND=ON,-DWITH_UNWIND=OFF,libunwind,libunwind" +PACKAGECONFIG[execinfo] = ",,libexecinfo" +PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," +PACKAGECONFIG[64bit-atomics] = ",-DCMAKE_CXX_STANDARD_LIBRARIES='-latomic',," + +do_configure:append() { + # remove WORKDIR info to improve reproducibility + if [ -f "${B}/config.h" ] ; then + sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h + fi +} + +FILES:${PN}-dev += "${datadir}/${BPN}/cmake" diff --git a/meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb b/meta-oe/recipes-support/gnulib/gnulib_202401.bb index b505ac18dd..41675d3587 100644 --- a/meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb +++ b/meta-oe/recipes-support/gnulib/gnulib_202401.bb @@ -8,20 +8,20 @@ as a collection of portable idioms to be used in other projects." HOMEPAGE = "http://www.gnu.org/software/gnulib/" SECTION = "devel" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=56a22a6e5bcce45e2c8ac184f81412b5" -SRCREV = "b23000de1e47c7d580e0e220966dd1ee42a5e5bc" +SRCREV = "c99c8d491850dc3a6e0b8604a2729d8bc5c0eff1" -SRC_URI = "git://git.sv.gnu.org/gnulib;protocol=git \ +SRC_URI = "git://git.savannah.gnu.org/git/gnulib.git;branch=stable-${PV};protocol=https \ " S = "${WORKDIR}/git" do_install () { - cd ${S} - git checkout master - git clone ${S} ${D}/${datadir}/gnulib + install -d ${D}/${datadir}/gnulib + cp --no-preserve=ownership --recursive ${S}/* ${D}/${datadir}/gnulib/ + cp --no-preserve=ownership --recursive ${S}/.git ${D}/${datadir}/gnulib/ } do_patch[noexec] = "1" @@ -29,8 +29,9 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_package[noexec] = "1" do_packagedata[noexec] = "1" -do_package_write_ipk[noexec] = "1" -do_package_write_deb[noexec] = "1" -do_package_write_rpm[noexec] = "1" +deltask package_write_ipk +deltask package_write_deb +deltask package_write_rpm +deltask do_deploy_archives BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch new file mode 100644 index 0000000000..3017314abe --- /dev/null +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch @@ -0,0 +1,33 @@ +From 7f0e99af540a333108b92d792923ec7fc9e9fad9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 28 May 2024 20:14:54 -0700 +Subject: [PATCH] cycleclock: Fix type conversion to match function return type + (#1794) + +fixes build with clang19 + +src/cycleclock.h:208:52: error: implicit conversion changes signedness: 'uint64_t' (aka 'unsigned long long') to 'int64_t' (aka 'long long') [-Werror,-Wsign-conversion] + 208 | return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo; + | ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~ +1 error generated. + +Upstream-Status: Backport [https://github.com/google/benchmark/commit/7f0e99af540a333108b92d792923ec7fc9e9fad9] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/cycleclock.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/cycleclock.h b/src/cycleclock.h +index a25843760..c657414e5 100644 +--- a/src/cycleclock.h ++++ b/src/cycleclock.h +@@ -205,7 +205,8 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { + "sub %0, zero, %0\n" + "and %1, %1, %0\n" + : "=r"(cycles_hi0), "=r"(cycles_lo), "=r"(cycles_hi1)); +- return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo; ++ return static_cast<int64_t>((static_cast<uint64_t>(cycles_hi1) << 32) | ++ cycles_lo); + #else + uint64_t cycles; + asm volatile("rdtime %0" : "=r"(cycles)); diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch new file mode 100644 index 0000000000..cc22a7e8a9 --- /dev/null +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch @@ -0,0 +1,32 @@ +From 54bca09aca6ccec41f852cb1f834463bc51290d0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 10 Jun 2024 21:45:22 -0700 +Subject: [PATCH] cycleclock: Fix type conversion to match function return type + on riscv64 + +Fixes builds with clang + +src/cycleclock.h:213:10: error: implicit conversion changes signedness: 'uint64_t' (aka 'unsigned long') to 'int64_t' (aka 'long') [-Werror,-Wsign-conversion] + 213 | return cycles; + | ~~~~~~ ^~~~~~ + 1 error generated. + +Upstream-Status: Submitted [https://github.com/google/benchmark/pull/1802] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/cycleclock.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cycleclock.h b/src/cycleclock.h +index c657414..bd62f5d 100644 +--- a/src/cycleclock.h ++++ b/src/cycleclock.h +@@ -210,7 +210,7 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { + #else + uint64_t cycles; + asm volatile("rdtime %0" : "=r"(cycles)); +- return cycles; ++ return static_cast<int64_t>(cycles); + #endif + #elif defined(__e2k__) || defined(__elbrus__) + struct timeval tv; diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb new file mode 100644 index 0000000000..706862f24a --- /dev/null +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "A microbenchmark support library" +HOMEPAGE = "https://github.com/google/benchmark" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main \ + file://0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch \ + file://0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch" +SRCREV = "a4cf155615c63e019ae549e31703bf367df5b471" + +S = "${WORKDIR}/git" + +EXTRA_OECMAKE = " \ + -DBUILD_SHARED_LIBS=yes \ + -DBENCHMARK_ENABLE_TESTING=no \ + -DCMAKE_BUILD_TYPE=Release \ +" + +inherit cmake + +FILES:${PN}-dev += "${libdir}/cmake" diff --git a/meta-oe/recipes-support/gosu/gosu_1.17.bb b/meta-oe/recipes-support/gosu/gosu_1.17.bb new file mode 100644 index 0000000000..6a4441fc24 --- /dev/null +++ b/meta-oe/recipes-support/gosu/gosu_1.17.bb @@ -0,0 +1,30 @@ +SUMMARY = "Simple Go-based setuid+setgid+setgroups+exec" +HOMEPAGE = "https://github.com/tianon/gosu" +DESCRIPTION = "This is a simple tool grown out of the simple fact that su and sudo have very strange and often annoying TTY and signal-forwarding behavior." +LICENSE = "Apache-2.0 " +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +GO_IMPORT = "github.com/tianon/gosu" +SRC_URI = "git://${GO_IMPORT}.git;destsuffix=src/${GO_IMPORT};branch=master;protocol=https \ + git://github.com/moby/sys;name=user;destsuffix=src/github.com/moby/sys;branch=main;protocol=https \ + git://github.com/golang/sys;name=sys;destsuffix=src/golang.org/x/sys;branch=master;protocol=https \ +" +SRCREV = "0d1847490b448a17eb347e5e357f2c0478df87ad" +#v0.1.0 +SRCREV_user = "c0711cde08c8fa33857a2c28721659267f49b5e2" +#v0.1.0 +SRCREV_sys = "95e765b1cc43ac521bd4fd501e00774e34401449" + +SRCREV_FORMAT .= "_user_sys" + +S = "${UNPACKDIR}" +inherit go + +CGO_ENABLED = "1" + +do_compile:prepend() { + # New Go versions has Go modules support enabled by default + export GO111MODULE=off +} + +RDEPENDS:${PN}-dev += "bash" diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch deleted file mode 100644 index e582c0da6e..0000000000 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ea9f64eb2cdf3be6c4dc65fa1472d854616e43ca Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 6 Mar 2017 13:38:46 -0800 -Subject: [PATCH] Support Atomic ops on clang - -clang pretends to be gcc 4.2 which is a lie -it actually supports a lot more features then -gcc 4.2, here it depends on gcc 4.7 to enable -the atomics and fails for clang - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/base/atomicops.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/base/atomicops.h b/src/base/atomicops.h -index be038f3..f1a21ff 100644 ---- a/src/base/atomicops.h -+++ b/src/base/atomicops.h -@@ -118,7 +118,7 @@ - #include "base/atomicops-internals-linuxppc.h" - #elif defined(__GNUC__) && defined(__mips__) - #include "base/atomicops-internals-mips.h" --#elif defined(__GNUC__) && GCC_VERSION >= 40700 -+#elif defined(__GNUC__) && GCC_VERSION >= 40700 || defined(__clang__) - #include "base/atomicops-internals-gcc.h" - #else - #error You need to implement atomic operations for this architecture --- -2.12.0 - diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch deleted file mode 100644 index 5bd0b6fa4f..0000000000 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 12ac0dc6742e1bcdfaf1842186c9002f0820a5e8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 1 Jul 2017 13:21:21 -0700 -Subject: [PATCH] Use ucontext_t instead of struct ucontext - -Newer glibc has dropped the ucontext tag from exposing - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/stacktrace_powerpc-linux-inl.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/stacktrace_powerpc-linux-inl.h b/src/stacktrace_powerpc-linux-inl.h -index a9bf775..47ff2d7 100644 ---- a/src/stacktrace_powerpc-linux-inl.h -+++ b/src/stacktrace_powerpc-linux-inl.h -@@ -53,7 +53,6 @@ - #elif defined(HAVE_UCONTEXT_H) - #include <ucontext.h> // for ucontext_t - #endif --typedef ucontext ucontext_t; - - // PowerPC64 Little Endian follows BE wrt. backchain, condition register, - // and LR save area, so no need to adjust the reading struct. -@@ -202,7 +201,7 @@ static int GET_STACK_TRACE_OR_FRAMES { - struct rt_signal_frame_32 { - char dummy[64 + 16]; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - // We don't care about the rest, since IP value is at 'uc' field.A - } *sigframe = reinterpret_cast<rt_signal_frame_32*>(current); - result[n] = (void*) sigframe->uc.uc_mcontext.uc_regs->gregs[PT_NIP]; --- -2.13.2 - diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch index 99127e11a6..2ea54e48c9 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch @@ -1,25 +1,26 @@ -From b5961f17e9d7f2bc44da611b3e4b27c8a641fc72 Mon Sep 17 00:00:00 2001 +From 06605158852f9364519391fa11070ba5ec4303e9 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 2 Sep 2017 08:07:17 -0700 Subject: [PATCH] disbale heap checkers and debug allocator on musl Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- + Upstream-Status: Pending +--- configure.ac | 2 ++ 1 file changed, 2 insertions(+) -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac -@@ -51,6 +51,8 @@ case "$host" in - *-cygwin*) default_enable_heap_checker=no; default_enable_cpu_profiler=no;; - *-freebsd*) default_enable_heap_checker=no;; - *-darwin*) default_enable_heap_checker=no;; +diff --git a/configure.ac b/configure.ac +index 68fd51c..4cb71fe 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -53,6 +53,8 @@ case "$host" in + need_nanosleep=no;; + *-cygwin*) default_enable_cpu_profiler=no;; + *-linux*) default_enable_heap_checker=yes; heap_checker_supported=yes;; + *-musl*) default_enable_heap_checker=no; default_enable_heap_profiler=no; + default_enable_debugalloc=no; default_enable_libunwind=no; esac - # Currently only backtrace works on s390. + # Currently only backtrace works on s390 and OSX. diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch deleted file mode 100644 index 78621c7fe0..0000000000 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 157914941bd38f1a38bb6bd7294ca6c2bc1b8dcb Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 16 Jul 2017 15:51:28 -0700 -Subject: [PATCH] fix build with musl libc - -Patch from https://github.com/gperftools/gperftools/pull/765/ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 1 + - src/malloc_hook_mmap_linux.h | 8 ++++++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b42fea3..70b49a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -188,6 +188,7 @@ AC_HEADER_STDC - AC_CHECK_TYPES([__int64]) # defined in some windows platforms - AC_CHECK_TYPES([struct mallinfo],,, [#include <malloc.h>]) - AC_CHECK_TYPES([Elf32_Versym],,, [#include <elf.h>]) # for vdso_support.h -+AC_CHECK_FUNCS(__sbrk) # for intercepting glibc memory allocator - AC_CHECK_FUNCS(sbrk) # for tcmalloc to get memory - AC_CHECK_FUNCS(geteuid) # for turning off services when run as root - AC_CHECK_FUNCS(fork) # for the pthread_atfork setup -diff --git a/src/malloc_hook_mmap_linux.h b/src/malloc_hook_mmap_linux.h -index 79ac4e3..d444635 100755 ---- a/src/malloc_hook_mmap_linux.h -+++ b/src/malloc_hook_mmap_linux.h -@@ -46,6 +46,10 @@ - #include <errno.h> - #include "base/linux_syscall_support.h" - -+#ifndef __GLIBC__ -+typedef off64_t __off64_t; -+#endif -+ - // The x86-32 case and the x86-64 case differ: - // 32b has a mmap2() syscall, 64b does not. - // 64b and 32b have different calling conventions for mmap(). -@@ -168,7 +172,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, - return result; - } - --# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) -+# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)) - - extern "C" void* mmap(void *start, size_t length, int prot, int flags, - int fd, off_t offset) __THROW { -@@ -206,7 +210,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, - return result; - } - --#ifndef __UCLIBC__ -+#if HAVE___SBRK - // libc's version: - extern "C" void* __sbrk(ptrdiff_t increment); - --- -2.13.3 - diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch deleted file mode 100644 index 667008a5b1..0000000000 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 04ea8e001501931f4dbf20288aca78469617b08a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 16 Jul 2017 19:28:17 -0700 -Subject: [PATCH] include fcntl.h for loff_t definition - -Fixes -linux_syscall_support.h:2641:26: error: 'loff_t' has not been declared - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/base/linux_syscall_support.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/base/linux_syscall_support.h b/src/base/linux_syscall_support.h -index 85347a2..70431ca 100644 ---- a/src/base/linux_syscall_support.h -+++ b/src/base/linux_syscall_support.h -@@ -162,6 +162,7 @@ extern "C" { - #include <unistd.h> - #include <linux/unistd.h> - #include <endian.h> -+#include <fcntl.h> - - #ifdef __mips__ - /* Include definitions of the ABI currently in use. */ --- -2.13.3 - diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch new file mode 100644 index 0000000000..1142df0be9 --- /dev/null +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch @@ -0,0 +1,59 @@ +From d675808d300278a9e7143428cfecf3fda61cc9a2 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 21 Mar 2024 10:59:29 +0000 +Subject: [PATCH] src/mmap_hook.cc: Fix build for 32bit machine + +Fixed build error on 32bit machine: + +../git/src/mmap_hook.cc:309:31: error: static assertion failed + 309 | static_assert(sizeof(int32_t) == sizeof(off_t), ""); + +This is because oe's off_t is 64bit on both 32 and 64bit system, which is the +default value of glibc, so the assertion would be failed on 32bit system, and +remove mmap() and mmap64() to fix the redefined error. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + src/mmap_hook.cc | 22 ---------------------- + 1 file changed, 22 deletions(-) + +diff --git a/src/mmap_hook.cc b/src/mmap_hook.cc +index 0a0f62f..27425e4 100644 +--- a/src/mmap_hook.cc ++++ b/src/mmap_hook.cc +@@ -302,30 +302,8 @@ void* mmap(void* start, size_t length, int prot, int flags, int fd, off_t off) _ + + #define HOOKED_MMAP + +-#elif defined(DEFINED_DO_MMAP) && defined(__linux__) && !GOOD_LINUX_SYSTEM +-// Linuxes with 32-bit off_t. We're being careful with mmap64 being +-// 64-bit and mmap being 32-bit. +- +-static_assert(sizeof(int32_t) == sizeof(off_t), ""); +- +-extern "C" void* mmap64(void* start, size_t length, int prot, int flags, int fd, int64_t off) +- __THROW ATTRIBUTE_SECTION(malloc_hook); +-extern "C" void* mmap(void* start, size_t length, int prot, int flags, int fd, off_t off) +- __THROW ATTRIBUTE_SECTION(malloc_hook); +- +-void* mmap(void *start, size_t length, int prot, int flags, int fd, off_t off) __THROW { +- return do_mmap_with_hooks(start, length, prot, flags, fd, off); +-} +- +-void* mmap64(void *start, size_t length, int prot, int flags, int fd, int64_t off) __THROW { +- return do_mmap_with_hooks(start, length, prot, flags, fd, off); +-} +- +-#define HOOKED_MMAP +- + #endif // Linux/32-bit off_t case + +- + #ifdef HOOKED_MMAP + + extern "C" int munmap(void* start, size_t length) __THROW ATTRIBUTE_SECTION(malloc_hook); +-- +2.35.5 + diff --git a/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch b/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch index f2647404bf..15eacc8993 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch @@ -1,15 +1,20 @@ -Disable libunwind on aarch64 +From 564f800e3e24647c095f7a321bf3ebdccfbf762d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 2 Sep 2017 12:02:04 -0700 +Subject: [PATCH] Disable libunwind on aarch64 Fixes hangs when using libtcmalloc.so Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac -@@ -69,6 +69,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [re +--- + configure.ac | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/configure.ac ++++ b/configure.ac +@@ -76,6 +76,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [re [default_enable_libunwind=yes default_tcmalloc_pagesize=8]) diff --git a/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch new file mode 100644 index 0000000000..800fa3a84f --- /dev/null +++ b/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch @@ -0,0 +1,61 @@ +From 328805fd16930deefda400a77e9c2c5d17d04d29 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 13 Mar 2021 00:42:25 -0800 +Subject: [PATCH] Compatibility fixes for musl. + +--- +Upstream-Status: Pending + + src/getpc.h | 4 ++++ + src/stacktrace_powerpc-linux-inl.h | 8 ++++++-- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/getpc.h b/src/getpc.h +index 87d18b6..c569731 100644 +--- a/src/getpc.h ++++ b/src/getpc.h +@@ -68,6 +68,10 @@ + typedef ucontext ucontext_t; + #endif + ++#if defined(__powerpc__) && !defined(PT_NIP) ++#define PT_NIP 32 ++#endif ++ + namespace tcmalloc { + namespace getpc { + +diff --git a/src/stacktrace_powerpc-linux-inl.h b/src/stacktrace_powerpc-linux-inl.h +index 883e7d2..212bd25 100644 +--- a/src/stacktrace_powerpc-linux-inl.h ++++ b/src/stacktrace_powerpc-linux-inl.h +@@ -186,7 +186,7 @@ static int GET_STACK_TRACE_OR_FRAMES { + ucontext_t uc; + // We don't care about the rest, since the IP value is at 'uc' field. + } *sigframe = reinterpret_cast<signal_frame_64*>(current); +- result[n] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP]; ++ result[n] = (void*) sigframe->uc.uc_mcontext.gp_regs[32]; + } + #else + if (sigtramp32_vdso && (sigtramp32_vdso == current->return_addr)) { +@@ -196,7 +196,7 @@ static int GET_STACK_TRACE_OR_FRAMES { + mcontext_t mctx; + // We don't care about the rest, since IP value is at 'mctx' field. + } *sigframe = reinterpret_cast<signal_frame_32*>(current); +- result[n] = (void*) sigframe->mctx.gregs[PT_NIP]; ++ result[n] = (void*) sigframe->mctx.gregs[32]; + } else if (sigtramp32_rt_vdso && (sigtramp32_rt_vdso == current->return_addr)) { + struct rt_signal_frame_32 { + char dummy[64 + 16]; +@@ -204,7 +204,11 @@ static int GET_STACK_TRACE_OR_FRAMES { + ucontext_t uc; + // We don't care about the rest, since IP value is at 'uc' field.A + } *sigframe = reinterpret_cast<rt_signal_frame_32*>(current); ++#if defined(__GLIBC__) + result[n] = (void*) sigframe->uc.uc_mcontext.uc_regs->gregs[PT_NIP]; ++#else ++ result[n] = (void*) sigframe->uc.uc_mcontext.gregs[32]; ++#endif + } + #endif + diff --git a/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch b/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch deleted file mode 100644 index 7e1a23bf68..0000000000 --- a/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch +++ /dev/null @@ -1,17 +0,0 @@ -sgidef.h does not exist on musl and its not needed to compile - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending -Index: git/src/base/linux_syscall_support.h -=================================================================== ---- git.orig/src/base/linux_syscall_support.h -+++ git/src/base/linux_syscall_support.h -@@ -164,7 +164,7 @@ extern "C" { - #include <endian.h> - #include <fcntl.h> - --#ifdef __mips__ -+#if defined(__mips__) && defined(__glibc__) - /* Include definitions of the ABI currently in use. */ - #include <sgidefs.h> - #endif diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.15.bb b/meta-oe/recipes-support/gperftools/gperftools_2.15.bb new file mode 100644 index 0000000000..bd3b2afaea --- /dev/null +++ b/meta-oe/recipes-support/gperftools/gperftools_2.15.bb @@ -0,0 +1,65 @@ +SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" +HOMEPAGE = "https://github.com/gperftools/gperftools" +DESCRIPTION = "The gperftools, previously called google-perftools, package contains some \ +utilities to improve and analyze the performance of C++ programs. \ +Included are an optimized thread-caching malloc() and cpu and heap profiling utilities. \ +" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" + +DEPENDS:append:libc-musl = " libucontext" + +SRCREV = "365060c4213a48adb27f63d5dfad41b3dfbdd62e" +SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https \ + file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \ + file://disable_libunwind_aarch64.patch \ + file://0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch \ + " + +SRC_URI:append:libc-musl = " file://ppc-musl.patch" + +inherit autotools + +S = "${WORKDIR}/git" + +# On mips, we have the following error. +# do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 +# Segmentation fault (core dumped) +COMPATIBLE_HOST:mipsarch = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" + +# Disable thumb1 +# {standard input}: Assembler messages: +# {standard input}:434: Error: lo register required -- `ldr pc,[sp]' +# Makefile:4538: recipe for target 'src/base/libtcmalloc_la-linuxthreads.lo' failed +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:toolchain-clang:arm = "arm" + +EXTRA_OECONF:append:libc-musl:powerpc64le = " --disable-cpu-profiler" +EXTRA_OECONF:append:libc-musl:powerpc = " --disable-cpu-profiler" +PACKAGECONFIG ?= "libunwind static" +PACKAGECONFIG:remove:arm:libc-musl = "libunwind" +PACKAGECONFIG:remove:riscv64 = "libunwind" +PACKAGECONFIG:remove:riscv32 = "libunwind" + +PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" +PACKAGECONFIG[static] = "--enable-static,--disable-static," + +PACKAGE_BEFORE_PN += "libtcmalloc-minimal" +FILES:libtcmalloc-minimal = "${libdir}/libtcmalloc_minimal*${SOLIBS} ${libdir}/libtcmalloc_minimal_debug*${SOLIBS}" + +# pprof tool requires Getopt::long and POSIX perl5 modules. +# Also runs `objdump` on each cpuprofile data file +RDEPENDS:${PN} += " \ + binutils \ + curl \ + perl-module-carp \ + perl-module-cwd \ + perl-module-getopt-long \ + perl-module-overloading \ + perl-module-posix \ +" + +RDEPENDS:${PN} += "libtcmalloc-minimal (= ${EXTENDPKGV})" diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb b/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb deleted file mode 100644 index ecac6c5cc8..0000000000 --- a/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" -HOMEPAGE = "https://github.com/gperftools/gperftools" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" -DEPENDS += "libunwind" - -SRCREV = "bf840dec0495e17f5c8403e68e10b9d6bf05c559" -SRC_URI = "git://github.com/gperftools/gperftools \ - file://0001-Support-Atomic-ops-on-clang.patch \ - file://0001-Use-ucontext_t-instead-of-struct-ucontext.patch \ - file://0001-fix-build-with-musl-libc.patch \ - file://0001-include-fcntl.h-for-loff_t-definition.patch \ - file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \ - file://disable_libunwind_aarch64.patch \ - file://sgidef.patch \ - " - -inherit autotools - -S = "${WORKDIR}/git" - -# Disable thumb1 -# {standard input}: Assembler messages: -# {standard input}:434: Error: lo register required -- `ldr pc,[sp]' -# Makefile:4538: recipe for target 'src/base/libtcmalloc_la-linuxthreads.lo' failed -ARM_INSTRUCTION_SET_armv5 = "arm" - diff --git a/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch b/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch deleted file mode 100644 index a9198166a9..0000000000 --- a/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 52e6cf052b1f938fcca1bc24d578fe0bfd972988 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 25 Jun 2017 07:25:33 -0700 -Subject: [PATCH] Use sigemptyset API instead of __sigemptyset - -__sigemptyset has been removed from glibc public -API headers in upcoming (2.26) release onwards - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - src/prog/gpm-root.y | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y -index 5126c65..76c896c 100644 ---- a/src/prog/gpm-root.y -+++ b/src/prog/gpm-root.y -@@ -1196,11 +1196,7 @@ int main(int argc, char **argv) - LOG_DAEMON : LOG_USER); - /* reap your zombies */ - childaction.sa_handler=reap_children; --#if defined(__GLIBC__) -- __sigemptyset(&childaction.sa_mask); --#else /* __GLIBC__ */ - sigemptyset(&childaction.sa_mask); --#endif /* __GLIBC__ */ - childaction.sa_flags=0; - sigaction(SIGCHLD,&childaction,NULL); - --- -2.13.1 - diff --git a/meta-oe/recipes-support/gpm/gpm/gpm.service.in b/meta-oe/recipes-support/gpm/gpm/gpm.service.in index ee6c040fa6..5a6cadeb4e 100644 --- a/meta-oe/recipes-support/gpm/gpm/gpm.service.in +++ b/meta-oe/recipes-support/gpm/gpm/gpm.service.in @@ -4,6 +4,7 @@ Description=Virtual console mouse server [Service] Type=forking ExecStart=@bindir@/gpm -m /dev/input/mice -t imps2 +PIDFile=/run/gpm.pid [Install] WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/gpm/gpm/no-docs.patch b/meta-oe/recipes-support/gpm/gpm/no-docs.patch deleted file mode 100644 index 3faef84ee2..0000000000 --- a/meta-oe/recipes-support/gpm/gpm/no-docs.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: gpm-1.99.7/Makefile.in -=================================================================== ---- gpm-1.99.7.orig/Makefile.in 2008-07-24 03:36:35.000000000 -0700 -+++ gpm-1.99.7/Makefile.in 2010-06-22 18:28:45.269507001 -0700 -@@ -19,7 +19,7 @@ - # user-overridable flags, but it's also all the implicit rule looks at. - # missing ? - --SUBDIRS = src doc contrib -+SUBDIRS = src - - - ### simple, but effective rules diff --git a/meta-oe/recipes-support/gpm/gpm/processcreds.patch b/meta-oe/recipes-support/gpm/gpm/processcreds.patch deleted file mode 100644 index d647eca0ad..0000000000 --- a/meta-oe/recipes-support/gpm/gpm/processcreds.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: gpm-1.99.7/src/daemon/processconn.c -=================================================================== ---- gpm-1.99.7.orig/src/daemon/processconn.c 2010-09-29 17:36:18.571782951 +0400 -+++ gpm-1.99.7/src/daemon/processconn.c 2010-09-29 17:42:44.659991758 +0400 -@@ -20,6 +20,7 @@ - * - ********/ - -+#define _GNU_SOURCE - #include <sys/socket.h> /* accept */ - #include <stdlib.h> /* malloc */ - #include <unistd.h> /* close */ diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb index 51c4dd6397..a066488649 100644 --- a/meta-oe/recipes-support/gpm/gpm_git.bb +++ b/meta-oe/recipes-support/gpm/gpm_git.bb @@ -1,47 +1,42 @@ +SUMMARY = "Console mouse driver" DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \ for the console and xterm, with sample clients included \ (emacs, etc)." +HOMEPAGE = "https://www.nico.schottelius.org/software/gpm" SECTION = "console/utils" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" PV = "1.99.7+git${SRCREV}" -PR = "r2" -SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77" +SRCREV = "e82d1a653ca94aa4ed12441424da6ce780b1e530" -DEPENDS = "ncurses" +DEPENDS = "ncurses bison-native" -SRC_URI = "git://github.com/telmich/gpm;protocol=git \ +SRC_URI = "git://github.com/telmich/gpm;protocol=https;branch=master \ file://init \ - file://no-docs.patch \ - file://processcreds.patch \ file://gpm.service.in \ - file://0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch \ " S = "${WORKDIR}/git" -inherit autotools-brokensep update-rc.d systemd +inherit autotools-brokensep update-rc.d systemd texinfo INITSCRIPT_NAME = "gpm" INITSCRIPT_PARAMS = "defaults" -do_configure_prepend() { +# Avoid line statements with bison/yacc +# ERROR: lib32-gpm-1.99.7+gite82d1a653ca94aa4ed12441424da6ce780b1e530-r0 do_package_qa: QA Issue: File /usr/src/debug/lib32-gpm/1.99.7+gite82d1a653ca94aa4ed12441424da6ce780b1e530/src/prog/gpm-root.c in package lib32-gpm-src contains reference to TMPDIR [buildpaths] +EXTRA_OEMAKE = "YFLAGS='-l'" + +do_configure:prepend() { (cd ${S};./autogen.sh;cd -) } -do_install_append () { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_system_unitdir} - sed 's:@bindir@:${bindir}:' < ${WORKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service - fi - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -D -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm - fi - install -D -m 0644 ${S}/src/headers/gpm.h ${D}${includedir}/gpm.h +do_install:append () { + install -d ${D}${systemd_system_unitdir} + sed 's:@bindir@:${sbindir}:' < ${UNPACKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service + install -D -m 0755 ${UNPACKDIR}/init ${D}${INIT_D_DIR}/gpm ln -s libgpm.so.2 ${D}${libdir}/libgpm.so } -SYSTEMD_SERVICE_${PN} = "gpm.service" - -FILES_${PN} += "${datadir}/emacs" +SYSTEMD_SERVICE:${PN} = "gpm.service" diff --git a/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch b/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch index 09a60127a4..5ef39ea33d 100644 --- a/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch +++ b/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Makefile: Append instead of overriding LDFLAGS Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/gradm/gradm/0001-make-Define-SBINDIR-flag.patch b/meta-oe/recipes-support/gradm/gradm/0001-make-Define-SBINDIR-flag.patch new file mode 100644 index 0000000000..1c0f3bfbae --- /dev/null +++ b/meta-oe/recipes-support/gradm/gradm/0001-make-Define-SBINDIR-flag.patch @@ -0,0 +1,69 @@ +From 12bc62ac26df012fc143913b6e046a3cf5127db2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 23 Apr 2022 09:20:49 -0700 +Subject: [PATCH] make: Define SBINDIR flag + +Provides a facility to control install locations of /sbin elements from +environment + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/Makefile b/Makefile +index deed94c..9190fe9 100644 +--- a/Makefile ++++ b/Makefile +@@ -25,6 +25,7 @@ MKNOD=/bin/mknod + CC=/usr/bin/gcc + FIND=/usr/bin/find + LIBS := $(shell if [ "`uname -m`" != "sparc64" -a "`uname -m`" != "x86_64" ]; then echo "-lfl" ; else echo "" ; fi) ++SBINDIR=/sbin + OPT_FLAGS := -O2 + # for older versions of grsecurity, comment the above line and uncomment the below: + #OPT_FLAGS := $(shell if [ "`uname -m`" != "sparc64" ] && [ "`uname -m`" != "x86_64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi) +@@ -136,15 +137,15 @@ lex.learn_pass1.o: lex.learn_pass1.c learn_pass1.tab.h + lex.learn_pass2.o: lex.learn_pass2.c learn_pass2.tab.h + + install: $(GRADM_BIN) gradm.8 policy grlearn +- @mkdir -p $(DESTDIR)/sbin ++ @mkdir -p $(DESTDIR)$(SBINDIR) + @echo "Installing gradm..." +- @$(INSTALL) -m 0755 $(GRADM_BIN) $(DESTDIR)/sbin ++ @$(INSTALL) -m 0755 $(GRADM_BIN) $(DESTDIR)$(SBINDIR) + @if [ -f $(GRADM_PAM) ] ; then \ + echo "Installing gradm_pam..." ; \ +- $(INSTALL) -m 4755 $(GRADM_PAM) $(DESTDIR)/sbin ; \ ++ $(INSTALL) -m 4755 $(GRADM_PAM) $(DESTDIR)$(SBINDIR) ; \ + fi + @echo "Installing grlearn..." +- @$(INSTALL) -m 0700 grlearn $(DESTDIR)/sbin ++ @$(INSTALL) -m 0700 grlearn $(DESTDIR)$(SBINDIR) + @mkdir -p -m 700 $(DESTDIR)$(GRSEC_DIR) + @if [ ! -f $(DESTDIR)$(GRSEC_DIR)/policy ] ; then \ + if [ -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \ +@@ -170,15 +171,15 @@ install: $(GRADM_BIN) gradm.8 policy grlearn + echo "KERNEL==\"grsec\", MODE=\"0622\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \ + echo "LABEL=\"permissions_end\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \ + fi +- @if [ -f $(DESTDIR)/sbin/udevadm ] ; then \ +- $(DESTDIR)/sbin/udevadm trigger --action=change ; \ ++ @if [ -f $(DESTDIR)$(SBINDIR)/udevadm ] ; then \ ++ $(DESTDIR)$(SBINDIR)/udevadm trigger --action=change ; \ + fi + @echo "Installing gradm manpage..." + @mkdir -p $(DESTDIR)$(MANDIR)/man8 + @$(INSTALL) -m 0644 gradm.8 $(DESTDIR)$(MANDIR)/man8/$(GRADM_BIN).8 +- @if [ -x /sbin/$(GRADM_BIN) ] ; then \ ++ @if [ -x $(SBINDIR)/$(GRADM_BIN) ] ; then \ + if [ -z $(DESTDIR) ] && [ ! -f $(GRSEC_DIR)/pw ] ; then \ +- /sbin/$(GRADM_BIN) -P ; \ ++ $(SBINDIR)/$(GRADM_BIN) -P ; \ + fi \ + fi + @true +-- +2.36.0 + diff --git a/meta-oe/recipes-support/gradm/gradm_3.1.bb b/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb index 1a4261a9ea..6238a04d96 100644 --- a/meta-oe/recipes-support/gradm/gradm_3.1.bb +++ b/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb @@ -7,16 +7,18 @@ via a password to the kernel and parsing rules to be passed to the \ kernel" HOMEPAGE = "http://grsecurity.net/index.php" SECTION = "admin" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b" DEPENDS = "flex-native bison-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -SRC_URI = "http://grsecurity.net/stable/${BP}-201507191652.tar.gz \ +SRC_URI = "http://grsecurity.net/stable/${BP}.tar.gz \ file://0001-Makefile-remove-strip.patch \ file://0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch \ + file://0001-make-Define-SBINDIR-flag.patch \ " -SRC_URI[md5sum] = "ecec72d3a9b6d84c00eda97957b707b6" -SRC_URI[sha256sum] = "2f14c357bf0459e502a4e108b76c3f6240aa484762d07bb1687796b9b9297a50" +SRC_URI[sha256sum] = "2459290f367a47c8a1ce4ea2ec08359799ea33dc15ed4436439596ce88284fb9" + +UPSTREAM_CHECK_URI = "https://grsecurity.net/download" S = "${WORKDIR}/gradm" @@ -24,6 +26,7 @@ inherit autotools-brokensep do_compile() { oe_runmake 'CC=${CC}' \ + 'LIBS=' \ 'OPT_FLAGS=${CFLAGS}' \ 'LLEX=${STAGING_BINDIR_NATIVE}/lex' \ 'FLEX=${STAGING_BINDIR_NATIVE}/flex' \ @@ -34,6 +37,8 @@ do_compile() { do_install() { oe_runmake 'CC=${CC}' \ 'DESTDIR=${D}' \ + 'SBINDIR=${base_sbindir}' \ + 'LIBS=' \ 'LLEX=${STAGING_BINDIR_NATIVE}/lex' \ 'FLEX=${STAGING_BINDIR_NATIVE}/flex' \ 'BISON=${STAGING_BINDIR_NATIVE}/bison' \ @@ -43,10 +48,6 @@ do_install() { rm -rf ${D}/dev } -pkg_postinst_${PN}() { - # make sure running on the target - if [ x"$D" != "x" ]; then - exit 1 - fi +pkg_postinst_ontarget:${PN}() { /bin/mknod -m 0622 /dev/grsec c 1 13 } diff --git a/meta-oe/recipes-support/gsl/gsl.inc b/meta-oe/recipes-support/gsl/gsl.inc index 40613930b5..d0fa9344eb 100644 --- a/meta-oe/recipes-support/gsl/gsl.inc +++ b/meta-oe/recipes-support/gsl/gsl.inc @@ -1,9 +1,12 @@ DESCRIPTION = "GNU Scientific Library" HOMEPAGE = "http://www.gnu.org/software/gsl/" SECTION = "libs" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit autotools pkgconfig binconfig LEAD_SONAME = "libgsl.so" + +# Uses fpu_control.h which is glibc only header see ieee-utils/fp-gnuppc.c +COMPATIBLE_HOST:libc-musl:powerpc = "null" diff --git a/meta-oe/recipes-support/gsl/gsl_1.15.bb b/meta-oe/recipes-support/gsl/gsl_1.15.bb deleted file mode 100644 index 620e7804c4..0000000000 --- a/meta-oe/recipes-support/gsl/gsl_1.15.bb +++ /dev/null @@ -1,7 +0,0 @@ -include gsl.inc - -SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" - -SRC_URI[md5sum] = "494ffefd90eef4ada678c306bab4030b" -SRC_URI[sha256sum] = "85b907e57902e2b7606ef3aef960302ffdd13bd9dc5b8fcbfa75e4f0bf340ea3" - diff --git a/meta-oe/recipes-support/gsl/gsl_2.8.bb b/meta-oe/recipes-support/gsl/gsl_2.8.bb new file mode 100644 index 0000000000..45c776112b --- /dev/null +++ b/meta-oe/recipes-support/gsl/gsl_2.8.bb @@ -0,0 +1,4 @@ +include gsl.inc + +SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" +SRC_URI[sha256sum] = "6a99eeed15632c6354895b1dd542ed5a855c0f15d9ad1326c6fe2b2c9e423190" diff --git a/meta-oe/recipes-support/gsoap/gsoap/0001-Fix-out-of-tree-builds.patch b/meta-oe/recipes-support/gsoap/gsoap/0001-Fix-out-of-tree-builds.patch deleted file mode 100644 index 5ceb4bf025..0000000000 --- a/meta-oe/recipes-support/gsoap/gsoap/0001-Fix-out-of-tree-builds.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 8a10b6bd556426616e93f15639f369defbeca33f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 14 Aug 2017 11:58:58 -0700 -Subject: [PATCH] Fix out of tree builds - -When build dir is not same as sourcedir then the build failed due -to use of $(srcdir) variable which assumes source = build therefore -replace that with top_srcdir - -Additionally move the conditional addition of sources to Makefile.am -instead of adding it in configure.ac, since then we can use top_srcdir -variable to access those sources too otherwise its not possible to -specify the right dir for these sources - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted[https://sourceforge.net/p/gsoap2/patches/171/] - - configure.ac | 5 +++-- - gsoap/Makefile.am | 14 +++++++------- - gsoap/samples/autotest/Makefile.am | 8 ++++---- - gsoap/samples/databinding/Makefile.am | 8 ++++---- - gsoap/wsdl/Makefile.am | 15 +++++++++------ - 5 files changed, 27 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0631c18..c36e696 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -265,7 +265,7 @@ if test "x$with_openssl" = "xyes"; then - WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" - # an ugly hack to get httpda and smdevp plugins to conditionally - # compile with wsdl2h when OPENSSL is available -- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lssl -lcrypto -lz" -+ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz" - SAMPLE_INCLUDES= - SAMPLE_SSL_LIBS="-lssl -lcrypto -lz" - WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" -@@ -289,12 +289,13 @@ else - SAMPLE_INCLUDES= - WSDL2H_SOAP_CPP_LIB="libgsoap++.a" - fi -+AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes") -+AC_SUBST(WITH_OPENSSL) - AC_SUBST(WSDL2H_EXTRA_FLAGS) - AC_SUBST(WSDL2H_EXTRA_LIBS) - AC_SUBST(SAMPLE_INCLUDES) - AC_SUBST(SAMPLE_SSL_LIBS) - AC_SUBST(WSDL2H_SOAP_CPP_LIB) -- - # enable the compile of the samples - AC_ARG_ENABLE(samples, - [ --enable-samples enable compile for the gsoap samples], -diff --git a/gsoap/Makefile.am b/gsoap/Makefile.am -index 7273b82..9c0c89f 100644 ---- a/gsoap/Makefile.am -+++ b/gsoap/Makefile.am -@@ -13,26 +13,26 @@ AM_CXXFLAGS = $(SOAPCPP2_DEBUG) -D$(platform) - AM_CFLAGS = $(SOAPCPP2_DEBUG) -D$(platform) - - # Install all soapcpp2 and wsdl2h files into ${prefix}/share/gsoap --nobase_pkgdata_DATA = $(srcdir)/import/* $(srcdir)/plugin/* $(srcdir)/WS/* $(srcdir)/custom/* $(srcdir)/extras/* -+nobase_pkgdata_DATA = $(top_srcdir)/gsoap/import/* $(top_srcdir)/gsoap/plugin/* $(top_srcdir)/gsoap/WS/* $(top_srcdir)/gsoap/custom/* $(top_srcdir)/gsoap/extras/* - - ## we cannot build stdsoap2.o from 2 different sources (stdsoap2.cpp and stdsoap2.c), so we need an intermediate target: - stdsoap2_ck.c: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ck.c -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_ck.c - - stdsoap2_cpp.cpp: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_cpp.cpp -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_cpp.cpp - - stdsoap2_ck_cpp.cpp: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ck_cpp.cpp -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_ck_cpp.cpp - - stdsoap2_ssl.c: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl.c -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_ssl.c - - stdsoap2_ssl_cpp.cpp: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl_cpp.cpp -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_ssl_cpp.cpp - ## do the same fo dom.cpp since we want to link it into the cpp libs and dom.c into the c libs - dom_cpp.cpp: dom.cpp -- $(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp -+ $(LN_S) -f $(top_srcdir)/gsoap/dom.cpp dom_cpp.cpp - - lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a - -diff --git a/gsoap/samples/autotest/Makefile.am b/gsoap/samples/autotest/Makefile.am -index 36adf51..61e514c 100644 ---- a/gsoap/samples/autotest/Makefile.am -+++ b/gsoap/samples/autotest/Makefile.am -@@ -6,13 +6,13 @@ - AUTOMAKE_OPTIONS = subdir-objects foreign 1.4 - - CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin --AM_LDFLAGS=$(CPPFLAGS) -I$(srcdir) -L$(srcdir) -+AM_LDFLAGS=$(CPPFLAGS) -I$(top_srcdir)/gsoap/samples/autotest -L$(top_srcdir)/gsoap/samples/autotest - SOAP=$(top_srcdir)/gsoap/src/soapcpp2$(EXEEXT) - WSDL=$(top_srcdir)/gsoap/wsdl/wsdl2h$(EXEEXT) --WSDL_FLAGS=-d -P -t $(srcdir)/typemap.dat -+WSDL_FLAGS=-d -P -t $(top_srcdir)/gsoap/samples/autotest/typemap.dat - SOAP_FLAGS=-SL -T -I$(top_srcdir)/gsoap/import -I$(top_srcdir)/gsoap/custom --WSDLINPUT=$(srcdir)/examples.wsdl --SOAPHEADER=$(srcdir)/examples.h -+WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl -+SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h - SOAP_CPP_SRC=soapC.cpp soapServer.cpp - SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a - -diff --git a/gsoap/samples/databinding/Makefile.am b/gsoap/samples/databinding/Makefile.am -index 892d4fd..86ad482 100644 ---- a/gsoap/samples/databinding/Makefile.am -+++ b/gsoap/samples/databinding/Makefile.am -@@ -6,13 +6,13 @@ - AUTOMAKE_OPTIONS = subdir-objects foreign 1.4 - - CPPFLAGS=$(SAMPLE_INCLUDES) -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin --AM_LDFLAGS=$(AM_CPPFLAGS) -I$(srcdir) -L$(srcdir) -+AM_LDFLAGS=$(AM_CPPFLAGS) -I$(top_srcdir)/gsoap/samples/databinding -L$(top_srcdir)/gsoap/samples/databinding - SOAP=$(top_srcdir)/gsoap/src/soapcpp2$(EXEEXT) - WSDL=$(top_srcdir)/gsoap/wsdl/wsdl2h$(EXEEXT) --WSDL_FLAGS=-g -t $(srcdir)/addresstypemap.dat -+WSDL_FLAGS=-g -t $(top_srcdir)/gsoap/samples/databinding/addresstypemap.dat - SOAP_FLAGS=-0 -CS -p address -I$(top_srcdir)/gsoap/import --WSDLINPUT=$(srcdir)/address.xsd --SOAPHEADER=$(srcdir)/address.h -+WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd -+SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h - SOAP_CPP_SRC=addressC.cpp - SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a - -diff --git a/gsoap/wsdl/Makefile.am b/gsoap/wsdl/Makefile.am -index b8da5db..9f2aefa 100644 ---- a/gsoap/wsdl/Makefile.am -+++ b/gsoap/wsdl/Makefile.am -@@ -6,14 +6,14 @@ - AUTOMAKE_OPTIONS = foreign 1.4 - - # INCLUDES=-I$(top_srcdir)/gsoap --# AM_LDFLAGS=$(INCLUDES) -I$(srcdir) -L$(srcdir) --AM_LDFLAGS=-L$(srcdir) -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin -+# AM_LDFLAGS=$(INCLUDES) -I$(top_srcdir)/gsoap/wsdl -L$(top_srcdir)/gsoap/wsdl -+AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin - AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin - SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT) - SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB) - SOAP_CPP_SRC=wsdlC.cpp --SOAPHEADER=$(srcdir)/wsdl.h --SOAP_FLAGS=-SC -pwsdl -I$(srcdir) -I$(top_srcdir)/gsoap/import -+SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h -+SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import - BUILT_SOURCES=$(SOAP_CPP_SRC) - # WSDL2H_EXTRA_FLAGS=-DWITH_OPENSSL -DWITH_GZIP # defined in configure.in - # WSDL2H_EXTRA_LIBS=-lssl -lcrypto -lz # defined in configure.in -@@ -24,11 +24,14 @@ $(SOAP_CPP_SRC) : $(SOAPHEADER) - #LIBS= - - bin_PROGRAMS=wsdl2h -- -+if WITH_OPENSSL -+wsdl2h_LDADD=$(SOAP_CPP_LIB) $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c $(WSDL2H_EXTRA_LIBS) -+else -+wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS) -+endif - wsdl2h_CFLAGS=$(C_DEBUG_FLAGS) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS) - wsdl2h_CXXFLAGS=$(C_DEBUG_FLAGS) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH) - wsdl2h_CPPFLAGS=$(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform) - wsdl2h_SOURCES=wsdl2h.cpp wsdl.cpp wadl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC) --wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS) - - CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap --- -2.14.1 - diff --git a/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch b/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch new file mode 100644 index 0000000000..df27a59ee7 --- /dev/null +++ b/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch @@ -0,0 +1,85 @@ +From 2b7a51556185539a0f9baef0f109e0814933d6b3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 19 May 2024 17:11:20 -0700 +Subject: [PATCH] Provide strtod_l signature on non-glibc linux ( musl ) + systems + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gsoap/stdsoap2.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/gsoap/stdsoap2.cpp ++++ b/gsoap/stdsoap2.cpp +@@ -74,6 +74,11 @@ A commercial use license is available fr + + #include "stdsoap2.h" + ++#if defined(__linux__) && !defined(__GLIBC__) ++struct __locale_struct; ++double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *); ++#endif ++ + #if GSOAP_VERSION != GSOAP_LIB_VERSION + # error "GSOAP VERSION MISMATCH IN LIBRARY: PLEASE REINSTALL PACKAGE" + #endif +@@ -5457,7 +5462,7 @@ tcp_gethostbyname(struct soap *soap, con + { + #if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R) + struct hostent_data ht_data; +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) + int r; + char *tmpbuf = soap->tmpbuf; + size_t tmplen = sizeof(soap->tmpbuf); +@@ -5490,7 +5495,7 @@ tcp_gethostbyname(struct soap *soap, con + hostent = NULL; + soap->errnum = h_errno; + } +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) + while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) + { + if (tmpbuf != soap->tmpbuf) +@@ -23192,7 +23197,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) ++# if !defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); +--- a/gsoap/stdsoap2.c ++++ b/gsoap/stdsoap2.c +@@ -74,6 +74,11 @@ A commercial use license is available fr + + #include "stdsoap2.h" + ++#if defined(__linux__) && !defined(__GLIBC__) ++struct __locale_struct; ++double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *); ++#endif ++ + #if GSOAP_VERSION != GSOAP_LIB_VERSION + # error "GSOAP VERSION MISMATCH IN LIBRARY: PLEASE REINSTALL PACKAGE" + #endif +@@ -5490,7 +5495,7 @@ tcp_gethostbyname(struct soap *soap, con + hostent = NULL; + soap->errnum = h_errno; + } +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) + while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) + { + if (tmpbuf != soap->tmpbuf) +@@ -23192,7 +23197,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) ++# if !defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); diff --git a/meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch b/meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch deleted file mode 100644 index 571cbe5409..0000000000 --- a/meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch +++ /dev/null @@ -1,63 +0,0 @@ -From db260fbc7af4c73c997c485a0c69c61594a0e59c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 30 Aug 2017 19:48:50 -0700 -Subject: [PATCH] stdgsoap2: Fix build with musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gsoap/stdsoap2.c | 2 +- - gsoap/stdsoap2.cpp | 4 ++-- - gsoap/stdsoap2.h | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c -index 58e9df4..62389e1 100644 ---- a/gsoap/stdsoap2.c -+++ b/gsoap/stdsoap2.c -@@ -4462,7 +4462,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr) - return soap->error = SOAP_EOM; - return SOAP_OK; - } --#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) -+#if defined(LINUX) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) - if (gethostbyname_r(addr, &hostent, soap->buf, sizeof(soap->buf), &host, &soap->errnum) < 0) - host = NULL; - #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) -diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp -index 58e9df4..b637161 100644 ---- a/gsoap/stdsoap2.cpp -+++ b/gsoap/stdsoap2.cpp -@@ -4462,7 +4462,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr) - return soap->error = SOAP_EOM; - return SOAP_OK; - } --#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) -+#if defined(LINUX) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) - if (gethostbyname_r(addr, &hostent, soap->buf, sizeof(soap->buf), &host, &soap->errnum) < 0) - host = NULL; - #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) -@@ -19658,7 +19658,7 @@ soap_strerror(struct soap *soap) - { - #ifndef WIN32 - # ifdef HAVE_STRERROR_R --# if defined(_GNU_SOURCE) && !defined(__ANDROID__) -+# if defined(_GNU_SOURCE) && !defined(__ANDROID__) && defined(__GLIBC__) - return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* GNU-specific */ - # else - strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ -diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h -index 07a3952..c6ace4c 100644 ---- a/gsoap/stdsoap2.h -+++ b/gsoap/stdsoap2.h -@@ -947,7 +947,7 @@ extern "C" { - # endif - #elif defined(SOCKLEN_T) - # define SOAP_SOCKLEN_T SOCKLEN_T --#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__ANDROID__) || defined(_XOPEN_SOURCE) -+#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__ANDROID__) || defined(_XOPEN_SOURCE) || defined (LINUX) - # define SOAP_SOCKLEN_T socklen_t - #elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS) - # define SOAP_SOCKLEN_T int --- -2.14.1 - diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb new file mode 100644 index 0000000000..5528e87e6c --- /dev/null +++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "The gSOAP toolkit provides a unique SOAP-to-C/C++ language binding \ +for the development of SOAP Web Services and clients." +SECTION = "devel" +LICENSE = "GPL-2.0-with-OpenSSL-exception" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ + file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" + +SRC_URI = "https://prdownloads.sourceforge.net/${BPN}2/${BPN}_${PV}.zip \ + file://0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch" +SRC_URI[sha256sum] = "63478e555c0ccde0164f055ff605b02805db0abc6712a04bcb14cb617b047218" + +inherit autotools + +BBCLASSEXTEND = "native" + +S = "${WORKDIR}/${BPN}-2.8" + +EXTRA_OECONF += "--enable-ipv6 --enable-c-locale" +PARALLEL_MAKE = "" + +EXTRA_OEMAKE:class-target = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2" + +DEPENDS = "openssl zlib flex bison bison-native" +DEPENDS:append:class-target = " gsoap-native" + +do_install:append() { + install -d ${D}${libdir} + for lib in libgsoapssl libgsoapssl++ libgsoap libgsoapck++ libgsoap++ libgsoapck + do + oe_libinstall -C gsoap $lib ${D}${libdir} + done +} + +do_install:class-native() { + oe_runmake DESTDIR=${D} BINDIR=${D}${bindir} install +} + +FILES:${PN} = "${bindir}/wsdl2h ${bindir}/soapcpp2" +FILES:${PN} += "${datadir}" +FILES:${PN}-staticdev = "${libdir}" +FILES:${PN}-dev = "${includedir}" +RRECOMMENDS:${PN}-dev = "${PN}-staticdev" diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.51.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.51.bb deleted file mode 100644 index 8875844615..0000000000 --- a/meta-oe/recipes-support/gsoap/gsoap_2.8.51.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "The gSOAP toolkit provides a unique SOAP-to-C/C++ language binding \ -for the development of SOAP Web Services and clients." -SECTION = "devel" -LICENSE = "GPL-2.0-with-OpenSSL-exception" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ - file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \ - file://0001-Fix-out-of-tree-builds.patch \ - file://0001-stdgsoap2-Fix-build-with-musl.patch \ - " -SRC_URI[md5sum] = "212951d6e1435bb51fa4320f458809ea" -SRC_URI[sha256sum] = "3e7bb24a9e492f5cb86daca34054c9787152f1d7b70add36b789d03816d5ffa1" - -inherit autotools - -BBCLASSEXTEND = "native" - -S = "${WORKDIR}/${BPN}-2.8" - -PARALLEL_MAKE = "" - -EXTRA_OEMAKE_class-target = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2" - -DEPENDS = "openssl zlib flex bison" -DEPENDS_append_class-target = " gsoap-native" - -do_install_append() { - install -d ${D}${libdir} - for lib in libgsoapssl libgsoapssl++ libgsoap libgsoapck++ libgsoap++ libgsoapck - do - oe_libinstall -C gsoap $lib ${D}${libdir} - done -} - -do_install_class-native() { - oe_runmake DESTDIR=${D} BINDIR=${D}${bindir} install -} - -FILES_${PN} = "${bindir}/wsdl2h ${bindir}/soapcpp2" -FILES_${PN} += "${datadir}" -FILES_${PN}-staticdev = "${libdir}" -FILES_${PN}-dev = "${includedir}" -RRECOMMENDS_${PN}-dev = "${PN}-staticdev" diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/0001-configure.ac-Rename-to-configure.ac-and-use-external.patch b/meta-oe/recipes-support/hddtemp/hddtemp/0001-configure.ac-Rename-to-configure.ac-and-use-external.patch new file mode 100644 index 0000000000..d2de0bbe61 --- /dev/null +++ b/meta-oe/recipes-support/hddtemp/hddtemp/0001-configure.ac-Rename-to-configure.ac-and-use-external.patch @@ -0,0 +1,703 @@ +From d7e6fe2ac69333c2d943a4b8eb139373d1fb2ce2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 31 Dec 2019 18:08:09 -0800 +Subject: [PATCH] configure.ac: Rename to configure.ac and use external gettext + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 81 insertions(+) + create mode 100644 configure.ac + +--- /dev/null ++++ b/configure.ac +@@ -0,0 +1,81 @@ ++dnl Process this file with autoconf to produce a configure script. ++ ++# Initialization ++AC_INIT ++AC_CONFIG_SRCDIR([Makefile.am]) ++AC_CONFIG_HEADERS([config.h]) ++ ++# Determine the host and build type. The target is always a PIC. ++AC_CANONICAL_HOST ++ ++AM_INIT_AUTOMAKE(hddtemp, 0.3-beta15) ++ ++dnl Checks for programs. ++AC_PROG_CC ++AC_PROG_INSTALL ++ ++# append the host alias to the tools for cross compiling ++AC_HEADER_STDC ++AC_CHECK_HEADERS(fcntl.h) ++AC_CHECK_HEADERS(iconv.h) ++AC_CHECK_HEADERS(netinet/in.h) ++AC_CHECK_TYPE(in_addr_t, ,[AC_DEFINE_UNQUOTED([in_addr_t], [uint32_t], [Define to 'uint32_t' if <netinet/in.h> does not define.])], [#include <netinet/in.h>]) ++ ++# Checks for typedefs, structures, and compiler characteristics. ++AC_C_CONST ++AC_STRUCT_TM ++ ++dnl internationalization macros ++AM_GNU_GETTEXT([external]) ++ ++AC_CHECK_FUNCS([bindtextdomain textdomain iconv]) ++ ++dnl reasonable guesses for where stuff is installed ++dnl if we don't do that now, the config.h will use ${prefix} ++dnl for DEFAULT_DATABASE_PATH. ++if test "x$prefix" = "xNONE"; then ++ prefix="/usr/local" ++fi ++if test "x$exec_prefix" = "xNONE"; then ++ exec_prefix=$prefix ++fi ++ ++AC_MSG_CHECKING([Location of hddtemp.db]) ++DEFAULT_DATABASE_PATH= ++#db_path=\"`eval echo ${datadir}`/misc/hddtemp.db\" ++db_path=\"/usr/share/misc/hddtemp.db\" ++AC_ARG_WITH(db_path, ++ [ --with-db-path=PATH \ ++ Default location of hddtemp.db file [/usr/share/misc/hddtemp.db]], ++ [ if test -d "$withval"; then ++ AC_MSG_FAILURE([new file name for db-path]) ++ fi ++ DEFAULT_DATABASE_PATH="\"$withval\"" ++ ], ++ [ DEFAULT_DATABASE_PATH="$db_path" ]) ++AC_MSG_RESULT($DEFAULT_DATABASE_PATH) ++AC_DEFINE_UNQUOTED([DEFAULT_DATABASE_PATH], [$DEFAULT_DATABASE_PATH], [Default location of drive info database]) ++ ++#CFLAGS="$CFLAGS -Wall -fomit-frame-pointer -Wcast-align" ++CFLAGS="$CFLAGS -Wall -W -Wcast-align" ++ ++# Substitute configuration variables ++AC_CONFIG_FILES([Makefile \ ++po/Makefile.in \ ++m4/Makefile \ ++src/Makefile \ ++doc/Makefile \ ++]) ++AC_OUTPUT ++ ++AC_MSG_RESULT([ ++ ++hddtemp-$VERSION is now configured for $canonical_host_type ++ ++ Build: $build ++ Host: $host ++ Source directory: $srcdir ++ Installation prefix: $prefix ++ C compiler: $CC $CFLAGS ++ ++]) +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,7 +12,7 @@ EXTRA_DIST = config.rpath autogen.sh \ + README \ + TODO + +-SUBDIRS = intl po m4 src doc ++SUBDIRS = po m4 src doc + + CLEANFILES = *~ + +--- a/configure.in ++++ /dev/null +@@ -1,83 +0,0 @@ +-dnl Process this file with autoconf to produce a configure script. +- +-# Initialization +-AC_INIT +-AC_CONFIG_SRCDIR([Makefile.am]) +-AC_CONFIG_HEADERS([config.h]) +- +-# Determine the host and build type. The target is always a PIC. +-AC_CANONICAL_HOST +- +-AM_INIT_AUTOMAKE(hddtemp, 0.3-beta15) +- +-dnl Checks for programs. +-AC_PROG_CC +-AC_PROG_INSTALL +- +-# append the host alias to the tools for cross compiling +-AC_HEADER_STDC +-AC_CHECK_HEADERS(fcntl.h) +-AC_CHECK_HEADERS(iconv.h) +-AC_CHECK_HEADERS(netinet/in.h) +-AC_CHECK_TYPE(in_addr_t, ,[AC_DEFINE_UNQUOTED([in_addr_t], [uint32_t], [Define to 'uint32_t' if <netinet/in.h> does not define.])], [#include <netinet/in.h>]) +- +-# Checks for typedefs, structures, and compiler characteristics. +-AC_C_CONST +-AC_STRUCT_TM +- +-dnl internationalization macros +-AM_GNU_GETTEXT_VERSION +-AM_GNU_GETTEXT +-#AM_GNU_GETTEXT([external]) +- +-AC_CHECK_FUNCS([bindtextdomain textdomain iconv]) +- +-dnl reasonable guesses for where stuff is installed +-dnl if we don't do that now, the config.h will use ${prefix} +-dnl for DEFAULT_DATABASE_PATH. +-if test "x$prefix" = "xNONE"; then +- prefix="/usr/local" +-fi +-if test "x$exec_prefix" = "xNONE"; then +- exec_prefix=$prefix +-fi +- +-AC_MSG_CHECKING([Location of hddtemp.db]) +-DEFAULT_DATABASE_PATH= +-#db_path=\"`eval echo ${datadir}`/misc/hddtemp.db\" +-db_path=\"/usr/share/misc/hddtemp.db\" +-AC_ARG_WITH(db_path, +- [ --with-db-path=PATH \ +- Default location of hddtemp.db file [/usr/share/misc/hddtemp.db]], +- [ if test -d "$withval"; then +- AC_MSG_FAILURE([new file name for db-path]) +- fi +- DEFAULT_DATABASE_PATH="\"$withval\"" +- ], +- [ DEFAULT_DATABASE_PATH="$db_path" ]) +-AC_MSG_RESULT($DEFAULT_DATABASE_PATH) +-AC_DEFINE_UNQUOTED([DEFAULT_DATABASE_PATH], [$DEFAULT_DATABASE_PATH], [Default location of drive info database]) +- +-#CFLAGS="$CFLAGS -Wall -fomit-frame-pointer -Wcast-align" +-CFLAGS="$CFLAGS -Wall -W -Wcast-align" +- +-# Substitute configuration variables +-AC_CONFIG_FILES([Makefile intl/Makefile \ +-po/Makefile.in \ +-m4/Makefile \ +-src/Makefile \ +-doc/Makefile \ +-]) +-AC_OUTPUT +- +-AC_MSG_RESULT([ +- +-hddtemp-$VERSION is now configured for $canonical_host_type +- +- Build: $build +- Host: $host +- Source directory: $srcdir +- Installation prefix: $prefix +- C compiler: $CC $CFLAGS +- +-]) +--- a/intl/ChangeLog ++++ /dev/null +@@ -1,4 +0,0 @@ +-2005-02-24 GNU <bug-gnu-gettext@gnu.org> +- +- * Version 0.14.2 released. +- +--- a/intl/Makefile.in ++++ /dev/null +@@ -1,500 +0,0 @@ +-# Makefile for directory with message catalog handling library of GNU gettext +-# Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc. +-# +-# This program is free software; you can redistribute it and/or modify it +-# under the terms of the GNU Library General Public License as published +-# by the Free Software Foundation; either version 2, or (at your option) +-# any later version. +-# +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-# Library General Public License for more details. +-# +-# You should have received a copy of the GNU Library General Public +-# License along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +-# USA. +- +-PACKAGE = @PACKAGE@ +-VERSION = @VERSION@ +- +-SHELL = /bin/sh +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ +-top_builddir = .. +-VPATH = $(srcdir) +- +-prefix = @prefix@ +-exec_prefix = @exec_prefix@ +-transform = @program_transform_name@ +-libdir = @libdir@ +-includedir = @includedir@ +-datadir = @datadir@ +-localedir = $(datadir)/locale +-gettextsrcdir = $(datadir)/gettext/intl +-aliaspath = $(localedir) +-subdir = intl +- +-INSTALL = @INSTALL@ +-INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) +- +-l = @INTL_LIBTOOL_SUFFIX_PREFIX@ +- +-AR = ar +-CC = @CC@ +-LIBTOOL = @LIBTOOL@ +-RANLIB = @RANLIB@ +-YACC = @INTLBISON@ -y -d +-YFLAGS = --name-prefix=__gettext +- +-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ +--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \ +--DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \ +--Dset_relocation_prefix=libintl_set_relocation_prefix \ +--Drelocate=libintl_relocate \ +--DDEPENDS_ON_LIBICONV=1 @DEFS@ +-CPPFLAGS = @CPPFLAGS@ +-CFLAGS = @CFLAGS@ +-LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ +- +-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) +- +-HEADERS = \ +- gmo.h \ +- gettextP.h \ +- hash-string.h \ +- loadinfo.h \ +- plural-exp.h \ +- eval-plural.h \ +- localcharset.h \ +- relocatable.h \ +- xsize.h \ +- printf-args.h printf-args.c \ +- printf-parse.h wprintf-parse.h printf-parse.c \ +- vasnprintf.h vasnwprintf.h vasnprintf.c \ +- os2compat.h \ +- libgnuintl.h.in +-SOURCES = \ +- bindtextdom.c \ +- dcgettext.c \ +- dgettext.c \ +- gettext.c \ +- finddomain.c \ +- loadmsgcat.c \ +- localealias.c \ +- textdomain.c \ +- l10nflist.c \ +- explodename.c \ +- dcigettext.c \ +- dcngettext.c \ +- dngettext.c \ +- ngettext.c \ +- plural.y \ +- plural-exp.c \ +- localcharset.c \ +- relocatable.c \ +- langprefs.c \ +- localename.c \ +- log.c \ +- printf.c \ +- osdep.c \ +- os2compat.c \ +- intl-compat.c +-OBJECTS = \ +- bindtextdom.$lo \ +- dcgettext.$lo \ +- dgettext.$lo \ +- gettext.$lo \ +- finddomain.$lo \ +- loadmsgcat.$lo \ +- localealias.$lo \ +- textdomain.$lo \ +- l10nflist.$lo \ +- explodename.$lo \ +- dcigettext.$lo \ +- dcngettext.$lo \ +- dngettext.$lo \ +- ngettext.$lo \ +- plural.$lo \ +- plural-exp.$lo \ +- localcharset.$lo \ +- relocatable.$lo \ +- langprefs.$lo \ +- localename.$lo \ +- log.$lo \ +- printf.$lo \ +- osdep.$lo \ +- intl-compat.$lo +-DISTFILES.common = Makefile.in \ +-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES) +-DISTFILES.generated = plural.c +-DISTFILES.normal = VERSION +-DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \ +-libgnuintl.h_vms Makefile.vms \ +-libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc +-DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \ +-COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h +- +-all: all-@USE_INCLUDED_LIBINTL@ +-all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed +-all-no: all-no-@BUILD_INCLUDED_LIBINTL@ +-all-no-yes: libgnuintl.$la +-all-no-no: +- +-libintl.a libgnuintl.a: $(OBJECTS) +- rm -f $@ +- $(AR) cru $@ $(OBJECTS) +- $(RANLIB) $@ +- +-libintl.la libgnuintl.la: $(OBJECTS) +- $(LIBTOOL) --mode=link \ +- $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ +- $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) -lc \ +- -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ +- -rpath $(libdir) \ +- -no-undefined +- +-# Libtool's library version information for libintl. +-# Before making a gettext release, the gettext maintainer must change this +-# according to the libtool documentation, section "Library interface versions". +-# Maintainers of other packages that include the intl directory must *not* +-# change these values. +-LTV_CURRENT=7 +-LTV_REVISION=1 +-LTV_AGE=4 +- +-.SUFFIXES: +-.SUFFIXES: .c .y .o .lo .sin .sed +- +-.c.o: +- $(COMPILE) $< +- +-.y.c: +- $(YACC) $(YFLAGS) --output $@ $< +- rm -f $*.h +- +-bindtextdom.lo: $(srcdir)/bindtextdom.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c +-dcgettext.lo: $(srcdir)/dcgettext.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c +-dgettext.lo: $(srcdir)/dgettext.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c +-gettext.lo: $(srcdir)/gettext.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c +-finddomain.lo: $(srcdir)/finddomain.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c +-loadmsgcat.lo: $(srcdir)/loadmsgcat.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c +-localealias.lo: $(srcdir)/localealias.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c +-textdomain.lo: $(srcdir)/textdomain.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c +-l10nflist.lo: $(srcdir)/l10nflist.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c +-explodename.lo: $(srcdir)/explodename.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c +-dcigettext.lo: $(srcdir)/dcigettext.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c +-dcngettext.lo: $(srcdir)/dcngettext.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c +-dngettext.lo: $(srcdir)/dngettext.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c +-ngettext.lo: $(srcdir)/ngettext.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c +-plural.lo: $(srcdir)/plural.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c +-plural-exp.lo: $(srcdir)/plural-exp.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c +-localcharset.lo: $(srcdir)/localcharset.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c +-relocatable.lo: $(srcdir)/relocatable.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c +-langprefs.lo: $(srcdir)/langprefs.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/langprefs.c +-localename.lo: $(srcdir)/localename.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c +-log.lo: $(srcdir)/log.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c +-printf.lo: $(srcdir)/printf.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c +-osdep.lo: $(srcdir)/osdep.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c +-intl-compat.lo: $(srcdir)/intl-compat.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c +- +-ref-add.sed: $(srcdir)/ref-add.sin +- sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed +- mv t-ref-add.sed ref-add.sed +-ref-del.sed: $(srcdir)/ref-del.sin +- sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed +- mv t-ref-del.sed ref-del.sed +- +-INCLUDES = -I. -I$(srcdir) -I.. +- +-libgnuintl.h: $(srcdir)/libgnuintl.h.in +- sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \ +- -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ +- -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ +- -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ +- < $(srcdir)/libgnuintl.h.in > libgnuintl.h +- +-libintl.h: libgnuintl.h +- cp libgnuintl.h libintl.h +- +-charset.alias: $(srcdir)/config.charset +- $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ +- mv t-$@ $@ +- +-check: all +- +-# We must not install the libintl.h/libintl.a files if we are on a +-# system which has the GNU gettext() function in its C library or in a +-# separate library. +-# If you want to use the one which comes with this version of the +-# package, you have to use `configure --with-included-gettext'. +-install: install-exec install-data +-install-exec: all +- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ +- && test '@USE_INCLUDED_LIBINTL@' = yes; then \ +- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ +- $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ +- $(LIBTOOL) --mode=install \ +- $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ +- if test "@RELOCATABLE@" = yes; then \ +- dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \ +- if test -n "$$dependencies"; then \ +- rm -f $(DESTDIR)$(libdir)/libintl.la; \ +- fi; \ +- fi; \ +- else \ +- : ; \ +- fi +- if test "$(PACKAGE)" = "gettext-tools" \ +- && test '@USE_INCLUDED_LIBINTL@' = no \ +- && test @GLIBC2@ != no; then \ +- $(mkinstalldirs) $(DESTDIR)$(libdir); \ +- $(LIBTOOL) --mode=install \ +- $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \ +- rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \ +- $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \ +- $(LIBTOOL) --mode=uninstall \ +- rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \ +- else \ +- : ; \ +- fi +- if test '@USE_INCLUDED_LIBINTL@' = yes; then \ +- test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ +- temp=$(DESTDIR)$(libdir)/t-charset.alias; \ +- dest=$(DESTDIR)$(libdir)/charset.alias; \ +- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ +- orig=$(DESTDIR)$(libdir)/charset.alias; \ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ +- else \ +- if test @GLIBC21@ = no; then \ +- orig=charset.alias; \ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ +- fi; \ +- fi; \ +- $(mkinstalldirs) $(DESTDIR)$(localedir); \ +- test -f $(DESTDIR)$(localedir)/locale.alias \ +- && orig=$(DESTDIR)$(localedir)/locale.alias \ +- || orig=$(srcdir)/locale.alias; \ +- temp=$(DESTDIR)$(localedir)/t-locale.alias; \ +- dest=$(DESTDIR)$(localedir)/locale.alias; \ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ +- else \ +- : ; \ +- fi +-install-data: all +- if test "$(PACKAGE)" = "gettext-tools"; then \ +- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ +- $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ +- $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ +- dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \ +- for file in $$dists; do \ +- $(INSTALL_DATA) $(srcdir)/$$file \ +- $(DESTDIR)$(gettextsrcdir)/$$file; \ +- done; \ +- chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \ +- dists="$(DISTFILES.generated)"; \ +- for file in $$dists; do \ +- if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ +- $(INSTALL_DATA) $$dir/$$file \ +- $(DESTDIR)$(gettextsrcdir)/$$file; \ +- done; \ +- dists="$(DISTFILES.obsolete)"; \ +- for file in $$dists; do \ +- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ +- done; \ +- else \ +- : ; \ +- fi +- +-install-strip: install +- +-installdirs: +- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ +- && test '@USE_INCLUDED_LIBINTL@' = yes; then \ +- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ +- else \ +- : ; \ +- fi +- if test "$(PACKAGE)" = "gettext-tools" \ +- && test '@USE_INCLUDED_LIBINTL@' = no \ +- && test @GLIBC2@ != no; then \ +- $(mkinstalldirs) $(DESTDIR)$(libdir); \ +- else \ +- : ; \ +- fi +- if test '@USE_INCLUDED_LIBINTL@' = yes; then \ +- test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ +- $(mkinstalldirs) $(DESTDIR)$(localedir); \ +- else \ +- : ; \ +- fi +- if test "$(PACKAGE)" = "gettext-tools"; then \ +- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ +- else \ +- : ; \ +- fi +- +-# Define this as empty until I found a useful application. +-installcheck: +- +-uninstall: +- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ +- && test '@USE_INCLUDED_LIBINTL@' = yes; then \ +- rm -f $(DESTDIR)$(includedir)/libintl.h; \ +- $(LIBTOOL) --mode=uninstall \ +- rm -f $(DESTDIR)$(libdir)/libintl.$la; \ +- else \ +- : ; \ +- fi +- if test "$(PACKAGE)" = "gettext-tools" \ +- && test '@USE_INCLUDED_LIBINTL@' = no \ +- && test @GLIBC2@ != no; then \ +- rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \ +- else \ +- : ; \ +- fi +- if test '@USE_INCLUDED_LIBINTL@' = yes; then \ +- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ +- temp=$(DESTDIR)$(libdir)/t-charset.alias; \ +- dest=$(DESTDIR)$(libdir)/charset.alias; \ +- sed -f ref-del.sed $$dest > $$temp; \ +- if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ +- rm -f $$dest; \ +- else \ +- $(INSTALL_DATA) $$temp $$dest; \ +- fi; \ +- rm -f $$temp; \ +- fi; \ +- if test -f $(DESTDIR)$(localedir)/locale.alias; then \ +- temp=$(DESTDIR)$(localedir)/t-locale.alias; \ +- dest=$(DESTDIR)$(localedir)/locale.alias; \ +- sed -f ref-del.sed $$dest > $$temp; \ +- if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ +- rm -f $$dest; \ +- else \ +- $(INSTALL_DATA) $$temp $$dest; \ +- fi; \ +- rm -f $$temp; \ +- fi; \ +- else \ +- : ; \ +- fi +- if test "$(PACKAGE)" = "gettext-tools"; then \ +- for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \ +- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ +- done; \ +- else \ +- : ; \ +- fi +- +-info dvi ps pdf html: +- +-$(OBJECTS): ../config.h libgnuintl.h +-bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h +-dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h +-explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h +-dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h +-dcigettext.$lo: $(srcdir)/eval-plural.h +-localcharset.$lo: $(srcdir)/localcharset.h +-localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h +-printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c +- +-tags: TAGS +- +-TAGS: $(HEADERS) $(SOURCES) +- here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) +- +-ctags: CTAGS +- +-CTAGS: $(HEADERS) $(SOURCES) +- here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES) +- +-id: ID +- +-ID: $(HEADERS) $(SOURCES) +- here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) +- +- +-mostlyclean: +- rm -f *.a *.la *.o *.obj *.lo core core.* +- rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed +- rm -f -r .libs _libs +- +-clean: mostlyclean +- +-distclean: clean +- rm -f Makefile ID TAGS +- if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \ +- rm -f ChangeLog.inst $(DISTFILES.normal); \ +- else \ +- : ; \ +- fi +- +-maintainer-clean: distclean +- @echo "This command is intended for maintainers to use;" +- @echo "it deletes files that may require special tools to rebuild." +- +- +-# GNU gettext needs not contain the file `VERSION' but contains some +-# other files which should not be distributed in other packages. +-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) +-dist distdir: Makefile +- if test "$(PACKAGE)" = "gettext-tools"; then \ +- : ; \ +- else \ +- if test "$(PACKAGE)" = "gettext-runtime"; then \ +- additional="$(DISTFILES.gettext)"; \ +- else \ +- additional="$(DISTFILES.normal)"; \ +- fi; \ +- $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \ +- for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \ +- if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ +- cp -p $$dir/$$file $(distdir); \ +- done; \ +- fi +- +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status +-# This would be more efficient, but doesn't work any more with autoconf-2.57, +-# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used. +-# cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status +- +-# Tell versions [3.59,3.63) of GNU make not to export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch b/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch new file mode 100644 index 0000000000..38f5c88997 --- /dev/null +++ b/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch @@ -0,0 +1,46 @@ +From 04149f9ec9b37b5bb4c2b6c38d4560b2c122c483 Mon Sep 17 00:00:00 2001 +From: Yoann Congal <yoann.congal@smile.fr> +Date: Thu, 23 May 2024 23:28:42 +0200 +Subject: [PATCH] po: force Language: header for "fr" and "de" locals + +Language: header is "new" and used to be derived from Language-Team +header. But, for fr.po and de.po, Language can't be derived. + +Force "Language" header to avoid having a default Language header. + +Upstream-Status: Inactive-Upstream [lastrelease: 26-Apr-2006] +See: http://download.savannah.nongnu.org/releases/hddtemp/?C=M&O=D + +Signed-off-by: Yoann Congal <yoann.congal@smile.fr> +--- + po/de.po | 1 + + po/fr.po | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/po/de.po b/po/de.po +index 3b79e08..d04976b 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -13,6 +13,7 @@ msgstr "" + "PO-Revision-Date: 2011-08-30 16:40+0200\n" + "Last-Translator: Vinzenz Vietzke <vinz@v1nz.org>\n" + "Language-Team: <debian-l10n-german@lists.debian.org>\n" ++"Language: de\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit" +diff --git a/po/fr.po b/po/fr.po +index 2fd97c5..0b3bf19 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -12,6 +12,7 @@ msgstr "" + "PO-Revision-Date: 2011-08-30 16:38+0200\n" + "Last-Translator: Aurelien Jarno <aurelien@aurel32.net>\n" + "Language-Team: FRANCAIS <fr@li.org>\n" ++"Language: fr\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=ISO-8859-1\n" + "Content-Transfer-Encoding: 8bit\n" +-- +2.39.2 + diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/0001-sata.c-Declare-ata_get_powermode-prototype.patch b/meta-oe/recipes-support/hddtemp/hddtemp/0001-sata.c-Declare-ata_get_powermode-prototype.patch new file mode 100644 index 0000000000..5703d3c241 --- /dev/null +++ b/meta-oe/recipes-support/hddtemp/hddtemp/0001-sata.c-Declare-ata_get_powermode-prototype.patch @@ -0,0 +1,33 @@ +From c5ca31940d1d1889ef2cc6974c18ff24ab406748 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 16:42:23 -0700 +Subject: [PATCH] sata.c: Declare ata_get_powermode prototype + +Fixes build warnings/errors + +sata.c:127:10: error: call to undeclared function 'ata_get_powermode'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +| switch(ata_get_powermode(dsk->fd)) + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/sata.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/sata.c b/src/sata.c +index d67621f..4172245 100644 +--- a/src/sata.c ++++ b/src/sata.c +@@ -52,7 +52,8 @@ + (((u16)(__x) & (u16)0xff00U) >> 8) )); \ + }) + +- ++extern enum e_powermode ata_get_powermode(int device); ++ + static int sata_probe(int device) { + int bus_num; + unsigned char cmd[4] = { WIN_IDENTIFY, 0, 0, 1 }; +-- +2.37.3 + diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch index 19f8380b47..1a541e32fd 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch @@ -1,11 +1,14 @@ +Upstream-Status: Pending + Auto-detect disks if none specified Refer to: https://bugzilla.redhat.com/show_bug.cgi?id=717479 -diff -up hddtemp-0.3-beta15/doc/hddtemp.8~ hddtemp-0.3-beta15/doc/hddtemp.8 ---- hddtemp-0.3-beta15/doc/hddtemp.8~ 2011-08-18 00:36:05.689001470 +0300 -+++ hddtemp-0.3-beta15/doc/hddtemp.8 2011-08-18 00:44:46.753006253 +0300 +Index: hddtemp-0.3-beta15/doc/hddtemp.8 +=================================================================== +--- hddtemp-0.3-beta15.orig/doc/hddtemp.8 ++++ hddtemp-0.3-beta15/doc/hddtemp.8 @@ -19,7 +19,7 @@ hddtemp \- Utility to monitor hard drive temperature .SH SYNOPSIS @@ -25,9 +28,10 @@ diff -up hddtemp-0.3-beta15/doc/hddtemp.8~ hddtemp-0.3-beta15/doc/hddtemp.8 .SH "OPTIONS" -diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c ---- hddtemp-0.3-beta15/src/hddtemp.c~ 2011-08-18 00:36:05.638996861 +0300 -+++ hddtemp-0.3-beta15/src/hddtemp.c 2011-08-18 00:35:55.485060798 +0300 +Index: hddtemp-0.3-beta15/src/hddtemp.c +=================================================================== +--- hddtemp-0.3-beta15.orig/src/hddtemp.c ++++ hddtemp-0.3-beta15/src/hddtemp.c @@ -54,6 +54,7 @@ #include <linux/hdreg.h> #include <ctype.h> @@ -44,7 +48,7 @@ diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c backtrace_sigsegv(); backtrace_sigill(); -@@ -419,11 +421,6 @@ int main(int argc, char* argv[]) { +@@ -423,11 +425,6 @@ int main(int argc, char* argv[]) { exit(0); } @@ -56,7 +60,7 @@ diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c if(debug) { /* argc = optind + 1;*/ quiet = 1; -@@ -434,6 +431,23 @@ int main(int argc, char* argv[]) { +@@ -438,6 +435,23 @@ int main(int argc, char* argv[]) { exit(1); } @@ -80,7 +84,7 @@ diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c init_bus_types(); /* collect disks informations */ -@@ -527,6 +541,7 @@ int main(int argc, char* argv[]) { +@@ -531,6 +545,7 @@ int main(int argc, char* argv[]) { else { do_direct_mode(ldisks); } diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch index 8f6b9c3c4b..78de64c99d 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -ru hddtemp-0.3-beta15.orig/configure.in hddtemp-0.3-beta15/configure.in --- hddtemp-0.3-beta15.orig/configure.in 2005-10-17 20:14:19.000000000 +0100 +++ hddtemp-0.3-beta15/configure.in 2008-06-27 00:00:46.000000000 +0100 diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff index f61c1649a4..60953381a1 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff @@ -6,11 +6,13 @@ Filtered with: filterdiff -p1 -x README -x 'debian/*' -Upstream-Status: unmaintained +Upstream-Status: Inappropriate [unmaintained] +Index: hddtemp-0.3-beta15/doc/hddtemp.8 +=================================================================== --- hddtemp-0.3-beta15.orig/doc/hddtemp.8 +++ hddtemp-0.3-beta15/doc/hddtemp.8 -@@ -58,6 +58,10 @@ +@@ -58,6 +58,10 @@ Execute hddtemp in TCP/IP daemon mode (p .B \-f, \-\-file=\fIfile\fI Specify the database file to use. .TP @@ -21,7 +23,7 @@ Upstream-Status: unmaintained .B \-l, \-\-listen=\fIaddr\fR Listen on a specific address. \fIaddr\fR is a string containing a host name or a numeric host address string. The numeric host address -@@ -80,6 +84,9 @@ +@@ -80,6 +84,9 @@ seconds. .B \-q, \-\-quiet Don't check if the drive is supported. .TP @@ -31,7 +33,7 @@ Upstream-Status: unmaintained .B \-v, \-\-version Display hddtemp version number. .TP -@@ -96,7 +103,7 @@ +@@ -96,7 +103,7 @@ Listen on IPv6 sockets only. .SH "DRIVE DATABASE" If you know your drive has a temperature sensor but it is being reported unsupported, tell me which model and which manufacturer it @@ -40,7 +42,7 @@ Upstream-Status: unmaintained line of hddtemp.db is either a comment, a blank line or a line containing: .TP -@@ -112,7 +119,7 @@ +@@ -112,7 +119,7 @@ set of drives from its model name or fro Feedback is welcome (see the REPORT section below). .SH "TCP/IP DAEMON MODE" @@ -49,7 +51,7 @@ Upstream-Status: unmaintained .PP # hddtemp SATA:/dev/sda PATA:/dev/hda .PP -@@ -120,7 +127,7 @@ +@@ -120,7 +127,7 @@ To test .B hddtemp in daemon mode, start it like this: .PP @@ -58,7 +60,7 @@ Upstream-Status: unmaintained .PP .PP and use -@@ -165,8 +172,8 @@ +@@ -165,8 +172,8 @@ and 12 are often reported to match a tem investigation they do not. But fields 194 (which is the standard field for temperature) and 231 are good candidates. .PP @@ -69,13 +71,15 @@ Upstream-Status: unmaintained yourself. .SH "BUGS" -@@ -183,5 +190,5 @@ +@@ -183,5 +190,5 @@ supported on i386 architectures only. .PP Emmanuel Varagnat (hddtemp@guzu.net). .PP -This manual page was originaly written by Aurelien Jarno <aurel32@debian.org>, +This manual page was originally written by Aurelien Jarno <aurel32@debian.org>, for the Debian GNU/Linux system (but may be used by others). +Index: hddtemp-0.3-beta15/po/fr.po +=================================================================== --- hddtemp-0.3-beta15.orig/po/fr.po +++ hddtemp-0.3-beta15/po/fr.po @@ -7,9 +7,9 @@ @@ -91,7 +95,7 @@ Upstream-Status: unmaintained "Last-Translator: Aurelien Jarno <aurelien@aurel32.net>\n" "Language-Team: FRANCAIS <fr@li.org>\n" "MIME-Version: 1.0\n" -@@ -17,23 +17,7 @@ +@@ -17,23 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0.1\n" @@ -116,7 +120,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "\n" -@@ -46,7 +30,7 @@ +@@ -46,7 +30,7 @@ msgstr "" "Modèle: %s\n" "\n" @@ -125,7 +129,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -60,75 +44,60 @@ +@@ -60,75 +44,60 @@ msgstr "" "net).\n" "ATTENTION : Voir les options --help, --debug et --drivebase.\n" @@ -216,7 +220,7 @@ Upstream-Status: unmaintained " -b --drivebase : display database file content that allow hddtemp to\n" " recognize supported drives.\n" " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -138,6 +107,7 @@ +@@ -138,6 +107,7 @@ msgid "" " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " "default.)\n" " -f --file=FILE : specify database file to use.\n" @@ -224,7 +228,7 @@ Upstream-Status: unmaintained " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " "mode).\n" " -n --numeric : print only the temperature.\n" -@@ -145,6 +115,8 @@ +@@ -145,6 +115,8 @@ msgid "" " -s --separator=C : separator to use between fields (in TCP/IP daemon " "mode).\n" " -S --syslog=s : log temperature to syslog every s seconds.\n" @@ -233,7 +237,7 @@ Upstream-Status: unmaintained " -q --quiet : do not check if the drive is supported.\n" " -v --version : display hddtemp version number.\n" " -w --wake-up : wake-up the drive if need.\n" -@@ -153,11 +125,14 @@ +@@ -153,11 +125,14 @@ msgid "" "\n" "Report bugs or new drives to <hddtemp@guzu.net>.\n" msgstr "" @@ -249,7 +253,7 @@ Upstream-Status: unmaintained " -b --drivebase : affiche le contenu du fichier de base de donnée " "qui \n" " permet à hddtemp de reconnaître les lecteurs " -@@ -172,6 +147,7 @@ +@@ -172,6 +147,7 @@ msgstr "" "défaut).\n" " -f --file=FILE : specifie le fichier à utiliser comme base de " "données.\n" @@ -257,7 +261,7 @@ Upstream-Status: unmaintained " -l --listen=addr : écoute sur une interface spécifique (en mode démon " "TCP/IP).\n" " -n --numeric : affiche seulement la température.\n" -@@ -180,6 +156,8 @@ +@@ -180,6 +156,8 @@ msgstr "" "démon TCP/IP).\n" " -S --syslog=s : enregistre la température dans syslog tous les s " "secondes.\n" @@ -266,7 +270,7 @@ Upstream-Status: unmaintained " -q --quiet : ne vérifie pas si le lecteur est supporté.\n" " -v --version : affiche la version de hddtemp.\n" " -w --wake-up : réveiller le lecteur si nécessaire.\n" -@@ -188,62 +166,95 @@ +@@ -188,62 +166,95 @@ msgstr "" "\n" "Report bugs or new drives to <hddtemp@guzu.net>.\n" @@ -377,6 +381,8 @@ Upstream-Status: unmaintained + +#~ msgid "field(%d)\t = %d\n" +#~ msgstr "champ(%d)\t = %d\n" +Index: hddtemp-0.3-beta15/po/ru.po +=================================================================== --- hddtemp-0.3-beta15.orig/po/ru.po +++ hddtemp-0.3-beta15/po/ru.po @@ -6,8 +6,8 @@ @@ -390,7 +396,7 @@ Upstream-Status: unmaintained "PO-Revision-Date: 2003-03-08 16:42+0300\n" "Last-Translator: Michael Shigorin <mike@altlinux.ru>\n" "Language-Team: Russian <ru@li.org>\n" -@@ -15,23 +15,7 @@ +@@ -15,23 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" @@ -415,7 +421,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "\n" -@@ -40,7 +24,7 @@ +@@ -40,7 +24,7 @@ msgid "" "\n" msgstr "" @@ -424,7 +430,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -53,72 +37,59 @@ +@@ -53,72 +37,59 @@ msgstr "" "÷îéíáîéå: åÓÌÉ ×Ù ÔÏÞÎÏ ÚÎÁÅÔÅ, ÞÔÏ ÄÁÔÞÉË ÅÓÔØ, ÎÁÐÉÛÉÔÅ hddtemp@guzu.net\n" "÷îéíáîéå: (ÓÍ. ÏÐÃÉÉ --help, --debug É --drivebase).\n" @@ -512,7 +518,7 @@ Upstream-Status: unmaintained " -b --drivebase : display database file content that allow hddtemp to\n" " recognize supported drives.\n" " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -128,6 +99,7 @@ +@@ -128,6 +99,7 @@ msgid "" " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " "default.)\n" " -f --file=FILE : specify database file to use.\n" @@ -520,7 +526,7 @@ Upstream-Status: unmaintained " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " "mode).\n" " -n --numeric : print only the temperature.\n" -@@ -135,6 +107,8 @@ +@@ -135,6 +107,8 @@ msgid "" " -s --separator=C : separator to use between fields (in TCP/IP daemon " "mode).\n" " -S --syslog=s : log temperature to syslog every s seconds.\n" @@ -529,7 +535,7 @@ Upstream-Status: unmaintained " -q --quiet : do not check if the drive is supported.\n" " -v --version : display hddtemp version number.\n" " -w --wake-up : wake-up the drive if need.\n" -@@ -168,59 +142,90 @@ +@@ -168,59 +142,90 @@ msgstr "" "\n" "óÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ É ÄÁÎÎÙÅ ÄÌÑ ÄÉÓËÏ× ÏÔÐÒÁ×ÌÑÊÔÅ ÎÁ <hddtemp@guzu.net>.\n" @@ -636,6 +642,8 @@ Upstream-Status: unmaintained + +#~ msgid "field(%d)\t = %d\n" +#~ msgstr "ÐÏÌÅ(%d)\t = %d\n" +Index: hddtemp-0.3-beta15/po/sv.po +=================================================================== --- hddtemp-0.3-beta15.orig/po/sv.po +++ hddtemp-0.3-beta15/po/sv.po @@ -6,8 +6,8 @@ @@ -649,7 +657,7 @@ Upstream-Status: unmaintained "PO-Revision-Date: 2005-11-02 19:03+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <sv@li.org>\n" -@@ -17,23 +17,7 @@ +@@ -17,23 +17,7 @@ msgstr "" "X-Poedit-Language: swe\n" "X-Poedit-Country: swe\n" @@ -674,7 +682,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "\n" -@@ -46,7 +30,7 @@ +@@ -46,7 +30,7 @@ msgstr "" "Modell: %s\n" "\n" @@ -683,7 +691,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -60,76 +44,63 @@ +@@ -60,76 +44,63 @@ msgstr "" "net).\n" "VARNING: Se --help, --debug och --drivebase flaggorna.\n" @@ -777,7 +785,7 @@ Upstream-Status: unmaintained " -b --drivebase : display database file content that allow hddtemp to\n" " recognize supported drives.\n" " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -139,6 +110,7 @@ +@@ -139,6 +110,7 @@ msgid "" " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " "default.)\n" " -f --file=FILE : specify database file to use.\n" @@ -785,7 +793,7 @@ Upstream-Status: unmaintained " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " "mode).\n" " -n --numeric : print only the temperature.\n" -@@ -146,6 +118,8 @@ +@@ -146,6 +118,8 @@ msgid "" " -s --separator=C : separator to use between fields (in TCP/IP daemon " "mode).\n" " -S --syslog=s : log temperature to syslog every s seconds.\n" @@ -794,7 +802,7 @@ Upstream-Status: unmaintained " -q --quiet : do not check if the drive is supported.\n" " -v --version : display hddtemp version number.\n" " -w --wake-up : wake-up the drive if need.\n" -@@ -184,61 +158,91 @@ +@@ -184,61 +158,91 @@ msgstr "" "\n" "Rapportera buggar eller nya hårddiskar till <hddtemp@guzu.net>.\n" @@ -901,9 +909,11 @@ Upstream-Status: unmaintained + +#~ msgid "field(%d)\t = %d\n" +#~ msgstr "fält(%d)\t = %d\n" +Index: hddtemp-0.3-beta15/po/pt.po +=================================================================== --- hddtemp-0.3-beta15.orig/po/pt.po +++ hddtemp-0.3-beta15/po/pt.po -@@ -7,7 +7,7 @@ +@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hddtemp 0.3-beta14\n" "Report-Msgid-Bugs-To: \n" @@ -912,7 +922,7 @@ Upstream-Status: unmaintained "PO-Revision-Date: 2006-03-29 23:22+0000\n" "Last-Translator: Miguel Figueiredo <elmig@debianp.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" -@@ -15,23 +15,7 @@ +@@ -15,23 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -937,7 +947,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "\n" -@@ -44,7 +28,7 @@ +@@ -44,7 +28,7 @@ msgstr "" "Modelo: %s\n" "\n" @@ -946,7 +956,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -54,79 +38,68 @@ +@@ -54,79 +38,68 @@ msgid "" msgstr "" "AVISO: O disco %s não parece ter um sensor de temperatura.\n" "AVISO: Isto não significa que não tem nenhum.\n" @@ -1047,7 +1057,7 @@ Upstream-Status: unmaintained " -b --drivebase : display database file content that allow hddtemp to\n" " recognize supported drives.\n" " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -136,6 +109,7 @@ +@@ -136,6 +109,7 @@ msgid "" " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " "default.)\n" " -f --file=FILE : specify database file to use.\n" @@ -1055,7 +1065,7 @@ Upstream-Status: unmaintained " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " "mode).\n" " -n --numeric : print only the temperature.\n" -@@ -143,6 +117,8 @@ +@@ -143,6 +117,8 @@ msgid "" " -s --separator=C : separator to use between fields (in TCP/IP daemon " "mode).\n" " -S --syslog=s : log temperature to syslog every s seconds.\n" @@ -1064,7 +1074,7 @@ Upstream-Status: unmaintained " -q --quiet : do not check if the drive is supported.\n" " -v --version : display hddtemp version number.\n" " -w --wake-up : wake-up the drive if need.\n" -@@ -156,19 +132,23 @@ +@@ -156,19 +132,23 @@ msgstr "" " hddtemp mostra a temperatura dos discos indicados no argumento.\n" " Os discos têm de suportar S.M.A.R.T.\n" "\n" @@ -1096,7 +1106,7 @@ Upstream-Status: unmaintained " -q --quiet : não verificar se o disco é suportado.\n" " -v --version : mostrar o número da versão do hddtemp.\n" " -w --wake-up : acordar o disco se necessário.\n" -@@ -177,58 +157,93 @@ +@@ -177,58 +157,93 @@ msgstr "" "\n" "Relatar bugs ou novos discos para <hddtemp@guzu.net>.\n" @@ -1208,7 +1218,9 @@ Upstream-Status: unmaintained + +#~ msgid "field(%d)\t = %d\n" +#~ msgstr "campo(%d)\t = %d\n" ---- hddtemp-0.3-beta15.orig/po/de.po +Index: hddtemp-0.3-beta15/po/de.po +=================================================================== +--- /dev/null +++ hddtemp-0.3-beta15/po/de.po @@ -0,0 +1,250 @@ +# German translation of hddtemp. @@ -1461,12 +1473,16 @@ Upstream-Status: unmaintained +#, c-format +msgid "log sense failed : %s" +msgstr "Protokoll-Erkennung fehlgeschlagen : %s" +Index: hddtemp-0.3-beta15/po/LINGUAS +=================================================================== --- hddtemp-0.3-beta15.orig/po/LINGUAS +++ hddtemp-0.3-beta15/po/LINGUAS @@ -1,2 +1,2 @@ # Set of available languages. -fr pt ru sv +de fr pt ru sv +Index: hddtemp-0.3-beta15/po/hddtemp.pot +=================================================================== --- hddtemp-0.3-beta15.orig/po/hddtemp.pot +++ hddtemp-0.3-beta15/po/hddtemp.pot @@ -1,35 +1,22 @@ @@ -1513,7 +1529,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "\n" -@@ -38,7 +25,7 @@ +@@ -38,7 +25,7 @@ msgid "" "\n" msgstr "" @@ -1522,7 +1538,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -47,67 +34,59 @@ +@@ -47,67 +34,59 @@ msgid "" "WARNING: See --help, --debug and --drivebase options.\n" msgstr "" @@ -1604,7 +1620,7 @@ Upstream-Status: unmaintained " -b --drivebase : display database file content that allow hddtemp to\n" " recognize supported drives.\n" " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -117,6 +96,7 @@ +@@ -117,6 +96,7 @@ msgid "" " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " "default.)\n" " -f --file=FILE : specify database file to use.\n" @@ -1612,7 +1628,7 @@ Upstream-Status: unmaintained " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " "mode).\n" " -n --numeric : print only the temperature.\n" -@@ -124,6 +104,8 @@ +@@ -124,6 +104,8 @@ msgid "" " -s --separator=C : separator to use between fields (in TCP/IP daemon " "mode).\n" " -S --syslog=s : log temperature to syslog every s seconds.\n" @@ -1621,7 +1637,7 @@ Upstream-Status: unmaintained " -q --quiet : do not check if the drive is supported.\n" " -v --version : display hddtemp version number.\n" " -w --wake-up : wake-up the drive if need.\n" -@@ -133,58 +115,69 @@ +@@ -133,58 +115,69 @@ msgid "" "Report bugs or new drives to <hddtemp@guzu.net>.\n" msgstr "" @@ -1705,9 +1721,11 @@ Upstream-Status: unmaintained #, c-format msgid "log sense failed : %s" msgstr "" +Index: hddtemp-0.3-beta15/src/sata.c +=================================================================== --- hddtemp-0.3-beta15.orig/src/sata.c +++ hddtemp-0.3-beta15/src/sata.c -@@ -118,11 +118,22 @@ +@@ -118,11 +118,22 @@ static enum e_gettemp sata_get_temperatu int i; u16 * p; @@ -1731,7 +1749,7 @@ Upstream-Status: unmaintained /* get SMART values */ if(sata_enable_smart(dsk->fd) != 0) { -@@ -154,24 +165,15 @@ +@@ -154,24 +165,15 @@ static enum e_gettemp sata_get_temperatu } /* temperature */ @@ -1759,6 +1777,8 @@ Upstream-Status: unmaintained /* never reached */ } +Index: hddtemp-0.3-beta15/src/satacmds.c +=================================================================== --- hddtemp-0.3-beta15.orig/src/satacmds.c +++ hddtemp-0.3-beta15/src/satacmds.c @@ -39,7 +39,7 @@ @@ -1770,7 +1790,7 @@ Upstream-Status: unmaintained // Application specific includes #include "satacmds.h" -@@ -80,8 +80,8 @@ +@@ -80,8 +80,8 @@ int sata_pass_thru(int device, unsigned ret = scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction); @@ -1781,7 +1801,7 @@ Upstream-Status: unmaintained return 1; else return ret; -@@ -95,10 +95,10 @@ +@@ -95,10 +95,10 @@ void sata_fixstring(unsigned char *s, in p = s; end = &s[bytecount & ~1]; /* bytecount must be even */ @@ -1794,6 +1814,8 @@ Upstream-Status: unmaintained } /* strip leading blanks */ +Index: hddtemp-0.3-beta15/src/backtrace.c +=================================================================== --- hddtemp-0.3-beta15.orig/src/backtrace.c +++ hddtemp-0.3-beta15/src/backtrace.c @@ -16,9 +16,10 @@ @@ -1822,7 +1844,7 @@ Upstream-Status: unmaintained #define MAX_BTSIZE 64 -@@ -42,7 +47,6 @@ +@@ -42,7 +47,6 @@ void backtrace_handler(int n, siginfo_t static char **messages = NULL; static size_t btsize = 0; static size_t i; @@ -1830,7 +1852,7 @@ Upstream-Status: unmaintained static char *strerr = "???"; static FILE *fstrm; -@@ -61,10 +65,10 @@ +@@ -61,10 +65,10 @@ void backtrace_handler(int n, siginfo_t SIC_CASE(SEGV_MAPERR); SIC_CASE(SEGV_ACCERR); } @@ -1843,7 +1865,7 @@ Upstream-Status: unmaintained break; case SIGILL: switch(ist->si_code) { -@@ -77,10 +81,10 @@ +@@ -77,10 +81,10 @@ void backtrace_handler(int n, siginfo_t SIC_CASE(ILL_COPROC); SIC_CASE(ILL_BADSTK); } @@ -1856,7 +1878,7 @@ Upstream-Status: unmaintained break; case SIGBUS: switch(ist->si_code) { -@@ -88,10 +92,10 @@ +@@ -88,10 +92,10 @@ void backtrace_handler(int n, siginfo_t SIC_CASE(BUS_ADRERR); SIC_CASE(BUS_OBJERR); } @@ -1869,7 +1891,7 @@ Upstream-Status: unmaintained break; } fflush(fstrm); -@@ -101,7 +105,7 @@ +@@ -101,7 +105,7 @@ void backtrace_handler(int n, siginfo_t /* old_eip = *(unsigned int*)((void*)&n-4); old_ebp = *(unsigned int*)((void*)&n-8); @@ -1878,7 +1900,7 @@ Upstream-Status: unmaintained *(unsigned int*)((void*)&n-8) = puc->uc_mcontext.gregs[REG_EBP]; btsize = backtrace(btinfo, MAX_BTSIZE); -@@ -111,14 +115,14 @@ +@@ -111,14 +115,14 @@ void backtrace_handler(int n, siginfo_t */ btsize = backtrace(btinfo, MAX_BTSIZE); @@ -1895,9 +1917,11 @@ Upstream-Status: unmaintained fflush(fstrm); fclose(fstrm); +Index: hddtemp-0.3-beta15/src/daemon.c +=================================================================== --- hddtemp-0.3-beta15.orig/src/daemon.c +++ hddtemp-0.3-beta15/src/daemon.c -@@ -163,19 +163,16 @@ +@@ -163,19 +163,16 @@ void daemon_send_msg(struct disk *ldisks switch(dsk->ret) { case GETTEMP_NOT_APPLICABLE: @@ -1922,7 +1946,7 @@ Upstream-Status: unmaintained break; case GETTEMP_KNOWN: n = snprintf(msg, sizeof(msg), "%s%c%s%c%d%c%c", -@@ -185,26 +182,23 @@ +@@ -185,26 +182,23 @@ void daemon_send_msg(struct disk *ldisks get_unit(dsk)); break; case GETTEMP_NOSENSOR: @@ -1955,7 +1979,7 @@ Upstream-Status: unmaintained break; } write(cfd,&separator, 1); -@@ -222,14 +216,11 @@ +@@ -222,14 +216,11 @@ void daemon_syslog(struct disk *ldisks) for(dsk = ldisks; dsk; dsk = dsk->next) { switch(dsk->ret) { case GETTEMP_KNOWN: @@ -1972,7 +1996,7 @@ Upstream-Status: unmaintained break; case GETTEMP_DRIVE_SLEEP: syslog(LOG_WARNING, _("%s: %s: drive is sleeping"), -@@ -270,28 +261,30 @@ +@@ -270,28 +261,30 @@ void do_daemon_mode(struct disk *ldisks) fd_set deffds; time_t next_time; @@ -2025,9 +2049,11 @@ Upstream-Status: unmaintained } chdir("/"); umask(0); +Index: hddtemp-0.3-beta15/src/hddtemp.c +=================================================================== --- hddtemp-0.3-beta15.orig/src/hddtemp.c +++ hddtemp-0.3-beta15/src/hddtemp.c -@@ -75,7 +75,7 @@ +@@ -75,7 +75,7 @@ char * listen_addr; char separator = SEPARATOR; struct bustype * bus[BUS_TYPE_MAX]; @@ -2036,7 +2062,7 @@ Upstream-Status: unmaintained static enum { DEFAULT, CELSIUS, FAHRENHEIT } unit; -@@ -194,23 +194,7 @@ +@@ -194,23 +194,7 @@ static void display_temperature(struct d if (numeric && quiet) printf("0\n"); else @@ -2061,7 +2087,7 @@ Upstream-Status: unmaintained break; case GETTEMP_KNOWN: -@@ -232,14 +216,14 @@ +@@ -232,14 +216,14 @@ static void display_temperature(struct d if (numeric && quiet) printf("0\n"); else @@ -2078,7 +2104,7 @@ Upstream-Status: unmaintained break; default: -@@ -268,8 +252,9 @@ +@@ -268,8 +252,9 @@ void do_direct_mode(struct disk *ldisks) int main(int argc, char* argv[]) { int i, c, lindex = 0, db_loaded = 0; @@ -2089,16 +2115,16 @@ Upstream-Status: unmaintained backtrace_sigsegv(); backtrace_sigill(); -@@ -279,7 +264,7 @@ - bindtextdomain (PACKAGE, LOCALEDIR); +@@ -283,7 +268,7 @@ int main(int argc, char* argv[]) { textdomain (PACKAGE); + #endif - show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = 0; + show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = foreground = 0; unit = DEFAULT; portnum = PORT_NUMBER; listen_addr = NULL; -@@ -294,6 +279,7 @@ +@@ -298,6 +283,7 @@ int main(int argc, char* argv[]) { {"drivebase", 0, NULL, 'b'}, {"debug", 0, NULL, 'D'}, {"file", 1, NULL, 'f'}, @@ -2106,7 +2132,7 @@ Upstream-Status: unmaintained {"listen", 1, NULL, 'l'}, {"version", 0, NULL, 'v'}, {"port", 1, NULL, 'p'}, -@@ -305,7 +291,7 @@ +@@ -309,7 +295,7 @@ int main(int argc, char* argv[]) { {0, 0, 0, 0} }; @@ -2115,7 +2141,7 @@ Upstream-Status: unmaintained if (c == -1) break; -@@ -382,12 +368,13 @@ +@@ -386,12 +372,13 @@ int main(int argc, char* argv[]) { " (done for every drive supplied).\n" " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by default.)\n" " -f --file=FILE : specify database file to use.\n" @@ -2130,7 +2156,7 @@ Upstream-Status: unmaintained " -q --quiet : do not check if the drive is supported.\n" " -v --version : display hddtemp version number.\n" " -w --wake-up : wake-up the drive if need.\n" -@@ -418,6 +405,9 @@ +@@ -422,6 +409,9 @@ int main(int argc, char* argv[]) { } } break; @@ -2140,7 +2166,7 @@ Upstream-Status: unmaintained default: exit(1); } -@@ -489,6 +479,7 @@ +@@ -493,6 +483,7 @@ int main(int argc, char* argv[]) { if( (dsk->fd = open(dsk->drive, O_RDONLY | O_NONBLOCK)) < 0) { snprintf(dsk->errormsg, MAX_ERRORMSG_SIZE, "open: %s\n", strerror(errno)); dsk->type = ERROR; @@ -2148,7 +2174,7 @@ Upstream-Status: unmaintained continue; } -@@ -501,6 +492,7 @@ +@@ -505,6 +496,7 @@ int main(int argc, char* argv[]) { ldisks = dsk->next; free(dsk); @@ -2156,7 +2182,7 @@ Upstream-Status: unmaintained continue; } -@@ -514,11 +506,17 @@ +@@ -518,11 +510,17 @@ int main(int argc, char* argv[]) { db_loaded = 1; } @@ -2177,16 +2203,18 @@ Upstream-Status: unmaintained } } -@@ -530,5 +528,5 @@ +@@ -534,5 +532,5 @@ int main(int argc, char* argv[]) { do_direct_mode(ldisks); } - return 0; + return ret; } +Index: hddtemp-0.3-beta15/src/ata.c +=================================================================== --- hddtemp-0.3-beta15.orig/src/ata.c +++ hddtemp-0.3-beta15/src/ata.c -@@ -75,7 +75,7 @@ +@@ -75,7 +75,7 @@ static enum e_gettemp ata_get_temperatur int i; u16 * p; @@ -2195,7 +2223,7 @@ Upstream-Status: unmaintained close(dsk->fd); dsk->fd = -1; return GETTEMP_NOSENSOR; -@@ -140,24 +140,15 @@ +@@ -140,24 +140,15 @@ static enum e_gettemp ata_get_temperatur */ /* temperature */ @@ -2224,9 +2252,11 @@ Upstream-Status: unmaintained /* never reached */ } +Index: hddtemp-0.3-beta15/src/hddtemp.h +=================================================================== --- hddtemp-0.3-beta15.orig/src/hddtemp.h +++ hddtemp-0.3-beta15/src/hddtemp.h -@@ -39,8 +39,6 @@ +@@ -39,8 +39,6 @@ enum e_gettemp { GETTEMP_ERROR, /* Error */ GETTEMP_NOT_APPLICABLE, /* */ GETTEMP_UNKNOWN, /* Drive is not in database */ @@ -2235,7 +2265,7 @@ Upstream-Status: unmaintained GETTEMP_KNOWN, /* Drive appear in database */ GETTEMP_NOSENSOR, /* Drive appear in database but is known to have no sensor */ GETTEMP_DRIVE_SLEEP /* Drive is sleeping */ -@@ -78,7 +76,7 @@ +@@ -78,7 +76,7 @@ struct bustype { extern struct bustype * bus[BUS_TYPE_MAX]; extern char errormsg[MAX_ERRORMSG_SIZE]; @@ -2244,9 +2274,11 @@ Upstream-Status: unmaintained extern char separator; extern long portnum, syslog_interval; extern char * listen_addr; +Index: hddtemp-0.3-beta15/src/scsicmds.c +=================================================================== --- hddtemp-0.3-beta15.orig/src/scsicmds.c +++ hddtemp-0.3-beta15/src/scsicmds.c -@@ -147,6 +147,7 @@ +@@ -147,6 +147,7 @@ int scsi_inquiry(int device, unsigned ch return 1; else { scsi_fixstring(buffer + 8, 24); diff --git a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb index 4a871bf4f4..75feccb87c 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb +++ b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb @@ -1,14 +1,16 @@ SUMMARY = "Hard disk temperature monitor daemon" SECTION = "console/network" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" -PR = "r1" SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/hddtemp/hddtemp-0.3-beta15.tar.bz2 \ file://hddtemp-no-nls-support.patch \ file://hddtemp_0.3-beta15-52.diff \ file://hddtemp-0.3-beta15-autodetect-717479.patch \ file://0001-backtrace-Replace-struct-ucontext-with-ucontext_t.patch \ + file://0001-configure.ac-Rename-to-configure.ac-and-use-external.patch \ + file://0001-sata.c-Declare-ata_get_powermode-prototype.patch \ + file://0001-po-force-Language-header-for-fr-and-de-locals.patch \ file://hddtemp.db \ file://init \ " @@ -20,13 +22,13 @@ LIC_FILES_CHKSUM = "file://GPL-2;md5=eb723b61539feef013de476e68b5c50a" inherit autotools gettext update-rc.d -FILES_${PN} += "/usr/share/misc/hddtemp.db" +FILES:${PN} += "/usr/share/misc/hddtemp.db" -do_install_append() { +do_install:append() { install -d ${D}/usr/share/misc/ - install -m 0644 ${WORKDIR}/hddtemp.db ${D}/usr/share/misc/hddtemp.db + install -m 0644 ${UNPACKDIR}/hddtemp.db ${D}/usr/share/misc/hddtemp.db install -d ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hddtemp + install -m 0644 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/hddtemp } INITSCRIPT_NAME = "hddtemp" diff --git a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch new file mode 100644 index 0000000000..0d016ccb4c --- /dev/null +++ b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch @@ -0,0 +1,67 @@ +From 9f5afd99cce93e68996deb2b5fa7c32737d279fe Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Tue, 16 Jul 2024 17:54:29 +0800 +Subject: [PATCH] cmake: remove build flags + +Don't generate the build host related info and reemove the build flags +to improve reproducibility. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + config/cmake/libhdf5.settings.cmake.in | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in +index deb07ed..6f255c4 100644 +--- a/config/cmake/libhdf5.settings.cmake.in ++++ b/config/cmake/libhdf5.settings.cmake.in +@@ -23,23 +23,23 @@ Linking Options: + ---------------- + Libraries: @BUILD_NAME_EXT@ + Statically Linked Executables: @BUILD_STATIC_EXECS@ +- LDFLAGS: @CMAKE_SHARED_LINKER_FLAGS@ ++ LDFLAGS: + H5_LDFLAGS: @H5_LDFLAGS@ + AM_LDFLAGS: @AM_LDFLAGS@ + Extra libraries: @LINK_LIBS@ +- Archiver: @CMAKE_AR@ +- AR_FLAGS: +- Ranlib: @CMAKE_RANLIB@ ++ Archiver: ++ AR_FLAGS: ++ Ranlib: + + Languages: + ---------- + C: YES +- C Compiler: @CMAKE_C_COMPILER@ @CMAKE_C_COMPILER_VERSION@ ++ C Compiler: + CPPFLAGS: @CPPFLAGS@ + H5_CPPFLAGS: @H5_CPPFLAGS@ + AM_CPPFLAGS: @AM_CPPFLAGS@ +- CFLAGS: @CMAKE_C_FLAGS@ +- H5_CFLAGS: @HDF5_CMAKE_C_FLAGS@ ++ CFLAGS: ++ H5_CFLAGS: + AM_CFLAGS: @AM_CFLAGS@ + Shared C Library: @H5_ENABLE_SHARED_LIB@ + Static C Library: @H5_ENABLE_STATIC_LIB@ +@@ -51,11 +51,11 @@ Languages: + AM Fortran Flags: @AM_FCFLAGS@ + Shared Fortran Library: @H5_ENABLE_SHARED_LIB@ + Static Fortran Library: @H5_ENABLE_STATIC_LIB@ +- Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@ ++ Module Directory: + + C++: @HDF5_BUILD_CPP_LIB@ + C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ +- C++ Flags: @CMAKE_CXX_FLAGS@ ++ C++ Flags: + H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ + AM C++ Flags: @AM_CXXFLAGS@ + Shared C++ Library: @H5_ENABLE_SHARED_LIB@ +-- +2.25.1 + diff --git a/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch b/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch new file mode 100644 index 0000000000..f0eb05a1e7 --- /dev/null +++ b/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch @@ -0,0 +1,47 @@ +From f76141864edf7100c1c29bec159ea629077a7fa0 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Tue, 29 Jan 2019 11:13:42 +0800 +Subject: [PATCH 2/2] Remove suffix `-shared' from shared library name + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + CMakeLists.txt | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,19 +191,19 @@ set (HDF5_HL_F90_C_LIB_TARGET "${HDF + set (HDF5_JAVA_JNI_LIB_TARGET "${HDF5_JAVA_JNI_LIB_CORENAME}") + set (HDF5_JAVA_HDF5_LIB_TARGET "${HDF5_JAVA_HDF5_LIB_CORENAME}") + set (HDF5_JAVA_TEST_LIB_TARGET "${HDF5_JAVA_TEST_LIB_CORENAME}") +-set (HDF5_LIBSH_TARGET "${HDF5_LIB_CORENAME}-shared") +-set (HDF5_TEST_LIBSH_TARGET "${HDF5_TEST_LIB_CORENAME}-shared") +-set (HDF5_CPP_LIBSH_TARGET "${HDF5_CPP_LIB_CORENAME}-shared") +-set (HDF5_HL_LIBSH_TARGET "${HDF5_HL_LIB_CORENAME}-shared") +-set (HDF5_HL_CPP_LIBSH_TARGET "${HDF5_HL_CPP_LIB_CORENAME}-shared") +-set (HDF5_TOOLS_LIBSH_TARGET "${HDF5_TOOLS_LIB_CORENAME}-shared") +-set (HDF5_UTILS_LIBSH_TARGET "${HDF5_UTILS_LIB_CORENAME}-shared") +-set (HDF5_F90_LIBSH_TARGET "${HDF5_F90_LIB_CORENAME}-shared") +-set (HDF5_F90_C_LIBSH_TARGET "${HDF5_F90_C_LIB_CORENAME}-shared") +-set (HDF5_F90_TEST_LIBSH_TARGET "${HDF5_F90_TEST_LIB_CORENAME}-shared") +-set (HDF5_F90_C_TEST_LIBSH_TARGET "${HDF5_F90_C_TEST_LIB_CORENAME}-shared") +-set (HDF5_HL_F90_LIBSH_TARGET "${HDF5_HL_F90_LIB_CORENAME}-shared") +-set (HDF5_HL_F90_C_LIBSH_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}-shared") ++set (HDF5_LIBSH_TARGET "${HDF5_LIB_CORENAME}") ++set (HDF5_TEST_LIBSH_TARGET "${HDF5_TEST_LIB_CORENAME}") ++set (HDF5_CPP_LIBSH_TARGET "${HDF5_CPP_LIB_CORENAME}") ++set (HDF5_HL_LIBSH_TARGET "${HDF5_HL_LIB_CORENAME}") ++set (HDF5_HL_CPP_LIBSH_TARGET "${HDF5_HL_CPP_LIB_CORENAME}") ++set (HDF5_TOOLS_LIBSH_TARGET "${HDF5_TOOLS_LIB_CORENAME}") ++set (HDF5_UTILS_LIBSH_TARGET "${HDF5_UTILS_LIB_CORENAME}") ++set (HDF5_F90_LIBSH_TARGET "${HDF5_F90_LIB_CORENAME}") ++set (HDF5_F90_C_LIBSH_TARGET "${HDF5_F90_C_LIB_CORENAME}") ++set (HDF5_F90_TEST_LIBSH_TARGET "${HDF5_F90_TEST_LIB_CORENAME}") ++set (HDF5_F90_C_TEST_LIBSH_TARGET "${HDF5_F90_C_TEST_LIB_CORENAME}") ++set (HDF5_HL_F90_LIBSH_TARGET "${HDF5_HL_F90_LIB_CORENAME}") ++set (HDF5_HL_F90_C_LIBSH_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}") + + #----------------------------------------------------------------------------- + # Define some CMake variables for use later in the project diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb b/meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb new file mode 100644 index 0000000000..f34e5f183d --- /dev/null +++ b/meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb @@ -0,0 +1,65 @@ +SUMMARY = "Management suite for extremely large and complex data collections" +DESCRIPTION = "Unique technology suite that makes possible the management of \ +extremely large and complex data collections" +HOMEPAGE = "https://www.hdfgroup.org/" +SECTION = "libs" + +LICENSE = "HDF5" +LIC_FILES_CHKSUM = "file://COPYING;md5=adebb1ecf1b3b80c13359e18ef67301e" + +inherit cmake siteinfo qemu multilib_header multilib_script + +DEPENDS += "qemu-native zlib" + +SRC_URI = " \ + https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.4/src/${BPN}-${PV}.tar.gz \ + file://0002-Remove-suffix-shared-from-shared-library-name.patch \ + file://0001-cmake-remove-build-flags.patch \ +" +SRC_URI[sha256sum] = "019ac451d9e1cf89c0482ba2a06f07a46166caf23f60fea5ef3c37724a318e03" + +FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" + +EXTRA_OECMAKE = " \ + -DHDF5_INSTALL_CMAKE_DIR=${libdir}/cmake \ + -DCMAKE_INSTALL_PREFIX='${prefix}' \ + -DHDF5_INSTALL_LIB_DIR='${baselib}' \ +" +EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper " + +gen_emu() { + # Write out a qemu wrapper that will be used by cmake + # so that it can run target helper binaries through that. + qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + cat > ${WORKDIR}/qemuwrapper << EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x ${WORKDIR}/qemuwrapper +} + +do_unpack[postfuncs] += "gen_emu" + +MULTILIB_SCRIPTS += "${PN}:${bindir}/h5cc \ + ${PN}:${bindir}/h5hlcc \ +" + +do_configure:append() { + sed -i -e 's|${WORKDIR}||g' ${B}/src/libhdf5.settings + sed -i -e 's|${WORKDIR}||g' ${B}/src/H5build_settings.c +} + +do_install:append() { + # Used for generating config files on target + oe_multilib_header H5pubconf.h + # remove the buildpath + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/pkgconfig/hdf5.pc + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/hdf5-targets.cmake + sed -i -e 's|${RECIPE_SYSROOT_NATIVE}||g' ${D}${bindir}/h5hlcc + sed -i -e 's|${RECIPE_SYSROOT_NATIVE}||g' ${D}${bindir}/h5cc +} + +BBCLASSEXTEND = "native" + +# h5fuse.sh script needs bash +RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb b/meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb new file mode 100644 index 0000000000..c7a487ba5c --- /dev/null +++ b/meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "A Simple library for communicating with USB and Bluetooth HID devices" +HOMEPAGE = "http://www.signal11.us/oss/hidapi/" +SECTION = "libs" + +LICENSE = "BSD-3-Clause | GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077" + +DEPENDS = "libusb udev" +RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-utf-16" + +inherit autotools pkgconfig + +SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master" +SRCREV = "d3013f0af3f4029d82872c1a9487ea461a56dee4" +S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-oe/recipes-support/hidapi/hidapi_git.bb deleted file mode 100644 index a34797ff51..0000000000 --- a/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Multi-platform library to interface with USB and Bluetooth HID-Class devices" -AUTHOR = "Alan Ott" -HOMEPAGE = "http://www.signal11.us/oss/hidapi/" -SECTION = "libs" -LICENSE = "BSD-3-Clause | GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077" -DEPENDS = "libusb udev" -PV = "0.7.99+0.8.0-rc1+git${SRCPV}" - -SRCREV = "d17db57b9d4354752e0af42f5f33007a42ef2906" -SRC_URI = "git://github.com/signal11/hidapi.git" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/hstr/files/0001-Use-OE-specific-checks-for-ncurses.patch b/meta-oe/recipes-support/hstr/files/0001-Use-OE-specific-checks-for-ncurses.patch new file mode 100644 index 0000000000..421d824ee0 --- /dev/null +++ b/meta-oe/recipes-support/hstr/files/0001-Use-OE-specific-checks-for-ncurses.patch @@ -0,0 +1,42 @@ +From f3fb4f12fac75efe0d8f1a923ad5992a7433d0db Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 2 Mar 2022 06:22:15 +0000 +Subject: [PATCH] Use OE-specific checks for ncurses + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + src/include/hstr.h | 2 +- + src/include/hstr_curses.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/include/hstr.h b/src/include/hstr.h +index 5eac881..c47cadb 100644 +--- a/src/include/hstr.h ++++ b/src/include/hstr.h +@@ -26,7 +26,7 @@ + #elif defined(__FreeBSD__) + #include <ncurses.h> + #else +- #include <ncursesw/curses.h> ++ #include <curses.h> + #endif + #include <readline/chardefs.h> + #include <signal.h> +diff --git a/src/include/hstr_curses.h b/src/include/hstr_curses.h +index 8a50ab9..1f081a8 100644 +--- a/src/include/hstr_curses.h ++++ b/src/include/hstr_curses.h +@@ -24,7 +24,7 @@ + #elif defined(__FreeBSD__) + #include <ncurses.h> + #else +-#include <ncursesw/curses.h> ++#include <curses.h> + #endif + + #define color_attr_on(C) if(terminal_has_colors()) { attron(C); } +-- +2.31.1 + diff --git a/meta-oe/recipes-support/hstr/files/0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch b/meta-oe/recipes-support/hstr/files/0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch new file mode 100644 index 0000000000..832d768ff3 --- /dev/null +++ b/meta-oe/recipes-support/hstr/files/0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch @@ -0,0 +1,33 @@ +From d5ad538adb9fcbad8a3b4e46f266b668301cb1c4 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 2 Mar 2022 05:36:48 +0000 +Subject: [PATCH] configure.ac: Don't use AC_CHECK_FILE + +AC_CHECK_FILE is not suitable for cross-compile, so +remove it to fix configure error: +cannot check for file existence when cross compiling + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 775c795..bd99188 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -116,9 +116,6 @@ AC_TYPE_SIZE_T + AC_FUNC_MALLOC + AC_CHECK_FUNCS([memset strdup strstr]) + +-# Bash@Ubuntu@Windows +-AC_CHECK_FILE(/tmp/hstr-ms-wsl,AC_DEFINE(__MS_WSL__), []) +- + # Bash CLI autocomplete + AC_ARG_WITH([bash-completion-dir], + AS_HELP_STRING([--with-bash-completion-dir[=PATH]], +-- +2.31.1 + diff --git a/meta-oe/recipes-support/hstr/hstr_3.1.0.bb b/meta-oe/recipes-support/hstr/hstr_3.1.0.bb new file mode 100644 index 0000000000..a641feef6f --- /dev/null +++ b/meta-oe/recipes-support/hstr/hstr_3.1.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "bash and zsh shell history suggest box - easily view, navigate, search and manage your command history." +HOMEPAGE = "http://dvorka.github.io/hstr/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" + +DEPENDS = "ncurses readline" + +SRC_URI = "https://github.com/dvorka/hstr/releases/download/3.1/hstr-${PV}-tarball.tgz \ + file://0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch \ + file://0001-Use-OE-specific-checks-for-ncurses.patch" + +S = "${WORKDIR}/${BPN}" + +SRC_URI[sha256sum] = "4dabf61f045f022bac8bc909e5fd96041af6c53df56d97dfa3cfbf49af4453a5" + +inherit autotools pkgconfig bash-completion diff --git a/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch index ff5cd49237..3d113efa15 100644 --- a/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch +++ b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch @@ -1,46 +1,47 @@ -From 7ebcbf17ad9483c7109e4a83b66966bc02f09bd4 Mon Sep 17 00:00:00 2001 +From 0d49ee6416e389b9a7ba693588c2eaf129306a01 Mon Sep 17 00:00:00 2001 From: Paul Barker <pbarker@toganlabs.com> -Date: Sun, 5 Nov 2017 20:10:10 +0000 -Subject: [PATCH] Use pkg-config +Date: Sun, 5 Nov 2017 22:07:30 +0000 +Subject: [PATCH] htop: Update to v2.0.2 We need to use pkg-config to find the ncurses library instead of the ncurses*-config applications. Signed-off-by: Paul Barker <pbarker@toganlabs.com> -Upstream-status: Inappropriate - (`ncurses*-config` can be used outside of OpenEmbedded) +Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> + +Upstream-Status: Inappropriate [`ncurses*-config` can be used outside of OpenEmbedded] + --- - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + configure.ac | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 7e0edd1..c5a8365 100644 +index e4df238a..2a31b201 100644 --- a/configure.ac +++ b/configure.ac -@@ -185,9 +185,9 @@ m4_define([HTOP_CHECK_LIB], - - AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") +@@ -391,10 +391,10 @@ AC_ARG_ENABLE([unicode], + [], + [enable_unicode=yes]) if test "x$enable_unicode" = xyes; then -- HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", -- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", -+ HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", -+ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", -+ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncurses5", - HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], - HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], - HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], -@@ -200,8 +200,8 @@ if test "x$enable_unicode" = xyes; then - [AC_CHECK_HEADERS([ncurses/curses.h],[:], - [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) +- HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", +- HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", +- HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "ncursesw5-config", +- HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "ncurses5-config", ++ HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", ++ HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", ++ HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", ++ HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncurses5", + HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], + HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], + HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], +@@ -416,8 +416,8 @@ if test "x$enable_unicode" = xyes; then + # (at this point we already link against a working ncurses library with wide character support) + AC_SEARCH_LIBS([keypad], [tinfow tinfo]) else -- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", -- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", -+ HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses6", -+ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses5", - HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], - HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], - missing_libraries="$missing_libraries libncurses" --- -2.7.4 - +- HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses6-config], +- HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses5-config], ++ HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses6], ++ HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses5], + HTOP_CHECK_LIB([ncurses6], [doupdate], [HAVE_LIBNCURSES], + HTOP_CHECK_LIB([ncurses], [doupdate], [HAVE_LIBNCURSES], + HTOP_CHECK_LIB([curses], [doupdate], [HAVE_LIBNCURSES], diff --git a/meta-oe/recipes-support/htop/htop_2.0.2.bb b/meta-oe/recipes-support/htop/htop_2.0.2.bb deleted file mode 100644 index 395b83ff66..0000000000 --- a/meta-oe/recipes-support/htop/htop_2.0.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "htop process monitor" -HOMEPAGE = "http://htop.sf.net" -SECTION = "console/utils" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3" - -DEPENDS = "ncurses" -RDEPENDS_${PN} = "ncurses-terminfo" - -SRC_URI = " \ - http://hisham.hm/htop/releases/${PV}/htop-${PV}.tar.gz \ - file://0001-Use-pkg-config.patch \ - " - -SRC_URI[md5sum] = "7d354d904bad591a931ad57e99fea84a" -SRC_URI[sha256sum] = "179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487" - -LDFLAGS_append_libc-uclibc = " -lubacktrace" - -do_configure_prepend () { - rm -rf ${S}/config.h -} - -inherit autotools diff --git a/meta-oe/recipes-support/htop/htop_3.3.0.bb b/meta-oe/recipes-support/htop/htop_3.3.0.bb new file mode 100644 index 0000000000..cd5b766f0f --- /dev/null +++ b/meta-oe/recipes-support/htop/htop_3.3.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "Interactive process viewer" +HOMEPAGE = "https://htop.dev" +SECTION = "console/utils" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "ncurses" + +SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https \ + file://0001-Use-pkg-config.patch \ +" +SRCREV = "68c970c7ef4a0682760ed570b3d82388ae7ccf54" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= " \ + unicode \ + affinity \ + delayacct \ +" +PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode" +PACKAGECONFIG[affinity] = "--enable-affinity,--disable-affinity,,,,hwloc" +PACKAGECONFIG[unwind] = "--enable-unwind,--disable-unwind,libunwind" +PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc,,,affinity" +PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz" +PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver" +PACKAGECONFIG[ancient-vserver] = "--enable-ancient-vserver,--disable-ancient-vserver" +PACKAGECONFIG[capabilities] = "--enable-capabilities,--disable-capabilities,libcap" +PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl" +PACKAGECONFIG[sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors" + +FILES:${PN} += "${datadir}/icons/hicolor/scalable/apps/htop.svg" + +RDEPENDS:${PN} += "ncurses-terminfo-base" diff --git a/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb b/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb new file mode 100644 index 0000000000..ed342d6757 --- /dev/null +++ b/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb @@ -0,0 +1,154 @@ +SUMMARY = "Hunspell dictionaries used by Maliit" + +#Provided by Titus Wormer (wooorm) https://github.com/wooorm/dictionaries + +LICENSE = "MIT" +LICENSE:dictionaries/bg = "LGPL 2.1" +LICENSE:dictionaries/br = "GPL 3.0" +LICENSE:dictionaries/ca-valencia = "GPL 2.0 & LGPL-2.1-only" +LICENSE:dictionaries/ca = "GPL 2.0 & LGPL-2.1-only" +LICENSE:dictionaries/cs = "GPL-2.0-only" +LICENSE:dictionaries/da = "GPL-2.0-only" +LICENSE:dictionaries/de-AT = "GPL-3.0-only" +LICENSE:dictionaries/de-CH = "GPL-3.0-only" +LICENSE:dictionaries/de = "GPL-3.0-only" +LICENSE:dictionaries/el-polyton = "GPL-2.0-only" +LICENSE:dictionaries/el = "GPL-2.0-only" +LICENSE:dictionaries/en-AU = "LGPL-2.0-only" +LICENSE:dictionaries/en-CA = "MIT & BSD" +LICENSE:dictionaries/en-GB = "LGPL-2.0-only" +LICENSE:dictionaries/en-US = "MIT & BSD" +LICENSE:dictionaries/en-ZA = "LGPL 2.1" +LICENSE:dictionaries/eo = "GPL-2.0-only" +LICENSE:dictionaries/es = "GPL-3.0-only" +LICENSE:dictionaries/et = "LGPL-2.1-only" +LICENSE:dictionaries/eu = "GPL-2.0-only" +LICENSE:dictionaries/fo = "GPL-2.0-only" +LICENSE:dictionaries/fr = "MPL-2.0" +LICENSE:dictionaries/fur = "GPL-2.0-only" +LICENSE:dictionaries/fy = "GPL-3.0-only" +LICENSE:dictionaries/ga = "GPL-2.0-only" +LICENSE:dictionaries/gd = "GPL-3.0-only" +LICENSE:dictionaries/gl = "GPL-3.0-only" +LICENSE:dictionaries/he = "AGPL-3.0-only" +LICENSE:dictionaries/hr = "GPL-3.0-only" +LICENSE:dictionaries/hu = "GPL-2.0-only" +LICENSE:dictionaries/hy-arevela = "GPL-2.0-only" +LICENSE:dictionaries/hy-arevmda = "GPL-2.0-only" +LICENSE:dictionaries/ia = "GPL-3.0-only" +LICENSE:dictionaries/ie = "Apache-2.0" +LICENSE:dictionaries/is = "CC BY-SA 3.0 & CC BY 4.0" +LICENSE:dictionaries/it = "GPL-3.0-only" +LICENSE:dictionaries/ko = "MPL-1.1 & GPL-2.0-only & LGPL-2.1-only" +LICENSE:dictionaries/la = "GPL-3.0-only" +LICENSE:dictionaries/lb = "EUPL-1.1" +LICENSE:dictionaries/lt = "Other" +LICENSE:dictionaries/ltg = "LGPL-2.1-only" +LICENSE:dictionaries/lv = "LGPL-2.1-only" +LICENSE:dictionaries/mk = "GPL-3.0-only" +LICENSE:dictionaries/mn = "GPL-2.0-only" +LICENSE:dictionaries/nb = "GPL-2.0-only" +LICENSE:dictionaries/nds = "GPL-2.0-only" +LICENSE:dictionaries/ne = "LGPL-2.1-only" +LICENSE:dictionaries/nl = "BSD" +LICENSE:dictionaries/nn = "GPL-2.0-only" +LICENSE:dictionaries/pl = "GPL-3.0-only" +LICENSE:dictionaries/pt-BR = "LGPL 2.1" +LICENSE:dictionaries/pt = "GPL-2.0-only" +LICENSE:dictionaries/ro = "GPL-2.0-only" +LICENSE:dictionaries/ru = "BSD" +LICENSE:dictionaries/rw = "GPL-3.0-only" +LICENSE:dictionaries/sk = "GPL-2.0-only" +LICENSE:dictionaries/sl = "GPL-2.0-only" +LICENSE:dictionaries/sr-Latn = "LGPL 3.0" +LICENSE:dictionaries/sr = "LGPL 3.0" +LICENSE:dictionaries/sv = "LGPL 3.0" +LICENSE:dictionaries/tr = "MIT" +LICENSE:dictionaries/uk = "GPL 2.0" +LICENSE:dictionaries/vi = "GPL 3.0" +LIC_FILES_CHKSUM = " \ + file://dictionaries/bg/license;md5=ab14e2ded1a43b84be9aba2be64b9814 \ + file://dictionaries/br/license;md5=2e046c64edc0a4e47fb3ea614e6c82c4 \ + file://dictionaries/ca-valencia/license;md5=da087cefab7bc3b7687203198a0042ec \ + file://dictionaries/ca/license;md5=da087cefab7bc3b7687203198a0042ec \ + file://dictionaries/cs/license;md5=e0496d626a53ad31addea1869c1bed53 \ + file://dictionaries/da/license;md5=b7678b3e997999043be3503dc717d96d \ + file://dictionaries/de-AT/license;md5=a03d823e8cd00fd71c9ba18b8ec4ccf1 \ + file://dictionaries/de-CH/license;md5=a03d823e8cd00fd71c9ba18b8ec4ccf1 \ + file://dictionaries/de/license;md5=a03d823e8cd00fd71c9ba18b8ec4ccf1 \ + file://dictionaries/el-polyton/license;md5=d952bcbf1c67129920f03536197c7281 \ + file://dictionaries/el/license;md5=90b757dd77b1ebbf473eef31037a59e8 \ + file://dictionaries/en-AU/license;md5=dae002c846eab5e1132ba2e00692dc68 \ + file://dictionaries/en-CA/license;md5=6c205de0cbcae4b42cf992bb355a5346 \ + file://dictionaries/en-GB/license;md5=dd6d2bbd7b7f4519448f2b995fd99cd4 \ + file://dictionaries/en-US/license;md5=244a909f295640bfafeb8d9e522d454b \ + file://dictionaries/en-ZA/license;md5=56e4b4ca965de3bba6db42494cc34576 \ + file://dictionaries/eo/license;md5=eb723b61539feef013de476e68b5c50a \ + file://dictionaries/es/license;md5=b41cabf4e6f2a7d951684246518bea4f \ + file://dictionaries/et/readme.md;md5=59d851f12cc280f893b245938abc1905 \ + file://dictionaries/fo/license;md5=fa9ce505d07423c9f8e6c1073f4806c2 \ + file://dictionaries/fr/license;md5=2346c7bffe6ab4d51730ab3116817c72 \ + file://dictionaries/fur/license;md5=28ac8c6e75d6c44b60016a8c850036e3 \ + file://dictionaries/fy/license;md5=c05115c38ca2a4aa95cb9c9b00ed78df \ + file://dictionaries/ga/license;md5=ee7d601b5d3be3856a169afa71eb3376 \ + file://dictionaries/gd/license;md5=b5f39c26d691733095323a59d0f02216 \ + file://dictionaries/gl/license;md5=d32239bcb673463ab874e80d47fae504 \ + file://dictionaries/he/license;md5=e627dcdf6878e7eca4454e39d1489271 \ + file://dictionaries/hr/license;md5=4b03c9b6e41a6ef12b4e31d2fb224d46 \ + file://dictionaries/hu/license;md5=c9755266de74fdbe69636bdb3076b603 \ + file://dictionaries/hy-arevela/license;md5=c690b6bc807de0a6dcd62db030843ee4 \ + file://dictionaries/hy-arevmda/license;md5=c690b6bc807de0a6dcd62db030843ee4 \ + file://dictionaries/ia/license;md5=25c37bbb54f9ab5da9b4bcdda2e2f68e \ + file://dictionaries/ie/license;md5=fa818a259cbed7ce8bc2a22d35a464fc \ + file://dictionaries/is/license;md5=db5e38a312b91d717561514767c95999 \ + file://dictionaries/it/license;md5=31d06285633a89f4d0267895ef8b7107 \ + file://dictionaries/ko/license;md5=5ff35d5b0523cccb3049edff77c73a10 \ + file://dictionaries/la/license;md5=9bc08ae2930eb806cee44bbae905b7ba \ + file://dictionaries/lb/license;md5=5d6417331778645577c40c3329a3d559 \ + file://dictionaries/lt/license;md5=3d1264d7017271c6731fefaba912a15f \ + file://dictionaries/ltg/license;md5=72c786f9d43bb07c101766457fcf6435 \ + file://dictionaries/lv/license;md5=957d42bd58feff079daa6ede1d215585 \ + file://dictionaries/mk/license;md5=c05a3747d4c871f3c6378909668ec72d \ + file://dictionaries/mn/license;md5=93a1be573a1bd039cb4e17c21ed800a7 \ + file://dictionaries/nb/license;md5=6b50c67a5ee9ba5af1b4ab6c009b66f2 \ + file://dictionaries/nds/license;md5=08c69ee106e67a1085d45dc723ae5396 \ + file://dictionaries/ne/license;md5=620e39f1aec72b0bdbc922128dd08267 \ + file://dictionaries/nl/license;md5=f9181fe437dd701ce6ae690f6e09b119 \ + file://dictionaries/nn/license;md5=9d372c99817cb42bdd1f6c0acb7f4d11 \ + file://dictionaries/pl/license;md5=5d0961c4eee8448d5f3738b1ff04ebe8 \ + file://dictionaries/pt-BR/license;md5=08a7e74543d3e612e7613f2959bedab0 \ + file://dictionaries/pt/license;md5=53d8ed71b4053ef0ccfcf6b3f89880a8 \ + file://dictionaries/ro/license;md5=db18b1d6cfc0d4ca32371cb76900de2c \ + file://dictionaries/ru/license;md5=a3d4108679bd3b76ec1a86520b5362cf \ + file://dictionaries/rw/license;md5=784d7dc7357bd924e8d5642892bf1b6b \ + file://dictionaries/sk/license;md5=7fb3956bf960db433deedec7746d33c5 \ + file://dictionaries/sl/license;md5=4965d53062ea2045837facf483475ac7 \ + file://dictionaries/sr-Latn/license;md5=0139a4b8ce316882cceae8924030950d \ + file://dictionaries/sr/license;md5=0139a4b8ce316882cceae8924030950d \ + file://dictionaries/sv/license;md5=fe5c586fe56d04fbdc44df187129ac29 \ + file://dictionaries/tr/readme.md;md5=27c07bbfa543cfdd163f2dad491703bd \ + file://dictionaries/uk/license;md5=7702f203b58979ebbc31bfaeb44f219c \ + file://dictionaries/vi/license;md5=8d9ecb4e7577ce760029786aba7ecec5 \ +" + +RDEPENDS:${PN} = "hunspell" + +PV = "0.0.0+git" +SRCREV = "820a65e539e34a3a8c2a855d2450b84745c624ee" +SRC_URI = "git://github.com/wooorm/dictionaries.git;branch=main;protocol=https" + +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + +S = "${WORKDIR}/git" + +do_install() { + for LANGUAGE in `ls -d1 ${S}/dictionaries/*` ; do + LANGUAGE_DIR=`basename $LANGUAGE | sed 's:-:_:'` + install -D -m0644 $LANGUAGE/index.dic ${D}${datadir}/hunspell/$LANGUAGE_DIR.dic + install -D -m0644 $LANGUAGE/index.aff ${D}${datadir}/hunspell/$LANGUAGE_DIR.aff + install -D -m0644 $LANGUAGE/LICENSE ${D}${datadir}/hunspell/LICENSE-$LANGUAGE_DIR 2>/dev/null || echo "No LICENSE for language $LANGUAGE" + done +} + +FILES:${PN} = "${datadir}/hunspell" diff --git a/meta-oe/recipes-support/hunspell/hunspell_1.6.1.bb b/meta-oe/recipes-support/hunspell/hunspell_1.6.1.bb deleted file mode 100644 index 125729f2d1..0000000000 --- a/meta-oe/recipes-support/hunspell/hunspell_1.6.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "A spell checker and morphological analyzer library" -HOMEPAGE = "http://hunspell.github.io/" -LICENSE = "GPLv3 | LGPLv3" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 \ -" - -SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz" -SRC_URI[md5sum] = "0df1c18c1284f8625af5ae5a8d5c4cef" -SRC_URI[sha256sum] = "30f593733c50b794016bb03d31fd2a2071e4610c6fa4708e33edad2335102c49" - -inherit autotools pkgconfig gettext - -RDEPENDS_${PN} = "perl" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb b/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb new file mode 100644 index 0000000000..afe75472a5 --- /dev/null +++ b/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "A spell checker and morphological analyzer library" +HOMEPAGE = "http://hunspell.github.io/" +LICENSE = "GPL-2.0-only | LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=75859989545e37968a99b631ef42722e \ + file://COPYING.LESSER;md5=c96ca6c1de8adc025adfada81d06fba5 \ +" + +SRCREV = "2969be996acad84b91ab3875b1816636fe61a40e" +SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig gettext + +# ispellaff2myspell: A program to convert ispell affix tables to myspell format +PACKAGES =+ "${PN}-ispell" +FILES:${PN}-ispell = "${bindir}/ispellaff2myspell" +RDEPENDS:${PN}-ispell = "perl" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-oe/recipes-support/hwdata/hwdata_0.387.bb index 50d35c682f..d73bb93aae 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_0.387.bb @@ -2,22 +2,25 @@ DESCRIPTION = "Hardware identification and configuration data" HOMEPAGE = "https://github.com/vcrhonek/hwdata" SECTION = "System/Base" -LICENSE = "GPL-2.0+" +LICENSE = "GPL-2.0-or-later | XFree86-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.291+git${SRCPV}" -SRCREV = "4bfbdcf5913d6dd53336d31b8035708075e6fdfa" -SRC_URI = "git://github.com/vcrhonek/${BPN}.git" +SRCREV = "f0ba62c0b0401c215aed8abb42cf7dcdb7e6fecc" +SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" +inherit allarch + do_configure() { ${S}/configure --datadir=${datadir} --libdir=${libdir} } +do_compile[noexec] = "1" + do_install() { oe_runmake install DESTDIR=${D} } -FILES_${PN} = "${libdir}/* \ +FILES:${PN} = "${libdir}/* \ ${datadir}/* " diff --git a/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb b/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb new file mode 100644 index 0000000000..8218b08084 --- /dev/null +++ b/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "A command-line application to restore firmware files to iOS devices" +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \ +" + +HOMEPAGE = "http://www.libimobiledevice.org/" + +DEPENDS = "libirecovery libimobiledevice libzip curl libimobiledevice-glue openssl" + +PV = "1.0.1+git" + +SRCREV = "ecae6c6e8ca6b6bad080a1c73f10ffd0e67d75a7" +SRC_URI = "git://github.com/libimobiledevice/idevicerestore;protocol=https;branch=master" + +S = "${WORKDIR}/git" +inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb b/meta-oe/recipes-support/iksemel/iksemel_1.5.bb index 0903e90d7d..b27c2b2e8a 100644 --- a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb +++ b/meta-oe/recipes-support/iksemel/iksemel_1.5.bb @@ -1,19 +1,22 @@ SUMMARY = "Fast and portable XML parser and Jabber protocol library" HOMEPAGE = "https://github.com/meduketto/iksemel" SECTION = "libs" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRCREV = "978b733462e41efd5db72bc9974cb3b0d1d5f6fa" -PV = "1.5+git${SRCPV}" +PV = "1.5+git" -SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https \ +SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https;branch=master \ file://fix-configure-option-parsing.patch \ file://avoid-obsolete-gnutls-apis.patch" +# The current PV is not a git tag but a README content +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" -inherit autotools pkgconfig lib_package +inherit autotools pkgconfig lib_package texinfo # TLS support requires either openssl or gnutls (if both are enabled openssl will be used). PACKAGECONFIG ?= "gnutls" diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.7.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.7.bb deleted file mode 100644 index 669534eaa0..0000000000 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.7.bb +++ /dev/null @@ -1,82 +0,0 @@ -SUMMARY = "ImageMagick is an image convertion tools" -SECTION = "console/utils" -LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dad5a98f173fd3fa6958a1a58c6131c1" -# FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. -DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib fftw freetype" - -BASE_PV := "${PV}" -PV .= "_7" -SRC_URI = "git://github.com/ImageMagick/ImageMagick.git " -SRCREV = "e12602b39b5e778240d286b6f9bbbc0fe3fb26c5" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig update-alternatives - -# xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2 -# if someone needs xml support then fix it first -EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --disable-openmp --without-xml --disable-opencl" - -CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[graphviz] = "--with-gvc,--without-gvc,graphviz" -PACKAGECONFIG[jp2] = "--with-jp2,,jasper" -PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz" -PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg" -PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo" -PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" -PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf" -PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt" - -FILES_${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \ - ${datadir}/ImageMagick-7" - -FILES_${PN}-dev += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/*.a" - -FILES_${PN}-dbg += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/.debug/*" - -BBCLASSEXTEND = "native" - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE_${PN} = "animate compare composite conjure convert display \ - identify import mogrify montage stream" - -ALTERNATIVE_TARGET[animate] = "${bindir}/animate.im7" -ALTERNATIVE_TARGET[compare] = "${bindir}/compare.im7" -ALTERNATIVE_TARGET[composite] = "${bindir}/composite.im7" -ALTERNATIVE_TARGET[conjure] = "${bindir}/conjure.im7" -ALTERNATIVE_TARGET[convert] = "${bindir}/convert.im7" -ALTERNATIVE_TARGET[display] = "${bindir}/display.im7" -ALTERNATIVE_TARGET[identify] = "${bindir}/identify.im7" -ALTERNATIVE_TARGET[import] = "${bindir}/import.im7" -ALTERNATIVE_TARGET[mogrify] = "${bindir}/mogrify.im7" -ALTERNATIVE_TARGET[montage] = "${bindir}/montage.im7" -ALTERNATIVE_TARGET[stream] = "${bindir}/stream.im7" - -ALTERNATIVE_${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \ - convert.1 display.1 identify.1 import.1 mogrify.1 montage.1 stream.1" - -ALTERNATIVE_LINK_NAME[animate.1] = "${mandir}/man1/animate.1" -ALTERNATIVE_TARGET[animate.1] = "${mandir}/man1/animate.im7.1" -ALTERNATIVE_LINK_NAME[compare.1] = "${mandir}/man1/compare.1" -ALTERNATIVE_TARGET[compare.1] = "${mandir}/man1/compare.im7.1" -ALTERNATIVE_LINK_NAME[composite.1] = "${mandir}/man1/composite.1" -ALTERNATIVE_TARGET[composite.1] = "${mandir}/man1/composite.im7.1" -ALTERNATIVE_LINK_NAME[conjure.1] = "${mandir}/man1/conjure.1" -ALTERNATIVE_TARGET[conjure.1] = "${mandir}/man1/conjure.im7.1" -ALTERNATIVE_LINK_NAME[convert.1] = "${mandir}/man1/convert.1" -ALTERNATIVE_TARGET[convert.1] = "${mandir}/man1/convert.im7.1" -ALTERNATIVE_LINK_NAME[display.1] = "${mandir}/man1/display.1" -ALTERNATIVE_TARGET[display.1] = "${mandir}/man1/display.im7.1" -ALTERNATIVE_LINK_NAME[identify.1] = "${mandir}/man1/identify.1" -ALTERNATIVE_TARGET[identify.1] = "${mandir}/man1/identify.im7.1" -ALTERNATIVE_LINK_NAME[import.1] = "${mandir}/man1/import.1" -ALTERNATIVE_TARGET[import.1] = "${mandir}/man1/import.im7.1" -ALTERNATIVE_LINK_NAME[mogrify.1] = "${mandir}/man1/mogrify.1" -ALTERNATIVE_TARGET[mogrify.1] = "${mandir}/man1/mogrify.im7.1" -ALTERNATIVE_LINK_NAME[montage.1] = "${mandir}/man1/montage.1" -ALTERNATIVE_TARGET[montage.1] = "${mandir}/man1/montage.im7.1" -ALTERNATIVE_LINK_NAME[stream.1] = "${mandir}/man1/stream.1" -ALTERNATIVE_TARGET[stream.1] = "${mandir}/man1/stream.im7.1" diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb new file mode 100644 index 0000000000..5407c4e400 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb @@ -0,0 +1,171 @@ +SUMMARY = "ImageMagick is an image conversion toolkit" +SECTION = "console/utils" +HOMEPAGE = "https://www.imagemagick.org/" +DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \ +editing raster and vector image files. It can read and write over 200 image file formats." +LICENSE = "ImageMagick" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2f9de66264141265b203cde9902819ea \ + file://NOTICE;md5=bcbf1f1897b40ec8df39700cb560e9ed" +# FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. +DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" + +BASE_PV := "${PV}" +PV .= "-26" +SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https" +SRCREV = "570a9a048bb0e3a5c221ca87be9408ae35f711e2" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig update-alternatives +export ac_cv_sys_file_offset_bits="64" + +EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --enable-largefile" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} cxx webp xml" +PACKAGECONFIG[cxx] = "--with-magick-plus-plus,--without-magick-plus-plus" +PACKAGECONFIG[graphviz] = "--with-gvc,--without-gvc,graphviz" +PACKAGECONFIG[jp2] = "--with-jp2,,jasper" +PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz" +PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg" +PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo" +PACKAGECONFIG[rsvg] = "--with-rsvg,--without-rsvg,librsvg" +PACKAGECONFIG[tcmalloc] = "--with-tcmalloc=yes,--with-tcmalloc=no,gperftools" +PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" +PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf" +PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt" +PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxml2" + +do_install:append:class-target() { + for file in MagickCore-config.im7 MagickWand-config.im7 Magick++-config.im7; do + sed -i 's,${STAGING_DIR_TARGET},,g' ${D}${bindir}/"$file" + done + sed -i 's,${S},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml + sed -i 's,${B},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml + sed -i 's,${RECIPE_SYSROOT},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml + sed -i 's,${HOSTTOOLS_DIR},${bindir},g' ${D}${sysconfdir}/ImageMagick-7/delegates.xml +} + +FILES:${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \ + ${datadir}/ImageMagick-7" + +FILES:${PN}-dev += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/*.a" + +FILES:${PN}-dbg += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/.debug/*" + +BBCLASSEXTEND = "native nativesdk" + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE:${PN} = "animate compare composite conjure convert display \ + identify import magick-script mogrify montage stream" + +ALTERNATIVE_TARGET[animate] = "${bindir}/animate.im7" +ALTERNATIVE_TARGET[compare] = "${bindir}/compare.im7" +ALTERNATIVE_TARGET[composite] = "${bindir}/composite.im7" +ALTERNATIVE_TARGET[conjure] = "${bindir}/conjure.im7" +ALTERNATIVE_TARGET[convert] = "${bindir}/convert.im7" +ALTERNATIVE_TARGET[display] = "${bindir}/display.im7" +ALTERNATIVE_TARGET[identify] = "${bindir}/identify.im7" +ALTERNATIVE_TARGET[import] = "${bindir}/import.im7" +ALTERNATIVE_TARGET[magick-script] = "${bindir}/magick-script.im7" +ALTERNATIVE_TARGET[mogrify] = "${bindir}/mogrify.im7" +ALTERNATIVE_TARGET[montage] = "${bindir}/montage.im7" +ALTERNATIVE_TARGET[stream] = "${bindir}/stream.im7" + +ALTERNATIVE:${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \ + convert.1 display.1 identify.1 import.1 magick-script.1 mogrify.1 montage.1 stream.1" + +ALTERNATIVE_LINK_NAME[animate.1] = "${mandir}/man1/animate.1" +ALTERNATIVE_TARGET[animate.1] = "${mandir}/man1/animate.im7.1" +ALTERNATIVE_LINK_NAME[compare.1] = "${mandir}/man1/compare.1" +ALTERNATIVE_TARGET[compare.1] = "${mandir}/man1/compare.im7.1" +ALTERNATIVE_LINK_NAME[composite.1] = "${mandir}/man1/composite.1" +ALTERNATIVE_TARGET[composite.1] = "${mandir}/man1/composite.im7.1" +ALTERNATIVE_LINK_NAME[conjure.1] = "${mandir}/man1/conjure.1" +ALTERNATIVE_TARGET[conjure.1] = "${mandir}/man1/conjure.im7.1" +ALTERNATIVE_LINK_NAME[convert.1] = "${mandir}/man1/convert.1" +ALTERNATIVE_TARGET[convert.1] = "${mandir}/man1/convert.im7.1" +ALTERNATIVE_LINK_NAME[display.1] = "${mandir}/man1/display.1" +ALTERNATIVE_TARGET[display.1] = "${mandir}/man1/display.im7.1" +ALTERNATIVE_LINK_NAME[identify.1] = "${mandir}/man1/identify.1" +ALTERNATIVE_TARGET[identify.1] = "${mandir}/man1/identify.im7.1" +ALTERNATIVE_LINK_NAME[import.1] = "${mandir}/man1/import.1" +ALTERNATIVE_TARGET[import.1] = "${mandir}/man1/import.im7.1" +ALTERNATIVE_LINK_NAME[magick-script.1] = "${mandir}/man1/magick-script.1" +ALTERNATIVE_TARGET[magick-script.1] = "${mandir}/man1/magick-script.im7.1" +ALTERNATIVE_LINK_NAME[mogrify.1] = "${mandir}/man1/mogrify.1" +ALTERNATIVE_TARGET[mogrify.1] = "${mandir}/man1/mogrify.im7.1" +ALTERNATIVE_LINK_NAME[montage.1] = "${mandir}/man1/montage.1" +ALTERNATIVE_TARGET[montage.1] = "${mandir}/man1/montage.im7.1" +ALTERNATIVE_LINK_NAME[stream.1] = "${mandir}/man1/stream.1" +ALTERNATIVE_TARGET[stream.1] = "${mandir}/man1/stream.im7.1" + +CVE_STATUS[CVE-2007-1667] = "cpe-incorrect: CVE should not include a CPE for imagemagick" +CVE_STATUS[CVE-2014-9804] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9805] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9806] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9807] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9808] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9809] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9810] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9811] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9812] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9813] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9814] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9815] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9816] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9817] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9818] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9819] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9820] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9821] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9822] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9823] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9824] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9825] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9826] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9827] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9828] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9829] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9830] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9831] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9848] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9852] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9853] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9854] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2014-9907] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-10062] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-10" +CVE_STATUS[CVE-2016-10144] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.7-1" +CVE_STATUS[CVE-2016-10145] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.7-1" +CVE_STATUS[CVE-2016-10146] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.6-8" +CVE_STATUS[CVE-2016-5118] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-7" +CVE_STATUS[CVE-2016-7513] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7514] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-0" +CVE_STATUS[CVE-2016-7515] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7516] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7517] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7518] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7519] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7520] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7521] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7522] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7523] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7524] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7525] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7526] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7527] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7528] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7529] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7530] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7531] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-0" +CVE_STATUS[CVE-2016-7532] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7533] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7534] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7535] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7536] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7537] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2016-7538] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" +CVE_STATUS[CVE-2017-5506] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4" +CVE_STATUS[CVE-2017-5509] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4" +CVE_STATUS[CVE-2017-5510] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4" +CVE_STATUS[CVE-2017-5511] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-3" diff --git a/meta-oe/recipes-support/imapfilter/imapfilter/ldflags.patch b/meta-oe/recipes-support/imapfilter/imapfilter/ldflags.patch new file mode 100644 index 0000000000..ceda8394a7 --- /dev/null +++ b/meta-oe/recipes-support/imapfilter/imapfilter/ldflags.patch @@ -0,0 +1,16 @@ +Append to LDFLAGS so it can respect the LDFLAGS passed from environment. This helps +with using propert GNU_HASH settings during link on mips/arm + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/Makefile ++++ b/src/Makefile +@@ -24,7 +24,7 @@ CFLAGS = -Wall -Wextra -O \ + -DCONFIG_SSL_CAPATH='"$(SSLCAPATH)"' \ + -DCONFIG_SSL_CAFILE='"$(SSLCAFILE)"' \ + $(INCDIRS) $(MYCFLAGS) +-LDFLAGS = $(LIBDIRS) $(MYLDFLAGS) ++LDFLAGS += $(LIBDIRS) $(MYLDFLAGS) + LIBS = -lm -ldl $(LIBLUA) $(LIBPCRE) $(LIBSSL) $(LIBCRYPTO) $(MYLIBS) + + MAN1 = imapfilter.1 diff --git a/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb b/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb new file mode 100644 index 0000000000..422d96359c --- /dev/null +++ b/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "IMAPFilter is a mail filtering utility that processes mailboxes based on IMAP queries" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f8d2fc4954306888fd0e4b27bef83525" + +# v2.7.6 +SRCREV = "9e6661278572009a92a8e125c9b339232a9735a1" +SRC_URI = "git://github.com/lefcha/imapfilter;protocol=https;branch=master \ + file://ldflags.patch \ +" +S = "${WORKDIR}/git" + +DEPENDS= "openssl lua libpcre2" + +EXTRA_OEMAKE:append = " PREFIX=${prefix}" + +do_install(){ + oe_runmake DESTDIR=${D} install + + # No need for manuals at this point, MANDIR is hardcoded to depend on prefix + rm -rf ${D}${prefix}/man +} + +ASNEEDED = "" diff --git a/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb b/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb new file mode 100644 index 0000000000..c4b7ce032d --- /dev/null +++ b/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb @@ -0,0 +1,39 @@ +SUMMARY = "i.MX code signing tool" +DESCRIPTION = "Code signing support that integrates the HABv4 and AHAB library for i.MX processors" +LICENSE = "BSD-3-Clause & Apache-2.0" + +LIC_FILES_CHKSUM = "\ + file://LICENSE.bsd3;md5=14aba05f9fa6c25527297c8aac95fcf6 \ + file://LICENSE.hidapi;md5=e0ea014f523f64f0adb13409055ee59e \ + file://LICENSE.openssl;md5=3441526b1df5cc01d812c7dfc218cea6 \ +" + +DEPENDS = "byacc-native flex-native openssl" + +# debian: 3.4.0+dfsg-2 +DEBIAN_PGK_NAME = "imx-code-signing-tool" +DEBIAN_PGK_VERSION = "${PV}+dfsg" + +SRC_URI = "\ + ${DEBIAN_MIRROR}/main/i/${DEBIAN_PGK_NAME}/${DEBIAN_PGK_NAME}_${DEBIAN_PGK_VERSION}.orig.tar.xz \ +" + +SRC_URI[sha256sum] = "52ee3cee3bc500a42095f73c4584e223b4b9d2dfc1cd3e5df965c5952eba8c8d" + +S = "${WORKDIR}/${DEBIAN_PGK_NAME}-${DEBIAN_PGK_VERSION}" + +EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" AR="${AR}" OBJCOPY="${OBJCOPY}"' + +do_compile() { + oe_runmake -C code/obj.linux64 OSTYPE=linux64 ENCRYPTION=yes COPTIONS="${CFLAGS} ${CPPFLAGS}" LDOPTIONS="${LDFLAGS}" + oe_runmake -C add-ons/hab_csf_parser COPTS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" +} + +do_install () { + install -d ${D}${bindir} + install -m 755 ${S}/code/obj.linux64/cst ${D}${bindir}/ + install -m 755 ${S}/code/obj.linux64/srktool ${D}${bindir} + install -m 755 ${S}/add-ons/hab_csf_parser/csf_parser ${D}${bindir} +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/inih/libinih_58.bb b/meta-oe/recipes-support/inih/libinih_58.bb new file mode 100644 index 0000000000..2bcf2b4bd4 --- /dev/null +++ b/meta-oe/recipes-support/inih/libinih_58.bb @@ -0,0 +1,14 @@ +SUMMARY = "inih (INI Not Invented Here)" +DESCRIPTION = "A .INI file parser written in C that was designed to be small and simple." +HOMEPAGE = "https://github.com/benhoyt/inih" +SECTION = "libs" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7a95d2af90376e85a05318794e6f202" + +SRC_URI = "git://github.com/benhoyt/inih.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" +SRCREV = "5cc5e2c24642513aaa5b19126aad42d0e4e0923e" + +inherit meson pkgconfig diff --git a/meta-oe/recipes-support/inih/libinih_git.bb b/meta-oe/recipes-support/inih/libinih_git.bb deleted file mode 100644 index 5030c78a31..0000000000 --- a/meta-oe/recipes-support/inih/libinih_git.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "C and C++ INI Library" -HOMEPAGE = "http://code.google.com/p/inih/" -PV = "0.0+gitr${SRCPV}" -PKGV = "${GITPKGVTAG}" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dae28cbf28207425e0d0b3eb835f4bde" - -PR = "r3" - -# The github repository provides a cmake and pkg-config integration -SRCREV = "25078f7156eb8647b3b35dd25f9ae6f8c4ee0589" -SRC_URI = "git://github.com/OSSystems/inih.git" - -S = "${WORKDIR}/git" - -inherit gitpkgv cmake - -# We don't have libinih since we only have static libraries -ALLOW_EMPTY_${PN} = "1" diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.2.4.bb b/meta-oe/recipes-support/iniparser/iniparser_4.2.4.bb new file mode 100644 index 0000000000..aeac9c30ba --- /dev/null +++ b/meta-oe/recipes-support/iniparser/iniparser_4.2.4.bb @@ -0,0 +1,18 @@ +SUMMARY = "The iniParser library is a simple C library offering INI file parsing services (both reading and writing)." +SECTION = "libs" +HOMEPAGE = "https://gitlab.com/iniparser/iniparser" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678" +SRCBRANCH = "main" +SRCREV = "4e5d1cc10215ce328c61bb5fd7839746e47375f9" + +SRC_URI = "git://gitlab.com/iniparser/iniparser.git;protocol=https;branch=${SRCBRANCH}" +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = " \ + -DBUILD_DOCS=OFF \ + " + +FILES_${PN}-staticdev += "${libdir}/cmake/iniparser/iniparser-staticTargets*.cmake" diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch new file mode 100644 index 0000000000..3b195aae4f --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch @@ -0,0 +1,28 @@ +From 6a57ff26d695aaad096b798879a5dbc5af2cedf5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 20 Dec 2022 10:46:50 -0800 +Subject: [PATCH] configure: Add AC_SYS_LARGEFILE autoconf macro + +This will define _FILE_OFFSET_BITS to be 64 if off_t is 64bit +and we do not need to define lfs64 functions + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/174] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index bddf14d..b89a266 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,6 +17,9 @@ AC_PROG_CC + AM_INIT_AUTOMAKE + LT_INIT + ++# Add option for largefile support ++AC_SYS_LARGEFILE ++ + AC_PATH_PROG(DOXYGEN, doxygen, NO_DOXYGEN) + + AC_ARG_ENABLE(doxygen, diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch new file mode 100644 index 0000000000..931244830c --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch @@ -0,0 +1,40 @@ +From 6c3ce01a281a9aa661494d24a862219fc9e2b460 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 16 Dec 2021 14:57:55 -0800 +Subject: [PATCH 2/2] libinotifytools: Bridge differences between + musl/glibc/kernel fnotify.h + +System detects to use sys/fnotify.h and then assumes glibc's definitions +but musl has definitions of its own. perhaps portable thing would be to +use linux/fnotify.h interface directly on linux irrespective of libc + +See the differences discussion here [1] + +[1] https://inbox.vuxu.org/musl/20191112220151.GC27331@x230/T/#ma8700992467200c8792e0fa8508eae656b81aeba + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/154] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libinotifytools/src/inotifytools.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c +index 902eac2..2b96395 100644 +--- a/libinotifytools/src/inotifytools.c ++++ b/libinotifytools/src/inotifytools.c +@@ -55,6 +55,12 @@ struct fanotify_event_fid { + struct fanotify_event_info_fid info; + struct file_handle handle; + }; ++ ++#ifndef __GLIBC__ ++#define val __val ++#define __kernel_fsid_t fsid_t ++#endif ++ + #endif + + /** +-- +2.34.1 + diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch new file mode 100644 index 0000000000..c0784ecc73 --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch @@ -0,0 +1,119 @@ +From c6093ad63b92f5d25e6826d1c49dc7cee86d3747 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 20 Dec 2022 10:48:10 -0800 +Subject: [PATCH] replace stat64/lstat64 with stat/lstat + +lfs64 functions are not needed when off_t is 64-bit +Additionally this fixes build with musl which does not +export these functions without defining _LARGEFILE64_SOURCE + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/174] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libinotifytools/src/inotifytools.c | 8 ++++---- + libinotifytools/src/inotifytools/inotify-nosys.h | 5 ----- + libinotifytools/src/inotifytools/inotifytools.h | 5 ----- + src/common.c | 4 ++-- + src/common.h | 6 +----- + 5 files changed, 7 insertions(+), 21 deletions(-) + +diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c +index 50f6135..3e17ac6 100644 +--- a/libinotifytools/src/inotifytools.c ++++ b/libinotifytools/src/inotifytools.c +@@ -1750,14 +1750,14 @@ int inotifytools_watch_recursively_with_exclude(char const* path, + + static struct dirent * ent; + char * next_file; +- static struct stat64 my_stat; ++ static struct stat my_stat; + ent = readdir( dir ); + // Watch each directory within this directory + while ( ent ) { + if ( (0 != strcmp( ent->d_name, "." )) && + (0 != strcmp( ent->d_name, ".." )) ) { + nasprintf(&next_file,"%s%s", my_path, ent->d_name); +- if ( -1 == lstat64( next_file, &my_stat ) ) { ++ if ( -1 == lstat( next_file, &my_stat ) ) { + error = errno; + free( next_file ); + if ( errno != EACCES ) { +@@ -1840,9 +1840,9 @@ int inotifytools_error() { + * @internal + */ + static int isdir( char const * path ) { +- static struct stat64 my_stat; ++ static struct stat my_stat; + +- if ( -1 == lstat64( path, &my_stat ) ) { ++ if ( -1 == lstat( path, &my_stat ) ) { + if (errno == ENOENT) return 0; + fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno)); + return 0; +diff --git a/libinotifytools/src/inotifytools/inotify-nosys.h b/libinotifytools/src/inotifytools/inotify-nosys.h +index 01aa45e..97166d4 100644 +--- a/libinotifytools/src/inotifytools/inotify-nosys.h ++++ b/libinotifytools/src/inotifytools/inotify-nosys.h +@@ -13,11 +13,6 @@ + #include <sys/syscall.h> + #include <unistd.h> + +-#ifdef __FreeBSD__ +-#define stat64 stat +-#define lstat64 lstat +-#endif +- + /* + * struct inotify_event - structure read from the inotify device for each event + * +diff --git a/libinotifytools/src/inotifytools/inotifytools.h b/libinotifytools/src/inotifytools/inotifytools.h +index 49936ae..2ec4358 100644 +--- a/libinotifytools/src/inotifytools/inotifytools.h ++++ b/libinotifytools/src/inotifytools/inotifytools.h +@@ -1,11 +1,6 @@ + #ifndef _inotifytools_H + #define _inotifytools_H + +-#ifdef __FreeBSD__ +-#define stat64 stat +-#define lstat64 lstat +-#endif +- + #ifdef __cplusplus + extern "C" + { +diff --git a/src/common.c b/src/common.c +index 5a6fda1..885286e 100644 +--- a/src/common.c ++++ b/src/common.c +@@ -45,9 +45,9 @@ void print_event_descriptions() { + } + + int isdir(char const *path) { +- static struct stat64 my_stat; ++ static struct stat my_stat; + +- if (-1 == lstat64(path, &my_stat)) { ++ if (-1 == lstat(path, &my_stat)) { + if (errno == ENOENT) + return 0; + fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno)); +diff --git a/src/common.h b/src/common.h +index 12d3dde..7f1e34a 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -1,13 +1,9 @@ + #ifndef COMMON_H + #define COMMON_H + +-#ifdef __FreeBSD__ +-#define stat64 stat +-#define lstat64 lstat +-#ifdef ENABLE_FANOTIFY ++#if defined(__FreeBSD__) && defined(ENABLE_FANOTIFY) + #error "FreeBSD does not support fanotify" + #endif +-#endif + + #include <stdbool.h> + diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch deleted file mode 100644 index 89b890dda9..0000000000 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch +++ /dev/null @@ -1,31 +0,0 @@ -inotify-tools: fix __NR_inotify_add_watch system call number on _MIPS_SIM_ABI64 - -The correct value should be the same as defined in -linux/arch/mips/include/uapi/asm/unistd.h - -Upstream-Status: Summitted [https://github.com/rvoicilas/inotify-tools/pull/71] - -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - libinotifytools/src/inotifytools/inotify-nosys.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libinotifytools/src/inotifytools/inotify-nosys.h b/libinotifytools/src/inotifytools/inotify-nosys.h -index db76b2c..5f7b11b 100644 ---- a/libinotifytools/src/inotifytools/inotify-nosys.h -+++ b/libinotifytools/src/inotifytools/inotify-nosys.h -@@ -100,8 +100,8 @@ struct inotify_event { - # endif - # if _MIPS_SIM == _MIPS_SIM_ABI64 - # define __NR_inotify_init (__NR_Linux + 243) --# define __NR_inotify_add_watch (__NR_Linux + 243) --# define __NR_inotify_rm_watch (__NR_Linux + 243) -+# define __NR_inotify_add_watch (__NR_Linux + 244) -+# define __NR_inotify_rm_watch (__NR_Linux + 245) - # endif - # if _MIPS_SIM == _MIPS_SIM_NABI32 - # define __NR_inotify_init (__NR_Linux + 247) --- -1.7.10.4 - diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/inotifywait-fix-compile-error-with-GCC-6.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/inotifywait-fix-compile-error-with-GCC-6.patch deleted file mode 100644 index ba042a24b4..0000000000 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools/inotifywait-fix-compile-error-with-GCC-6.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 7affb288d6c0726e7b1ebc317a878927b6ef0d02 Mon Sep 17 00:00:00 2001 -From: Andrea Galbusera <gizero@gmail.com> -Date: Tue, 13 Sep 2016 08:10:29 +0200 -Subject: [PATCH] inotifywait: fix compile error with GCC 6 - -Fails to compile with misleading-indentation error - -| src/inotifywait.c: In function 'output_event_csv': -| src/inotifywait.c:126:5: error: this 'if' clause does not guard... [-Werror=misleading-indentation] -| if (filename != NULL) -| ^~ -| src/inotifywait.c:129:2: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' -| printf("%s,", csv_escape( inotifytools_event_to_str( event->mask ) ) ); -| ^~~~~~ -| cc1: all warnings being treated as errors - -Fix indentation to resolve. - -Upstream-Status: Submitted [https://github.com/rvoicilas/inotify-tools/pull/66] - -Signed-off-by: Andrea Galbusera <gizero@gmail.com> ---- - src/inotifywait.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/inotifywait.c b/src/inotifywait.c -index c5ce5e3..404a85b 100644 ---- a/src/inotifywait.c -+++ b/src/inotifywait.c -@@ -122,9 +122,9 @@ void validate_format( char * fmt ) { - - - void output_event_csv( struct inotify_event * event ) { -- char *filename = csv_escape(inotifytools_filename_from_wd(event->wd)); -- if (filename != NULL) -- printf("%s,", filename); -+ char *filename = csv_escape(inotifytools_filename_from_wd(event->wd)); -+ if (filename != NULL) -+ printf("%s,", filename); - - printf("%s,", csv_escape( inotifytools_event_to_str( event->mask ) ) ); - if ( event->len > 0 ) --- -1.9.1 - diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb new file mode 100644 index 0000000000..8a0ae17ad7 --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "Command line tools and C library providing a simple interface to inotify" +HOMEPAGE = "http://wiki.github.com/rvoicilas/inotify-tools" +SECTION = "console/devel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" + +SRCREV = "c8bdbc0a2ed822fc7c67c5c3e102d89fe27fb2d0" + +SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https \ + file://0002-libinotifytools-Bridge-differences-between-musl-glib.patch \ + file://0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch \ + file://0003-replace-stat64-lstat64-with-stat-lstat.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools + +EXTRA_OECONF = "--disable-doxygen" + +# workaround until glibc 2.35 is fixed for this [1] +# [1] https://sourceware.org/pipermail/libc-alpha/2021-December/134215.html +CFLAGS += "-Wno-error" + +PACKAGES =+ "libinotifytools" + +FILES:libinotifytools = "${libdir}/lib*.so.*" diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb deleted file mode 100644 index efc753d5bf..0000000000 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Command line tools and C library providing a simple interface to inotify" -AUTHOR = "Rohan McGovern <rohan@mcgovern.id.au>" -HOMEPAGE = "http://wiki.github.com/rvoicilas/inotify-tools" -SECTION = "console/devel" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" - -SRCREV = "1df9af4d6cd0f4af4b1b19254bcf056aed4ae395" -PV = "3.14+git${SRCPV}" - -SRC_URI = "git://github.com/rvoicilas/${BPN} \ - file://inotifywait-fix-compile-error-with-GCC-6.patch \ - file://inotify-nosys-fix-system-call-number.patch \ - " - -S = "${WORKDIR}/git" - -inherit autotools - -EXTRA_OECONF = "--disable-doxygen" - -PACKAGES =+ "libinotifytools" - -FILES_libinotifytools = "${libdir}/lib*.so.*" diff --git a/meta-oe/recipes-support/ipmitool/ipmitool_1.8.18.bb b/meta-oe/recipes-support/ipmitool/ipmitool_1.8.18.bb deleted file mode 100644 index 9f73d2799b..0000000000 --- a/meta-oe/recipes-support/ipmitool/ipmitool_1.8.18.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Utility for IPMI control" -DESCRIPTION = "This package contains a utility for interfacing with devices that support \ -the Intelligent Platform Management Interface specification. IPMI is \ -an open standard for machine health, inventory, and remote power control. \ -\ -This utility can communicate with IPMI-enabled devices through either a \ -kernel driver such as OpenIPMI or over the RMCP LAN protocol defined in \ -the IPMI specification. IPMIv2 adds support for encrypted LAN \ -communications and remote Serial-over-LAN functionality. \ -\ -It provides commands for reading the Sensor Data Repository (SDR) and \ -displaying sensor values, displaying the contents of the System Event \ -Log (SEL), printing Field Replaceable Unit (FRU) information, reading and \ -setting LAN configuration, and chassis power control. \ -" - -HOMEPAGE = "http://ipmitool.sourceforge.net/" -SECTION = "kernel/userland" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=9aa91e13d644326bf281924212862184" - -DEPENDS = "openssl readline ncurses" - -SRC_URI = "${SOURCEFORGE_MIRROR}/ipmitool/ipmitool-${PV}.tar.bz2" -SRC_URI[md5sum] = "bab7ea104c7b85529c3ef65c54427aa3" -SRC_URI[sha256sum] = "0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01" - -inherit autotools - -# --disable-dependency-tracking speeds up the build -# --enable-file-security adds some security checks -# --disable-intf-free disables FreeIPMI support - we don't want to depend on -# FreeIPMI libraries, FreeIPMI has its own ipmitoool-like utility. -# -EXTRA_OECONF = "--disable-dependency-tracking --enable-file-security --disable-intf-free" diff --git a/meta-oe/recipes-support/ipmiutil/ipmiutil/fix_systemd_path.patch b/meta-oe/recipes-support/ipmiutil/ipmiutil/fix_systemd_path.patch deleted file mode 100644 index 33116b3c06..0000000000 --- a/meta-oe/recipes-support/ipmiutil/ipmiutil/fix_systemd_path.patch +++ /dev/null @@ -1,127 +0,0 @@ -allow systemd path to be defined by configure option. - -The configure probes the host for systemd path information. - -Upstream Status: Inappropriate [Embedded] - -Signed-off-By: Armin Kuster <akuster@mvista.com> - -Index: ipmiutil-3.0.5/configure.ac -=================================================================== ---- ipmiutil-3.0.5.orig/configure.ac -+++ ipmiutil-3.0.5/configure.ac -@@ -149,7 +149,6 @@ CROSS_LFLAGS="" - CROSS_CFLAGS="" - LIBSENSORS="" - SAM2OBJ="isensor2.o ievents2.o" --SYSTEMD_DIR=/usr/share/ipmiutil - - AC_ARG_ENABLE([useflags], - [ --enable-useflags include environment CFLAGS and LDFLAGS.], -@@ -200,29 +199,42 @@ AC_ARG_ENABLE([gpl], - - dnl Does this Linux have systemd enabled? Otherwise use sysv init. - AC_ARG_ENABLE([systemd], -- [ --enable-systemd enable systemd service type=notify support and %_unitdir [[default=disabled]]],) --if test "x$enable_systemd" = "xyes"; then -- GPL_CFLAGS="$GPL_CFLAGS -DENABLE_SYSTEMD" -- # if systemd enabled, install service scripts in unitdir -- which rpm >/dev/null 2>&1 -- if test $? -eq 0 ; then -- SYSTEMD_DIR=`rpm --eval "%{_unitdir}"` -- else -- SYSTEMD_DIR=/usr/share/ipmiutil -- fi -+ [ --enable-systemd[=systemddir] install systemd unit file. If 'yes' -+ probe the system for unit directory. -+ If a path is specified, assume that -+ is a valid install path. [[default=disabled]]],) -+# Check whether --enable-systemd was given. -+if test "${enable_systemd+set}" = set; then : -+ withval=$enable_systemd; if test "$withval" = yes; then -+ GPL_CFLAGS="$GPL_CFLAGS -DENABLE_SYSTEMD" -+ if test -z "$systemddir"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking location of the systemd unit files directory" >&5 -+ $as_echo_n "checking location of the systemd unit files directory... " >&6; } -+ _rpmdir = "" -+ which rpm >/dev/null 2>&1 -+ if test $? -eq 0 ; then -+ _rpmdir = `rpm --eval "%{_unitdir}"` -+ fi -+ for systemd_d in ${datadir}/usr/share/ipmiutil ${_rpmdir} /usr/share/ipmiutil; do -+ if test -z "$systemddir"; then -+ if test -d "$systemd_d"; then -+ systemddir="$systemd_d" -+ fi -+ fi -+ done -+ fi -+ if test -n "$systemddir"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $systemddir" >&5 -+ $as_echo "$systemddir" >&6; } -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -+ $as_echo "not found" >&6; } -+ fi - else -- # otherwise install the systemd service scripts in the data dir -- SYSTEMD_DIR=/usr/share/ipmiutil -- if test "x$sysname" != "xDarwin" ; then -- if test "x$os" != "xhpux" ; then -- # MacOS and HP-UX: 'which' command returns 0 always -- which rpm >/dev/null 2>&1 -- if test $? -eq 0 ; then -- datad=`rpm --eval "%{_datadir}"` -- SYSTEMD_DIR=${datad}/ipmiutil -- fi -- fi -- fi -+ if test "$withval" != no; then -+ systemddir=$withval -+ fi -+fi - fi - - dnl start main logic -@@ -528,7 +540,7 @@ AC_SUBST(INS_LIB) - AC_SUBST(SUBDIR_S) - AC_SUBST(CROSS_CFLAGS) - AC_SUBST(CROSS_LFLAGS) --AC_SUBST(SYSTEMD_DIR) -+AC_SUBST(systemddir) - AC_SUBST(SHR_LINK) - AC_SUBST(pkgconfigdir) - -Index: ipmiutil-3.0.5/scripts/Makefile.am -=================================================================== ---- ipmiutil-3.0.5.orig/scripts/Makefile.am -+++ ipmiutil-3.0.5/scripts/Makefile.am -@@ -17,7 +17,8 @@ cronto = ${DESTDIR}${etcdir}/cron.daily - sbinto = ${DESTDIR}${sbindir} - varto = ${DESTDIR}/var/lib/ipmiutil - initto = ${DESTDIR}@INIT_DIR@ --sysdto = ${DESTDIR}@SYSTEMD_DIR@ -+sysdto = ${DESTDIR}@systemddir@ -+systemddir = @systemddir@ - sysvinit = ${datato} - sbinfls = ialarms ihealth ifru igetevent ireset icmd isol ilan isensor isel iserial iwdt iconfig ipicmg ifirewall ifwum ihpm iuser - -@@ -47,10 +48,14 @@ install: - ${INSTALL_SCRIPT_SH} ipmi_port.sh ${sysvinit}/ipmi_port - ${INSTALL_SCRIPT_SH} ipmi_info ${sysvinit}/ipmi_info - ${INSTALL_SCRIPT_SH} checksel ${datato} -- ${INSTALL_DATA_SH} ipmiutil_wdt.service ${sysdto} -- ${INSTALL_DATA_SH} ipmiutil_asy.service ${sysdto} -- ${INSTALL_DATA_SH} ipmiutil_evt.service ${sysdto} -- ${INSTALL_DATA_SH} ipmi_port.service ${sysdto} -+ -+ if [ ! -z "${systemddir}" ]; then \ -+ $(MKDIR) ${sysdto}; \ -+ ${INSTALL_DATA_SH} ipmiutil_wdt.service ${sysdto}; \ -+ ${INSTALL_DATA_SH} ipmiutil_asy.service ${sysdto}; \ -+ ${INSTALL_DATA_SH} ipmiutil_evt.service ${sysdto}; \ -+ ${INSTALL_DATA_SH} ipmi_port.service ${sysdto}; \ -+ fi - ${INSTALL_SCRIPT_SH} ipmiutil.env ${datato} - ${INSTALL_SCRIPT_SH} ipmiutil.pre ${datato} - ${INSTALL_SCRIPT_SH} ipmiutil.setup ${datato} diff --git a/meta-oe/recipes-support/ipmiutil/ipmiutil_3.0.5.bb b/meta-oe/recipes-support/ipmiutil/ipmiutil_3.0.5.bb deleted file mode 100644 index 338cafd536..0000000000 --- a/meta-oe/recipes-support/ipmiutil/ipmiutil_3.0.5.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "ipmiutil is an easy-to-use set of IPMI server management utilities.\ -It can get/set sensor thresholds, automate SEL management, do SOL console, etc." - -DESCRIPTION = "The IPMI Management Utilities currently work with platforms that \ -support the IPMI 1.5 or 2.0 specification. IPMI servers can be managed\ -locally, or remotely via IPMI LAN, even when the OS or main CPU is not\ -functional.\n \ -The ipmiutil utilities will use an IPMI Driver, either the Intel IPMI package \ -(ipmidrvr, /dev/imb), MontaVista OpenIPMI (/dev/ipmi0), the valinux IPMI \ -Driver (/dev/ipmikcs), or the LANDesk ldipmi daemon. The ipmiutil utilities \ -can also use direct user-space I/Os in Linux or FreeBSD if no IPMI driver \ -is detected." - -HOMEPAGE = "http://ipmiutil.sourceforge.net" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=626a5970304daa1fcb87f757fb42b795" - -DEPENDS += "openssl" - -PARALLEL_MAKE = "" - -SRC_URI = "${SOURCEFORGE_MIRROR}/ipmiutil/ipmiutil-${PV}.tar.gz \ - file://fix_systemd_path.patch \ - " -SRC_URI[md5sum] = "5feaf6a827205792e057bb4ff5c4e842" -SRC_URI[sha256sum] = "b2d7f72535131c7832ba4be13dc33c81513fc3ee43fe797b4b52014600ecee5e" - -inherit autotools-brokensep pkgconfig systemd - -PACKAGECONFIG ?= "lanplus gpl" -PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--enable-systemd=${datadir}/${BPN}, --enable-systemd=no" -PACKAGECONFIG[sha256] = "--enable-sha256, --enable-sha256=no, openssl-native, openssl" -PACKAGECONFIG[lanplus] = "--enable-lanplus, --enable-lanplus=no, openssl-native, openssl" -PACKAGECONFIG[landesk] = "--enable-landesk, --enable-landesk=no" -PACKAGECONFIG[sensors] = "--enable-libsensors, --enable-libsensors=no" - -#build with some GPL code -PACKAGECONFIG[gpl] = "--enable-gpl, --enable-gpl=no" -#no GPL or LanPlus libs -PACKAGECONFIG[standalone] = "--enable-standalone, --enable-standalone=no" - -CFLAGS += "-I${STAGING_INCDIR}" -LDFLAGS += "-L${STAGING_LIBDIR}" - -COMPATIBLE_HOST = '(x86_64|i.86).*-linux' diff --git a/meta-oe/recipes-support/joe/joe/0001-adjust-signature-of-main.patch b/meta-oe/recipes-support/joe/joe/0001-adjust-signature-of-main.patch deleted file mode 100644 index 00f48e8a29..0000000000 --- a/meta-oe/recipes-support/joe/joe/0001-adjust-signature-of-main.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 27e4639254f2b2eb7d04790bd8cf16ecfcbac1c2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 19 Oct 2016 01:07:16 +0000 -Subject: [PATCH] adjust signature of main() - -clang complains about the types of main() function - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/main.c b/main.c -index 81ba543..ee7506c 100644 ---- a/main.c -+++ b/main.c -@@ -159,7 +159,7 @@ extern int breakflg; - - unsigned char **mainenv; - --int main(int argc, unsigned char **argv, unsigned char **envv) -+int main(int argc, char **argv, char **envv) - { - CAP *cap; - unsigned char *s; --- -1.9.1 - diff --git a/meta-oe/recipes-support/joe/joe_3.1.bb b/meta-oe/recipes-support/joe/joe_3.1.bb deleted file mode 100644 index 1ad355b5ae..0000000000 --- a/meta-oe/recipes-support/joe/joe_3.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SECTION = "console/utils" -SUMMARY = "Console text editor with good functionality, good choice for vi-haters" -HOMEPAGE = "http://joe-editor.sourceforge.net/" -LICENSE = "GPLv1" -LIC_FILES_CHKSUM = "file://COPYING;md5=da10ed7cf8038981c580e11c1d3e8fb6" - -SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz \ - file://0001-adjust-signature-of-main.patch \ - " - -PACKAGECONFIG ??= "curses" -PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,ncurses-terminfo" - -inherit autotools - -SRC_URI[md5sum] = "2a6ef018870fca9b7df85401994fb0e0" -SRC_URI[sha256sum] = "252390e4bc687957f09f334095904c8cc53b39c7b663ed47861ae1d11aef5946" diff --git a/meta-oe/recipes-support/joe/joe_4.6.bb b/meta-oe/recipes-support/joe/joe_4.6.bb new file mode 100644 index 0000000000..ed0bf337b5 --- /dev/null +++ b/meta-oe/recipes-support/joe/joe_4.6.bb @@ -0,0 +1,15 @@ +SECTION = "console/utils" +SUMMARY = "Console text editor with good functionality, good choice for vi-haters" +HOMEPAGE = "http://joe-editor.sourceforge.net/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" + +PACKAGECONFIG ??= "curses" +PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,ncurses-terminfo" + +inherit autotools-brokensep mime-xdg + +SRC_URI[md5sum] = "9017484e6116830d846678b625ea5c43" +SRC_URI[sha256sum] = "495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de" diff --git a/meta-oe/recipes-support/lcms/lcms_2.16.bb b/meta-oe/recipes-support/lcms/lcms_2.16.bb new file mode 100644 index 0000000000..8135f83a05 --- /dev/null +++ b/meta-oe/recipes-support/lcms/lcms_2.16.bb @@ -0,0 +1,17 @@ +SUMMARY = "Little cms is a small-footprint, speed optimized color management engine" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e9ce323c4b71c943a785db90142b228a" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz" +SRC_URI[sha256sum] = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51" + +DEPENDS = "tiff" + +BBCLASSEXTEND = "native nativesdk" + +S = "${WORKDIR}/lcms2-${PV}" + +inherit autotools + +CVE_PRODUCT += "littlecms:little_cms_color_engine" diff --git a/meta-oe/recipes-support/lcms/lcms_2.7.bb b/meta-oe/recipes-support/lcms/lcms_2.7.bb deleted file mode 100644 index 12ccb2050b..0000000000 --- a/meta-oe/recipes-support/lcms/lcms_2.7.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Little cms is a small-footprint, speed optimized color management engine" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=6c786c3b7a4afbd3c990f1b81261d516" -SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz" -SRC_URI[md5sum] = "06c1626f625424a811fb4b5eb070839d" -SRC_URI[sha256sum] = "4524234ae7de185e6b6da5d31d6875085b2198bc63b1211f7dde6e2d197d6a53" - -DEPENDS = "tiff" - -BBCLASSEXTEND = "native" - -S = "${WORKDIR}/lcms2-${PV}" - -inherit autotools diff --git a/meta-oe/recipes-support/lcov/lcov_1.11.bb b/meta-oe/recipes-support/lcov/lcov_1.11.bb deleted file mode 100644 index 2f9ac336e9..0000000000 --- a/meta-oe/recipes-support/lcov/lcov_1.11.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "A graphical front-end for gcov" -HOMEPAGE = "http://ltp.sourceforge.net/coverage/lcov.php" -DESCRIPTION = "LCOV is a graphical front-end for GCC's coverage testing \ -tool gcov. It collects gcov data for multiple source files and creates \ -HTML pages containing the source code annotated with coverage information. \ -It also adds overview pages for easy navigation within the file structure. \ -LCOV supports statement, function and branch coverage measurement." -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -RDEPENDS_${PN} += " \ - gcov \ - perl \ - perl-module-filehandle \ - perl-module-getopt-std \ - perl-module-digest-sha \ -" - -SRC_URI = "http://downloads.sourceforge.net/ltp/${BP}.tar.gz" - -SRC_URI[md5sum] = "e79b799ae3ce149aa924c7520e993024" -SRC_URI[sha256sum] = "c282de8d678ecbfda32ce4b5c85fc02f77c2a39a062f068bd8e774d29ddc9bf8" - -do_install() { - oe_runmake install PREFIX=${D} -} - diff --git a/meta-oe/recipes-support/lcov/lcov_1.16.bb b/meta-oe/recipes-support/lcov/lcov_1.16.bb new file mode 100755 index 0000000000..4f35eff90f --- /dev/null +++ b/meta-oe/recipes-support/lcov/lcov_1.16.bb @@ -0,0 +1,60 @@ +SUMMARY = "A graphical front-end for gcov" +HOMEPAGE = "https://github.com/linux-test-project/lcov" +DESCRIPTION = "LCOV is a graphical front-end for GCC's coverage testing \ +tool gcov. It collects gcov data for multiple source files and creates \ +HTML pages containing the source code annotated with coverage information. \ +It also adds overview pages for easy navigation within the file structure. \ +LCOV supports statement, function and branch coverage measurement." +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +RDEPENDS:${PN} += " \ + perl \ + perl-module-filehandle \ + perl-module-getopt-std \ + perl-module-digest-md5 \ + perl-module-digest-sha \ + perl-module-constant \ + perl-module-cwd \ + perl-module-errno \ + perl-module-file-basename \ + perl-module-file-copy \ + perl-module-file-find \ + perl-module-file-path \ + perl-module-file-spec \ + perl-module-file-spec-functions \ + perl-module-file-spec-unix \ + perl-module-file-temp \ + perl-module-getopt-long \ + perl-module-list-util \ + perl-module-mro \ + perl-module-overload \ + perl-module-overloading \ + perl-module-overload-numbers \ + perl-module-parent \ + perl-module-pod-usage \ + perl-module-posix \ + perl-module-re \ + perl-module-safe \ + perl-module-scalar-util \ + perl-module-term-cap \ + perl-module-text-parsewords \ + perl-module-tie-hash \ +" + +RDEPENDS:${PN}:append:class-target = " \ + gcov \ + gcov-symlinks \ +" +SRC_URI = "https://github.com/linux-test-project/lcov/releases/download/v${PV}/lcov-${PV}.tar.gz" +SRC_URI[md5sum] = "bfee0cef50d7b7bd1df03bfadf68dcef" +SRC_URI[sha256sum] = "987031ad5528c8a746d4b52b380bc1bffe412de1f2b9c2ba5224995668e3240b" + +UPSTREAM_CHECK_URI = "https://github.com/linux-test-project/lcov/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + +do_install() { + oe_runmake install PREFIX=${D}${prefix} CFG_DIR=${D}${sysconfdir} LCOV_PERL_PATH="/usr/bin/env perl" +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb index 4cfb732932..59b26d821e 100644 --- a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb +++ b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb @@ -1,11 +1,11 @@ SUMMARY = "ATA S.M.A.R.T. Reading and Parsing Library" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "udev" SRCREV = "de6258940960443038b4c1651dfda3620075e870" -SRC_URI = "git://git.0pointer.de/libatasmart.git \ +SRC_URI = "git://git.0pointer.net/libatasmart.git;protocol=https;branch=master \ file://0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch \ " @@ -13,9 +13,9 @@ S = "${WORKDIR}/git" inherit autotools lib_package pkgconfig -do_install_append() { +do_install:append() { sed -i -e s://:/:g -e 's:=${libdir}/libudev.la:-ludev:g' ${D}${libdir}/libatasmart.la } PACKAGES =+ "${PN}-dev-vala" -FILES_${PN}-dev-vala = "${datadir}/vala" +FILES:${PN}-dev-vala = "${datadir}/vala" diff --git a/meta-oe/recipes-support/libb64/libb64/0001-Makefile-fix-parallel-build-of-examples.patch b/meta-oe/recipes-support/libb64/libb64/0001-Makefile-fix-parallel-build-of-examples.patch new file mode 100644 index 0000000000..84dee415ad --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64/0001-Makefile-fix-parallel-build-of-examples.patch @@ -0,0 +1,46 @@ +From cbe8bd2948f522062c6170f581e1e265692a9a55 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Sun, 24 Oct 2021 18:53:04 +0100 +Subject: [PATCH] Makefile: fix parallel build of examples + +Without the change examples fails to build as: + + $ LANG=C make -j + make -C src + make -C examples + make[1]: Entering directory 'libb64/src' + cc -O3 -Werror -pedantic -I../include -c -o cencode.o cencode.c + make[1]: Entering directory 'libb64/examples' + make[1]: *** No rule to make target 'libb64.a', needed by 'c-example1'. Stop. + make[1]: Leaving directory 'libb64/examples' + make: *** [Makefile:8: all_examples] Error 2 + make: *** Waiting for unfinished jobs.... + cc -O3 -Werror -pedantic -I../include -c -o cdecode.o cdecode.c + ar rv libb64.a cencode.o cdecode.o + ar: creating libb64.a + a - cencode.o + a - cdecode.o + make[1]: Leaving directory 'libb64/src' + +Upstream-Status: Submitted [https://github.com/libb64/libb64/pull/9] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index db40356..aa48c76 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ all_src: + $(MAKE) -C src + all_base64: all_src + $(MAKE) -C base64 +-all_examples: ++all_examples: all_src + $(MAKE) -C examples + + clean: clean_src clean_base64 clean_include clean_examples +-- +2.37.2 + diff --git a/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch new file mode 100644 index 0000000000..b3ee24d9d5 --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch @@ -0,0 +1,27 @@ +From 68f66d1583be670eb8d5f3f38dbd5dd1d63b733c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 27 Mar 2021 21:41:04 -0700 +Subject: [PATCH] example: Do not run the tests + +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + examples/Makefile | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/examples/Makefile b/examples/Makefile +index d9667a5..554b346 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -33,11 +33,8 @@ depend: $(SOURCES) + makedepend -f- $(CFLAGS) $(SOURCES) 2> /dev/null 1> depend + + test-c-example1: c-example1 +- ./c-example1 + + test-c-example2: c-example2 +- ./c-example2 loremgibson.txt encoded.txt decoded.txt +- diff -q loremgibson.txt decoded.txt + + test: test-c-example1 test-c-example2 + diff --git a/meta-oe/recipes-support/libb64/libb64/0001-examples-Use-proper-function-prototype-for-main.patch b/meta-oe/recipes-support/libb64/libb64/0001-examples-Use-proper-function-prototype-for-main.patch new file mode 100644 index 0000000000..42e889efc2 --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64/0001-examples-Use-proper-function-prototype-for-main.patch @@ -0,0 +1,27 @@ +From 98eaf510f40e384b32c01ad4bd5c3a697fdd8560 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 Aug 2022 14:34:38 -0700 +Subject: [PATCH] examples: Use proper function prototype for main + +Upstream-Status: Submitted [https://github.com/libb64/libb64/pull/10] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + examples/c-example1.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/c-example1.c b/examples/c-example1.c +index a0001df..34585dd 100644 +--- a/examples/c-example1.c ++++ b/examples/c-example1.c +@@ -83,7 +83,7 @@ char* decode(const char* input) + } + + +-int main() ++int main(int argc, char** argv) + { + const char* input = "hello world"; + char* encoded; +-- +2.37.2 + diff --git a/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch b/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch new file mode 100644 index 0000000000..f2b8f599c6 --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch @@ -0,0 +1,57 @@ +From 9ec49389f56816d7ac2331296c03d147531a421a Mon Sep 17 00:00:00 2001 +From: Jakub Wilk <jwilk@debian.org> +Date: Sat, 27 Mar 2021 22:01:13 -0700 +Subject: [PATCH] use BUFSIZ as buffer size + +Bug: http://sourceforge.net/tracker/?func=detail&atid=785907&aid=3591336&group_id=152942 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + include/b64/decode.h | 3 ++- + include/b64/encode.h | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/include/b64/decode.h b/include/b64/decode.h +index b2362e5..8db1d09 100644 +--- a/include/b64/decode.h ++++ b/include/b64/decode.h +@@ -8,6 +8,7 @@ For details, see http://sourceforge.net/projects/libb64 + #ifndef BASE64_DECODE_H + #define BASE64_DECODE_H + ++#include <cstdio> + #include <iostream> + + namespace base64 +@@ -22,7 +23,7 @@ namespace base64 + base64_decodestate _state; + int _buffersize; + +- decoder(int buffersize_in = BUFFERSIZE) ++ decoder(int buffersize_in = BUFSIZ) + : _buffersize(buffersize_in) + { + base64_init_decodestate(&_state); +diff --git a/include/b64/encode.h b/include/b64/encode.h +index c1a5f88..644e4dd 100644 +--- a/include/b64/encode.h ++++ b/include/b64/encode.h +@@ -8,6 +8,7 @@ For details, see http://sourceforge.net/projects/libb64 + #ifndef BASE64_ENCODE_H + #define BASE64_ENCODE_H + ++#include <cstdio> + #include <iostream> + + namespace base64 +@@ -22,7 +23,7 @@ namespace base64 + base64_encodestate _state; + int _buffersize; + +- encoder(int buffersize_in = BUFFERSIZE) ++ encoder(int buffersize_in = BUFSIZ) + : _buffersize(buffersize_in) + { + base64_init_encodestate(&_state); diff --git a/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb b/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb new file mode 100644 index 0000000000..e0683b177b --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb @@ -0,0 +1,38 @@ +SUMMARY = "Base64 Encoding/Decoding Routines" +DESCRIPTION = "base64 encoding/decoding library - runtime library \ +libb64 is a library of ANSI C routines for fast encoding/decoding data into \ +and from a base64-encoded format" +HOMEPAGE = "https://github.com/libb64" +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=81296a564fa0621472714aae7c763d96" + +PV .= "+2.0.0.2+git" +SRCREV = "ce864b17ea0e24a91e77c7dd3eb2d1ac4175b3f0" + +SRC_URI = "git://github.com/libb64/libb64;protocol=https;branch=master \ + file://0001-example-Do-not-run-the-tests.patch \ + file://0002-use-BUFSIZ-as-buffer-size.patch \ + file://0001-Makefile-fix-parallel-build-of-examples.patch \ + file://0001-examples-Use-proper-function-prototype-for-main.patch \ + " + +S = "${WORKDIR}/git" + +CFLAGS += "-fPIC" + +do_configure () { + : +} + +do_compile () { + oe_runmake + ${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,${BPN}.so.0 src/*.o -o src/${BPN}.so.0 +} + +do_install () { + install -d ${D}${includedir}/b64 + install -Dm 0644 ${B}/src/libb64.a ${D}${libdir}/libb64.a + install -Dm 0644 ${B}/src/libb64.so.0 ${D}${libdir}/libb64.so.0 + ln -s libb64.so.0 ${D}${libdir}/libb64.so + install -Dm 0644 ${S}/include/b64/*.h ${D}${includedir}/b64/ +} diff --git a/meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch b/meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch deleted file mode 100644 index b57e39fbcc..0000000000 --- a/meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2ddc97b30792817d162f51ec3818376aefbf184e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 3 May 2017 02:05:33 -0400 -Subject: [PATCH] remove python2 support - -We use python3 rather than python2 support - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - src/python/Makefile.am | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/python/Makefile.am b/src/python/Makefile.am -index 567d0d7..8d9f446 100644 ---- a/src/python/Makefile.am -+++ b/src/python/Makefile.am -@@ -1,8 +1,3 @@ --pylibdir = $(shell python -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))") -- --pybytesizedir = $(pylibdir)/bytesize --dist_pybytesize_DATA = bytesize.py __init__.py -- - if WITH_PYTHON3 - py3libdir = $(shell python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))") - py3bytesizedir = $(py3libdir)/bytesize --- -2.8.1 - diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb b/meta-oe/recipes-support/libbytesize/libbytesize_2.11.bb index 6903021490..214c2b2844 100644 --- a/meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb +++ b/meta-oe/recipes-support/libbytesize/libbytesize_2.11.bb @@ -1,34 +1,29 @@ DESCRIPTION = "The goal of this project is to provide a tiny library that would \ facilitate the common operations with sizes in bytes." HOMEPAGE = "https://github.com/rhinstaller/libbytesize" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" SECTION = "devel/lib" LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" S = "${WORKDIR}/git" -B = "${S}" -SRCREV = "369127c0edbba7d1a4e2e02486375dd9d379524f" -PV = "0.10+git${SRCPV}" -SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master \ - file://0001-remove-python2-support.patch \ -" +SRCREV = "9da72b2732508b0ba0ceed27f5e50bc276ef31f2" +SRC_URI = "git://github.com/storaged-project/libbytesize;branch=main;protocol=https" -inherit gettext autotools python3native +inherit gettext autotools pkgconfig python3native DEPENDS += " \ - libpcre \ + libpcre2 \ gmp \ mpfr \ + gettext-native \ " -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" PACKAGECONFIG ??= "python3" -PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" -PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3-core" +EXTRA_OECONF = "--without-gtk-doc" EXTRA_OEMAKE = "py3libdir=${PYTHON_SITEPACKAGES_DIR}" - - diff --git a/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch index 4e0984f364..89f31f7946 100644 --- a/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch +++ b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch @@ -8,6 +8,8 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- +Upstream-Status: Pending + src/Makefile.am | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch b/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch new file mode 100644 index 0000000000..1e45441ff9 --- /dev/null +++ b/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -0,0 +1,65 @@ +From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001 +From: Michael Meeks <michael.meeks@suse.com> +Date: Fri, 9 Nov 2012 16:16:40 +0000 +Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays: + broadway/wayland + +--- +Upstream-Status: Pending + + src/canberra-gtk-module.c | 15 +++++++++++++++ + src/canberra-gtk.c | 5 +++++ + 2 files changed, 20 insertions(+) + +--- a/src/canberra-gtk-module.c ++++ b/src/canberra-gtk-module.c +@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDispla + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDispl + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisp + gboolean ret = FALSE; + Atom xembed; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return FALSE; ++#endif ++ + /* Gnome Panel applets are XEMBED windows. We need to make sure we + * ignore them */ + +--- a/src/canberra-gtk.c ++++ b/src/canberra-gtk.c +@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDispla + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, diff --git a/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch b/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch new file mode 100644 index 0000000000..57f5486084 --- /dev/null +++ b/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch @@ -0,0 +1,65 @@ +From dfd3ef4caac300f517f8eeb378f0b0f9ba6a9b06 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Tue, 15 Aug 2023 15:41:03 +0200 +Subject: [PATCH] remove dropped gtkdoc templates + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Pending +--- +--- a/gtkdoc/gtk-doc.make 2011-08-25 23:20:22.000000000 +0200 ++++ b/gtkdoc/gtk-doc.make 2023-08-15 18:08:02.430729073 +0200 +@@ -33,9 +33,9 @@ + $(HTML_IMAGES) \ + $(SETUP_FILES) + +-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ ++DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ +- tmpl.stamp sgml.stamp html.stamp pdf.stamp ++ sgml.stamp html.stamp pdf.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -120,27 +120,12 @@ + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +-#### templates #### +- +-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt +- @echo ' DOC Rebuilding template files' +- @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +- if test -w $(abs_srcdir) ; then \ +- cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ +- fi \ +- fi +- @touch tmpl-build.stamp +- +-tmpl.stamp: tmpl-build.stamp +- @true +- + $(srcdir)/tmpl/*.sgml: + @true + + #### xml #### + +-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++sgml-build.stamp: $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo ' DOC Building XML' + @-chmod -R u+w $(srcdir) + @_source_dir='' ; \ + --- a/gtkdoc/Makefile.am 2009-01-21 21:52:46.000000000 +0100 ++++ b/gtkdoc/Makefile.am 2023-08-15 17:41:59.002498772 +0200 +@@ -31,10 +31,6 @@ + # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml + MKDB_OPTIONS=--sgml-mode --output-format=xml + +-# Extra options to supply to gtkdoc-mktmpl +-# e.g. MKTMPL_OPTIONS=--only-section-tmpl +-MKTMPL_OPTIONS= +- + # Extra options to supply to gtkdoc-fixref. Not normally needed. + # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html + FIXXREF_OPTIONS= diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb index 72c93abe17..95c9479588 100644 --- a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb +++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb @@ -1,6 +1,6 @@ SUMMARY = "Implementation of XDG Sound Theme and Name Specifications" DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops." -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/canberra.h;beginline=7;endline=24;md5=c616c687cf8da540a14f917e0d23ab03" @@ -11,6 +11,8 @@ inherit autotools gtk-doc SRC_URI = " \ http://0pointer.de/lennart/projects/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch \ + file://0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch \ + file://0001-remove-dropped-templates.patch \ " SRC_URI[md5sum] = "34cb7e4430afaf6f447c4ebdb9b42072" SRC_URI[sha256sum] = "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72" @@ -31,32 +33,32 @@ PACKAGECONFIG[gstreamer] = "--enable-gstreamer, --disable-gstreamer, gstreamer1. PACKAGECONFIG[gtk] = "--enable-gtk, --disable-gtk, gtk+" PACKAGECONFIG[gtk3] = "--enable-gtk3, --disable-gtk3, gtk+3" -python populate_packages_prepend() { +python populate_packages:prepend() { plugindir = d.expand('${libdir}/${BPN}-${PV}/') - do_split_packages(d, plugindir, '^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' ) - do_split_packages(d, plugindir, '^libcanberra-(.*)\.la$', 'libcanberra-%s', '%s support library', extra_depends='' ) + do_split_packages(d, plugindir, r'^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' ) + do_split_packages(d, plugindir, r'^libcanberra-(.*)\.la$', 'libcanberra-%s', '%s support library', extra_depends='' ) } PACKAGES =+ "${PN}-gnome ${PN}-gtk2 ${PN}-gtk3 ${PN}-systemd" PACKAGES_DYNAMIC += "^libcanberra-.*" -FILES_${PN} = "${bindir}/ ${libdir}/${BPN}.so.*" +FILES:${PN} = "${bindir}/ ${libdir}/${BPN}.so.*" -FILES_${PN}-dev += "${datadir}/vala/vapi ${libdir}/*/modules/*.la ${libdir}/*/*.la" +FILES:${PN}-dev += "${datadir}/vala/vapi ${libdir}/*/modules/*.la ${libdir}/*/*.la" -FILES_${PN}-dbg += "${libdir}/${BPN}-${PV}/.debug ${libdir}/gtk-*/modules/.debug" +FILES:${PN}-dbg += "${libdir}/${BPN}-${PV}/.debug ${libdir}/gtk-*/modules/.debug" -FILES_${PN}-gtk2 = "${libdir}/${BPN}-gtk.so.* \ +FILES:${PN}-gtk2 = "${libdir}/${BPN}-gtk.so.* \ ${libdir}/gtk-2.0/modules/*.so \ ${bindir}/canberra-gtk-play" # -gtk3 ships a symlink to a .so -INSANE_SKIP_${PN}-gtk3 = "dev-so" -FILES_${PN}-gtk3 = "${libdir}/${BPN}-gtk3.so.* \ +INSANE_SKIP:${PN}-gtk3 = "dev-so" +FILES:${PN}-gtk3 = "${libdir}/${BPN}-gtk3.so.* \ ${libdir}/gtk-3.0/modules/*.so \ ${bindir}/canberra-gtk3-play" -FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/ \ +FILES:${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/ \ ${datadir}/gdm/ ${datadir}/gnome/" -FILES_${PN}-systemd = "${systemd_unitdir}/system/*.service" +FILES:${PN}-systemd = "${systemd_unitdir}/system/*.service" diff --git a/meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch b/meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch new file mode 100644 index 0000000000..86ee6902f2 --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch @@ -0,0 +1,41 @@ +From 395cd70a8c28a4ea408a227d745fe20ed8af9105 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 10 Sep 2024 18:11:40 -0700 +Subject: [PATCH] Fix instances of + -Wmissing-template-arg-list-after-template-kw. + +Clang has a new warning that requires a template argument list after using +the template keyword. Remove uses of the template keyword when we're not +specifying types. + +See https://github.com/llvm/llvm-project/issues/94194 for the upstream +clang changes + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/835] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/cereal/types/tuple.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/cereal/types/tuple.hpp b/include/cereal/types/tuple.hpp +index 80c68075..5c79eca9 100644 +--- a/include/cereal/types/tuple.hpp ++++ b/include/cereal/types/tuple.hpp +@@ -95,7 +95,7 @@ namespace cereal + template <class Archive, class ... Types> inline + static void apply( Archive & ar, std::tuple<Types...> & tuple ) + { +- serialize<Height - 1>::template apply( ar, tuple ); ++ serialize<Height - 1>::apply( ar, tuple ); + ar( CEREAL_NVP_(tuple_element_name<Height - 1>::c_str(), + std::get<Height - 1>( tuple )) ); + } +@@ -116,7 +116,7 @@ namespace cereal + template <class Archive, class ... Types> inline + void CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, std::tuple<Types...> & tuple ) + { +- tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::template apply( ar, tuple ); ++ tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::apply( ar, tuple ); + } + } // namespace cereal + diff --git a/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch b/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch new file mode 100644 index 0000000000..fc30f0ad7c --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch @@ -0,0 +1,52 @@ +From ac70933783a70d5387a2bb2849c568e33ba52558 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 21 Jan 2023 01:41:32 -0800 +Subject: [PATCH] cmake: Use -idirafter instead of -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like <cstdlib> + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/recipe-sysroot/usr/include/c++/v1/cwchar:113:5: error: <cwchar> tried including <wchar.h> but didn't find libc++'s <wcha +r.h> header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard + Library, and you are probably using compiler flags that make that not be the case. | # error <cwchar> tried including <wchar.h> but didn't find libc++'s <wchar.h> header. \ +| ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +<sysroot>/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/777] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + unittests/boost/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unittests/boost/CMakeLists.txt b/unittests/boost/CMakeLists.txt +index 1d733bc7..08e6a169 100644 +--- a/unittests/boost/CMakeLists.txt ++++ b/unittests/boost/CMakeLists.txt +@@ -1,6 +1,6 @@ + file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) + +-include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${Boost_INCLUDE_DIRS}") + + # Build all of the non-special tests + foreach(TEST_SOURCE ${TESTS}) +-- +2.39.1 + diff --git a/meta-oe/recipes-support/libcereal/files/0001-doctest-Do-not-use-unnamed-class.patch b/meta-oe/recipes-support/libcereal/files/0001-doctest-Do-not-use-unnamed-class.patch new file mode 100644 index 0000000000..9396cc5d01 --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/0001-doctest-Do-not-use-unnamed-class.patch @@ -0,0 +1,38 @@ +From 03bbb1b055c41ec652470f775b55a7cf80d664ef Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 17 Apr 2023 16:46:12 -0700 +Subject: [PATCH] doctest: Do not use unnamed class + +When compiling with clang this results in emitting absolute path into +debug info, especially .debug_str section has + +~(unnamed class at /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/unittests/doctest.h:6428:5) +(unnamed class at /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/unittests/doctest.h:6428:5) + +Therefore use a name for the class instead and help get rid of this +absolute path in debug info. This fixes + +File /usr/lib/libcereal/ptest/tests/.debug/test_unordered_map in package libcereal-dbg contains reference to TMPDIR + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/788] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + unittests/doctest.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unittests/doctest.h b/unittests/doctest.h +index cd5b44d6..e6d8f7f9 100644 +--- a/unittests/doctest.h ++++ b/unittests/doctest.h +@@ -6424,7 +6424,7 @@ void Context::setCout(std::ostream* out) { p->cout = out; } + static class DiscardOStream : public std::ostream + { + private: +- class : public std::streambuf ++ class discardBufStream: public std::streambuf + { + private: + // allowing some buffering decreases the amount of calls to overflow +-- +2.40.0 + diff --git a/meta-oe/recipes-support/libcereal/files/0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch b/meta-oe/recipes-support/libcereal/files/0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch new file mode 100644 index 0000000000..26a8223d19 --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch @@ -0,0 +1,54 @@ +From 36054278304945c6aef7d44e58788ca882c67d05 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 15:54:13 -0700 +Subject: [PATCH] sandbox: Do not use int8_t in std::uniform_int_distribution + +Newer versions of libc++ has dropped supporting this usecase since its +an UB see. + +https://reviews.llvm.org/D114920?id=400571 + +Fixes + +uniform_int_distribution.h:162:5: error: static assertion failed due to requirement '__libcpp_random_is_valid_inttype<char>::value': IntType must be a supported integer type + static_assert(__libcpp_random_is_valid_inttype<_IntType>::value, "IntType must be a supported integer type"); + ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/sandbox/performance.cpp:261:9: note: in instantiation of template class 'std::uniform_int_distribution<char>' requested here + c = std::uniform_int_distribution<char>(' ', '~')(gen); + ^ +/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/sandbox/performance.cpp:261:9: error: type 'std::uniform_int_distribution<char>' does not provide a call operator + c = std::uniform_int_distribution<char>(' ', '~')(gen); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +2 errors generated. + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/764] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sandbox/performance.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sandbox/performance.cpp b/sandbox/performance.cpp +index f9307870..aca8c78c 100644 +--- a/sandbox/performance.cpp ++++ b/sandbox/performance.cpp +@@ -258,7 +258,7 @@ random_value(std::mt19937 & gen) + { + std::string s(std::uniform_int_distribution<int>(3, 30)(gen), ' '); + for(char & c : s) +- c = std::uniform_int_distribution<char>(' ', '~')(gen); ++ c = static_cast<char>( std::uniform_int_distribution<int>(' ', '~')(gen) ); + return s; + } + +@@ -277,7 +277,7 @@ std::string random_binary_string(std::mt19937 & gen) + { + std::string s(N, ' '); + for(auto & c : s ) +- c = std::uniform_int_distribution<char>('0', '1')(gen); ++ c = static_cast<char>( std::uniform_int_distribution<int>( '0', '1' )(gen) ); + return s; + } + +-- +2.37.3 + diff --git a/meta-oe/recipes-support/libcereal/files/run-ptest b/meta-oe/recipes-support/libcereal/files/run-ptest new file mode 100755 index 0000000000..9bc480aa7f --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/run-ptest @@ -0,0 +1,12 @@ +#!/bin/sh + +cd tests +for atest in test_* ; do + rm -rf tests.log + ./${atest} > tests.log 2>&1 + if [ $? = 0 ] ; then + echo "PASS: ${atest}" + else + echo "FAIL: ${atest}" + fi +done diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb new file mode 100644 index 0000000000..c2ab0d61b8 --- /dev/null +++ b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb @@ -0,0 +1,57 @@ +SUMMARY = "A C++11 library for serialization" +HOMEPAGE = "https://uscilab.github.io/cereal/" + +SECTION = "libs" + +LICENSE = "BSD-3-Clause & MIT & BSL-1.0" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=4921372a1fb38469e667c38b17a1c4b3 \ + file://include/cereal/external/rapidxml/license.txt;md5=d63ab70ba21ca0544b03284958324301 \ + file://include/cereal/external/LICENSE;md5=b07578c9df99c0b8b45eb041efd4a645 \ + file://include/cereal/external/rapidjson/LICENSE;md5=e7abb663111d4ac17cf00323698aff08 \ + file://include/cereal/external/rapidjson/msinttypes/LICENSE;md5=dffce65b98c773976de2e338bd130f46 \ +" + +DEPENDS = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'boost', '', d)} " + +PROVIDES += "${PN}-dev" + +PV .= "+git" +SRCREV = "ebef1e929807629befafbb2918ea1a08c7194554" +SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https \ + file://0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch \ + file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ + file://0001-doctest-Do-not-use-unnamed-class.patch \ + file://0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch \ + file://run-ptest \ +" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig ptest + +CXXFLAGS:append:toolchain-clang = " -Wno-error=c++11-narrowing-const-reference" + +LIBATOMIC:mips = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" +LIBATOMIC:riscv32 = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" +LIBATOMIC:powerpc = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" + +PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" +PACKAGECONFIG[with-tests] = "-DWITH_WERROR=OFF -DBUILD_TESTS=ON ${LIBATOMIC},," +EXTRA_OECMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '', '-DJUST_INSTALL_CEREAL=ON', d)} \ + ${@['','-DSKIP_PORTABILITY_TEST=ON'][d.getVar('SITEINFO_BITS') != '32']}" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp ${B}/unittests/test_* ${D}${PTEST_PATH}/tests +} + +ALLOW_EMPTY:${PN} = "1" + +RDEPENDS:${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" + +#it needs to work with CXXFLAGS += " -mlong-double-64" but ppc only supports 128bit long double +COMPATIBLE_HOST:powerpc:libc-musl = "null" +COMPATIBLE_HOST:powerpc64le:libc-musl = "null" diff --git a/meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch b/meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch new file mode 100644 index 0000000000..aa9fab86e6 --- /dev/null +++ b/meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch @@ -0,0 +1,48 @@ +From b684f4cc25821b6e86a58576f864e4b12dfdfecc Mon Sep 17 00:00:00 2001 +From: Rasmus Villemoes <rasmus.villemoes@prevas.dk> +Date: Sat, 5 Jun 2021 22:57:51 +0200 +Subject: [PATCH] only apply search path logic to relative pathnames + +Adding any directory to the search path via cfg_add_searchpath breaks +lookup of absolute paths. So change the logic in cfg_searchpath() to +ignore the search path when the given filename is absolute, and merely +check that for existence. + +This is technically an ABI change, but the current behaviour is quite +unusual and unexpected. + +Upstream-Status: Backport [https://github.com/libconfuse/libconfuse/pull/155] + +Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> +--- + src/confuse.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/confuse.c b/src/confuse.c +index 2ea0254..19b56e3 100644 +--- a/src/confuse.c ++++ b/src/confuse.c +@@ -1746,12 +1746,20 @@ DLLIMPORT char *cfg_searchpath(cfg_searchpath_t *p, const char *file) + return NULL; + } + ++ if (file[0] == '/') { ++ fullpath = strdup(file); ++ if (!fullpath) ++ return NULL; ++ goto check; ++ } ++ + if ((fullpath = cfg_searchpath(p->next, file)) != NULL) + return fullpath; + + if ((fullpath = cfg_make_fullpath(p->dir, file)) == NULL) + return NULL; + ++check: + #ifdef HAVE_SYS_STAT_H + err = stat((const char *)fullpath, &st); + if ((!err) && S_ISREG(st.st_mode)) +-- +2.31.1 + diff --git a/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb b/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb new file mode 100644 index 0000000000..e6f28c7b69 --- /dev/null +++ b/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb @@ -0,0 +1,14 @@ +SUMMARY = "libConfuse is a configuration file parser library" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=42fa47330d4051cd219f7d99d023de3a" + +SRC_URI = "https://github.com/libconfuse/libconfuse/releases/download/v${PV}/confuse-${PV}.tar.gz" +SRC_URI[sha256sum] = "3a59ded20bc652eaa8e6261ab46f7e483bc13dad79263c15af42ecbb329707b8" + +SRC_URI += "file://0001-only-apply-search-path-logic-to-relative-pathnames.patch" + +inherit autotools-brokensep pkgconfig gettext + +S = "${WORKDIR}/confuse-${PV}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb new file mode 100644 index 0000000000..cf2d933169 --- /dev/null +++ b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb @@ -0,0 +1,29 @@ +SUMMARY = "high level C++ wrapper for rdkafka" +DESCRIPTION = "cppkafka allows C++ applications to consume and produce messages using the Apache Kafka protocol." +HOMEPAGE = "https://github.com/mfontanini/cppkafka" +SECTION = "lib" +LICENSE = "BSD-2-Clause" + +LIC_FILES_CHKSUM = " \ +file://LICENSE;md5=d8b4ca15d239dc1485ef495c8f1bcc72 \ +" + +SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https;branch=master \ +" +SRCREV = "91ac543cbd2228588dcf24a6ca357f8be0f4e5ab" + +BASEPV = "0.4.0" +PV = "${BASEPV}+git" + +DEPENDS = "librdkafka curl boost chrpath-replacement-native" + +inherit cmake + +EXTRA_OECMAKE = "-DCPPKAFKA_BUILD_SHARED=ON" + +S = "${WORKDIR}/git" + +do_install:append(){ + chrpath -d ${D}${libdir}/libcppkafka.so.${BASEPV} + sed -i -e 's|${STAGING_INCDIR}|\$\{includedir\}|g' ${D}${datadir}/pkgconfig/cppkafka.pc +} diff --git a/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch b/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch new file mode 100644 index 0000000000..d9e10469d3 --- /dev/null +++ b/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch @@ -0,0 +1,43 @@ +From 655c5c32b37a2bea12389ed69c0869215fcf5abe Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 3 Sep 2023 11:22:35 +0200 +Subject: [PATCH] CMakeLists.txt: don't fall back CMAKE_INSTALL_LIBDIR to lib + +* testing ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} existence + doesn't really work in cross compilation and on some hosts was causing: + + ERROR: QA Issue: libcyusbserial: Files/directories were installed but not shipped in any package: + /usr/lib/libcyusbserial.so.1 + /usr/lib/libcyusbserial.so + Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. + libcyusbserial: 2 installed and not shipped files. [installed-vs-shipped] + + with multilib using /usr/lib32 or /usr/lib64 when the same didn't + exist on host. + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + lib/CMakeLists.txt | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 2b031cb..53a7263 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -6,15 +6,6 @@ if (NOT CMAKE_INSTALL_LIBDIR) + include(GNUInstallDirs) + endif (NOT CMAKE_INSTALL_LIBDIR) + +-# Fall back to just "lib" if the item provided by GNUInstallDirs doesn't exist +-# For example, on Ubuntu 13.10 with CMake 2.8.11.2, +-# /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} doesn't exist. +-if (NOT EXISTS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +- message(STATUS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} does not exist. Defaulting libcyusbserial install location to ${CMAKE_INSTALL_PREFIX}/lib.") +- set(CMAKE_INSTALL_LIBDIR lib) +-endif() +- +- + ################################################################################ + # Include paths + ################################################################################ diff --git a/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb b/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb index 74b5e21e23..dd7f457b10 100644 --- a/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb +++ b/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb @@ -1,18 +1,20 @@ SUMMARY = "Enable userspace control of Cypress USB-Serial bridge devices" HOMEPAGE = "https://github.com/cyrozap/libcyusbserial" BUGTRACKER = "https://github.com/cyrozap/libcyusbserial/issues" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.LESSER.txt;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libusb udev" -PV = "1.0.0+git${SRCPV}" +PV = "1.0.0+git" SRCREV = "655e2d544183d094f0e2d119c7e0c6206a0ddb3f" -SRC_URI = "git://github.com/cyrozap/${BPN}.git" +SRC_URI = "git://github.com/cyrozap/${BPN}.git;branch=master;protocol=https \ + file://0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch \ +" S = "${WORKDIR}/git" inherit cmake PACKAGES =+ "${PN}-utils" -FILES_${PN}-utils = "${bindir}/*" +FILES:${PN}-utils = "${bindir}/*" diff --git a/meta-oe/recipes-support/libdbi/libdbi.inc b/meta-oe/recipes-support/libdbi/libdbi.inc deleted file mode 100644 index cea2838e36..0000000000 --- a/meta-oe/recipes-support/libdbi/libdbi.inc +++ /dev/null @@ -1,17 +0,0 @@ -# libdbi OE build file -# Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION = "Database Independent Abstraction Layer for C" -HOMEPAGE = "http://libdbi.sourceforge.net/" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" -SECTION = "libs" - -INC_PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libdbi/libdbi-${PV}.tar.gz" - -inherit autotools - -EXTRA_OECONF = "--disable-docs" diff --git a/meta-oe/recipes-support/libdbi/libdbi_0.9.0.bb b/meta-oe/recipes-support/libdbi/libdbi_0.9.0.bb deleted file mode 100644 index 24eae28501..0000000000 --- a/meta-oe/recipes-support/libdbi/libdbi_0.9.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${PN}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "05e2ceeac4bc85fbe40de8b4b22d9ab3" -SRC_URI[sha256sum] = "dafb6cdca524c628df832b6dd0bf8fabceb103248edb21762c02d3068fca4503" diff --git a/meta-oe/recipes-support/libee/libee.inc b/meta-oe/recipes-support/libee/libee.inc deleted file mode 100644 index e5a145ab22..0000000000 --- a/meta-oe/recipes-support/libee/libee.inc +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "An Event Expression Library inspired by CEE" -DESCRIPTION = "The core idea of libee is to provide a small \ -but hopefully convenient API layer above the CEE standard." - -HOMEPAGE = "http://www.libee.org" -SECTION = "base" - -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=1c2687de35e36ba3b999136236a66cd6" - -SRC_URI = "http://www.libee.org/download/files/download/${BPN}-${PV}.tar.gz\ - file://libee-parallel-make.patch \ - file://run-ptest \ - file://ezapi1.sh \ -" - -inherit autotools ptest pkgconfig - -DEPENDS += "libestr" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench', '', d)}" - -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," -PACKAGECONFIG[testbench] = "--enable-testbench,--disable-testbench,," - -TESTDIR = "tests" - -# We presume the tests we are going to install so just build them directly. -# -do_compile_ptest() { - oe_runmake -C ${TESTDIR} genfile ezapi1 -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH} - install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH} - install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH} - install -m 0755 ${WORKDIR}/ezapi1.sh ${D}${PTEST_PATH} -} diff --git a/meta-oe/recipes-support/libee/libee/ezapi1.sh b/meta-oe/recipes-support/libee/libee/ezapi1.sh deleted file mode 100755 index e9db5e614b..0000000000 --- a/meta-oe/recipes-support/libee/libee/ezapi1.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -echo --------------------------------------------------------------------------- -echo A very basic test for the event class -echo --------------------------------------------------------------------------- -rm -f infile -./genfile 100 > infile -./ezapi1 -iinfile -if [ $? -ne 0 ] ; then - echo "FAIL: $0" - exit 1 -fi -echo "PASS: $0" -rm -f infile diff --git a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch b/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch deleted file mode 100644 index 25e5c6ae02..0000000000 --- a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch +++ /dev/null @@ -1,20 +0,0 @@ -fix parallel compiling problem - -without specifying libee_convert_DEPENDENCIES = libee.la, libee_convert -can't find libee.la when linking as libee is not generated yet. - -Upstream-Status: pending - -Signed-off-by: Yao Zhao <yao.zhao@windriver.com> ---- -diff --git a/src/Makefile.am b/src/Makefile.am -index 08aaa9e..f0c78f7 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -46,5 +46,6 @@ libee_la_LDFLAGS = -version-info 0:0:0 - libee_convert_SOURCES = convert.c - libee_convert_CPPFLAGS = -I$(top_srcdir) $(LIBEE_CFLAGS) $(LIBESTR_CFLAGS) $(LIBXML2_CFLAGS) - libee_convert_LDADD = $(LIBEE_LIBS) $(LIBXML2_LIBS) $(LIBESTR_LIBS) -+libee_convert_DEPENDENCIES = libee.la - - include_HEADERS = diff --git a/meta-oe/recipes-support/libee/libee/run-ptest b/meta-oe/recipes-support/libee/libee/run-ptest deleted file mode 100755 index 3cb6607645..0000000000 --- a/meta-oe/recipes-support/libee/libee/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# -./ezapi1.sh diff --git a/meta-oe/recipes-support/libee/libee_0.4.1.bb b/meta-oe/recipes-support/libee/libee_0.4.1.bb deleted file mode 100644 index ef2c20db5a..0000000000 --- a/meta-oe/recipes-support/libee/libee_0.4.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${BPN}.inc - -SRC_URI[md5sum] = "7bbf4160876c12db6193c06e2badedb2" -SRC_URI[sha256sum] = "c0dac01938593deee06c3d161e4eda4ecc0fd7317e1321bd96e301aceb7fb027" diff --git a/meta-oe/recipes-support/libeigen/libeigen/0001-CMakeLists.txt-install-FindEigen3.cmake-script.patch b/meta-oe/recipes-support/libeigen/libeigen/0001-CMakeLists.txt-install-FindEigen3.cmake-script.patch deleted file mode 100644 index 761dadbc34..0000000000 --- a/meta-oe/recipes-support/libeigen/libeigen/0001-CMakeLists.txt-install-FindEigen3.cmake-script.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fd8bc66efac1059c1068f804746b01b90177c333 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> -Date: Sun, 18 Oct 2015 16:52:25 +0200 -Subject: [PATCH] CMakeLists.txt: install FindEigen3.cmake script - -Upstream-Status: Pending - -Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> ---- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 76a11b9..ec6c6ea 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -342,6 +342,8 @@ if(EIGEN_BUILD_PKGCONFIG) - ) - endif(EIGEN_BUILD_PKGCONFIG) - -+install(FILES "${PROJECT_SOURCE_DIR}/cmake/FindEigen3.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/cmake/Modules") -+ - add_subdirectory(Eigen) - - add_subdirectory(doc EXCLUDE_FROM_ALL) --- -1.9.3 - diff --git a/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch b/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch new file mode 100644 index 0000000000..84b5a4da9f --- /dev/null +++ b/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch @@ -0,0 +1,72 @@ +From cb507309937958c632147de87e8f1231d6698847 Mon Sep 17 00:00:00 2001 +From: Antonio Sanchez <cantonios@google.com> +Date: Tue, 14 Sep 2021 10:57:22 -0700 +Subject: [PATCH] Default eigen_packet_wrapper constructor. + +This makes it trivial, allowing use of `memcpy`. + +Fixes #2326 + +Upstream-Status: Backport [https://gitlab.com/libeigen/eigen/-/merge_requests/645/diffs?commit_id=cb507309937958c632147de87e8f1231d6698847] +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +* fixes build failures for arm targets with NEON enabled (e.g. -mfpu=neon-vfpv4) + for recipes with -Werror enabled and gcc-11, e.g. fuse-core, robot-localization, + prbt-ikfast-manipulator-plugin, rm-chassis-controllers in meta-ros1-noetic: + +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:214, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h: In function 'Packet Eigen::internal::pload(const typename Eigen::internal::unpacket_traits<T>::type*) [with Packet = Eigen::internal::eigen_packet_wrapper<int, 2>; typename Eigen::internal::unpacket_traits<T>::type = signed char]': +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h:1671:9: error: 'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} from an array of 'const int8_t' {aka 'const signed char'} [-Werror=class-memaccess] + 1671 | memcpy(&res, from, sizeof(Packet4c)); + | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:172, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h:159:8: note: 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} declared here + 159 | struct eigen_packet_wrapper + | ^~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:214, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h: In function 'Packet Eigen::internal::ploadu(const typename Eigen::internal::unpacket_traits<T>::type*) [with Packet = Eigen::internal::eigen_packet_wrapper<int, 2>; typename Eigen::internal::unpacket_traits<T>::type = signed char]': +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h:1716:9: error: 'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} from an array of 'const int8_t' {aka 'const signed char'} [-Werror=class-memaccess] + 1716 | memcpy(&res, from, sizeof(Packet4c)); + | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:172, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h:159:8: note: 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} declared here + 159 | struct eigen_packet_wrapper + | ^~~~~~~~~~~~~~~~~~~~ +cc1plus: all warnings being treated as errors + +--- + Eigen/src/Core/GenericPacketMath.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Eigen/src/Core/GenericPacketMath.h b/Eigen/src/Core/GenericPacketMath.h +index 8f8f64f15..72234288e 100644 +--- a/Eigen/src/Core/GenericPacketMath.h ++++ b/Eigen/src/Core/GenericPacketMath.h +@@ -162,7 +162,7 @@ struct eigen_packet_wrapper + { + EIGEN_ALWAYS_INLINE operator T&() { return m_val; } + EIGEN_ALWAYS_INLINE operator const T&() const { return m_val; } +- EIGEN_ALWAYS_INLINE eigen_packet_wrapper() {} ++ EIGEN_ALWAYS_INLINE eigen_packet_wrapper() = default; + EIGEN_ALWAYS_INLINE eigen_packet_wrapper(const T &v) : m_val(v) {} + EIGEN_ALWAYS_INLINE eigen_packet_wrapper& operator=(const T &v) { + m_val = v; +-- +2.17.1 + diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb b/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb deleted file mode 100644 index bc3b32e384..0000000000 --- a/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." -AUTHOR = "Benoît Jacob and Gaël Guennebaud and others" -HOMEPAGE = "http://eigen.tuxfamily.org/" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad" - -SRC_URI = "http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2;downloadfilename=${BP}.tar.bz2" -SRC_URI[md5sum] = "a7aab9f758249b86c93221ad417fbe18" -SRC_URI[sha256sum] = "dd254beb0bafc695d0f62ae1a222ff85b52dbaa3a16f76e781dce22d0d20a4a6" - -S = "${WORKDIR}/eigen-eigen-5a0156e40feb" - -inherit cmake - -FILES_${PN} = "${includedir} ${libdir}" -FILES_${PN}-dev = "${datadir}/eigen3/cmake ${datadir}/cmake/Modules ${datadir}/pkgconfig" - -# ${PN} is empty so we need to tweak -dev and -dbg package dependencies -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb b/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb new file mode 100644 index 0000000000..72044427dd --- /dev/null +++ b/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." +HOMEPAGE = "http://eigen.tuxfamily.org/" +LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPL-2.0-only & LGPL-2.1-only & MINPACK" +LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ + file://COPYING.BSD;md5=2dd0510ee95e59ca28834b875bc96596 \ + file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.MINPACK;md5=71d91b0f75ce79a75d3108a72bef8116 \ +" + +SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;branch=3.4 \ + file://0001-Default-eigen_packet_wrapper-constructor.patch \ +" + +SRCREV = "3147391d946bb4b6c68edd901f2add6ac1f31f8c" + +S = "${WORKDIR}/git" + +inherit cmake + +FILES:${PN}-dev += "${datadir}/eigen3/cmake" + +# ${PN} is empty so we need to tweak -dev and -dbg package dependencies +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libestr/libestr_0.1.10.bb b/meta-oe/recipes-support/libestr/libestr_0.1.11.bb index 9bff4f35a7..2ebf2757d7 100644 --- a/meta-oe/recipes-support/libestr/libestr_0.1.10.bb +++ b/meta-oe/recipes-support/libestr/libestr_0.1.11.bb @@ -1,11 +1,13 @@ SUMMARY = "some essentials for string handling (and a bit more)" HOMEPAGE = "http://libestr.adiscon.com/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=9d6c993486c18262afba4ca5bcb894d0" SRC_URI = "http://libestr.adiscon.com/files/download/${BP}.tar.gz" -SRC_URI[md5sum] = "f4c9165a23587e77f7efe65d676d5e8e" -SRC_URI[sha256sum] = "bd655e126e750edd18544b88eb1568d200a424a0c23f665eb14bbece07ac703c" +SRC_URI[md5sum] = "1f25a2332750d4bfacfb314235fedff0" +SRC_URI[sha256sum] = "46632b2785ff4a231dcf241eeb0dcb5fc0c7d4da8ee49cf5687722cdbe8b2024" + +UPSTREAM_CHECK_URI = "http://libestr.adiscon.com/download/" inherit autotools diff --git a/meta-oe/recipes-support/libfann/libfann_git.bb b/meta-oe/recipes-support/libfann/libfann_git.bb new file mode 100644 index 0000000000..40f91ac43d --- /dev/null +++ b/meta-oe/recipes-support/libfann/libfann_git.bb @@ -0,0 +1,19 @@ +SUMMARY = "Fast Artificial Neural Network (FANN) Library" +DESCRIPTION = "Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks." +HOMEPAGE = "https://github.com/libfann/fann" +SECTION = "libs/devel" + +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=f14599a2f089f6ff8c97e2baa4e3d575" + +inherit cmake + +SRCREV ?= "7ec1fc7e5bd734f1d3c89b095e630e83c86b9be1" +SRC_URI = "git://github.com/libfann/fann.git;branch=master;protocol=https \ + " + +PV = "2.2.0+git" + +S = "${WORKDIR}/git" + +EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" diff --git a/meta-oe/recipes-support/libfido2/libfido2_1.15.0.bb b/meta-oe/recipes-support/libfido2/libfido2_1.15.0.bb new file mode 100644 index 0000000000..74844855d9 --- /dev/null +++ b/meta-oe/recipes-support/libfido2/libfido2_1.15.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "FIDO 2.0 support library" +DESCRIPTION = "libfido2 provides library functionality and command-line tools to \ +communicate with a FIDO device over USB, and to verify attestation and \ +assertion signatures." +HOMEPAGE = "https://developers.yubico.com/libfido2" +LICENSE = "BSD-2-Clause" +SECTION = "libs/network" +DEPENDS = "libcbor openssl zlib udev" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=20be19aaa222f71738712b26f7f8717b" + +SRC_URI = "https://developers.yubico.com/${BPN}/Releases/${BPN}-${PV}.tar.gz" +SRC_URI[sha256sum] = "abaab1318d21d262ece416fb8a7132fa9374bda89f6fa52b86a98a2f5712b61e" + +inherit cmake pkgconfig manpages + +PACKAGECONFIG[manpages] = "-DBUILD_MANPAGES:BOOL=ON,-DBUILD_MANPAGES:BOOL=OFF" + +EXTRA_OECMAKE = "-DUDEV_RULES_DIR=${nonarch_base_libdir}/udev/rules.d -DBUILD_EXAMPLES:BOOL=OFF" + +PACKAGE_BEFORE_PN = "${PN}-tools" + +FILES:${PN}-tools = "${bindir}/fido2-*" diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.4.bb b/meta-oe/recipes-support/libftdi/libftdi_1.4.bb deleted file mode 100644 index 6bea16582f..0000000000 --- a/meta-oe/recipes-support/libftdi/libftdi_1.4.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "libftdi is a library to talk to FTDI chips.\ -FT232BM/245BM, FT2232C/D and FT232/245R using libusb,\ -including the popular bitbang mode." -HOMEPAGE = "http://www.intra2net.com/en/developer/libftdi/" -SECTION = "libs" - -LICENSE = "LGPLv2.1 & GPLv2" -LIC_FILES_CHKSUM= "\ - file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ -" - -DEPENDS = "libusb1" - -SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2" - -SRC_URI[md5sum] = "0c09fb2bb19a57c839fa6845c6c780a2" -SRC_URI[sha256sum] = "ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74" - -S = "${WORKDIR}/${BPN}1-${PV}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on -DFTDIPP=on,-DFTDI_BUILD_CPP=off -DFTDIPP=off,boost" - -inherit cmake binconfig pkgconfig - -EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" - -FILES_${PN}-dev += "${libdir}/cmake" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.5.bb b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb new file mode 100644 index 0000000000..24dc5b2288 --- /dev/null +++ b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "libftdi is a library to talk to FTDI chips.\ +FT232BM/245BM, FT2232C/D and FT232/245R using libusb,\ +including the popular bitbang mode." +HOMEPAGE = "http://www.intra2net.com/en/developer/libftdi/" +SECTION = "libs" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" +LIC_FILES_CHKSUM= "\ + file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ +" + +DEPENDS = "libusb1 python3 swig-native" + +SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2" +SRC_URI[sha256sum] = "7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049" + +UPSTREAM_CHECK_URI = "http://www.intra2net.com/en/developer/libftdi/download.php" + +S = "${WORKDIR}/${BPN}1-${PV}" + +inherit cmake binconfig pkgconfig python3native + +PACKAGECONFIG ??= "" +PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on -DFTDIPP=on,-DFTDI_BUILD_CPP=off -DFTDIPP=off,boost" +PACKAGECONFIG[ftdi-eeprom] = "-DFTDI_EEPROM=on,-DFTDI_EEPROM=off,libconfuse" + +EXTRA_OECMAKE = "-DSTATICLIBS=off -DEXAMPLES=off \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ + -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ + -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" + +do_install:append() { + # remove absolute paths + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/libftdi1/LibFTDI1Config.cmake +} + +BBCLASSEXTEND = "native nativesdk" + +PACKAGES =+ "${PN}-python ftdi-eeprom" + +FILES:ftdi-eeprom = "${bindir}/ftdi_eeprom" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/" diff --git a/meta-oe/recipes-support/libgit2/libgit2_0.24.3.bb b/meta-oe/recipes-support/libgit2/libgit2_0.24.3.bb deleted file mode 100644 index 8f580f9ff1..0000000000 --- a/meta-oe/recipes-support/libgit2/libgit2_0.24.3.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "the Git linkable library" -HOMEPAGE = "http://libgit2.github.com/" -LICENSE = "GPL-2.0-with-GCC-exception" -LIC_FILES_CHKSUM = "file://COPYING;md5=34197a479f637beb9e09e56893f48bc2" - -DEPENDS = "curl openssl zlib libssh2" - -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.24" -SRCREV = "4cf1ec7cff28da8838a2f0a9fb330e312ea3f963" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "\ - -DTHREADSAFE=ON \ - -DBUILD_CLAR=OFF \ - -DSHA1_TYPE="builtin" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DBUILD_EXAMPLES=OFF \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-1.x/0001-bindings-cxx-disable-tests.patch b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/0001-bindings-cxx-disable-tests.patch new file mode 100644 index 0000000000..0b850ba138 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/0001-bindings-cxx-disable-tests.patch @@ -0,0 +1,33 @@ +From 8293f0b8a329beed542f5c8a2efa4641759fccf4 Mon Sep 17 00:00:00 2001 +From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> +Date: Tue, 11 Jun 2024 10:34:14 +0200 +Subject: [PATCH] bindings: cxx: disable tests + +Meta-openembedded is moving to catch2 v3 which will make the C++ tests +incompatible with the testing library. As this is an older version of +the project, just disable C++ tests entirely. + +Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> +--- +Upstream-Status: Inappropriate [upstream continues to use Catch2 v2] + + bindings/cxx/Makefile.am | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/bindings/cxx/Makefile.am b/bindings/cxx/Makefile.am +index 5c40ceb..d901836 100644 +--- a/bindings/cxx/Makefile.am ++++ b/bindings/cxx/Makefile.am +@@ -19,9 +19,3 @@ pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libgpiodcxx.pc + + SUBDIRS = . examples +- +-if WITH_TESTS +- +-SUBDIRS += tests +- +-endif +-- +2.40.1 + diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest new file mode 100644 index 0000000000..a56c2bb685 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest @@ -0,0 +1,19 @@ +#!/bin/sh + +testbins="gpiod-test gpio-tools-test gpiod_py_test.py" + +ptestdir=$(dirname "$(readlink -f "$0")") +cd $ptestdir/tests + +for testbin in $testbins; do + if test -e ./$testbin; then + ./$testbin > ./$testbin.out 2>&1 + if [ $? -ne 0 ]; then + echo "FAIL: $testbin" + else + echo "PASS: $testbin" + fi + else + echo "SKIP: $testbin" + fi +done diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch new file mode 100644 index 0000000000..ac1eff510b --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch @@ -0,0 +1,530 @@ +From 0d3e1b3923a1fac80e9d75d8b5e33cd36f4fe659 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 31 May 2024 09:03:22 -0700 +Subject: [PATCH] bindings: cxx: Migrate C++ tests to use Catch2 v3 + +Catch2 v3.x has API changes which needs to be addressed +in the tests themselves, hence this changeset is to fix +those. + +Upstream-Status: Submitted [https://lore.kernel.org/linux-gpio/20240531184223.3949069-1-raj.khem@gmail.com/T/#u] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> +--- + bindings/cxx/tests/Makefile.am | 2 +- + bindings/cxx/tests/gpiod-cxx-test-main.cpp | 3 +-- + bindings/cxx/tests/helpers.hpp | 8 +++--- + bindings/cxx/tests/tests-chip-info.cpp | 30 ++++++++++----------- + bindings/cxx/tests/tests-chip.cpp | 14 +++++----- + bindings/cxx/tests/tests-edge-event.cpp | 2 +- + bindings/cxx/tests/tests-info-event.cpp | 2 +- + bindings/cxx/tests/tests-line-config.cpp | 2 +- + bindings/cxx/tests/tests-line-info.cpp | 22 +++++++-------- + bindings/cxx/tests/tests-line-request.cpp | 16 +++++------ + bindings/cxx/tests/tests-line-settings.cpp | 2 +- + bindings/cxx/tests/tests-line.cpp | 2 +- + bindings/cxx/tests/tests-misc.cpp | 2 +- + bindings/cxx/tests/tests-request-config.cpp | 10 +++---- + configure.ac | 4 +-- + 15 files changed, 60 insertions(+), 61 deletions(-) + +diff --git a/bindings/cxx/tests/Makefile.am b/bindings/cxx/tests/Makefile.am +index fbf80a1..d9284da 100644 +--- a/bindings/cxx/tests/Makefile.am ++++ b/bindings/cxx/tests/Makefile.am +@@ -4,7 +4,7 @@ + AM_CXXFLAGS = -I$(top_srcdir)/bindings/cxx/ -I$(top_srcdir)/include + AM_CXXFLAGS += -I$(top_srcdir)/tests/gpiosim/ + AM_CXXFLAGS += -Wall -Wextra -g -std=gnu++17 $(CATCH2_CFLAGS) +-AM_LDFLAGS = -pthread ++AM_LDFLAGS = -pthread $(CATCH2_LIBS) + LDADD = $(top_builddir)/bindings/cxx/libgpiodcxx.la + LDADD += $(top_builddir)/tests/gpiosim/libgpiosim.la + +diff --git a/bindings/cxx/tests/gpiod-cxx-test-main.cpp b/bindings/cxx/tests/gpiod-cxx-test-main.cpp +index 11bf8e5..ec48286 100644 +--- a/bindings/cxx/tests/gpiod-cxx-test-main.cpp ++++ b/bindings/cxx/tests/gpiod-cxx-test-main.cpp +@@ -1,5 +1,4 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2017-2021 Bartosz Golaszewski <bartekgola@gmail.com> + +-#define CATCH_CONFIG_MAIN +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> +diff --git a/bindings/cxx/tests/helpers.hpp b/bindings/cxx/tests/helpers.hpp +index 62d9827..62bbdf5 100644 +--- a/bindings/cxx/tests/helpers.hpp ++++ b/bindings/cxx/tests/helpers.hpp +@@ -4,13 +4,13 @@ + #ifndef __GPIOD_CXX_TEST_HELPERS_HPP__ + #define __GPIOD_CXX_TEST_HELPERS_HPP__ + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <regex> + #include <string> + #include <sstream> + #include <system_error> + +-class system_error_matcher : public Catch::MatcherBase<::std::system_error> ++class system_error_matcher : public Catch::Matchers::MatcherBase<::std::system_error> + { + public: + explicit system_error_matcher(int expected_errno); +@@ -21,7 +21,7 @@ private: + ::std::error_condition _m_cond; + }; + +-class regex_matcher : public Catch::MatcherBase<::std::string> ++class regex_matcher : public Catch::Matchers::MatcherBase<::std::string> + { + public: + explicit regex_matcher(const ::std::string& pattern); +@@ -33,7 +33,7 @@ private: + ::std::string _m_repr; + }; + +-template<class T> class stringify_matcher : public Catch::MatcherBase<T> ++template<class T> class stringify_matcher : public Catch::Matchers::MatcherBase<T> + { + public: + explicit stringify_matcher(const ::std::string& expected) : _m_expected(expected) +diff --git a/bindings/cxx/tests/tests-chip-info.cpp b/bindings/cxx/tests/tests-chip-info.cpp +index 717c387..2c54f53 100644 +--- a/bindings/cxx/tests/tests-chip-info.cpp ++++ b/bindings/cxx/tests/tests-chip-info.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <gpiod.hpp> + #include <sstream> + +@@ -24,12 +24,12 @@ TEST_CASE("chip_info properties can be read", "[chip-info][chip]") + + SECTION("get chip name") + { +- REQUIRE_THAT(info.name(), Catch::Equals(sim.name())); ++ REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name())); + } + + SECTION("get chip label") + { +- REQUIRE_THAT(info.label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar")); + } + + SECTION("get num_lines") +@@ -52,12 +52,12 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]") + { + auto copy(info); + +- REQUIRE_THAT(copy.name(), Catch::Equals(sim.name())); +- REQUIRE_THAT(copy.label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals(sim.name())); ++ REQUIRE_THAT(copy.label(), Catch::Matchers::Equals("foobar")); + REQUIRE(copy.num_lines() == 4); + +- REQUIRE_THAT(info.name(), Catch::Equals(sim.name())); +- REQUIRE_THAT(info.label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name())); ++ REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar")); + REQUIRE(info.num_lines() == 4); + } + +@@ -67,12 +67,12 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]") + + copy = info; + +- REQUIRE_THAT(copy.name(), Catch::Equals(sim.name())); +- REQUIRE_THAT(copy.label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals(sim.name())); ++ REQUIRE_THAT(copy.label(), Catch::Matchers::Equals("foobar")); + REQUIRE(copy.num_lines() == 4); + +- REQUIRE_THAT(info.name(), Catch::Equals(sim.name())); +- REQUIRE_THAT(info.label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name())); ++ REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar")); + REQUIRE(info.num_lines() == 4); + } + +@@ -80,8 +80,8 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]") + { + auto moved(std::move(info)); + +- REQUIRE_THAT(moved.name(), Catch::Equals(sim.name())); +- REQUIRE_THAT(moved.label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(moved.name(), Catch::Matchers::Equals(sim.name())); ++ REQUIRE_THAT(moved.label(), Catch::Matchers::Equals("foobar")); + REQUIRE(moved.num_lines() == 4); + } + +@@ -91,8 +91,8 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]") + + moved = ::std::move(info); + +- REQUIRE_THAT(moved.name(), Catch::Equals(sim.name())); +- REQUIRE_THAT(moved.label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(moved.name(), Catch::Matchers::Equals(sim.name())); ++ REQUIRE_THAT(moved.label(), Catch::Matchers::Equals("foobar")); + REQUIRE(moved.num_lines() == 4); + } + } +diff --git a/bindings/cxx/tests/tests-chip.cpp b/bindings/cxx/tests/tests-chip.cpp +index c5ec19b..1ab7add 100644 +--- a/bindings/cxx/tests/tests-chip.cpp ++++ b/bindings/cxx/tests/tests-chip.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <gpiod.hpp> + #include <sstream> + #include <system_error> +@@ -48,9 +48,9 @@ TEST_CASE("chip constructor works", "[chip]") + .build(); + + ::gpiod::chip first(sim.dev_path()); +- REQUIRE_THAT(first.get_info().label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(first.get_info().label(), Catch::Matchers::Equals("foobar")); + ::gpiod::chip second(::std::move(first)); +- REQUIRE_THAT(second.get_info().label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(second.get_info().label(), Catch::Matchers::Equals("foobar")); + } + } + +@@ -70,9 +70,9 @@ TEST_CASE("chip operators work", "[chip]") + + ::gpiod::chip moved_chip(moved_sim.dev_path()); + +- REQUIRE_THAT(chip.get_info().label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(chip.get_info().label(), Catch::Matchers::Equals("foobar")); + chip = ::std::move(moved_chip); +- REQUIRE_THAT(chip.get_info().label(), Catch::Equals("moved")); ++ REQUIRE_THAT(chip.get_info().label(), Catch::Matchers::Equals("moved")); + } + + SECTION("boolean operator") +@@ -94,7 +94,7 @@ TEST_CASE("chip properties can be read", "[chip]") + + SECTION("get device path") + { +- REQUIRE_THAT(chip.path(), Catch::Equals(sim.dev_path())); ++ REQUIRE_THAT(chip.path(), Catch::Matchers::Equals(sim.dev_path())); + } + + SECTION("get file descriptor") +@@ -169,7 +169,7 @@ TEST_CASE("stream insertion operator works for chip", "[chip]") + "\", label=\"foobar\", num_lines=4))"; + + buf << chip; +- REQUIRE_THAT(buf.str(), Catch::Equals(expected.str())); ++ REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected.str())); + } + + SECTION("closed chip") +diff --git a/bindings/cxx/tests/tests-edge-event.cpp b/bindings/cxx/tests/tests-edge-event.cpp +index 19a6ab3..db387be 100644 +--- a/bindings/cxx/tests/tests-edge-event.cpp ++++ b/bindings/cxx/tests/tests-edge-event.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <chrono> + #include <gpiod.hpp> + #include <sstream> +diff --git a/bindings/cxx/tests/tests-info-event.cpp b/bindings/cxx/tests/tests-info-event.cpp +index 21c0ef0..f7ae309 100644 +--- a/bindings/cxx/tests/tests-info-event.cpp ++++ b/bindings/cxx/tests/tests-info-event.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <chrono> + #include <filesystem> + #include <gpiod.hpp> +diff --git a/bindings/cxx/tests/tests-line-config.cpp b/bindings/cxx/tests/tests-line-config.cpp +index 5e439a1..2f510fb 100644 +--- a/bindings/cxx/tests/tests-line-config.cpp ++++ b/bindings/cxx/tests/tests-line-config.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <gpiod.hpp> + + #include "gpiosim.hpp" +diff --git a/bindings/cxx/tests/tests-line-info.cpp b/bindings/cxx/tests/tests-line-info.cpp +index 21211f2..8589da3 100644 +--- a/bindings/cxx/tests/tests-line-info.cpp ++++ b/bindings/cxx/tests/tests-line-info.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <gpiod.hpp> + #include <string> + +@@ -35,9 +35,9 @@ TEST_CASE("get_line_info() works", "[chip][line-info]") + auto info = chip.get_line_info(0); + + REQUIRE(info.offset() == 0); +- REQUIRE_THAT(info.name(), Catch::Equals("foobar")); ++ REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar")); + REQUIRE(info.used()); +- REQUIRE_THAT(info.consumer(), Catch::Equals("hog")); ++ REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("hog")); + REQUIRE(info.direction() == ::gpiod::line::direction::OUTPUT); + REQUIRE_FALSE(info.active_low()); + REQUIRE(info.bias() == ::gpiod::line::bias::UNKNOWN); +@@ -74,9 +74,9 @@ TEST_CASE("line properties can be retrieved", "[line-info]") + auto info6 = chip.get_line_info(6); + + REQUIRE(info4.offset() == 4); +- REQUIRE_THAT(info4.name(), Catch::Equals("baz")); ++ REQUIRE_THAT(info4.name(), Catch::Matchers::Equals("baz")); + REQUIRE(info4.used()); +- REQUIRE_THAT(info4.consumer(), Catch::Equals("hog4")); ++ REQUIRE_THAT(info4.consumer(), Catch::Matchers::Equals("hog4")); + REQUIRE(info4.direction() == direction::OUTPUT); + REQUIRE(info4.edge_detection() == edge::NONE); + REQUIRE_FALSE(info4.active_low()); +@@ -102,10 +102,10 @@ TEST_CASE("line_info can be copied and moved") + { + auto copy(info); + REQUIRE(copy.offset() == 2); +- REQUIRE_THAT(copy.name(), Catch::Equals("foobar")); ++ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar")); + /* info can still be used */ + REQUIRE(info.offset() == 2); +- REQUIRE_THAT(info.name(), Catch::Equals("foobar")); ++ REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar")); + } + + SECTION("assignment operator works") +@@ -113,17 +113,17 @@ TEST_CASE("line_info can be copied and moved") + auto copy = chip.get_line_info(0); + copy = info; + REQUIRE(copy.offset() == 2); +- REQUIRE_THAT(copy.name(), Catch::Equals("foobar")); ++ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar")); + /* info can still be used */ + REQUIRE(info.offset() == 2); +- REQUIRE_THAT(info.name(), Catch::Equals("foobar")); ++ REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar")); + } + + SECTION("move constructor works") + { + auto copy(::std::move(info)); + REQUIRE(copy.offset() == 2); +- REQUIRE_THAT(copy.name(), Catch::Equals("foobar")); ++ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar")); + } + + SECTION("move assignment operator works") +@@ -131,7 +131,7 @@ TEST_CASE("line_info can be copied and moved") + auto copy = chip.get_line_info(0); + copy = ::std::move(info); + REQUIRE(copy.offset() == 2); +- REQUIRE_THAT(copy.name(), Catch::Equals("foobar")); ++ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar")); + } + } + +diff --git a/bindings/cxx/tests/tests-line-request.cpp b/bindings/cxx/tests/tests-line-request.cpp +index 9632ae0..af8b979 100644 +--- a/bindings/cxx/tests/tests-line-request.cpp ++++ b/bindings/cxx/tests/tests-line-request.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <gpiod.hpp> + #include <sstream> + #include <stdexcept> +@@ -20,7 +20,7 @@ using pull = ::gpiosim::chip::pull; + + namespace { + +-class value_matcher : public Catch::MatcherBase<value> ++class value_matcher : public Catch::Matchers::MatcherBase<value> + { + public: + value_matcher(pull pull, bool active_low = false) +@@ -117,7 +117,7 @@ TEST_CASE("consumer string is set correctly", "[line-request]") + auto info = chip.get_line_info(2); + + REQUIRE(info.used()); +- REQUIRE_THAT(info.consumer(), Catch::Equals("foobar")); ++ REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("foobar")); + } + + SECTION("empty consumer") +@@ -130,7 +130,7 @@ TEST_CASE("consumer string is set correctly", "[line-request]") + auto info = chip.get_line_info(2); + + REQUIRE(info.used()); +- REQUIRE_THAT(info.consumer(), Catch::Equals("?")); ++ REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("?")); + } + } + +@@ -380,7 +380,7 @@ TEST_CASE("line_request can be moved", "[line-request]") + auto moved(::std::move(request)); + + REQUIRE(moved.fd() == fd); +- REQUIRE_THAT(moved.offsets(), Catch::Equals(offs)); ++ REQUIRE_THAT(moved.offsets(), Catch::Matchers::Equals(offs)); + } + + SECTION("move assignment operator works") +@@ -388,7 +388,7 @@ TEST_CASE("line_request can be moved", "[line-request]") + another = ::std::move(request); + + REQUIRE(another.fd() == fd); +- REQUIRE_THAT(another.offsets(), Catch::Equals(offs)); ++ REQUIRE_THAT(another.offsets(), Catch::Matchers::Equals(offs)); + } + } + +@@ -484,7 +484,7 @@ TEST_CASE("line_request stream insertion operator works", "[line-request]") + { + buf << request; + +- REQUIRE_THAT(buf.str(), Catch::Equals(expected.str())); ++ REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected.str())); + } + + SECTION("request released") +@@ -493,7 +493,7 @@ TEST_CASE("line_request stream insertion operator works", "[line-request]") + + buf << request; + +- REQUIRE_THAT(buf.str(), Catch::Equals("gpiod::line_request(released)")); ++ REQUIRE_THAT(buf.str(), Catch::Matchers::Equals("gpiod::line_request(released)")); + } + } + +diff --git a/bindings/cxx/tests/tests-line-settings.cpp b/bindings/cxx/tests/tests-line-settings.cpp +index dc821bb..2690331 100644 +--- a/bindings/cxx/tests/tests-line-settings.cpp ++++ b/bindings/cxx/tests/tests-line-settings.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <gpiod.hpp> + + #include "helpers.hpp" +diff --git a/bindings/cxx/tests/tests-line.cpp b/bindings/cxx/tests/tests-line.cpp +index 319012a..abd0e08 100644 +--- a/bindings/cxx/tests/tests-line.cpp ++++ b/bindings/cxx/tests/tests-line.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <gpiod.hpp> + + #include "helpers.hpp" +diff --git a/bindings/cxx/tests/tests-misc.cpp b/bindings/cxx/tests/tests-misc.cpp +index f06dc39..33fc3fa 100644 +--- a/bindings/cxx/tests/tests-misc.cpp ++++ b/bindings/cxx/tests/tests-misc.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <filesystem> + #include <gpiod.hpp> + #include <string> +diff --git a/bindings/cxx/tests/tests-request-config.cpp b/bindings/cxx/tests/tests-request-config.cpp +index 66eb748..d71e91b 100644 +--- a/bindings/cxx/tests/tests-request-config.cpp ++++ b/bindings/cxx/tests/tests-request-config.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <cstddef> + #include <gpiod.hpp> + #include <string> +@@ -33,7 +33,7 @@ TEST_CASE("request_config can be moved", "[request-config]") + SECTION("move constructor works") + { + auto moved(::std::move(cfg)); +- REQUIRE_THAT(moved.consumer(), Catch::Equals("foobar")); ++ REQUIRE_THAT(moved.consumer(), Catch::Matchers::Equals("foobar")); + REQUIRE(moved.event_buffer_size() == 64); + } + +@@ -43,7 +43,7 @@ TEST_CASE("request_config can be moved", "[request-config]") + + moved = ::std::move(cfg); + +- REQUIRE_THAT(moved.consumer(), Catch::Equals("foobar")); ++ REQUIRE_THAT(moved.consumer(), Catch::Matchers::Equals("foobar")); + REQUIRE(moved.event_buffer_size() == 64); + } + } +@@ -55,7 +55,7 @@ TEST_CASE("request_config mutators work", "[request-config]") + SECTION("set consumer") + { + cfg.set_consumer("foobar"); +- REQUIRE_THAT(cfg.consumer(), Catch::Equals("foobar")); ++ REQUIRE_THAT(cfg.consumer(), Catch::Matchers::Equals("foobar")); + } + + SECTION("set event_buffer_size") +@@ -77,7 +77,7 @@ TEST_CASE("request_config stream insertion operator works", "[request-config]") + + ::std::string expected("gpiod::request_config(consumer='foobar', event_buffer_size=32)"); + +- REQUIRE_THAT(buf.str(), Catch::Equals(expected)); ++ REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected)); + } + + } /* namespace */ +diff --git a/configure.ac b/configure.ac +index a2370c5..216007e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -206,9 +206,9 @@ then + + if test "x$with_tests" = xtrue + then +- PKG_CHECK_MODULES([CATCH2], [catch2],, [ ++ PKG_CHECK_MODULES([CATCH2], [catch2-with-main],, [ + AC_LANG_PUSH([C++]) +- AC_CHECK_HEADERS([catch2/catch.hpp], [], [HEADER_NOT_FOUND_CXX([catch2/catch.hpp])]) ++ AC_CHECK_HEADERS([catch2/catch_all.hpp], [], [HEADER_NOT_FOUND_CXX([catch2/catch_all.hpp])]) + AC_LANG_POP([C++]) + ]) + fi diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest new file mode 100644 index 0000000000..29ec0d1027 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest @@ -0,0 +1,24 @@ +#!/bin/sh + +testbins="gpiod-test gpio-tools-test.bash gpiod-cxx-test" + +ptestdir=$(dirname "$(readlink -f "$0")") +cd $ptestdir/tests + +# libgpiod v2 uses gpio-sim - a configfs-based testing module. We need to +# make sure configfs is mounted before running any tests. +modprobe configfs +mountpoint /sys/kernel/config > /dev/null || mount -t configfs configfs /sys/kernel/config + +for testbin in $testbins; do + if test -e ./$testbin; then + ./$testbin > ./$testbin.out 2>&1 + if [ $? -ne 0 ]; then + echo "FAIL: $testbin" + else + echo "PASS: $testbin" + fi + else + echo "SKIP: $testbin" + fi +done diff --git a/meta-oe/recipes-support/libgpiod/libgpiod.bb b/meta-oe/recipes-support/libgpiod/libgpiod.bb deleted file mode 100644 index 6aa27ad574..0000000000 --- a/meta-oe/recipes-support/libgpiod/libgpiod.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "C library and tools for interacting with the linux GPIO character device" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" - -SRC_URI = "https://www.kernel.org/pub/software/libs/libgpiod/${BP}.tar.xz" - -SRC_URI[md5sum] = "9c1966bea7dffd59bd099a8b2930e2ea" -SRC_URI[sha256sum] = "50c7862428ca90b58672e2475aea66d33a6fc86c6bab1928c0660f3aedf44a37" - -PV = "0.3.2" - -inherit autotools pkgconfig - -# enable tools -PACKAGECONFIG ?= "tools" - -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" -PACKAGECONFIG[tools] = "--enable-tools,--disable-tools," - -PACKAGES += " ${PN}-tools" - -FILES_${PN}-tools = "${bindir}/*" diff --git a/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-oe/recipes-support/libgpiod/libgpiod.inc new file mode 100644 index 0000000000..7b68f77d20 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod.inc @@ -0,0 +1,56 @@ +SUMMARY = "C library and tools for interacting with the linux GPIO character device" +RECIPE_MAINTAINER = "Bartosz Golaszewski <brgl@bgdev.pl>" + +inherit autotools pkgconfig ptest + +SRC_URI += " \ + https://www.kernel.org/pub/software/libs/libgpiod/libgpiod-${PV}.tar.xz \ + file://run-ptest \ +" + +PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" + +# Enable cxx bindings by default. +PACKAGECONFIG ?= " \ + cxx \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ +" + +# Always build tools - they don't have any additional +# requirements over the library. +EXTRA_OECONF = "--enable-tools" + +DEPENDS += "autoconf-archive-native" + +PACKAGES =+ "${PN}-tools libgpiodcxx" +FILES:${PN}-tools += " \ + ${bindir}/gpiodetect \ + ${bindir}/gpioinfo \ + ${bindir}/gpioget \ + ${bindir}/gpioset \ + ${bindir}/gpiomon \ +" +FILES:libgpiodcxx = "${libdir}/libgpiodcxx.so.*" + +RRECOMMENDS:${PN}-ptest += "coreutils" + +do_install:append() { + rm -f ${D}${bindir}/gpiod-test + rm -f ${D}${bindir}/gpio-tools-test + rm -f ${D}${bindir}/gpio-tools-test.bats + rm -f ${D}${bindir}/gpiod-cxx-test +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests/ + + # These are the core C library tests + install -m 0755 ${B}/tests/.libs/gpiod-test ${D}${PTEST_PATH}/tests/ + + # Tools are always built so let's always install them for ptest even if + # we're not selecting libgpiod-tools. + for tool in ${FILES:${PN}-tools}; do + install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/ + done +} + diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb new file mode 100644 index 0000000000..0795839492 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb @@ -0,0 +1,47 @@ +require libgpiod.inc + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" + +SRC_URI += "file://0001-bindings-cxx-disable-tests.patch" + +SRC_URI[sha256sum] = "ae280f697bf035a1fb780c9972e5c81d0d2712b7ab6124fb3fba24619daa72bc" + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:" + +inherit python3native + +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2" +PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" + +# Always build tools - they don't have any additional +# requirements over the library. +EXTRA_OECONF = "--enable-tools" + +PACKAGES =+ "${PN}-python" +FILES:${PN}-tools += "${bindir}/gpiofind" +FILES:${PN}-ptest += " \ + ${bindir}/gpiod_py_test.py \ + ${libdir}/libgpiomockup.so.* \ +" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.so" +FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" + +RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '', d)}" +RRECOMMENDS:${PN}-ptest += " \ + kernel-module-gpio-mockup \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-unittest', '', d)} \ +" +RDEPENDS:${PN}-ptest += " \ + python3-packaging \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'bats', '', d)} \ +" + +do_install_ptest:append() { + install -m 0755 ${S}/tools/gpio-tools-test ${D}${PTEST_PATH}/tests/ + install -m 0755 ${S}/tools/gpio-tools-test.bats ${D}${PTEST_PATH}/tests/ + + if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then + install -m 0755 ${S}/bindings/python/tests/gpiod_py_test.py ${D}${PTEST_PATH}/tests/ + fi +} diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb new file mode 100644 index 0000000000..6130371e4e --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb @@ -0,0 +1,33 @@ +require libgpiod.inc + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0" +LIC_FILES_CHKSUM = " \ + file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSES/LGPL-2.1-or-later.txt;md5=4b54a1fd55a448865a0b32d41598759d \ + file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \ +" + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" + +SRC_URI += "file://0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch" +SRC_URI[sha256sum] = "2be4c0b03e995d236c0e476e14aeb475d7b431dd1439609b6d65c540f91eaf58" + +# Enable all project features for ptest +PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit" +PACKAGECONFIG[gpioset-interactive] = "--enable-gpioset-interactive,--disable-gpioset-interactive,libedit" + +PACKAGES =+ "${PN}-ptest-dev" +FILES:${PN}-tools += "${bindir}/gpionotify" +FILES:${PN}-ptest += "${libdir}/libgpiosim.so.*" +FILES:${PN}-ptest-dev += "${includedir}/gpiosim.h" + +RDEPENDS:${PN}-ptest += " \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'shunit2 bash', '', d)} \ +" +RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs" + +do_install_ptest:append() { + install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/ + install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/ + install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h +} diff --git a/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb b/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb new file mode 100644 index 0000000000..491b6a7a1d --- /dev/null +++ b/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb @@ -0,0 +1,18 @@ +SUMMARY = "GUsb is a GObject wrapper for libusb1" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = "glib-2.0 libusb" + +inherit meson gobject-introspection gtk-doc gettext vala + +PACKAGECONFIG:class-target ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)}" +PACKAGECONFIG[vapi] = "-Dvapi=true,-Dvapi=false" + +EXTRA_OEMESON:append:class-native = " -Dtests=false -Dintrospection=false" + +SRC_URI = "git://github.com/hughsie/libgusb.git;branch=main;protocol=https" +SRCREV = "332d5b987ffecb824426e88518e05547faf2b520" +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libharu/libharu_2.4.4.bb b/meta-oe/recipes-support/libharu/libharu_2.4.4.bb new file mode 100644 index 0000000000..02dc499e03 --- /dev/null +++ b/meta-oe/recipes-support/libharu/libharu_2.4.4.bb @@ -0,0 +1,16 @@ +SUMMARY = "free PDF library" +HOMEPAGE = "http://libharu.org" +DESCRIPTION = "libHaru is a library for generating PDF files. \ + It is free, open source, written in ANSI C and cross platform. " + +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://LICENSE;md5=924546dab2bef90e370d7c0c090ddcf0" + +DEPENDS += "libpng zlib" + +SRC_URI = "git://github.com/libharu/libharu.git;branch=master;protocol=https" +SRCREV = "0c598becaadaef8e3d12b883f9fc2864a118c12d" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-oe/recipes-support/libiio/libiio_0.25.bb b/meta-oe/recipes-support/libiio/libiio_0.25.bb new file mode 100644 index 0000000000..2c6d2b5145 --- /dev/null +++ b/meta-oe/recipes-support/libiio/libiio_0.25.bb @@ -0,0 +1,81 @@ +SUMMARY = "Library for interfacing with IIO devices" +HOMEPAGE = "https://wiki.analog.com/resources/tools-software/linux-software/libiio" +SECTION = "libs" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" + +SRCREV = "b6028fdeef888ab45f7c1dd6e4ed9480ae4b55e3" + +SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=main" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +SETUPTOOLS_SETUP_PATH ?= "${B}/bindings/python/" + +DEPENDS = " \ + flex-native bison-native libaio \ +" + +inherit cmake python3native systemd setuptools3 pkgconfig + +EXTRA_OECMAKE = " \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCPP_BINDINGS=ON \ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ + -DUDEV_RULES_INSTALL_DIR=${nonarch_base_libdir}/udev/rules.d \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \ +" + +PACKAGECONFIG ??= " \ + usb_backend network_backend serial_backend xml_backend \ + ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'dnssd', '', d)} \ +" + +# network_backend, serial_backend and usb_backend depend on xml_backend, so don't switch it off +XML_BACKEND_DISABLE = "${@bb.utils.contains_any('PACKAGECONFIG', 'network_backend serial_backend usb_backend', '', '-DWITH_XML_BACKEND=off', d)}" + +PACKAGECONFIG[usb_backend] = "-DWITH_USB_BACKEND=ON -DWITH_XML_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1 libxml2" +PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON -DWITH_XML_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" +PACKAGECONFIG[serial_backend] = "-DWITH_SERIAL_BACKEND=ON -DWITH_XML_BACKEND=ON,-DWITH_SERIAL_BACKEND=off,libserialport libxml2" +PACKAGECONFIG[xml_backend] = "-DWITH_XML_BACKEND=ON,${XML_BACKEND_DISABLE},libxml2" +PACKAGECONFIG[dnssd] = "-DHAVE_DNS_SD=ON,-DHAVE_DNS_SD=off,avahi" +PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" + +PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-python3" + +# Inheriting setuptools3 incorrectly adds the dependency on python3-core +# to ${PN} instead of to ${PN}-python3 where it belongs. +RDEPENDS:${PN}:remove = "python3-core" +RDEPENDS:${PN}-python3 = "${PN} python3-core python3-ctypes python3-stringold" + +FILES:${PN}-iiod = " \ + ${sbindir}/iiod \ + ${systemd_system_unitdir}/iiod.service \ +" +FILES:${PN}-tests = "${bindir}" +FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" + +SYSTEMD_PACKAGES = "${PN}-iiod" +SYSTEMD_SERVICE:${PN}-iiod = "iiod.service" + +# Explicitly define do_configure, do_compile and do_install because both cmake and setuptools3 have +# EXPORT_FUNCTIONS do_configure do_compile do_install +do_configure() { + cmake_do_configure +} + +do_compile() { + if ${@bb.utils.contains('PACKAGECONFIG', 'libiio-python3', 'true', 'false', d)}; then + setuptools3_do_compile + fi + cmake_do_compile +} + +do_install() { + if ${@bb.utils.contains('PACKAGECONFIG', 'libiio-python3', 'true', 'false', d)}; then + setuptools3_do_install + fi + cmake_do_install +} diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb deleted file mode 100644 index d66ac58d5a..0000000000 --- a/meta-oe/recipes-support/libiio/libiio_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Library for interfacing with IIO devices" -HOMEPAGE = "https://wiki.analog.com/resources/tools-software/linux-software/libiio" -SECTION = "libs" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" - -SRCREV = "08f947d5e40600259bb698c3b95538e9f2bfecc2" -PV = "0.8+git${SRCPV}" - -SRC_URI = "git://github.com/analogdevicesinc/libiio.git" - -S = "${WORKDIR}/git" - -DEPENDS = "flex-native bison-native avahi libaio libusb1 libxml2" - -inherit cmake pythonnative - -PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-python" - -RDEPENDS_${PN}-python = "${PN} python-ctypes python-stringold" - -FILES_${PN}-iiod = "${sbindir}/iiod" -FILES_${PN}-tests = "${bindir}" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb new file mode 100644 index 0000000000..644c3ba07b --- /dev/null +++ b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb @@ -0,0 +1,33 @@ +SUMMARY = "iODBC driver manager maintained by OpenLink Software." + +DESCRIPTION = "This kit will provide you with everything you need to \ +develop ODBC-compliant applications under Unix without having to pay \ +royalties to other parties. \ +" + +HOMEPAGE = "http://www.iodbc.org/" + +LICENSE = "LGPL-2.0-only | BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=8c0138a8701f0e1282f5c8b2c7d39114 \ + file://LICENSE.BSD;md5=5b36348a404e1d65b57df8d33fd6e414 \ + " + +SRC_URI = "https://github.com/openlink/iODBC/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI[sha256sum] = "3898b32d07961360f6f2cf36db36036b719a230e476469258a80f32243e845fa" + +UPSTREAM_CHECK_URI = "https://github.com/openlink/iODBC/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + +inherit autotools + +EXTRA_OECONF += " --prefix=/usr/local \ + --includedir=/usr/include/iodbc \ + --with-iodbc-inidir=/etc \ + --enable-odbc3 \ + --enable-pthreads \ + --disable-libodbc \ + --disable-static \ + " + +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}:${bindir}/iodbc-config" diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb b/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb new file mode 100644 index 0000000000..38ffd032ab --- /dev/null +++ b/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb @@ -0,0 +1,27 @@ +SUMMARY = "A simple, lightweight JavaScript API for handling cookies." +HOMEPAGE = "https://github.com/js-cookie/js-cookie" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e16cf0e247d84f8999bf55865a9c98cf" + +SRC_URI = "git://github.com/js-cookie/js-cookie.git;protocol=https;branch=main" + +SRCREV = "ab3f67fc4fad88cdf07b258c08e4164e06bf7506" + +S = "${WORKDIR}/git" + +JQUERYCOOKIEDIR = "${datadir}/javascript/jquery-cookie" +JQUERYCOOKIEDOCDIR = "${docdir}/libjs-jquery-cookie" + +do_install() { + install -d ${D}${JQUERYCOOKIEDIR} + install -m 0644 ${S}/*.js ${D}${JQUERYCOOKIEDIR} + install -m 0644 ${S}/src/*.mjs ${D}${JQUERYCOOKIEDIR} + install -m 0644 ${S}/*.json ${D}${JQUERYCOOKIEDIR} + + install -d ${D}${JQUERYCOOKIEDOCDIR} + install -m 0644 ${S}/*.md ${D}${JQUERYCOOKIEDOCDIR} + +} + +FILES:${PN} += "${datadir}/javascript/jquery-cookie" +FILES:${PN}-doc += "${docdir}/libjs-jquery-cookie" diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb b/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb new file mode 100644 index 0000000000..b6147ffeb2 --- /dev/null +++ b/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "A JavaScript library for internationalization and localization that leverages the official Unicode CLDR JSON data" +SECTION = "console/network" +HOMEPAGE = "https://github.com/globalizejs/globalize" +LICENSE = "MIT" + +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=4db68fb4d1d9986d736b35039f2ad9ea" + +SRCREV = "771061fb35f7fd8d7c2c37f5d5bb26115be382bc" +SRC_URI = "git://github.com/globalizejs/globalize;protocol=https;nobranch=1" + +FILES:${PN} = "${datadir}/javascript/jquery-globalize" +FILES:${PN}-doc += "${docdir}/${PN}" + +do_install() { + install -d ${D}${datadir}/javascript/jquery-globalize/ + install -m 0644 ${S}/dist/*.js ${D}${datadir}/javascript/jquery-globalize/ + install -m 0644 ${S}/dist/globalize/*.js ${D}${datadir}/javascript/jquery-globalize/ + + install -d ${D}${docdir}/${PN}/ + install -m 0644 ${S}/LICENSE ${D}${docdir}/${PN}/ +} diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb b/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb new file mode 100644 index 0000000000..63dfc6fa78 --- /dev/null +++ b/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Highly customizable checkboxes and radio buttons (jQuery & Zepto)" +SECTION = "console/network" +HOMEPAGE = "http://fronteed.com/iCheck" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://icheck.js;beginline=6;endline=7;md5=ea25eee37fc3b14403e215bfe13564bc" + +SRC_URI = "git://github.com/fronteed/icheck.git;protocol=https;branch=${PV}" + +SRCREV = "c8c1af84e4b90b4aea31466aad09bf877619e943" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${datadir}/javascript/jquery-icheck/ + install -m 0644 ${S}/icheck.js ${D}${datadir}/javascript/jquery-icheck/ + install -m 0644 ${S}/icheck.min.js ${D}${datadir}/javascript/jquery-icheck/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/ + install -m 0644 ${S}/skins/all.css ${D}${datadir}/javascript/jquery-icheck/skins/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/flat/ + install -m 0644 ${S}/skins/flat/* ${D}${datadir}/javascript/jquery-icheck/skins/flat/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/futurico/ + install -m 0644 ${S}/skins/futurico/* ${D}${datadir}/javascript/jquery-icheck/skins/futurico/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/line/ + install -m 0644 ${S}/skins/line/* ${D}${datadir}/javascript/jquery-icheck/skins/line/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/minimal/ + install -m 0644 ${S}/skins/minimal/* ${D}${datadir}/javascript/jquery-icheck/skins/minimal/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/polaris/ + install -m 0644 ${S}/skins/polaris/* ${D}${datadir}/javascript/jquery-icheck/skins/polaris/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/square/ + install -m 0644 ${S}/skins/square/* ${D}${datadir}/javascript/jquery-icheck/skins/square/ +} + +FILES:${PN} += "${datadir}/javascript/jquery-icheck" + diff --git a/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb b/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb index 7f425cdeab..68b5086701 100644 --- a/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb +++ b/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb @@ -1,15 +1,21 @@ SUMMARY = "JavaScript library for dynamic web applications" HOMEPAGE = "https://jquery.com/" -LICENSE = "MIT | BSD | GPL-2" -LIC_FILES_CHKSUM = "file://usr/share/doc/libjs-jquery/copyright;md5=5d1ec6f95e0a91d38e2f71de93ddb00e" +LICENSE = "GPL-2.0-only | MIT" +LIC_FILES_CHKSUM = "file://usr/share/doc/libjs-jquery/copyright;md5=04bfd6e5b918af29f2f79ce44527da62" -SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/${BPN}_${PV}+debian-1ubuntu1~ubuntu12.04.1_all.deb;subdir=${BP}" -SRC_URI[md5sum] = "fa511ab67f6e960c5b6d39a4d665e47f" -SRC_URI[sha256sum] = "190ca18a71e35c8ab2ba73fe5be3c7cc601fe20b45709d801110818f1b602cc1" +SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/${BPN}_${PV}~dfsg-3_all.deb" + +SRC_URI[sha256sum] = "e04d192c2356e9d4c2b2c7d83fde9408713212b53c4d106e5b9e46c1a56da33b" + +UPSTREAM_CHECK_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" JQUERYDIR = "${datadir}/javascript/jquery" JQUERYDOCDIR = "${docdir}/libjs-jquery" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { install -d -m 0755 ${D}${JQUERYDIR} install -m 0644 ${S}${JQUERYDIR}/jquery.js ${D}${JQUERYDIR}/ @@ -22,4 +28,4 @@ do_install() { install -m 0644 ${S}${JQUERYDOCDIR}/copyright ${D}${JQUERYDOCDIR}/ } -FILES_${PN} = "/usr/share/javascript/jquery" +FILES:${PN} = "/usr/share/javascript/jquery" diff --git a/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb b/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb index 4928b6c3a7..e639ce59d8 100644 --- a/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb +++ b/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb @@ -1,6 +1,6 @@ SUMMARY = "Pure-JavaScript CSS selector engine" HOMEPAGE = "https://github.com/jquery/sizzle/wiki" -LICENSE = "GPL-2.0 & MIT & AFL-2.1" +LICENSE = "GPL-2.0-only & MIT & AFL-2.1" LIC_FILES_CHKSUM = "file://MIT-LICENSE.txt;md5=e43aa437a6a1ba421653bd5034333bf9" SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/universe/s/sizzle/sizzle_1.10.18.orig.tar.gz" @@ -16,4 +16,4 @@ do_install() { install -m 0644 ${SIZZLEDIR}/*.js ${D}/${datadir}/javascript/sizzle/ } -FILES_${PN} = "${datadir}/javascript/sizzle/" +FILES:${PN} = "${datadir}/javascript/sizzle/" diff --git a/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb b/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb deleted file mode 100644 index d0463a640d..0000000000 --- a/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Liblinebreak is an implementation of the line breaking algorithm as described in Unicode 5.1.0 Standard Annex 14, Revision 22" -HOMEPAGE = "http://vimgadgets.sourceforge.net/liblinebreak/" -SECTION = "libs" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENCE;md5=3715191da62bafb5cfc4ff36195b2ec3" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/vimgadgets/liblinebreak/${PV}/liblinebreak-${PV}.tar.gz" -SRC_URI[md5sum] = "d18039259001ccb24b5dd4648c49c5ad" -SRC_URI[sha256sum] = "9efcb0cb1afc75ad1e92d2b2dbf4d9c77b072d6656c5f1a150af8b718d0c7b76" - -inherit autotools diff --git a/meta-oe/recipes-support/libmanette/libmanette_0.2.9.bb b/meta-oe/recipes-support/libmanette/libmanette_0.2.9.bb new file mode 100644 index 0000000000..2e59401892 --- /dev/null +++ b/meta-oe/recipes-support/libmanette/libmanette_0.2.9.bb @@ -0,0 +1,16 @@ +# Copyright (C) 2021 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) +SUMMARY = "The simple GObject game controller library" +HOMEPAGE = "https://gnome.pages.gitlab.gnome.org/libmanette/" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "libevdev libgudev" + +SRC_URI = "https://download.gnome.org/sources/libmanette/0.2/libmanette-${PV}.tar.xz" +SRC_URI[sha256sum] = "29366be5452f60a74c65fc64ffe2d74eddd4e6e6824c2cefa567a43bd92b688f" + +inherit meson pkgconfig gobject-introspection ptest vala + +FILES:${PN}-ptest =+ "${bindir}/manette-test" +FILES:${PN}-dev =+ "${libdir}/girepository-1.0" diff --git a/meta-oe/recipes-support/libmcrypt/libmcrypt_2.5.8.bb b/meta-oe/recipes-support/libmcrypt/libmcrypt_2.5.8.bb deleted file mode 100644 index 2a133c69ad..0000000000 --- a/meta-oe/recipes-support/libmcrypt/libmcrypt_2.5.8.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Replacement for the old crypt() package and crypt(1) command, with extensions" -HOMEPAGE = "http://mcrypt.sourceforge.net/" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff" -DEPENDS = "libtool" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/mcrypt/Libmcrypt/${PV}/libmcrypt-${PV}.tar.gz" - -SRC_URI[md5sum] = "0821830d930a86a5c69110837c55b7da" -SRC_URI[sha256sum] = "e4eb6c074bbab168ac47b947c195ff8cef9d51a211cdd18ca9c9ef34d27a373e" - -inherit autotools-brokensep gettext binconfig diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.55.bb b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.55.bb deleted file mode 100644 index ee399a7645..0000000000 --- a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.55.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" -HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=9331186f4f80db7da0e724bdd6554ee5" -SECTION = "net" -DEPENDS = "libgcrypt gnutls file" - -SRC_URI = "http://ftp.gnu.org/gnu/libmicrohttpd/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "1c20f84a8b9cf692dd50b558b3571a3a" -SRC_URI[sha256sum] = "0c1cab8dc9f2588bd3076a28f77a7f8de9560cbf2d80e53f9a8696ada80ed0f8" - -inherit autotools lib_package pkgconfig gettext - -EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" - -PACKAGECONFIG ?= "curl" -PACKAGECONFIG_append_class-target = "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ -" -PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," - -do_compile_append() { - sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc -} diff --git a/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch b/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch new file mode 100644 index 0000000000..717e3f1f8b --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch @@ -0,0 +1,69 @@ +From 64fd25af5fea3a3c9c12122a2fd0fab3cd420f72 Mon Sep 17 00:00:00 2001 +From: asmitk01-in <asmitk01@in.ibm.com> +Date: Wed, 5 Feb 2020 00:14:42 -0600 +Subject: [PATCH] libmimetic: Removing test directory from the Makefile + +The test directory is removed as there were errors (relocation errors) +since the shared object files of libc++ and libc were not taken from the +sysroot path but from the system's library path where the required +version of the .so is not present. + +The files 'mimetic/codec/other_codecs.h' and 'mimetic/contenttype.cxx' +contains changes that resolves errors when compiling on target system +aarch64-yoe-linux-musl. + +Signed-off-by: asmitk01-in <asmitk01@in.ibm.com> +Change-Id: I1822b36ad4a1fa5e7b165d8cac3a6e96aca11c35 +--- +Upstream-Status: Pending + + Makefile.am | 2 +- + mimetic/codec/other_codecs.h | 4 ++++ + mimetic/contenttype.cxx | 4 ++++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 634bd4c..c7cbae7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile Makefile.in config.cache + EXTRA_DIST=LICENSE m4 +-SUBDIRS = mimetic doc examples test win32 ++SUBDIRS = mimetic doc examples win32 + INCLUDES=-I$(top_srcdir) + ACLOCAL_AMFLAGS=-I m4 + +diff --git a/mimetic/codec/other_codecs.h b/mimetic/codec/other_codecs.h +index c4ccf3f..0fc88fd 100644 +--- a/mimetic/codec/other_codecs.h ++++ b/mimetic/codec/other_codecs.h +@@ -8,6 +8,10 @@ + #define _MIMETIC_CODEC_OTHER_CODECS_H_ + #include <mimetic/codec/codec_base.h> + ++#ifndef __GLIBC__ ++ typedef unsigned int uint; ++#endif ++ + namespace mimetic + { + +diff --git a/mimetic/contenttype.cxx b/mimetic/contenttype.cxx +index 522082d..0577d44 100644 +--- a/mimetic/contenttype.cxx ++++ b/mimetic/contenttype.cxx +@@ -13,6 +13,10 @@ + #include <mimetic/tokenizer.h> + #include <mimetic/utils.h> + ++#ifndef __GLIBC__ ++ typedef unsigned int uint; ++#endif ++ + namespace mimetic + { + using namespace std; +-- +2.9.3 + diff --git a/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch b/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch new file mode 100644 index 0000000000..c7c8d62aaa --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch @@ -0,0 +1,49 @@ +From f8ab2b1aaa37f6ba9d527a99cb37b6ac2171e122 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 14 Feb 2020 17:03:12 -0800 +Subject: [PATCH] mimetic: Check for MMAP_FAILED return from mmap() + +Avoids using greater than zero comparision on pointers + +Fixes +mimetic/os/mmfile.cxx:60:14: error: ordered comparison between pointer and zero ('char *' and 'int') + +if(m_beg > 0) +~~~~ ^ ~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + mimetic/os/mmfile.cxx | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/mimetic/os/mmfile.cxx b/mimetic/os/mmfile.cxx +index dfc95b7..ed4ff55 100644 +--- a/mimetic/os/mmfile.cxx ++++ b/mimetic/os/mmfile.cxx +@@ -57,15 +57,13 @@ bool MMFile::open(int mode) + bool MMFile::map() + { + m_beg = (char*) mmap(0, m_st.st_size, PROT_READ, MAP_SHARED,m_fd,0); +- if(m_beg > 0) +- { +- m_end = m_beg + m_st.st_size; +- #if HAVE_MADVISE +- madvise(m_beg, m_st.st_size, MADV_SEQUENTIAL); +- #endif +- return true; +- } +- return false; ++ if(m_beg == MAP_FAILED) ++ return false; ++ m_end = m_beg + m_st.st_size; ++ #if HAVE_MADVISE ++ madvise(m_beg, m_st.st_size, MADV_SEQUENTIAL); ++ #endif ++ return true; + } + + MMFile::~MMFile() +-- +2.25.0 + diff --git a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb new file mode 100644 index 0000000000..4d4a5ff109 --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb @@ -0,0 +1,23 @@ +# Released under the MIT license. + +SUMMARY = "Mimetic Library for multi-part parsing" +DESCRIPTION = "Email library (MIME) written in C++ designed to be easy to use and integrate but yet fast and efficient." +HOMEPAGE = "http://www.codesink.org/mimetic_mime_library.html" +BUGTRACKER = "https://github.com/LadislavSopko/mimetic/issues" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b49da7df0ca479ef01ff7f2d799eabee" + +SRCREV = "50486af99b4f9b35522d7b3de40b6ce107505279" +SRC_URI += "git://github.com/LadislavSopko/mimetic/;branch=master;protocol=https \ + file://0001-libmimetic-Removing-test-directory-from-the-Makefile.patch \ + file://0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch \ + " + +UPSTREAM_CHECK_COMMITS = "1" + +S = "${WORKDIR}/git" + +CXXFLAGS += "-Wno-narrowing -std=c++14" + +inherit autotools diff --git a/meta-oe/recipes-support/libmxml/libmxml_4.0.3.bb b/meta-oe/recipes-support/libmxml/libmxml_4.0.3.bb new file mode 100644 index 0000000000..54582e7047 --- /dev/null +++ b/meta-oe/recipes-support/libmxml/libmxml_4.0.3.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Tiny XML Library" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" +HOMEPAGE = "https://www.msweet.org/mxml/" +BUGTRACKER = "https://github.com/michaelrsweet/mxml/issues" + +SRC_URI = "git://github.com/michaelrsweet/mxml.git;branch=master;protocol=https" +SRCREV = "804c4f4d922e4ca240ce2cad3ec7bc5d00c08691" +S = "${WORKDIR}/git" + +# Package does not support out of tree builds. +inherit autotools-brokensep + +PACKAGECONFIG ??= "threads" +PACKAGECONFIG[threads] = "--enable-threads,--disable-threads" + +# MXML uses autotools but it explicitly states it does not support autoheader. +EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" + +do_configure:prepend() { + # Respect optimization CFLAGS specified by OE. + sed -e 's/-Os -g//' -i ${S}/configure.ac + + # Enable verbose compilation output. This is required for extra QA checks to work. + sed -e '/.SILENT:/d' -i ${S}/Makefile.in +} + +do_install() { + # Package uses DSTROOT instread of standard DESTDIR to specify install location. + oe_runmake install DSTROOT=${D} +} diff --git a/meta-oe/recipes-support/libnice/libnice_0.1.22.bb b/meta-oe/recipes-support/libnice/libnice_0.1.22.bb new file mode 100644 index 0000000000..4b932029ee --- /dev/null +++ b/meta-oe/recipes-support/libnice/libnice_0.1.22.bb @@ -0,0 +1,33 @@ +SUMMARY = "Interactive Connectivity Establishment library" +DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactive Connectivity Establishment standard (ICE)." +HOMEPAGE = "http://nice.freedesktop.org/wiki/" + +LICENSE = "LGPL-2.1-only & MPL-1.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ + file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ +" + +SRC_URI = "http://nice.freedesktop.org/releases/${BP}.tar.gz" +SRC_URI[sha256sum] = "a5f724cf09eae50c41a7517141d89da4a61ec9eaca32da4a0073faed5417ad7e" + +UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/libnice/libnice/-/tags" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + +DEPENDS = "glib-2.0 gnutls ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}" + +PACKAGECONFIG[gupnp] = "-Dgupnp=enabled,-Dgupnp=disabled,gupnp" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0" +PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled," + +GTKDOC_MESON_OPTION = "gtk_doc" +GTKDOC_MESON_ENABLE_FLAG = "enabled" +GTKDOC_MESON_DISABLE_FLAG = "disabled" + +inherit meson gtk-doc gobject-introspection + +EXTRA_OEMESON = "-Dexamples=disabled -Dtests=disabled" + +FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/pkgconfig" +FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" diff --git a/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch b/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch deleted file mode 100644 index a43b4b176c..0000000000 --- a/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f1b9992caf9910f9f7afae401045e42572cc84ff Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 1 Apr 2017 08:50:35 -0700 -Subject: [PATCH] signal.c: SIGCLD and SIGCHILD are same on sytem V systems - -Musl drops the SIGCLD legacy - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - nih/signal.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nih/signal.c b/nih/signal.c -index a241df9..691c8e6 100644 ---- a/nih/signal.c -+++ b/nih/signal.c -@@ -87,7 +87,7 @@ static const SignalName signal_names[] = { - { SIGSTKFLT, "STKFLT" }, - #endif - { SIGCHLD, "CHLD" }, -- { SIGCLD, "CLD" }, -+ { SIGCHLD, "CLD" }, - { SIGCONT, "CONT" }, - { SIGSTOP, "STOP" }, - { SIGTSTP, "TSTP" }, --- -2.12.1 - diff --git a/meta-oe/recipes-support/libnih/libnih-1.0.3/libnih_1.0.3-4ubuntu16.patch b/meta-oe/recipes-support/libnih/libnih-1.0.3/libnih_1.0.3-4ubuntu16.patch deleted file mode 100644 index 5d125c8514..0000000000 --- a/meta-oe/recipes-support/libnih/libnih-1.0.3/libnih_1.0.3-4ubuntu16.patch +++ /dev/null @@ -1,3593 +0,0 @@ ---- libnih-1.0.3.orig/ChangeLog -+++ libnih-1.0.3/ChangeLog -@@ -1,3 +1,84 @@ -+2013-03-13 Steve Langasek <steve.langasek@ubuntu.com> -+ -+ * nih/watch.c (nih_watch_walk_filter): New NihFileFilter function -+ passed to nih_dir_walk_scan() to ensure the nih_watch_new() filter -+ function is passed the NihWatch data rather than the data passed to -+ the nih_dir_walk() NihFileVisitor function (LP: #776532). -+ -+ * nih/tests/test_watch.c (test_new): New test "with filter and data" -+ to ensure filter is passed correct value. -+ -+2013-02-28 James Hunt <james.hunt@ubuntu.com> -+ -+ * Removal of gcc 'malloc' function attribute resulting from -+ a clarification in its description which makes its use invalid. -+ (LP: #1123588). -+ -+2013-02-05 James Hunt <james.hunt@ubuntu.com> -+ -+ * nih/logging.c: nih_log_abort_message(): Remove erroneous check -+ left over from use of __abort_msg weak symbol. -+ * nih/tests/test_logging.c: Remove unecessary check on whether -+ __nih_abort_msg has an address. -+ -+2012-12-13 Stéphane Graber <stgraber@ubuntu.com> -+ -+ * nih-dbus-tool/type.c, nih-dbus-tool/marshal.c: Update dbus code -+ generator to allow for empty lists for type 'as'. This drops the -+ != NULL check for NULL terminated arrays and moves the iteration -+ loop inside an 'if' statement. -+ -+2012-12-11 Dmitrijs Ledkovs <dmitrijs.ledkovs@canonical.com> -+ -+ * nih/file.c (nih_dir_walk_scan): Fallback to lstat, if the -+ non-portable dirent.d_type is not available (LP: #672643) (Closes: -+ #695604). -+ -+2012-12-10 Petr Lautrbach <plautrba@redhat.com> -+ -+ * nih/tests/test_file.c: don't use dirent.d_type (not portable) -+ -+2012-10-25 James Hunt <james.hunt@ubuntu.com> -+ -+ * nih/logging.c: Use our own __nih_abort_msg rather than the -+ (e)glibc private symbol __abort_msg to avoid upgrade issues (LP: #997359). -+ * nih/tests/test_logging.c: Update tests for __nih_abort_msg. -+ -+2011-08-31 James Hunt <james.hunt@ubuntu.com> -+ -+ * nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c -+ (test_unix_fd_to_str): Sanity check value before invoking strchr in -+ case it returns address of null (which would give a misleading test -+ pass). -+ * nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c -+ (test_unix_fd_to_str, test_unix_fd_to_str_sync): Sanity check value -+ before invoking strchr in case it returns address of null (which would -+ give a misleading test pass). -+ * nih/config.c (): nih_config_block_end: Add check to ensure strchr() -+ doesn't return address of null since this would result in a misleading -+ return value of TRUE. -+ -+ * nih/string.c (nih_str_split): Fixes to avoid over-running -+ input string and also returning an empty string array entry -+ when repeat is true (LP: #834813). -+ * nih/tests/test_string.c (test_str_split): Added a lot of new -+ tests for nih_str_split(). -+ -+2011-08-26 James Hunt <james.hunt@ubuntu.com> -+ -+ * nih/io.c (nih_io_select_fds): Ensure number of fds being managed -+ is within limits. -+ -+ * nih/config.c, nih/error.h, nih/io.c, nih/test_files.h: Correct -+ typos in comments. -+ -+2011-06-20 James Hunt <james.hunt@ubuntu.com> -+ -+ * nih/watch.c (nih_watch_handle): Handle non-directory watches; -+ previously a file watch resulted in an invalid file path ending in -+ a single slash (LP:#777097). -+ * nih/tests/test_watch.c: Added explicit test for watch on a file. -+ - 2010-12-23 Scott James Remnant <scott@netsplit.com> - - * NEWS: Release 1.0.3 ---- libnih-1.0.3.orig/nih/watch.c -+++ libnih-1.0.3/nih/watch.c -@@ -2,8 +2,8 @@ - * - * watch.c - watching of files and directories with inotify - * -- * Copyright © 2009 Scott James Remnant <scott@netsplit.com>. -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2011 Scott James Remnant <scott@netsplit.com>. -+ * Copyright © 2011 Canonical Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, as -@@ -71,6 +71,9 @@ - uint32_t events, uint32_t cookie, - const char *name, - int *caught_free); -+static int nih_watch_walk_filter (void *data, const char *path, -+ int is_dir) -+ __attribute__ ((warn_unused_result)); - - - /** -@@ -91,7 +94,7 @@ - * sub-directories will be automatically watched. - * - * Additionally, the set of files and directories within @path can be -- * limited by passing a @filter function which will recieve the paths and -+ * limited by passing a @filter function which will receive the paths and - * may return TRUE to indicate that the path received should not be watched. - * - * When a file is created within @path, or moved from outside this location -@@ -104,7 +107,7 @@ - * files that exist under @path when the watch is first added. This only - * occurs if the watch can be added. - * -- * This is a very high level wrapped around the inotify API; lower levels -+ * This is a very high level wrapper around the inotify API; lower levels - * can be obtained using the inotify API itself and some of the helper - * functions used by this one. - * -@@ -185,6 +188,35 @@ - } - - -+ /** -+ * nih_watch_walk_filter: -+ * @data: NihWatch, -+ * @path: path to file, -+ * @is_dir: TRUE if @path is a directory. -+ * -+ * Callback function for nih_dir_walk(), used by nih_watch_add() to wrap -+ * the user-specified NihFileFilter (watch->filter) with a filter that can -+ * take watch itself as an argument. -+ * -+ * Returns: TRUE if the path should be ignored, FALSE otherwise. -+ **/ -+static int -+nih_watch_walk_filter (void *data, const char *path, int is_dir) -+{ -+ NihWatch *watch; -+ -+ watch = (NihWatch *)data; -+ -+ nih_assert (watch); -+ -+ /* No filter, so accept all files */ -+ if (! watch->filter) -+ return FALSE; -+ -+ return watch->filter (watch->data, path, is_dir); -+} -+ -+ - /** - * nih_watch_handle_by_wd: - * @watch: watch to search, -@@ -295,7 +327,7 @@ - * one; errors within the walk are warned automatically, so if this - * fails, it means we literally couldn't watch the top-level. - */ -- if (subdirs && (nih_dir_walk (path, watch->filter, -+ if (subdirs && (nih_dir_walk (path, nih_watch_walk_filter, - (NihFileVisitor)nih_watch_add_visitor, - NULL, watch) < 0)) { - NihError *err; -@@ -494,12 +526,21 @@ - return; - } - -+ /* Every other event must come with a name */ -+ if (name && *name) { - -- /* Every other event must come with a name. */ -- if ((! name) || strchr (name, '/')) -- return; -+ /* If name refers to a directory, there should be no associated -+ * path - just the name of the path element. -+ */ -+ if (strchr (name, '/')) -+ return; - -- path = NIH_MUST (nih_sprintf (NULL, "%s/%s", handle->path, name)); -+ /* Event occured for file within a watched directory */ -+ path = NIH_MUST (nih_sprintf (NULL, "%s/%s", handle->path, name)); -+ } else { -+ /* File event occured */ -+ path = NIH_MUST (nih_strdup (NULL, handle->path)); -+ } - - /* Check the filter */ - if (watch->filter && watch->filter (watch->data, path, ---- libnih-1.0.3.orig/nih/hash.h -+++ libnih-1.0.3/nih/hash.h -@@ -141,7 +141,7 @@ - * @hash: hash table to iterate, - * @iter: name of iterator variable. - * -- * Expans to nested for statements that iterate over each entry in each -+ * Expands to nested for statements that iterate over each entry in each - * bin of @hash, except for the bin head pointer, setting @iter to each - * entry for the block within the loop. A variable named _@iter_i is used - * to iterate the hash bins. -@@ -203,7 +203,7 @@ - NihKeyFunction key_function, - NihHashFunction hash_function, - NihCmpFunction cmp_function) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NihList * nih_hash_add (NihHash *hash, NihList *entry); - NihList * nih_hash_add_unique (NihHash *hash, NihList *entry); ---- libnih-1.0.3.orig/nih/main.h -+++ libnih-1.0.3/nih/main.h -@@ -138,7 +138,7 @@ - - NihMainLoopFunc *nih_main_loop_add_func (const void *parent, - NihMainLoopCb callback, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - void nih_main_term_signal (void *data, NihSignal *signal); - ---- libnih-1.0.3.orig/nih/command.h -+++ libnih-1.0.3/nih/command.h -@@ -123,7 +123,7 @@ - - NihCommand *nih_command_join (const void *parent, - const NihCommand *a, const NihCommand *b) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih/config.h -+++ libnih-1.0.3/nih/config.h -@@ -140,10 +140,10 @@ - char * nih_config_next_token (const void *parent, const char *file, - size_t len, size_t *pos, size_t *lineno, - const char *delim, int dequote) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * nih_config_next_arg (const void *parent, const char *file, - size_t len, size_t *pos, size_t *lineno) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - void nih_config_next_line (const char *file, size_t len, - size_t *pos, size_t *lineno); - -@@ -155,15 +155,15 @@ - - char ** nih_config_parse_args (const void *parent, const char *file, - size_t len, size_t *pos, size_t *lineno) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * nih_config_parse_command (const void *parent, const char *file, - size_t len, size_t *pos, size_t *lineno) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * nih_config_parse_block (const void *parent, const char *file, - size_t len, size_t *pos, size_t *lineno, - const char *type) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - int nih_config_skip_block (const char *file, size_t len, - size_t *lineno, size_t *pos, - const char *type, size_t *endpos) ---- libnih-1.0.3.orig/nih/io.c -+++ libnih-1.0.3/nih/io.c -@@ -2,8 +2,8 @@ - * - * io.c - file and socket input/output handling - * -- * Copyright © 2009 Scott James Remnant <scott@netsplit.com>. -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2011 Scott James Remnant <scott@netsplit.com>. -+ * Copyright © 2011 Canonical Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, as -@@ -165,6 +165,7 @@ - nih_assert (readfds != NULL); - nih_assert (writefds != NULL); - nih_assert (exceptfds != NULL); -+ nih_assert (*nfds <= FD_SETSIZE); - - nih_io_init (); - -@@ -186,6 +187,9 @@ - *nfds = nih_max (*nfds, watch->fd + 1); - } - } -+ -+ /* Re-check in case we exceeded the limit in the loop */ -+ nih_assert (*nfds <= FD_SETSIZE); - } - - /** -@@ -901,7 +905,7 @@ - * read and placed into the receive buffer or queue, and the reader function - * is called if set. - * -- * Any data or messaages in the send buffer or queue are written out if the -+ * Any data or messages in the send buffer or queue are written out if the - * @events includes NIH_IO_WRITE. - * - * Errors are handled when data is read, and result in the error handled -@@ -1211,7 +1215,7 @@ - * This function is called when the local end of a file descriptor being - * managed by NihIo should be closed. Usually this is because the remote - * end has been closed (without error) but it can also be because no -- * error handler was given -+ * error handler was given. - * - * Normally this just calls the close handler, or if not available, it - * closes the file descriptor and frees the structure (which may be -@@ -1291,7 +1295,7 @@ - * @io: structure to be destroyed. - * - * Closes the file descriptor associated with an NihIo structure so that -- * the structure can be freed. IF an error is caught by closing the -+ * the structure can be freed. If an error is caught by closing the - * descriptor, the error handler is called instead of the error being raised; - * this allows you to group your error handling in one place rather than - * special-case close. ---- libnih-1.0.3.orig/nih/watch.h -+++ libnih-1.0.3/nih/watch.h -@@ -156,7 +156,7 @@ - NihCreateHandler create_handler, - NihModifyHandler modify_handler, - NihDeleteHandler delete_handler, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int nih_watch_add (NihWatch *watch, const char *path, int subdirs) - __attribute__ ((warn_unused_result)); ---- libnih-1.0.3.orig/nih/tree.h -+++ libnih-1.0.3/nih/tree.h -@@ -344,9 +344,9 @@ - - void nih_tree_init (NihTree *tree); - NihTree * nih_tree_new (const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - NihTreeEntry *nih_tree_entry_new (const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NihTree * nih_tree_add (NihTree *tree, NihTree *node, - NihTreeWhere where); ---- libnih-1.0.3.orig/nih/file.c -+++ libnih-1.0.3/nih/file.c -@@ -65,7 +65,7 @@ - /* Prototypes for static functions */ - static char **nih_dir_walk_scan (const char *path, NihFileFilter filter, - void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - static int nih_dir_walk_visit (const char *dirname, NihList *dirs, - const char *path, NihFileFilter filter, - NihFileVisitor visitor, -@@ -619,6 +619,8 @@ - struct dirent *ent; - char **paths; - size_t npaths; -+ int isdir; -+ struct stat statbuf; - - nih_assert (path != NULL); - -@@ -640,7 +642,15 @@ - subpath = NIH_MUST (nih_sprintf (NULL, "%s/%s", - path, ent->d_name)); - -- if (filter && filter (data, subpath, ent->d_type == DT_DIR)) -+ if (ent->d_type == DT_UNKNOWN) { -+ if ( lstat (subpath, &statbuf)) -+ isdir = 0; -+ else -+ isdir = S_ISDIR(statbuf.st_mode); -+ } else -+ isdir = ent->d_type == DT_DIR; -+ -+ if (filter && filter (data, subpath, isdir)) - continue; - - NIH_MUST (nih_str_array_addp (&paths, NULL, &npaths, subpath)); ---- libnih-1.0.3.orig/nih/alloc.c -+++ libnih-1.0.3/nih/alloc.c -@@ -119,8 +119,7 @@ - static inline int nih_alloc_context_free (NihAllocCtx *ctx); - - static inline NihAllocRef *nih_alloc_ref_new (NihAllocCtx *parent, -- NihAllocCtx *child) -- __attribute__ ((malloc)); -+ NihAllocCtx *child); - static inline void nih_alloc_ref_free (NihAllocRef *ref); - static inline NihAllocRef *nih_alloc_ref_lookup (NihAllocCtx *parent, - NihAllocCtx *child); ---- libnih-1.0.3.orig/nih/timer.h -+++ libnih-1.0.3/nih/timer.h -@@ -59,7 +59,7 @@ - * @months: months (1-12), - * @wdays: days of week (0-7). - * -- * Indidcates when scheduled timers should be run, each member is a bit -+ * Indicates when scheduled timers should be run, each member is a bit - * field where the bit is 1 if the timer should be run for that value and - * 0 if not. - **/ -@@ -117,14 +117,14 @@ - - NihTimer *nih_timer_add_timeout (const void *parent, time_t timeout, - NihTimerCb callback, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - NihTimer *nih_timer_add_periodic (const void *parent, time_t period, - NihTimerCb callback, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - NihTimer *nih_timer_add_scheduled (const void *parent, - NihTimerSchedule *schedule, - NihTimerCb callback, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NihTimer *nih_timer_next_due (void); - void nih_timer_poll (void); ---- libnih-1.0.3.orig/nih/config.c -+++ libnih-1.0.3/nih/config.c -@@ -2,8 +2,8 @@ - * - * config.c - configuration file parsing - * -- * Copyright © 2009 Scott James Remnant <scott@netsplit.com>. -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2011 Scott James Remnant <scott@netsplit.com>. -+ * Copyright © 2011 Canonical Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, as -@@ -657,7 +657,7 @@ - * of the returned string are freed, the returned string will also be - * freed. - * -- * Returns: the command found or NULL on raised error. -+ * Returns: the newly allocated command found or NULL on raised error. - **/ - char * - nih_config_parse_command (const void *parent, -@@ -714,7 +714,7 @@ - * @lineno: line number, - * @type: block identifier. - * -- * Extracts a block of text from @line, stopping when the pharse "end @type" -+ * Extracts a block of text from @line, stopping when the phrase "end @type" - * is encountered without any quotes or blackslash escaping within it. - * - * @file may be a memory mapped file, in which case @pos should be given -@@ -950,7 +950,7 @@ - return FALSE; - - /* Must be whitespace after */ -- if (! strchr (NIH_CONFIG_WS, file[p + 3])) -+ if (file[p + 3] && ! strchr (NIH_CONFIG_WS, file[p + 3])) - return FALSE; - - /* Find the second word */ ---- libnih-1.0.3.orig/nih/option.h -+++ libnih-1.0.3/nih/option.h -@@ -124,11 +124,11 @@ - char ** nih_option_parser (const void *parent, - int argc, char *argv[], - NihOption *options, int break_nonopt) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NihOption *nih_option_join (const void *parent, - const NihOption *a, const NihOption *b) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int nih_option_count (NihOption *option, const char *arg); - int nih_option_int (NihOption *option, const char *arg); ---- libnih-1.0.3.orig/nih/signal.h -+++ libnih-1.0.3/nih/signal.h -@@ -76,7 +76,7 @@ - - NihSignal * nih_signal_add_handler (const void *parent, int signum, - NihSignalHandler handler, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - void nih_signal_handler (int signum); - void nih_signal_poll (void); ---- libnih-1.0.3.orig/nih/list.h -+++ libnih-1.0.3/nih/list.h -@@ -37,7 +37,7 @@ - * after a known entry, and remove an entry from the list. - * - * List entries may be created in one of two ways. The most common is to -- * embed the NihList structure as the frist member of your own structure, -+ * embed the NihList structure as the first member of your own structure, - * and initialise it with nih_list_init() after allocating the structure. - * Alternatively you may create NihListEntry structures with - * nih_list_entry_new() and point at your own data from them. -@@ -196,10 +196,10 @@ - - void nih_list_init (NihList *entry); - NihList * nih_list_new (const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NihListEntry *nih_list_entry_new (const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - - NihList * nih_list_add (NihList *list, NihList *entry); ---- libnih-1.0.3.orig/nih/logging.c -+++ libnih-1.0.3/nih/logging.c -@@ -39,11 +39,11 @@ - - - /** -- * __abort_msg: -+ * __nih_abort_msg: - * -- * A glibc variable that keeps the assertion message in the core dump. -+ * A variable that keeps the assertion message in the core dump. - **/ --extern char *__abort_msg __attribute__ ((weak)); -+char *__nih_abort_msg = NULL; - - /** - * logger: -@@ -114,19 +114,16 @@ - * nih_log_abort_message: - * @message: message to be logged. - * -- * Save @message in the glibc __abort_msg variable so it can be retrieved -+ * Save @message in the __nih_abort_msg variable so it can be retrieved - * by debuggers if we should crash at this point. - **/ - static void - nih_log_abort_message (const char *message) - { -- if (! &__abort_msg) -- return; -+ if (__nih_abort_msg) -+ nih_discard (__nih_abort_msg); - -- if (__abort_msg) -- nih_discard (__abort_msg); -- -- __abort_msg = NIH_MUST (nih_strdup (NULL, message)); -+ __nih_abort_msg = NIH_MUST (nih_strdup (NULL, message)); - } - - /** ---- libnih-1.0.3.orig/nih/test_files.h -+++ libnih-1.0.3/nih/test_files.h -@@ -1,7 +1,7 @@ - /* libnih - * -- * Copyright © 2009 Scott James Remnant <scott@netsplit.com>. -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2011 Scott James Remnant <scott@netsplit.com>. -+ * Copyright © 2011 Canonical Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, as -@@ -39,7 +39,7 @@ - * TEST_FILENAME: - * @_var: variable to store filename in. - * -- * Generate a filename that may be used for testing, it's unlinked it if -+ * Generate a filename that may be used for testing, it's unlinked if it - * exists and it's up to you to unlink it when done. @_var should be at - * least PATH_MAX long. - **/ ---- libnih-1.0.3.orig/nih/test_process.h -+++ libnih-1.0.3/nih/test_process.h -@@ -36,7 +36,7 @@ - * Spawn a child in which a test can be performed without affecting the - * main flow of the process. The pid of the child is stored in @_pid. - * -- * This macro ensures that the child has begun exectution before the -+ * This macro ensures that the child has begun execution before the - * parent is allowed to continue through the usual use of a pipe. - * - * A block of code should follow this macro, which is the code that will ---- libnih-1.0.3.orig/nih/child.h -+++ libnih-1.0.3/nih/child.h -@@ -98,7 +98,7 @@ - NihChildWatch *nih_child_add_watch (const void *parent, pid_t pid, - NihChildEvents events, - NihChildHandler handler, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - void nih_child_poll (void); - ---- libnih-1.0.3.orig/nih/alloc.h -+++ libnih-1.0.3/nih/alloc.h -@@ -299,7 +299,7 @@ - * It is permissible to take references to foo within its scope, or by - * functions called, in which case it will not be freed. Also it is - * generally nonsensical to allocate with a parent, since this too will -- * prevent it from beign freed. -+ * prevent it from being freed. - **/ - #define nih_local __attribute__ ((cleanup(_nih_discard_local))) - -@@ -307,11 +307,11 @@ - NIH_BEGIN_EXTERN - - void * nih_alloc (const void *parent, size_t size) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - void * nih_realloc (void *ptr, const void *parent, - size_t size) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int nih_free (void *ptr); - int nih_discard (void *ptr); ---- libnih-1.0.3.orig/nih/io.h -+++ libnih-1.0.3/nih/io.h -@@ -269,7 +269,7 @@ - NihIoWatch * nih_io_add_watch (const void *parent, int fd, - NihIoEvents events, - NihIoWatcher watcher, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - void nih_io_select_fds (int *nfds, fd_set *readfds, - fd_set *writefds, fd_set *exceptfds); -@@ -278,12 +278,12 @@ - - - NihIoBuffer * nih_io_buffer_new (const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int nih_io_buffer_resize (NihIoBuffer *buffer, size_t grow); - char * nih_io_buffer_pop (const void *parent, - NihIoBuffer *buffer, size_t *len) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - void nih_io_buffer_shrink (NihIoBuffer *buffer, size_t len); - int nih_io_buffer_push (NihIoBuffer *buffer, - const char *str, size_t len) -@@ -291,7 +291,7 @@ - - - NihIoMessage *nih_io_message_new (const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int nih_io_message_add_control (NihIoMessage *message, int level, - int type, socklen_t len, -@@ -300,7 +300,7 @@ - - NihIoMessage *nih_io_message_recv (const void *parent, int fd, - size_t *len) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - ssize_t nih_io_message_send (NihIoMessage *message, int fd) - __attribute__ ((warn_unused_result)); - -@@ -310,7 +310,7 @@ - NihIoCloseHandler close_handler, - NihIoErrorHandler error_handler, - void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - void nih_io_shutdown (NihIo *io); - int nih_io_destroy (NihIo *io); - -@@ -319,14 +319,14 @@ - - char * nih_io_read (const void *parent, NihIo *io, - size_t *len) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - int nih_io_write (NihIo *io, const char *str, - size_t len) - __attribute__ ((warn_unused_result)); - - char * nih_io_get (const void *parent, NihIo *io, - const char *delim) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int nih_io_printf (NihIo *io, const char *format, ...) - __attribute__ ((warn_unused_result, format (printf, 2, 3))); ---- libnih-1.0.3.orig/nih/test_output.h -+++ libnih-1.0.3/nih/test_output.h -@@ -61,10 +61,10 @@ - - /** - * TEST_FEATURE: -- * @_feat: name of function feature being tested. -+ * @_feat: name of function or group feature being tested. - * -- * Output a message indicating that a sub-test of a function is being -- * performed, specifically the feature named _feat. -+ * Output a message indicating that a sub-test of a function or -+ * group is being performed, specifically the feature named _feat. - **/ - #define TEST_FEATURE(_feat) \ - printf ("...%s\n", _feat); ---- libnih-1.0.3.orig/nih/error.h -+++ libnih-1.0.3/nih/error.h -@@ -1,7 +1,7 @@ - /* libnih - * -- * Copyright © 2009 Scott James Remnant <scott@netsplit.com>. -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2011 Scott James Remnant <scott@netsplit.com>. -+ * Copyright © 2011 Canonical Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, as -@@ -111,7 +111,7 @@ - * @message: human-readable message. - * - * Raises an error with the given details in the current error context, -- * if an unhandled error already exists then an error message is emmitted -+ * if an unhandled error already exists then an error message is emitted - * through the logging system; you should try to avoid this. - * - * @message should be a static string, as it will not be freed when the -@@ -126,7 +126,7 @@ - * @format: format string for human-readable message. - * - * Raises an error with the given details in the current error context, -- * if an unhandled error already exists then an error message is emmitted -+ * if an unhandled error already exists then an error message is emitted - * through the logging system; you should try to avoid this. - * - * The human-readable message for the error is parsed according to @format, -@@ -140,7 +140,7 @@ - * nih_error_raise_system: - * - * Raises an error with details taken from the current value of errno, -- * if an unhandled error already exists then an error message is emmitted -+ * if an unhandled error already exists then an error message is emitted - * through the logging system; you should try to avoid this. - **/ - #define nih_error_raise_system() \ -@@ -162,7 +162,7 @@ - * @error: existing object to raise. - * - * Raises the existing error object in the current error context, -- * if an unhandled error already exists then an error message is emmitted -+ * if an unhandled error already exists then an error message is emitted - * through the logging system; you should try to avoid this. - * - * This is normally used to raise a taken error that has not been handled, -@@ -182,7 +182,7 @@ - * @message: human-readable message. - * - * Raises an error with the given details in the current error context, -- * if an unhandled error already exists then an error message is emmitted -+ * if an unhandled error already exists then an error message is emitted - * through the logging system; you should try to avoid this. - * - * Will return from the current function with @retval, which may be left -@@ -199,7 +199,7 @@ - * @retval: return value for function. - * - * Raises an error with details taken from the current value of errno, -- * if an unhandled error already exists then an error message is emmitted -+ * if an unhandled error already exists then an error message is emitted - * through the logging system; you should try to avoid this. - * - * Will return from the current function with @retval, which may be left ---- libnih-1.0.3.orig/nih/string.h -+++ libnih-1.0.3/nih/string.h -@@ -35,60 +35,60 @@ - NIH_BEGIN_EXTERN - - char * nih_sprintf (const void *parent, const char *format, ...) -- __attribute__ ((format (printf, 2, 3), warn_unused_result, malloc)); -+ __attribute__ ((format (printf, 2, 3), warn_unused_result)); - - char * nih_vsprintf (const void *parent, const char *format, - va_list args) -- __attribute__ ((format (printf, 2, 0), warn_unused_result, malloc)); -+ __attribute__ ((format (printf, 2, 0), warn_unused_result)); - - char * nih_strdup (const void *parent, const char *str) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * nih_strndup (const void *parent, const char *str, size_t len) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * nih_strcat (char **str, const void *parent, const char *src) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * nih_strncat (char **str, const void *parent, const char *src, - size_t len) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * nih_strcat_sprintf (char **str, const void *parent, - const char *format, ...) -- __attribute__ ((format (printf, 3, 4), warn_unused_result, malloc)); -+ __attribute__ ((format (printf, 3, 4), warn_unused_result)); - char * nih_strcat_vsprintf (char **str, const void *parent, - const char *format, va_list args) -- __attribute__ ((format (printf, 3, 0), warn_unused_result, malloc)); -+ __attribute__ ((format (printf, 3, 0), warn_unused_result)); - - char **nih_str_split (const void *parent, const char *str, - const char *delim, int repeat) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char **nih_str_array_new (const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char **nih_str_array_add (char ***array, const void *parent, size_t *len, - const char *str) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char **nih_str_array_addn (char ***array, const void *parent, size_t *len, - const char *str, size_t strlen) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char **nih_str_array_addp (char ***array, const void *parent, size_t *len, - void *ptr) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char **nih_str_array_copy (const void *parent, size_t *len, - char * const *array) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char **nih_str_array_append (char ***array, const void *parent, size_t *len, - char * const *args) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * nih_str_wrap (const void *parent, const char *str, size_t len, - size_t first_indent, size_t indent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - size_t nih_str_screen_width (void); - char * nih_str_screen_wrap (const void *parent, const char *str, - size_t first_indent, size_t indent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih/string.c -+++ libnih-1.0.3/nih/string.c -@@ -405,7 +405,7 @@ - const char *ptr; - - /* Skip initial delimiters */ -- while (repeat && strchr (delim, *str)) -+ while (repeat && *str && strchr (delim, *str)) - str++; - - /* Find the end of the token */ -@@ -413,6 +413,13 @@ - while (*str && (! strchr (delim, *str))) - str++; - -+ /* Don't create an empty string array element in repeat -+ * mode if there is no token (as a result of a -+ * duplicated delimiter character). -+ */ -+ if (repeat && (str == ptr)) -+ continue; -+ - if (! nih_str_array_addn (&array, parent, &len, - ptr, str - ptr)) { - nih_free (array); ---- libnih-1.0.3.orig/nih/file.h -+++ libnih-1.0.3/nih/file.h -@@ -82,7 +82,7 @@ - - char *nih_file_read (const void *parent, const char *path, - size_t *length) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - void *nih_file_map (const char *path, int flags, size_t *length) - __attribute__ ((warn_unused_result)); ---- libnih-1.0.3.orig/nih/tests/test_option.c -+++ libnih-1.0.3/nih/tests/test_option.c -@@ -1574,7 +1574,7 @@ - output = tmpfile (); - TEST_CHILD (pid) { - TEST_DIVERT_STDOUT (output) { -- char **args; -+ char **args __attribute__((unused)); - - args = nih_option_parser (NULL, argc, argv, - options, FALSE); -@@ -1652,7 +1652,7 @@ - unsetenv ("COLUMNS"); - - TEST_DIVERT_STDOUT (output) { -- char **args; -+ char **args __attribute__((unused)); - - args = nih_option_parser (NULL, argc, argv, - options, FALSE); ---- libnih-1.0.3.orig/nih/tests/test_logging.c -+++ libnih-1.0.3/nih/tests/test_logging.c -@@ -31,7 +31,7 @@ - #include <nih/main.h> - - --extern char *__abort_msg __attribute__ ((weak)); -+extern char *__nih_abort_msg; - - static NihLogLevel last_priority = NIH_LOG_UNKNOWN; - static char * last_message = NULL; -@@ -156,68 +156,63 @@ - } - - -- /* Check that a fatal message is also stored in the glibc __abort_msg -+ /* Check that a fatal message is also stored in the __nih_abort_msg - * variable. - */ -- if (&__abort_msg) { -- TEST_FEATURE ("with fatal message"); -- TEST_ALLOC_FAIL { -- __abort_msg = NULL; -- last_priority = NIH_LOG_UNKNOWN; -- last_message = NULL; -- -- ret = nih_log_message (NIH_LOG_FATAL, -- "message with %s %d formatting", -- "some", 20); -- -- TEST_EQ (ret, 0); -- TEST_EQ (last_priority, NIH_LOG_FATAL); -- TEST_EQ_STR (last_message, "message with some 20 formatting"); -- -- TEST_NE_P (__abort_msg, NULL); -- TEST_ALLOC_PARENT (__abort_msg, NULL); -- TEST_EQ_STR (__abort_msg, "message with some 20 formatting"); -+ TEST_FEATURE ("with fatal message"); -+ TEST_ALLOC_FAIL { -+ __nih_abort_msg = NULL; -+ last_priority = NIH_LOG_UNKNOWN; -+ last_message = NULL; - -- free (last_message); -- } -+ ret = nih_log_message (NIH_LOG_FATAL, -+ "message with %s %d formatting", -+ "some", 20); - -+ TEST_EQ (ret, 0); -+ TEST_EQ (last_priority, NIH_LOG_FATAL); -+ TEST_EQ_STR (last_message, "message with some 20 formatting"); - -- /* Check that a fatal message can safely overwrite one already stored -- * in the glibc __abort_msg variable. -- */ -- TEST_FEATURE ("with second fatal message"); -- TEST_ALLOC_FAIL { -- TEST_ALLOC_SAFE { -- msg = nih_strdup (NULL, "test"); -- } -- -- __abort_msg = msg; -- TEST_FREE_TAG (msg); -- -- last_priority = NIH_LOG_UNKNOWN; -- last_message = NULL; -- -- ret = nih_log_message (NIH_LOG_FATAL, -- "message with %s %d formatting", -- "some", 20); -- -- TEST_EQ (ret, 0); -- TEST_EQ (last_priority, NIH_LOG_FATAL); -- TEST_EQ_STR (last_message, "message with some 20 formatting"); -- -- TEST_FREE (msg); -- -- TEST_NE_P (__abort_msg, NULL); -- TEST_ALLOC_PARENT (__abort_msg, NULL); -- TEST_EQ_STR (__abort_msg, "message with some 20 formatting"); -+ TEST_NE_P (__nih_abort_msg, NULL); -+ TEST_ALLOC_PARENT (__nih_abort_msg, NULL); -+ TEST_EQ_STR (__nih_abort_msg, "message with some 20 formatting"); - -- free (last_message); -- } -- } else { -- printf ("SKIP: __abort_msg not available\n"); -+ free (last_message); - } - - -+ /* Check that a fatal message can safely overwrite one already stored -+ * in the __nih_abort_msg variable. -+ */ -+ TEST_FEATURE ("with second fatal message"); -+ TEST_ALLOC_FAIL { -+ TEST_ALLOC_SAFE { -+ msg = nih_strdup (NULL, "test"); -+ } -+ -+ __nih_abort_msg = msg; -+ TEST_FREE_TAG (msg); -+ -+ last_priority = NIH_LOG_UNKNOWN; -+ last_message = NULL; -+ -+ ret = nih_log_message (NIH_LOG_FATAL, -+ "message with %s %d formatting", -+ "some", 20); -+ -+ TEST_EQ (ret, 0); -+ TEST_EQ (last_priority, NIH_LOG_FATAL); -+ TEST_EQ_STR (last_message, "message with some 20 formatting"); -+ -+ TEST_FREE (msg); -+ -+ TEST_NE_P (__nih_abort_msg, NULL); -+ TEST_ALLOC_PARENT (__nih_abort_msg, NULL); -+ TEST_EQ_STR (__nih_abort_msg, "message with some 20 formatting"); -+ -+ free (last_message); -+ } -+ - /* Check that the nih_debug macro wraps the call properly and - * includes the function in which the message occurred. - */ ---- libnih-1.0.3.orig/nih/tests/test_hash.c -+++ libnih-1.0.3/nih/tests/test_hash.c -@@ -470,7 +470,8 @@ - test_lookup (void) - { - NihHash *hash; -- NihList *entry1, *entry2, *entry3, *ptr; -+ NihList *entry1, *entry2, *ptr; -+ NihList *entry3 __attribute__((unused)); - - TEST_FUNCTION ("nih_hash_lookup"); - hash = nih_hash_string_new (NULL, 0); ---- libnih-1.0.3.orig/nih/tests/test_main.c -+++ libnih-1.0.3/nih/tests/test_main.c -@@ -457,7 +457,7 @@ - test_main_loop (void) - { - NihMainLoopFunc *func; -- NihTimer *timer; -+ NihTimer *timer __attribute__((unused)); - int ret; - - /* Check that we can run through the main loop, and that the ---- libnih-1.0.3.orig/nih/tests/test_watch.c -+++ libnih-1.0.3/nih/tests/test_watch.c -@@ -2,8 +2,8 @@ - * - * test_watch.c - test suite for nih/watch.c - * -- * Copyright © 2009 Scott James Remnant <scott@netsplit.com>. -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2011 Scott James Remnant <scott@netsplit.com>. -+ * Copyright © 2011 Canonical Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, as -@@ -39,6 +39,8 @@ - #include <nih/error.h> - #include <nih/logging.h> - -+/* Read "The Hitchhikers Guide to the Galaxy" */ -+#define FILTER_VALUE 42 - - static int - my_filter (void *data, -@@ -54,6 +56,26 @@ - return FALSE; - } - -+/* Set by my_filter2 () so it knows if it has already been called */ -+static int my_filter2_called = 0; -+ -+static int -+my_filter2 (int *value, -+ const char *path, -+ int is_dir) -+{ -+ /* we only want to toggle the value once */ -+ if (my_filter2_called) -+ return TRUE; -+ -+ my_filter2_called = 1; -+ -+ nih_assert (value && *value == FILTER_VALUE); -+ *value = 0; -+ -+ return FALSE; -+} -+ - static int create_called = 0; - static int modify_called = 0; - static int delete_called = 0; -@@ -553,6 +575,44 @@ - nih_free (watch); - } - -+ /* Ensure the file filter gets passed the correct data pointer. -+ */ -+ TEST_FEATURE ("with filter and data"); -+ -+ /* Ensure we have a new directory */ -+ TEST_FILENAME (dirname); -+ mkdir (dirname, 0755); -+ -+ /* Create a single file */ -+ strcpy (filename, dirname); -+ strcat (filename, "/foo"); -+ -+ fd = fopen (filename, "w"); -+ fprintf (fd, "test\n"); -+ fclose (fd); -+ -+ TEST_ALLOC_FAIL { -+ int watch_data = FILTER_VALUE; -+ -+ /* Reset required to appease TEST_ALLOC_FAIL */ -+ my_filter2_called = 0; -+ -+ watch = nih_watch_new (NULL, dirname, -+ TRUE, TRUE, -+ (NihFileFilter)my_filter2, -+ NULL, NULL, NULL, -+ &watch_data); -+ -+ TEST_NE_P (watch, NULL); -+ -+ /* Ensure the filter was called and changed the value */ -+ -+ TEST_NE (my_filter2_called, 0); -+ TEST_EQ (watch_data, 0); -+ -+ nih_free (watch); -+ } -+ - strcpy (filename, dirname); - strcat (filename, "/bar"); - chmod (filename, 0755); -@@ -946,13 +1006,82 @@ - nih_error_init (); - - TEST_FILENAME (dirname); -- mkdir (dirname, 0755); -+ TEST_EQ (mkdir (dirname, 0755), 0); - -- watch = nih_watch_new (NULL, dirname, TRUE, TRUE, my_filter, -- my_create_handler, my_modify_handler, -+ TEST_FEATURE ("with watched file"); -+ strcpy (filename, dirname); -+ strcat (filename, "/foo"); -+ -+ /* Create file first since we don't set a create handler on the -+ * watch. -+ */ -+ fd = fopen (filename, "w"); -+ fprintf (fd, "bar\n"); -+ fclose (fd); -+ -+ create_called = 0; -+ modify_called = 0; -+ delete_called = 0; -+ logger_called = 0; -+ last_path = NULL; -+ last_watch = NULL; -+ last_data = NULL; -+ -+ watch = nih_watch_new (NULL, filename, FALSE, FALSE, NULL, -+ NULL, my_modify_handler, - my_delete_handler, &watch); -+ TEST_NE_P (watch, NULL); -+ -+ /* Now, modify the existing file to trigger the modify handler. */ -+ fd = fopen (filename, "a+"); -+ fprintf (fd, "baz\n"); -+ fclose (fd); -+ -+ nfds = 0; -+ FD_ZERO (&readfds); -+ FD_ZERO (&writefds); -+ FD_ZERO (&exceptfds); -+ -+ nih_io_select_fds (&nfds, &readfds, &writefds, &exceptfds); -+ select (nfds, &readfds, &writefds, &exceptfds, NULL); -+ nih_io_handle_fds (&readfds, &writefds, &exceptfds); -+ -+ TEST_EQ_STR (watch->path, filename); -+ -+ /* Ensure no regression to old behaviour (LP:#777097) */ -+ TEST_NE (last_path[ strlen(last_path) - 1 ], '/'); -+ -+ TEST_EQ_STR (last_path, filename); -+ TEST_EQ (modify_called, 1); -+ -+ unlink (filename); -+ -+ nfds = 0; -+ FD_ZERO (&readfds); -+ FD_ZERO (&writefds); -+ FD_ZERO (&exceptfds); -+ -+ nih_io_select_fds (&nfds, &readfds, &writefds, &exceptfds); -+ select (nfds, &readfds, &writefds, &exceptfds, NULL); -+ nih_io_handle_fds (&readfds, &writefds, &exceptfds); - -+ TEST_EQ (delete_called, 1); - -+ rmdir (filename); -+ nih_free (last_path); -+ -+ create_called = 0; -+ modify_called = 0; -+ delete_called = 0; -+ logger_called = 0; -+ last_path = NULL; -+ last_watch = NULL; -+ last_data = NULL; -+ -+ -+ watch = nih_watch_new (NULL, dirname, TRUE, TRUE, my_filter, -+ my_create_handler, my_modify_handler, -+ my_delete_handler, &watch); - /* Check that creating a file within the directory being watched - * results in the create handler being called, and passed the full - * path of the created file to it. ---- libnih-1.0.3.orig/nih/tests/test_string.c -+++ libnih-1.0.3/nih/tests/test_string.c -@@ -619,6 +619,215 @@ - nih_free (array); - } - -+ TEST_FEATURE ("with no repeat and multiple identical delimiter " -+ "characters at string start"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "\t\tthis is a test", " \t", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 7); -+ for (i = 0; i < 6; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], ""); -+ TEST_EQ_STR (array[1], ""); -+ TEST_EQ_STR (array[2], "this"); -+ TEST_EQ_STR (array[3], "is"); -+ TEST_EQ_STR (array[4], "a"); -+ TEST_EQ_STR (array[5], "test"); -+ TEST_EQ_P (array[6], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with no repeat and multiple different delimiter " -+ "characters at string start"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, " \tthis is a test", " \t", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 7); -+ for (i = 0; i < 6; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], ""); -+ TEST_EQ_STR (array[1], ""); -+ TEST_EQ_STR (array[2], "this"); -+ TEST_EQ_STR (array[3], "is"); -+ TEST_EQ_STR (array[4], "a"); -+ TEST_EQ_STR (array[5], "test"); -+ TEST_EQ_P (array[6], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with no repeat and multiple identical delimiter " -+ "characters within string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "this is a\t\ttest", " \t", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 8); -+ for (i = 0; i < 7; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "this"); -+ TEST_EQ_STR (array[1], "is"); -+ TEST_EQ_STR (array[2], ""); -+ TEST_EQ_STR (array[3], ""); -+ TEST_EQ_STR (array[4], "a"); -+ TEST_EQ_STR (array[5], ""); -+ TEST_EQ_STR (array[6], "test"); -+ TEST_EQ_P (array[7], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with no repeat and multiple different delimiter " -+ "characters within string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "this is \n\ta\ttest", " \t\n", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 7); -+ for (i = 0; i < 6; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "this"); -+ TEST_EQ_STR (array[1], "is"); -+ TEST_EQ_STR (array[2], ""); -+ TEST_EQ_STR (array[3], ""); -+ TEST_EQ_STR (array[4], "a"); -+ TEST_EQ_STR (array[5], "test"); -+ TEST_EQ_P (array[6], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with no repeat and multiple identical delimiter " -+ "characters at string end"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "this is a test ", " \t", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 6); -+ for (i = 0; i < 5; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "this"); -+ TEST_EQ_STR (array[1], "is"); -+ TEST_EQ_STR (array[2], "a"); -+ TEST_EQ_STR (array[3], "test"); -+ TEST_EQ_STR (array[4], ""); -+ TEST_EQ_P (array[5], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with no repeat and multiple different delimiter " -+ "characters at string end"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "this is a test \t", " \t", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 6); -+ for (i = 0; i < 5; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "this"); -+ TEST_EQ_STR (array[1], "is"); -+ TEST_EQ_STR (array[2], "a"); -+ TEST_EQ_STR (array[3], "test"); -+ TEST_EQ_STR (array[4], ""); -+ TEST_EQ_P (array[5], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with no repeat and multiple identical delimiter " -+ "characters at beginning, middle and end of string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, " this is\n\n\na test\t\t\t", " \t\n", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 12); -+ for (i = 0; i < 11; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], ""); -+ TEST_EQ_STR (array[1], ""); -+ TEST_EQ_STR (array[2], ""); -+ TEST_EQ_STR (array[3], "this"); -+ TEST_EQ_STR (array[4], "is"); -+ TEST_EQ_STR (array[5], ""); -+ TEST_EQ_STR (array[6], ""); -+ TEST_EQ_STR (array[7], "a"); -+ TEST_EQ_STR (array[8], "test"); -+ TEST_EQ_STR (array[9], ""); -+ TEST_EQ_STR (array[10], ""); -+ TEST_EQ_P (array[11], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with no repeat and multiple different delimiter " -+ "characters at beginning, middle and end of string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, ": \nthis is\t \n:a test:\n ", "\n :\t", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 13); -+ for (i = 0; i < 12; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], ""); -+ TEST_EQ_STR (array[1], ""); -+ TEST_EQ_STR (array[2], ""); -+ TEST_EQ_STR (array[3], "this"); -+ TEST_EQ_STR (array[4], "is"); -+ TEST_EQ_STR (array[5], ""); -+ TEST_EQ_STR (array[6], ""); -+ TEST_EQ_STR (array[7], ""); -+ TEST_EQ_STR (array[8], "a"); -+ TEST_EQ_STR (array[9], "test"); -+ TEST_EQ_STR (array[10], ""); -+ TEST_EQ_STR (array[11], ""); -+ TEST_EQ_P (array[12], NULL); -+ -+ nih_free (array); -+ } - - /* Check that we can split a string treating multiple consecutive - * matching characters as a single separator to be skipped. -@@ -645,6 +854,177 @@ - nih_free (array); - } - -+ /* Check that we can split a string containing multiple -+ * occurences of one of the delimiter characters at the -+ * beginning of the string. -+ */ -+ TEST_FEATURE ("with repeat and multiple identical adjacent delimiter characters at string start"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "\n\nhello", " \t\r\n", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 2); -+ for (i = 0; i < 1; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_P (array[1], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with repeat and multiple different adjacent delimiter characters at string start"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "\n\r hello", " \t\r\n", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 2); -+ for (i = 0; i < 1; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_P (array[1], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with repeat and multiple identical adjacent delimiter " -+ "characters within string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "hello\n\rworld", " \t\n\r", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 3); -+ for (i = 0; i < 2; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_STR (array[1], "world"); -+ TEST_EQ_P (array[2], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with repeat and multiple different adjacent delimiter " -+ "characters within string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "hello\n\r\tworld", " \t\n\r", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 3); -+ for (i = 0; i < 2; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_STR (array[1], "world"); -+ TEST_EQ_P (array[2], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with repeat and multiple identical adjacent delimiter " -+ "characters at string end"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "hello\n\n\n\n\n\n\n", " \t\r\n", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 2); -+ for (i = 0; i < 1; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_P (array[1], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with repeat and multiple different adjacent delimiter " -+ "characters at string end"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "hello \r\t\r\t\n ", " \t\r\n", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 2); -+ for (i = 0; i < 1; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_P (array[1], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with repeat and multiple identical adjacent delimiter " -+ "characters at beginning, middle and end of string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, -+ " hello\n\n\n, world\n\n\n", -+ "\r\t\n ", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 4); -+ for (i = 0; i < 3; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_STR (array[1], ","); -+ TEST_EQ_STR (array[2], "world"); -+ TEST_EQ_P (array[3], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with repeat and multiple different adjacent delimiter " -+ "characters at beginning, middle and end of string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, -+ "\n \r\thello\n\n\r , \n\t\rworld\t \r\n \n", -+ " \t\n\r", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 4); -+ for (i = 0; i < 3; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_STR (array[1], ","); -+ TEST_EQ_STR (array[2], "world"); -+ TEST_EQ_P (array[3], NULL); -+ -+ nih_free (array); -+ } - - /* Check that we can give an empty string, and end up with a - * one-element array that only contains a NULL pointer. ---- libnih-1.0.3.orig/nih/tests/test_file.c -+++ libnih-1.0.3/nih/tests/test_file.c -@@ -724,6 +724,25 @@ - return FALSE; - } - -+/* find only frodo files */ -+static int -+my_filter_frodo_file (void *data, -+ const char *path, -+ int is_dir) -+{ -+ char *slash; -+ -+ if (is_dir) -+ return FALSE; -+ -+ slash = strrchr (path, '/'); -+ if (strcmp (slash, "/frodo")) -+ return TRUE; -+ -+ return FALSE; -+} -+ -+ - static int logger_called = 0; - - static int -@@ -905,6 +924,48 @@ - TEST_EQ_STR (v->path, filename); - - nih_free (visited); -+ -+ /* Try also inverse filter */ -+ TEST_ALLOC_SAFE { -+ visitor_called = 0; -+ visited = nih_list_new (NULL); -+ } -+ -+ ret = nih_dir_walk (dirname, my_filter_frodo_file, -+ my_visitor, NULL, &ret); -+ -+ TEST_EQ (ret, 0); -+ TEST_EQ (visitor_called, 4); -+ -+ v = (Visited *)visited->next; -+ TEST_EQ (v->data, &ret); -+ TEST_EQ_STR (v->dirname, dirname); -+ strcpy (filename, dirname); -+ strcat (filename, "/bar"); -+ TEST_EQ_STR (v->path, filename); -+ -+ v = (Visited *)v->entry.next; -+ TEST_EQ (v->data, &ret); -+ TEST_EQ_STR (v->dirname, dirname); -+ strcpy (filename, dirname); -+ strcat (filename, "/bar/frodo"); -+ TEST_EQ_STR (v->path, filename); -+ -+ v = (Visited *)v->entry.next; -+ TEST_EQ (v->data, &ret); -+ TEST_EQ_STR (v->dirname, dirname); -+ strcpy (filename, dirname); -+ strcat (filename, "/baz"); -+ TEST_EQ_STR (v->path, filename); -+ -+ v = (Visited *)v->entry.next; -+ TEST_EQ (v->data, &ret); -+ TEST_EQ_STR (v->dirname, dirname); -+ strcpy (filename, dirname); -+ strcat (filename, "/frodo"); -+ TEST_EQ_STR (v->path, filename); -+ -+ nih_free (visited); - } - - ---- libnih-1.0.3.orig/debian/control -+++ libnih-1.0.3/debian/control -@@ -0,0 +1,81 @@ -+Source: libnih -+Section: libs -+Priority: required -+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> -+XSBC-Original-Maintainer: Scott James Remnant <scott@netsplit.com> -+Standards-Version: 3.9.4 -+Build-Depends: debhelper (>= 9), pkg-config (>= 0.22), libdbus-1-dev (>= 1.4), libexpat1-dev (>= 2.0.0), dbus (>= 1.4), libc6-dev (>= 2.15~) | libc6.1-dev (>= 2.15~), -+ dh-autoreconf, autopoint, dpkg-dev (>= 1.16.1~) -+# To cross build this package also needs: libdbus-1-dev:native (>= 1.4), libexpat1-dev:native (>= 2.0.0) -+# But :native build-deps are not supported yet, so instead one can do -+# $ apt-get build-dep libnih -+# $ apt-get build-dep libnih -aarmhf -+# instead to get all required build-deps -+Vcs-Bzr: lp:ubuntu/libnih -+XSC-Debian-Vcs-Git: git://git.debian.org/git/collab-maint/libnih.git -+XSC-Debian-Vcs-Browser: http://git.debian.org/?p=collab-maint/libnih.git;a=summary -+Homepage: https://launchpad.net/libnih -+ -+Package: libnih1 -+Architecture: any -+Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends}, ${misc:Depends} -+Multi-Arch: same -+Description: NIH Utility Library -+ libnih is a light-weight "standard library" of C functions to ease the -+ development of other libraries and applications, especially those -+ normally found in /lib. -+ . -+ This package contains the shared library. -+ -+Package: libnih-dev -+Priority: optional -+Section: libdevel -+Architecture: any -+Multi-Arch: same -+Depends: libnih1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -+Description: NIH Utility Library (development files) -+ libnih is a light-weight "standard library" of C functions to ease the -+ development of other libraries and applications, especially those -+ normally found in /lib. -+ . -+ This package contains the static library and C header files which are -+ needed for developing software using libnih. -+ -+Package: libnih-dbus1 -+Architecture: any -+Pre-Depends: ${misc:Pre-Depends} -+Depends: libnih1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -+Multi-Arch: same -+Description: NIH D-Bus Bindings Library -+ libnih-dbus is a D-Bus bindings library that integrates with the main -+ loop provided by libnih. -+ . -+ This package contains the shared library. -+ -+Package: libnih-dbus-dev -+Priority: optional -+Section: libdevel -+Architecture: any -+Multi-Arch: same -+Depends: libnih-dbus1 (= ${binary:Version}), libnih-dev (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -+Recommends: nih-dbus-tool (= ${binary:Version}) -+Description: NIH D-Bus Bindings Library (development files) -+ libnih-dbus is a D-Bus bindings library that integrates with the main -+ loop provided by libnih. -+ . -+ This package contains the static library and C header files which are -+ needed for developing software using libnih-dbus. -+ -+Package: nih-dbus-tool -+Section: devel -+Architecture: any -+Multi-Arch: foreign -+Depends: ${shlibs:Depends}, ${misc:Depends} -+Recommends: libnih-dbus-dev (= ${binary:Version}) -+Description: NIH D-Bus Binding Tool -+ nih-dbus-tool generates C source code from the D-Bus Introspection XML -+ data provided by most services; either to make implementing the -+ described objects in C programs or to make proxying to the described -+ remote objects easier. -+ . -+ The generated code requires libnih-dbus-dev to be compiled. ---- libnih-1.0.3.orig/debian/libnih-dev.install -+++ libnih-1.0.3/debian/libnih-dev.install -@@ -0,0 +1,6 @@ -+lib/*/libnih.a -+lib/*/libnih.so -+usr/include/libnih.h -+usr/include/nih -+usr/lib/*/pkgconfig/libnih.pc -+usr/share/aclocal/libnih.m4 ---- libnih-1.0.3.orig/debian/libnih1.docs -+++ libnih-1.0.3/debian/libnih1.docs -@@ -0,0 +1,3 @@ -+AUTHORS -+NEWS -+README ---- libnih-1.0.3.orig/debian/libnih-dbus1.install -+++ libnih-1.0.3/debian/libnih-dbus1.install -@@ -0,0 +1 @@ -+lib/*/libnih-dbus.so.* ---- libnih-1.0.3.orig/debian/libnih1.install -+++ libnih-1.0.3/debian/libnih1.install -@@ -0,0 +1 @@ -+lib/*/libnih.so.* ---- libnih-1.0.3.orig/debian/rules -+++ libnih-1.0.3/debian/rules -@@ -0,0 +1,54 @@ -+#!/usr/bin/make -f -+ -+include /usr/share/dpkg/architecture.mk -+ -+%: -+ dh $@ --with autoreconf -+ -+ -+CFLAGS := -Wall -fstack-protector -fPIE $(shell dpkg-buildflags --get CFLAGS) -+LDFLAGS := -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -pie $(shell dpkg-buildflags --get LDFLAGS) -+ -+override_dh_auto_configure: -+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) -+ dh_auto_configure -- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ -+ --libdir=/lib/$(DEB_HOST_MULTIARCH) -+else -+ dh_auto_configure -B build-dbus-tool/ -- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ -+ --libdir=/lib/$(DEB_BUILD_MULTIARCH) \ -+ --host=$(DEB_BUILD_GNU_TYPE) -+ dh_auto_build -B build-dbus-tool/ --parallel -+ dh_auto_configure -- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ -+ NIH_DBUS_TOOL=$(CURDIR)/build-dbus-tool/nih-dbus-tool/nih-dbus-tool \ -+ --libdir=/lib/$(DEB_HOST_MULTIARCH) -+endif -+ -+override_dh_auto_build: -+ dh_auto_build --parallel -+ -+override_dh_auto_test: -+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) -+ dh_auto_test --parallel -+endif -+ -+override_dh_auto_install: -+ dh_auto_install -- pkgconfigdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -+ -+override_dh_makeshlibs: -+ dh_makeshlibs -plibnih1 -V 'libnih1 (>= 1.0.0)' -+ dh_makeshlibs -plibnih-dbus1 -V 'libnih-dbus1 (>= 1.0.0)' -+ dh_makeshlibs -Nlibnih1 -Nlibnih-dbus1 -+ -+override_dh_shlibdeps: -+ dh_shlibdeps -+ sed -i 's/2\.14/2.15/' debian/*.substvars -+ sed -i 's/>= 2.15)/>= 2.15~)/g' debian/*.substvars -+ -+ -+# Symlink /usr/share/doc directories together -+override_dh_installdocs: -+ dh_installdocs --link-doc=libnih1 -+ -+override_dh_clean: -+ rm -rf build-dbus-tool/ -+ dh_clean ---- libnih-1.0.3.orig/debian/compat -+++ libnih-1.0.3/debian/compat -@@ -0,0 +1 @@ -+9 ---- libnih-1.0.3.orig/debian/nih-dbus-tool.install -+++ libnih-1.0.3/debian/nih-dbus-tool.install -@@ -0,0 +1,2 @@ -+usr/bin/nih-dbus-tool -+usr/share/man/man1/nih-dbus-tool.1 ---- libnih-1.0.3.orig/debian/copyright -+++ libnih-1.0.3/debian/copyright -@@ -0,0 +1,18 @@ -+This is the Ubuntu package of libnih, the NIH Utility Library. -+ -+Copyright © 2009 Canonical Ltd. -+Copyright © 2009 Scott James Remnant <scott@netsplit.com> -+ -+Licence: -+ -+This program is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License version 2, as -+published by the Free Software Foundation. -+ -+This program is distributed in the hope that it will be useful, but -+WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+General Public License for more details. -+ -+On Ubuntu systems, the complete text of the GNU General Public License -+can be found in ‘/usr/share/common-licenses/GPL-2’. ---- libnih-1.0.3.orig/debian/libnih-dbus1.postinst -+++ libnih-1.0.3/debian/libnih-dbus1.postinst -@@ -0,0 +1,53 @@ -+#!/bin/sh -+ -+set -e -+ -+if [ "$1" = configure ]; then -+ # A dependent library of Upstart has changed, so restart Upstart -+ # such that it can safely unmount the root filesystem (LP: #740390) -+ -+ # Query running version of Upstart, but only when we know -+ # that initctl will work. -+ # -+ # The calculated version string may be the null string if -+ # Upstart is not running (where for example an alternative -+ # init is running outside a chroot environment) or if the -+ # query failed for some reason. However, the version check -+ # below handles a null version string correctly. -+ UPSTART_VERSION_RUNNING=$(initctl version 2>/dev/null |\ -+ awk '{print $3}'|tr -d ')' || :) -+ -+ if ischroot; then -+ # Do not honour re-exec when requested from within a -+ # chroot since: -+ # -+ # (a) The version of Upstart outside might not support it. -+ # (b) An isolated environment such as a chroot should -+ # not be able to modify its containing environment. -+ # -+ # A sufficiently new Upstart will actually handle a re-exec -+ # request coming from telinit within a chroot correctly (by -+ # doing nothing) but it's simple enough to perform the check -+ # here and save Upstart the effort. -+ : -+ elif dpkg --compare-versions "$UPSTART_VERSION_RUNNING" ge 1.6.1; then -+ # We are not running inside a chroot and the running version -+ # of Upstart supports stateful re-exec, so we can -+ # restart immediately. -+ # -+ # XXX: Note that the check on the running version must -+ # remain *indefinitely* since it's the only safe way to -+ # know if stateful re-exec is supported: simply checking -+ # packaged version numbers is not sufficient since -+ # the package could be upgraded multiple times without a -+ # reboot. -+ telinit u || : -+ else -+ # Before we shutdown or reboot, we need to re-exec so that we -+ # can safely remount the root filesystem; we can't just do that -+ # here because we lose state. -+ touch /var/run/init.upgraded || : -+ fi -+fi -+ -+#DEBHELPER# ---- libnih-1.0.3.orig/debian/changelog.DEBIAN -+++ libnih-1.0.3/debian/changelog.DEBIAN -@@ -0,0 +1,118 @@ -+libnih (1.0.3-4) unstable; urgency=low -+ -+ * Rebuild for new libc to update versioned dependency; this comes from -+ the __abort_msg dependency, dpkg-shlibs needs overriding since this is -+ actually a weak link, but this rebuild fixes things for now. -+ Closes: #625257. -+ -+ -- Scott James Remnant <scott@netsplit.com> Mon, 02 May 2011 15:08:33 -0700 -+ -+libnih (1.0.3-3) unstable; urgency=low -+ -+ * New maintainer. Closes: #624442. -+ -+ -- Scott James Remnant <scott@netsplit.com> Thu, 28 Apr 2011 14:26:05 -0700 -+ -+libnih (1.0.3-2) unstable; urgency=low -+ -+ * Bump build dependency on libdbus-1-dev and dbus to (>= 1.4) for Unix file -+ descriptor passing support. -+ -+ -- Michael Biebl <biebl@debian.org> Thu, 10 Feb 2011 20:25:18 +0100 -+ -+libnih (1.0.3-1ubuntu1) natty; urgency=low -+ -+ * Rebuild with libc6-dev (>= 2.13~). -+ -+ -- Matthias Klose <doko@ubuntu.com> Fri, 18 Feb 2011 12:09:29 +0100 -+ -+libnih (1.0.3-1) unstable; urgency=low -+ -+ * New upstream release. -+ * Bump debhelper compatibility level to 8 and update build dependency -+ accordingly. -+ -+ -- Michael Biebl <biebl@debian.org> Mon, 07 Feb 2011 22:19:13 +0100 -+ -+libnih (1.0.2-2) unstable; urgency=low -+ -+ * Install library development files to /usr/lib and not /lib. -+ * Remove libtool *.la files as there are no reverse dependencies referencing -+ them. -+ * Bump Standards-Version to 3.9.1. No further changes. -+ -+ -- Michael Biebl <biebl@debian.org> Sun, 02 Jan 2011 21:09:40 +0100 -+ -+libnih (1.0.2-1ubuntu3) natty; urgency=low -+ -+ * Disable some tests on ppc64 to build an initial package. -+ -+ -- Matthias Klose <doko@ubuntu.com> Thu, 18 Nov 2010 10:59:38 +0100 -+ -+libnih (1.0.2-1ubuntu2) maverick; urgency=low -+ -+ * Re-add -fPIE to the testsuite on armel, removing all armel-specific tests; -+ current gcc-4.4 don't seem affected by the ICE anymore (see LP #398403). -+ -+ -- Loïc Minier <loic.minier@linaro.org> Mon, 23 Aug 2010 10:25:31 +0200 -+ -+libnih (1.0.2-1ubuntu1) maverick; urgency=low -+ -+ * Rebuild with libc6-dev (>= 2.12~), after checking that -+ __abort_msg is available with the same signature in eglibc 2.12. -+ * Don't build the testsuite with -fPIE on armel; LP: #398403. -+ -+ -- Matthias Klose <doko@ubuntu.com> Sun, 30 May 2010 02:54:56 +0200 -+ -+libnih (1.0.2-1) unstable; urgency=low -+ -+ * Initial upload to Debian. Closes: #585071 -+ * Based on the Ubuntu package for Lucid done by Scott James Remnant with the -+ following changes: -+ - Switch packages to priority optional. -+ - Use binary:Version instead of Source-Version. -+ - Bump Standards-Version to 3.8.4. -+ - Add Homepage and Vcs-* fields. -+ - Don't symlink /usr/share/doc directories. -+ - Refer to versioned /usr/share/common-licenses/GPL-2 file in -+ debian/copyright. -+ - List all symbols explicitly instead of using a wildcard and add symbols -+ introduced in 1.0.1. -+ - Use the symbols files to create the correct version info instead of -+ specifying it manually via shlibs. -+ - Switch to source format 3.0 (quilt). -+ - Add watch file to track new upstream releases. -+ -+ -- Michael Biebl <biebl@debian.org> Sun, 13 Jun 2010 23:36:52 +0200 -+ -+libnih (1.0.1-1) lucid; urgency=low -+ -+ * New upstream release: -+ - Add missing __nih_* symbols to linker version script so that we -+ can link Upstart's test suite. -+ - Glibc __abort_msg symbol now only linked as a weak symbol. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Thu, 04 Feb 2010 14:53:26 -0800 -+ -+libnih (1.0.0-2build1) lucid; urgency=low -+ -+ * Rebuild to pick up relaxed dependency on libc6, after checking that -+ __abort_msg is available with the same signature in eglibc 2.11. -+ LP: #508702. -+ -+ -- Matthias Klose <doko@ubuntu.com> Mon, 18 Jan 2010 16:09:13 +0100 -+ -+libnih (1.0.0-2) lucid; urgency=low -+ -+ * debian/control: Add build-dependency on dbus so the test suite can -+ pass on the buildds. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Sat, 28 Nov 2009 23:28:27 +0000 -+ -+libnih (1.0.0-1) lucid; urgency=low -+ -+ * First upstream release. Previously this code was included in the -+ upstart, mountall and ureadahead source packages. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Sat, 28 Nov 2009 21:14:00 +0000 -+ ---- libnih-1.0.3.orig/debian/libnih1.symbols -+++ libnih-1.0.3/debian/libnih1.symbols -@@ -0,0 +1,2 @@ -+libnih.so.1 libnih1 #MINVER# -+ *@LIBNIH_1_0 1.0.0 ---- libnih-1.0.3.orig/debian/libnih-dbus-dev.install -+++ libnih-1.0.3/debian/libnih-dbus-dev.install -@@ -0,0 +1,5 @@ -+lib/*/libnih-dbus.a -+lib/*/libnih-dbus.so -+usr/include/libnih-dbus.h -+usr/include/nih-dbus -+usr/lib/*/pkgconfig/libnih-dbus.pc ---- libnih-1.0.3.orig/debian/libnih1.postinst -+++ libnih-1.0.3/debian/libnih1.postinst -@@ -0,0 +1,53 @@ -+#!/bin/sh -+ -+set -e -+ -+if [ "$1" = configure ]; then -+ # A dependent library of Upstart has changed, so restart Upstart -+ # such that it can safely unmount the root filesystem (LP: #740390) -+ -+ # Query running version of Upstart, but only when we know -+ # that initctl will work. -+ # -+ # The calculated version string may be the null string if -+ # Upstart is not running (where for example an alternative -+ # init is running outside a chroot environment) or if the -+ # query failed for some reason. However, the version check -+ # below handles a null version string correctly. -+ UPSTART_VERSION_RUNNING=$(initctl version 2>/dev/null |\ -+ awk '{print $3}'|tr -d ')' || :) -+ -+ if ischroot; then -+ # Do not honour re-exec when requested from within a -+ # chroot since: -+ # -+ # (a) The version of Upstart outside might not support it. -+ # (b) An isolated environment such as a chroot should -+ # not be able to modify its containing environment. -+ # -+ # A sufficiently new Upstart will actually handle a re-exec -+ # request coming from telinit within a chroot correctly (by -+ # doing nothing) but it's simple enough to perform the check -+ # here and save Upstart the effort. -+ : -+ elif dpkg --compare-versions "$UPSTART_VERSION_RUNNING" ge 1.6.1; then -+ # We are not running inside a chroot and the running version -+ # of Upstart supports stateful re-exec, so we can -+ # restart immediately. -+ # -+ # XXX: Note that the check on the running version must -+ # remain *indefinitely* since it's the only safe way to -+ # know if stateful re-exec is supported: simply checking -+ # packaged version numbers is not sufficient since -+ # the package could be upgraded multiple times without a -+ # reboot. -+ telinit u || : -+ else -+ # Before we shutdown or reboot, we need to re-exec so that we -+ # can safely remount the root filesystem; we can't just do that -+ # here because we lose state. -+ touch /var/run/init.upgraded || : -+ fi -+fi -+ -+#DEBHELPER# ---- libnih-1.0.3.orig/debian/libnih-dbus1.symbols -+++ libnih-1.0.3/debian/libnih-dbus1.symbols -@@ -0,0 +1,2 @@ -+libnih-dbus.so.1 libnih-dbus1 #MINVER# -+ *@LIBNIH_DBUS_1_0 1.0.0 ---- libnih-1.0.3.orig/debian/changelog -+++ libnih-1.0.3/debian/changelog -@@ -0,0 +1,213 @@ -+libnih (1.0.3-4ubuntu16) raring; urgency=low -+ -+ * debian/{libnih1.postinst,libnih-dbus1.postinst}: Force an upgrade to -+ restart Upstart (to pick up new package version) if the running -+ instance supports it. -+ * Merge of important fixes from lp:~upstart-devel/libnih/nih -+ (LP: #776532, LP: #777097, LP: #834813, LP: #1123588). -+ -+ -- James Hunt <james.hunt@ubuntu.com> Thu, 14 Mar 2013 09:14:22 +0000 -+ -+libnih (1.0.3-4ubuntu15) raring; urgency=low -+ -+ * Enable cross-building, sans adding :native build-dependencies. -+ See comments in debian/control. -+ * Lintian fixes. -+ -+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Tue, 08 Jan 2013 15:38:58 +0000 -+ -+libnih (1.0.3-4ubuntu14) raring; urgency=low -+ -+ * Update dbus code generator to allow for empty lists for type 'as'. -+ This drops the != NULL check for NULL terminated arrays and moves the -+ iteration loop inside an 'if' statement. -+ -+ -- Stéphane Graber <stgraber@ubuntu.com> Thu, 13 Dec 2012 10:00:27 -0500 -+ -+libnih (1.0.3-4ubuntu13) raring; urgency=low -+ -+ [ Petr Lautrbach <plautrba@redhat.com>, Dmitrijs Ledkovs ] -+ * Fallback to lstat, if dirent.d_type is not available (not portable) -+ (LP: #672643) (Closes: #695604) -+ -+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Tue, 11 Dec 2012 17:26:52 +0000 -+ -+libnih (1.0.3-4ubuntu12) raring; urgency=low -+ -+ * nih/logging.c: Use our own __nih_abort_msg rather than the (e)glibc -+ private symbol __abort_msg to avoid upgrade issues (LP: #997359). -+ * nih/tests/test_logging.c: Update tests for __nih_abort_msg. -+ -+ -- James Hunt <james.hunt@ubuntu.com> Thu, 25 Oct 2012 10:57:30 +0100 -+ -+libnih (1.0.3-4ubuntu11) quantal; urgency=low -+ -+ * Addition of debian/libnih-dbus1.postinst and -+ debian/libnih1.postinst to force Upstart re-exec on shutdown -+ to avoid unmounting disks uncleanly (LP: #740390). -+ -+ -- James Hunt <james.hunt@ubuntu.com> Wed, 03 Oct 2012 16:49:40 +0100 -+ -+libnih (1.0.3-4ubuntu10) quantal; urgency=low -+ -+ * Update config.guess,sub for aarch64 -+ -+ -- Wookey <wookey@wookware.org> Mon, 01 Oct 2012 12:57:05 +0100 -+ -+libnih (1.0.3-4ubuntu9) precise; urgency=low -+ -+ * Mark the nih-dbus-tool package Multi-Arch: foreign so it can be used as -+ a build-dependency of upstart when cross-building. -+ -+ -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 15 Feb 2012 22:57:50 -0800 -+ -+libnih (1.0.3-4ubuntu8) precise; urgency=low -+ -+ * libnih1 needs a versioned Pre-Depend on libc6 instead of just a Depend, -+ because libc6 itself uses runlevel from the upstart package in its -+ preinst, which in turn uses libnih1, which needs to be loadable (i.e., -+ its symbol references resolve). We therefore need to ensure that -+ libnih1's dependencies are always unpacked before libnih1 itself is -+ unpacked. While having something further up the stack (such as upstart, -+ or something on top of upstart) being marked Essential: yes and with the -+ necessary pre-depends would let apt handle this for us with its -+ "immediate configuration" support, but for various reasons we don't want -+ to make upstart essential. LP: #508083. -+ -+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 10 Feb 2012 12:13:25 -0800 -+ -+libnih (1.0.3-4ubuntu7) precise; urgency=low -+ -+ * Relax dependency on libc6. -+ -+ -- Matthias Klose <doko@ubuntu.com> Wed, 08 Feb 2012 23:43:21 +0100 -+ -+libnih (1.0.3-4ubuntu6) precise; urgency=low -+ -+ * Rebuild with libc6-dev (>= 2.15~). -+ -+ -- Matthias Klose <doko@ubuntu.com> Wed, 08 Feb 2012 21:48:57 +0100 -+ -+libnih (1.0.3-4ubuntu5) precise; urgency=low -+ -+ * Mark libnih-dev and libnih-dbus-dev Multi-Arch: same as well. -+ -+ -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 06 Nov 2011 14:45:07 -0800 -+ -+libnih (1.0.3-4ubuntu4) precise; urgency=low -+ -+ * Make libnih1 and libnih-dbus1 installable using multi-arch. -+ -+ -- James Hunt <james.hunt@ubuntu.com> Tue, 01 Nov 2011 14:25:09 -0400 -+ -+libnih (1.0.3-4ubuntu3) precise; urgency=low -+ -+ * Build to install with eglibc-2.15. -+ -+ -- Matthias Klose <doko@ubuntu.com> Fri, 14 Oct 2011 14:05:03 +0200 -+ -+libnih (1.0.3-4ubuntu2) oneiric; urgency=low -+ -+ * Use dpkg-buildflags to get the build flags. -+ * Build with the default build flags, don't hard-code -Os. LP: #791315. -+ -+ -- Matthias Klose <doko@ubuntu.com> Wed, 15 Jun 2011 16:45:42 +0200 -+ -+libnih (1.0.3-4ubuntu1) oneiric; urgency=low -+ -+ * Merge from debian unstable. Retained Ubuntu Build-Depends and Priority. -+ -+ -- James Hunt <james.hunt@ubuntu.com> Mon, 23 May 2011 19:28:19 +0100 -+ -+libnih (1.0.3-1ubuntu1) natty; urgency=low -+ -+ * Rebuild with libc6-dev (>= 2.13~). -+ -+ -- Matthias Klose <doko@ubuntu.com> Fri, 18 Feb 2011 12:09:29 +0100 -+ -+libnih (1.0.3-1) natty; urgency=low -+ -+ * New upstream release: -+ - Added support for passing file descriptors over D-Bus to nih-dbus-tool -+ -+ -- Scott James Remnant <scott@ubuntu.com> Thu, 23 Dec 2010 22:28:24 +0000 -+ -+libnih (1.0.2-2) natty; urgency=low -+ -+ * Revert the previous upload. It is never acceptable to simply disable -+ tests, especially when it turns out that the test that was disabled -+ was failing because there was a serious bug that could cause kernel -+ panics for people on boot. -+ -+ Test suites are here for a reason. -+ -+ * Bumped libdbus Build-Dependency to the version with the bug fix that -+ caused the test suite to fail. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Wed, 08 Dec 2010 19:40:15 +0000 -+ -+libnih (1.0.2-1ubuntu3) natty; urgency=low -+ -+ * Disable some tests on ppc64 to build an initial package. -+ -+ -- Matthias Klose <doko@ubuntu.com> Thu, 18 Nov 2010 10:59:38 +0100 -+ -+libnih (1.0.2-1ubuntu2) maverick; urgency=low -+ -+ * Re-add -fPIE to the testsuite on armel, removing all armel-specific tests; -+ current gcc-4.4 don't seem affected by the ICE anymore (see LP #398403). -+ -+ -- Loïc Minier <loic.minier@linaro.org> Mon, 23 Aug 2010 10:25:31 +0200 -+ -+libnih (1.0.2-1ubuntu1) maverick; urgency=low -+ -+ * Rebuild with libc6-dev (>= 2.12~), after checking that -+ __abort_msg is available with the same signature in eglibc 2.12. -+ * Don't build the testsuite with -fPIE on armel; LP: #398403. -+ -+ -- Matthias Klose <doko@ubuntu.com> Sun, 30 May 2010 02:54:56 +0200 -+ -+libnih (1.0.2-1) maverick; urgency=low -+ -+ * New upstream release: -+ - Rename AC_COPYRIGHT to NIH_COPYRIGHT to avoid conflict with other -+ packages. -+ - Add serial to libnih.m4 -+ - Add NIH_WITH_LOCAL_LIBNIH macro. -+ -+ * Fix use of ${Source-Version} to be ${binary:Version} -+ * Add debian/source/format with "1.0" to be future compatible. -+ * Bump standards version. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Tue, 27 Apr 2010 10:49:55 -0700 -+ -+libnih (1.0.1-1) lucid; urgency=low -+ -+ * New upstream release: -+ - Add missing __nih_* symbols to linker version script so that we -+ can link Upstart's test suite. -+ - Glibc __abort_msg symbol now only linked as a weak symbol. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Thu, 04 Feb 2010 14:53:26 -0800 -+ -+libnih (1.0.0-2build1) lucid; urgency=low -+ -+ * Rebuild to pick up relaxed dependency on libc6, after checking that -+ __abort_msg is available with the same signature in eglibc 2.11. -+ LP: #508702. -+ -+ -- Matthias Klose <doko@ubuntu.com> Mon, 18 Jan 2010 16:09:13 +0100 -+ -+libnih (1.0.0-2) lucid; urgency=low -+ -+ * debian/control: Add build-dependency on dbus so the test suite can -+ pass on the buildds. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Sat, 28 Nov 2009 23:28:27 +0000 -+ -+libnih (1.0.0-1) lucid; urgency=low -+ -+ * First upstream release. Previously this code was included in the -+ upstart, mountall and ureadahead source packages. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Sat, 28 Nov 2009 21:14:00 +0000 ---- libnih-1.0.3.orig/debian/source/format -+++ libnih-1.0.3/debian/source/format -@@ -0,0 +1 @@ -+1.0 ---- libnih-1.0.3.orig/nih-dbus/dbus_proxy.h -+++ libnih-1.0.3/nih-dbus/dbus_proxy.h -@@ -146,14 +146,14 @@ - const char *name, const char *path, - NihDBusLostHandler lost_handler, - void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NihDBusProxySignal *nih_dbus_proxy_connect (NihDBusProxy *proxy, - const NihDBusInterface *interface, - const char *name, - NihDBusSignalHandler handler, - void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus/dbus_object.h -+++ libnih-1.0.3/nih-dbus/dbus_object.h -@@ -61,8 +61,7 @@ - DBusConnection *connection, - const char *path, - const NihDBusInterface **interfaces, -- void *data) -- __attribute__ ((malloc)); -+ void *data); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus/dbus_util.h -+++ libnih-1.0.3/nih-dbus/dbus_util.h -@@ -26,7 +26,7 @@ - NIH_BEGIN_EXTERN - - char *nih_dbus_path (const void *parent, const char *root, ...) -- __attribute__ ((sentinel, warn_unused_result, malloc)); -+ __attribute__ ((sentinel, warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus/dbus_pending_data.h -+++ libnih-1.0.3/nih-dbus/dbus_pending_data.h -@@ -104,7 +104,7 @@ - NihDBusReplyHandler handler, - NihDBusErrorHandler error_handler, - void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus/dbus_proxy.c -+++ libnih-1.0.3/nih-dbus/dbus_proxy.c -@@ -46,11 +46,11 @@ - __attribute__ ((warn_unused_result)); - static char *nih_dbus_proxy_name_rule (const void *parent, - NihDBusProxy *proxy) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - static int nih_dbus_proxy_signal_destroy (NihDBusProxySignal *proxied); - static char *nih_dbus_proxy_signal_rule (const void *parent, - NihDBusProxySignal *proxied) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - /* Prototypes for handler functions */ - static DBusHandlerResult nih_dbus_proxy_name_owner_changed (DBusConnection *connection, ---- libnih-1.0.3.orig/nih-dbus-tool/symbol.c -+++ libnih-1.0.3/nih-dbus-tool/symbol.c -@@ -40,10 +40,10 @@ - /* Prototypes for static functions */ - static char *symbol_strcat_interface (char **str, const void *parent, - const char *format, ...) -- __attribute__ ((format (printf, 3, 4), warn_unused_result, malloc)); -+ __attribute__ ((format (printf, 3, 4), warn_unused_result)); - static char *symbol_strcat_title (char **str, const void *parent, - const char *format, ...) -- __attribute__ ((format (printf, 3, 4), warn_unused_result, malloc)); -+ __attribute__ ((format (printf, 3, 4), warn_unused_result)); - - - /** ---- libnih-1.0.3.orig/nih-dbus-tool/demarshal.h -+++ libnih-1.0.3/nih-dbus-tool/demarshal.h -@@ -37,7 +37,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/symbol.h -+++ libnih-1.0.3/nih-dbus-tool/symbol.h -@@ -28,22 +28,22 @@ - int symbol_valid (const char *symbol); - - char *symbol_from_name (const void *parent, const char *name) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char *symbol_impl (const void *parent, const char *prefix, - const char *interface_name, const char *name, - const char *postfix) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char *symbol_extern (const void *parent, const char *prefix, - const char *interface_symbol, const char *midfix, - const char *symbol, const char *postfix) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char *symbol_typedef (const void *parent, const char *prefix, - const char *interface_symbol, const char *midfix, - const char *symbol, const char *postfix) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/output.h -+++ libnih-1.0.3/nih-dbus-tool/output.h -@@ -35,9 +35,9 @@ - __attribute__ ((warn_unused_result)); - - char *output_preamble (const void *parent, const char *path) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char *output_sentinel (const void *parent, const char *path) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/parse.h -+++ libnih-1.0.3/nih-dbus-tool/parse.h -@@ -95,7 +95,7 @@ - - ParseStack *parse_stack_push (const void *parent, NihList *stack, - ParseStackType type, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - ParseStack *parse_stack_top (NihList *stack); - - void parse_start_tag (XML_Parser xmlp, const char *tag, -@@ -103,7 +103,7 @@ - void parse_end_tag (XML_Parser xmlp, const char *tag); - - Node * parse_xml (const void *parent, int fd, const char *filename) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/type.h -+++ libnih-1.0.3/nih-dbus-tool/type.h -@@ -94,43 +94,43 @@ - - char * type_of (const void * parent, - DBusSignatureIter *iter) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - TypeVar * type_var_new (const void *parent, const char *type, - const char *name) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_var_to_string (const void *parent, TypeVar *var) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_var_layout (const void *parent, NihList *vars) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - TypeFunc * type_func_new (const void *parent, const char *type, - const char *name) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_func_to_string (const void *parent, TypeFunc *func) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_func_to_typedef (const void *parent, TypeFunc *func) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_func_layout (const void *parent, NihList *funcs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - TypeStruct *type_struct_new (const void *parent, const char *name) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_struct_to_string (const void *parent, TypeStruct *structure) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * type_to_const (char **type, const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_to_pointer (char **type, const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_to_static (char **type, const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_to_extern (char **type, const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * type_strcat_assert (char **block, const void *parent, - TypeVar *var, TypeVar *prev, TypeVar *next) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/argument.h -+++ libnih-1.0.3/nih-dbus-tool/argument.h -@@ -61,7 +61,7 @@ - - Argument *argument_new (const void *parent, const char *name, - const char *type, NihDBusArgDir direction) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int argument_start_tag (XML_Parser xmlp, const char *tag, - char * const *attr) ---- libnih-1.0.3.orig/nih-dbus-tool/indent.h -+++ libnih-1.0.3/nih-dbus-tool/indent.h -@@ -26,9 +26,9 @@ - NIH_BEGIN_EXTERN - - char *indent (char **str, const void *parent, int level) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char *comment (char **str, const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/main.c -+++ libnih-1.0.3/nih-dbus-tool/main.c -@@ -52,10 +52,10 @@ - /* Prototypes for local functions */ - char *source_file_path (const void *parent, const char *output_path, - const char *filename) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char *header_file_path (const void *parent, const char *output_path, - const char *filename) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - - /** ---- libnih-1.0.3.orig/nih-dbus-tool/signal.h -+++ libnih-1.0.3/nih-dbus-tool/signal.h -@@ -58,7 +58,7 @@ - int signal_name_valid (const char *name); - - Signal * signal_new (const void *parent, const char *name) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int signal_start_tag (XML_Parser xmlp, const char *tag, - char * const *attr) -@@ -76,18 +76,18 @@ - char * signal_object_function (const void *parent, const char *prefix, - Interface *interface, Signal *signal, - NihList *prototypes, NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * signal_proxy_function (const void *parent, const char *prefix, - Interface *interface, Signal *signal, - NihList *prototypes, NihList *typedefs, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * signal_args_array (const void *parent, const char *prefix, - Interface *interface, Signal *signal, - NihList *prototypes) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/marshal.c -+++ libnih-1.0.3/nih-dbus-tool/marshal.c -@@ -49,7 +49,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - static char *marshal_array (const void *parent, - DBusSignatureIter *iter, - const char *iter_name, const char *name, -@@ -58,7 +58,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - static char *marshal_struct (const void *parent, - DBusSignatureIter *iter, - const char *iter_name, const char *name, -@@ -67,7 +67,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - - /** -@@ -364,6 +364,7 @@ - nih_local TypeVar *element_len_var = NULL; - nih_local char * block = NULL; - nih_local char * vars_block = NULL; -+ nih_local char * loop_block = NULL; - - nih_assert (iter != NULL); - nih_assert (iter_name != NULL); -@@ -448,7 +449,7 @@ - nih_list_add (locals, &array_iter_var->entry); - - if (dbus_type_is_fixed (element_type)) { -- if (! nih_strcat_sprintf (&code, parent, -+ if (! nih_strcat_sprintf (&loop_block, parent, - "for (size_t %s = 0; %s < %s; %s++) {\n", - loop_name, loop_name, len_name, loop_name)) { - nih_free (code); -@@ -456,6 +457,12 @@ - } - } else { - if (! nih_strcat_sprintf (&code, parent, -+ "if (%s) {\n", -+ name)) { -+ nih_free (code); -+ return NULL; -+ } -+ if (! nih_strcat_sprintf (&loop_block, parent, - "for (size_t %s = 0; %s[%s]; %s++) {\n", - loop_name, name, loop_name, loop_name)) { - nih_free (code); -@@ -576,7 +583,7 @@ - } - - -- if (! nih_strcat_sprintf (&code, parent, -+ if (! nih_strcat_sprintf (&loop_block, parent, - "%s" - "\n" - "%s" -@@ -590,9 +597,34 @@ - } - - /* Close the container again */ -+ if (! nih_strcat_sprintf (&loop_block, parent, -+ "}\n")) { -+ nih_free (code); -+ return NULL; -+ } -+ -+ if (dbus_type_is_fixed (element_type)) { -+ if (! nih_strcat_sprintf (&code, parent, -+ "%s\n", loop_block)) { -+ nih_free (code); -+ return NULL; -+ } -+ } -+ else { -+ if (! indent (&loop_block, NULL, 1)) { -+ nih_free (code); -+ return NULL; -+ } -+ -+ if (! nih_strcat_sprintf (&code, parent, -+ "%s" -+ "}\n\n", loop_block)) { -+ nih_free (code); -+ return NULL; -+ } -+ } -+ - if (! nih_strcat_sprintf (&code, parent, -- "}\n" -- "\n" - "if (! dbus_message_iter_close_container (&%s, &%s)) {\n" - "%s" - "}\n", ---- libnih-1.0.3.orig/nih-dbus-tool/demarshal.c -+++ libnih-1.0.3/nih-dbus-tool/demarshal.c -@@ -51,7 +51,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - static char *demarshal_array (const void *parent, - DBusSignatureIter *iter, - const char *parent_name, -@@ -62,7 +62,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - static char *demarshal_struct (const void *parent, - DBusSignatureIter *iter, - const char *parent_name, -@@ -73,7 +73,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - - /** ---- libnih-1.0.3.orig/nih-dbus-tool/interface.h -+++ libnih-1.0.3/nih-dbus-tool/interface.h -@@ -61,7 +61,7 @@ - - Interface *interface_new (const void *parent, - const char *name) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int interface_start_tag (XML_Parser xmlp, - const char *tag, -@@ -81,26 +81,26 @@ - Interface *interface, - int with_handlers, - NihList *prototypes) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * interface_signals_array (const void *parent, - const char *prefix, - Interface *interface, - int with_filters, - NihList *prototypes) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * interface_properties_array (const void *parent, - const char *prefix, - Interface *interface, - int with_handlers, - NihList *prototypes) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * interface_struct (const void *parent, - const char *prefix, - Interface *interface, - int object, - NihList *prototypes) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - - char * interface_proxy_get_all_function (const void *parent, -@@ -108,7 +108,7 @@ - Interface *interface, - NihList *prototypes, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * interface_proxy_get_all_notify_function (const void *parent, - const char *prefix, -@@ -116,14 +116,14 @@ - NihList *prototypes, - NihList *typedefs, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * interface_proxy_get_all_sync_function (const void *parent, - const char *prefix, - Interface *interface, - NihList *prototypes, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/method.h -+++ libnih-1.0.3/nih-dbus-tool/method.h -@@ -62,7 +62,7 @@ - int method_name_valid (const char *name); - - Method * method_new (const void *parent, const char *name) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int method_start_tag (XML_Parser xmlp, const char *tag, - char * const *attr) -@@ -82,33 +82,33 @@ - Interface *interface, Method *method, - NihList *prototypes, NihList *handlers, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * method_reply_function (const void *parent, const char *prefix, - Interface *interface, Method *method, - NihList *prototypes, NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * method_proxy_function (const void *parent, const char *prefix, - Interface *interface, Method *method, - NihList *prototypes, NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * method_proxy_notify_function (const void *parent, const char *prefix, - Interface *interface, Method *method, - NihList *prototypes, NihList *typedefs, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * method_proxy_sync_function (const void *parent, const char *prefix, - Interface *interface, Method *method, - NihList *prototypes, NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * method_args_array (const void *parent, const char *prefix, - Interface *interface, Method *method, - NihList *prototypes) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/node.h -+++ libnih-1.0.3/nih-dbus-tool/node.h -@@ -47,7 +47,7 @@ - int node_path_valid (const char *name); - - Node * node_new (const void *parent, const char *path) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int node_start_tag (XML_Parser xmlp, const char *tag, - char * const *attr) -@@ -59,18 +59,18 @@ - - char * node_interfaces_array (const void *parent, const char *prefix, - Node *node, int object, NihList *prototypes) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * node_object_functions (const void *parent, const char *prefix, - Node *node, - NihList *prototypes, NihList *handlers, - NihList *structs, NihList *externs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * node_proxy_functions (const void *parent, const char *prefix, - Node *node, - NihList *prototypes, NihList *structs, - NihList *typedefs, NihList *externs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/marshal.h -+++ libnih-1.0.3/nih-dbus-tool/marshal.h -@@ -35,7 +35,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/type.c -+++ libnih-1.0.3/nih-dbus-tool/type.c -@@ -1101,7 +1101,7 @@ - nih_assert (block != NULL); - nih_assert (var != NULL); - -- if (! strchr (var->type, '*')) -+ if (! strchr (var->type, '*') || ! strcmp (var->type, "char * const *")) - return *block; - - if (next && (! strcmp (next->type, "size_t"))) { ---- libnih-1.0.3.orig/nih-dbus-tool/property.h -+++ libnih-1.0.3/nih-dbus-tool/property.h -@@ -65,7 +65,7 @@ - const char *name, - const char *type, - NihDBusAccess access) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int property_start_tag (XML_Parser xmlp, const char *tag, - char * const *attr) -@@ -88,7 +88,7 @@ - NihList *prototypes, - NihList *handlers, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * property_object_set_function (const void *parent, - const char *prefix, - Interface *interface, -@@ -96,7 +96,7 @@ - NihList *prototypes, - NihList *handlers, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * property_proxy_get_function (const void *parent, - const char *prefix, -@@ -104,7 +104,7 @@ - Property *property, - NihList *prototypes, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * property_proxy_get_notify_function (const void *parent, - const char *prefix, - Interface *interface, -@@ -112,7 +112,7 @@ - NihList *prototypes, - NihList *typedefs, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * property_proxy_set_function (const void *parent, - const char *prefix, -@@ -120,7 +120,7 @@ - Property *property, - NihList *prototypes, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * property_proxy_set_notify_function (const void *parent, - const char *prefix, - Interface *interface, -@@ -128,7 +128,7 @@ - NihList *prototypes, - NihList *typedefs, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * property_proxy_get_sync_function (const void *parent, - const char *prefix, -@@ -136,14 +136,14 @@ - Property *property, - NihList *prototypes, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * property_proxy_set_sync_function (const void *parent, - const char *prefix, - Interface *interface, - Property *property, - NihList *prototypes, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/tests/test_main.c -+++ libnih-1.0.3/nih-dbus-tool/tests/test_main.c -@@ -100,10 +100,10 @@ - - extern char *source_file_path (const void *parent, const char *output_path, - const char *filename) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - extern char *header_file_path (const void *parent, const char *output_path, - const char *filename) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - void - test_source_file_path (void) ---- libnih-1.0.3.orig/nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c -+++ libnih-1.0.3/nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c -@@ -12524,6 +12524,7 @@ - dbus_message_iter_init (reply, &iter); - - dbus_message_iter_get_basic (&iter, &str_value); -+ TEST_NE (str_value[0], '\0'); - TEST_TRUE (strchr ("0123456789", str_value[0])); - - dbus_message_unref (reply); ---- libnih-1.0.3.orig/nih-dbus-tool/tests/test_marshal.c -+++ libnih-1.0.3/nih-dbus-tool/tests/test_marshal.c -@@ -1479,39 +1479,41 @@ - "\treturn -1;\n" - "}\n" - "\n" -- "for (size_t value_i = 0; value[value_i]; value_i++) {\n" -- "\tDBusMessageIter value_element_iter;\n" -- "\tconst int16_t * value_element;\n" -- "\tsize_t value_element_len;\n" -+ "if (value) {\n" -+ "\tfor (size_t value_i = 0; value[value_i]; value_i++) {\n" -+ "\t\tDBusMessageIter value_element_iter;\n" -+ "\t\tconst int16_t * value_element;\n" -+ "\t\tsize_t value_element_len;\n" - "\n" -- "\tvalue_element = value[value_i];\n" -- "\tvalue_element_len = value_len[value_i];\n" -+ "\t\tvalue_element = value[value_i];\n" -+ "\t\tvalue_element_len = value_len[value_i];\n" - "\n" - -- "\t/* Marshal an array onto the message */\n" -- "\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_ARRAY, \"n\", &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -+ "\t\t/* Marshal an array onto the message */\n" -+ "\t\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_ARRAY, \"n\", &value_element_iter)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\tfor (size_t value_element_i = 0; value_element_i < value_element_len; value_element_i++) {\n" -- "\t\tint16_t value_element_element;\n" -+ "\t\tfor (size_t value_element_i = 0; value_element_i < value_element_len; value_element_i++) {\n" -+ "\t\t\tint16_t value_element_element;\n" - "\n" -- "\t\tvalue_element_element = value_element[value_element_i];\n" -+ "\t\t\tvalue_element_element = value_element[value_element_i];\n" - "\n" -- "\t\t/* Marshal a int16_t onto the message */\n" -- "\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_INT16, &value_element_element)) {\n" -- "\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\t\t/* Marshal a int16_t onto the message */\n" -+ "\t\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_INT16, &value_element_element)) {\n" -+ "\t\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\t\treturn -1;\n" -+ "\t\t\t}\n" -+ "\t\t}\n" -+ "\n" -+ "\t\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" - "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" - "\t\t\treturn -1;\n" - "\t\t}\n" -- "\t}\n" -- "\n" -- "\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" - -+ "\t}\n" - "}\n" - "\n" - "if (! dbus_message_iter_close_container (&iter, &value_iter)) {\n" -@@ -1766,15 +1768,17 @@ - "\treturn -1;\n" - "}\n" - "\n" -- "for (size_t value_i = 0; value[value_i]; value_i++) {\n" -- "\tconst char *value_element;\n" -+ "if (value) {\n" -+ "\tfor (size_t value_i = 0; value[value_i]; value_i++) {\n" -+ "\t\tconst char *value_element;\n" - "\n" -- "\tvalue_element = value[value_i];\n" -+ "\t\tvalue_element = value[value_i];\n" - "\n" -- "\t/* Marshal a char * onto the message */\n" -- "\tif (! dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_STRING, &value_element)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -+ "\t\t/* Marshal a char * onto the message */\n" -+ "\t\tif (! dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_STRING, &value_element)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\t}\n" - "}\n" - "\n" -@@ -1933,35 +1937,39 @@ - "\treturn -1;\n" - "}\n" - "\n" -- "for (size_t value_i = 0; value[value_i]; value_i++) {\n" -- "\tDBusMessageIter value_element_iter;\n" -- "\tchar * const * value_element;\n" -+ "if (value) {\n" -+ "\tfor (size_t value_i = 0; value[value_i]; value_i++) {\n" -+ "\t\tDBusMessageIter value_element_iter;\n" -+ "\t\tchar * const * value_element;\n" - "\n" -- "\tvalue_element = value[value_i];\n" -+ "\t\tvalue_element = value[value_i];\n" - "\n" -- "\t/* Marshal an array onto the message */\n" -- "\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_ARRAY, \"s\", &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -- "\n" -- "\tfor (size_t value_element_i = 0; value_element[value_element_i]; value_element_i++) {\n" -- "\t\tconst char *value_element_element;\n" -+ "\t\t/* Marshal an array onto the message */\n" -+ "\t\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_ARRAY, \"s\", &value_element_iter)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\t\tvalue_element_element = value_element[value_element_i];\n" -+ "\t\tif (value_element) {\n" -+ "\t\t\tfor (size_t value_element_i = 0; value_element[value_element_i]; value_element_i++) {\n" -+ "\t\t\t\tconst char *value_element_element;\n" -+ "\n" -+ "\t\t\t\tvalue_element_element = value_element[value_element_i];\n" -+ "\n" -+ "\t\t\t\t/* Marshal a char * onto the message */\n" -+ "\t\t\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_STRING, &value_element_element)) {\n" -+ "\t\t\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\t\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\t\t\treturn -1;\n" -+ "\t\t\t\t}\n" -+ "\t\t\t}\n" -+ "\t\t}\n" - "\n" -- "\t\t/* Marshal a char * onto the message */\n" -- "\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_STRING, &value_element_element)) {\n" -- "\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" - "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" - "\t\t\treturn -1;\n" - "\t\t}\n" - "\t}\n" -- "\n" -- "\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" - "}\n" - "\n" - "if (! dbus_message_iter_close_container (&iter, &value_iter)) {\n" -@@ -2194,16 +2202,18 @@ - "\treturn -1;\n" - "}\n" - "\n" -- "for (size_t value_item2_i = 0; value_item2[value_item2_i]; value_item2_i++) {\n" -- "\tconst char *value_item2_element;\n" -+ "if (value_item2) {\n" -+ "\tfor (size_t value_item2_i = 0; value_item2[value_item2_i]; value_item2_i++) {\n" -+ "\t\tconst char *value_item2_element;\n" - "\n" -- "\tvalue_item2_element = value_item2[value_item2_i];\n" -+ "\t\tvalue_item2_element = value_item2[value_item2_i];\n" - "\n" -- "\t/* Marshal a char * onto the message */\n" -- "\tif (! dbus_message_iter_append_basic (&value_item2_iter, DBUS_TYPE_STRING, &value_item2_element)) {\n" -- "\t\tdbus_message_iter_abandon_container (&value_iter, &value_item2_iter);\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -+ "\t\t/* Marshal a char * onto the message */\n" -+ "\t\tif (! dbus_message_iter_append_basic (&value_item2_iter, DBUS_TYPE_STRING, &value_item2_element)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_item2_iter);\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\t}\n" - "}\n" - "\n" -@@ -2642,41 +2652,43 @@ - "\treturn -1;\n" - "}\n" - "\n" -- "for (size_t value_i = 0; value[value_i]; value_i++) {\n" -- "\tDBusMessageIter value_element_iter;\n" -- "\tconst char * value_element_item0;\n" -- "\tuint32_t value_element_item1;\n" -- "\tconst MyStructArrayValueElement *value_element;\n" -+ "if (value) {\n" -+ "\tfor (size_t value_i = 0; value[value_i]; value_i++) {\n" -+ "\t\tDBusMessageIter value_element_iter;\n" -+ "\t\tconst char * value_element_item0;\n" -+ "\t\tuint32_t value_element_item1;\n" -+ "\t\tconst MyStructArrayValueElement *value_element;\n" - "\n" -- "\tvalue_element = value[value_i];\n" -+ "\t\tvalue_element = value[value_i];\n" - "\n" -- "\t/* Marshal a structure onto the message */\n" -- "\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_STRUCT, NULL, &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -+ "\t\t/* Marshal a structure onto the message */\n" -+ "\t\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_STRUCT, NULL, &value_element_iter)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\tvalue_element_item0 = value_element->item0;\n" -+ "\t\tvalue_element_item0 = value_element->item0;\n" - "\n" -- "\t/* Marshal a char * onto the message */\n" -- "\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_STRING, &value_element_item0)) {\n" -- "\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -+ "\t\t/* Marshal a char * onto the message */\n" -+ "\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_STRING, &value_element_item0)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\tvalue_element_item1 = value_element->item1;\n" -+ "\t\tvalue_element_item1 = value_element->item1;\n" - "\n" -- "\t/* Marshal a uint32_t onto the message */\n" -- "\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_UINT32, &value_element_item1)) {\n" -- "\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -+ "\t\t/* Marshal a uint32_t onto the message */\n" -+ "\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_UINT32, &value_element_item1)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -+ "\t\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\t}\n" - "}\n" - "\n" -@@ -2912,41 +2924,43 @@ - "\treturn -1;\n" - "}\n" - "\n" -- "for (size_t value_i = 0; value[value_i]; value_i++) {\n" -- "\tDBusMessageIter value_element_iter;\n" -- "\tconst char * value_element_item0;\n" -- "\tuint32_t value_element_item1;\n" -- "\tconst MyDictEntryArrayValueElement *value_element;\n" -+ "if (value) {\n" -+ "\tfor (size_t value_i = 0; value[value_i]; value_i++) {\n" -+ "\t\tDBusMessageIter value_element_iter;\n" -+ "\t\tconst char * value_element_item0;\n" -+ "\t\tuint32_t value_element_item1;\n" -+ "\t\tconst MyDictEntryArrayValueElement *value_element;\n" - "\n" -- "\tvalue_element = value[value_i];\n" -+ "\t\tvalue_element = value[value_i];\n" - "\n" -- "\t/* Marshal a structure onto the message */\n" -- "\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_DICT_ENTRY, NULL, &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -+ "\t\t/* Marshal a structure onto the message */\n" -+ "\t\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_DICT_ENTRY, NULL, &value_element_iter)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\tvalue_element_item0 = value_element->item0;\n" -+ "\t\tvalue_element_item0 = value_element->item0;\n" - "\n" -- "\t/* Marshal a char * onto the message */\n" -- "\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_STRING, &value_element_item0)) {\n" -- "\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -+ "\t\t/* Marshal a char * onto the message */\n" -+ "\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_STRING, &value_element_item0)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\tvalue_element_item1 = value_element->item1;\n" -+ "\t\tvalue_element_item1 = value_element->item1;\n" - "\n" -- "\t/* Marshal a uint32_t onto the message */\n" -- "\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_UINT32, &value_element_item1)) {\n" -- "\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -+ "\t\t/* Marshal a uint32_t onto the message */\n" -+ "\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_UINT32, &value_element_item1)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -+ "\t\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\t}\n" - "}\n" - "\n" ---- libnih-1.0.3.orig/nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c -+++ libnih-1.0.3/nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c -@@ -27359,6 +27359,7 @@ - TEST_TRUE (unix_fd_to_str_replied); - - TEST_EQ_P (last_data, parent); -+ TEST_NE (last_str_value[0], '\0'); - TEST_TRUE (strchr ("0123456789", last_str_value[0])); - TEST_ALLOC_PARENT (last_str_value, parent); - -@@ -27673,6 +27674,7 @@ - - TEST_EQ (ret, 0); - -+ TEST_NE (str_value[0], '\0'); - TEST_TRUE (strchr ("0123456789", str_value[0])); - TEST_ALLOC_PARENT (str_value, parent); - ---- libnih-1.0.3.orig/nih-dbus-tool/tests/test_property.c -+++ libnih-1.0.3/nih-dbus-tool/tests/test_property.c -@@ -8733,7 +8733,7 @@ - TypeVar * var; - NihListEntry * attrib; - NihDBusProxy * proxy = NULL; -- void * parent = NULL; -+ void * parent __attribute__((unused)) = NULL; - pid_t pid = -1; - int status; - DBusMessage * method_call; ---- libnih-1.0.3.orig/nih-dbus-tool/tests/expected/test_method_object_function_standard.c -+++ libnih-1.0.3/nih-dbus-tool/tests/expected/test_method_object_function_standard.c -@@ -136,17 +136,19 @@ - goto enomem; - } - -- for (size_t output_i = 0; output[output_i]; output_i++) { -- const char *output_element; -+ if (output) { -+ for (size_t output_i = 0; output[output_i]; output_i++) { -+ const char *output_element; - -- output_element = output[output_i]; -+ output_element = output[output_i]; - -- /* Marshal a char * onto the message */ -- if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -- dbus_message_iter_abandon_container (&iter, &output_iter); -- dbus_message_unref (reply); -- reply = NULL; -- goto enomem; -+ /* Marshal a char * onto the message */ -+ if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -+ dbus_message_iter_abandon_container (&iter, &output_iter); -+ dbus_message_unref (reply); -+ reply = NULL; -+ goto enomem; -+ } - } - } - ---- libnih-1.0.3.orig/nih-dbus-tool/tests/expected/test_method_reply_function_standard.c -+++ libnih-1.0.3/nih-dbus-tool/tests/expected/test_method_reply_function_standard.c -@@ -7,7 +7,6 @@ - DBusMessageIter output_iter; - - nih_assert (message != NULL); -- nih_assert (output != NULL); - - /* If the sender doesn't care about a reply, don't bother wasting - * effort constructing and sending one. -@@ -28,16 +27,18 @@ - return -1; - } - -- for (size_t output_i = 0; output[output_i]; output_i++) { -- const char *output_element; -- -- output_element = output[output_i]; -- -- /* Marshal a char * onto the message */ -- if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -- dbus_message_iter_abandon_container (&iter, &output_iter); -- dbus_message_unref (reply); -- return -1; -+ if (output) { -+ for (size_t output_i = 0; output[output_i]; output_i++) { -+ const char *output_element; -+ -+ output_element = output[output_i]; -+ -+ /* Marshal a char * onto the message */ -+ if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -+ dbus_message_iter_abandon_container (&iter, &output_iter); -+ dbus_message_unref (reply); -+ return -1; -+ } - } - } - ---- libnih-1.0.3.orig/nih-dbus-tool/tests/expected/test_method_reply_function_deprecated.c -+++ libnih-1.0.3/nih-dbus-tool/tests/expected/test_method_reply_function_deprecated.c -@@ -7,7 +7,6 @@ - DBusMessageIter output_iter; - - nih_assert (message != NULL); -- nih_assert (output != NULL); - - /* If the sender doesn't care about a reply, don't bother wasting - * effort constructing and sending one. -@@ -28,16 +27,18 @@ - return -1; - } - -- for (size_t output_i = 0; output[output_i]; output_i++) { -- const char *output_element; -- -- output_element = output[output_i]; -- -- /* Marshal a char * onto the message */ -- if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -- dbus_message_iter_abandon_container (&iter, &output_iter); -- dbus_message_unref (reply); -- return -1; -+ if (output) { -+ for (size_t output_i = 0; output[output_i]; output_i++) { -+ const char *output_element; -+ -+ output_element = output[output_i]; -+ -+ /* Marshal a char * onto the message */ -+ if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -+ dbus_message_iter_abandon_container (&iter, &output_iter); -+ dbus_message_unref (reply); -+ return -1; -+ } - } - } - ---- libnih-1.0.3.orig/nih-dbus-tool/tests/expected/test_method_object_function_no_input.c -+++ libnih-1.0.3/nih-dbus-tool/tests/expected/test_method_object_function_no_input.c -@@ -88,17 +88,19 @@ - goto enomem; - } - -- for (size_t output_i = 0; output[output_i]; output_i++) { -- const char *output_element; -+ if (output) { -+ for (size_t output_i = 0; output[output_i]; output_i++) { -+ const char *output_element; - -- output_element = output[output_i]; -+ output_element = output[output_i]; - -- /* Marshal a char * onto the message */ -- if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -- dbus_message_iter_abandon_container (&iter, &output_iter); -- dbus_message_unref (reply); -- reply = NULL; -- goto enomem; -+ /* Marshal a char * onto the message */ -+ if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -+ dbus_message_iter_abandon_container (&iter, &output_iter); -+ dbus_message_unref (reply); -+ reply = NULL; -+ goto enomem; -+ } - } - } - diff --git a/meta-oe/recipes-support/libnih/libnih_1.0.3.bb b/meta-oe/recipes-support/libnih/libnih_1.0.3.bb deleted file mode 100644 index 3e35f4d1fc..0000000000 --- a/meta-oe/recipes-support/libnih/libnih_1.0.3.bb +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2013 LG Electronics, Inc. - -SUMMARY = "libnih library" -HOMEPAGE = "https://launchpad.net/libnih" -DESCRIPTION = "libnih is a small library for C application development \ - containing functions that, despite its name, are not implemented \ - elsewhere in the standard library set. \ - \ - libnih is roughly equivalent to other C libraries such as glib, \ - except that its focus is on a small size and intended for \ - applications that sit very low in the software stack, especially \ - outside of /usr. \ - \ - It expressly does not reimplement functions that already exist in \ - libraries ordinarily shipped in /lib such libc6, and does not do \ - foolish things like invent arbitrary typedefs for perfectly good C types." - -SECTION = "libs" - -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = "dbus libnih-native" -DEPENDS_class-native = "dbus-native" - -SRC_URI = "https://launchpad.net/${BPN}/1.0/${PV}/+download/${BP}.tar.gz \ - file://libnih_1.0.3-4ubuntu16.patch \ - file://0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch \ - " - -SRC_URI[md5sum] = "db7990ce55e01daffe19006524a1ccb0" -SRC_URI[sha256sum] = "897572df7565c0a90a81532671e23c63f99b4efde2eecbbf11e7857fbc61f405" - -inherit autotools -inherit gettext - -# target libnih requires native nih-dbus-tool -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libnvme/libnvme_1.10.bb b/meta-oe/recipes-support/libnvme/libnvme_1.10.bb new file mode 100644 index 0000000000..a05d1168ef --- /dev/null +++ b/meta-oe/recipes-support/libnvme/libnvme_1.10.bb @@ -0,0 +1,22 @@ +SUMMARY = "libnvme development C library" +DESCRIPTION = "\ +libnvme provides type definitions for NVMe specification structures, \ +enumerations, and bit fields, helper functions to construct, dispatch, \ +and decode commands and payloads, and utilities to connect, scan, and \ +manage nvme devices on a Linux system." +HOMEPAGE = "https://github.com/linux-nvme/${BPN}" +SECTION = "libs" +LICENSE = "LGPL-2.1-only & CC0-1.0 & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ + file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" +DEPENDS = "json-c" +SRCREV = "dd51fa8550564c93436423a4d8ed4be92ae50290" + +SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +EXTRA_OEMESON += "-Dkeyutils=disabled -Dopenssl=disabled -Dpython=disabled" diff --git a/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch b/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch new file mode 100644 index 0000000000..2631f4ae73 --- /dev/null +++ b/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch @@ -0,0 +1,151 @@ +From c14d9bf71753a38df57cc6538b22ed389d2c2cb1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 4 Sep 2018 17:18:51 -0700 +Subject: [PATCH] Support OpenSSL 1.1.0 + +Taken from https://github.com/x42/liboauth/issues/9 + +Upstream-Status: Submitted [https://github.com/x42/liboauth/issues/9] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/hash.c | 65 ++++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 44 insertions(+), 21 deletions(-) + +diff --git a/src/hash.c b/src/hash.c +index 17ff5c8..e128826 100644 +--- a/src/hash.c ++++ b/src/hash.c +@@ -362,6 +362,11 @@ looser: + #include "oauth.h" // base64 encode fn's. + #include <openssl/hmac.h> + ++#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#define EVP_MD_CTX_new EVP_MD_CTX_create ++#define EVP_MD_CTX_free EVP_MD_CTX_destroy ++#endif ++ + char *oauth_sign_hmac_sha1 (const char *m, const char *k) { + return(oauth_sign_hmac_sha1_raw (m, strlen(m), k, strlen(k))); + } +@@ -386,7 +391,7 @@ char *oauth_sign_rsa_sha1 (const char *m, const char *k) { + unsigned char *sig = NULL; + unsigned char *passphrase = NULL; + unsigned int len=0; +- EVP_MD_CTX md_ctx; ++ EVP_MD_CTX *md_ctx; + + EVP_PKEY *pkey; + BIO *in; +@@ -399,24 +404,31 @@ char *oauth_sign_rsa_sha1 (const char *m, const char *k) { + return xstrdup("liboauth/OpenSSL: can not read private key"); + } + ++ md_ctx = EVP_MD_CTX_new(); ++ if (md_ctx == NULL) { ++ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX"); ++ } ++ + len = EVP_PKEY_size(pkey); + sig = (unsigned char*)xmalloc((len+1)*sizeof(char)); + +- EVP_SignInit(&md_ctx, EVP_sha1()); +- EVP_SignUpdate(&md_ctx, m, strlen(m)); +- if (EVP_SignFinal (&md_ctx, sig, &len, pkey)) { ++ EVP_SignInit(md_ctx, EVP_sha1()); ++ EVP_SignUpdate(md_ctx, m, strlen(m)); ++ if (EVP_SignFinal (md_ctx, sig, &len, pkey)) { + char *tmp; + sig[len] = '\0'; + tmp = oauth_encode_base64(len,sig); + OPENSSL_free(sig); + EVP_PKEY_free(pkey); ++ EVP_MD_CTX_free(md_ctx); + return tmp; + } ++ EVP_MD_CTX_free(md_ctx); + return xstrdup("liboauth/OpenSSL: rsa-sha1 signing failed"); + } + + int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) { +- EVP_MD_CTX md_ctx; ++ EVP_MD_CTX *md_ctx; + EVP_PKEY *pkey; + BIO *in; + X509 *cert = NULL; +@@ -437,13 +449,18 @@ int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) { + return -2; + } + ++ md_ctx = EVP_MD_CTX_new(); ++ if (md_ctx == NULL) { ++ return -2; ++ } ++ + b64d= (unsigned char*) xmalloc(sizeof(char)*strlen(s)); + slen = oauth_decode_base64(b64d, s); + +- EVP_VerifyInit(&md_ctx, EVP_sha1()); +- EVP_VerifyUpdate(&md_ctx, m, strlen(m)); +- err = EVP_VerifyFinal(&md_ctx, b64d, slen, pkey); +- EVP_MD_CTX_cleanup(&md_ctx); ++ EVP_VerifyInit(md_ctx, EVP_sha1()); ++ EVP_VerifyUpdate(md_ctx, m, strlen(m)); ++ err = EVP_VerifyFinal(md_ctx, b64d, slen, pkey); ++ EVP_MD_CTX_free(md_ctx); + EVP_PKEY_free(pkey); + xfree(b64d); + return (err); +@@ -455,35 +472,41 @@ int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) { + */ + char *oauth_body_hash_file(char *filename) { + unsigned char fb[BUFSIZ]; +- EVP_MD_CTX ctx; ++ EVP_MD_CTX *ctx; + size_t len=0; + unsigned char *md; + FILE *F= fopen(filename, "r"); + if (!F) return NULL; + +- EVP_MD_CTX_init(&ctx); +- EVP_DigestInit(&ctx,EVP_sha1()); ++ ctx = EVP_MD_CTX_new(); ++ if (ctx == NULL) { ++ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX"); ++ } ++ EVP_DigestInit(ctx,EVP_sha1()); + while (!feof(F) && (len=fread(fb,sizeof(char),BUFSIZ, F))>0) { +- EVP_DigestUpdate(&ctx, fb, len); ++ EVP_DigestUpdate(ctx, fb, len); + } + fclose(F); + len=0; + md=(unsigned char*) xcalloc(EVP_MD_size(EVP_sha1()),sizeof(unsigned char)); +- EVP_DigestFinal(&ctx, md,(unsigned int*) &len); +- EVP_MD_CTX_cleanup(&ctx); ++ EVP_DigestFinal(ctx, md,(unsigned int*) &len); ++ EVP_MD_CTX_free(ctx); + return oauth_body_hash_encode(len, md); + } + + char *oauth_body_hash_data(size_t length, const char *data) { +- EVP_MD_CTX ctx; ++ EVP_MD_CTX *ctx; + size_t len=0; + unsigned char *md; + md=(unsigned char*) xcalloc(EVP_MD_size(EVP_sha1()),sizeof(unsigned char)); +- EVP_MD_CTX_init(&ctx); +- EVP_DigestInit(&ctx,EVP_sha1()); +- EVP_DigestUpdate(&ctx, data, length); +- EVP_DigestFinal(&ctx, md,(unsigned int*) &len); +- EVP_MD_CTX_cleanup(&ctx); ++ ctx = EVP_MD_CTX_new(); ++ if (ctx == NULL) { ++ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX"); ++ } ++ EVP_DigestInit(ctx,EVP_sha1()); ++ EVP_DigestUpdate(ctx, data, length); ++ EVP_DigestFinal(ctx, md,(unsigned int*) &len); ++ EVP_MD_CTX_free(ctx); + return oauth_body_hash_encode(len, md); + } + diff --git a/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb b/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb index 3311da5a8f..d4b8170873 100644 --- a/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb +++ b/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb @@ -3,13 +3,15 @@ DESCRIPTION = "C library implementing OAuth Core RFC 5849" HOMEPAGE = "http://liboauth.sourceforge.net" -LICENSE = "MIT|GPL-2.0" +LICENSE = "MIT|GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=6266718a5241c045c8099d9be48817df \ file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" SECTION = "libs" DEPENDS = "curl openssl" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BP}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BP}.tar.gz \ + file://0001-Support-OpenSSL-1.1.0.patch \ + " SRC_URI[md5sum] = "689b46c2b3ab1a39735ac33f714c4f7f" SRC_URI[sha256sum] = "0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f" diff --git a/meta-oe/recipes-support/libol/libol/configure.patch b/meta-oe/recipes-support/libol/libol/configure.patch deleted file mode 100644 index 87695fb06d..0000000000 --- a/meta-oe/recipes-support/libol/libol/configure.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: libol-0.3.18/configure.in -=================================================================== ---- libol-0.3.18.orig/configure.in 2006-03-27 14:44:52.000000000 +0000 -+++ libol-0.3.18/configure.in 2014-07-18 07:05:56.029481372 +0000 -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(src/abstract_io.c) -+AC_INIT(libol, "0.3.18") - --AM_INIT_AUTOMAKE(libol, "0.3.18", 1) -+AM_INIT_AUTOMAKE([foreign]) - if test -n "$SNAPSHOT_VERSION"; then - VERSION=$VERSION+$SNAPSHOT_VERSION - fi diff --git a/meta-oe/recipes-support/libol/libol_0.3.18.bb b/meta-oe/recipes-support/libol/libol_0.3.18.bb deleted file mode 100644 index 74e1ef2156..0000000000 --- a/meta-oe/recipes-support/libol/libol_0.3.18.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A tiny C support library" -HOMEPAGE = "https://my.balabit.com/downloads/libol" -SECTION = "libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" - -SRC_URI = "http://www.balabit.com/downloads/files/libol/0.3/${BP}.tar.gz \ - file://configure.patch" -SRC_URI[md5sum] = "cbadf4b7ea276dfa85acc38a1cc5ff17" -SRC_URI[sha256sum] = "9de3bf13297ff882e02a1e6e5f6bf760a544aff92a9d8a1cf4328a32005cefe7" - -inherit autotools binconfig - -do_compile_prepend() { - install ${S}/utils/make_class.in ${B}/utils -} - -do_install_append() { - rm -fr ${D}${bindir} -} diff --git a/meta-oe/recipes-support/liboop/liboop/explicit_linking.patch b/meta-oe/recipes-support/liboop/liboop/explicit_linking.patch deleted file mode 100644 index 05d3bf6f44..0000000000 --- a/meta-oe/recipes-support/liboop/liboop/explicit_linking.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -51,7 +51,7 @@ noinst_PROGRAMS = test-oop - - test_oop_SOURCES = test-oop.c - test_oop_CFLAGS = $(GLIB2_CFLAGS) $(GLIB_INCLUDES) $(TCL_INCLUDES) $(WWW_INCLUDES) --test_oop_LDADD = $(lib_LTLIBRARIES) -+test_oop_LDADD = $(lib_LTLIBRARIES) $(GLIB2_LIBS) $(ADNS_LIBS) $(TCL_LIBS) $(READLINE_LIBS) - - release: dist - gzip -dc $(PACKAGE)-$(VERSION).tar.gz | bzip2 -9 \ ---- a/liboop-glib2.pc.in -+++ b/liboop-glib2.pc.in -@@ -7,5 +7,5 @@ Name: liboop-glib2 - Description: Event loop management library (GLIB2 support) - Version: @VERSION@ - Requires: liboop = @VERSION@ glib-2.0 --Libs: -L${libdir} -loop-glib2 -+Libs: -L${libdir} -loop-glib2 @GLIB2_LIBS@ - Cflags: -D_REENTRANT -I${includedir} diff --git a/meta-oe/recipes-support/liboop/liboop/new-readline-typedef.patch b/meta-oe/recipes-support/liboop/liboop/new-readline-typedef.patch deleted file mode 100644 index 0a0242032f..0000000000 --- a/meta-oe/recipes-support/liboop/liboop/new-readline-typedef.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/test-oop.c -+++ b/test-oop.c -@@ -180,7 +180,7 @@ static void *stop_readline(oop_source *s - static void add_readline(oop_source *src) { - rl_callback_handler_install( - (char *) "> ", /* readline isn't const-correct */ -- (VFunction *) on_readline); -+ (rl_vcpfunc_t *) on_readline); - oop_readline_register(src); - src->on_signal(src,SIGQUIT,stop_readline,NULL); - } diff --git a/meta-oe/recipes-support/liboop/liboop/read_bugfixes.patch b/meta-oe/recipes-support/liboop/liboop/read_bugfixes.patch deleted file mode 100644 index 1880a241ac..0000000000 --- a/meta-oe/recipes-support/liboop/liboop/read_bugfixes.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Ian Jackson <ijackson@chiark.greenend.org.uk> -Applied-Upstream: no -Bug-Debian: http://bugs.debian.org/579604 -Subject: oop-read.h bugfixes - -Some years ago I contributed a feature for reading lines and records -to liboop: oop-read.h and read.c. Since it took a while for that -feature to make it into distributed versions, for a long time I've -been using my own copy of the source file. It seems that I fixed a -couple of bugs in my copy which are still in the Debian package. I -can't find any record of me having told anyone about them and now I -find that 1.0-6 still has the bugs. - -There are two fixes: - * Initialise "rd->discard" properly - * Avoid rd->neednotcheck becoming negative - ---- a/read.c -+++ b/read.c -@@ -114,6 +114,7 @@ oop_read *oop_rd_new(oop_source *oop, oo - rd->allocbuf= 0; - rd->used= 0; - rd->alloc= buf ? bufsz : 0; -+ rd->discard= 0; - rd->neednotcheck= 0; - rd->displacedchar= -1; - rd->style= *OOP_RD_STYLE_IMMED; -@@ -235,7 +236,11 @@ static void *on_process(oop_source *oop, - - if (rd->discard) { - rd->used -= rd->discard; -- rd->neednotcheck -= rd->discard; -+ if (rd->neednotcheck > rd->discard) { -+ rd->neednotcheck -= rd->discard; -+ } else { -+ rd->neednotcheck= 0; -+ } - memmove(buf, buf + rd->discard, rd->used); - rd->discard= 0; - } diff --git a/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch b/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch index e738be54ca..0521aaeaff 100644 --- a/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch +++ b/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch @@ -1,14 +1,5 @@ ---- a/configure -+++ b/configure -@@ -19935,7 +19935,7 @@ - fi - - if test xno != x$with_tcl; then -- for version in 8.4 8.3 8.2 8.1 8.0 ; do -+ for version in "" 8.4 8.3 8.2 8.1 8.0 ; do - CPPFLAGS="$save_cppflags -I/usr/include/tcl$version" - as_ac_Lib=`echo "ac_cv_lib_tcl$version''_Tcl_Main" | $as_tr_sh` - echo "$as_me:$LINENO: checking for Tcl_Main in -ltcl$version" >&5 +Upstream-Status: Pending + --- a/configure.ac +++ b/configure.ac @@ -71,7 +71,7 @@ diff --git a/meta-oe/recipes-support/liboop/liboop_1.0.bb b/meta-oe/recipes-support/liboop/liboop_1.0.1.bb index 82818c2424..7ad88b7402 100644 --- a/meta-oe/recipes-support/liboop/liboop_1.0.bb +++ b/meta-oe/recipes-support/liboop/liboop_1.0.1.bb @@ -1,17 +1,14 @@ DESCRIPTION = "Liboop is a low-level event loop management library for POSIX-based operating systems" -HOMEPAGE = "http://liboop.org/" -LICENSE = "GPL-2.0" +HOMEPAGE = "http://www.lysator.liu.se/liboop/" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8b54f38ccbd44feb80ab90e01af8b700" -SRC_URI = "http://ftp.debian.org/debian/pool/main/libo/liboop/liboop_${PV}.orig.tar.gz \ - file://read_bugfixes.patch \ - file://explicit_linking.patch \ +SRC_URI = "http://ftp.lysator.liu.se/pub/liboop/liboop-${PV}.tar.gz \ file://tcl_dev.patch \ - file://new-readline-typedef.patch \ " -SRC_URI[md5sum] = "36cb971047d3af02369446f5e0b315a2" -SRC_URI[sha256sum] = "34d83c6e0f09ee15cb2bc3131e219747c3b612bb57cf7d25318ab90da9a2d97c" +SRC_URI[md5sum] = "f2b3dff17355fd9a6e2229caca8993f0" +SRC_URI[sha256sum] = "56af16ad65e7397dadc8268e37ff6f67431db390c60c75e21a33e12b0e0d17e0" PACKAGECONFIG ?= "" PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" diff --git a/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch b/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch new file mode 100644 index 0000000000..778a1f6e1e --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch @@ -0,0 +1,28 @@ +From 123b5a4c5e09f4262d4545a0bc5edb01a19b6b76 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Mon, 21 Aug 2023 10:06:55 +0200 +Subject: [PATCH] meson.build: allow crosscompiling gir + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 39b739e..46f2252 100644 +--- a/meson.build ++++ b/meson.build +@@ -29,7 +29,7 @@ libosinfo_pkgconfdir = join_paths(libosinfo_libdir, 'pkgconfig') + + # gobject introspection + gir = find_program('g-ir-scanner', required: get_option('enable-introspection')) +-enable_introspection = gir.found() and not meson.is_cross_build() ++enable_introspection = gir.found() + + # vala + vapi_opt = get_option('enable-vala') +-- +2.41.0 + diff --git a/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch b/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch new file mode 100644 index 0000000000..467c6b4baf --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch @@ -0,0 +1,32 @@ +From 5bbdd06503456784c5ffa22409e8bab50470d673 Mon Sep 17 00:00:00 2001 +From: Michal Privoznik <mprivozn@redhat.com> +Date: Mon, 27 Nov 2023 15:11:45 +0100 +Subject: [PATCH] osinfo: Make xmlError struct constant in + propagate_libxml_error() + +In libxml2 commit v2.12.0~14 the API changed so that +xmlGetLastError() returns pointer to a constant xmlError struct. +Reflect this change in our code. + +Upstream-Status: Backport [https://gitlab.com/libosinfo/libosinfo/-/merge_requests/155] +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + osinfo/osinfo_install_script.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c +index 5800f37..303245a 100644 +--- a/osinfo/osinfo_install_script.c ++++ b/osinfo/osinfo_install_script.c +@@ -769,7 +769,7 @@ static void propagate_libxml_error(GError **error, const char *format, ...) G_GN + + static void propagate_libxml_error(GError **error, const char *format, ...) + { +- xmlErrorPtr err = xmlGetLastError(); ++ const xmlError *err = xmlGetLastError(); + char *prefix; + va_list ap; + +-- +2.44.0 + diff --git a/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb b/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb new file mode 100644 index 0000000000..727d5ecf89 --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "API for managing information about operating systems, hypervisors and the (virtual) hardware devices." +HOMEPAGE = "https://libosinfo.org" + +LICENSE = "LGPL-2.1-only & GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2b0e9926530c269f5ae95560370195af" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = " \ + git://gitlab.com/libosinfo/libosinfo.git;branch=main;protocol=https \ + file://0001-meson.build-allow-crosscompiling-gir.patch \ + file://0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch \ +" + +SRCREV = "ca9dd5b810dc04ea38048ae9be491654c8596ef9" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig gtk-doc gobject-introspection vala + +DEPENDS = "glib-2.0 libsoup libxslt" + +VALA_MESON_OPTION = 'enable-vala' +VALA_MESON_ENABLE_FLAG = 'enabled' +VALA_MESON_DISABLE_FLAG = 'disabled' +GIR_MESON_OPTION = "enable-introspection" +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = "enable-gtk-doc" + +EXTRA_OEMESON += " \ + -Dwith-pci-ids-path=${datadir}/hwdata/pci.ids \ + -Dwith-usb-ids-path=${datadir}/hwdata/usb.ids \ +" + +RDEPENDS:${PN} = "hwdata osinfo-db" diff --git a/meta-oe/recipes-support/libosinfo/osinfo-db-tools/0001-Make-xmlError-structs-constant.patch b/meta-oe/recipes-support/libosinfo/osinfo-db-tools/0001-Make-xmlError-structs-constant.patch new file mode 100644 index 0000000000..edff5732c6 --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/osinfo-db-tools/0001-Make-xmlError-structs-constant.patch @@ -0,0 +1,56 @@ +Upstream-Status: Backport [https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/34378a4] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +From 34378a4ac257f2f5fcf364786d1634a8c36b304f Mon Sep 17 00:00:00 2001 +From: Michal Privoznik <mprivozn@redhat.com> +Date: Mon, 27 Nov 2023 15:04:43 +0100 +Subject: [PATCH] Make xmlError structs constant + +In libxml2 commits v2.12.0~14 and v2.12.0~77 the API changed so +that: + +1) xmlGetLastError() returns pointer to a constant xmlError + struct, and + +2) xmlSetStructuredErrorFunc() changed the signature of callback + (validate_structured_error_nop()), it too is passed pointer to + a constant xmlError struct. + +But of course, older libxml2 expects different callback +signature. Therefore, we need to typecast it anyway. + +Also, drop obviously incorrect @error annotation in +validate_structured_error_nop; the variable is used. + +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + tools/osinfo-db-validate.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c +index a721b4d..b1434a6 100644 +--- a/tools/osinfo-db-validate.c ++++ b/tools/osinfo-db-validate.c +@@ -35,7 +35,7 @@ static void validate_generic_error_nop(void *userData G_GNUC_UNUSED, + } + + static void validate_structured_error_nop(void *userData G_GNUC_UNUSED, +- xmlErrorPtr error G_GNUC_UNUSED) ++ const xmlError *error) + { + if (error->file) + g_printerr("%s:%d %s", error->file, error->line, error->message); +@@ -173,7 +173,8 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro + g_autofree gchar *schemapath = NULL; + + xmlSetGenericErrorFunc(NULL, validate_generic_error_nop); +- xmlSetStructuredErrorFunc(NULL, validate_structured_error_nop); ++ /* Drop this typecast when >=libxml2-2.12.0 is required */ ++ xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc) validate_structured_error_nop); + + schemapath = g_file_get_path(schema); + rngParser = xmlRelaxNGNewParserCtxt(schemapath); +-- +2.34.1 + diff --git a/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.11.0.bb b/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.11.0.bb new file mode 100644 index 0000000000..0584bee15c --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.11.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "Tools for managing the libosinfo database files" +HOMEPAGE = "https://libosinfo.org" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "glib-2.0 json-glib libarchive libsoup-2.4" + +SRC_URI = "git://gitlab.com/libosinfo/osinfo-db-tools.git;branch=main;protocol=https \ + file://0001-Make-xmlError-structs-constant.patch \ + " +SRCREV = "85a1788c6977419b6facad11dbfbf823e739eb3b" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libosinfo/osinfo-db_20240701.bb b/meta-oe/recipes-support/libosinfo/osinfo-db_20240701.bb new file mode 100644 index 0000000000..d369046055 --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/osinfo-db_20240701.bb @@ -0,0 +1,21 @@ +SUMMARY = "osinfo-db provides the database files for use with the libosinfo library" +HOMEPAGE = "https://libosinfo.org" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "osinfo-db-tools-native" + +SRC_URI = "git://gitlab.com/libosinfo/osinfo-db.git;branch=main;protocol=https" + +SRCREV = "cde78484ab747c87532d47cf3f09b76f280c0b74" + +S = "${WORKDIR}/git" + +inherit allarch autotools-brokensep + +EXTRA_OEMAKE = "OSINFO_DB_TARGET='--dir ${datadir}/osinfo'" + +do_configure[noexec] = "1" + +FILES:${PN} = "${datadir}/osinfo" diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.12.bb b/meta-oe/recipes-support/libp11/libp11_0.4.12.bb new file mode 100644 index 0000000000..2237782009 --- /dev/null +++ b/meta-oe/recipes-support/libp11/libp11_0.4.12.bb @@ -0,0 +1,30 @@ +SUMMARY = "Library for using PKCS" +DESCRIPTION = "\ +Libp11 is a library implementing a small layer on top of PKCS \ +make using PKCS" +HOMEPAGE = "https://github.com/OpenSC/libp11" +BUGTRACKER = "https://github.com/OpenSC/libp11/issues" +SECTION = "Development/Libraries" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" +DEPENDS = "libtool openssl" + +SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https" +SRCREV = "53d65dc48cf436694f7edcfc805414e608e8a2bf" + +UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-static" + +do_install:append () { + rm -rf ${D}${docdir}/${BPN} +} + +FILES:${PN} += "${libdir}/engines*/pkcs11.so" +FILES:${PN}-dev += "${libdir}/engines*/libpkcs11${SOLIBSDEV}" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.7.bb b/meta-oe/recipes-support/libp11/libp11_0.4.7.bb deleted file mode 100644 index 949c33752b..0000000000 --- a/meta-oe/recipes-support/libp11/libp11_0.4.7.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Library for using PKCS" -DESCRIPTION = "\ -Libp11 is a library implementing a small layer on top of PKCS \ -make using PKCS" -HOMEPAGE = "http://www.opensc-project.org/libp11" -SECTION = "Development/Libraries" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" -DEPENDS = "libtool openssl" - -SRC_URI = "git://github.com/OpenSC/libp11.git" -SRCREV = "64569a391897bd29c5060b19fa4613e619e59277" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-static" - -do_install_append () { - rm -rf ${D}${libdir}/*.la - rm -rf ${D}${docdir}/${BPN} -} - -FILES_${PN} += "${libdir}/engines/pkcs11.so" -FILES_${PN}-dev += "${libdir}/engines/libpkcs11${SOLIBSDEV}" diff --git a/meta-oe/recipes-support/libpaper/libpaper_2.2.5.bb b/meta-oe/recipes-support/libpaper/libpaper_2.2.5.bb new file mode 100644 index 0000000000..3b0e1bf0dd --- /dev/null +++ b/meta-oe/recipes-support/libpaper/libpaper_2.2.5.bb @@ -0,0 +1,12 @@ +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "https://github.com/rrthomas/libpaper/releases/download/v${PV}/libpaper-${PV}.tar.gz" +SRC_URI[sha256sum] = "7be50974ce0df0c74e7587f10b04272cd53fd675cb6a1273ae1cc5c9cc9cab09" + +UPSTREAM_CHECK_URI = "https://github.com/rrthomas/libpaper/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + +inherit perlnative autotools + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb new file mode 100644 index 0000000000..6b1355fa37 --- /dev/null +++ b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb @@ -0,0 +1,14 @@ +SUMMARY = "raw image decoder" +LICENSE = "LGPL-2.1-only | CDDL-1.0" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=1501ae0aa3c8544e63f08d6f7bf88a6f" + +SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=0.21-stable;protocol=https" +SRCREV = "1ef70158d7fde1ced6aaddb0b9443c32a7121d3d" +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +DEPENDS = "jpeg jasper lcms" + +CVE_STATUS[CVE-2020-22628] = "cpe-incorrect: The current version (0.21.2) is not affected by the CVE which affects versions earlier than 0.21.2" +CVE_STATUS[CVE-2023-1729] = "cpe-incorrect: The current version (0.21.2) is not affected by the CVE which affects versions earlier than 0.21.2" diff --git a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb index 337780789d..15e1ee2438 100644 --- a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb +++ b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb @@ -1,7 +1,7 @@ SUMMARY = "base library for low-level IEEE 1394 accesses" HOMEPAGE = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394" SECTION = "libs" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRC_URI = "https://www.kernel.org/pub/linux/libs/ieee1394/${BPN}-${PV}.tar.gz" diff --git a/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch b/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch new file mode 100644 index 0000000000..053a4cc2d8 --- /dev/null +++ b/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch @@ -0,0 +1,30 @@ +From ed1dd35e0e23a98e57567718a0d474fd29cc348a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 19 Mar 2022 21:36:41 -0700 +Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR + +this ensures that it is portable across platforms e.g. ppc64/linux +uses lib64 not lib + +Upstream-Status: Submitted [https://github.com/edenhill/librdkafka/pull/3770] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d1129bce..774473fa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -219,7 +219,7 @@ configure_file("packaging/cmake/config.h.in" "${GENERATED_DIR}/config.h") + + include(GNUInstallDirs) + +-set(config_install_dir "lib/cmake/${PROJECT_NAME}") ++set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") + +-- +2.35.1 + diff --git a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb b/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb new file mode 100644 index 0000000000..6148e7cb08 --- /dev/null +++ b/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "the Apache Kafka C/C++ client library" +DESCRIPTION = "librdkafka is a C library implementation of the Apache Kafka protocol, \ + providing Producer, Consumer and Admin clients." +HOMEPAGE = "https://github.com/edenhill/librdkafka" +SECTION = "libs" +LICENSE = "BSD-2-Clause" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=2be8675acbfdac48935e73897af5f646" + +SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master \ + file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \ + " +SRCREV = "063a9ae7a65cebdf1cc128da9815c05f91a2a996" + +DEPENDS = "zlib openssl zstd" + +inherit cmake + +S = "${WORKDIR}/git" + +FILES:${PN} += "${datadir}" + +EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF -DRDKAFKA_BUILD_TESTS=OFF" diff --git a/meta-oe/recipes-support/librsync/librsync_2.3.4.bb b/meta-oe/recipes-support/librsync/librsync_2.3.4.bb new file mode 100644 index 0000000000..3cad665389 --- /dev/null +++ b/meta-oe/recipes-support/librsync/librsync_2.3.4.bb @@ -0,0 +1,17 @@ +SUMMARY = "Remote delta-compression library." + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" + +SRC_URI = "git://github.com/librsync/librsync.git;branch=master;protocol=https" +SRCREV = "e364852674780e43d578e4239128ff7014190ed3" +S = "${WORKDIR}/git" + +DEPENDS = "popt" + +inherit cmake + +PACKAGES =+ "rdiff" +FILES:rdiff = "${bindir}/rdiff" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch b/meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch deleted file mode 100644 index 2d5bd6d910..0000000000 --- a/meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: SDL2_ttf-2.0.14/Makefile.am -=================================================================== ---- SDL2_ttf-2.0.14.orig/Makefile.am -+++ SDL2_ttf-2.0.14/Makefile.am -@@ -1,6 +1,8 @@ - # Makefile.am for the SDL truetype font loading library and viewer - lib_LTLIBRARIES = libSDL2_ttf.la - -+AUTOMAKE_OPTIONS = foreign -+ - libSDL2_ttfincludedir = $(includedir)/SDL2 - libSDL2_ttfinclude_HEADERS = \ - SDL_ttf.h diff --git a/meta-oe/recipes-support/libsdl-ttf/files/use.pkg-config.for.freetype2.patch b/meta-oe/recipes-support/libsdl-ttf/files/use.pkg-config.for.freetype2.patch deleted file mode 100644 index 8a11f66495..0000000000 --- a/meta-oe/recipes-support/libsdl-ttf/files/use.pkg-config.for.freetype2.patch +++ /dev/null @@ -1,57 +0,0 @@ -freetype-config was removed from oe-core in - -commit 5870bd272b0b077d0826fb900b251884c1c05061 -Author: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Thu May 22 10:59:33 2014 +0100 - - binconfig-disabled: Add class and use - -diff --git a/configure.in b/configure.in -index 408e8d6..5f9e730 100644 ---- a/configure.in -+++ b/configure.in -@@ -86,39 +86,11 @@ case "$host" in - esac - AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue) - --dnl Check for the FreeType 2 library --dnl --dnl Get the cflags and libraries from the freetype-config script --dnl --AC_ARG_WITH(freetype-prefix,[ --with-freetype-prefix=PFX Prefix where FREETYPE is --installed (optional)], -- freetype_prefix="$withval", freetype_prefix="") --AC_ARG_WITH(freetype-exec-prefix,[ --with-freetype-exec-prefix=PFX Exec prefix --where FREETYPE is installed (optional)], -- freetype_exec_prefix="$withval", freetype_exec_prefix="") -- --if test x$freetype_exec_prefix != x ; then -- freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix" -- if test x${FREETYPE_CONFIG+set} != xset ; then -- FREETYPE_CONFIG=$freetype_exec_prefix/bin/freetype-config -- fi --fi --if test x$freetype_prefix != x ; then -- freetype_args="$freetype_args --prefix=$freetype_prefix" -- if test x${FREETYPE_CONFIG+set} != xset ; then -- FREETYPE_CONFIG=$freetype_prefix/bin/freetype-config -- fi --fi --AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) --no_freetype="" --if test "$FREETYPE_CONFIG" = "no" ; then -- AC_MSG_ERROR([ --*** Unable to find FreeType2 library (http://www.freetype.org/) --]) --else -- CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`" -- LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`" --fi -+PKG_CHECK_MODULES(FREETYPE2, freetype2, -+ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" -+ LIBS="$LIBS $FREETYPE2_LIBS", -+ AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) -+) - - dnl Check for SDL - SDL_VERSION=2.0.0 diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.11.bb b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.11.bb deleted file mode 100644 index d8b378f2cd..0000000000 --- a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.11.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Simple DirectMedia Layer truetype font library" -SECTION = "libs" -DEPENDS = "virtual/libsdl freetype" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING;md5=22800d1b3701377aae0b61ee36f5c303" - -SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \ - file://use.pkg-config.for.freetype2.patch \ -" -SRC_URI[md5sum] = "61e29bd9da8d245bc2471d1b2ce591aa" -SRC_URI[sha256sum] = "724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7" - -S = "${WORKDIR}/SDL_ttf-${PV}" - -inherit autotools pkgconfig - -LDFLAGS += "-lm" - -do_configure_prepend() { - # make autoreconf happy - touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog - - # Removing these files fixes a libtool version mismatch. - MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" - - for i in ${MACROS}; do - rm -f ${S}/acinclude/$i - done -} diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb deleted file mode 100644 index 4601593ad8..0000000000 --- a/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Simple DirectMedia Layer truetype font library" -SECTION = "libs" -DEPENDS = "virtual/libsdl2 freetype virtual/libgl" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=cb33e7c4df9fbde389f149ad6bc93ce5" - -SRC_URI = " \ - http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \ - file://use.pkg-config.for.freetype2.patch \ - file://automake_foreign.patch \ -" -SRC_URI[md5sum] = "e53c05e1e7f1382c316afd6c763388b1" -SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276" - -S = "${WORKDIR}/SDL2_ttf-${PV}" - -inherit autotools pkgconfig distro_features_check - -# links to libGL.so -REQUIRED_DISTRO_FEATURES += "x11 opengl" - -do_configure_prepend() { - # Removing these files fixes a libtool version mismatch. - MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" - - for i in ${MACROS}; do - rm -f ${S}/acinclude/$i - done -} -ASNEEDED = "" diff --git a/meta-oe/recipes-support/libsmi/libsmi/0001-Define-createIdentifierRef-prototype-in-yang-complex.patch b/meta-oe/recipes-support/libsmi/libsmi/0001-Define-createIdentifierRef-prototype-in-yang-complex.patch new file mode 100644 index 0000000000..3374f8484e --- /dev/null +++ b/meta-oe/recipes-support/libsmi/libsmi/0001-Define-createIdentifierRef-prototype-in-yang-complex.patch @@ -0,0 +1,53 @@ +From 77b520a8ee193b6d9f12e049f505d8d98204c11c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 17:13:32 -0700 +Subject: [PATCH] Define createIdentifierRef prototype in yang-complex-types.c + +Provide needed prototype to make compiler happy + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/parser-yang.y | 3 ++- + lib/yang-complex-types.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +--- a/lib/parser-yang.y ++++ b/lib/parser-yang.y +@@ -41,7 +41,8 @@ + #include "yang-complex-types.h" + #include "util.h" + #include "error.h" +- ++#include "yang-check.h" ++ + #ifdef HAVE_DMALLOC_H + #include <dmalloc.h> + #endif +@@ -61,7 +62,8 @@ + #define debug + #endif + +- ++extern void createIdentifierRef(struct _YangNode *node, char* prefix, char* ident); ++extern void smiyyerror(char *msg, Parser *parserPtr); + /* + * NOTE: The argument lvalp ist not really a void pointer. Unfortunately, + * we don't know it better at this point. bison generated C code declares +--- a/lib/yang-complex-types.c ++++ b/lib/yang-complex-types.c +@@ -35,12 +35,13 @@ + #include "yang-data.h" + #include "yang-check.h" + #include "yang-complex-types.h" +- + /* + * Current parser defined in parser-yang. Workaround - can't include data.h + */ + extern Parser *currentParser; + ++extern void createIdentifierRef(struct _YangNode *node, char* prefix, char* ident); ++ + static const int parents_complex_type[] = { + YANG_DECL_MODULE, YANG_DECL_SUBMODULE, YANG_DECL_CONTAINER, + YANG_DECL_LIST, YANG_DECL_RPC, YANG_DECL_INPUT, diff --git a/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch b/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch new file mode 100644 index 0000000000..9354a889a0 --- /dev/null +++ b/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch @@ -0,0 +1,28 @@ +From 86b706f694b822d8028fd36320147767056d2ffa Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 6 Sep 2022 12:09:00 -0700 +Subject: [PATCH] parser-yang: Define _DEFAULT_SOURCE + +This is needed for timegm API + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/parser-yang.y | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/parser-yang.y b/lib/parser-yang.y +index b111607..0ded9d2 100644 +--- a/lib/parser-yang.y ++++ b/lib/parser-yang.y +@@ -21,6 +21,7 @@ + #ifdef BACKEND_YANG + + #define _ISOC99_SOURCE ++#define _DEFAULT_SOURCE + #include <stdio.h> + #include <errno.h> + #include <stdlib.h> +-- +2.37.3 + diff --git a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index b537ce67dc..0dda756dd7 100644 --- a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -1,32 +1,46 @@ SUMMARY = "A Library to Access SMI MIB Information" HOMEPAGE = "https://www.ibr.cs.tu-bs.de/projects/libsmi" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause & TCL" LIC_FILES_CHKSUM = "file://COPYING;md5=3ad3076f9332343a21636cfd351f05b7" SRC_URI = "https://www.ibr.cs.tu-bs.de/projects/${BPN}/download/${BP}.tar.gz \ file://smi.conf \ file://libsmi-fix-the-test-dump-files.patch \ + file://0001-Define-createIdentifierRef-prototype-in-yang-complex.patch \ + file://0001-parser-yang-Define-_DEFAULT_SOURCE.patch \ " SRC_URI[md5sum] = "4bf47483c06c9f07d1b10fbc74eddf11" SRC_URI[sha256sum] = "f21accdadb1bb328ea3f8a13fc34d715baac6e2db66065898346322c725754d3" -RDEPENDS_${PN} += "wget" +UPSTREAM_CHECK_URI = "https://repology.org/project/libsmi/information" +UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" -inherit autotools +DEPENDS += "bison-native flex-native wget-native gawk-native" -EXTRA_OECONF = "ac_cv_path_SH=${base_bindir}/sh ac_cv_path_WGET=${bindir}/wget" +inherit autotools-brokensep update-alternatives +ALTERNATIVE_PRIORITY = "50" +ALTERNATIVE:${PN}-yang = " ietf-interfaces ietf-netconf-acm ietf-netconf-with-defaults ietf-netconf" +ALTERNATIVE_LINK_NAME[ietf-interfaces] = "${datadir}/yang/ietf-interfaces.yang" +ALTERNATIVE_LINK_NAME[ietf-netconf-acm] = "${datadir}/yang/ietf-netconf-acm.yang" +ALTERNATIVE_LINK_NAME[ietf-netconf-with-defaults] = "${datadir}/yang/ietf-netconf-with-defaults.yang" +ALTERNATIVE_LINK_NAME[ietf-netconf] = "${datadir}/yang/ietf-netconf.yang" -do_install_append () { +EXTRA_OECONF:class-native = "ac_cv_path_SH=/bin/sh" +EXTRA_OECONF:class-target = "ac_cv_path_SH=/bin/sh ac_cv_path_WGET=${bindir}/wget ac_cv_path_AWK=${bindir}/awk" + +do_install:append () { install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/smi.conf ${D}${sysconfdir}/smi.conf + install -m 0644 ${UNPACKDIR}/smi.conf ${D}${sysconfdir}/smi.conf } PACKAGES += "${PN}-mibs ${PN}-pibs ${PN}-yang" -FILES_${PN}-mibs += "${datadir}/mibs" -FILES_${PN}-pibs += "${datadir}/pibs" -FILES_${PN}-yang += "${datadir}/yang" +FILES:${PN}-mibs += "${datadir}/mibs" +FILES:${PN}-pibs += "${datadir}/pibs" +FILES:${PN}-yang += "${datadir}/yang" + +RRECOMMENDS:${PN} = "${BPN}-mibs" -RRECOMMENDS_${PN} = "${BPN}-mibs" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb b/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb index 01708df35a..5969220a41 100644 --- a/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb +++ b/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb @@ -4,13 +4,13 @@ DESCRIPTION = "libsoc is a C library to interface with common peripherals (gpio, HOMEPAGE = "https://github.com/jackmitch/libsoc" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENCE;md5=e0bfebea12a718922225ba987b2126a5" -inherit autotools pkgconfig python-dir +inherit autotools pkgconfig python3-dir SRCREV = "fd1ad6e7823fa76d8db0d3c5884faffa8ffddafb" -SRC_URI = "git://github.com/jackmitch/libsoc.git" +SRC_URI = "git://github.com/jackmitch/libsoc.git;branch=master;protocol=https" S = "${WORKDIR}/git" @@ -21,12 +21,12 @@ PACKAGECONFIG ?= "" PACKAGECONFIG[disabledebug] = "--disable-debug,," PACKAGECONFIG[allboardconfigs] = "--with-board-configs,," PACKAGECONFIG[enableboardconfig] = "--enable-board=${BOARD},," -PACKAGECONFIG[python] = "--enable-python=${PYTHON_PN},,${PYTHON_PN}" +PACKAGECONFIG[python] = "--enable-python=${STAGING_BINDIR_NATIVE}/python3-native/python3,,python3 python3-native" PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', \ - '${PYTHON_PN}-libsoc-staticdev ${PYTHON_PN}-libsoc', '', d)}" + 'python3-libsoc-staticdev python3-libsoc', '', d)}" -RDEPENDS_${PN} = "libgcc" +RDEPENDS:${PN} = "libgcc" -FILES_${PYTHON_PN}-libsoc-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*/*.a" -FILES_${PYTHON_PN}-libsoc += "${PYTHON_SITEPACKAGES_DIR}" +FILES:python3-libsoc-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*/*.a" +FILES:python3-libsoc += "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-oe/recipes-support/libsodium/libsodium_1.0.11.bb b/meta-oe/recipes-support/libsodium/libsodium_1.0.11.bb deleted file mode 100644 index cbcbe96cd7..0000000000 --- a/meta-oe/recipes-support/libsodium/libsodium_1.0.11.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "The Sodium crypto library" -HOMEPAGE = "http://libsodium.org/" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c9f00492f01f5610253fde01c3d2e866" - -SRC_URI = "https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "b58928d035064b2a46fb564937b83540" -SRC_URI[sha256sum] = "a14549db3c49f6ae2170cbbf4664bd48ace50681045e8dbea7c8d9fb96f9c765" - -inherit autotools - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch b/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch new file mode 100644 index 0000000000..21af9a5a19 --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch @@ -0,0 +1,37 @@ +From 98a330971f4344619b698d4603a45bd31d6935d9 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Sun, 15 Sep 2024 20:31:55 +0800 +Subject: [PATCH] CompilerChecks.cmake: drop -Wunused-variable flag + +Drop -Wunused-variable flag to fix build with clang: + +libssh/0.11.1/git/src/threads/libgcrypt.c:29:1: error: unused variable 'gcry_threads_pthread' [-Werror,-Wunused-variable] + 29 | GCRY_THREAD_OPTION_PTHREAD_IMPL; + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +libssh/0.11.1/recipe-sysroot/usr/include/gcrypt.h:217:33: note: expanded from macro 'GCRY_THREAD_OPTION_PTHREAD_IMPL' + 217 | static struct gcry_thread_cbs gcry_threads_pthread = { \ + | ^~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + CompilerChecks.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CompilerChecks.cmake b/CompilerChecks.cmake +index 9719e699..ec15fa2a 100644 +--- a/CompilerChecks.cmake ++++ b/CompilerChecks.cmake +@@ -48,7 +48,7 @@ if (UNIX) + add_c_compiler_flag("-Werror=implicit-int" SUPPORTED_COMPILER_FLAGS) + add_c_compiler_flag("-Wint-conversion" SUPPORTED_COMPILER_FLAGS) + add_c_compiler_flag("-Werror=int-conversion" SUPPORTED_COMPILER_FLAGS) +- add_c_compiler_flag("-Werror=unused-variable" SUPPORTED_COMPILER_FLAGS) ++ #add_c_compiler_flag("-Werror=unused-variable" SUPPORTED_COMPILER_FLAGS) + + check_c_compiler_flag("-Wformat" REQUIRED_FLAGS_WFORMAT) + if (REQUIRED_FLAGS_WFORMAT) +-- +2.25.1 + diff --git a/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch new file mode 100644 index 0000000000..4803ff81d8 --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch @@ -0,0 +1,38 @@ +From 99fcb71903cca8458bcd6c0d5b676619a9710dab Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 15 Mar 2023 16:51:58 +0800 +Subject: [PATCH] tests/CMakeLists.txt: do not search ssh/sshd commands on host + +It will search ssh/sshd commands on host when configure. Since they are +not required by unittests, we can skip the search. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + tests/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 89b95d08..e481534c 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -96,6 +96,7 @@ set(TEST_TARGET_LIBRARIES + + add_subdirectory(unittests) + ++if (CLIENT_TESTING OR SERVER_TESTING) + # OpenSSH Capabilities are required for all unit tests + find_program(SSH_EXECUTABLE NAMES ssh) + if (SSH_EXECUTABLE) +@@ -345,6 +346,7 @@ endif (WITH_PKCS11_URI) + file(COPY gss/kdcsetup.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/gss FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) + + message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") ++endif () + + configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h) + +-- +2.25.1 + diff --git a/meta-oe/recipes-support/libssh/libssh/run-ptest b/meta-oe/recipes-support/libssh/libssh/run-ptest new file mode 100644 index 0000000000..6346b72d50 --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests=$(find * -type f -name 'torture_*') + +for f in $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-oe/recipes-support/libssh/libssh_0.11.1.bb b/meta-oe/recipes-support/libssh/libssh_0.11.1.bb new file mode 100644 index 0000000000..5f39c2d79c --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh_0.11.1.bb @@ -0,0 +1,50 @@ +SUMMARY = "Multiplatform C library implementing the SSHv2 and SSHv1 protocol" +HOMEPAGE = "http://www.libssh.org" +SECTION = "libs" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0" + +DEPENDS = "zlib openssl" + +SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.11 \ + file://0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch \ + file://run-ptest \ + " + +SRC_URI:append:toolchain-clang = " file://0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch" + +SRCREV = "854795c654eda518ed6de6c1ebb4e2107fcb2e73" + +S = "${WORKDIR}/git" + +inherit cmake ptest + +PACKAGECONFIG ??= "gcrypt ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" +PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, " +PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=1, -DWITH_GCRYPT=0, libgcrypt, " +PACKAGECONFIG[tests] = "-DUNIT_TESTING=1, -DUNIT_TESTING=0, cmocka" + +ARM_INSTRUCTION_SET:armv5 = "arm" + +EXTRA_OECMAKE = " \ + -DWITH_PCAP=1 \ + -DWITH_SFTP=1 \ + -DWITH_ZLIB=1 \ + -DWITH_EXAMPLES=0 \ + " + +do_compile:prepend () { + if [ ${PTEST_ENABLED} = "1" ]; then + sed -i -e 's|${B}|${PTEST_PATH}|g' ${B}/config.h + sed -i -e 's|${S}|${PTEST_PATH}|g' ${B}/config.h + fi +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -f ${B}/tests/unittests/torture_* ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/unittests + cp -f ${S}/tests/unittests/hello*.sh ${D}${PTEST_PATH}/tests/unittests/ +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libssh/libssh_0.7.3.bb b/meta-oe/recipes-support/libssh/libssh_0.7.3.bb deleted file mode 100644 index 79e7dc5998..0000000000 --- a/meta-oe/recipes-support/libssh/libssh_0.7.3.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Multiplatform C library implementing the SSHv2 and SSHv1 protocol" -HOMEPAGE = "http://www.libssh.org" -SECTION = "libs" - -DEPENDS = "zlib openssl libgcrypt" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=388a4fb1dea8ceae0be78ba9b01fc139" - -SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=v0-7" -SRCREV = "cdf7690e038230623cbbf6b024ece62f41efa98d" -S = "${WORKDIR}/git" - -EXTRA_OECMAKE = " \ - -DWITH_GCRYPT=1 \ - -DWITH_PCAP=1 \ - -DWITH_SFTP=1 \ - -DWITH_ZLIB=1 \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ - " - -PACKAGECONFIG ??="" -PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, " - -inherit cmake - -do_configure_prepend () { - # Disable building of examples - sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \ - || bbfatal "Failed to disable examples" -} - -FILES_${PN}-dev += "${libdir}/cmake" -TOOLCHAIN = "gcc" diff --git a/meta-oe/recipes-support/libssh2/libssh2_1.8.0.bb b/meta-oe/recipes-support/libssh2/libssh2_1.8.0.bb deleted file mode 100644 index 94bfb8f87e..0000000000 --- a/meta-oe/recipes-support/libssh2/libssh2_1.8.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "A client-side C library implementing the SSH2 protocol" -HOMEPAGE = "http://www.libssh2.org/" -SECTION = "libs" - -DEPENDS = "zlib" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" - -SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz" -SRC_URI[md5sum] = "3d1147cae66e2959ea5441b183de1b1c" -SRC_URI[sha256sum] = "39f34e2f6835f4b992cafe8625073a88e5a28ba78f83e8099610a7b3af4676d4" - -inherit autotools pkgconfig - -EXTRA_OECONF += "\ - --with-libz \ - --with-libz-prefix=${STAGING_LIBDIR} \ - " - -# only one of openssl and gcrypt could be set -PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[openssl] = "--with-openssl --with-libssl-prefix=${STAGING_LIBDIR},--without-openssl,openssl" -PACKAGECONFIG[gcrypt] = "--with-libgcrypt --with-libgcrypt-prefix=${STAGING_EXECPREFIXDIR},--without-libgcrypt,libgcrypt" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch b/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch new file mode 100644 index 0000000000..2529d5d9d1 --- /dev/null +++ b/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch @@ -0,0 +1,57 @@ +From eacc9e9c62a3857ce1e2e24b81fc22d8ae91f422 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 9 May 2019 22:06:48 +0200 +Subject: [PATCH] Build so-lib +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Stolen from [1] + +[1] https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/snowball/trunk/dynamiclib.diff + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + GNUmakefile | 7 +++++-- + libstemmer/symbol.map | 6 ++++++ + 2 files changed, 11 insertions(+), 2 deletions(-) + create mode 100644 libstemmer/symbol.map + +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -170,12 +170,12 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=. + JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) + JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class) + +-CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations ++CFLAGS=-O2 -fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations + CPPFLAGS= + + INCLUDES=-Iinclude + +-all: snowball$(EXEEXT) libstemmer.a stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) ++all: snowball$(EXEEXT) libstemmer.a libstemmer.so stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) + + algorithms.mk: libstemmer/mkalgorithms.pl libstemmer/modules.txt + libstemmer/mkalgorithms.pl algorithms.mk libstemmer/modules.txt +@@ -225,6 +225,9 @@ libstemmer/libstemmer.o: libstemmer/modu + libstemmer.a: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) + $(AR) -cru $@ $^ + ++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) ++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ ++ + examples/%.o: examples/%.c + $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $< + +--- /dev/null ++++ b/libstemmer/symbol.map +@@ -0,0 +1,6 @@ ++SB_STEMMER_0 { ++ global: ++ sb_stemmer_*; ++ local: ++ *; ++}; diff --git a/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb b/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb new file mode 100644 index 0000000000..be2935a385 --- /dev/null +++ b/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "Snowball compiler and stemming algorithms" +HOMEPAGE = "https://snowballstem.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=19139aaf3c8c8fa1ca6edd59c072fb9f" + +DEPENDS:append:class-target = " ${BPN}-native" + +SRC_URI = "git://github.com/snowballstem/snowball.git;branch=master;protocol=https \ + file://0001-Build-so-lib.patch \ + " +SRCREV = "48a67a2831005f49c48ec29a5837640e23e54e6b" +S = "${WORKDIR}/git" + +LIBVER = "0.0.0" + +inherit lib_package + +do_compile:prepend:class-target() { + # use native tools + sed -i 's:./snowball :snowball :g' ${S}/GNUmakefile +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${S}/snowball ${D}${bindir} + install -m 755 ${S}/stemwords ${D}${bindir} + + install -d ${D}${libdir} + install -m 755 ${S}/libstemmer.so.${LIBVER} ${D}${libdir}/ + ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so.0 + ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so + + install -d ${D}${includedir} + install -m 644 ${S}/include/*.h ${D}${includedir} +} + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch b/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch index 31c0d29e93..4929eece06 100644 --- a/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch +++ b/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch @@ -4,6 +4,8 @@ Date: Wed, 2 Nov 2016 05:43:43 -0400 Subject: [PATCH] Do not strip libtar. --- +Upstream-Status: Pending + libtar/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch b/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch index 178a970299..efde754be7 100644 --- a/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch +++ b/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch @@ -1,4 +1,6 @@ --- +Upstream-Status: Pending + configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/libtar/libtar_1.2.20.bb b/meta-oe/recipes-support/libtar/libtar_1.2.20.bb index 60710f416a..f93d9c09a5 100644 --- a/meta-oe/recipes-support/libtar/libtar_1.2.20.bb +++ b/meta-oe/recipes-support/libtar/libtar_1.2.20.bb @@ -19,3 +19,5 @@ inherit autotools-brokensep PACKAGECONFIG ??= "zlib" PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" + +BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch b/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch deleted file mode 100644 index a4a17ed85b..0000000000 --- a/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0ab69dc18a2057ff5bf41abcdf2b983b72d5a903 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 12 Jul 2017 15:34:49 -0700 -Subject: [PATCH 1/2] include sys/select.h for fd_set definition - -Fixes -teamnl.c:160:2: error: unknown type name 'fd_set'; did you mean 'fpos_t'? - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - utils/teamnl.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/teamnl.c b/utils/teamnl.c -index e8de7e2..25129e8 100644 ---- a/utils/teamnl.c -+++ b/utils/teamnl.c -@@ -24,6 +24,7 @@ - #include <getopt.h> - #include <errno.h> - #include <sys/signalfd.h> -+#include <sys/select.h> - #include <signal.h> - #include <unistd.h> - #include <team.h> --- -2.13.2 - diff --git a/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-check-the-return-value.patch b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-check-the-return-value.patch new file mode 100644 index 0000000000..96891c9ea7 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-check-the-return-value.patch @@ -0,0 +1,34 @@ +From e86a58271d7d0a3b9cd546251d2527e93898bdb8 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Tue, 21 Dec 2021 11:15:31 +0800 +Subject: [PATCH] team_basic_test.py: check the return value + +Not only print the traceback like before, also check the +return value. + +Upstream-Status: Submitted [https://github.com/jpirko/libteam/pull/63] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + scripts/team_basic_test.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py +index 0b64af2..17588c7 100755 +--- a/scripts/team_basic_test.py ++++ b/scripts/team_basic_test.py +@@ -203,4 +203,10 @@ def main(): + btest.run() + + if __name__ == "__main__": +- main() ++ try: ++ ret = main() ++ except Exception as esc: ++ ret = 1 ++ import traceback ++ traceback.print_exc() ++ sys.exit(ret) +-- +2.17.1 + diff --git a/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch new file mode 100644 index 0000000000..468a55f346 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch @@ -0,0 +1,32 @@ +From 00debe6bd4cf5a3133a8fbaab75f7447a39fa655 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <wenzong.fan@windriver.com> +Date: Thu, 12 Apr 2018 01:54:15 +0000 +Subject: [PATCH] team_basic_test.py: disable RedHat specific test + +The test _run_teamd_initscripts() is for RedHat ifcfg scripts which are +incompatible with OE: + /etc/sysconfig/network-scripts/ifcfg-* + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +--- + scripts/team_basic_test.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py +index b05be9e..faabd18 100755 +--- a/scripts/team_basic_test.py ++++ b/scripts/team_basic_test.py +@@ -171,7 +171,7 @@ TEAM_PORT_CONFIG='{"prio": 10}' + try: + for mode_name in self._team_modes: + self._run_one_mode(mode_name) +- self._run_teamd_initscripts() ++ #self._run_teamd_initscripts() + finally: + cmd_exec("modprobe -r team_mode_loadbalance team_mode_roundrobin team_mode_activebackup team_mode_broadcast team"); + +-- +2.13.3 + diff --git a/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch new file mode 100644 index 0000000000..69276aba91 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch @@ -0,0 +1,101 @@ +From 06050e79655f0fa7d9daeda1fbd3a9a2c7736841 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 2 Dec 2021 15:08:25 +0800 +Subject: [PATCH] team_basic_test.py: switch to python3 + +Switch the script team_basic_test.py to python3 + +Upstream-Status: Submitted [https://github.com/jpirko/libteam/pull/63] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + scripts/team_basic_test.py | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py +index faabd18..0b64af2 100755 +--- a/scripts/team_basic_test.py ++++ b/scripts/team_basic_test.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + """ + Basic test. + +@@ -32,11 +32,11 @@ def usage(): + """ + Print usage of this app + """ +- print "Usage: team_basic_test.py [OPTION...]" +- print "" +- print " -h, --help print this message" +- print " -c, --loop-count=NUMBER number of loops (default 1)" +- print " -p, --port=NETDEV port device (can be defined multiple times)" ++ print("Usage: team_basic_test.py [OPTION...]") ++ print("") ++ print(" -h, --help print this message") ++ print(" -c, --loop-count=NUMBER number of loops (default 1)") ++ print(" -p, --port=NETDEV port device (can be defined multiple times)") + sys.exit() + + class CmdExecFailedException(Exception): +@@ -55,15 +55,15 @@ class CmdExecUnexpectedOutputException(Exception): + return "Command execution output unexpected: \"%s\" != \"%s\"" % (self.__output, self.__expected_output) + + def print_output(out_type, string): +- print("%s:\n" ++ print(("%s:\n" + "----------------------------\n" + "%s" +- "----------------------------" % (out_type, string)) ++ "----------------------------" % (out_type, string))) + + def cmd_exec(cmd, expected_output=None, cleaner=False): + cmd = cmd.rstrip(" ") + if not cleaner: +- print("# \"%s\"" % cmd) ++ print(("# \"%s\"" % cmd)) + subp = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + (data_stdout, data_stderr) = subp.communicate() +@@ -74,7 +74,7 @@ def cmd_exec(cmd, expected_output=None, cleaner=False): + if data_stderr: + print_output("Stderr", data_stderr) + raise CmdExecFailedException(subp.returncode) +- output = data_stdout.rstrip() ++ output = (data_stdout.rstrip()).decode() + if expected_output: + if output != expected_output: + raise CmdExecUnexpectedOutputException(output, expected_output) +@@ -166,7 +166,7 @@ TEAM_PORT_CONFIG='{"prio": 10}' + os.removedirs("/tmp/team_test/") + + def _run_one_loop(self, run_nr): +- print "RUN #%d" % (run_nr) ++ print("RUN #%d" % (run_nr)) + self._created_teams = [] + try: + for mode_name in self._team_modes: +@@ -176,7 +176,7 @@ TEAM_PORT_CONFIG='{"prio": 10}' + cmd_exec("modprobe -r team_mode_loadbalance team_mode_roundrobin team_mode_activebackup team_mode_broadcast team"); + + def run(self): +- for i in xrange(self._loop_count): ++ for i in range(self._loop_count): + self._run_one_loop(i + 1) + + def main(): +@@ -186,8 +186,8 @@ def main(): + "hc:p:", + ["help", "loop-count=", "port="] + ) +- except getopt.GetoptError, err: +- print str(err) ++ except getopt.GetoptError as err: ++ print(str(err)) + usage() + + btest = TeamBasicTest() +-- +2.17.1 + diff --git a/meta-oe/recipes-support/libteam/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch b/meta-oe/recipes-support/libteam/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch new file mode 100644 index 0000000000..0740601190 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch @@ -0,0 +1,39 @@ +From e6ba4c16da808e47891241452a927b7f558a6420 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 11 May 2024 23:11:22 -0700 +Subject: [patch libteam] teamd: Pass correct parameter type to accept API + +accept() expects sockaddr as second parameter + +int accept (int, struct sockaddr *__restrict, socklen_t *__restrict); + +Fixes build with gcc-16 on musl systems +| ../../git/teamd/teamd_usock.c: In function 'callback_usock': +| ../../git/teamd/teamd_usock.c:280:40: error: passing argument 2 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types] +| 280 | sock = accept(ctx->usock.sock, &addr, &alen); +| | ^~~~~ +| | | +| | struct sockaddr_un * + +Upstream-Status: Submitted [https://lists.fedorahosted.org/archives/list/libteam@lists.fedorahosted.org/2024/5/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + teamd/teamd_usock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/teamd/teamd_usock.c b/teamd/teamd_usock.c +index 1adfdf8..5895124 100644 +--- a/teamd/teamd_usock.c ++++ b/teamd/teamd_usock.c +@@ -277,7 +277,7 @@ static int callback_usock(struct teamd_context *ctx, int events, void *priv) + int err; + + alen = sizeof(addr); +- sock = accept(ctx->usock.sock, &addr, &alen); ++ sock = accept(ctx->usock.sock, (struct sockaddr *)&addr, &alen); + if (sock == -1) { + teamd_log_err("usock: Failed to accept connection."); + return -errno; +-- +2.45.0 + diff --git a/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch index beabf63ca3..030140ad46 100644 --- a/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch +++ b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch @@ -12,22 +12,20 @@ tinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + teamd/teamd_runner_lacp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c -index 9c77fae..8800854 100644 --- a/teamd/teamd_runner_lacp.c +++ b/teamd/teamd_runner_lacp.c -@@ -23,6 +23,7 @@ +@@ -23,12 +23,12 @@ #include <unistd.h> #include <limits.h> #include <sys/ioctl.h> +#include <net/ethernet.h> - #include <linux/if_ether.h> #include <sys/socket.h> - #include <linux/netdevice.h> -@@ -30,7 +31,6 @@ + #include <netinet/in.h> #include <errno.h> #include <team.h> #include <private/misc.h> @@ -35,6 +33,3 @@ index 9c77fae..8800854 100644 #include "teamd.h" #include "teamd_config.h" --- -2.13.2 - diff --git a/meta-oe/recipes-support/libteam/libteam/run-ptest b/meta-oe/recipes-support/libteam/libteam/run-ptest new file mode 100644 index 0000000000..26f097d587 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/run-ptest @@ -0,0 +1,8 @@ +#!/bin/sh + +python3 $(dirname $0)/team_basic_test.py +if [ $? -eq 0 ] ; then + echo "PASS: libteam" +else + echo "FAIL: libteam" +fi diff --git a/meta-oe/recipes-support/libteam/libteam_1.27.bb b/meta-oe/recipes-support/libteam/libteam_1.27.bb deleted file mode 100644 index 32227009e3..0000000000 --- a/meta-oe/recipes-support/libteam/libteam_1.27.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Library for controlling team network device" -HOMEPAGE = "http://www.libteam.org/" -SECTION = "libs/network" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "libnl libdaemon jansson" - -SRC_URI = "git://github.com/jpirko/libteam \ - file://0001-include-sys-select.h-for-fd_set-definition.patch \ - file://0002-teamd-Re-adjust-include-header-order.patch \ - " -SRCREV = "91a928a56a501daac5ce8b3c16bd9943661f1d16" - -SRC_URI[md5sum] = "565114d70c41bff6093d8e57be284e8a" -SRC_URI[sha256sum] = "d65286379141db141bea33424ec0507bb0f827a0bf03d9c65004bb593e3d5545" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -FILES_${PN} = "${libdir}/libteam${SOLIBS} \ -" - -PACKAGES += "${PN}-dctl ${PN}-utils" -FILES_${PN}-dctl = "${libdir}/libteamdctl${SOLIBS} \ -" -FILES_${PN}-utils = "${bindir}/bond2team \ - ${bindir}/teamd \ - ${bindir}/teamdctl \ - ${bindir}/teamnl \ -" - -RDEPENDS_${PN}-utils = "bash" - diff --git a/meta-oe/recipes-support/libteam/libteam_1.32.bb b/meta-oe/recipes-support/libteam/libteam_1.32.bb new file mode 100644 index 0000000000..508cbb13bb --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam_1.32.bb @@ -0,0 +1,47 @@ +SUMMARY = "Library for controlling team network device" +HOMEPAGE = "http://www.libteam.org/" +SECTION = "libs/network" + +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "libnl libdaemon jansson" + +SRC_URI = "git://github.com/jpirko/libteam;branch=master;protocol=https \ + file://0002-teamd-Re-adjust-include-header-order.patch \ + file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \ + file://0001-team_basic_test.py-switch-to-python3.patch \ + file://0001-team_basic_test.py-check-the-return-value.patch \ + file://0001-teamd-Pass-correct-parameter-type-to-accept-API.patch \ + file://run-ptest \ + " +SRCREV = "8b843e93cee1dab61fb79b01791201cdad45e1d1" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig ptest + +FILES:${PN} = "${libdir}/libteam${SOLIBS} \ +" + +PACKAGES += "${PN}-dctl ${PN}-utils" +FILES:${PN}-dctl = "${libdir}/libteamdctl${SOLIBS} \ +" +FILES:${PN}-utils = "${bindir}/bond2team \ + ${bindir}/teamd \ + ${bindir}/teamdctl \ + ${bindir}/teamnl \ +" + +RDEPENDS:${PN}-utils = "bash" +RDEPENDS:${PN}-ptest = "python3-core libteam-utils" +# Ensure kernel has these mods enabled features/net/team/team.scc +RRECOMMENDS:${PN} += "kernel-module-team kernel-module-team-mode-activebackup \ + kernel-module-team-mode-broadcast \ + kernel-module-team-mode-loadbalance \ + kernel-module-team-mode-random \ + kernel-module-team-mode-roundrobin" + +do_install_ptest() { + install ${S}/scripts/team_basic_test.py ${D}${PTEST_PATH}/ +} diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb index 138df9f300..6fbdd071e8 100644 --- a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb +++ b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb @@ -6,7 +6,6 @@ LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://readme.txt;md5=f8f366f3370dda889f60faa7db162cf4" SECTION = "libs" -PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/tinyxml/tinyxml_${@'${PV}'.replace('.', '_')}.tar.gz \ file://enforce-use-stl.patch \ diff --git a/meta-oe/recipes-support/libtinyxml2/files/run-ptest b/meta-oe/recipes-support/libtinyxml2/files/run-ptest new file mode 100644 index 0000000000..870912672e --- /dev/null +++ b/meta-oe/recipes-support/libtinyxml2/files/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh + +for i in `ls xmltest`; do + ./$i + if [ $? -eq 0 ]; then + echo "PASS: $i" + else + echo "FAIL: $i" + fi +done diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb new file mode 100644 index 0000000000..bcd309282b --- /dev/null +++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" +HOMEPAGE = "https://leethomason.github.io/tinyxml2" +SECTION = "libs" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" + +SRCREV = "321ea883b7190d4e85cae5512a12e5eaa8f8731f" +SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https \ + file://run-ptest" + +S = "${WORKDIR}/git" + +inherit meson ptest + +EXTRA_OEMESON += " \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true', '', d)} \ + -Ddefault_library=both \ +" + +CXXFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" + +do_install_ptest() { + install -Dm 0755 ${B}/xmltest ${D}${PTEST_PATH}/xmltest + install -d ${D}${PTEST_PATH}/resources/out + for f in ${S}/resources/*.xml; do + install -m 0644 $f ${D}${PTEST_PATH}/resources/ + done +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb deleted file mode 100644 index 8b5ab44fdd..0000000000 --- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" -HOMEPAGE = "http://www.grinninglizard.com/tinyxml2/" -SECTION = "libs" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://tinyxml2.cpp;endline=22;md5=c19221dbd8a66ad3090462af4c5de5e7" - -SRC_URI = "git://github.com/leethomason/tinyxml2.git" - -SRCREV = "37bc3aca429f0164adf68c23444540b4a24b5778" - -S = "${WORKDIR}/git" - -inherit cmake - -FILES_${PN}-dev += "${libdir}/cmake/" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb b/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb new file mode 100644 index 0000000000..4d6c06240d --- /dev/null +++ b/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "LibTomMath is a number theoretic multiple-precision integer library" +HOMEPAGE = "https://www.libtom.net/LibTomMath" +SECTION = "libs" +LICENSE = "Unlicense" +LIC_FILES_CHKSUM = "file://LICENSE;md5=23e7e0a32e53a2b1d35f5fd9ef053402" + +DEPENDS = "libtool-cross" + +SRC_URI = "git://github.com/libtom/libtommath.git;protocol=https;branch=master" + +SRCREV = "95d80fd8229d05dd6cb4ec88bc8d4f5377ff00ef" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "'PREFIX=${prefix}' 'DESTDIR=${D}' 'LIBPATH=${libdir}' 'CFLAGS=${CFLAGS}'" + +do_compile() { + oe_runmake -f makefile.shared +} + +do_install() { + oe_runmake -f makefile.shared install +} diff --git a/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch b/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch new file mode 100644 index 0000000000..90f028b856 --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch @@ -0,0 +1,43 @@ +From 7ea4e55a91e6d5564c6de762c2d1afc78ff9cfd3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 16 Sep 2024 22:58:38 +0000 +Subject: [PATCH] test: Compile nolibc.c only when CONFIG_NOLIBC is set + +building nolibc.c fails for non nolibc targets + +Fixes +In file included from nolibc.c:33: +./../src/lib.h:20:2: error: "This arch doesn't support building liburing without libc" + 20 | #error "This arch doesn't support building liburing without libc" + | ^ +1 error generated. + +Upstream-Status: Backport [https://github.com/axboe/liburing/commit/a182f62c01f981cd9dd508ec952fbc975b263e3d] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/Makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/test/Makefile b/test/Makefile +index 0538a75..0dfecb8 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -126,7 +126,6 @@ test_srcs := \ + msg-ring-overflow.c \ + multicqes_drain.c \ + no-mmap-inval.c \ +- nolibc.c \ + nop-all-sizes.c \ + nop.c \ + ooo-file-unreg.c \ +@@ -221,6 +220,10 @@ test_srcs := \ + all_targets := + include ../Makefile.quiet + ++ifeq ($(CONFIG_NOLIBC),y) ++ test_srcs += nolibc.c ++endif ++ + ifdef CONFIG_HAVE_STATX + test_srcs += statx.c + else ifdef CONFIG_HAVE_GLIBC_STATX diff --git a/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch b/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch new file mode 100644 index 0000000000..62ca78a1ed --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch @@ -0,0 +1,27 @@ +From 684bcb2a8795fd399d6c164e51459a2785057b1c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Sep 2024 09:56:42 -0700 +Subject: [PATCH 1/2] test: Drop including error.h header + +There is no error APIs being used in this test, therefore +drop including it, this also makes it portable to musl +systems which do not have error.h + +Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1233] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/init-mem.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/test/init-mem.c b/test/init-mem.c +index 6f9a02a..f512190 100644 +--- a/test/init-mem.c ++++ b/test/init-mem.c +@@ -13,7 +13,6 @@ + #include <netinet/udp.h> + #include <arpa/inet.h> + #include <net/if.h> +-#include <error.h> + + #include "liburing.h" + #include "helpers.h" diff --git a/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch b/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch new file mode 100644 index 0000000000..8a1d542502 --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch @@ -0,0 +1,32 @@ +From d06433ff1a1905436cfcde80e22ee51bd9591536 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Sep 2024 09:59:31 -0700 +Subject: [PATCH 2/2] ooo-file-unreg.c: Include poll.h instead of sys/poll.h + +This fixes a warning e.g. + +In file included from ooo-file-unreg.c:12: +/mnt/b/yoe/master/build/tmp/work/riscv32-yoe-linux-musl/liburing/2.7/recipe-sysroot/usr/include/sys/poll.h:1:2: warning: redirecting incorrect #include <sys/poll.h> to <poll.h> [-W#warnings] + 1 | #warning redirecting incorrect #include <sys/poll.h> to <poll.h> + | ^ +1 warning generated. + +Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1233] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/ooo-file-unreg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/ooo-file-unreg.c b/test/ooo-file-unreg.c +index d76e0fb..dd6ea55 100644 +--- a/test/ooo-file-unreg.c ++++ b/test/ooo-file-unreg.c +@@ -9,7 +9,7 @@ + #include <sys/socket.h> + #include <unistd.h> + #include <stdlib.h> +-#include <sys/poll.h> ++#include <poll.h> + + #include "liburing.h" + #include "helpers.h" diff --git a/meta-oe/recipes-support/liburing/liburing_2.7.bb b/meta-oe/recipes-support/liburing/liburing_2.7.bb new file mode 100644 index 0000000000..b10fe40ca0 --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing_2.7.bb @@ -0,0 +1,38 @@ +SUMMARY = "This is the io_uring library, liburing." +DESCRIPTION = "liburing provides helpers to setup and teardown io_uring \ +instances, and also a simplified interface for applications that don't need \ +(or want) to deal with the full kernel side implementation." +HOMEPAGE = "https://github.com/axboe/liburing" +BUGTRACKER = "https://github.com/axboe/liburing/issues" +SECTION = "libs" + +LICENSE = "LGPL-2.1-only | MIT" +LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af" + +SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \ + file://0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch \ + file://0001-test-Drop-including-error.h-header.patch \ + file://0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch" +SRCREV = "5227d48b28ad8671e61d444b72678da584d2e6c3" + +S = "${WORKDIR}/git" + +DEPENDS:append:libc-musl = " libucontext" +XCFLAGS = "-pthread" +XCFLAGS:append:libc-musl = " -lucontext" + +USELIBC = "" +# clang-18+ on RV64 emits memset for arch/riscv64/syscall.h provided __do_syscall4 macro +# this does not happen for gcc or older clang, so link with libc since we need memset API +# -fno-builtin-memset does not help +USELIBC:riscv64:toolchain-clang = "--use-libc" +USELIBC:riscv32 = "--use-libc" +EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" +do_configure() { + ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} ${USELIBC} +} +do_install () { + oe_runmake install DESTDIR=${D} +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch new file mode 100644 index 0000000000..7df44737ad --- /dev/null +++ b/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch @@ -0,0 +1,30 @@ +From 840795dcb48214b74cfde75e7ce5e8a1a6c64a46 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 2 Apr 2015 19:18:45 -0700 +Subject: [PATCH] usb.h: Include sys/types.h + +We need the definitions for things like u_intX_t + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libusb/usb.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libusb/usb.h b/libusb/usb.h +index ea62543..18b610a 100644 +--- a/libusb/usb.h ++++ b/libusb/usb.h +@@ -46,6 +46,8 @@ typedef unsigned __int32 uint32_t; + #include <stdint.h> + #endif + ++#include <sys/types.h> ++ + /* On linux PATH_MAX is defined in linux/limits.h. */ + #if defined(__linux__) + #include <linux/limits.h> +-- +2.34.1 + diff --git a/meta-oe/recipes-support/libusb/libusb-compat/0002-automake-make-example-programs-installable.patch b/meta-oe/recipes-support/libusb/libusb-compat/0002-automake-make-example-programs-installable.patch new file mode 100644 index 0000000000..faf532cad2 --- /dev/null +++ b/meta-oe/recipes-support/libusb/libusb-compat/0002-automake-make-example-programs-installable.patch @@ -0,0 +1,24 @@ +From 9dcdfa716e3c3831d9b70472b39dab2fd370f503 Mon Sep 17 00:00:00 2001 +From: Yoann Congal <yoann.congal@smile.fr> +Date: Sun, 26 Feb 2023 16:04:35 +0100 +Subject: [PATCH] automake: make example programs installable + +The example programs are used as tests for ptest, so we need a way to +install them on the rootfs. + +Upstream-Status: Inappropriate [oe-core specific] +--- + examples/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index 9bd3efc..f4324c2 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,5 +1,5 @@ + AM_CPPFLAGS = -I$(top_srcdir)/libusb +-noinst_PROGRAMS = lsusb testlibusb ++bin_PROGRAMS = lsusb testlibusb + + lsusb_SOURCES = lsusb.c + lsusb_LDADD = ../libusb/libusb.la diff --git a/meta-oe/recipes-support/libusb/libusb-compat/run-ptest b/meta-oe/recipes-support/libusb/libusb-compat/run-ptest new file mode 100644 index 0000000000..901662d696 --- /dev/null +++ b/meta-oe/recipes-support/libusb/libusb-compat/run-ptest @@ -0,0 +1,14 @@ +#!/bin/sh + +rc=0 +for TEST in lsusb testlibusb; do + if ! ./$TEST ; then + echo "FAIL: $TEST" + rc=$((rc + 1)) + else + echo "PASS: $TEST" + fi +done + +# return number of failed tests +exit $rc diff --git a/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb b/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb new file mode 100644 index 0000000000..57f1f54387 --- /dev/null +++ b/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb @@ -0,0 +1,47 @@ +SUMMARY = "libusb-0.1 compatibility layer for libusb1" +DESCRIPTION = "libusb-0.1 compatible layer for libusb1, a drop-in replacement \ +that aims to look, feel and behave exactly like libusb-0.1" +HOMEPAGE = "http://www.libusb.org/" +BUGTRACKER = "http://www.libusb.org/report" +SECTION = "libs" + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f2ac5f3ac4835e8f91324a26a590a423" +DEPENDS = "libusb1" + +# libusb-compat dlopen() libusb1 so we need to explicitly RDEPENDS on it +RDEPENDS:${PN} += "libusb1" + +# Few packages are known not to work with libusb-compat (e.g. libmtp-1.0.0), +# so here libusb-0.1 is removed completely instead of adding virtual/libusb0. +# Besides, libusb-0.1 uses a per 1ms polling that hurts a lot to power +# consumption. +PROVIDES = "libusb virtual/libusb0" +BBCLASSEXTEND = "native nativesdk" + +PE = "1" + +SRC_URI = " \ + git://github.com/libusb/libusb-compat-0.1.git;protocol=https;branch=master \ + file://0001-usb.h-Include-sys-types.h.patch \ + file://0002-automake-make-example-programs-installable.patch \ + file://run-ptest \ +" +SRCREV = "c497eff1ae8c4cfd4fdff370f04c78fa0584f4f3" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb-compat-0.1/releases" + +BINCONFIG = "${bindir}/libusb-config" + +inherit autotools pkgconfig binconfig-disabled lib_package ptest + +# examples are used as ptest so enable them at configuration if needed +EXTRA_OECONF += "${@bb.utils.contains('PTEST_ENABLED', '1', '--enable-examples-build', '', d)}" + +# Move test binaries out of bindir to avoid clashing with a "real" lsusb. +do_install_ptest() { + for bin in lsusb testlibusb; do + mv ${D}${bindir}/$bin ${D}${PTEST_PATH} + done +} diff --git a/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch b/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch index 6be49fbca4..16506999e2 100644 --- a/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch +++ b/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch @@ -7,7 +7,7 @@ The include flag should point to the source directory, not the build directory. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> -Upstream-status: Submitted [https://github.com/libusbg/libusbg/pull/9] +Upstream-Status: Submitted [https://github.com/libusbg/libusbg/pull/9] --- examples/Makefile.am | 2 +- src/Makefile.am | 2 +- diff --git a/meta-oe/recipes-support/libusbg/libusbg_git.bb b/meta-oe/recipes-support/libusbg/libusbg_git.bb index 97d60a6a8a..716d9c4ce4 100644 --- a/meta-oe/recipes-support/libusbg/libusbg_git.bb +++ b/meta-oe/recipes-support/libusbg/libusbg_git.bb @@ -1,16 +1,19 @@ SUMMARY = "USB Gadget Configfs Library" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" -inherit autotools +inherit autotools update-alternatives PV = "0.1.0" SRCREV = "a826d136e0e8fa53815f1ba05893e6dd74208c15" -SRC_URI = "git://github.com/libusbg/libusbg.git \ +SRC_URI = "git://github.com/libusbg/libusbg.git;branch=master;protocol=https \ file://0001-Fix-out-of-tree-builds.patch \ " S = "${WORKDIR}/git" +ALTERNATIVE:${PN} = "gadget-acm-ecm show-gadgets" +ALTERNATIVE_LINK_NAME[gadget-acm-ecm] = "${bindir}/gadget-acm-ecm" +ALTERNATIVE_LINK_NAME[show-gadgets] = "${bindir}/show-gadgets" diff --git a/meta-oe/recipes-support/libusbgx/libusbgx-config.bb b/meta-oe/recipes-support/libusbgx/libusbgx-config.bb new file mode 100644 index 0000000000..c79dd092cd --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx-config.bb @@ -0,0 +1,15 @@ +SUMMARY = "USB Gadget Configuration Files" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI = "file://usbgx.default" + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -Dm 0644 ${UNPACKDIR}/usbgx.default ${D}${sysconfdir}/default/usbgx +} diff --git a/meta-oe/recipes-support/libusbgx/libusbgx-config/usbgx.default b/meta-oe/recipes-support/libusbgx/libusbgx-config/usbgx.default new file mode 100644 index 0000000000..f690dfe2ab --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx-config/usbgx.default @@ -0,0 +1,2 @@ +IMPORT_SCHEMAS="" +ENABLED_SCHEMAS="$IMPORT_SCHEMAS" diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch b/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch new file mode 100644 index 0000000000..24a2760d11 --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch @@ -0,0 +1,796 @@ +From 421b366cafdf954b7e1cd2bbb78b55e04d73c082 Mon Sep 17 00:00:00 2001 +From: Wlodzimierz Lipert <wlodzimierz.lipert@gmail.com> +Date: Mon, 28 Nov 2022 08:29:54 +0100 +Subject: [PATCH] fix: stack-buffer-overflow in usbg_f_foo_attr_val processing. + Changed ABI version from 2 to 3. + +Upstream-Status: Submitted [https://github.com/linux-usb-gadgets/libusbgx/pull/72] + +Signed-off-by: Wlodzimierz Lipert <wlodzimierz.lipert@gmail.com> +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + include/usbg/function/hid.h | 28 ++++++++++++---------------- + include/usbg/function/midi.h | 35 +++++++++++++---------------------- + include/usbg/function/ms.h | 30 +++++++++++------------------- + include/usbg/function/net.h | 34 ++++++++++++++-------------------- + include/usbg/function/uac2.h | 29 +++++++++++++---------------- + include/usbg/usbg_internal.h | 10 +++++----- + src/Makefile.am | 2 +- + src/function/ether.c | 10 +++++----- + src/function/hid.c | 12 ++++++------ + src/function/midi.c | 10 +++++----- + src/function/ms.c | 10 +++++----- + src/function/uac2.c | 10 +++++----- + src/function/uvc.c | 10 +++++----- + src/usbg_common.c | 2 +- + 14 files changed, 101 insertions(+), 131 deletions(-) + +diff --git a/include/usbg/function/hid.h b/include/usbg/function/hid.h +index 3463140..3b3907b 100644 +--- a/include/usbg/function/hid.h ++++ b/include/usbg/function/hid.h +@@ -56,11 +56,6 @@ union usbg_f_hid_attr_val { + unsigned int subclass; + }; + +-#define USBG_F_HID_UINT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_hid_attr_val, protocol, WHAT) +- +-#define USBG_F_HID_RDESC_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_hid_attr_val, report_desc, WHAT) + /** + * @brief Cast from generic function to hid function + * @param[in] f function to be converted to hid funciton. +@@ -137,7 +132,7 @@ int usbg_f_hid_get_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_hid_set_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, +- union usbg_f_hid_attr_val val); ++ const union usbg_f_hid_attr_val *val); + + /** + * @brief Get the minor and major of corresponding character device +@@ -173,8 +168,9 @@ static inline int usbg_f_hid_get_protocol(usbg_f_hid *hf, + static inline int usbg_f_hid_set_protocol(usbg_f_hid *hf, + unsigned int protocol) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_PROTOCOL, +- USBG_F_HID_UINT_TO_ATTR_VAL(protocol)); ++ ++ union usbg_f_hid_attr_val val = {.protocol = protocol}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_PROTOCOL, &val); + } + + /** +@@ -199,8 +195,8 @@ static inline int usbg_f_hid_get_report_desc(usbg_f_hid *hf, + static inline int usbg_f_hid_set_report_desc(usbg_f_hid *hf, + struct usbg_f_hid_report_desc report_desc) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, +- USBG_F_HID_RDESC_TO_ATTR_VAL(report_desc)); ++ union usbg_f_hid_attr_val val = {.report_desc = report_desc}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, &val); + } + + /** +@@ -242,8 +238,8 @@ static inline int usbg_f_hid_set_report_desc_raw(usbg_f_hid *hf, + .len = len, + }; + +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, +- USBG_F_HID_RDESC_TO_ATTR_VAL(report_desc)); ++ union usbg_f_hid_attr_val val = {.report_desc = report_desc}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, &val); + } + + /** +@@ -268,8 +264,8 @@ static inline int usbg_f_hid_get_report_length(usbg_f_hid *hf, + static inline int usbg_f_hid_set_report_length(usbg_f_hid *hf, + unsigned int report_length) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_LENGTH, +- USBG_F_HID_UINT_TO_ATTR_VAL(report_length)); ++ union usbg_f_hid_attr_val val = {.report_length = report_length}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_LENGTH, &val); + } + + /** +@@ -294,8 +290,8 @@ static inline int usbg_f_hid_get_subclass(usbg_f_hid *hf, + static inline int usbg_f_hid_set_subclass(usbg_f_hid *hf, + unsigned int subclass) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_SUBCLASS, +- USBG_F_HID_UINT_TO_ATTR_VAL(subclass)); ++ union usbg_f_hid_attr_val val = {.subclass = subclass}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_SUBCLASS, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/function/midi.h b/include/usbg/function/midi.h +index 39df047..b9d9d4f 100644 +--- a/include/usbg/function/midi.h ++++ b/include/usbg/function/midi.h +@@ -53,15 +53,6 @@ union usbg_f_midi_attr_val { + unsigned int qlen; + }; + +-#define USBG_F_MIDI_INT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_midi_attr_val, index, WHAT) +- +-#define USBG_F_MIDI_UINT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_midi_attr_val, qlen, WHAT) +- +-#define USBG_F_MIDI_CCHAR_PTR_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_midi_attr_val, id, WHAT) +- + /** + * @brief Cast from generic function to midi function + * @param[in] f function to be converted to midi funciton. +@@ -126,7 +117,7 @@ int usbg_f_midi_get_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_midi_set_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, +- union usbg_f_midi_attr_val val); ++ const union usbg_f_midi_attr_val *val); + + /** + * @brief Get the index value of MIDI adapter +@@ -148,8 +139,8 @@ static inline int usbg_f_midi_get_index(usbg_f_midi *mf, int *index) + */ + static inline int usbg_f_midi_set_index(usbg_f_midi *mf, int index) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_INDEX, +- USBG_F_MIDI_INT_TO_ATTR_VAL(index)); ++ union usbg_f_midi_attr_val val = {.index = index}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_INDEX, &val); + } + + /** +@@ -188,8 +179,8 @@ int usbg_f_midi_get_id_s(usbg_f_midi *mf, char *buf, int len); + */ + static inline int usbg_f_midi_set_id(usbg_f_midi *mf, const char *id) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_ID, +- USBG_F_MIDI_CCHAR_PTR_TO_ATTR_VAL(id)); ++ union usbg_f_midi_attr_val val = {.id = id}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_ID, &val); + } + + /** +@@ -212,8 +203,8 @@ static inline int usbg_f_midi_get_in_ports(usbg_f_midi *mf, unsigned *in_ports) + */ + static inline int usbg_f_midi_set_in_ports(usbg_f_midi *mf, unsigned in_ports) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_IN_PORTS, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(in_ports)); ++ union usbg_f_midi_attr_val val = {.in_ports = in_ports}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_IN_PORTS, &val); + } + + /** +@@ -236,8 +227,8 @@ static inline int usbg_f_midi_get_out_ports(usbg_f_midi *mf, unsigned *out_ports + */ + static inline int usbg_f_midi_set_out_ports(usbg_f_midi *mf, unsigned out_ports) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_OUT_PORTS, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(out_ports)); ++ union usbg_f_midi_attr_val val = {.out_ports = out_ports}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_OUT_PORTS, &val); + } + + /** +@@ -264,8 +255,8 @@ static inline int usbg_f_midi_get_buflen(usbg_f_midi *mf, int *buflen) + */ + static inline int usbg_f_midi_set_buflen(usbg_f_midi *mf, unsigned buflen) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_BUFLEN, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(buflen)); ++ union usbg_f_midi_attr_val val = {.buflen = buflen}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_BUFLEN, &val); + } + + /** +@@ -288,8 +279,8 @@ static inline int usbg_f_midi_get_qlen(usbg_f_midi *mf, unsigned *qlen) + */ + static inline int usbg_f_midi_set_qlen(usbg_f_midi *mf, unsigned qlen) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_QLEN, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(qlen)); ++ union usbg_f_midi_attr_val val = {.qlen = qlen}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_QLEN, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/function/ms.h b/include/usbg/function/ms.h +index 780464c..f52eb78 100644 +--- a/include/usbg/function/ms.h ++++ b/include/usbg/function/ms.h +@@ -56,14 +56,6 @@ union usbg_f_ms_lun_attr_val { + const char *file; + }; + +-#define USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_ms_lun_attr_val, cdrom, WHAT) +- +-#define USBG_F_MS_LUN_CCHAR_PTR_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_ms_lun_attr_val, file, WHAT) +- +- +- + /** + * @brief Cast from generic function to mass storage function + * @param[in] f function to be converted to ms funciton. +@@ -157,7 +149,7 @@ int usbg_f_ms_get_lun_attr_val(usbg_f_ms *mf, int lun_id, + */ + int usbg_f_ms_set_lun_attr_val(usbg_f_ms *mf, int lun_id, + enum usbg_f_ms_lun_attr lattr, +- const union usbg_f_ms_lun_attr_val val); ++ const union usbg_f_ms_lun_attr_val *val); + + /** + * @brief Get the value which determines if lun is visible as a cdrom +@@ -183,8 +175,8 @@ static inline int usbg_f_ms_get_lun_cdrom(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_cdrom(usbg_f_ms *mf, int lun_id, + bool cdrom) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_CDROM, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(cdrom)); ++ union usbg_f_ms_lun_attr_val val = {.cdrom = cdrom}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_CDROM, &val); + } + + /** +@@ -209,8 +201,8 @@ static inline int usbg_f_ms_get_lun_ro(usbg_f_ms *mf, int lun_id, bool *ro) + */ + static inline int usbg_f_ms_set_lun_ro(usbg_f_ms *mf, int lun_id, bool ro) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_RO, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(ro)); ++ union usbg_f_ms_lun_attr_val val = {.ro = ro}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_RO, &val); + } + + /** +@@ -239,8 +231,8 @@ static inline int usbg_f_ms_get_lun_nofua(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_nofua(usbg_f_ms *mf, int lun_id, + bool nofua) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_NOFUA, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(nofua)); ++ union usbg_f_ms_lun_attr_val val = {.nofua = nofua}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_NOFUA, &val); + } + + /** +@@ -267,8 +259,8 @@ static inline int usbg_f_ms_get_lun_removable(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_removable(usbg_f_ms *mf, int lun_id, + bool removable) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_REMOVABLE, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(removable)); ++ union usbg_f_ms_lun_attr_val val = {.removable = removable}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_REMOVABLE, &val); + } + + /** +@@ -313,8 +305,8 @@ int usbg_f_ms_get_lun_file_s(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_file(usbg_f_ms *mf, int lun_id, + const char *file) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_FILE, +- USBG_F_MS_LUN_CCHAR_PTR_TO_ATTR_VAL(file)); ++ union usbg_f_ms_lun_attr_val val = {.file = file}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_FILE, &val); + } + + /** +diff --git a/include/usbg/function/net.h b/include/usbg/function/net.h +index b0409f1..06cee30 100644 +--- a/include/usbg/function/net.h ++++ b/include/usbg/function/net.h +@@ -56,12 +56,6 @@ union usbg_f_net_attr_val { + unsigned int protocol; + }; + +-#define USBG_F_NET_ETHER_ADDR_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_net_attr_val, dev_addr, WHAT) +- +-#define USBG_F_NET_INT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_net_attr_val, qmult, WHAT) +- + /** + * @brief Cast from generic function to net function + * @param[in] f function to be converted to net funciton. +@@ -125,7 +119,7 @@ int usbg_f_net_get_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_net_set_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, +- const union usbg_f_net_attr_val val); ++ const union usbg_f_net_attr_val *val); + + /** + * @brief Get the value of device side MAC address +@@ -136,7 +130,7 @@ int usbg_f_net_set_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, + static inline int usbg_f_net_get_dev_addr(usbg_f_net *nf, + struct ether_addr *addr) + { +- union usbg_f_net_attr_val val = { .dev_addr = *addr, }; ++ union usbg_f_net_attr_val val = {.dev_addr = *addr}; + return usbg_f_net_get_attr_val(nf, USBG_F_NET_DEV_ADDR, &val); + } + +@@ -149,8 +143,8 @@ static inline int usbg_f_net_get_dev_addr(usbg_f_net *nf, + static inline int usbg_f_net_set_dev_addr(usbg_f_net *nf, + const struct ether_addr *addr) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_DEV_ADDR, +- USBG_F_NET_ETHER_ADDR_TO_ATTR_VAL(*addr)); ++ union usbg_f_net_attr_val val = {.dev_addr = *addr}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_DEV_ADDR, &val); + } + + /** +@@ -175,8 +169,8 @@ static inline int usbg_f_net_get_host_addr(usbg_f_net *nf, + static inline int usbg_f_net_set_host_addr(usbg_f_net *nf, + const struct ether_addr *addr) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_HOST_ADDR, +- USBG_F_NET_ETHER_ADDR_TO_ATTR_VAL(*addr)); ++ union usbg_f_net_attr_val val = {.host_addr = *addr}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_HOST_ADDR, &val); + } + + /** +@@ -226,8 +220,8 @@ static inline int usbg_f_net_get_qmult(usbg_f_net *nf, int *qmult) + */ + static inline int usbg_f_net_set_qmult(usbg_f_net *nf, int qmult) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_QMULT, +- USBG_F_NET_INT_TO_ATTR_VAL(qmult)); ++ union usbg_f_net_attr_val val = {.qmult = qmult}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_QMULT, &val); + } + + /** +@@ -250,8 +244,8 @@ static inline int usbg_f_net_get_class(usbg_f_net *nf, unsigned int *class_) + */ + static inline int usbg_f_net_set_class(usbg_f_net *nf, unsigned int class_) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_CLASS, +- USBG_F_NET_INT_TO_ATTR_VAL(class_)); ++ union usbg_f_net_attr_val val = {.class_ = class_}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_CLASS, &val); + } + + /** +@@ -274,8 +268,8 @@ static inline int usbg_f_net_get_subclass(usbg_f_net *nf, int *subclass) + */ + static inline int usbg_f_net_set_subclass(usbg_f_net *nf, unsigned int subclass) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_SUBCLASS, +- USBG_F_NET_INT_TO_ATTR_VAL(subclass)); ++ union usbg_f_net_attr_val val = {.subclass = subclass}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_SUBCLASS, &val); + } + + /** +@@ -298,8 +292,8 @@ static inline int usbg_f_net_get_protocol(usbg_f_net *nf, int *protocol) + */ + static inline int usbg_f_net_set_protocol(usbg_f_net *nf, unsigned int protocol) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_PROTOCOL, +- USBG_F_NET_INT_TO_ATTR_VAL(protocol)); ++ union usbg_f_net_attr_val val = {.protocol = protocol}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_PROTOCOL, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/function/uac2.h b/include/usbg/function/uac2.h +index 6fc4d24..80918ef 100644 +--- a/include/usbg/function/uac2.h ++++ b/include/usbg/function/uac2.h +@@ -110,9 +110,6 @@ union usbg_f_uac2_attr_val { + const char * function_name; + }; + +-#define USBG_F_UAC2_INT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_uac2_attr_val, c_chmask, WHAT) +- + /** + * @brief Cast from generic function to uac2 function + * @param[in] f function to be converted to uac2 funciton. +@@ -172,7 +169,7 @@ int usbg_f_uac2_get_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_uac2_set_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, +- union usbg_f_uac2_attr_val val); ++ const union usbg_f_uac2_attr_val *val); + + /** + * @brief Get the capture channel mask of UAC2 adapter +@@ -194,8 +191,8 @@ static inline int usbg_f_uac2_get_c_chmask(usbg_f_uac2 *af, int *c_chmask) + */ + static inline int usbg_f_uac2_set_c_chmask(usbg_f_uac2 *af, int c_chmask) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_CHMASK, +- USBG_F_UAC2_INT_TO_ATTR_VAL(c_chmask)); ++ union usbg_f_uac2_attr_val val = {.c_chmask = c_chmask}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_CHMASK, &val); + } + + /** +@@ -218,8 +215,8 @@ static inline int usbg_f_uac2_get_c_srate(usbg_f_uac2 *af, int *c_srate) + */ + static inline int usbg_f_uac2_set_c_srate(usbg_f_uac2 *af, int c_srate) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SRATE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(c_srate)); ++ union usbg_f_uac2_attr_val val = {.c_srate = c_srate}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SRATE, &val); + } + + /** +@@ -242,8 +239,8 @@ static inline int usbg_f_uac2_get_c_ssize(usbg_f_uac2 *af, int *c_ssize) + */ + static inline int usbg_f_uac2_set_c_ssize(usbg_f_uac2 *af, int c_ssize) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SSIZE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(c_ssize)); ++ union usbg_f_uac2_attr_val val = {.c_ssize = c_ssize}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SSIZE, &val); + } + + /** +@@ -266,8 +263,8 @@ static inline int usbg_f_uac2_get_p_chmask(usbg_f_uac2 *af, int *p_chmask) + */ + static inline int usbg_f_uac2_set_p_chmask(usbg_f_uac2 *af, int p_chmask) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_CHMASK, +- USBG_F_UAC2_INT_TO_ATTR_VAL(p_chmask)); ++ union usbg_f_uac2_attr_val val = {.p_chmask = p_chmask}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_CHMASK, &val); + } + + /** +@@ -290,8 +287,8 @@ static inline int usbg_f_uac2_get_p_srate(usbg_f_uac2 *af, int *p_srate) + */ + static inline int usbg_f_uac2_set_p_srate(usbg_f_uac2 *af, int p_srate) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SRATE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(p_srate)); ++ union usbg_f_uac2_attr_val val = {.p_srate = p_srate}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SRATE, &val); + } + + /** +@@ -314,8 +311,8 @@ static inline int usbg_f_uac2_get_p_ssize(usbg_f_uac2 *af, int *p_ssize) + */ + static inline int usbg_f_uac2_set_p_ssize(usbg_f_uac2 *af, int p_ssize) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SSIZE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(p_ssize)); ++ union usbg_f_uac2_attr_val val = {.p_ssize = p_ssize}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SSIZE, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/usbg_internal.h b/include/usbg/usbg_internal.h +index 1d8dfe2..d6a3e3a 100644 +--- a/include/usbg/usbg_internal.h ++++ b/include/usbg/usbg_internal.h +@@ -322,7 +322,7 @@ void usbg_cleanup_function(struct usbg_function *f); + } + + typedef int (*usbg_attr_get_func)(const char *, const char *, const char *, void *); +-typedef int (*usbg_attr_set_func)(const char *, const char *, const char *, void *); ++typedef int (*usbg_attr_set_func)(const char *, const char *, const char *, const void *); + + static inline int usbg_get_dec(const char *path, const char *name, + const char *attr, void *val) +@@ -331,7 +331,7 @@ static inline int usbg_get_dec(const char *path, const char *name, + } + + static inline int usbg_set_dec(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + return usbg_write_dec(path, name, attr, *((int *)val)); + } +@@ -343,7 +343,7 @@ static inline int usbg_get_bool(const char *path, const char *name, + } + + static inline int usbg_set_bool(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + return usbg_write_bool(path, name, attr, *((bool *)val)); + } +@@ -355,7 +355,7 @@ static inline int usbg_get_string(const char *path, const char *name, + } + + static inline int usbg_set_string(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + return usbg_write_string(path, name, attr, *(char **)val); + } +@@ -364,7 +364,7 @@ int usbg_get_ether_addr(const char *path, const char *name, const char *attr, + void *val); + + int usbg_set_ether_addr(const char *path, const char *name, const char *attr, +- void *val); ++ const void *val); + + int usbg_get_dev(const char *path, const char *name, const char *attr, + void *val); +diff --git a/src/Makefile.am b/src/Makefile.am +index 634209f..ac97bc8 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -7,6 +7,6 @@ else + libusbgx_la_SOURCES += usbg_schemes_none.c + endif + libusbgx_la_LDFLAGS = $(LIBCONFIG_LIBS) +-libusbgx_la_LDFLAGS += -version-info 2:0:0 ++libusbgx_la_LDFLAGS += -version-info 3:0:0 + libusbgx_la_CFLAGS = $(LIBCONFIG_CFLAGS) + AM_CPPFLAGS=-I$(top_srcdir)/include/ -I$(top_builddir)/include/usbg +diff --git a/src/function/ether.c b/src/function/ether.c +index a9eaf33..a1d20f1 100644 +--- a/src/function/ether.c ++++ b/src/function/ether.c +@@ -124,7 +124,7 @@ static int ether_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_net_set_attr_val(nf, i, val); ++ ret = usbg_f_net_set_attr_val(nf, i, &val); + if (ret) + break; + } +@@ -258,8 +258,8 @@ int usbg_f_net_set_attrs(usbg_f_net *nf, + continue; + + ret = usbg_f_net_set_attr_val(nf, i, +- *(union usbg_f_net_attr_val *) +- ((char *)attrs ++ (const union usbg_f_net_attr_val *) ++ ((const char *)attrs + + net_attr[i].offset)); + if (ret) + break; +@@ -277,12 +277,12 @@ int usbg_f_net_get_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, + } + + int usbg_f_net_set_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, +- union usbg_f_net_attr_val val) ++ const union usbg_f_net_attr_val *val) + { + return net_attr[attr].ro ? + USBG_ERROR_INVALID_PARAM : + net_attr[attr].set(nf->func.path, nf->func.name, +- net_attr[attr].name, &val); ++ net_attr[attr].name, val); + } + + int usbg_f_net_get_ifname_s(usbg_f_net *nf, char *buf, int len) +diff --git a/src/function/hid.c b/src/function/hid.c +index 4d075cf..895c2c6 100644 +--- a/src/function/hid.c ++++ b/src/function/hid.c +@@ -69,9 +69,9 @@ static int hid_get_report(const char *path, const char *name, const char *attr, + } + + static int hid_set_report(const char *path, const char *name, const char *attr, +- void *val) ++ const void *val) + { +- struct usbg_f_hid_report_desc *report_desc = val; ++ const struct usbg_f_hid_report_desc *report_desc = val; + char *buf = report_desc->desc; + int len = report_desc->len; + int ret; +@@ -239,7 +239,7 @@ static int hid_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_hid_set_attr_val(hf, i, val); ++ ret = usbg_f_hid_set_attr_val(hf, i, &val); + if (ret) + break; + } +@@ -327,7 +327,7 @@ int usbg_f_hid_set_attrs(usbg_f_hid *hf, + continue; + + ret = usbg_f_hid_set_attr_val(hf, i, +- *(union usbg_f_hid_attr_val *) ++ (union usbg_f_hid_attr_val *) + ((char *)attrs + + hid_attr[i].offset)); + if (ret) +@@ -346,11 +346,11 @@ int usbg_f_hid_get_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, + } + + int usbg_f_hid_set_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, +- union usbg_f_hid_attr_val val) ++ const union usbg_f_hid_attr_val *val) + { + return hid_attr[attr].ro ? + USBG_ERROR_INVALID_PARAM : + hid_attr[attr].set(hf->func.path, hf->func.name, +- hid_attr[attr].name, &val); ++ hid_attr[attr].name, val); + } + +diff --git a/src/function/midi.c b/src/function/midi.c +index 1cedb97..2318b49 100644 +--- a/src/function/midi.c ++++ b/src/function/midi.c +@@ -100,7 +100,7 @@ static int midi_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_midi_set_attr_val(mf, i, val); ++ ret = usbg_f_midi_set_attr_val(mf, i, &val); + if (ret) + break; + } +@@ -185,8 +185,8 @@ int usbg_f_midi_set_attrs(usbg_f_midi *mf, + + for (i = USBG_F_MIDI_ATTR_MIN; i < USBG_F_MIDI_ATTR_MAX; ++i) { + ret = usbg_f_midi_set_attr_val(mf, i, +- *(union usbg_f_midi_attr_val *) +- ((char *)attrs ++ (const union usbg_f_midi_attr_val *) ++ ((const char *)attrs + + midi_attr[i].offset)); + if (ret) + break; +@@ -204,10 +204,10 @@ int usbg_f_midi_get_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, + } + + int usbg_f_midi_set_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, +- union usbg_f_midi_attr_val val) ++ const union usbg_f_midi_attr_val *val) + { + return midi_attr[attr].set(mf->func.path, mf->func.name, +- midi_attr[attr].name, &val); ++ midi_attr[attr].name, val); + } + + int usbg_f_midi_get_id_s(usbg_f_midi *mf, char *buf, int len) +diff --git a/src/function/ms.c b/src/function/ms.c +index 519b012..5cdd814 100644 +--- a/src/function/ms.c ++++ b/src/function/ms.c +@@ -207,7 +207,7 @@ static int ms_import_lun_attrs(struct usbg_f_ms *mf, int lun_id, + if (ret < 0) + break; + +- ret = usbg_f_ms_set_lun_attr_val(mf, lun_id, i, val); ++ ret = usbg_f_ms_set_lun_attr_val(mf, lun_id, i, &val); + if (ret) + break; + } +@@ -605,8 +605,8 @@ int usbg_f_ms_set_lun_attrs(usbg_f_ms *mf, int lun_id, + + for (i = USBG_F_MS_LUN_ATTR_MIN; i < USBG_F_MS_LUN_ATTR_MAX; ++i) { + ret = usbg_f_ms_set_lun_attr_val(mf, lun_id, i, +- *(union usbg_f_ms_lun_attr_val *) +- ((char *)lattrs ++ (const union usbg_f_ms_lun_attr_val *) ++ ((const char *)lattrs + + ms_lun_attr[i].offset)); + if (ret) + break; +@@ -633,7 +633,7 @@ int usbg_f_ms_get_lun_attr_val(usbg_f_ms *mf, int lun_id, + + int usbg_f_ms_set_lun_attr_val(usbg_f_ms *mf, int lun_id, + enum usbg_f_ms_lun_attr lattr, +- union usbg_f_ms_lun_attr_val val) ++ const union usbg_f_ms_lun_attr_val *val) + { + char lpath[USBG_MAX_PATH_LENGTH]; + int ret; +@@ -644,7 +644,7 @@ int usbg_f_ms_set_lun_attr_val(usbg_f_ms *mf, int lun_id, + return USBG_ERROR_PATH_TOO_LONG; + + return ms_lun_attr[lattr].set(lpath, "", +- ms_lun_attr[lattr].name, &val); ++ ms_lun_attr[lattr].name, val); + } + + int usbg_f_ms_get_lun_file_s(usbg_f_ms *mf, int lun_id, +diff --git a/src/function/uac2.c b/src/function/uac2.c +index 9ca8b66..fc06c1d 100644 +--- a/src/function/uac2.c ++++ b/src/function/uac2.c +@@ -125,7 +125,7 @@ static int uac2_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_uac2_set_attr_val(af, i, val); ++ ret = usbg_f_uac2_set_attr_val(af, i, &val); + if (ret) + break; + } +@@ -210,8 +210,8 @@ int usbg_f_uac2_set_attrs(usbg_f_uac2 *af, + + for (i = USBG_F_UAC2_ATTR_MIN; i < USBG_F_UAC2_ATTR_MAX; ++i) { + ret = usbg_f_uac2_set_attr_val(af, i, +- *(union usbg_f_uac2_attr_val *) +- ((char *)attrs ++ (const union usbg_f_uac2_attr_val *) ++ ((const char *)attrs + + uac2_attr[i].offset)); + if (ret) + break; +@@ -229,8 +229,8 @@ int usbg_f_uac2_get_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, + } + + int usbg_f_uac2_set_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, +- union usbg_f_uac2_attr_val val) ++ const union usbg_f_uac2_attr_val *val) + { + return uac2_attr[attr].set(af->func.path, af->func.name, +- uac2_attr[attr].name, &val); ++ uac2_attr[attr].name, val); + } +diff --git a/src/function/uvc.c b/src/function/uvc.c +index f39594b..947b94e 100644 +--- a/src/function/uvc.c ++++ b/src/function/uvc.c +@@ -303,7 +303,7 @@ int usbg_f_uvc_get_config_attr_val(usbg_f_uvc *uvcf, enum usbg_f_uvc_config_attr + } + + int usbg_f_uvc_set_config_attr_val(usbg_f_uvc *uvcf, enum usbg_f_uvc_config_attr iattr, +- union usbg_f_uvc_config_attr_val val) ++ const union usbg_f_uvc_config_attr_val *val) + { + char ipath[USBG_MAX_PATH_LENGTH]; + int nmb; +@@ -314,7 +314,7 @@ int usbg_f_uvc_set_config_attr_val(usbg_f_uvc *uvcf, enum usbg_f_uvc_config_attr + return USBG_ERROR_PATH_TOO_LONG; + + return uvc_config_attr[iattr].set(ipath, "", +- uvc_config_attr[iattr].name, &val); ++ uvc_config_attr[iattr].name, val); + } + + int usbg_f_uvc_get_config_attrs(usbg_f_uvc *uvcf, struct usbg_f_uvc_config_attrs *iattrs) +@@ -341,8 +341,8 @@ int usbg_f_uvc_set_config_attrs(usbg_f_uvc *uvcf, const struct usbg_f_uvc_config + + for (i = USBG_F_UVC_FRAME_ATTR_MIN; i < USBG_F_UVC_FRAME_ATTR_MAX; ++i) { + ret = usbg_f_uvc_set_config_attr_val(uvcf, i, +- *(union usbg_f_uvc_config_attr_val *) +- ((char *)iattrs ++ (const union usbg_f_uvc_config_attr_val *) ++ ((const char *)iattrs + + uvc_config_attr[i].offset)); + if (ret) + break; +@@ -774,7 +774,7 @@ static int uvc_import_config(struct usbg_f_uvc *uvcf, config_setting_t *root) + if (ret < 0) + break; + +- ret = usbg_f_uvc_set_config_attr_val(uvcf, i, val); ++ ret = usbg_f_uvc_set_config_attr_val(uvcf, i, &val); + if (ret) + break; + } +diff --git a/src/usbg_common.c b/src/usbg_common.c +index 5f7f4e5..7234649 100644 +--- a/src/usbg_common.c ++++ b/src/usbg_common.c +@@ -337,7 +337,7 @@ int usbg_get_ether_addr(const char *path, const char *name, + } + + int usbg_set_ether_addr(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + char str_addr[USBG_MAX_STR_LENGTH]; + +-- +2.42.0 + diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch b/meta-oe/recipes-support/libusbgx/libusbgx/0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch new file mode 100644 index 0000000000..cc122c844c --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch @@ -0,0 +1,52 @@ +From 4f3f2ad08e6ca132bd1dd388e02b57223bf4219d Mon Sep 17 00:00:00 2001 +From: Ming Liu <liu.ming50@gmail.com> +Date: Sun, 11 Dec 2022 14:11:49 +0100 +Subject: [PATCH] libusbgx: Add interface name for NCM Feature Descriptors + +In commit: abf422bffca4a4767e7e242c44910dbf5ef7094f +[ +Author: Stefan Agner <stefan.agner@toradex.com> +Date: Tue Jan 24 14:22:25 2017 -0800 + + libusbgx: Add interface name for Feature Descriptors + + This adds interface name required for "Feature Descriptors". If + specified, we can assume that a Feature Descriptor with the + interface name of the specified string is understood by the + kernel (e.g. interface.rndis). +] + +it only added Feature Descriptors for RNDIS, NCM also needs that, or +else it could not be recognized by Windows systems. + +Add Feature Descriptors interface name for NCM. + +Upstream-Status: Submitted [https://github.com/linux-usb-gadgets/libusbgx/pull/73] + +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + src/function/ether.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/function/ether.c b/src/function/ether.c +index b1fe1d2..a9eaf33 100644 +--- a/src/function/ether.c ++++ b/src/function/ether.c +@@ -184,8 +184,14 @@ struct usbg_function_type usbg_f_type_subset = { + ETHER_FUNCTION_OPTS + }; + ++static char *ncm_os_desc_ifnames[] = { ++ "ncm", ++ NULL ++}; ++ + struct usbg_function_type usbg_f_type_ncm = { + .name = "ncm", ++ .os_desc_iname = ncm_os_desc_ifnames, + ETHER_FUNCTION_OPTS + }; + +-- +2.25.1 + diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start new file mode 100755 index 0000000000..e80cb2c340 --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start @@ -0,0 +1,20 @@ +#!/bin/sh + +[ -r /etc/default/usbgx ] && . /etc/default/usbgx + +for i in $IMPORT_SCHEMAS; do + /usr/bin/gadget-import "$i" /etc/usbgx/"$i".schema +done + +for script in $(find -L /etc/usbgx.d -type f -exec test -e {} \; -print 2>/dev/null); do + $script +done + +for i in $ENABLED_SCHEMAS; do + configured_udc=$(eval 'echo ${UDC_FOR_SCHEMA_'"$i"'}') + if [ -n "${configured_udc}" ] && [ -e "/sys/class/udc/${configured_udc}" ]; then + echo ${configured_udc} > /sys/kernel/config/usb_gadget/"$i"/UDC + else + ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/"$i"/UDC + fi +done diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop new file mode 100755 index 0000000000..24b7caed5e --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop @@ -0,0 +1,13 @@ +#!/bin/sh + +[ -r /etc/default/usbgx ] && . /etc/default/usbgx + +for i in $IMPORT_SCHEMAS; do + if [ -e /sys/kernel/config/usb_gadget/"$i"/idVendor ]; then + if [ -e /sys/kernel/config/usb_gadget/"$i"/idProduct ]; then + idVendor=$(cat /sys/kernel/config/usb_gadget/"$i"/idVendor) + idProduct=$(cat /sys/kernel/config/usb_gadget/"$i"/idProduct) + /usr/bin/gadget-vid-pid-remove ${idVendor}:${idProduct} + fi + fi +done diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.initd b/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.initd new file mode 100644 index 0000000000..d1938078f0 --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.initd @@ -0,0 +1,143 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: usbg +# Required-Start: $local_fs +# Should-Start: +# Required-Stop: $local_fs +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Example initscript +# Description: This file should be used to construct scripts to be +# placed in /etc/init.d +### END INIT INFO + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin + +DESC="Load USB gadget schemas" +NAME="usbgx" +DAEMON=/usr/bin/gadget-start +DAEMON_ARGS="" +PIDFILE=/var/run/$NAME.pid + +. /etc/init.d/functions || exit 1 + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# +# Function that starts the daemon/service +# +do_start() { + local status pid + + status=0 + pid=`pidofproc $NAME` || status=$? + case $status in + 0) + echo "$DESC already running ($pid)." + exit 1 + ;; + *) + echo "Starting $DESC ..." + exec $DAEMON $DAEMON_ARGS >/dev/null 2>&1 || status=$? + echo "ERROR: Failed to start $DESC." + exit $status + ;; + esac +} + +# +# Function that stops the daemon/service +# +do_stop() { + local pid status + + status=0 + pid=`pidofproc $NAME` || status=$? + case $status in + 0) + # Exit when fail to stop, the kill would complain when fail + kill -s 15 $pid >/dev/null && rm -f $PIDFILE && \ + echo "Stopped $DESC ($pid)." || exit $? + ;; + *) + echo "$DESC is not running; none killed." >&2 + ;; + esac + + return $status +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + local pid status + + status=0 + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + pid=`pidofproc $NAME` || status=$? + case $status in + 0) + echo "Reloading $DESC ..." + kill -s 1 $pid || exit $? + ;; + *) + echo "$DESC is not running; none reloaded." >&2 + ;; + esac + exit $status +} + + +# +# Function that shows the daemon/service status +# +status_of_proc () { + local pid status + + status=0 + # pidof output null when no program is running, so no "2>/dev/null". + pid=`pidofproc $NAME` || status=$? + case $status in + 0) + echo "$DESC is running ($pid)." + exit 0 + ;; + *) + echo "$DESC is not running." >&2 + exit $status + ;; + esac +} + +case "$1" in + start) + do_start + ;; + stop) + do_stop || exit $? + ;; + status) + status_of_proc + ;; + restart) + # Always start the service regardless the status of do_stop + do_stop + do_start + ;; + try-restart|force-reload) + do_stop && do_start + ;; + *) + echo "Usage: $0 {start|stop|status|restart|try-restart|force-reload}" >&2 + exit 3 + ;; +esac diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service b/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service new file mode 100644 index 0000000000..7210969d62 --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service @@ -0,0 +1,13 @@ +[Unit] +Description=Load USB gadget schemas +Requires=sys-kernel-config.mount +After=sys-kernel-config.mount + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/bin/gadget-start +ExecStop=/usr/bin/gadget-stop + +[Install] +WantedBy=usb-gadget.target diff --git a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb new file mode 100644 index 0000000000..bc40f029cd --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb @@ -0,0 +1,61 @@ +SUMMARY = "USB Gadget neXt Configfs Library" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" + +inherit autotools pkgconfig systemd update-rc.d update-alternatives + +PV = "0.2.0+git" +SRCREV = "ec0b01c03fdc7893997b7b32ec1c12c6103f62f3" +SRCBRANCH = "master" +SRC_URI = " \ + git://github.com/libusbgx/libusbgx.git;branch=${SRCBRANCH};protocol=https \ + file://0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch \ + file://0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch \ + file://gadget-start \ + file://gadget-stop \ + file://usbgx.initd \ + file://usbgx.service \ +" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "examples gadget-schemes libconfig" +PACKAGECONFIG[libconfig] = "--with-libconfig=yes,--without-libconfig,libconfig" +PACKAGECONFIG[examples] = "--enable-examples,--disable-examples" +PACKAGECONFIG[gadget-schemes] = "--enable-gadget-schemes,--disable-gadget-schemes" +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,cmocka" + +PACKAGE_BEFORE_PN = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '${PN}-examples', '', d)}" + +SYSTEMD_PACKAGES = "${PN}-examples" +SYSTEMD_SERVICE:${PN}-examples = "usbgx.service" +SYSTEMD_AUTO_ENABLE:${PN}-examples = "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'enable', 'disable', d)}" + +INITSCRIPT_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '${PN}-examples', '', d)}" +INITSCRIPT_NAME = "usbgx" +INITSCRIPT_PARAMS = "defaults" +INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '1', '0', d)}" + +do_install:append() { + install -Dm 0755 ${UNPACKDIR}/gadget-start ${D}${bindir}/gadget-start + sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-start + install -m 0755 ${UNPACKDIR}/gadget-start ${D}${bindir}/gadget-stop + sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-stop + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -Dm 0644 ${UNPACKDIR}/usbgx.service ${D}${systemd_system_unitdir}/usbgx.service + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -Dm 0755 ${UNPACKDIR}/usbgx.initd ${D}${sysconfdir}/init.d/usbgx + fi +} + +FILES:${PN}-examples = "${bindir}/* ${sysconfdir}/*" +RDEPENDS:${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'libusbgx-config', '', d)}" + +ALTERNATIVE_PRIORITY = "90" +ALTERNATIVE:${PN}-examples = "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'gadget-acm-ecm show-gadgets', '', d)}" +ALTERNATIVE_LINK_NAME[gadget-acm-ecm] = "${bindir}/gadget-acm-ecm" +ALTERNATIVE_LINK_NAME[show-gadgets] = "${bindir}/show-gadgets" diff --git a/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch b/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch index 8140ea3438..00119af11c 100644 --- a/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch +++ b/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch @@ -11,15 +11,13 @@ Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> iface.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -diff --git a/iface.c b/iface.c -index 5951d81..27793f0 100644 --- a/iface.c +++ b/iface.c @@ -43,7 +43,14 @@ __result; })) #endif --#define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter" +-#define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter" +#ifdef LIBEXECDIR +# define CAT_PATH(DIR1,DIR2) DIR1##DIR2 +# define RAW_UTEMPTER_PATH CAT_PATH(LIBEXECDIR,/utempter/utempter) @@ -31,6 +29,3 @@ index 5951d81..27793f0 100644 static const char *utempter_pathname; static int saved_fd = -1; --- -1.8.3.1 - diff --git a/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch b/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch new file mode 100644 index 0000000000..f43f54eaab --- /dev/null +++ b/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch @@ -0,0 +1,36 @@ +From 48b6bcf9f5d8a05eace4bc463c47e8a4715d3000 Mon Sep 17 00:00:00 2001 +From: iddinev <xidinev@gmail.com> +Date: Mon, 18 Mar 2019 15:45:20 +0200 +Subject: [PATCH] Proper macro path generation. + +Signed-off-by: iddinev <xidinev@gmail.com> +--- +Upstream-Status: Pending + + libutempter/iface.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git libutempter/iface.c libutempter/iface.c +index 27793f0..c1c0ee9 100644 +--- libutempter/iface.c ++++ libutempter/iface.c +@@ -44,13 +44,12 @@ + #endif + + #ifdef LIBEXECDIR +-# define CAT_PATH(DIR1,DIR2) DIR1##DIR2 +-# define RAW_UTEMPTER_PATH CAT_PATH(LIBEXECDIR,/utempter/utempter) ++# define UTEMPTER_DEFAULT_PATHNAME XSTR_PATH(LIBEXECDIR)"/utempter/utempter" + #else +-# define RAW_UTEMPTER_PATH /usr/lib/libtempter/utempter/utempter ++# define UTEMPTER_DEFAULT_PATHNAME STR_PATH(/usr/lib/libtempter/utempter/utempter) + #endif + #define STR_PATH(RAW_STR) #RAW_STR +-#define UTEMPTER_DEFAULT_PATHNAME STR_PATH(RAW_UTEMPTER_PATH) ++#define XSTR_PATH(STR) STR_PATH(STR) + + static const char *utempter_pathname; + static int saved_fd = -1; +-- +2.7.4 + diff --git a/meta-oe/recipes-support/libutempter/libutempter/libutempter-remove-glibc-assumption.patch b/meta-oe/recipes-support/libutempter/libutempter/libutempter-remove-glibc-assumption.patch deleted file mode 100644 index 6ed93355bb..0000000000 --- a/meta-oe/recipes-support/libutempter/libutempter/libutempter-remove-glibc-assumption.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Naur libutempter-1.1.6.orig/utempter.c libutempter-1.1.6/utempter.c ---- libutempter-1.1.6.orig/utempter.c 2010-11-04 13:14:53.000000000 -0400 -+++ libutempter-1.1.6/utempter.c 2014-06-20 16:37:09.762403323 -0400 -@@ -34,13 +34,7 @@ - #include <sys/stat.h> - #include <utmp.h> - --#ifdef __GLIBC__ - # include <pty.h> --#elif defined(__FreeBSD__) --# include <libutil.h> --#else --# error Unsupported platform --#endif /* __GLIBC__ || __FreeBSD__ */ - - #define DEV_PREFIX "/dev/" - #define DEV_PREFIX_LEN (sizeof(DEV_PREFIX)-1) -@@ -106,17 +100,12 @@ - - static int - write_uwtmp_record(const char *user, const char *term, const char *host, --#ifdef __GLIBC__ - pid_t pid, --#endif - int add) - { - struct utmp ut; - struct timeval tv; -- --#ifdef __GLIBC__ - size_t offset; --#endif - - memset(&ut, 0, sizeof(ut)); - -@@ -128,8 +117,6 @@ - if (host) - strncpy(ut.ut_host, host, sizeof(ut.ut_host)); - --#ifdef __GLIBC__ -- - offset = (strlen(term) <= sizeof(ut.ut_id)) ? 0 : - strlen(term) - sizeof(ut.ut_id); - strncpy(ut.ut_id, term + offset, sizeof(ut.ut_id)); -@@ -156,27 +143,6 @@ - - (void) updwtmp(_PATH_WTMP, &ut); - --#elif defined(__FreeBSD__) -- -- ut.ut_time = tv.tv_sec; -- -- if (add) -- { -- login(&ut); -- } else -- { -- if (logout(term) != 1) -- { --#ifdef UTEMPTER_DEBUG -- fprintf(stderr, "utempter: logout: %s\n", -- strerror(errno)); --#endif -- exit(EXIT_FAILURE); -- } -- } -- --#endif /* __GLIBC__ || __FreeBSD__ */ -- - #ifdef UTEMPTER_DEBUG - fprintf(stderr, - "utempter: DEBUG: utmp/wtmp record %s for terminal '%s'\n", -@@ -255,8 +221,6 @@ - validate_device(device); - - return write_uwtmp_record(pw->pw_name, device + DEV_PREFIX_LEN, host, --#ifdef __GLIBC__ - pid, --#endif - add); - } diff --git a/meta-oe/recipes-support/libutempter/libutempter.bb b/meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb index 8c84cb376f..0d2cd135c6 100644 --- a/meta-oe/recipes-support/libutempter/libutempter.bb +++ b/meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb @@ -4,16 +4,15 @@ This library provides interface for terminal emulators such as \ screen and xterm to record user sessions to utmp and wtmp files." HOMEPAGE = "ftp://ftp.altlinux.org/pub/people/ldv/utempter" SECTION = "System Environment/Libraries" -LICENSE = "GPLv2 & GPLv2+ & LGPLv2 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & LGPL-2.0-only & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" -SRCREV = "3ef74fff310f09e2601e241b9f042cd39d591018" -PV = "1.1.6-alt2+git${SRCPV}" +SRCREV = "63825e2244629d44dae21132b1065d7ecc0491c0" -SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git \ +SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git;branch=master \ file://0001-Fix-macro-error.patch \ - file://libutempter-remove-glibc-assumption.patch \ - " + file://0002-Proper-macro-path-generation.patch \ + " S = "${WORKDIR}/git/${BPN}" @@ -36,6 +35,6 @@ do_install() { rm -f ${D}${libdir}/*.a } -FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN} += "${libexecdir}/utempter/utempter" -FILES_${PN}-dbg += "${libexecdir}/utempter/.debug/utempter" +FILES:${PN} = "${libdir}/*.so.*" +FILES:${PN} += "${libexecdir}/utempter/utempter" +FILES:${PN}-dbg += "${libexecdir}/utempter/.debug/utempter" diff --git a/meta-oe/recipes-support/links/files/ac-prog-cxx.patch b/meta-oe/recipes-support/links/files/ac-prog-cxx.patch index 41c3826850..0406b700d7 100644 --- a/meta-oe/recipes-support/links/files/ac-prog-cxx.patch +++ b/meta-oe/recipes-support/links/files/ac-prog-cxx.patch @@ -1,11 +1,23 @@ ---- links-2.1pre20/configure.in.orig 2005-12-21 15:23:49.000000000 +0000 -+++ links-2.1pre20/configure.in 2005-12-21 15:23:59.000000000 +0000 -@@ -18,7 +18,7 @@ +From c00668541f68c17a5e453a4dcc2a86022b20af87 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Mon, 30 Jul 2012 23:52:49 +0200 + +--- +Upstream-Status: Pending + + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 7c15b6b..9896631 100644 +--- a/configure.in ++++ b/configure.in +@@ -23,7 +23,7 @@ AM_CONFIG_HEADER(config.h) dnl Checks for programs. AC_PROG_CC --#AC_PROG_CXX +-dnl AC_PROG_CXX +AC_PROG_CXX - #AC_PROG_AWK - #AM_PROG_LEX - #AC_PROG_YACC + dnl AC_PROG_AWK + dnl AM_PROG_LEX + dnl AC_PROG_YACC diff --git a/meta-oe/recipes-support/links/links-x11_2.7.bb b/meta-oe/recipes-support/links/links-x11_2.26.bb index 2ae11ac97e..713919bca1 100644 --- a/meta-oe/recipes-support/links/links-x11_2.7.bb +++ b/meta-oe/recipes-support/links/links-x11_2.26.bb @@ -1,15 +1,18 @@ require links.inc DEPENDS += "virtual/libx11" -RCONFLICTS_${PN} = "links" +RCONFLICTS:${PN} = "links" -inherit distro_features_check +inherit features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += " file://links2.desktop \ http://www.xora.org.uk/oe/links2.png;name=icon" +SRC_URI[sha256sum] = "f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb" +SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" + S = "${WORKDIR}/links-${PV}" EXTRA_OECONF = "--enable-graphics \ @@ -18,14 +21,9 @@ EXTRA_OECONF = "--enable-graphics \ --without-directfb --without-pmshell --without-atheos \ --with-x --without-gpm" -do_install_append() { +do_install:append() { install -d ${D}/${datadir}/applications - install -m 0644 ${WORKDIR}/links2.desktop ${D}/${datadir}/applications + install -m 0644 ${UNPACKDIR}/links2.desktop ${D}/${datadir}/applications install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps + install -m 0644 ${UNPACKDIR}/links2.png ${D}/${datadir}/pixmaps } - -SRC_URI[md5sum] = "d06aa6e14b2172d73188871a5357185a" -SRC_URI[sha256sum] = "0c182b1cbcdfd5cdcd2f75a6032d1a4b660d07c1225c1e07757cec81d3302130" -SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" -SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" diff --git a/meta-oe/recipes-support/links/links.inc b/meta-oe/recipes-support/links/links.inc index e072408206..d772d54aff 100644 --- a/meta-oe/recipes-support/links/links.inc +++ b/meta-oe/recipes-support/links/links.inc @@ -2,8 +2,8 @@ DESCRIPTION = "Links is graphics and text mode WWW \ browser, similar to Lynx." HOMEPAGE = "http://links.twibright.com/" SECTION = "console/network" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=65e735be2e05d5943803344148f57603" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b0c80473f97008e42e29a9f80fcc55ff" DEPENDS = "jpeg libpng flex openssl zlib" SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ diff --git a/meta-oe/recipes-support/links/links_2.7.bb b/meta-oe/recipes-support/links/links_2.29.bb index e80dd7bca3..311d84e484 100644 --- a/meta-oe/recipes-support/links/links_2.7.bb +++ b/meta-oe/recipes-support/links/links_2.29.bb @@ -1,13 +1,13 @@ require links.inc DEPENDS += "gpm" -RCONFLICTS_${PN} = "links-x11" +RCONFLICTS:${PN} = "links-x11" EXTRA_OECONF = "--enable-graphics \ --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ --without-libtiff --without-svgalib --with-fb \ --without-directfb --without-pmshell --without-atheos \ --without-x" +SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998" -SRC_URI[md5sum] = "d06aa6e14b2172d73188871a5357185a" -SRC_URI[sha256sum] = "0c182b1cbcdfd5cdcd2f75a6032d1a4b660d07c1225c1e07757cec81d3302130" +CVE_STATUS[CVE-2008-3319] = "cpe-incorrect: The recipe used in the `meta-openembedded` is a different links package compared to the one which has the CVE issue." diff --git a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch b/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch index 9608b7e753..86edcc2e42 100644 --- a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch +++ b/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch @@ -8,6 +8,8 @@ Fixes QA errors about GNU_HASH Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + mib-modules/Makefile | 10 +++++----- tools/Makefile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb index 3a6319c314..844e5acf90 100644 --- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb +++ b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb @@ -1,18 +1,18 @@ SUMMARY = "lio-utils" DESCRIPTION = "a simple low-level configuration tool set for the Target+iSCSI (LIO)" HOMEPAGE = "http://linux-iscsi.org/index.php/Lio-utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df" -PV = "4.1+git${SRCPV}" +PV = "4.1+git" -SRC_URI = "git://risingtidesystems.com/lio-utils.git \ +SRC_URI = "git://github.com/Datera/lio-utils.git;branch=master;protocol=https \ file://0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch \ " -SRCREV = "28bd928655bdc7bd3cf380f0196630690c51e05f" +SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e" S = "${WORKDIR}/git" -inherit distutils +inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "distutils", "", d)} EXTRA_OEMAKE += "DESTDIR=${D}" @@ -55,8 +55,21 @@ do_install() { install -m 755 ${S}/conf/lio_start.default ${D}/etc/target/lio_start.sh } -RDEPENDS_${PN} += "python-stringold python-subprocess python-shell \ +SKIP_RECIPE[lio-utils] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}" + +RDEPENDS:${PN} += "python-stringold python-subprocess python-shell \ python-datetime python-textutils python-crypt python-netclient python-email \ bash" -FILES_${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*" +FILES:${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*" + +# http://errors.yoctoproject.org/Errors/Details/184712/ +# python-native/python: can't open file 'setup.py': [Errno 2] No such file or directory +CLEANBROKEN = "1" + +python() { + if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): + raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') +} + + diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config/fancontrol b/meta-oe/recipes-support/lm_sensors/lmsensors-config/fancontrol deleted file mode 100644 index 1f03a2bf2f..0000000000 --- a/meta-oe/recipes-support/lm_sensors/lmsensors-config/fancontrol +++ /dev/null @@ -1,2 +0,0 @@ -# fancontrol configuration file. -# Place your device specific configuration in this file. diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord b/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord deleted file mode 100644 index a58362e43d..0000000000 --- a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord +++ /dev/null @@ -1,16 +0,0 @@ -# configuration for hardware sensors monitoring daemon -# in intervals use suffix "m" for minutes, "s" for seconds, "h" for hours -# 0 means turning facility off - -# interval between scanning alarms -INTERVAL=1m - -# interval between logging -LOG_INTERVAL=20m - -# interval between RRD logging -# RRD_INTERVAL=1m - -# RRD db location -# RRD_LOGFILE=/var/log/sensors.rrd - diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.cgi b/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.cgi deleted file mode 100644 index b1aad05b6d..0000000000 --- a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.cgi +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/rrdcgi - -<html> -<head> -<title>sensord</title> -</head> -<body> -Generate a valid sensord.cgi script and install it in your BSP. -</body> -</html> diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.conf b/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.conf deleted file mode 100644 index 6b48cf6044..0000000000 --- a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.conf +++ /dev/null @@ -1,16 +0,0 @@ -# Default sensord configuration file -# Syntax: sensord {options} {chips} -# -i, --interval <time> -- interval between scanning alarms (default 60s) -# -l, --log-interval <time> -- interval between logging sensors (default 30m) -# -t, --rrd-interval <time> -- interval between updating RRD file (default 5m) -# -T, --rrd-no-average -- switch RRD in non-average mode -# -r, --rrd-file <file> -- RRD file (default <none>) -# -c, --config-file <file> -- configuration file -# -p, --pid-file <file> -- PID file (default /var/run/sensord.pid) -# -f, --syslog-facility <f> -- syslog facility to use (default local4) -# -g, --rrd-cgi <img-dir> -- output an RRD CGI script and exit -# -a, --load-average -- include load average in RRD file -# -d, --debug -- display some debug information -# -v, --version -- display version and exit -# -h, --help -- display help and exit -SENSORD_ARGS="-i60s -l30m -t1m -r/var/lib/sensord.rrd -a" diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensors.conf b/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensors.conf deleted file mode 100644 index bb8c93de6e..0000000000 --- a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensors.conf +++ /dev/null @@ -1,2 +0,0 @@ -# sensors configuration file. -# Place your device specific configuration in this file. diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb b/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb deleted file mode 100644 index b0091d6574..0000000000 --- a/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY = "lm_sensors configuration files" -DESCRIPTION = "Hardware health monitoring configuration files" -HOMEPAGE = "http://www.lm-sensors.org/" -LICENSE = "MIT-X" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI = "file://fancontrol \ - file://sensord.cgi \ - file://sensord.conf \ - file://sensors.conf \ - file://sensord \ -" -S = "${WORKDIR}" - -RDEPENDS_${PN}-dev = "" - -do_install() { - # Install fancontrol configuration file - install -d ${D}${sysconfdir}/sysconfig - install -m 0644 ${WORKDIR}/fancontrol ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/sensord ${D}${sysconfdir}/sysconfig - # Install libsensors configuration file - install -d ${D}${sysconfdir}/sensors.d - install -m 0644 ${WORKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d - - # Install sensord configuration file - install -m 0644 ${WORKDIR}/sensord.conf ${D}${sysconfdir} - - # Install sensord.cgi script and create world-writable - # web-accessible sensord directory - install -d ${D}/www/pages/cgi-bin - install -m 0755 ${WORKDIR}/sensord.cgi ${D}/www/pages/cgi-bin - install -d -m a=rwxs ${D}/www/pages/sensord -} - -# libsensors configuration -PACKAGES =+ "${PN}-libsensors" - -# sensord logging daemon configuration -PACKAGES =+ "${PN}-sensord" - -# fancontrol script configuration -PACKAGES =+ "${PN}-fancontrol" - -# sensord web cgi support -PACKAGES =+ "${PN}-cgi" -RRECOMMENDS_${PN}-cgi = "lighttpd lighttpd-module-cgi" -RDEPENDS_${PN}-cgi = "${PN}-sensord rrdtool" -FILES_${PN}-cgi = "/www/*" - -# libsensors configuration file -FILES_${PN}-libsensors = "${sysconfdir}/sensors.d/sensors.conf" - -# sensord logging daemon configuration files -FILES_${PN}-sensord = "\ - ${sysconfdir}/sensord.conf \ - ${sysconfdir}/sysconfig/sensord \ -" - -# fancontrol script configuration file -FILES_${PN}-fancontrol = "${sysconfdir}/fancontrol" diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch b/meta-oe/recipes-support/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch deleted file mode 100644 index abf6e752af..0000000000 --- a/meta-oe/recipes-support/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c4428260e7685ebaf5c26c6ecaae5a56849853e8 Mon Sep 17 00:00:00 2001 -From: Li Zhou <li.zhou@windriver.com> -Date: Tue, 6 Sep 2016 14:04:29 +0800 -Subject: [PATCH] lmsensors: sensors-detect: print a special message when there - isn't enough cpu info - -When running sensors-detect, if there isn't enough information in -/proc/cpuinfo for this arch (e.g. ppc64), "Use of uninitialized value -in concatenation (.) or string at /usr/sbin/sensors-detect line 2867" -and incomplete "# Processor: (//)" will be printed. -Here print out a prompt for such a case. - -Upstream-Status: Pending - -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - prog/detect/sensors-detect | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect -index 3c2b44f..5f62405 100755 ---- a/prog/detect/sensors-detect -+++ b/prog/detect/sensors-detect -@@ -2864,7 +2864,12 @@ sub initialize_cpu_list - sub print_cpu_info - { - my $cpu = $cpu[0]; -- print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; -+ if ( $cpu->{'model name'} && $cpu->{'cpu family'} && $cpu->{model} && $cpu->{stepping} ) { -+ print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; -+ } -+ else { -+ print "# Processor: There isn't enough cpu info for this arch!!!\n"; -+ } - } - - # @i2c_adapters is a list of references to hashes, one hash per I2C/SMBus --- -1.9.1 - diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch b/meta-oe/recipes-support/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch deleted file mode 100644 index fb3878dc39..0000000000 --- a/meta-oe/recipes-support/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 727524453f115ddc05109e9bbb3d0e60a7db9185 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 16 Jul 2017 15:05:50 -0700 -Subject: [PATCH] prog: Do not limit sys/io.h header include to just glibc - -musl provides it too. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - prog/dump/isadump.c | 6 ------ - prog/dump/isaset.c | 6 ------ - prog/dump/superio.c | 5 ----- - prog/dump/util.c | 5 ----- - 4 files changed, 22 deletions(-) - -diff --git a/prog/dump/isadump.c b/prog/dump/isadump.c -index e0e6f00..8794537 100644 ---- a/prog/dump/isadump.c -+++ b/prog/dump/isadump.c -@@ -36,13 +36,7 @@ - #include "util.h" - #include "superio.h" - -- --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - #ifdef __powerpc__ - unsigned long isa_io_base = 0; /* XXX for now */ -diff --git a/prog/dump/isaset.c b/prog/dump/isaset.c -index e743755..85a4f64 100644 ---- a/prog/dump/isaset.c -+++ b/prog/dump/isaset.c -@@ -32,13 +32,7 @@ - #include <string.h> - #include "util.h" - -- --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - #ifdef __powerpc__ - unsigned long isa_io_base = 0; /* XXX for now */ -diff --git a/prog/dump/superio.c b/prog/dump/superio.c -index 64ef27b..906fe55 100644 ---- a/prog/dump/superio.c -+++ b/prog/dump/superio.c -@@ -20,12 +20,7 @@ - */ - - #include <stdlib.h> -- --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - #include "superio.h" - -diff --git a/prog/dump/util.c b/prog/dump/util.c -index 874c1b9..197fa64 100644 ---- a/prog/dump/util.c -+++ b/prog/dump/util.c -@@ -11,12 +11,7 @@ - #include <stdio.h> - #include "util.h" - --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - /* Return 1 if we should continue, 0 if we should abort */ - int user_ack(int def) --- -2.13.3 - diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init b/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init deleted file mode 100644 index 4433020b38..0000000000 --- a/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: fancontrol -# Required-Start: $local_fs -# Should-Start: -# Required-Stop: $local_fs -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: fancontrol initscript -# Description: Starts and controls the fancontrol daemon -### END INIT INFO - -PATH=/sbin:/usr/sbin:/bin:/usr/bin - -DESC="fan control daemon" -NAME="fancontrol" -FANCONTROL=`which $NAME` -PIDFILE="/var/run/fancontrol.pid" - -# Exit if the package is not installed -[ -x "$FANCONTROL" ] || exit 0 - -case "$1" in - start) - echo -n "Starting $DESC: $NAME... " - start-stop-daemon -S -p $PIDFILE -b -x $FANCONTROL - echo "done." - ;; - stop) - echo -n "Stopping $DESC: $NAME... " - start-stop-daemon -K -p $PIDFILE - echo "done." - ;; - restart) - echo "Restarting $DESC: $NAME... " - $0 stop - $0 start - echo "done." - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - -exit 0 diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/sensord.init b/meta-oe/recipes-support/lm_sensors/lmsensors/sensord.init deleted file mode 100644 index 5a09cd3cfc..0000000000 --- a/meta-oe/recipes-support/lm_sensors/lmsensors/sensord.init +++ /dev/null @@ -1,49 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: sensord -# Required-Start: $local_fs -# Should-Start: -# Required-Stop: $local_fs -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: sensord initscript -# Description: Starts the sensord logging daemon -### END INIT INFO - -PATH=/sbin:/usr/sbin:/bin:/usr/bin - -DESC="sensors logging daemon" -NAME="sensord" -SENSORD=`which $NAME` - -. /etc/init.d/functions || exit 1 -. /etc/sensord.conf || exit 1 - -# Exit if the package is not installed -[ -x "$SENSORD" ] || exit 0 - -case "$1" in - start) - echo -n "Starting $DESC: $NAME... " - start-stop-daemon -S -x $SENSORD -- $SENSORD_ARGS - echo "done." - ;; - stop) - echo -n "Stopping $DESC: $NAME... " - start-stop-daemon -K -x $SENSORD - echo "done." - ;; - restart) - echo "Restarting $DESC: $NAME... " - $0 stop - $0 start - echo "done." - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - -exit 0 diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb b/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb deleted file mode 100644 index 454a69f40b..0000000000 --- a/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb +++ /dev/null @@ -1,140 +0,0 @@ -SUMMARY = "lm_sensors" -DESCRIPTION = "Hardware health monitoring applications" -HOMEPAGE = "http://www.lm-sensors.org/" -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "sysfsutils virtual/libiconv bison-native flex-native rrdtool" - -SRC_URI = "https://github.com/groeck/lm-sensors/archive/V3-4-0.tar.gz \ - file://fancontrol.init \ - file://sensord.init \ - file://0001-lmsensors-sensors-detect-print-a-special-message-whe.patch \ - file://0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch \ -" -SRC_URI[md5sum] = "1e9f117cbfa11be1955adc96df71eadb" -SRC_URI[sha256sum] = "e334c1c2b06f7290e3e66bdae330a5d36054701ffd47a5dde7a06f9a7402cb4e" - -inherit update-rc.d systemd - -RDEPENDS_${PN}-dev = "" - -INITSCRIPT_PACKAGES = "${PN}-fancontrol ${PN}-sensord" -INITSCRIPT_NAME_${PN}-fancontrol = "fancontrol" -INITSCRIPT_NAME_${PN}-sensord = "sensord" -INITSCRIPT_PARAMS_${PN}-fancontrol = "defaults 66" -INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67" - -SYSTEMD_PACKAGES = "${PN}-sensord" -SYSTEMD_SERVICE_${PN}-sensord = "sensord.service lm_sensors.service fancontrol.service" -SYSTEMD_AUTO_ENABLE = "disable" - -S = "${WORKDIR}/lm-sensors-3-4-0" - -EXTRA_OEMAKE = 'EXLDFLAGS="${LDFLAGS}" \ - MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \ - LIBDIR=${libdir} \ - CC="${CC}" AR="${AR}"' - -do_compile() { - sed -i -e 's:^# \(PROG_EXTRA\):\1:' ${S}/Makefile - # Respect LDFLAGS - sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' ${S}/Makefile - sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \ - ${S}/lib/Module.mk - oe_runmake user PROG_EXTRA="sensors sensord" -} - -do_install() { - oe_runmake user_install DESTDIR=${D} - install -m 0755 ${S}/prog/sensord/sensord ${D}${sbindir} - install -m 0644 ${S}/prog/sensord/sensord.8 ${D}${mandir}/man8 - - # Install directory - install -d ${D}${sysconfdir}/init.d - - # Install fancontrol init script - install -m 0755 ${WORKDIR}/fancontrol.init \ - ${D}${sysconfdir}/init.d/fancontrol - - # Install sensord init script - install -m 0755 ${WORKDIR}/sensord.init ${D}${sysconfdir}/init.d/sensord - - # Insall sensord service script - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/prog/init/*.service ${D}${systemd_unitdir}/system - fi -} - -# libsensors packages -PACKAGES =+ "${PN}-libsensors ${PN}-libsensors-dbg ${PN}-libsensors-dev ${PN}-libsensors-staticdev ${PN}-libsensors-doc" - -# sensors command packages -PACKAGES =+ "${PN}-sensors ${PN}-sensors-dbg ${PN}-sensors-doc" - -# sensord logging daemon -PACKAGES =+ "${PN}-sensord ${PN}-sensord-dbg ${PN}-sensord-doc" - -# fancontrol script -PACKAGES =+ "${PN}-fancontrol ${PN}-fancontrol-doc" - -# sensors-detect script -PACKAGES =+ "${PN}-sensorsdetect ${PN}-sensorsdetect-doc" - -# sensors-conf-convert script -PACKAGES =+ "${PN}-sensorsconfconvert ${PN}-sensorsconfconvert-doc" - -# pwmconfig script -PACKAGES =+ "${PN}-pwmconfig ${PN}-pwmconfig-doc" - -# isadump and isaset helper program -PACKAGES =+ "${PN}-isatools ${PN}-isatools-dbg ${PN}-isatools-doc" - -# libsensors files -FILES_${PN}-libsensors = "${libdir}/libsensors.so.* ${sysconfdir}/sensors3.conf ${sysconfdir}/sensors.d" -FILES_${PN}-libsensors-dbg = "${libdir}/.debug ${prefix}/src/debug" -FILES_${PN}-libsensors-dev = "${libdir}/libsensors.so ${includedir}" -FILES_${PN}-libsensors-staticdev = "${libdir}/libsensors.a" -FILES_${PN}-libsensors-doc = "${mandir}/man3" -RRECOMMENDS_${PN}-libsensors = "lmsensors-config-libsensors" - -# sensors command files -FILES_${PN}-sensors = "${bindir}/sensors" -FILES_${PN}-sensors-dbg = "${bindir}/.debug/sensors" -FILES_${PN}-sensors-doc = "${mandir}/man1 ${mandir}/man5" -RDEPENDS_${PN}-sensors = "${PN}-libsensors" - -# sensord logging daemon -FILES_${PN}-sensord = "${sbindir}/sensord ${sysconfdir}/init.d/sensord ${systemd_unitdir}/system/sensord.service" -FILES_${PN}-sensord-dbg = "${bindir}/.debug/sensord" -FILES_${PN}-sensord-doc = "${mandir}/man8/sensord.8" -RDEPENDS_${PN}-sensord = "${PN}-sensors rrdtool" -RRECOMMENDS_${PN}-sensord = "lmsensors-config-sensord" - -# fancontrol script files -FILES_${PN}-fancontrol = "${sbindir}/fancontrol ${sysconfdir}/init.d/fancontrol" -FILES_${PN}-fancontrol-doc = "${mandir}/man8/fancontrol.8" -RDEPENDS_${PN}-fancontrol = "bash" -RRECOMMENDS_${PN}-fancontrol = "lmsensors-config-fancontrol" - -# sensors-detect script files -FILES_${PN}-sensorsdetect = "${sbindir}/sensors-detect" -FILES_${PN}-sensorsdetect-doc = "${mandir}/man8/sensors-detect.8" -RDEPENDS_${PN}-sensorsdetect = "${PN}-sensors perl perl-modules" - -# sensors-conf-convert script files -FILES_${PN}-sensorsconfconvert = "${bindir}/sensors-conf-convert" -FILES_${PN}-sensorsconfconvert-doc = "${mandir}/man8/sensors-conf-convert.8" -RDEPENDS_${PN}-sensorsconfconvert = "${PN}-sensors perl perl-modules" - -# pwmconfig script files -FILES_${PN}-pwmconfig = "${sbindir}/pwmconfig" -FILES_${PN}-pwmconfig-doc = "${mandir}/man8/pwmconfig.8" -RDEPENDS_${PN}-pwmconfig = "${PN}-fancontrol" - -# isadump and isaset helper program files -FILES_${PN}-isatools = "${sbindir}/isa*" -FILES_${PN}-isatools-dbg = "${sbindir}/.debug/isa*" -FILES_${PN}-isatools-doc = "${mandir}/man8/isa*" diff --git a/meta-oe/recipes-support/lockdev/lockdev/0001-lockdev-Define-MAJOR-MINOR-for-non-glibc-case.patch b/meta-oe/recipes-support/lockdev/lockdev/0001-lockdev-Define-MAJOR-MINOR-for-non-glibc-case.patch new file mode 100644 index 0000000000..abcf1bc20f --- /dev/null +++ b/meta-oe/recipes-support/lockdev/lockdev/0001-lockdev-Define-MAJOR-MINOR-for-non-glibc-case.patch @@ -0,0 +1,28 @@ +From 11c78232aa589d5ed43eea3683e6e3de0362ffdc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 26 Apr 2022 10:00:32 -0700 +Subject: [PATCH] lockdev: Define MAJOR/MINOR for non-glibc case + +gnu_dev_major and gnu_dev_minor are glibc extensions but we do have +major/minor macros on musl too, so use them to define MINOR/MAJOR here + +Upstream-Status: Inappropriate [No active upstream] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/lockdev.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/src/lockdev.c ++++ b/src/lockdev.c +@@ -125,8 +125,8 @@ + #include <sys/file.h> + #if defined (__GNU_LIBRARY__) + # include <sys/sysmacros.h> +-# define MAJOR(dev) gnu_dev_major (dev) +-# define MINOR(dev) gnu_dev_minor (dev) ++# define MAJOR(dev) major (dev) ++# define MINOR(dev) minor (dev) + #else + # error "put here a define for MAJOR and MINOR" + #endif diff --git a/meta-oe/recipes-support/lockdev/lockdev/build.patch b/meta-oe/recipes-support/lockdev/lockdev/build.patch new file mode 100644 index 0000000000..36daea79af --- /dev/null +++ b/meta-oe/recipes-support/lockdev/lockdev/build.patch @@ -0,0 +1,30 @@ +Upstream-Status: Pending + +commit 0dd47123655c52d68185f06b9da8fb0e1b925400 +Author: Ludwig Nussel <ludwig.nussel@suse.de> +Date: Tue Feb 9 14:56:23 2010 +0100 + + RedHat patch 2 + + - change library file name + - install devel symlink + +--- a/Makefile ++++ b/Makefile +@@ -11,7 +11,7 @@ VER = $(shell expr `pwd` : '.*-\([0-9.]* + MVER = ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'} + + static = ${libname}.a +-shared = ${libname}.${VER}.so ++shared = ${libname}.so.${VER} + soname = ${libname}.so.${MVER} + + # overwritten by caller (e.g.: debian/rules) +@@ -73,6 +73,7 @@ install_doc: docs/lockdev.3 + install_run: ${shared} + install -m755 -d ${libdir} + install -m644 ${shared} ${libdir} ++ ln -s ${shared} ${libdir}/liblockdev.so + + .PHONY: clean distclean perl-clean mostyclean + perl-clean: clean diff --git a/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch b/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch new file mode 100644 index 0000000000..886af121b3 --- /dev/null +++ b/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch @@ -0,0 +1,29 @@ +Upstream-Status: Pending + +--- a/Makefile ++++ b/Makefile +@@ -15,17 +15,18 @@ shared = ${libname}.${VER}.so + soname = ${libname}.so.${MVER} + + # overwritten by caller (e.g.: debian/rules) +-basedir = /usr/local ++basedir ?= /usr/local ++baselib ?= lib + srcdir=. + +-libdir = ${basedir}/lib ++libdir = ${basedir}/${baselib} + incdir = ${basedir}/include + mandir = ${basedir}/share/man + +-CC = gcc +-LCFLAGS = -g -O2 -fPIC -Wall -pipe -D_REENTRANT +-CFLAGS = -g +-LDLIBS = -llockdev ++CC ?= gcc ++LCFLAGS ?= -g -O2 -fPIC -Wall -pipe -D_REENTRANT ++CFLAGS ?= -g ++LDLIBS ?= -llockdev + + .PHONY: shared static perl-lib + ALL: shared static perl-lib diff --git a/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb b/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb new file mode 100644 index 0000000000..a52ca25da4 --- /dev/null +++ b/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb @@ -0,0 +1,27 @@ +SUMMARY = "Locking devices library" +SECTION = "libs" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM="file://LICENSE;md5=d8045f3b8f929c1cb29a1e3fd737b499" + +PE = "1" +SRC_URI = "http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev/lockdev_${PV}.orig.tar.gz \ + file://cross_compile.patch \ + file://build.patch \ + file://0001-lockdev-Define-MAJOR-MINOR-for-non-glibc-case.patch \ + " +SRC_URI[sha256sum] = "ccae635d7ac3fdd50897eceb250872b3d9a191d298f213e7f0c836910d869f82" + +inherit lib_package perlnative + +TARGET_CC_ARCH += "${LDFLAGS}" + +CFLAGS:append:libc-musl = " -D__GNU_LIBRARY__" + +EXTRA_OEMAKE = "basedir=${D}${prefix} baselib=${baselib} LD='${CC}'" + +do_compile() { + oe_runmake shared static +} +do_install() { + oe_runmake DESTDIR=${D} install +} diff --git a/meta-oe/recipes-support/lockdev/lockdev_git.bb b/meta-oe/recipes-support/lockdev/lockdev_git.bb deleted file mode 100644 index 507ce3fe57..0000000000 --- a/meta-oe/recipes-support/lockdev/lockdev_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Locking devices library" -SECTION = "libs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM="file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -PV = "1.0.3+git${SRCPV}" - -SRCREV = "16b899645d32012cc94cc9232f64d4ddaaf0b795" -SRC_URI = "git://anonscm.debian.org/lockdev/lockdev.git" - -S = "${WORKDIR}/git" - -inherit lib_package autotools-brokensep - -do_configure_prepend () { - ./scripts/git-version > VERSION - - # Make automake happy - touch ChangeLog -} - -CFLAGS_append_libc-musl = " -D__GNU_LIBRARY__" diff --git a/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch b/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch index 9ff9d70025..405104a0fc 100644 --- a/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch +++ b/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Use the API properly in the example (format security error fixed). --- +Upstream-Status: Pending + examples/helloworld1/mylog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch b/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch index 4872eb4f5e..dadefec33a 100644 --- a/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch +++ b/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch @@ -1,7 +1,7 @@ The original use of AC_ARG_WITH is buggy and causes expat support to be *disabled* if "--with-expat" is passed to configure. -Upstream status: pending +Upstream-Status: Pending Index: log4c-1.2.4/configure.in =================================================================== diff --git a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb index ef7ad847a6..7d9b9d50f8 100644 --- a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb +++ b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb @@ -1,6 +1,6 @@ SUMMARY = "Log4c is a C library for flexible logging to files, syslog and other destinations" HOMEPAGE = "http://log4c.sourceforge.net" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ diff --git a/meta-oe/recipes-support/log4cpp/files/fix-pc.patch b/meta-oe/recipes-support/log4cpp/files/fix-pc.patch index b8fb42e5fd..b57b5a263c 100644 --- a/meta-oe/recipes-support/log4cpp/files/fix-pc.patch +++ b/meta-oe/recipes-support/log4cpp/files/fix-pc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Nurd ./log4cpp.orig/configure.in ./log4cpp/configure.in --- ./log4cpp.orig/configure.in 2009-09-07 16:57:46.000000000 -0400 +++ ./log4cpp/configure.in 2016-02-23 12:57:11.567240018 -0500 diff --git a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb index dc52c9ff41..a8b9b9a019 100644 --- a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb +++ b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb @@ -1,14 +1,12 @@ DESCRIPTION = "A library of C++ classes for flexible logging to files, syslog, IDSA and other destinations." HOMEPAGE = "http://sourceforge.net/projects/log4cpp/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" -RC = "rc5" -SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}${RC}.tar.gz \ +SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}.tar.gz \ file://fix-pc.patch;striplevel=2 \ " -SRC_URI[md5sum] = "58b4591a2f3e7ef3d5e3e7cfb3a81a62" -SRC_URI[sha256sum] = "a611d99a20af6676c60219762771c0bfac90f4879bbde70038ece75338b588ec" +SRC_URI[sha256sum] = "696113659e426540625274a8b251052cc04306d8ee5c42a0c7639f39ca90c9d6" S = "${WORKDIR}/${BPN}" @@ -20,3 +18,9 @@ EXTRA_OECONF = "\ --enable-html-docs=no \ --enable-latex-docs=no \ " + +CXXFLAGS += "-std=c++14" + +do_install:append() { + sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${bindir}/log4cpp-config +} diff --git a/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb b/meta-oe/recipes-support/logwarn/logwarn_1.0.17.bb index 5ae36bb67c..6be82979a4 100644 --- a/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb +++ b/meta-oe/recipes-support/logwarn/logwarn_1.0.17.bb @@ -11,8 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "https://s3.amazonaws.com/archie-public/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "e544a6230673ea54f7430bf817bb39d8" -SRC_URI[sha256sum] = "8dbfcf9b28c782ab3bddd6a620d4fb95d1b0ffcbe93276996cdc4800aa9aebd1" +SRC_URI[sha256sum] = "062d197349f4a43d8f69887fc642cb58b59a8e2cc54cc951d5c1c6abc4809a9a" + +UPSTREAM_CHECK_URI = "https://github.com/archiecobbs/logwarn/tags" +UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)" inherit autotools-brokensep @@ -31,7 +33,7 @@ CACHED_CONFIGUREVARS += " \ # Make sure some files exist for autoreconf. # -do_configure_prepend () { +do_configure:prepend () { touch ${S}/NEWS touch ${S}/ChangeLog touch ${S}/README @@ -39,7 +41,7 @@ do_configure_prepend () { # Create a directory for logfile state info, usually under /var/lib. # -do_install_append () { +do_install:append () { install -d ${D}${lcl_default_state_dir} } @@ -47,6 +49,6 @@ do_install_append () { # PACKAGES += "${PN}-nagios" -FILES_${PN}-nagios = "${nonarch_libdir}/nagios" +FILES:${PN}-nagios = "${nonarch_libdir}/nagios" -RDEPENDS_${PN}-nagios += "bash coreutils sed" +RDEPENDS:${PN}-nagios += "bash coreutils sed" diff --git a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch index e86ab25e62..fb58793a17 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch @@ -1,33 +1,34 @@ -From 916ea0c70fd063ab7b81f16fd917a75dc02edf4f Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt <pkj@axis.com> -Date: Fri, 17 Mar 2017 03:18:28 +0100 +From 44695f332e206e1db43d50163e1bce0bedf75fb7 Mon Sep 17 00:00:00 2001 +From: Peter Kjellerstedt <peter.kjellerstedt@axis.com> +Date: Mon, 26 Nov 2018 14:53:09 +0800 Subject: [PATCH] Avoid bashisms in init scripts Upstream-Status: Inappropriate Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> + +Rebase to 2.03.01 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - scripts/blk_availability_init_red_hat.in | 4 ++-- - scripts/clvmd_init_red_hat.in | 6 +++--- - scripts/cmirrord_init_red_hat.in | 4 ++-- - scripts/lvm2_cluster_activation_red_hat.sh.in | 4 ++-- - scripts/lvm2_lvmetad_init_red_hat.in | 4 ++-- - scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++-- - scripts/lvm2_monitoring_init_red_hat.in | 4 ++-- - scripts/lvm2_monitoring_init_rhel4 | 4 ++-- - 8 files changed, 17 insertions(+), 17 deletions(-) + scripts/blk_availability_init_red_hat.in | 4 ++-- + scripts/cmirrord_init_red_hat.in | 4 ++-- + scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++-- + scripts/lvm2_monitoring_init_red_hat.in | 4 ++-- + scripts/lvm2_monitoring_init_rhel4 | 4 ++-- + 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in -index a84ffe7..6b855b7 100644 +index 347c39574..b2e9cf932 100644 --- a/scripts/blk_availability_init_red_hat.in +++ b/scripts/blk_availability_init_red_hat.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # - # Copyright (C) 2012 Red Hat, Inc. All rights reserved. + # Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved. # -@@ -53,6 +53,6 @@ case "$1" in +@@ -51,6 +51,6 @@ case "$1" in status) ;; *) @@ -35,36 +36,8 @@ index a84ffe7..6b855b7 100644 + echo "Usage: $0 {start|stop|status}" ;; esac -diff --git a/scripts/clvmd_init_red_hat.in b/scripts/clvmd_init_red_hat.in -index d7f3392..abc8011 100644 ---- a/scripts/clvmd_init_red_hat.in -+++ b/scripts/clvmd_init_red_hat.in -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # clvmd - Clustered LVM Daemon init script - # -@@ -161,7 +161,7 @@ restart() { - fi - } - --[ "$EUID" != "0" ] && { -+[ "$(id -u)" != "0" ] && { - echo "clvmd init script can only be executed as root user" - exit 4 - } -@@ -206,7 +206,7 @@ case "$1" in - ;; - - *) -- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" -+ echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - rtrn=2 - ;; - esac diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in -index d4b7e37..d442cbc 100755 +index c82f8f547..a3a321d9c 100755 --- a/scripts/cmirrord_init_red_hat.in +++ b/scripts/cmirrord_init_red_hat.in @@ -1,4 +1,4 @@ @@ -73,7 +46,7 @@ index d4b7e37..d442cbc 100755 # # chkconfig: - 22 78 # description: Starts and stops cmirrord -@@ -101,7 +101,7 @@ case "$1" in +@@ -103,7 +103,7 @@ case "$1" in ;; *) @@ -82,46 +55,8 @@ index d4b7e37..d442cbc 100755 ;; esac -diff --git a/scripts/lvm2_cluster_activation_red_hat.sh.in b/scripts/lvm2_cluster_activation_red_hat.sh.in -index abea026..d8cba2e 100644 ---- a/scripts/lvm2_cluster_activation_red_hat.sh.in -+++ b/scripts/lvm2_cluster_activation_red_hat.sh.in -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - sbindir=@sbindir@ - -@@ -54,7 +54,7 @@ case "$1" in - rtrn=$? - ;; - *) -- echo $"Usage: $0 {activate|deactivate}" -+ echo "Usage: $0 {activate|deactivate}" - rtrn=3 - ;; - esac -diff --git a/scripts/lvm2_lvmetad_init_red_hat.in b/scripts/lvm2_lvmetad_init_red_hat.in -index b2f5d50..96269a9 100644 ---- a/scripts/lvm2_lvmetad_init_red_hat.in -+++ b/scripts/lvm2_lvmetad_init_red_hat.in -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # Copyright (C) 2012 Red Hat, Inc. All rights reserved. - # -@@ -105,7 +105,7 @@ case "$1" in - ;; - - *) -- echo $"Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}" -+ echo "Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}" - ;; - esac - diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in -index c521955..cdbaece 100644 +index 176ff5dcb..825f6ad84 100644 --- a/scripts/lvm2_lvmpolld_init_red_hat.in +++ b/scripts/lvm2_lvmpolld_init_red_hat.in @@ -1,4 +1,4 @@ @@ -130,7 +65,7 @@ index c521955..cdbaece 100644 # # Copyright (C) 2015 Red Hat, Inc. All rights reserved. # -@@ -107,7 +107,7 @@ case "$1" in +@@ -105,7 +105,7 @@ case "$1" in ;; *) @@ -140,7 +75,7 @@ index c521955..cdbaece 100644 esac diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in -index de7ff0d..9ff6bb7 100644 +index 95e4125a0..dff89cd38 100644 --- a/scripts/lvm2_monitoring_init_red_hat.in +++ b/scripts/lvm2_monitoring_init_red_hat.in @@ -1,4 +1,4 @@ @@ -149,7 +84,7 @@ index de7ff0d..9ff6bb7 100644 # # Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved. # -@@ -128,7 +128,7 @@ case "$1" in +@@ -127,7 +127,7 @@ case "$1" in ;; *) @@ -159,7 +94,7 @@ index de7ff0d..9ff6bb7 100644 esac diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 -index 8eb06c5..2e8d0f7 100644 +index 8eb06c509..2e8d0f71e 100644 --- a/scripts/lvm2_monitoring_init_rhel4 +++ b/scripts/lvm2_monitoring_init_rhel4 @@ -1,4 +1,4 @@ @@ -177,6 +112,3 @@ index 8eb06c5..2e8d0f7 100644 ;; esac --- -2.12.0 - diff --git a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch index 5d72402bd1..196de644cc 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch @@ -1,4 +1,4 @@ -From e3103459416616d3b8508e7176e897b0ae6c90f2 Mon Sep 17 00:00:00 2001 +From e2f24ea066e6dfb9f13f623009034acbf4ae8818 Mon Sep 17 00:00:00 2001 From: Dengke Du <dengke.du@windriver.com> Date: Tue, 25 Oct 2016 11:49:40 +0000 Subject: [PATCH] implement libc specific reopen_stream @@ -14,16 +14,17 @@ http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Dengke Du <dengke.du@windriver.com> +Upstream-Status: Pending --- lib/log/log.c | 6 ++++++ tools/lvmcmdline.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c -index c933154..3581084 100644 +index eafb3ef1c..ff3d751bf 100644 --- a/lib/log/log.c +++ b/lib/log/log.c -@@ -161,6 +161,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ +@@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ * Close and reopen standard stream on file descriptor fd. */ int reopen_standard_stream(FILE **stream, const char *mode) @@ -31,7 +32,7 @@ index c933154..3581084 100644 { int fd, fd_copy, new_fd; const char *name; -@@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream, const char *mode) +@@ -211,6 +212,11 @@ int reopen_standard_stream(FILE **stream, const char *mode) *stream = new_stream; return 1; } @@ -44,10 +45,10 @@ index c933154..3581084 100644 void init_log_fn(lvm2_log_fn_t log_fn) { diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c -index 9a4deb7..f1f18e6 100644 +index 1b2f7f47c..e0674d42d 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c -@@ -1818,7 +1818,7 @@ static int _check_standard_fds(void) +@@ -3378,7 +3378,7 @@ static int _check_standard_fds(void) int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && @@ -56,7 +57,7 @@ index 9a4deb7..f1f18e6 100644 if (err) perror("stdin stream open"); else -@@ -1828,7 +1828,7 @@ static int _check_standard_fds(void) +@@ -3388,7 +3388,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDOUT_FILENO) && @@ -65,7 +66,7 @@ index 9a4deb7..f1f18e6 100644 if (err) perror("stdout stream open"); /* else no stdout */ -@@ -1836,7 +1836,7 @@ static int _check_standard_fds(void) +@@ -3396,7 +3396,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDERR_FILENO) && @@ -74,6 +75,3 @@ index 9a4deb7..f1f18e6 100644 printf("stderr stream open: %s\n", strerror(errno)); return 0; --- -2.12.0 - diff --git a/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch b/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch new file mode 100644 index 0000000000..c57bff865a --- /dev/null +++ b/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch @@ -0,0 +1,29 @@ +From 4e2dc175e99792d84873a4785ff1524845267c3e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 25 Mar 2024 13:07:28 -0700 +Subject: [PATCH] include libgen.h for basename + +basename prototype has been removed from string.h from latest musl [1] +compilers e.g. clang-18 flags the absense of prototype as error. therefore +include libgen.h for providing it. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Submitted [ Sent to maintainer and lvm-devel@redhat.com ] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/device/device_id.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/device/device_id.c b/lib/device/device_id.c +index b3330f2ba..291bd5c73 100644 +--- a/lib/device/device_id.c ++++ b/lib/device/device_id.c +@@ -28,6 +28,7 @@ + #include "lib/activate/activate.h" + #include "device_mapper/misc/dm-ioctl.h" + ++#include <libgen.h> + #include <sys/stat.h> + #include <fcntl.h> + #include <unistd.h> diff --git a/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch b/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch deleted file mode 100644 index 95dcede33c..0000000000 --- a/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3ae9c0b607ec33fb07f32a41e9d28cc9068dd39a Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Tue, 25 Oct 2016 11:52:44 +0000 -Subject: [PATCH] Guard use of mallinfo() with __GLIBC__ - -This API is glibc-only - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Dengke Du <dengke.du@windriver.com> - ---- - lib/mm/memlock.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c -index da90144..f34f890 100644 ---- a/lib/mm/memlock.c -+++ b/lib/mm/memlock.c -@@ -150,7 +150,7 @@ static void _touch_memory(void *mem, size_t size) - - static void _allocate_memory(void) - { --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - void *stack_mem; - struct rlimit limit; - int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; --- -2.12.0 - diff --git a/meta-oe/recipes-support/lvm2/files/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch b/meta-oe/recipes-support/lvm2/files/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch deleted file mode 100644 index 9ab1c06d27..0000000000 --- a/meta-oe/recipes-support/lvm2/files/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b1ad91a059d99afd1ce25823b7c0a8d3ac63d2fd Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Tue, 25 Oct 2016 11:55:49 +0000 -Subject: [PATCH 3/4] include fcntl.h for O_* defines and fcntl() signature - -On glibc _somehow_ this header gets pulled in indirectly - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- -Upstream-Status: Pending ---- - libdaemon/server/daemon-server.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c -index 6af6de9..a9590e7 100644 ---- a/libdaemon/server/daemon-server.c -+++ b/libdaemon/server/daemon-server.c -@@ -18,6 +18,7 @@ - #include "daemon-server.h" - #include "daemon-log.h" - -+#include <fcntl.h> - #include <dlfcn.h> - #include <errno.h> - #include <pthread.h> --- -2.9.3 - diff --git a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch index aaeaa725d3..6435c3fd92 100644 --- a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch +++ b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch @@ -1,7 +1,7 @@ -From 0012ea63f6070a5d41fa380970f9c30b953237d2 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Tue, 25 Oct 2016 11:59:40 +0000 -Subject: [PATCH 4/4] tweak MODPROBE_CMD for cross compile +From b30f842d5d200a8217a47465d6cdd99d3805ba76 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Tue, 31 Jul 2018 15:04:29 +0800 +Subject: [PATCH] tweak MODPROBE_CMD for cross compile Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe is incorrect. @@ -16,23 +16,20 @@ filter=["r|/loop1$|","r|/loop2$|","r|/loop3$|","r|/loop4$|","r|/loop5$|","r|/loo Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Signed-off-by: Dengke Du <dengke.du@windriver.com> --- - configure.in | 1 - - 1 file changed, 1 deletion(-) + configure.ac | 2 -- + 1 file changed, 2 deletions(-) -diff --git a/configure.in b/configure.in -index cc77aab..a3579f2 100644 ---- a/configure.in -+++ b/configure.in -@@ -1853,7 +1853,6 @@ if test "$UDEV_SYNC" = yes; then - fi +diff --git a/configure.ac b/configure.ac +index c8d81e16c..7c1c04627 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1689,8 +1689,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ + ]) ################################################################################ --AC_PATH_TOOL(MODPROBE_CMD, modprobe) - - if test -n "$MODPROBE_CMD"; then +-AC_PATH_TOOL(MODPROBE_CMD, modprobe, [], [$PATH_SBIN]) +- + AS_IF([test -n "$MODPROBE_CMD"], [ AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) --- -2.9.3 - + ]) diff --git a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch index 15aa9f5002..e7aaad4d0e 100644 --- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch +++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch @@ -1,6 +1,6 @@ -From d8bb25e34d6533ba78eaae697771ee499a66706f Mon Sep 17 00:00:00 2001 +From e0e06b77e067da6a01dd9b0d5582a0a1709c655d Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 2 Aug 2017 03:41:37 -0400 +Date: Mon, 26 Nov 2018 14:59:55 +0800 Subject: [PATCH] do not build manual On some host (ubuntu 1404), build manual failed. @@ -14,45 +14,57 @@ Do not build man to workaround the issue. Upstream-Status: Pending Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Update context for lvm2 2.03.02. +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +Update context for lvm2 2.03.16. +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- - Makefile.in | 4 ++-- - configure.in | 1 - - 2 files changed, 2 insertions(+), 3 deletions(-) + Makefile.in | 6 +++--- + configure.ac | 1 - + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 31d428d..24f89a2 100644 +index 06c4b1823..90df7b09c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ --SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools -+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools +-SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools ++SUBDIRS = libdm conf daemons include lib libdaemon scripts tools ifeq ("@UDEV_RULES@", "yes") SUBDIRS += udev -@@ -69,7 +69,7 @@ liblvm.device-mapper: include.device-mapper +@@ -33,7 +33,7 @@ ifeq ($(MAKECMDGOALS),clean) + endif + # FIXME Should use intermediate Makefiles here! + ifeq ($(MAKECMDGOALS),distclean) +- SUBDIRS = conf include man test scripts \ ++ SUBDIRS = conf include test scripts \ + libdaemon lib tools daemons libdm \ + udev po + tools.distclean: test.distclean +@@ -59,7 +59,7 @@ unit-test run-unit-test: test libdm + daemons.device-mapper: libdm.device-mapper tools.device-mapper: libdm.device-mapper - scripts.device-mapper: include.device-mapper -device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper +device-mapper: tools.device-mapper daemons.device-mapper + device_mapper: device-mapper ifeq ("@INTL@", "yes") - lib.pofile: include.pofile -diff --git a/configure.in b/configure.in -index 1dc8819..108ace4 100644 ---- a/configure.in -+++ b/configure.in -@@ -2213,7 +2213,6 @@ libdm/Makefile +diff --git a/configure.ac b/configure.ac +index 7c1c04627..5364dd68e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2022,7 +2022,6 @@ libdaemon/server/Makefile + libdm/Makefile + libdm/dm-tools/Makefile libdm/libdevmapper.pc - liblvm/Makefile - liblvm/liblvm2app.pc -man/Makefile po/Makefile - python/Makefile - python/setup.py --- -2.8.1 - + scripts/lvm2-pvscan.service + scripts/blkdeactivate.sh diff --git a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch index 0e68d62fc2..2d49820057 100644 --- a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch +++ b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch @@ -1,6 +1,6 @@ -From 24a2c47fd01dde1710f1fa66f5c30ce7010c5956 Mon Sep 17 00:00:00 2001 +From 20a110ade91c73f4cb3883a3a9676708a93ca786 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 21 Sep 2017 15:28:10 +0800 +Date: Tue, 15 Oct 2019 18:12:54 +0800 Subject: [PATCH] start lvm2-monitor.service after tmp.mount The lvm2-monitor.service reqires the existence of locking_dir @@ -9,24 +9,25 @@ So start lvm2-monitor.service after tmp.mount Upstream-Status: Inappropriate [oe specific] +Rebase to v2_03_05 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Rebase to v2_03_16 +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in -index 22238b7..93b2bee 100644 +index c0c96e316..2a99a379d 100644 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in @@ -2,7 +2,7 @@ Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8) - Requires=dm-event.socket lvm2-lvmetad.socket --After=dm-event.socket dm-event.service lvm2-lvmetad.socket lvm2-activation.service lvm2-lvmetad.service -+After=dm-event.socket dm-event.service lvm2-lvmetad.socket lvm2-activation.service lvm2-lvmetad.service tmp.mount - Before=local-fs-pre.target + Requires=dm-event.socket +-After=dm-event.socket dm-event.service ++After=dm-event.socket dm-event.service tmp.mount + Before=local-fs-pre.target shutdown.target DefaultDependencies=no Conflicts=shutdown.target --- -1.8.3.1 - diff --git a/meta-oe/recipes-support/lvm2/files/reproducible-build.patch b/meta-oe/recipes-support/lvm2/files/reproducible-build.patch new file mode 100644 index 0000000000..ca632d213f --- /dev/null +++ b/meta-oe/recipes-support/lvm2/files/reproducible-build.patch @@ -0,0 +1,35 @@ +From f5c6fabbdf2e7bfa105658b9dfe45d2ab86f34bb Mon Sep 17 00:00:00 2001 +From: Joe Slater <joe.slater@windriver.com> +Date: Fri, 17 Jul 2020 13:59:56 -0700 +Subject: [PATCH] configure.ac: override CONFIGURE_LINE + +For reproducible binaries, we need to report a constant CONFIGURE_LINE. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <joe.slater@windriver.com> +--- + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5364dd68e..c2dbf3c9f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,7 +15,15 @@ AC_PREREQ(2.69) + ################################################################################ + dnl -- Process this file with autoconf to produce a configure script. + AC_INIT +-CONFIGURE_LINE="$0 $@" ++ ++dnl per reproducible-builds.org check SOURCE_DATE_EPOCH ++dnl ++if test -z "${SOURCE_DATE_EPOCH+set}" ; then ++ CONFIGURE_LINE="$0 $@" ++else ++ CONFIGURE_LINE="configure options are not available for reproducible builds" ++fi ++ + AC_CONFIG_SRCDIR([lib/device/dev-cache.h]) + AC_CONFIG_HEADERS([include/configure.h]) + diff --git a/meta-oe/recipes-support/lvm2/libdevmapper.bb b/meta-oe/recipes-support/lvm2/libdevmapper.bb new file mode 100644 index 0000000000..3b4439c3ae --- /dev/null +++ b/meta-oe/recipes-support/lvm2/libdevmapper.bb @@ -0,0 +1,19 @@ +# Break circular dependencies, only populate sysroot (header, +# libraries) to other recipe for compiling, recipe lvm2 +# generates package libdevmapper +require lvm2.inc + +DEPENDS += "autoconf-archive-native" + +inherit nopackages + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install() { + oe_runmake 'DESTDIR=${D}' -C libdm install +} + +# Do not generate package libdevmapper +PACKAGES = "" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb b/meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb deleted file mode 100644 index b6ae90240e..0000000000 --- a/meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb +++ /dev/null @@ -1,16 +0,0 @@ -require lvm2.inc - -SRC_URI[md5sum] = "153b7bb643eb26073274968e9026fa8f" -SRC_URI[sha256sum] = "b815a711a2fabaa5c3dc1a4a284df0268bf0f325f0fc0f5c9530c9bbb54b9964" - -DEPENDS += "autoconf-archive-native" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - oe_runmake 'DESTDIR=${D}' -C libdm install -} - -RRECOMMENDS_${PN}_append_class-target = " lvm2-udevrules" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/lvm2/lvm2.bb b/meta-oe/recipes-support/lvm2/lvm2.bb new file mode 100644 index 0000000000..f1a1aae2cd --- /dev/null +++ b/meta-oe/recipes-support/lvm2/lvm2.bb @@ -0,0 +1,109 @@ +require lvm2.inc + +SRC_URI += " \ + file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ + file://tweak-for-lvmdbusd.patch \ + " + +DEPENDS += "autoconf-archive-native" + +inherit multilib_script python3native + +MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf" + +CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" + +do_install:append() { + # Install machine specific configuration file + install -d ${D}${sysconfdir}/lvm + install -m 0644 ${UNPACKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf + sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf + # We don't want init scripts/systemd units for native SDK utilities + if [ "${PN}" != "nativesdk-lvm2" ]; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + oe_runmake 'DESTDIR=${D}' install install_systemd_units + sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service + else + oe_runmake 'DESTDIR=${D}' install install_initscripts + mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d + rm -rf ${D}${sysconfdir}/rc.d + fi + fi + + # following files only exist when package config `dbus` enabled + sed -i -e '1s,#!.*python.*,#!${USRBINPATH}/env python3,' \ + ${D}${sbindir}/lvmdbusd \ + ${D}${PYTHON_SITEPACKAGES_DIR}/lvmdbusd/lvmdb.py \ + ${D}${PYTHON_SITEPACKAGES_DIR}/lvmdbusd/lvm_shell_proxy.py \ + || true +} + +PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'lvm2-lvmdbusd.service', '', d)} \ + blk-availability.service \ + " +SYSTEMD_AUTO_ENABLE = "disable" + +TARGET_CC_ARCH += "${LDFLAGS}" + +EXTRA_OECONF:append:class-nativesdk = " --with-confdir=${sysconfdir}" + +DEPENDS += "util-linux" +LVM2_PACKAGECONFIG:append:class-target = " \ + udev \ +" + +PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev" +PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" + +PACKAGES =+ "libdevmapper" +FILES:libdevmapper = " \ + ${libdir}/libdevmapper.so.* \ + ${sbindir}/dmsetup \ + ${sbindir}/dmstats \ +" + +FILES:${PN} += " \ + ${libdir}/device-mapper/*.so \ + ${systemd_system_unitdir} \ + ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \ + ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \ +" + +FILES:${PN}-scripts = " \ + ${sbindir}/blkdeactivate \ + ${sbindir}/fsadm \ + ${sbindir}/lvmconf \ + ${sbindir}/lvmdump \ +" +# Specified explicitly for the udev rules, just in case that it does not get picked +# up automatically: +FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" +RDEPENDS:${PN} = "bash" +RDEPENDS:${PN}-udevrules = "libdevmapper" +RDEPENDS:${PN}:append:class-target = " libdevmapper" +RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper" + +RDEPENDS:${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ + bash \ + util-linux-lsblk \ + util-linux-findmnt \ + coreutils \ +" +RRECOMMENDS:${PN}:class-target = "${PN}-scripts (= ${EXTENDPKGV})" + +CONFFILES:${PN} += "${sysconfdir}/lvm/lvm.conf" + +SYSROOT_PREPROCESS_FUNCS:append = " remove_libdevmapper_sysroot_preprocess" +remove_libdevmapper_sysroot_preprocess() { + rm -f ${SYSROOT_DESTDIR}${libdir}/libdevmapper.so* \ + ${SYSROOT_DESTDIR}${sbindir}/dmsetup \ + ${SYSROOT_DESTDIR}${sbindir}/dmstats \ + ${SYSROOT_DESTDIR}${includedir}/libdevmapper.h \ + ${SYSROOT_DESTDIR}${libdir}/pkgconfig/devmapper.pc +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 289e07d8df..059ab6999b 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc @@ -1,31 +1,34 @@ HOMEPAGE = "https://www.sourceware.org/lvm2/" SECTION = "utils" DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux." -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" -DEPENDS += "util-linux" +DEPENDS += "libaio" -SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ +SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ file://lvm.conf \ file://0001-implement-libc-specific-reopen_stream.patch \ - file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ - file://0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \ file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \ file://0001-Avoid-bashisms-in-init-scripts.patch \ file://0005-do-not-build-manual.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ + file://reproducible-build.patch \ + file://0001-include-libgen.h-for-basename.patch \ " -S = "${WORKDIR}/LVM2.${PV}" -inherit autotools-brokensep pkgconfig systemd license +SRCREV = "6de3937ac517a3ecfd6d8d90f3f055dab631157e" +S = "${WORKDIR}/git" +PV = "2.03.26" -LVM2_PACKAGECONFIG = "dmeventd lvmetad" -LVM2_PACKAGECONFIG_append_class-target = " \ +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" + +inherit autotools-brokensep pkgconfig systemd + +LVM2_PACKAGECONFIG = "dmeventd" +LVM2_PACKAGECONFIG:append:class-target = " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ - ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ - udev \ " # odirect is always enabled because there currently is a bug in @@ -35,18 +38,16 @@ LVM2_PACKAGECONFIG_append_class-target = " \ PACKAGECONFIG ??= "odirect ${LVM2_PACKAGECONFIG}" PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" -PACKAGECONFIG[lvmetad] = "--enable-lvmetad,--disable-lvmetad" PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" +# NOTE: Add thin-provisioning-tools only if your distro policy allows GPL-3.0 license PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools" -PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev" # Unset user/group to unbreak install. EXTRA_OECONF = "--with-user= \ --with-group= \ --enable-realtime \ - --enable-applib \ --enable-cmdlib \ --enable-pkgconfig \ --with-usrlibdir=${libdir} \ @@ -58,3 +59,6 @@ EXTRA_OECONF = "--with-user= \ --with-thin-restore=${sbindir}/thin_restore \ " +# gold doesn't like multiple dm_bitset_parse_list definitions in libdm/.exported_symbols.DM_1_02_138 and libdm/.exported_symbols.DM_1_02_129 +# after it was uncommented in the later in 2.03.12 with https://github.com/lvmteam/lvm2/commit/60eb608d66c2056a78e81f27db3da14139d9faab +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd", '', d)}" diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch deleted file mode 100644 index e85818dbd4..0000000000 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0a8e466fcf99622896e070c5133165e4278e8cfb Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 25 May 2017 05:27:11 -0400 -Subject: [PATCH] explicitly do not install libdm - -Already have package libdevmapper which split from lvm2, -explicitly do not do the installation here. - -Upstream-Status: Inappropriate [meta-oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - libdm/Makefile.in | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/libdm/Makefile.in b/libdm/Makefile.in -index 3c9a4ce..45c91c6 100644 ---- a/libdm/Makefile.in -+++ b/libdm/Makefile.in -@@ -77,9 +77,11 @@ ifeq ("@PKGCONFIG@", "yes") - INSTALL_TYPE += install_pkgconfig - endif - --install: $(INSTALL_TYPE) install_include -+install: -+ echo "Do not install device mappler in lvm2" - --install_device-mapper: install -+install_device-mapper: -+ echo "Do not install device mappler in lvm2" - - install_include: $(srcdir)/libdevmapper.h - $(INSTALL_DATA) -D $< $(includedir)/$(<F) --- -2.8.1 - diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch new file mode 100644 index 0000000000..96a3d64fdf --- /dev/null +++ b/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch @@ -0,0 +1,70 @@ +From 2ff2a867db8d3e1c660d191a1805f9e355169c80 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Tue, 2 Mar 2021 01:33:05 -0800 +Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found + +In oe-core (util-linux and coreutils), the commands locates in +${bindir} rather than /bin, add BINDIR to configure it + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 3 +++ + scripts/blkdeactivate.sh.in | 7 ++++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d9e7964c3..9dfdcfe01 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1704,6 +1704,8 @@ AS_IF([test -n "$MODPROBE_CMD"], [ + + SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))" + ++BINDIR="$(eval echo $(eval echo $bindir))" ++ + SBINDIR="$(eval echo $(eval echo $sbindir))" + LVM_PATH="$SBINDIR/lvm" + AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.]) +@@ -1944,6 +1946,7 @@ AC_SUBST(PYTHON2DIR) + AC_SUBST(PYTHON3) + AC_SUBST(PYTHON3DIR) + AC_SUBST(RT_LIBS) ++AC_SUBST(BINDIR) + AC_SUBST(SBINDIR) + AC_SUBST(SELINUX_LIBS) + AC_SUBST(SELINUX_PC) +diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in +index 7c517b87b..7ef1bb766 100644 +--- a/scripts/blkdeactivate.sh.in ++++ b/scripts/blkdeactivate.sh.in +@@ -42,13 +42,14 @@ VDO="/bin/vdo" + + sbindir="@SBINDIR@" + DMSETUP="$sbindir/dmsetup" ++bindir="@BINDIR@" + LVM="$sbindir/lvm" + + if "$UMOUNT" --help | grep -- "--all-targets" >"$DEV_DIR/null"; then + UMOUNT_OPTS="--all-targets " + else + UMOUNT_OPTS="" +- FINDMNT="/bin/findmnt -r --noheadings -u -o TARGET" ++ FINDMNT="$bindir/findmnt -r --noheadings -u -o TARGET" + FINDMNT_READ="read -r mnt" + fi + DMSETUP_OPTS="" +@@ -57,10 +58,10 @@ MDADM_OPTS="" + MPATHD_OPTS="" + VDO_OPTS="" + +-LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" ++LSBLK="$bindir/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" + LSBLK_VARS="local devtype local kname local name local mnt" + LSBLK_READ="read -r devtype kname name mnt" +-SORT_MNT="/bin/sort -r -u -k 4" ++SORT_MNT="$bindir/sort -r -u -k 4" + + # Do not show tool errors by default (only done/skipping summary + # message provided by this script) and no verbose mode by default. diff --git a/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch b/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch new file mode 100644 index 0000000000..200f2f044a --- /dev/null +++ b/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch @@ -0,0 +1,60 @@ +From 34f5a21afae759d48fa11e77b622ca35a4feabaa Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 6 Dec 2023 10:24:46 +0800 +Subject: [PATCH] lvm2: 2.03.16 -> 2.03.22 + +Not check python modules pyudev and dbus during configure that they are runtime +dependencies. Deal with them in the package config setting in the recipe. + +Remove $(DESTDIR) from install destination that it is not suitable for oe. And +no generate python cache files too. + +Upstream-Status: Pending [oe specific] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure.ac | 4 ++-- + daemons/lvmdbusd/Makefile.in | 6 ++---- + 2 files changed, 4 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9dfdcfe01..fcf5c8b78 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1282,8 +1282,8 @@ AS_IF([test "$BUILD_LVMDBUSD" = "yes"], [ + AS_IF([test "$PYTHON3_BINDINGS" = "yes"], [PYTHON_BINDINGS="yes"]) + + # To get this macro, install autoconf-archive package then run autoreconf +- AX_PYTHON_MODULE([pyudev], [Required], python3) +- AX_PYTHON_MODULE([dbus], [Required], python3) ++ # AX_PYTHON_MODULE([pyudev], [Required], python3) ++ # AX_PYTHON_MODULE([dbus], [Required], python3) + ]) + + ################################################################################ +diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in +index 08b061fb2..e2b1c3209 100644 +--- a/daemons/lvmdbusd/Makefile.in ++++ b/daemons/lvmdbusd/Makefile.in +@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@ + top_builddir = @top_builddir@ + + lvmdbuspydir = $(python3dir)/lvmdbusd +-lvmdbusdir = $(DESTDIR)$(lvmdbuspydir) ++lvmdbusdir = $(lvmdbuspydir) + + LVMDBUS_SRCDIR_FILES = \ + automatedproperties.py \ +@@ -55,11 +55,9 @@ install_lvmdbusd: $(LVMDBUSD) + $(SHOW) " [INSTALL] $<" + $(Q) $(INSTALL_DIR) $(sbindir) + $(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir) +- $(Q) $(INSTALL_DIR) $(lvmdbusdir) $(lvmdbusdir)/__pycache__ ++ $(Q) $(INSTALL_DIR) $(lvmdbusdir) + $(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(lvmdbusdir)) + $(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(lvmdbusdir) +- $(Q) PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbuspydir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES) +- $(Q) $(CHMOD) 444 $(lvmdbusdir)/__pycache__/*.py[co] + + install_lvm2: install_lvmdbusd + diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb b/meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb deleted file mode 100644 index 84881e7442..0000000000 --- a/meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb +++ /dev/null @@ -1,54 +0,0 @@ -require lvm2.inc - -SRC_URI[md5sum] = "153b7bb643eb26073274968e9026fa8f" -SRC_URI[sha256sum] = "b815a711a2fabaa5c3dc1a4a284df0268bf0f325f0fc0f5c9530c9bbb54b9964" - -SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch" - -DEPENDS += "autoconf-archive-native" - -CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" - -do_install_append() { - # Install machine specific configuration file - install -d ${D}${sysconfdir}/lvm - install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf - sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - oe_runmake 'DESTDIR=${D}' install install_systemd_units - sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service - else - oe_runmake 'DESTDIR=${D}' install install_initscripts - mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d - rm -rf ${D}${sysconfdir}/rc.d - fi -} - -PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'lvmetad', 'lvm2-lvmetad.socket lvm2-pvscan@.service', '', d)} \ - blk-availability.service" -SYSTEMD_AUTO_ENABLE = "disable" - -TARGET_CC_ARCH += "${LDFLAGS}" - -FILES_${PN} += "${libdir}/device-mapper/*.so" -FILES_${PN}-scripts = " \ - ${sbindir}/blkdeactivate \ - ${sbindir}/fsadm \ - ${sbindir}/lvmconf \ - ${sbindir}/lvmdump \ -" -# Specified explicitly for the udev rules, just in case that it does not get picked -# up automatically: -FILES_${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" -RDEPENDS_${PN}_append_class-target = " libdevmapper" - -RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) bash" -RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" - -CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb b/meta-oe/recipes-support/mailcap/mailcap_2.1.54.bb index 114ce4607c..8385b63543 100644 --- a/meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb +++ b/meta-oe/recipes-support/mailcap/mailcap_2.1.54.bb @@ -14,13 +14,17 @@ by several applications e.g. to determine MIME types for filenames." SECTION = "System Environment/Base" LICENSE = "PD & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=100fcfb84512ccc03ffc7d89ac391305" +LIC_FILES_CHKSUM = "file://COPYING;md5=8dce08227d135cfda1f19d4c0c6689de" SRC_URI = "https://releases.pagure.org/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "2c26e18e912a5cf00318fcf7f8f2d747" -SRC_URI[sha256sum] = "d7b023b237d6053bf05ff6786e0663c55c614efcc99cdf856120be13b5c29157" +SRC_URI[sha256sum] = "9a4032202fc0d2b0858f41b167389a9cfe52ac24ec282e6479b90765319de113" + +inherit update-alternatives do_install() { oe_runmake install DESTDIR=${D} sysconfdir=${sysconfdir} mandir=${mandir} } + +ALTERNATIVE:${PN} = "mime.types" +ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types" diff --git a/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb b/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb index 3467d28988..d0e7e39202 100644 --- a/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb +++ b/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb @@ -1,6 +1,6 @@ DESCRIPTION = "mbuffer is a tool for buffering data streams with a large set of unique features." HOMEPAGE = "http://www.maier-komor.de/mbuffer.html" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" SECTION = "console/network" @@ -8,6 +8,8 @@ SRC_URI = " \ http://www.maier-komor.de/software/mbuffer/mbuffer-20140310.tgz \ " +UPSTREAM_CHECK_URI = "http://www.maier-komor.de/mbuffer.html" + SRC_URI[md5sum] = "9937d7f666c19a2e6b2499b04dbecc44" SRC_URI[sha256sum] = "ab90b6fdce16db2bf08bcda0bc5d2bfb053a9a163d2a24f95fbf246460549b99" diff --git a/meta-oe/recipes-support/mcelog/mce-inject_git.bb b/meta-oe/recipes-support/mcelog/mce-inject_git.bb index f876144919..08ec8c574e 100644 --- a/meta-oe/recipes-support/mcelog/mce-inject_git.bb +++ b/meta-oe/recipes-support/mcelog/mce-inject_git.bb @@ -4,11 +4,15 @@ software level into a running Linux kernel. This is intended for \ validation of the kernel machine check handler." SECTION = "System Environment/Base" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git" +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git;branch=master" -SRCREV = "4cbe46321b4a81365ff3aafafe63967264dbfec5" +SRCREV = "7668d820cadce2da9d90b72aab14c3e637ca47d6" -LICENSE = "GPLv2" +UPSTREAM_CHECK_COMMITS = "1" + +DEPENDS = "bison-native" + +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://README;beginline=30;md5=94c18755082a2da9c9cf97cba3ad47d6" S = "${WORKDIR}/git" @@ -17,4 +21,4 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' inherit autotools-brokensep -EXTRA_OEMAKE = "destdir=${D}" +EXTRA_OEMAKE = "destdir=${D} CFLAGS='${CFLAGS}'" diff --git a/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch b/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch new file mode 100644 index 0000000000..969bfc17cf --- /dev/null +++ b/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch @@ -0,0 +1,110 @@ +From 430982376a544bbccaef5006fab94bbc2f1d1711 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Mon, 13 Apr 2020 07:12:44 +0000 +Subject: [PATCH] gcov_merge.py/scov_merge.py: switch to python3 + +Make gcov_merge.py and scov_merge.py port to python3. + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + tools/scripts/gcov_merge.py | 12 ++++++------ + tools/scripts/scov_merge.py | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/tools/scripts/gcov_merge.py b/tools/scripts/gcov_merge.py +index 0ac9bed..9f1cb8c 100644 +--- a/tools/scripts/gcov_merge.py ++++ b/tools/scripts/gcov_merge.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # Merge gcov graph from several test cases. This can be used to check + # the coverage of several test cases. +@@ -11,7 +11,7 @@ + import sys + + def die(str): +- print str ++ print(str) + sys.exit(-1) + + def die_on(cond, str): +@@ -55,11 +55,11 @@ def merge(gcls1, gcls2): + gcl1.merge(gcl2) + + def gcov_merge(fns, of): +- f = file(fns[0]) ++ f = open(fns[0]) + gcls_base = parse(f) + + for fn in fns[1:]: +- f = file(fn) ++ f = open(fn) + gcls = parse(f) + merge(gcls_base, gcls) + +@@ -67,10 +67,10 @@ def gcov_merge(fns, of): + gcl.write(of) + + def usage(): +- print 'Usage: %s <gcov graph files>' % (sys.argv[0]) ++ print('Usage: %s <gcov graph files>' % (sys.argv[0])) + + if __name__ == '__main__': + if len(sys.argv) <= 1: + usage() +- exit -1 ++ sys.exit(-1) + gcov_merge(sys.argv[1:], sys.stdout) +diff --git a/tools/scripts/scov_merge.py b/tools/scripts/scov_merge.py +index f83b922..bbcf760 100644 +--- a/tools/scripts/scov_merge.py ++++ b/tools/scripts/scov_merge.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # Merge mce serverity coverage file from several test cases. This can + # be used to check the coverage of several test cases. +@@ -11,7 +11,7 @@ + import sys + + def die(str): +- print str ++ print(str) + sys.exit(-1) + + def die_on(cond, str): +@@ -47,11 +47,11 @@ def merge(gcls1, gcls2): + gcl1.merge(gcl2) + + def scov_merge(fns, of): +- f = file(fns[0]) ++ f = open(fns[0]) + gcls_base = parse(f) + + for fn in fns[1:]: +- f = file(fn) ++ f = open(fn) + gcls = parse(f) + merge(gcls_base, gcls) + +@@ -59,10 +59,10 @@ def scov_merge(fns, of): + gcl.write(of) + + def usage(): +- print 'Usage: %s <severities coverage files>' % (sys.argv[0]) ++ print('Usage: %s <severities coverage files>' % (sys.argv[0])) + + if __name__ == '__main__': + if len(sys.argv) <= 1: + usage() +- exit -1 ++ sys.exit(-1) + scov_merge(sys.argv[1:], sys.stdout) +-- +2.24.1 + diff --git a/meta-oe/recipes-support/mcelog/mce-test/makefile-remove-ldflags.patch b/meta-oe/recipes-support/mcelog/mce-test/makefile-remove-ldflags.patch new file mode 100644 index 0000000000..0ffedd2c17 --- /dev/null +++ b/meta-oe/recipes-support/mcelog/mce-test/makefile-remove-ldflags.patch @@ -0,0 +1,23 @@ +Remove the default CFLAGS and LDFLAGS in Makefile. Ensure the extra linker flags can be passed. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + +diff --git a/cases/stress/hwpoison/Makefile b/cases/stress/hwpoison/Makefile +index da1cbd8..dec5b14 100644 +--- a/cases/stress/hwpoison/Makefile ++++ b/cases/stress/hwpoison/Makefile +@@ -1,8 +1,8 @@ +-CFLAGS := -g -Wall +-LDFLAGS := -g ++#CFLAGS := -g -Wall ++#LDFLAGS := -g + +-export CFLAGS +-export LDFLAGS ++#export CFLAGS ++#export LDFLAGS + + all: + mkdir -p bin diff --git a/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-oe/recipes-support/mcelog/mce-test_git.bb new file mode 100644 index 0000000000..0a6fd684eb --- /dev/null +++ b/meta-oe/recipes-support/mcelog/mce-test_git.bb @@ -0,0 +1,33 @@ +# +# Copyright (C) 2012 Wind River Systems, Inc. +# +SUMMARY = "MCE test suite" + +DESCRIPTION = "The MCE test suite is a collection of tools and test scripts for \ +testing the Linux RAS related features, including CPU/Memory error \ +containment and recovery, ACPI/APEI support etc." + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git;branch=master \ + file://makefile-remove-ldflags.patch \ + file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \ + " +SRCREV = "9d11fc3e05eae7b454efeb5941beded56f80445b" +PV = "20230601+git" + +RDEPENDS:${PN} = "mcelog mce-inject dialog bash" + +COMPATIBLE_HOST = '(i.86|x86_64).*-linux' + +S ="${WORKDIR}/git" + +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" + +do_install:append(){ + install -d ${D}/opt/mce-test + cp -rf ${S}/* ${D}/opt/mce-test/ +} + +FILES:${PN} += "/opt" diff --git a/meta-oe/recipes-support/mcelog/mcelog/0001-client-Include-string.h-form-mem-function-prototypes.patch b/meta-oe/recipes-support/mcelog/mcelog/0001-client-Include-string.h-form-mem-function-prototypes.patch new file mode 100644 index 0000000000..3b6fd7d702 --- /dev/null +++ b/meta-oe/recipes-support/mcelog/mcelog/0001-client-Include-string.h-form-mem-function-prototypes.patch @@ -0,0 +1,26 @@ +From c7753f82261d49862d5e0f9691bf87799d36ef0c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 16:20:03 -0700 +Subject: [PATCH] client: Include string.h form mem* function prototypes + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + client.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/client.c b/client.c +index 883b1de..e474e55 100644 +--- a/client.c ++++ b/client.c +@@ -16,6 +16,7 @@ + on your Linux system; if not, write to the Free Software Foundation, + Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include <stdio.h> ++#include <string.h> + #include <sys/socket.h> + #include <sys/un.h> + #include <unistd.h> +-- +2.37.3 + diff --git a/meta-oe/recipes-support/mcelog/mcelog/run-ptest b/meta-oe/recipes-support/mcelog/mcelog/run-ptest index ba7a2c7683..320240f276 100644 --- a/meta-oe/recipes-support/mcelog/mcelog/run-ptest +++ b/meta-oe/recipes-support/mcelog/mcelog/run-ptest @@ -1,3 +1,9 @@ #!/bin/sh -make -C tests test +make -C tests test | sed -e '/\[PASS\]/ s/^/PASS: /g' \ + -e '/\[FAIL\]/ s/^/FAIL: /g' \ + -e '/\[IGNORE\]/ s/^/SKIP: /g' \ + -e 's/IGNORE:/SKIP:/' \ + -e 's/: \[PASS\]//' \ + -e 's/: \[FAIL\]//' \ + -e 's/: \[IGNORE\]//' diff --git a/meta-oe/recipes-support/mcelog/mcelog_1.49.bb b/meta-oe/recipes-support/mcelog/mcelog_200.bb index 84633a76c9..9d72e78599 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_1.49.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_200.bb @@ -2,25 +2,33 @@ SUMMARY = "mcelog daemon accounts memory and some other errors in various ways." DESCRIPTION = "mcelog is required by both 32bit x86 Linux kernels (since 2.6.30) \ and 64bit Linux kernels (since early 2.6 kernel releases) to log machine checks \ and should run on all Linux systems that need error handling." -HOMEPAGE = "http://mcelog.org/" +HOMEPAGE = "https://mcelog.org/" SECTION = "System Environment/Base" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ - file://run-ptest \ -" +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ + file://0001-client-Include-string.h-form-mem-function-prototypes.patch \ + file://run-ptest \ + " -SRCREV = "2cfdf29b2ef98ccd5ed42cdde8bbe437e0d6412f" +SRCREV = "955fd0917ab1b9f159443e5cbba1d0fa73486fac" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://README.md;md5=279840fabb191e6cd9150492d31b0e20" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" -inherit autotools-brokensep ptest +inherit ptest COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' -do_install_append() { +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install DESTDIR=${D} install -d ${D}${sysconfdir}/cron.hourly install -m 0755 ${S}/mcelog.cron ${D}${sysconfdir}/cron.hourly/ sed -i 's/bash/sh/' ${D}${sysconfdir}/cron.hourly/mcelog.cron @@ -32,4 +40,4 @@ do_install_ptest() { sed -i 's#../../mcelog#mcelog#' ${D}${PTEST_PATH}/tests/test } -RDEPENDS_${PN}-ptest += "${PN} make bash mce-inject" +RDEPENDS:${PN}-ptest += "make bash mce-inject" diff --git a/meta-oe/recipes-support/md4c/md4c_0.5.2.bb b/meta-oe/recipes-support/md4c/md4c_0.5.2.bb new file mode 100644 index 0000000000..6c409666fc --- /dev/null +++ b/meta-oe/recipes-support/md4c/md4c_0.5.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "Markdown for C" +DESCRIPTION = "MD4C is Markdown parser implementation in C." +HOMEPAGE = "http://github.com/mity/md4c" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=383f39920f391605af6e8e46e60e2378" + + +S = "${WORKDIR}/git" + +SRC_URI = " \ + git://github.com/mity/md4c.git;protocol=https;branch=master \ +" + +SRCREV = "729e6b8b320caa96328968ab27d7db2235e4fb47" + +inherit cmake diff --git a/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch b/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch index 1302679315..ce139a6387 100644 --- a/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch +++ b/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch @@ -5,35 +5,30 @@ Subject: [PATCH] Undefine REGEX for musl based systems Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + GNUmakefile | 1 - Makefile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -diff --git a/GNUmakefile b/GNUmakefile -index 7bf7dca..0e10030 100644 --- a/GNUmakefile +++ b/GNUmakefile -@@ -41,7 +41,6 @@ endif +@@ -45,7 +45,6 @@ endif CC?= gcc CFLAGS?= -O2 -pipe CFLAGS+= -g -Wall -CPPFLAGS= -DREGEX CPPFLAGS+= -D_GNU_SOURCE - CPPFLAGS+= $(BSD_CPPFLAGS) -D__dead=__dead2 + CPPFLAGS+= $(BSD_CPPFLAGS) LIBS= $(CURSES_LIBS) $(BSD_LIBS) -diff --git a/Makefile b/Makefile -index 94ce340..d516bbc 100644 --- a/Makefile +++ b/Makefile -@@ -10,7 +10,7 @@ DPADD+= ${LIBCURSES} ${LIBUTIL} - # REGEX -- create regular expression functions. +@@ -11,7 +11,7 @@ DPADD+= ${LIBUTIL} # STARTUPFILE -- look for and handle initialization file. + # MGLOG -- debug mg internals to a log file. # --CFLAGS+=-Wall -DREGEX -+CFLAGS+=-Wall +-CFLAGS+=-Wall -DREGEX `pkg-config --cflags-only-I ncurses` ++CFLAGS+=-Wall `pkg-config --cflags-only-I ncurses` SRCS= autoexec.c basic.c bell.c buffer.c cinfo.c dir.c display.c \ echo.c extend.c file.c fileio.c funmap.c help.c kbd.c keymap.c \ --- -2.12.2 - diff --git a/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch b/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch index 551f1df163..4eeb1d97dc 100644 --- a/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch +++ b/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch @@ -5,11 +5,11 @@ Subject: [PATCH 1/2] fileio: Include sys/param.h for MAXNAMLEN Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + fileio.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/fileio.c b/fileio.c -index 48a67a2..9b69665 100644 --- a/fileio.c +++ b/fileio.c @@ -12,6 +12,7 @@ @@ -20,6 +20,3 @@ index 48a67a2..9b69665 100644 #include <dirent.h> #include <errno.h> #include <fcntl.h> --- -2.12.2 - diff --git a/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch b/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch index 907d67064a..ef7811081b 100644 --- a/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch +++ b/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch @@ -5,16 +5,16 @@ Subject: [PATCH 2/2] fileio: Define DEFFILEMODE if platform is missing Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + fileio.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/fileio.c b/fileio.c -index 9b69665..a852fd2 100644 --- a/fileio.c +++ b/fileio.c -@@ -28,6 +28,10 @@ - #include "kbd.h" - #include "pathnames.h" +@@ -36,6 +36,10 @@ + #define DEFFILEMODE 0666 + #endif +#if !defined(DEFFILEMODE) +# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ @@ -23,6 +23,3 @@ index 9b69665..a852fd2 100644 static char *bkuplocation(const char *); static int bkupleavetmp(const char *); --- -2.12.2 - diff --git a/meta-oe/recipes-support/mg/mg_20170401.bb b/meta-oe/recipes-support/mg/mg_20230501.bb index dad1d008bf..ee00003977 100644 --- a/meta-oe/recipes-support/mg/mg_20170401.bb +++ b/meta-oe/recipes-support/mg/mg_20230501.bb @@ -1,19 +1,20 @@ SUMMARY = "A portable version of the mg maintained by the OpenBSD team" HOMEPAGE = "http://homepage.boetes.org/software/mg/" LICENSE = "PD" -LIC_FILES_CHKSUM = "file://version.c;md5=1895eb37bf6bd79cdc5c89d8166fabfb" +LIC_FILES_CHKSUM = "file://version.c;md5=a8e0b53d89d277bf3b40878ac568bedd" DEPENDS = "ncurses libbsd" SECTION = "console/editors" -SRC_URI = "http://homepage.boetes.org/software/mg/mg-${PV}.tar.gz \ +SRCREV = "f21c2ba36772ffa68d9cfa55305e427d37903b4a" +SRC_URI = "git://github.com/hboetes/mg;branch=master;protocol=https \ file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ " -SRC_URI_append_libc-musl = "\ +SRC_URI:append:libc-musl = "\ file://0001-Undefine-REGEX-for-musl-based-systems.patch \ " -SRC_URI[md5sum] = "884388589fb38c2109ad9fed328be20a" -SRC_URI[sha256sum] = "0a3608b17c153960cb1d954ca3b62445a77c0c1a18aa5c8c58aba9f6b8d62aab" + +S = "${WORKDIR}/git" # CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?= EXTRA_OEMAKE = "\ diff --git a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb b/meta-oe/recipes-support/mime-support/mime-support_3.62.bb index d617b6620c..46def2a23c 100644 --- a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb +++ b/meta-oe/recipes-support/mime-support/mime-support_3.62.bb @@ -1,18 +1,24 @@ SECTION = "base" SUMMARY = "MIME files 'mime.types' & 'mailcap', and support programs" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://debian/README;md5=36bbe2ace0a05c3fb684b73208fbf30b" +LICENSE = "PD & Bellcore" +LICENSE:${PN} = "PD" +# mailcap.man's license is Bellcore +LICENSE:${PN}-doc = "PD & Bellcore" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=53c851e31d27c3ea8a6217073a5ff01c" DEPENDS = "file" -RDEPENDS_${PN} = "perl" -RRECOMMENDS_${PN} = "file" +RDEPENDS:${PN} = "perl" +RRECOMMENDS:${PN} = "file" -SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz" +SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}.tar.gz" +SRC_URI[sha256sum] = "54e0a03e0cd63c7c9fe68a18ead0a2143fd3c327604215f989d85484d0409f4a" S = "${WORKDIR}/${BPN}" -FILES_${PN} += " ${libdir}/mime" +inherit update-alternatives -docdir_append = "/${BPN}" +FILES:${PN} += " ${libdir}/mime" + +docdir:append = "/${BPN}" do_install () { install -d ${D}${sysconfdir} @@ -25,22 +31,22 @@ do_install () { install -d ${D}${mandir}/man8 install -m 644 mime.types ${D}${sysconfdir}/ install -m 644 mailcap ${D}${libdir}/mime/ - install -m 644 mailcap.order ${D}${sysconfdir}/ + install -m 644 mailcap.order ${D}${sysconfdir}/ install -m 644 mailcap.man ${D}${mandir}/man5/mailcap.5 - install -m 644 mailcap.order.man ${D}${mandir}/man5/mailcap.order.5 -# install -m 755 install-mime ${D}${sbindir}/ -# install -m 644 install-mime.man ${D}${mandir}/man8/install-mime.8 + install -m 644 mailcap.order.man ${D}${mandir}/man5/mailcap.order.5 +# install -m 755 install-mime ${D}${sbindir}/ +# install -m 644 install-mime.man ${D}${mandir}/man8/install-mime.8 install -m 755 update-mime ${D}${sbindir}/ - install -m 644 update-mime.man ${D}${mandir}/man8/update-mime.8 + install -m 644 update-mime.man ${D}${mandir}/man8/update-mime.8 install -m 755 run-mailcap ${D}${bindir}/ - install -m 644 run-mailcap.man ${D}${mandir}/man1/run-mailcap.1 -# install -m 644 rfcs/* ${D}${docdir}/ - install -m 644 debian/changelog ${D}${docdir}/changelog.Debian - install -m 644 debian/README ${D}${docdir}/copyright + install -m 644 run-mailcap.man ${D}${mandir}/man1/run-mailcap.1 +# install -m 644 rfcs/* ${D}${docdir}/ + install -m 644 debian/changelog ${D}${docdir}/changelog.Debian + install -m 644 debian/copyright ${D}${docdir}/copyright install -m 755 debian-view ${D}${libdir}/mime/ - install -m 755 playaudio ${D}${libdir}/mime/ + install -m 755 playaudio ${D}${libdir}/mime/ install -m 755 playdsp ${D}${libdir}/mime/ - install -m 644 mailcap.entries ${D}${libdir}/mime/packages/mime-support + install -m 644 mailcap.entries ${D}${libdir}/mime/packages/mime-support cd ${D}${mandir}; gzip -9fv */* cd ${D}${docdir}; gzip -9v * cd ${D}${docdir}; gunzip copyright.gz @@ -54,5 +60,6 @@ do_install () { cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz } -SRC_URI[md5sum] = "d6e5d715e331147352c50c158dbdec6d" -SRC_URI[sha256sum] = "a529c7892cb786f514af71f4ca5a4c3ebc58b538a49ff959c0d97592d38f040a" +ALTERNATIVE_PRIORITY = "90" +ALTERNATIVE:${PN} = "mime.types" +ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types" diff --git a/meta-oe/recipes-support/mini-iconv/mini-iconv.bb b/meta-oe/recipes-support/mini-iconv/mini-iconv.bb deleted file mode 100644 index 0f1548aa28..0000000000 --- a/meta-oe/recipes-support/mini-iconv/mini-iconv.bb +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2012 Khem Raj <raj.khem@gmail.com> -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "A minimal iconv implementation w/ support for UTF-8, ASCII, ISO-8859-1" -HOMEPAGE = "http://tinderbox.dev.gentoo.org/portage/local/misc/mini-iconv/" -LICENSE = "MPL-1.1" -SECTION = "libs" -DEPENDS = "" -PROVIDES = "virtual/libiconv" -LIC_FILES_CHKSUM = "file://iconv.c;beginline=1;endline=6;md5=35af9d9924327fe8a0a1fe3a2cb454c8" -SRC_URI = "http://mirror.meleeweb.net/pub/linux/gentoo/distfiles/mini-iconv.tar.bz2" -SRC_URI[md5sum] = "84412221e26505a2b3855d4a1cdcd0e0" -SRC_URI[sha256sum] = "3552262bf1bcf8e859a2a3a7adfb0367af8593383e730c492e981477aac0a0d4" - - -S = "${WORKDIR}/${PN}" - -do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${prefix} LIB=${base_libdir} -} diff --git a/meta-oe/recipes-support/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch b/meta-oe/recipes-support/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch deleted file mode 100644 index 5da34480e7..0000000000 --- a/meta-oe/recipes-support/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch +++ /dev/null @@ -1,36 +0,0 @@ -From fbfceebce2121831904f2f7115252dd03b413a6d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 19 Sep 2017 18:52:53 -0700 -Subject: [PATCH] IntelRDFPMathLib20U1: Check for __DEFINED_wchar_t - -This is defined by musl if wchar_t is already defined - -avoids errors like - -src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h:46:15: error: typedef redefinition with different types - ('int' vs 'unsigned int') -typedef int wchar_t; - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h b/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h -index 2b3f76db86..cc80305775 100755 ---- a/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h -+++ b/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h -@@ -42,7 +42,7 @@ - #include <ctype.h> - - // Fix system header issue on Sun solaris and define required type by ourselves --#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) -+#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) && !defined(__DEFINED_wchar_t) - typedef int wchar_t; - #endif - --- -2.14.1 - diff --git a/meta-oe/recipes-support/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch b/meta-oe/recipes-support/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch deleted file mode 100644 index 09d49d28cd..0000000000 --- a/meta-oe/recipes-support/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 53368d3f4adc09dd84234a9af31771bcd8ca2757 Mon Sep 17 00:00:00 2001 -From: Sven Ebenfeld <sven.ebenfeld@gmail.com> -Date: Fri, 15 Jan 2016 22:41:28 +0100 -Subject: [PATCH] Tell scons to use build settings from environment variables - -Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com> ---- - SConstruct | 8 ++++++-- - src/mongo/util/SConscript | 2 ++ - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 5082a4b..3370f70 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -507,6 +507,7 @@ def variable_arch_converter(val): - 'amd64': 'x86_64', - 'emt64': 'x86_64', - 'x86': 'i386', -+ 'aarch64': 'arm64', - } - val = val.lower() - -@@ -568,7 +569,8 @@ env_vars.Add('ARFLAGS', - converter=variable_shlex_converter) - - env_vars.Add('CC', -- help='Select the C compiler to use') -+ help='Select the C compiler to use', -+ default=os.getenv('CC')) - - env_vars.Add('CCFLAGS', - help='Sets flags for the C and C++ compiler', -@@ -588,7 +590,8 @@ env_vars.Add('CPPPATH', - converter=variable_shlex_converter) - - env_vars.Add('CXX', -- help='Select the C++ compiler to use') -+ help='Select the C++ compiler to use', -+ default=os.getenv('CXX')) - - env_vars.Add('CXXFLAGS', - help='Sets flags for the C++ compiler', -@@ -818,6 +821,7 @@ envDict = dict(BUILD_ROOT=buildDir, - ) - - env = Environment(variables=env_vars, **envDict) -+env.PrependENVPath('PATH', os.getenv('PATH')) - del envDict - - env.AddMethod(env_os_is_wrapper, 'TargetOSIs') -diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript -index 6add602..8d05a62 100644 ---- a/src/mongo/util/SConscript -+++ b/src/mongo/util/SConscript -@@ -251,6 +251,8 @@ if get_option('allocator') == 'tcmalloc': - 'MONGO_HAVE_GPERFTOOLS_GET_THREAD_CACHE_SIZE' - ] - ) -+ if not use_system_version_of_library('valgrind'): -+ tcmspEnv.InjectThirdPartyIncludePaths('valgrind') - - tcmspEnv.Library( - target='tcmalloc_set_parameter', --- -1.9.1 - diff --git a/meta-oe/recipes-support/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch b/meta-oe/recipes-support/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch deleted file mode 100644 index f8c419d8a3..0000000000 --- a/meta-oe/recipes-support/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3eed8388b49d5d3cbc2db74fee1b017eb4b40d0a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 2 Sep 2017 10:06:24 -0700 -Subject: [PATCH] Use __GLIBC__ to control use of gnu_get_libc_version - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - src/mongo/util/processinfo_linux.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp -index 910015215e..bf8c1ffd15 100644 ---- a/src/mongo/util/processinfo_linux.cpp -+++ b/src/mongo/util/processinfo_linux.cpp -@@ -40,7 +40,7 @@ - #include <sys/mman.h> - #include <sys/utsname.h> - #include <unistd.h> --#ifdef __UCLIBC__ -+#ifndef __GLIBC__ - #include <features.h> - #else - #include <gnu/libc-version.h> -@@ -451,11 +451,13 @@ double ProcessInfo::getSystemMemoryPressurePercentage() { - } - - void ProcessInfo::getExtraInfo(BSONObjBuilder& info) { -+#if defined(__GLIBC__) - LinuxProc p(_pid); - if (p._maj_flt <= std::numeric_limits<long long>::max()) - info.appendNumber("page_faults", static_cast<long long>(p._maj_flt)); - else - info.appendNumber("page_faults", static_cast<double>(p._maj_flt)); -+#endif - } - - /** -@@ -491,7 +493,7 @@ void ProcessInfo::SystemInfo::collectSystemInfo() { - stringstream ss; - ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__; - bExtra.append("libcVersion", ss.str()); --#else -+#elif defined(__GLIBC__) - bExtra.append("libcVersion", gnu_get_libc_version()); - #endif - if (!verSig.empty()) --- -2.14.1 - diff --git a/meta-oe/recipes-support/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch b/meta-oe/recipes-support/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch deleted file mode 100644 index c43beb4c12..0000000000 --- a/meta-oe/recipes-support/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch +++ /dev/null @@ -1,67 +0,0 @@ -From a4951489d649c2b609cbb80f6cfb49fdcad8bd43 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 2 Sep 2017 10:03:37 -0700 -Subject: [PATCH] Use long long instead of int64_t - -Fixes -error: call to member function 'appendNumber' is ambiguous -since this function expects long long as parameter and not int64_t - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - src/mongo/util/procparser.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/mongo/util/procparser.cpp b/src/mongo/util/procparser.cpp -index 36f2ae0254..2c164bcbf3 100644 ---- a/src/mongo/util/procparser.cpp -+++ b/src/mongo/util/procparser.cpp -@@ -260,7 +260,7 @@ Status parseProcStat(const std::vector<StringData>& keys, - - StringData stringValue((*partIt).begin(), (*partIt).end() - (*partIt).begin()); - -- uint64_t value; -+ long long value; - - if (!parseNumberFromString(stringValue, &value).isOK()) { - value = 0; -@@ -272,7 +272,7 @@ Status parseProcStat(const std::vector<StringData>& keys, - } else { - StringData stringValue((*partIt).begin(), (*partIt).end() - (*partIt).begin()); - -- uint64_t value; -+ long long value; - - if (!parseNumberFromString(stringValue, &value).isOK()) { - value = 0; -@@ -365,7 +365,7 @@ Status parseProcMemInfo(const std::vector<StringData>& keys, - - StringData stringValue((*partIt).begin(), (*partIt).end()); - -- uint64_t value; -+ long long value; - - if (!parseNumberFromString(stringValue, &value).isOK()) { - value = 0; -@@ -426,7 +426,7 @@ Status parseProcDiskStats(const std::vector<StringData>& disks, - StringData data, - BSONObjBuilder* builder) { - bool foundKeys = false; -- std::vector<uint64_t> stats; -+ std::vector<long long> stats; - stats.reserve(kDiskFieldCount); - - using string_split_iterator = boost::split_iterator<StringData::const_iterator>; -@@ -501,7 +501,7 @@ Status parseProcDiskStats(const std::vector<StringData>& disks, - - StringData stringValue((*partIt).begin(), (*partIt).end()); - -- uint64_t value; -+ long long value; - - if (!parseNumberFromString(stringValue, &value).isOK()) { - value = 0; --- -2.14.1 - diff --git a/meta-oe/recipes-support/mongodb/mongodb/0001-Use-strerror_r-only-on-glibc-systems.patch b/meta-oe/recipes-support/mongodb/mongodb/0001-Use-strerror_r-only-on-glibc-systems.patch deleted file mode 100644 index 0334d994e4..0000000000 --- a/meta-oe/recipes-support/mongodb/mongodb/0001-Use-strerror_r-only-on-glibc-systems.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a4dfc92ff342e59596ab64267a8d4f22f173c23b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 2 Sep 2017 12:40:41 -0700 -Subject: [PATCH 1/4] Use strerror_r only on glibc systems - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/mongo/util/log.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mongo/util/log.cpp b/src/mongo/util/log.cpp -index 1957eb4791..ddf3908818 100644 ---- a/src/mongo/util/log.cpp -+++ b/src/mongo/util/log.cpp -@@ -101,7 +101,7 @@ string errnoWithDescription(int errNumber) { - char buf[kBuflen]; - char* msg{nullptr}; - --#if defined(__GNUC__) && defined(_GNU_SOURCE) -+#if defined(__GNUC__) && defined(_GNU_SOURCE) && defined(__GLIBC__) - msg = strerror_r(errNumber, buf, kBuflen); - #elif defined(_WIN32) - --- -2.14.1 - diff --git a/meta-oe/recipes-support/mongodb/mongodb/0001-mongo-Add-using-std-string.patch b/meta-oe/recipes-support/mongodb/mongodb/0001-mongo-Add-using-std-string.patch deleted file mode 100644 index e517d53d10..0000000000 --- a/meta-oe/recipes-support/mongodb/mongodb/0001-mongo-Add-using-std-string.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 5fdec9592285f5976345fbccb3d07fae1245ab53 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 2 Aug 2017 15:41:22 -0700 -Subject: [PATCH] mongo: Add using std::string - -This is needed with latest clang -Fixes -src/mongo/db/dbwebserver.cpp:206:23: error: use of undeclared identifier 'string'; did you mean 'String'? - static vector<string> commands; - ^~~~~~ - String - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/mongo/db/dbwebserver.cpp | 1 + - src/mongo/db/matcher/expression_leaf.cpp | 2 ++ - src/mongo/db/repl/master_slave.cpp | 1 + - src/mongo/util/net/miniwebserver.cpp | 1 + - 4 files changed, 5 insertions(+) - -diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp -index b202e0500b..0255613524 100644 ---- a/src/mongo/db/dbwebserver.cpp -+++ b/src/mongo/db/dbwebserver.cpp -@@ -67,6 +67,7 @@ namespace mongo { - using std::map; - using std::stringstream; - using std::vector; -+using std::string; - - using namespace html; - -diff --git a/src/mongo/db/matcher/expression_leaf.cpp b/src/mongo/db/matcher/expression_leaf.cpp -index d562bff141..4d931985e2 100644 ---- a/src/mongo/db/matcher/expression_leaf.cpp -+++ b/src/mongo/db/matcher/expression_leaf.cpp -@@ -44,6 +44,8 @@ - #include "mongo/stdx/memory.h" - #include "mongo/util/mongoutils/str.h" - -+using std::string; -+ - namespace mongo { - - Status LeafMatchExpression::setPath(StringData path) { -diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp -index 05faad1259..ea25d7151b 100644 ---- a/src/mongo/db/repl/master_slave.cpp -+++ b/src/mongo/db/repl/master_slave.cpp -@@ -78,6 +78,7 @@ using std::endl; - using std::max; - using std::min; - using std::set; -+using std::string; - using std::stringstream; - using std::unique_ptr; - using std::vector; -diff --git a/src/mongo/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp -index 5f4165d42f..239720c349 100644 ---- a/src/mongo/util/net/miniwebserver.cpp -+++ b/src/mongo/util/net/miniwebserver.cpp -@@ -46,6 +46,7 @@ namespace mongo { - - using std::shared_ptr; - using std::stringstream; -+using std::string; - using std::vector; - - MiniWebServer::MiniWebServer(const string& name, const string& ip, int port, ServiceContext* ctx) --- -2.13.3 - diff --git a/meta-oe/recipes-support/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch b/meta-oe/recipes-support/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch deleted file mode 100644 index 098306f500..0000000000 --- a/meta-oe/recipes-support/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch +++ /dev/null @@ -1,35 +0,0 @@ -From df7ef16afcc6ab55daa686e4f15c16e3d1280337 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 2 Sep 2017 12:42:30 -0700 -Subject: [PATCH 2/4] Add a definition for the macro __ELF_NATIVE_CLASS - -It depends on the native arch's word size. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/mongo/util/stacktrace_posix.cpp | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/mongo/util/stacktrace_posix.cpp b/src/mongo/util/stacktrace_posix.cpp -index 53ab85f56f..7c458e7ef2 100644 ---- a/src/mongo/util/stacktrace_posix.cpp -+++ b/src/mongo/util/stacktrace_posix.cpp -@@ -37,6 +37,15 @@ - #include <string> - #include <sys/utsname.h> - -+#if !defined(__GLIBC__) -+#if defined __x86_64__ && !defined __ILP32__ -+# define __WORDSIZE 64 -+#else -+# define __WORDSIZE 32 -+#endif -+#define __ELF_NATIVE_CLASS __WORDSIZE -+#endif -+ - #include "mongo/base/init.h" - #include "mongo/config.h" - #include "mongo/db/jsobj.h" --- -2.14.1 - diff --git a/meta-oe/recipes-support/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch b/meta-oe/recipes-support/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch deleted file mode 100644 index 95f9c1c1c6..0000000000 --- a/meta-oe/recipes-support/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5759878e5d278f11a1063e8fccd1e6b7b54caadf Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 2 Aug 2017 16:25:37 -0700 -Subject: [PATCH 2/2] d_state.cpp: Add missing dependenncy on - local_sharding_info - -Fixes -| src/mongo/s/d_state.cpp:81: error: undefined reference to 'mongo::enableLocalShardingInfo(mongo::ServiceContext*, std::function<bool (mongo::OperationContext*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>)' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/mongo/s/SConscript | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript -index 71720be517..51bd199127 100644 ---- a/src/mongo/s/SConscript -+++ b/src/mongo/s/SConscript -@@ -317,5 +317,6 @@ env.Library( - "$BUILD_DIR/mongo/db/s/sharding", - "$BUILD_DIR/mongo/executor/network_interface_factory", - "$BUILD_DIR/mongo/s/client/shard_local", -+ "$BUILD_DIR/mongo/s/local_sharding_info", - ], - ) --- -2.13.3 - diff --git a/meta-oe/recipes-support/mongodb/mongodb/0003-Conditionalize-glibc-specific-strerror_r.patch b/meta-oe/recipes-support/mongodb/mongodb/0003-Conditionalize-glibc-specific-strerror_r.patch deleted file mode 100644 index 1591f94c96..0000000000 --- a/meta-oe/recipes-support/mongodb/mongodb/0003-Conditionalize-glibc-specific-strerror_r.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 458f80f482a201b427a1c92235804d0c3f98fd51 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 2 Sep 2017 13:01:11 -0700 -Subject: [PATCH 3/4] Conditionalize glibc specific strerror_r - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - .../asio-asio-1-11-0/asio/include/asio/impl/error_code.ipp | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/src/third_party/asio-asio-1-11-0/asio/include/asio/impl/error_code.ipp b/src/third_party/asio-asio-1-11-0/asio/include/asio/impl/error_code.ipp -index 4e7badb14a..0eeae884e2 100644 ---- a/src/third_party/asio-asio-1-11-0/asio/include/asio/impl/error_code.ipp -+++ b/src/third_party/asio-asio-1-11-0/asio/include/asio/impl/error_code.ipp -@@ -97,17 +97,14 @@ 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__) -+#elif defined(__GLIBC__) && defined(_GNU_SOURCE) -+ char buf[256] = ""; -+ return strerror_r(value, buf, sizeof(buf)); -+#else - 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)); - #endif - #endif // defined(ASIO_WINDOWS) - } --- -2.14.1 - diff --git a/meta-oe/recipes-support/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch b/meta-oe/recipes-support/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch deleted file mode 100644 index e871f2ba90..0000000000 --- a/meta-oe/recipes-support/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a1c77702926eb8546ff96b00b5b994f7478dabae Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 2 Sep 2017 13:13:15 -0700 -Subject: [PATCH 4/4] wiredtiger: Disable strtouq on musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/third_party/wiredtiger/build_linux/wiredtiger_config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/third_party/wiredtiger/build_linux/wiredtiger_config.h b/src/third_party/wiredtiger/build_linux/wiredtiger_config.h -index 1122e1e319..fdfd48687b 100644 ---- a/src/third_party/wiredtiger/build_linux/wiredtiger_config.h -+++ b/src/third_party/wiredtiger/build_linux/wiredtiger_config.h -@@ -101,7 +101,7 @@ - #define HAVE_STRING_H 1 - - /* Define to 1 if you have the `strtouq' function. */ --#define HAVE_STRTOUQ 1 -+/* #undef HAVE_STRTOUQ 1 */ - - /* Define to 1 if you have the `sync_file_range' function. */ - /* #undef HAVE_SYNC_FILE_RANGE */ --- -2.14.1 - diff --git a/meta-oe/recipes-support/mongodb/mongodb/arm64-support.patch b/meta-oe/recipes-support/mongodb/mongodb/arm64-support.patch deleted file mode 100644 index 9046bb2f45..0000000000 --- a/meta-oe/recipes-support/mongodb/mongodb/arm64-support.patch +++ /dev/null @@ -1,43 +0,0 @@ -Add alises for arm64 which is same as aarch64 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: git/SConstruct -=================================================================== ---- git.orig/SConstruct -+++ git/SConstruct -@@ -990,6 +990,7 @@ elif endian == "big": - processor_macros = { - 'arm' : { 'endian': 'little', 'defines': ('__arm__',) }, - 'aarch64' : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')}, -+ 'arm64' : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')}, - 'i386' : { 'endian': 'little', 'defines': ('__i386', '_M_IX86')}, - 'ppc64le' : { 'endian': 'little', 'defines': ('__powerpc64__',)}, - 's390x' : { 'endian': 'big', 'defines': ('__s390x__',)}, -Index: git/src/third_party/IntelRDFPMathLib20U1/SConscript -=================================================================== ---- git.orig/src/third_party/IntelRDFPMathLib20U1/SConscript -+++ git/src/third_party/IntelRDFPMathLib20U1/SConscript -@@ -301,7 +301,7 @@ if processor == 'i386': - elif processor == 'arm': - cpp_defines['IA32'] = '1' - cpp_defines['ia32'] = '1' --elif processor == "aarch64": -+elif processor == "aarch64" or processor == 'arm64': - cpp_defines['efi2'] = '1' - cpp_defines['EFI2'] = '1' - # Using 64 bit little endian -Index: git/src/third_party/wiredtiger/SConscript -=================================================================== ---- git.orig/src/third_party/wiredtiger/SConscript -+++ git/src/third_party/wiredtiger/SConscript -@@ -139,7 +139,7 @@ condition_map = { - 'POSIX_HOST' : not env.TargetOSIs('windows'), - 'WINDOWS_HOST' : env.TargetOSIs('windows'), - -- 'ARM64_HOST' : env['TARGET_ARCH'] == 'aarch64', -+ 'ARM64_HOST' : env['TARGET_ARCH'] in ('aarch64', 'arm64'), - 'POWERPC_HOST' : env['TARGET_ARCH'] == 'ppc64le', - 'X86_HOST' : env['TARGET_ARCH'] == 'x86_64', - 'ZSERIES_HOST' : env['TARGET_ARCH'] == 's390x', diff --git a/meta-oe/recipes-support/mongodb/mongodb/disable-hw-crc32-on-arm64-s390x.patch b/meta-oe/recipes-support/mongodb/mongodb/disable-hw-crc32-on-arm64-s390x.patch deleted file mode 100644 index 5c5c20ce34..0000000000 --- a/meta-oe/recipes-support/mongodb/mongodb/disable-hw-crc32-on-arm64-s390x.patch +++ /dev/null @@ -1,50 +0,0 @@ -imported from debian - -Upstream-Status: Pending -Index: git/src/third_party/wiredtiger/SConscript -=================================================================== ---- git.orig/src/third_party/wiredtiger/SConscript -+++ git/src/third_party/wiredtiger/SConscript -@@ -169,7 +169,9 @@ if useSnappy: - # If not available at runtime, we fall back to software in some cases. - # - # On zSeries we may disable because SLES 11 kernel doe not support the instructions. --if not (env['TARGET_ARCH'] == 's390x' and get_option("use-s390x-crc32") == "off"): -+# Debian: disable hardware-assisted crc32 on s390x and arm64, as at least the -+# buildd's do not support the instructions. -+if env['TARGET_ARCH'] not in ('s390x', 'arm64', 'aarch64'): - env.Append(CPPDEFINES=["HAVE_CRC32_HARDWARE"]) - - wtlib = env.Library( -Index: git/src/third_party/wiredtiger/dist/filelist -=================================================================== ---- git.orig/src/third_party/wiredtiger/dist/filelist -+++ git/src/third_party/wiredtiger/dist/filelist -@@ -54,7 +54,6 @@ src/checksum/power8/crc32_wrapper.c POWE - src/checksum/software/checksum.c - src/checksum/x86/crc32-x86.c X86_HOST - src/checksum/zseries/crc32-s390x.c ZSERIES_HOST --src/checksum/zseries/crc32le-vx.sx ZSERIES_HOST - src/config/config.c - src/config/config_api.c - src/config/config_check.c -Index: git/src/third_party/wiredtiger/src/checksum/zseries/crc32-s390x.c -=================================================================== ---- git.orig/src/third_party/wiredtiger/src/checksum/zseries/crc32-s390x.c -+++ git/src/third_party/wiredtiger/src/checksum/zseries/crc32-s390x.c -@@ -78,6 +78,7 @@ unsigned int __wt_crc32c_le(unsigned int - return crc; \ - } - -+#if defined(HAVE_CRC32_HARDWARE) - /* Main CRC-32 functions */ - DEFINE_CRC32_VX(__wt_crc32c_le_vx, __wt_crc32c_le_vgfm_16, __wt_crc32c_le) - -@@ -90,6 +91,7 @@ __wt_checksum_hw(const void *chunk, size - { - return (~__wt_crc32c_le_vx(0xffffffff, chunk, len)); - } -+#endif - - #endif - diff --git a/meta-oe/recipes-support/mongodb/mongodb_git.bb b/meta-oe/recipes-support/mongodb/mongodb_git.bb deleted file mode 100644 index 0ff7d0b59f..0000000000 --- a/meta-oe/recipes-support/mongodb/mongodb_git.bb +++ /dev/null @@ -1,77 +0,0 @@ -SUMMARY = "mongodb" -LICENSE = "AGPL-3.0 & Apache-2.0 & Zlib" -LIC_FILES_CHKSUM = "file://GNU-AGPL-3.0.txt;md5=73f1eb20517c55bf9493b7dd6e480788 \ - file://APACHE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" - -DEPENDS = "openssl libpcre libpcap zlib python boost" - -inherit scons dos2unix siteinfo - -PV = "3.4.6+git${SRCPV}" -SRCREV = "c55eb86ef46ee7aede3b1e2a5d184a7df4bfb5b5" -SRC_URI = "git://github.com/mongodb/mongo.git;branch=v3.4 \ - file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ - file://0001-mongo-Add-using-std-string.patch \ - file://0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch \ - file://0001-Use-long-long-instead-of-int64_t.patch \ - file://0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch \ - file://0001-Use-strerror_r-only-on-glibc-systems.patch \ - file://0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch \ - file://0003-Conditionalize-glibc-specific-strerror_r.patch \ - file://arm64-support.patch \ - file://0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch \ - file://disable-hw-crc32-on-arm64-s390x.patch \ - " -SRC_URI_append_libc-musl ="\ - file://0004-wiredtiger-Disable-strtouq-on-musl.patch \ - " -S = "${WORKDIR}/git" - -# Wiredtiger supports only 64-bit platforms -PACKAGECONFIG_x86-64 ??= "tcmalloc wiredtiger" -PACKAGECONFIG_aarch64 ??= "tcmalloc wiredtiger" -PACKAGECONFIG ??= "tcmalloc" -# gperftools compilation fails for arm below v7 because of missing support of -# dmb operation. So we use system-allocator instead of tcmalloc -PACKAGECONFIG_remove_armv6 = "tcmalloc" -PACKAGECONFIG_remove_libc-musl = "tcmalloc" - -#std::current_exception is undefined for arm < v6 -COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" -COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" -COMPATIBLE_MACHINE_armv7a = "(!.*armv7a).*" -COMPATIBLE_MACHINE_armv7ve = "(!.*armv7ve).*" -COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" -COMPATIBLE_MACHINE_powerpc = "(!.*ppc).*" - -PACKAGECONFIG[tcmalloc] = "--use-system-tcmalloc,--allocator=system,gperftools," -PACKAGECONFIG[wiredtiger] = "--wiredtiger=on,--wiredtiger=off,," - -EXTRA_OESCONS = "--prefix=${D}${prefix} \ - LIBPATH=${STAGING_LIBDIR} \ - LINKFLAGS='${LDFLAGS}' \ - CXXFLAGS='${CXXFLAGS}' \ - TARGET_ARCH=${TARGET_ARCH} \ - --ssl \ - --disable-warnings-as-errors \ - --use-system-pcre \ - --use-system-zlib \ - --js-engine=none \ - --nostrip \ - --endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ - ${PACKAGECONFIG_CONFARGS} \ - mongod mongos" - -do_configure_prepend() { - # tests use hex floats, not supported in plain C++ - sed -e 's|-std=c++11|-std=gnu++11|g' -i ${S}/SConstruct -} -scons_do_compile() { - ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} ${EXTRA_OESCONS} || \ - die "scons build execution failed." -} - -scons_do_install() { - ${STAGING_BINDIR_NATIVE}/scons install ${EXTRA_OESCONS}|| \ - die "scons install execution failed." -} diff --git a/meta-oe/recipes-support/monit/monit/monit b/meta-oe/recipes-support/monit/monit/monit new file mode 100644 index 0000000000..394704e061 --- /dev/null +++ b/meta-oe/recipes-support/monit/monit/monit @@ -0,0 +1,42 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/monit and type +# > update-rc.d monit defaults 89 +# +monit=/usr/bin/monit +pidfile=/var/run/monit.pid +monit_args="-c /etc/monitrc" + +test -x "$monit" || exit 0 + +case "$1" in + start) + echo -n "Starting Monit" + start-stop-daemon --start --quiet --exec $monit -- $monit_args + RETVAL=$? + echo "." + ;; + stop) + echo -n "Stopping Monit" + start-stop-daemon --stop --quiet --pidfile $pidfile + RETVAL=$? + echo "." + ;; + restart) + $0 stop + $0 start + RETVAL=$? + ;; + status) + $monit $monit_args status + RETVAL=$? + echo "." + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 +esac + +exit $RETVAL + diff --git a/meta-oe/recipes-support/monit/monit/monitrc b/meta-oe/recipes-support/monit/monit/monitrc new file mode 100644 index 0000000000..af7bd2be53 --- /dev/null +++ b/meta-oe/recipes-support/monit/monit/monitrc @@ -0,0 +1,50 @@ +############################################################################### +## Monit control file +############################################################################### +## +## Comments begin with a '#' and extend through the end of the line. Keywords +## are case insensitive. All path's MUST BE FULLY QUALIFIED, starting with '/'. +## +## Below you will find examples of some frequently used statements. For +## information about the control file and a complete list of statements and +## options, please have a look in the Monit manual. +## +## +############################################################################### +## Global section +############################################################################### +## +## Start Monit in the background (run as a daemon): +# +set daemon 30 # check services at 30 seconds intervals +# with start delay 240 # optional: delay the first check by 4-minutes (by +# # default Monit check immediately after Monit start) +# +# + +# set monit files in temporary locations +set pidfile /var/run/.monit.pid +set statefile /var/run/.monit.state +set idfile /var/run/.monit.id + +## Set syslog logging. If you want to log to a standalone log file instead, +## specify the full path to the log file +# +set log syslog + +set httpd port 2812 + allow 0.0.0.0/0 # allow localhost to connect to the server and + allow admin:monit # require user 'admin' with password 'monit' + #with ssl { # enable SSL/TLS and set path to server certificate + # pemfile: /etc/ssl/certs/monit.pem + #} + +############################################################################### +## Includes +############################################################################### +## +## It is possible to include additional configuration parts from other files or +## directories. +# +include /etc/monit.d/* + diff --git a/meta-oe/recipes-support/monit/monit_5.34.0.bb b/meta-oe/recipes-support/monit/monit_5.34.0.bb new file mode 100644 index 0000000000..7c3869789c --- /dev/null +++ b/meta-oe/recipes-support/monit/monit_5.34.0.bb @@ -0,0 +1,56 @@ +DESCRIPTION = "Monit is a free open source utility for managing and monitoring, \ +processes, programs, files, directories and filesystems on a UNIX system. \ +Monit conducts automatic maintenance and repair and can execute meaningful \ +causal actions in error situations." + +HOMEPAGE = "http://mmonit.com/monit/" + +LICENSE = "AGPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \ + file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92" + +SRC_URI = " \ + https://mmonit.com/monit/dist/monit-${PV}.tar.gz \ + file://monit \ + file://monitrc \ +" + +SRC_URI[sha256sum] = "37f514cd8973bbce104cb8517ff3fc504052a083703eee0d0e873db26b919820" + +DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" + +inherit autotools-brokensep systemd update-rc.d + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" + +EXTRA_OECONF = "\ + libmonit_cv_setjmp_available=no \ + libmonit_cv_vsnprintf_c99_conformant=no \ + --with-ssl-lib-dir=${STAGING_LIBDIR} \ + --with-ssl-incl-dir=${STAGING_INCDIR} \ +" + +SYSTEMD_SERVICE:${PN} = "monit.service" +SYSTEMD_AUTO_ENABLE = "enable" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME:${PN} = "monit" +INITSCRIPT_PARAMS:${PN} = "defaults 89" + +do_configure:prepend() { + rm -rf ${S}/m4/* +} + +do_install:append() { + + # Configuration file + install -Dm 0600 ${UNPACKDIR}/monitrc ${D}${sysconfdir}/monitrc + + # SystemD + install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service + sed -i -e 's,@prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service + + # SysV + install -Dm 0755 ${UNPACKDIR}/monit ${D}${sysconfdir}/init.d/monit +} diff --git a/meta-oe/recipes-support/mscgen/mscgen_0.20.bb b/meta-oe/recipes-support/mscgen/mscgen_0.20.bb new file mode 100644 index 0000000000..b503506a2b --- /dev/null +++ b/meta-oe/recipes-support/mscgen/mscgen_0.20.bb @@ -0,0 +1,22 @@ +SUMMARY = "Mscgen is a small program that parses Message Sequence Chart descriptions and produces PNG, SVG, EPS or server side image maps (ismaps) as the output." +HOMEPAGE = "http://www.mcternan.me.uk/mscgen/" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b1e6a340187c1cf716513439d07c1d79" + +SRC_URI = "http://www.mcternan.me.uk/mscgen/software/${BPN}-src-${PV}.tar.gz" + +SRC_URI[md5sum] = "65c90fb5150d7176b65b793f0faa7377" +SRC_URI[sha256sum] = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23" + +UPSTREAM_CHECK_URI = "https://www.mcternan.me.uk//mscgen/" + +DEPENDS = "gd " + +inherit autotools gettext pkgconfig + +do_configure:prepend() { + sed -i "s#AC_PATH_PROG(GDLIB_CONFIG,gdlib-config)#AC_PATH_PROG([GDLIB_CONFIG],[gdlib-config], ,[${STAGING_BINDIR_CROSS}])#" ${S}/configure.ac +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/msktutil/msktutil/0001-configure.ac-Remove-native-include-path.patch b/meta-oe/recipes-support/msktutil/msktutil/0001-configure.ac-Remove-native-include-path.patch new file mode 100644 index 0000000000..1643c08566 --- /dev/null +++ b/meta-oe/recipes-support/msktutil/msktutil/0001-configure.ac-Remove-native-include-path.patch @@ -0,0 +1,31 @@ +From bf9795ffbda7bb241b708ff261976016efb943b1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 23:12:19 -0800 +Subject: [PATCH] configure.ac: Remove native include path + +On OE com_err.h is found in /usr/include too, therefore adding new path +to include search path is not needed. Moreover it fixed QA checks where +it warns about using build system paths. + +Upstream-Status: Inappropriate [Cross-compile specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index eaac16f..d23d0b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -134,7 +134,6 @@ fi + # Fedora, RHEL, Centos has com_err.h in /usr/include/et + AC_CHECK_HEADERS([et/com_err.h]) + if test "$ac_cv_header_et_com_err_h" = "yes"; then +- CPPFLAGS="-I/usr/include/et $CPPFLAGS" + AC_DEFINE(HAVE_COM_ERR_H, 1) + fi + +-- +2.39.1 + diff --git a/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb b/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb new file mode 100644 index 0000000000..4c68e7adf4 --- /dev/null +++ b/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "Program for interoperability with Active Directory" +DESCRIPTION = "Msktutil creates user or computer accounts in Active Directory, \ + creates Kerberos keytabs on Unix/Linux systems, adds and removes \ + principals to and from keytabs and changes the user or computer \ + account's password." + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" + +SRC_URI = "https://github.com/msktutil/msktutil/releases/download/${PV}/${BP}.tar.bz2 \ + file://0001-configure.ac-Remove-native-include-path.patch" +SRC_URI[sha256sum] = "f9686237c4e24414802415f4c8627c7343da365c5a3bcdef7a853fa3cd27b45d" + +UPSTREAM_CHECK_URI = "https://github.com/msktutil/msktutil/releases/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + +DEPENDS += "krb5 cyrus-sasl openldap" + +inherit autotools diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch new file mode 100644 index 0000000000..74ae1530cb --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch @@ -0,0 +1,76 @@ +From 1e1ba9ecc16895bf472eae345d44631b65629611 Mon Sep 17 00:00:00 2001 +From: Benjamin Marzinski <bmarzins@redhat.com> +Date: Thu, 13 Apr 2017 07:22:23 -0500 +Subject: [PATCH 01/12] RH: fixup udev rules for redhat + +The multipath rules need to run after scsi_id is run. This means moving +them after 60-persistent-storage.rules for redhat. Redhat also uses a +different naming scheme for partitions than SuSE. Also, there are some +false warnings that gcc throws because of the changed options. Fix these +too. + +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Upstream-Status: Pending +--- + Makefile.inc | 2 +- + kpartx/kpartx.rules | 2 +- + multipath/Makefile | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.inc b/Makefile.inc +index 5668e638..de89b21f 100644 +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -59,7 +59,7 @@ tmpfilesdir := $(systemd_prefix)lib/tmpfiles.d + modulesloaddir := $(systemd_prefix)lib/modules-load.d + libudevdir := $(systemd_prefix)lib/udev + udevrulesdir := $(libudevdir)/rules.d +-bindir := $(exec_prefix)sbin ++bindir := $(exec_prefix)/usr/sbin + mandir := $(usr_prefix)share/man + LIB := $(if $(shell test -d /lib64 && echo 1),lib64,lib) + syslibdir := $(prefix)$(LIB) +diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules +index 1969dee0..d2b28233 100644 +--- a/kpartx/kpartx.rules ++++ b/kpartx/kpartx.rules +@@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end" + GOTO="kpartx_end" + + LABEL="run_kpartx" +-RUN+="/sbin/kpartx -un -p -part /dev/$name" ++RUN+="/sbin/kpartx -un /dev/$name" + + LABEL="kpartx_end" +diff --git a/multipath/Makefile b/multipath/Makefile +index 67fb5e62..2ea9e528 100644 +--- a/multipath/Makefile ++++ b/multipath/Makefile +@@ -27,7 +27,7 @@ install: + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 99-z-dm-mpath-late.rules $(DESTDIR)$(udevrulesdir) +- $(Q)$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/56-multipath.rules ++ $(Q)$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/62-multipath.rules + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(tmpfilesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/multipath.conf + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)/man8 +@@ -50,7 +50,7 @@ uninstall: + $(Q)$(RM) $(DESTDIR)$(udevrulesdir)/99-z-dm-mpath-late.rules + $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf + $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf +- $(Q)$(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules ++ $(Q)$(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules + $(Q)$(RM) $(DESTDIR)$(mandir)/man8/$(EXEC).8 + $(Q)$(RM) $(DESTDIR)$(mandir)/man5/$(EXEC).conf.5 + $(Q)$(RM) $(DESTDIR)$(tmpfilesdir)/multipath.conf +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-kpartx-include-limits.h-for-PATH_MAX.patch b/meta-oe/recipes-support/multipath-tools/files/0001-kpartx-include-limits.h-for-PATH_MAX.patch deleted file mode 100644 index 46dd8e23b4..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0001-kpartx-include-limits.h-for-PATH_MAX.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 330028a5a904a0da3788141030e614569dc5aaa7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 14 Jul 2017 23:28:12 -0700 -Subject: [PATCH] kpartx: include limits.h for PATH_MAX - -lopart.c:76:12: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'INT8_MAX'? - char path[PATH_MAX]; - ^~~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - kpartx/lopart.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kpartx/lopart.c b/kpartx/lopart.c -index 7005445..5efe5dc 100644 ---- a/kpartx/lopart.c -+++ b/kpartx/lopart.c -@@ -22,6 +22,7 @@ - #include <errno.h> - #include <stdlib.h> - #include <unistd.h> -+#include <limits.h> - #include <sys/ioctl.h> - #include <sys/stat.h> - #include <sys/mman.h> --- -2.13.3 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch b/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch new file mode 100644 index 0000000000..0365a7ef64 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch @@ -0,0 +1,42 @@ +From 389286b25a903be62ce7f964246824fcc20c4c67 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 26 Mar 2024 18:56:55 -0700 +Subject: [PATCH] libmultipath: always use glibc basename() + +There is a use of basename() which expects it to be GNU version of +basename, which is not available in other libcs e.g. musl on Linux +therefore provide a version for such cases + +Upstream-Status: Submitted [https://github.com/opensvc/multipath-tools/pull/84] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libmultipath/configure.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/libmultipath/configure.c b/libmultipath/configure.c +index 4ecf6ba4..e81cc67c 100644 +--- a/libmultipath/configure.c ++++ b/libmultipath/configure.c +@@ -43,6 +43,19 @@ + #include "sysfs.h" + #include "io_err_stat.h" + ++#ifndef __GLIBC__ ++/* ++ * glibc's non-destructive version of basename() ++ * License: LGPL-2.1-or-later ++ */ ++static const char *__basename(const char *filename) ++{ ++ char *p = strrchr(filename, '/'); ++ return p ? p + 1 : filename; ++} ++#define basename(x) __basename(x) ++#endif ++ + /* group paths in pg by host adapter + */ + int group_by_host_adapter(struct pathgroup *pgp, vector adapters) +-- +2.44.0 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-multipath-attempt-at-common-multipath.rules.patch b/meta-oe/recipes-support/multipath-tools/files/0001-multipath-attempt-at-common-multipath.rules.patch deleted file mode 100644 index acb4269543..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0001-multipath-attempt-at-common-multipath.rules.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 5ab50e0cb888e553a2635bbbf81eea3cdeffee60 Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Wed, 12 Apr 2017 09:07:51 -0500 -Subject: [PATCH 01/14] multipath: attempt at common multipath.rules - -This is a proposal to try and bring the Redhat and SuSE multipath.rules -closer. There are a couple of changes that I'd like some input on. - -The big change is moving the kpartx call into the multipath rules. Half -of the current kpartx.rules file is about creating symlinks for multiple -types of dm devices. The other half auto-creates kpartx devices on top -of multipath devices. Since it is only creating kpartx devices on top of -multipath devices, I've moved the these rules into multipath.rules, or -rather, I've replaced them with the redhat rules in multipath.rules. The -biggest difference is the kpartx isn't run on every reload. It works -with the 11-dm-mpath.rules code to not run kpartx on multipathd -generated reloads or when there aren't any working paths. It does -remember if it didn't get to run kpartx when it was supposed to (because -there were no valid paths or the device was suspended) and will make -sure to run it on the next possible uevent. - -The other change is the redhat multipath rules remove the partition -device nodes for devices claimed by multipath. The udev rule will only -do this one time (both to keep from running partx on every event, and so -that if users manually reread the partition table, we don't keep -removing them when clearly they are wanted). Redhat does this because we -had multiple customer issues where they were using the scsi partitions -instead of the kpartx devices. Obviously, with setting the partition -devices to not ready and clearing their fs_type, this isn't essential, -but it has helped make customers do the right thing. - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> ---- - kpartx/kpartx.rules | 8 -------- - multipath/multipath.rules | 27 ++++++++++++++++++++++++--- - 2 files changed, 24 insertions(+), 11 deletions(-) - -diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules -index a958791..906e320 100644 ---- a/kpartx/kpartx.rules -+++ b/kpartx/kpartx.rules -@@ -34,12 +34,4 @@ ENV{ID_FS_LABEL_ENC}=="?*", IMPORT{db}="ID_FS_LABEL_ENC" - ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", \ - SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" - --# Create dm tables for partitions --ENV{DM_ACTION}=="PATH_FAILED|PATH_REINSTATED", GOTO="kpartx_end" --ENV{DM_NR_VALID_PATHS}=="0", GOTO="kpartx_end" --ENV{ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}!="1", IMPORT{db}="DM_SUBSYSTEM_UDEV_FLAG1" --ENV{DM_SUBSYSTEM_UDEV_FLAG1}=="1", GOTO="kpartx_end" --ENV{DM_STATE}!="SUSPENDED", ENV{DM_UUID}=="mpath-*", \ -- RUN+="/sbin/kpartx -un -p -part /dev/$name" -- - LABEL="kpartx_end" -diff --git a/multipath/multipath.rules b/multipath/multipath.rules -index 86defc0..616a04c 100644 ---- a/multipath/multipath.rules -+++ b/multipath/multipath.rules -@@ -1,13 +1,13 @@ - # Set DM_MULTIPATH_DEVICE_PATH if the device should be handled by multipath - SUBSYSTEM!="block", GOTO="end_mpath" - ACTION!="add|change", GOTO="end_mpath" --KERNEL!="sd*|dasd*", GOTO="end_mpath" -- -+KERNEL!="sd*|dasd*|rbd*|dm-*", GOTO="end_mpath" - IMPORT{cmdline}="nompath" - ENV{nompath}=="?*", GOTO="end_mpath" - IMPORT{cmdline}="multipath" - ENV{multipath}=="off", GOTO="end_mpath" - -+KERNEL=="dm-*", GOTO="check_kpartx" - ENV{DEVTYPE}!="partition", GOTO="test_dev" - IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH" - ENV{DM_MULTIPATH_DEVICE_PATH}=="1", ENV{ID_FS_TYPE}="none", \ -@@ -21,7 +21,28 @@ TEST!="$env{MPATH_SBIN_PATH}/multipath", ENV{MPATH_SBIN_PATH}="/usr/sbin" - - ENV{DM_MULTIPATH_DEVICE_PATH}!="1", \ - PROGRAM=="$env{MPATH_SBIN_PATH}/multipath -u %k", \ -- ENV{DM_MULTIPATH_DEVICE_PATH}="1", ENV{ID_FS_TYPE}="none", \ -+ ENV{DM_MULTIPATH_DEVICE_PATH}="1", ENV{ID_FS_TYPE}="mpath_member", \ - ENV{SYSTEMD_READY}="0" - -+ENV{DM_MULTIPATH_DEVICE_PATH}!="1", GOTO="end_mpath" -+ -+IMPORT{db}="DM_MULTIPATH_WIPE_PARTS" -+ENV{DM_MULTIPATH_WIPE_PARTS}!="1", ENV{DM_MULTIPATH_WIPE_PARTS}="1", \ -+ RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}" -+GOTO="end_mpath" -+ -+LABEL="check_kpartx" -+ -+IMPORT{db}="DM_MULTIPATH_NEED_KPARTX" -+ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}!="1", IMPORT{db}="DM_SUBSYSTEM_UDEV_FLAG1" -+ENV{DM_SUBSYSTEM_UDEV_FLAG1}=="1", GOTO="end_mpath" -+ACTION!="change", GOTO="end_mpath" -+ENV{DM_UUID}!="mpath-?*", GOTO="end_mpath" -+ENV{DM_ACTIVATION}=="1", ENV{DM_MULTIPATH_NEED_KPARTX}="1" -+ENV{DM_SUSPENDED}=="1", GOTO="end_mpath" -+ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath" -+ENV{DM_ACTIVATION}!="1", ENV{DM_MULTIPATH_NEED_KPARTX}!="1", GOTO="end_mpath" -+RUN+="/sbin/kpartx -un -p -part /dev/$name" -+ENV{DM_MULTIPATH_NEED_KPARTX}="" -+ - LABEL="end_mpath" --- -2.8.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch new file mode 100644 index 0000000000..4b24bd2d35 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch @@ -0,0 +1,65 @@ +From bb6db01cc19940bb5162c1cc0c9b5f8e4c209822 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Fri, 1 Mar 2024 10:34:06 +0800 +Subject: [PATCH 02/12] RH: Remove the property blacklist exception builtin + +Multipath set the default property blacklist exceptions to +(ID_SCSI_VPD|ID_WWN). This has the effect of blacklisting some internal +devices. These devices may never have multiple paths, but it is nice +to be able to set multipath up on them all the same. This patch simply +removes the default, and makes it so that if no property +blacklist_exception is given, then devices aren't failed for not matching +it. + +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +Upsteam-Status: Pending + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Upstream-Status: Pending +--- + libmultipath/blacklist.c | 16 +++++----------- + 1 file changed, 5 insertions(+), 11 deletions(-) + +diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c +index 75100b20..4fdaca76 100644 +--- a/libmultipath/blacklist.c ++++ b/libmultipath/blacklist.c +@@ -221,15 +221,6 @@ setup_default_blist (struct config * conf) + struct hwentry *hwe; + int i; + +- if (nvme_multipath_enabled()) { +- if (store_ble(conf->blist_devnode, "!^(sd[a-z]|dasd[a-z])", +- ORIGIN_DEFAULT)) +- return 1; +- } else { +- if (store_ble(conf->blist_devnode, "!^(sd[a-z]|dasd[a-z]|nvme[0-9])", +- ORIGIN_DEFAULT)) +- return 1; +- } + if (store_ble(conf->elist_property, "(SCSI_IDENT_|ID_WWN)", ORIGIN_DEFAULT)) + return 1; + +@@ -464,8 +455,11 @@ filter_property(const struct config *conf, struct udev_device *udev, + r = MATCH_NOTHING; + } + +- log_filter(devname, NULL, NULL, NULL, env, NULL, r, lvl); +- return r; ++ if (VECTOR_SIZE(conf->elist_property)) { ++ log_filter(devname, NULL, NULL, NULL, env, NULL, r, lvl); ++ return r; ++ } ++ return 0; + } + + static void free_ble(struct blentry *ble) +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0002-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0002-RH-fixup-udev-rules-for-redhat.patch deleted file mode 100644 index e63d2eb33f..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0002-RH-fixup-udev-rules-for-redhat.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 158255383c02d3fb81c82fb9ec6fd36fb234f68e Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Thu, 13 Apr 2017 07:22:23 -0500 -Subject: [PATCH 02/14] RH: fixup udev rules for redhat - -The multipath rules need to run after scsi_id is run. This means moving -them after 60-persistent-storage.rules for redhat. Also, we don't -currently set up all the symlinks that SuSE does. If we want them, they -should be done in the device-mapper package, since they are for all -device-mapper devices. Redhat also uses a different naming scheme for -partitions than SuSE. - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> ---- - Makefile.inc | 2 +- - kpartx/Makefile | 14 +++++++------- - multipath/Makefile | 4 ++-- - multipath/multipath.rules | 3 ++- - 4 files changed, 12 insertions(+), 11 deletions(-) - -diff --git a/Makefile.inc b/Makefile.inc -index 1815f9a..2591fa9 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -47,7 +47,7 @@ endif - - prefix = - exec_prefix = $(prefix) --bindir = $(exec_prefix)/sbin -+bindir = $(exec_prefix)/usr/sbin - libudevdir = $(prefix)/$(SYSTEMDPATH)/udev - udevrulesdir = $(libudevdir)/rules.d - multipathdir = $(TOPDIR)/libmultipath -diff --git a/kpartx/Makefile b/kpartx/Makefile -index 7b75032..bfa6fe8 100644 ---- a/kpartx/Makefile -+++ b/kpartx/Makefile -@@ -26,19 +26,19 @@ $(EXEC): $(OBJS) - install: $(EXEC) $(EXEC).8 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) -- $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) -- $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) -- $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)/rules.d -- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules -+# $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) -+# $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) -+# $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)/rules.d -+# $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) - - uninstall: - $(RM) $(DESTDIR)$(bindir)/$(EXEC) - $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz -- $(RM) $(DESTDIR)$(libudevdir)/kpartx_id -- $(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules -- $(RM) $(DESTDIR)$(libudevdir)/rules.d/67-kpartx-compat.rules -+# $(RM) $(DESTDIR)$(libudevdir)/kpartx_id -+# $(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules -+# $(RM) $(DESTDIR)$(libudevdir)/rules.d/67-kpartx-compat.rules - - clean: - $(RM) core *.o $(EXEC) *.gz -diff --git a/multipath/Makefile b/multipath/Makefile -index c85314e..1e9ee4b 100644 ---- a/multipath/Makefile -+++ b/multipath/Makefile -@@ -24,7 +24,7 @@ install: - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ - $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) - $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) -@@ -33,7 +33,7 @@ install: - uninstall: - $(RM) $(DESTDIR)$(bindir)/$(EXEC) - $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules -- $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules -+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules - $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz - $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz - -diff --git a/multipath/multipath.rules b/multipath/multipath.rules -index 616a04c..4d78b98 100644 ---- a/multipath/multipath.rules -+++ b/multipath/multipath.rules -@@ -33,6 +33,7 @@ GOTO="end_mpath" - - LABEL="check_kpartx" - -+ENV{DM_UUID}=="mpath-?*|part[0-9]*-mpath-?*", OPTIONS+="link_priority=10" - IMPORT{db}="DM_MULTIPATH_NEED_KPARTX" - ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}!="1", IMPORT{db}="DM_SUBSYSTEM_UDEV_FLAG1" - ENV{DM_SUBSYSTEM_UDEV_FLAG1}=="1", GOTO="end_mpath" -@@ -42,7 +43,7 @@ ENV{DM_ACTIVATION}=="1", ENV{DM_MULTIPATH_NEED_KPARTX}="1" - ENV{DM_SUSPENDED}=="1", GOTO="end_mpath" - ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath" - ENV{DM_ACTIVATION}!="1", ENV{DM_MULTIPATH_NEED_KPARTX}!="1", GOTO="end_mpath" --RUN+="/sbin/kpartx -un -p -part /dev/$name" -+RUN+="/sbin/kpartx -un /dev/$name" - ENV{DM_MULTIPATH_NEED_KPARTX}="" - - LABEL="end_mpath" --- -2.8.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0003-RH-Remove-the-property-blacklist-exception-builtin.patch b/meta-oe/recipes-support/multipath-tools/files/0003-RH-Remove-the-property-blacklist-exception-builtin.patch deleted file mode 100644 index 684e959d66..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0003-RH-Remove-the-property-blacklist-exception-builtin.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 69a67c2ed09ae51b53de402966a9f7a4cc737715 Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Wed, 2 Jul 2014 12:49:53 -0500 -Subject: [PATCH 03/14] RH: Remove the property blacklist exception builtin - -Multipath set the default property blacklist exceptions to -(ID_SCSI_VPD|ID_WWN). This has the effect of blacklisting some internal -devices. These devices may never have multiple paths, but it is nice -to be able to set multipath up on them all the same. This patch simply -removes the default, and makes it so that if no property -blacklist_exception is given, then devices aren't failed for not matching -it. - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> ---- - libmultipath/blacklist.c | 15 ++++++--------- - multipath/multipath.conf.5 | 4 ---- - 2 files changed, 6 insertions(+), 13 deletions(-) - -diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c -index ee396e2..19d4697 100644 ---- a/libmultipath/blacklist.c -+++ b/libmultipath/blacklist.c -@@ -181,12 +181,6 @@ setup_default_blist (struct config * conf) - if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) - return 1; - -- str = STRDUP("(SCSI_IDENT_|ID_WWN)"); -- if (!str) -- return 1; -- if (store_ble(conf->elist_property, str, ORIGIN_DEFAULT)) -- return 1; -- - vector_foreach_slot (conf->hwtable, hwe, i) { - if (hwe->bl_product) { - if (_blacklist_device(conf->blist_device, hwe->vendor, -@@ -390,9 +384,12 @@ filter_property(struct config * conf, struct udev_device * udev) - * This is the inverse of the 'normal' matching; - * the environment variable _has_ to match. - */ -- log_filter(devname, NULL, NULL, NULL, NULL, -- MATCH_PROPERTY_BLIST_MISSING); -- return MATCH_PROPERTY_BLIST_MISSING; -+ if (VECTOR_SIZE(conf->elist_property)) { -+ log_filter(devname, NULL, NULL, NULL, NULL, -+ MATCH_PROPERTY_BLIST_MISSING); -+ return MATCH_PROPERTY_BLIST_MISSING; -+ } -+ return 0; - } - - void -diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5 -index f04ff19..fbbbb27 100644 ---- a/multipath/multipath.conf.5 -+++ b/multipath/multipath.conf.5 -@@ -1014,10 +1014,6 @@ The \fIWorld Wide Identification\fR of a device. - .TP - .B property - Regular expression of the udev property to be whitelisted. --.RS --.TP --The default is: \fB(SCSI_IDENT_|ID_WWN)\fR --.RE - .TP - .B device - Subsection for the device description. This subsection recognizes the --- -2.8.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch new file mode 100644 index 0000000000..54b3bdc863 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch @@ -0,0 +1,117 @@ +From de8ee3480ec7479ed014c197a9d747403f6e0237 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Fri, 23 Nov 2018 17:25:15 +0800 +Subject: [PATCH 03/12] RH: don't start without a config file + +If /etc/multipath.conf doesn't exist, don't start multipathd and blacklist +all devices when running multipath. A completely blank configuration file +is almost never what users want. Also, people may have the multipath +packages installed but don't want to use them. This patch provides a +simple way to disable multipath. Simply removing or renaming +/etc/multipath.conf will keep multipath from doing anything. + +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +Upstream-Status: Pending + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + libmultipath/config.c | 18 ++++++++++++++++++ + libmultipath/config.h | 1 + + multipath/multipath.rules.in | 1 + + multipathd/multipathd.8.in | 2 ++ + multipathd/multipathd.service.in | 1 + + 5 files changed, 23 insertions(+) + +diff --git a/libmultipath/config.c b/libmultipath/config.c +index 83fa7369..8a3a8f37 100644 +--- a/libmultipath/config.c ++++ b/libmultipath/config.c +@@ -26,6 +26,7 @@ + #include "mpath_cmd.h" + #include "propsel.h" + #include "foreign.h" ++#include "version.h" + + /* + * We don't support re-initialization after +@@ -959,6 +960,23 @@ int _init_config (const char *file, struct config *conf) + } + factorize_hwtable(conf->hwtable, builtin_hwtable_size, file); + validate_pctable(conf->overrides, 0, file); ++ } else { ++ condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); ++ if (conf->blist_devnode == NULL) { ++ conf->blist_devnode = vector_alloc(); ++ if (!conf->blist_devnode) { ++ conf->blist_devnode = vector_alloc(); ++ if (!conf->blist_devnode) { ++ condlog(0, "cannot allocate blacklist\n"); ++ goto out; ++ } ++ } ++ if (store_ble(conf->blist_devnode, strdup(".*"), ++ ORIGIN_NO_CONFIG)) { ++ condlog(0, "cannot store default no-config blacklist\n"); ++ goto out; ++ } ++ } + } + + conf->processed_main_config = 1; +diff --git a/libmultipath/config.h b/libmultipath/config.h +index 384193ab..158cebf0 100644 +--- a/libmultipath/config.h ++++ b/libmultipath/config.h +@@ -10,6 +10,7 @@ + + #define ORIGIN_DEFAULT 0 + #define ORIGIN_CONFIG 1 ++#define ORIGIN_NO_CONFIG 2 + + enum devtypes { + DEV_NONE, +diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in +index 780bf852..2c518378 100644 +--- a/multipath/multipath.rules.in ++++ b/multipath/multipath.rules.in +@@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath" + ENV{nompath}=="?*", GOTO="end_mpath" + IMPORT{cmdline}="multipath" + ENV{multipath}=="off", GOTO="end_mpath" ++TEST!="/etc/multipath.conf", GOTO="end_mpath" + + ENV{DEVTYPE}!="partition", GOTO="test_dev" + IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH" +diff --git a/multipathd/multipathd.8.in b/multipathd/multipathd.8.in +index f1cab3ff..5ae21db1 100644 +--- a/multipathd/multipathd.8.in ++++ b/multipathd/multipathd.8.in +@@ -49,6 +49,8 @@ map regains its maximum performance and redundancy. + With the \fB-k\fR option, \fBmultipathd\fR acts as a client utility that + sends commands to a running instance of the multipathd daemon (see + \fBCOMMANDS\fR below). ++ ++In this Linux distribution, multipathd does not run unless a /etc/multipath.conf file exists. + . + . + .\" ---------------------------------------------------------------------------- +diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in +index 6d03ff71..0cd85102 100644 +--- a/multipathd/multipathd.service.in ++++ b/multipathd/multipathd.service.in +@@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target + Wants=systemd-udevd-kernel.socket @MODPROBE_UNIT@ + After=systemd-udevd-kernel.socket @MODPROBE_UNIT@ + After=multipathd.socket systemd-remount-fs.service ++ConditionPathExists=/etc/multipath.conf + Before=initrd-cleanup.service + DefaultDependencies=no + Conflicts=shutdown.target +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0004-RH-don-t-start-without-a-config-file.patch b/meta-oe/recipes-support/multipath-tools/files/0004-RH-don-t-start-without-a-config-file.patch deleted file mode 100644 index 87a6d3fb65..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0004-RH-don-t-start-without-a-config-file.patch +++ /dev/null @@ -1,108 +0,0 @@ -From b2b504fc1959c7a3f0a843c3c204e8e193b675b7 Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Wed, 15 Oct 2014 10:39:30 -0500 -Subject: [PATCH 04/14] RH: don't start without a config file - -If /etc/multipath.conf doesn't exist, don't start multipathd and blacklist -all devices when running multipath. A completely blank configuration file -is almost never what users want. Also, people may have the multipath -packages installed but don't want to use them. This patch provides a -simple way to disable multipath. Simply removing or renaming -/etc/multipath.conf will keep multipath from doing anything. - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> ---- - libmultipath/config.c | 17 +++++++++++++++++ - libmultipath/config.h | 1 + - multipath/multipath.rules | 1 + - multipathd/multipathd.8 | 2 ++ - multipathd/multipathd.service | 1 + - 5 files changed, 22 insertions(+) - -diff --git a/libmultipath/config.c b/libmultipath/config.c -index bb6619b..aae69b8 100644 ---- a/libmultipath/config.c -+++ b/libmultipath/config.c -@@ -25,6 +25,7 @@ - #include "prio.h" - #include "devmapper.h" - #include "mpath_cmd.h" -+#include "version.h" - - static int - hwe_strmatch (struct hwentry *hwe1, struct hwentry *hwe2) -@@ -667,6 +668,22 @@ load_config (char * file) - factorize_hwtable(conf->hwtable, builtin_hwtable_size); - } - -+ } else { -+ condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); -+ condlog(0, "A default multipath.conf file is located at"); -+ condlog(0, "/usr/share/doc/device-mapper-multipath-%d.%d.%d/multipath.conf", MULTIPATH_VERSION(VERSION_CODE)); -+ if (conf->blist_devnode == NULL) { -+ conf->blist_devnode = vector_alloc(); -+ if (!conf->blist_devnode) { -+ condlog(0, "cannot allocate blacklist\n"); -+ goto out; -+ } -+ } -+ if (store_ble(conf->blist_devnode, strdup(".*"), -+ ORIGIN_NO_CONFIG)) { -+ condlog(0, "cannot store default no-config blacklist\n"); -+ goto out; -+ } - } - - conf->processed_main_config = 1; -diff --git a/libmultipath/config.h b/libmultipath/config.h -index ffc69b5..614331c 100644 ---- a/libmultipath/config.h -+++ b/libmultipath/config.h -@@ -7,6 +7,7 @@ - - #define ORIGIN_DEFAULT 0 - #define ORIGIN_CONFIG 1 -+#define ORIGIN_NO_CONFIG 2 - - /* - * In kernel, fast_io_fail == 0 means immediate failure on rport delete. -diff --git a/multipath/multipath.rules b/multipath/multipath.rules -index 4d78b98..5753766 100644 ---- a/multipath/multipath.rules -+++ b/multipath/multipath.rules -@@ -6,6 +6,7 @@ IMPORT{cmdline}="nompath" - ENV{nompath}=="?*", GOTO="end_mpath" - IMPORT{cmdline}="multipath" - ENV{multipath}=="off", GOTO="end_mpath" -+TEST!="/etc/multipath.conf", GOTO="end_mpath" - - KERNEL=="dm-*", GOTO="check_kpartx" - ENV{DEVTYPE}!="partition", GOTO="test_dev" -diff --git a/multipathd/multipathd.8 b/multipathd/multipathd.8 -index 4c765af..c1499a5 100644 ---- a/multipathd/multipathd.8 -+++ b/multipathd/multipathd.8 -@@ -39,6 +39,8 @@ map regains its maximum performance and redundancy. - This daemon executes the external \fBmultipath\fR tool when events occur. - In turn, the multipath tool signals the multipathd daemon when it is done with - devmap reconfiguration, so that it can refresh its failed path list. -+ -+In this Linux distribution, multipathd does not run unless a /etc/multipath.conffile exists - . - . - .\" ---------------------------------------------------------------------------- -diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service -index fd66cf6..fafd088 100644 ---- a/multipathd/multipathd.service -+++ b/multipathd/multipathd.service -@@ -4,6 +4,7 @@ Wants=systemd-udev-trigger.service systemd-udev-settle.service - Before=iscsi.service iscsid.service lvm2-lvmetad.service lvm2-activation-early.service - Before=local-fs-pre.target blk-availability.service - After=multipathd.socket systemd-udev-trigger.service systemd-udev-settle.service -+ConditionPathExists=/etc/multipath.conf - DefaultDependencies=no - Conflicts=shutdown.target - ConditionKernelCommandLine=!nompath --- -2.8.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch new file mode 100644 index 0000000000..91477a44cb --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch @@ -0,0 +1,55 @@ +From f1b74f21875d6d9f0a5ac3d67df40a28b167052a Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 26 Nov 2018 09:19:17 +0800 +Subject: [PATCH 04/12] RH: use rpm optflags if present + +Use the passed in optflags when compiling as an RPM, and keep the +default flags as close as possible to the current fedora flags, while +still being generic. + +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +Upstream-Status: Pending + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + Makefile.inc | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/Makefile.inc b/Makefile.inc +index de89b21f..6ac632ff 100644 +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -95,7 +95,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo + MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \ + echo "modprobe@dm_multipath.service") + +-OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 ++ifndef RPM_OPT_FLAGS ++ OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 ++else ++ OPTFLAGS = $(RPM_OPT_FLAGS) ++endif ++OPTFLAGS += -Wextra -Wstrict-prototypes -Wformat=0 -Werror=implicit-int \ ++ -Werror=implicit-function-declaration -Wno-sign-compare \ ++ -Wno-unused-parameter -Werror=cast-qual \ ++ -Werror=discarded-qualifiers + WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ + -Werror=implicit-function-declaration -Werror=format-security \ + $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS) +@@ -105,7 +113,7 @@ CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \ + -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(configdir)\" \ + -DDEFAULT_CONFIGFILE=\"$(configfile)\" -DSTATE_DIR=\"$(statedir)\" \ + -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP +-CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe ++CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe + BIN_CFLAGS := -fPIE -DPIE + LIB_CFLAGS := -fPIC + SHARED_FLAGS := -shared +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch index acef41023b..c6089612b3 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch @@ -1,7 +1,7 @@ -From de44504fe7f7802cd474efd92ac15b5a8857db1f Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Thu, 16 Oct 2014 15:49:01 -0500 -Subject: [PATCH 05/14] RH: add mpathconf +From 8f52504859704466667e042baf437c2b6272ffb9 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 26 Nov 2018 09:55:12 +0800 +Subject: [PATCH 05/12] RH: add mpathconf mpathconf is a program (largely based on lvmcomf) to help users configure /etc/multipath.conf and enable or disable multipathing. It @@ -11,64 +11,69 @@ with the OS defaults, and to enable and disable multipathing via a single command. Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +Upstream-Status: Pending + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- libmultipath/config.c | 1 + - multipath/Makefile | 5 + - multipath/mpathconf | 464 ++++++++++++++++++++++++++++++++++++++++++++++++++ - multipath/mpathconf.8 | 101 +++++++++++ - 4 files changed, 571 insertions(+) + multipath/Makefile | 4 + + multipath/mpathconf | 464 ++++++++++++++++++++++++++++++++++++++++++ + multipath/mpathconf.8 | 101 +++++++++ + 4 files changed, 570 insertions(+) create mode 100644 multipath/mpathconf create mode 100644 multipath/mpathconf.8 diff --git a/libmultipath/config.c b/libmultipath/config.c -index aae69b8..c485748 100644 +index 8a3a8f37..a40b41ab 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c -@@ -672,6 +672,7 @@ load_config (char * file) +@@ -962,6 +962,7 @@ int _init_config (const char *file, struct config *conf) + validate_pctable(conf->overrides, 0, file); + } else { condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); - condlog(0, "A default multipath.conf file is located at"); - condlog(0, "/usr/share/doc/device-mapper-multipath-%d.%d.%d/multipath.conf", MULTIPATH_VERSION(VERSION_CODE)); + condlog(0, "You can run /sbin/mpathconf to create or modify /etc/multipath.conf"); if (conf->blist_devnode == NULL) { conf->blist_devnode = vector_alloc(); if (!conf->blist_devnode) { diff --git a/multipath/Makefile b/multipath/Makefile -index 1e9ee4b..3d4d459 100644 +index 2ea9e528..6b1fa09e 100644 --- a/multipath/Makefile +++ b/multipath/Makefile -@@ -18,10 +18,12 @@ $(EXEC): $(OBJS) - $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS) - $(GZIP) $(EXEC).8 > $(EXEC).8.gz - $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz -+ $(GZIP) mpathconf.8 > mpathconf.8.gz - +@@ -24,6 +24,7 @@ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ -+ $(INSTALL_PROGRAM) -m 755 mpathconf $(DESTDIR)$(bindir)/ - $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) - $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules -@@ -29,13 +31,16 @@ install: - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) -+ $(INSTALL_PROGRAM) -m 644 mpathconf.8.gz $(DESTDIR)$(man8dir) - - uninstall: - $(RM) $(DESTDIR)$(bindir)/$(EXEC) - $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules - $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules -+ $(RM) $(DESTDIR)$(bindir)/mpathconf - $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz - $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz -+ $(RM) $(DESTDIR)$(man8dir)/mpathconf.8.gz + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(Q)$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ ++ $(Q)$(INSTALL_PROGRAM) -m 755 mpathconf $(DESTDIR)$(bindir)/ + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 99-z-dm-mpath-late.rules $(DESTDIR)$(udevrulesdir) +@@ -34,6 +35,7 @@ install: + $(Q)$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)/man8 + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)/man5 + $(Q)$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(mandir)/man5 ++ $(Q)$(INSTALL_PROGRAM) -m 644 mpathconf.8 $(DESTDIR)$(mandir)/man8 + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(modulesloaddir) + ifeq ($(MODPROBE_UNIT),) + $(Q)$(INSTALL_PROGRAM) -m 644 modules-load.conf $(DESTDIR)$(modulesloaddir)/multipath.conf +@@ -51,8 +53,10 @@ uninstall: + $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf + $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf + $(Q)$(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules ++ $(Q)$(RM) $(DESTDIR)$(bindir)/mpathconf + $(Q)$(RM) $(DESTDIR)$(mandir)/man8/$(EXEC).8 + $(Q)$(RM) $(DESTDIR)$(mandir)/man5/$(EXEC).conf.5 ++ $(Q)$(RM) $(DESTDIR)$(mandir)/man8/mpathconf.8 + $(Q)$(RM) $(DESTDIR)$(tmpfilesdir)/multipath.conf - clean: - $(RM) core *.o $(EXEC) *.gz + clean: dep_clean diff --git a/multipath/mpathconf b/multipath/mpathconf new file mode 100644 -index 0000000..e839134 +index 00000000..e8391347 --- /dev/null +++ b/multipath/mpathconf @@ -0,0 +1,464 @@ @@ -538,7 +543,7 @@ index 0000000..e839134 +fi diff --git a/multipath/mpathconf.8 b/multipath/mpathconf.8 new file mode 100644 -index 0000000..4cd3267 +index 00000000..4cd32672 --- /dev/null +++ b/multipath/mpathconf.8 @@ -0,0 +1,101 @@ @@ -644,5 +649,5 @@ index 0000000..4cd3267 +.SH AUTHOR +Benjamin Marzinski <bmarzins@redhat.com> -- -2.8.1 +2.25.1 diff --git a/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch index dc291b8128..8df7de3b48 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch @@ -1,7 +1,7 @@ -From 15179c830521d8f37f9254ebc6bbf150a409f956 Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Fri, 17 Oct 2014 11:20:34 -0500 -Subject: [PATCH 06/14] RH: add wwids from kernel cmdline mpath.wwids with -A +From f93248d8e3598ccdc42b6d639107917c9cda268c Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 26 Sep 2019 16:29:48 +0800 +Subject: [PATCH 06/12] RH: add wwids from kernel cmdline mpath.wwids with -A This patch adds another option to multipath, "-A", which reads /proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds @@ -13,154 +13,83 @@ patch also execs "/sbin/multipath -A" before running multipathd in multipathd.service Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +Upstream-Status: Pending + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - libmultipath/wwids.c | 44 +++++++++++++++++++++++++++++++++++++++++++ - libmultipath/wwids.h | 1 + - multipath/main.c | 10 ++++++++-- - multipath/multipath.8 | 5 ++++- - multipathd/multipathd.service | 1 + - 5 files changed, 58 insertions(+), 3 deletions(-) + libmultipath/wwids.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ + libmultipath/wwids.h | 1 + + 2 files changed, 45 insertions(+) diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c -index bc70a27..88bb72b 100644 +index 591cd09b..b01f1b85 100644 --- a/libmultipath/wwids.c +++ b/libmultipath/wwids.c -@@ -321,3 +321,47 @@ remember_wwid(char *wwid) - condlog(4, "wwid %s already in wwids file", wwid); - return 0; +@@ -439,3 +439,47 @@ int unmark_failed_wwid(const char *wwid) + print_failed_wwid_result("unmark_failed", wwid, r); + return r; } + +int remember_cmdline_wwid(void) +{ -+ FILE *f = NULL; -+ char buf[LINE_MAX], *next, *ptr; -+ int ret = 0; ++ FILE *f = NULL; ++ char buf[LINE_MAX], *next, *ptr; ++ int ret = 0; + -+ f = fopen("/proc/cmdline", "re"); -+ if (!f) { -+ condlog(0, "can't open /proc/cmdline : %s", strerror(errno)); -+ return -1; -+ } ++ f = fopen("/proc/cmdline", "re"); ++ if (!f) { ++ condlog(0, "can't open /proc/cmdline : %s", strerror(errno)); ++ return -1; ++ } + -+ if (!fgets(buf, sizeof(buf), f)) { -+ if (ferror(f)) -+ condlog(0, "read of /proc/cmdline failed : %s", -+ strerror(errno)); -+ else -+ condlog(0, "couldn't read /proc/cmdline"); -+ fclose(f); -+ return -1; -+ } -+ fclose(f); -+ next = buf; -+ while((ptr = strstr(next, "mpath.wwid="))) { -+ ptr += 11; -+ next = strpbrk(ptr, " \t\n"); -+ if (next) { -+ *next = '\0'; -+ next++; -+ } -+ if (strlen(ptr)) { -+ if (remember_wwid(ptr) != 0) -+ ret = -1; -+ } -+ else { -+ condlog(0, "empty mpath.wwid kernel command line option"); -+ ret = -1; -+ } -+ if (!next) -+ break; -+ } -+ return ret; ++ if (!fgets(buf, sizeof(buf), f)) { ++ if (ferror(f)) ++ condlog(0, "read of /proc/cmdline failed : %s", ++ strerror(errno)); ++ else ++ condlog(0, "couldn't read /proc/cmdline"); ++ fclose(f); ++ return -1; ++ } ++ fclose(f); ++ next = buf; ++ while((ptr = strstr(next, "mpath.wwid="))) { ++ ptr += 11; ++ next = strpbrk(ptr, " \t\n"); ++ if (next) { ++ *next = '\0'; ++ next++; ++ } ++ if (strlen(ptr)) { ++ if (remember_wwid(ptr) != 0) ++ ret = -1; ++ } ++ else { ++ condlog(0, "empty mpath.wwid kernel command line option"); ++ ret = -1; ++ } ++ if (!next) ++ break; ++ } ++ return ret; +} diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h -index 9527012..b665232 100644 +index 0c6ee54d..e32a0b0e 100644 --- a/libmultipath/wwids.h +++ b/libmultipath/wwids.h -@@ -17,5 +17,6 @@ int remember_wwid(char *wwid); +@@ -17,6 +17,7 @@ int remember_wwid(char *wwid); int check_wwids_file(char *wwid, int write_wwid); int remove_wwid(char *wwid); int replace_wwids(vector mp); +int remember_cmdline_wwid(void); - #endif /* _WWIDS_H */ -diff --git a/multipath/main.c b/multipath/main.c -index 4174d43..72585b0 100644 ---- a/multipath/main.c -+++ b/multipath/main.c -@@ -102,7 +102,7 @@ usage (char * progname) - { - fprintf (stderr, VERSION_STRING); - fprintf (stderr, "Usage:\n"); -- fprintf (stderr, " %s [-a|-c|-w|-W] [-d] [-r] [-i] [-v lvl] [-p pol] [-b fil] [-q] [dev]\n", progname); -+ fprintf (stderr, " %s [-a|-A|-c|-w|-W] [-d] [-r] [-i] [-v lvl] [-p pol] [-b fil] [-q] [dev]\n", progname); - fprintf (stderr, " %s -l|-ll|-f [-v lvl] [-b fil] [-R num] [dev]\n", progname); - fprintf (stderr, " %s -F [-v lvl] [-R num]\n", progname); - fprintf (stderr, " %s -t\n", progname); -@@ -116,6 +116,8 @@ usage (char * progname) - " -f flush a multipath device map\n" - " -F flush all multipath device maps\n" - " -a add a device wwid to the wwids file\n" -+ " -A add devices from kernel command line mpath.wwids\n" -+ " parameters to wwids file\n" - " -c check if a device should be a path in a multipath device\n" - " -q allow queue_if_no_path when multipathd is not running\n" - " -d dry run, do not create or update devmaps\n" -@@ -522,7 +524,7 @@ main (int argc, char *argv[]) - exit(1); - multipath_conf = conf; - conf->retrigger_tries = 0; -- while ((arg = getopt(argc, argv, ":adchl::FfM:v:p:b:BrR:itquwW")) != EOF ) { -+ while ((arg = getopt(argc, argv, ":aAdchl::FfM:v:p:b:BrR:itquwW")) != EOF ) { - switch(arg) { - case 1: printf("optarg : %s\n",optarg); - break; -@@ -586,6 +588,10 @@ main (int argc, char *argv[]) - case 't': - r = dump_config(conf); - goto out_free_config; -+ case 'A': -+ if (remember_cmdline_wwid() != 0) -+ exit(1); -+ exit(0); - case 'h': - usage(argv[0]); - exit(0); -diff --git a/multipath/multipath.8 b/multipath/multipath.8 -index b9436e5..b9ad6b1 100644 ---- a/multipath/multipath.8 -+++ b/multipath/multipath.8 -@@ -25,7 +25,7 @@ multipath \- Device mapper target autoconfig. - .RB [\| \-b\ \c - .IR bindings_file \|] - .RB [\| \-d \|] --.RB [\| \-h | \-l | \-ll | \-f | \-t | \-F | \-B | \-c | \-q | \|-r | \|-i | \-a | \|-u | \-w | \-W \|] -+.RB [\| \-h | \-l | \-ll | \-f | \-t | \-F | \-B | \-c | \-q | \|-r | \|-i | \-a | \-A | \-u | \-w | \-W \|] - .RB [\| \-p\ \c - .IR failover | multibus | group_by_serial | group_by_prio | group_by_node_name \|] - .RB [\| \-R\ \c -@@ -122,6 +122,9 @@ Add the WWID for the specified device to the WWIDs file. - Check if the device specified in the program environment should be - a path in a multipath device. - . -+.B \-A -+add wwids from any kernel command line mpath.wwid parameters to the wwids file -+. - .TP - .B \-w - Remove the WWID for the specified device from the WWIDs file. -diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service -index fafd088..a623a3f 100644 ---- a/multipathd/multipathd.service -+++ b/multipathd/multipathd.service -@@ -15,6 +15,7 @@ Type=notify - NotifyAccess=main - LimitCORE=infinity - ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath -+ExecStartPre=-/sbin/multipath -A - ExecStart=/sbin/multipathd -d -s - ExecReload=/sbin/multipathd reconfigure - + enum { + WWID_IS_NOT_FAILED = 0, -- -2.8.1 +2.25.1 diff --git a/meta-oe/recipes-support/multipath-tools/files/0007-RH-trigger-change-uevent-on-new-device-creation.patch b/meta-oe/recipes-support/multipath-tools/files/0007-RH-trigger-change-uevent-on-new-device-creation.patch deleted file mode 100644 index 025a3512e3..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0007-RH-trigger-change-uevent-on-new-device-creation.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 0d2c9afbd89d79fd700f9c99aa20e5f7c7382027 Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Mon, 24 Apr 2017 09:39:57 -0500 -Subject: [PATCH 07/14] RH: trigger change uevent on new device creation - -When multipath first sees a path device with user_friendly names -enabled, it can't know if the device should be multipathed. This means -that it will not claim the device in udev. If the device is eventually -multipathed, multipath should trigger a change uevent to update the udev -database to claim the device. - -This also reverts commit 64e27ec066a001012f44550f095c93443e91d845. - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> ---- - libmultipath/configure.c | 26 ++++++++++++++++++++++++-- - libmultipath/configure.h | 1 + - libmultipath/wwids.c | 4 ++-- - multipath/main.c | 2 +- - multipathd/main.c | 7 ++----- - 5 files changed, 30 insertions(+), 10 deletions(-) - -diff --git a/libmultipath/configure.c b/libmultipath/configure.c -index bd090d9..843dd09 100644 ---- a/libmultipath/configure.c -+++ b/libmultipath/configure.c -@@ -422,6 +422,28 @@ trigger_udev_change(const struct multipath *mpp) - udev_device_unref(udd); - } - -+void -+trigger_paths_udev_change(const struct multipath *mpp) -+{ -+ struct pathgroup * pgp; -+ struct path * pp; -+ int i, j; -+ -+ if (!mpp || !mpp->pg) -+ return; -+ -+ vector_foreach_slot (mpp->pg, pgp, i) { -+ if (!pgp->paths) -+ continue; -+ vector_foreach_slot(pgp->paths, pp, j) { -+ if (!pp->udev) -+ continue; -+ sysfs_attr_set_value(pp->udev, "uevent", "change", -+ strlen("change")); -+ } -+ } -+} -+ - static int - is_mpp_known_to_udev(const struct multipath *mpp) - { -@@ -802,8 +824,8 @@ int domap(struct multipath *mpp, char *params, int is_daemon) - * succeeded - */ - mpp->force_udev_reload = 0; -- if (mpp->action == ACT_CREATE) -- remember_wwid(mpp->wwid); -+ if (mpp->action == ACT_CREATE && remember_wwid(mpp->wwid) == 1) -+ trigger_paths_udev_change(mpp); - if (!is_daemon) { - /* multipath client mode */ - dm_switchgroup(mpp->alias, mpp->bestpg); -diff --git a/libmultipath/configure.h b/libmultipath/configure.h -index fd7f581..253e29b 100644 ---- a/libmultipath/configure.h -+++ b/libmultipath/configure.h -@@ -36,3 +36,4 @@ int get_refwwid (enum mpath_cmds cmd, char * dev, enum devtypes dev_type, - vector pathvec, char **wwid); - int reload_map(struct vectors *vecs, struct multipath *mpp, int refresh, int is_daemon); - int sysfs_get_host_adapter_name(struct path *pp, char *adapter_name); -+void trigger_paths_udev_change(const struct multipath *mpp); -diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c -index 88bb72b..249c6c1 100644 ---- a/libmultipath/wwids.c -+++ b/libmultipath/wwids.c -@@ -319,7 +319,7 @@ remember_wwid(char *wwid) - condlog(3, "wrote wwid %s to wwids file", wwid); - else - condlog(4, "wwid %s already in wwids file", wwid); -- return 0; -+ return ret; - } - - int remember_cmdline_wwid(void) -@@ -353,7 +353,7 @@ int remember_cmdline_wwid(void) - next++; - } - if (strlen(ptr)) { -- if (remember_wwid(ptr) != 0) -+ if (remember_wwid(ptr) < 0) - ret = -1; - } - else { -diff --git a/multipath/main.c b/multipath/main.c -index 72585b0..2eda6a3 100644 ---- a/multipath/main.c -+++ b/multipath/main.c -@@ -336,7 +336,7 @@ configure (struct config *conf, enum mpath_cmds cmd, - } - if (cmd == CMD_ADD_WWID) { - r = remember_wwid(refwwid); -- if (r == 0) -+ if (r >= 0) - printf("wwid '%s' added\n", refwwid); - else - printf("failed adding '%s' to wwids file\n", -diff --git a/multipathd/main.c b/multipathd/main.c -index 81c76ca..874bcce 100644 ---- a/multipathd/main.c -+++ b/multipathd/main.c -@@ -2093,7 +2093,8 @@ configure (struct vectors * vecs, int start_waiters) - - sync_maps_state(mpvec); - vector_foreach_slot(mpvec, mpp, i){ -- remember_wwid(mpp->wwid); -+ if (remember_wwid(mpp->wwid) == 1) -+ trigger_paths_udev_change(mpp); - update_map_pr(mpp); - } - -@@ -2175,10 +2176,6 @@ reconfigure (struct vectors * vecs) - conf->verbosity = verbosity; - if (bindings_read_only) - conf->bindings_read_only = bindings_read_only; -- if (conf->find_multipaths) { -- condlog(2, "find_multipaths is set: -n is implied"); -- ignore_new_devs = 1; -- } - if (ignore_new_devs) - conf->ignore_new_devs = ignore_new_devs; - uxsock_timeout = conf->uxsock_timeout; --- -2.8.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch new file mode 100644 index 0000000000..c64b8aeabc --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch @@ -0,0 +1,105 @@ +From 49d0b0279f54ceb96878e8e72e828efbb84a534c Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Fri, 1 Mar 2024 11:45:10 +0800 +Subject: [PATCH 07/12] RH: warn on invalid regex instead of failing + +multipath.conf used to allow "*" as a match everything regular expression, +instead of requiring ".*". Instead of erroring when the old style +regular expressions are used, it should print a warning and convert +them. + +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +Upstream-Status: Pending + +[OP: Rebase to 0.9.3] +[OP: adjusted FREE() -> free(), made set_regex_value() static] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + libmultipath/dict.c | 40 ++++++++++++++++++++++++++++++++++------ + 1 file changed, 34 insertions(+), 6 deletions(-) + +diff --git a/libmultipath/dict.c b/libmultipath/dict.c +index 5af036b7..e494419d 100644 +--- a/libmultipath/dict.c ++++ b/libmultipath/dict.c +@@ -189,6 +189,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr) + return 0; + } + ++static void * ++set_regex_value(vector strvec) ++{ ++ char *buff = set_value(strvec); ++ ++ if (buff && strcmp("*", buff) == 0) { ++ condlog(0, "Invalid regular expression \"*\" in multipath.conf. Using \".*\""); ++ free(buff); ++ return strdup(".*"); ++ } ++ return buff; ++} ++ ++static int ++set_regex(vector strvec, void *ptr, const char *file, int line_nr) ++{ ++ char **str_ptr = (char **)ptr; ++ ++ if (*str_ptr) ++ free(*str_ptr); ++ *str_ptr = set_regex_value(strvec); ++ ++ if (!*str_ptr) ++ return 1; ++ ++ return 0; ++} ++ + static int + set_yes_no(vector strvec, void *ptr, const char *file, int line_nr) + { +@@ -1798,7 +1826,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec, \ + if (!conf->option) \ + return 1; \ + \ +- buff = set_value(strvec); \ ++ buff = set_regex_value(strvec); \ + if (!buff) \ + return 1; \ + \ +@@ -1818,7 +1846,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \ + if (!conf->option) \ + return 1; \ + \ +- buff = set_value(strvec); \ ++ buff = set_regex_value(strvec); \ + if (!buff) \ + return 1; \ + \ +@@ -1924,16 +1952,16 @@ device_handler(struct config *conf, vector strvec, const char *file, + return 0; + } + +-declare_hw_handler(vendor, set_str) ++declare_hw_handler(vendor, set_regex) + declare_hw_snprint(vendor, print_str) + +-declare_hw_handler(product, set_str) ++declare_hw_handler(product, set_regex) + declare_hw_snprint(product, print_str) + +-declare_hw_handler(revision, set_str) ++declare_hw_handler(revision, set_regex) + declare_hw_snprint(revision, print_str) + +-declare_hw_handler(bl_product, set_str) ++declare_hw_handler(bl_product, set_regex) + declare_hw_snprint(bl_product, print_str) + + declare_hw_arg_str_handler(hwhandler, 0) +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch new file mode 100644 index 0000000000..1fa1f3be27 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch @@ -0,0 +1,34 @@ +From fcba3e0d4c8448a2510025acb255c7335413bf56 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 26 Nov 2018 11:12:01 +0800 +Subject: [PATCH 08/12] RH: reset default find_mutipaths value to off + +Upstream has changed to default find_multipaths to "strict". For now +Redhat will retain the previous default of "off". + +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +Upstream-Status: Pending + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + libmultipath/defaults.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h +index 64b633f2..a06a8a41 100644 +--- a/libmultipath/defaults.h ++++ b/libmultipath/defaults.h +@@ -23,7 +23,7 @@ + #define DEFAULT_NO_PATH_RETRY NO_PATH_RETRY_UNDEF + #define DEFAULT_VERBOSITY 2 + #define DEFAULT_REASSIGN_MAPS 0 +-#define DEFAULT_FIND_MULTIPATHS FIND_MULTIPATHS_STRICT ++#define DEFAULT_FIND_MULTIPATHS FIND_MULTIPATHS_OFF + #define DEFAULT_FAST_IO_FAIL 5 + #define DEFAULT_DEV_LOSS_TMO 600 + #define DEFAULT_RETAIN_HWHANDLER RETAIN_HWHANDLER_ON +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0008-libmultipath-change-how-RADOS-checker-is-enabled.patch b/meta-oe/recipes-support/multipath-tools/files/0008-libmultipath-change-how-RADOS-checker-is-enabled.patch deleted file mode 100644 index f678809931..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0008-libmultipath-change-how-RADOS-checker-is-enabled.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0be174dbedd861d7694b0c7799fe26be31eb32b0 Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Fri, 26 May 2017 17:52:57 -0500 -Subject: [PATCH 08/14] libmultipath: change how RADOS checker is enabled - -Instead of making the user call "make", "make install" and "make clean" -with ENABLE_RADOS set correctly, have the makefile check if -/usr/include/rados/librados.h exists, just like it checks if specific -functions exist in a file. - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> ---- - Makefile.inc | 13 +++++++++++++ - libmultipath/checkers/Makefile | 3 ++- - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/Makefile.inc b/Makefile.inc -index 2591fa9..e084fd1 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -109,5 +109,18 @@ check_func = \ - echo "$$found" \ - ) - -+# Checker whether a file with name $1 exists -+check_file = $(shell \ -+ if [ -f "$1" ]; then \ -+ found=1; \ -+ status="yes"; \ -+ else \ -+ found=0; \ -+ status="no"; \ -+ fi; \ -+ echo 1>&2 "Checking if $1 exists ... $$status"; \ -+ echo "$$found" \ -+ ) -+ - %.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< -diff --git a/libmultipath/checkers/Makefile b/libmultipath/checkers/Makefile -index 732ca9d..bce6b8b 100644 ---- a/libmultipath/checkers/Makefile -+++ b/libmultipath/checkers/Makefile -@@ -14,7 +14,8 @@ LIBS= \ - libcheckemc_clariion.so \ - libcheckhp_sw.so \ - libcheckrdac.so --ifneq ($(ENABLE_RADOS),0) -+ -+ifneq ($(call check_file,/usr/include/rados/librados.h),0) - LIBS += libcheckrbd.so - endif - --- -2.8.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-set-verbosity-to-default-during-config.patch b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-set-verbosity-to-default-during-config.patch deleted file mode 100644 index 17d2d91796..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-set-verbosity-to-default-during-config.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 526e539628e051128abf46a60ec22e18c9b5d84f Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Wed, 31 May 2017 15:03:02 -0500 -Subject: [PATCH 09/14] multipath: set verbosity to default during config - -condlog was setting the verbosity to 0 if there was no configuration. -This keeps multipath from printing warning messages about config file -problems that are found while loading the configuration. Instead, it -should use the default config level until it loads the configuration -to find the current value. - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> ---- - libmultipath/debug.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libmultipath/debug.c b/libmultipath/debug.c -index fbe171a..f89b264 100644 ---- a/libmultipath/debug.c -+++ b/libmultipath/debug.c -@@ -11,6 +11,7 @@ - #include "../third-party/valgrind/drd.h" - #include "vector.h" - #include "config.h" -+#include "defaults.h" - - void dlog (int sink, int prio, const char * fmt, ...) - { -@@ -21,7 +22,7 @@ void dlog (int sink, int prio, const char * fmt, ...) - va_start(ap, fmt); - conf = get_multipath_config(); - ANNOTATE_IGNORE_READS_BEGIN(); -- thres = (conf) ? conf->verbosity : 0; -+ thres = (conf) ? conf->verbosity : DEFAULT_VERBOSITY; - ANNOTATE_IGNORE_READS_END(); - put_multipath_config(conf); - --- -2.8.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch new file mode 100644 index 0000000000..041b79a9af --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch @@ -0,0 +1,40 @@ +From 7452549e572b1c40aefe25524bf4bbbf34c952e5 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 4 Jun 2019 11:39:39 +0800 +Subject: [PATCH 09/12] multipath-tools: modify create-config.mk for + cross-compilation + +Do not look for systemd info on the host, and allow us to pass in CFLAGS +using the OPTFLAGS variable. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + create-config.mk | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/create-config.mk b/create-config.mk +index 4d318b96..a65975ba 100644 +--- a/create-config.mk ++++ b/create-config.mk +@@ -127,10 +127,6 @@ ifeq ($(ENABLE_DMEVENTS_POLL),0) + DEFINES += -DNO_DMEVENTS_POLL + endif + +-SYSTEMD := $(strip $(or $(shell $(PKG_CONFIG) --modversion libsystemd 2>/dev/null | awk '{print $$1}'), \ +- $(shell systemctl --version 2>/dev/null | sed -n 's/systemd \([0-9]*\).*/\1/p'))) +- +- + # $(call TEST_CC_OPTION,option,fallback) + # Test if the C compiler supports the option. + # Evaluates to "option" if yes, and "fallback" otherwise. +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch b/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch new file mode 100644 index 0000000000..b48720b8a1 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch @@ -0,0 +1,72 @@ +From 5d2fa3c5975266a6c02214afa6254e6eeeb1baad Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 26 Nov 2018 11:17:41 +0800 +Subject: [PATCH 10/12] Subject: [PATCH] Always use devmapper + +Do not try to compute several _API_ make variables +from host information when cross-compiling. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Aws Ismail <aws.ismail@windriver.com> +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + create-config.mk | 36 ++++++++---------------------------- + 1 file changed, 8 insertions(+), 28 deletions(-) + +diff --git a/create-config.mk b/create-config.mk +index a65975ba..8ba592f4 100644 +--- a/create-config.mk ++++ b/create-config.mk +@@ -79,34 +79,14 @@ URCU_VERSION = $(shell \ + + DEFINES := + +-ifneq ($(call check_func,dm_task_no_flush,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_FLUSH +-endif +- +-ifneq ($(call check_func,dm_task_get_errno,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_GET_ERRNO +-endif +- +-ifneq ($(call check_func,dm_task_set_cookie,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_COOKIE +-endif +- +-ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,$(libudev_incdir)/libudev.h),0) +- DEFINES += LIBUDEV_API_RECVBUF +-endif +- +-ifneq ($(call check_func,dm_task_deferred_remove,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_DEFERRED +-endif +- +-ifneq ($(call check_func,dm_hold_control_dev,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_HOLD_CONTROL +-endif +- +-ifneq ($(call check_var,ELS_DTAG_LNK_INTEGRITY,$(kernel_incdir)/scsi/fc/fc_els.h),0) +- DEFINES += FPIN_EVENT_HANDLER +- FPIN_SUPPORT = 1 +-endif ++DEFINES += LIBDM_API_FLUSH ++DEFINES += LIBDM_API_GET_ERRNO ++DEFINES += LIBDM_API_COOKIE ++DEFINES += LIBUDEV_API_RECVBUF ++DEFINES += LIBDM_API_DEFERRED ++DEFINES += LIBDM_API_HOLD_CONTROL ++DEFINES += FPIN_EVENT_HANDLER ++FPIN_SUPPORT = 1 + + libmount_h := $(shell $(PKG_CONFIG) --variable=includedir mount)/libmount/libmount.h + ifneq ($(call check_func,mnt_unref_cache,$(libmount_h)),0) +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0010-mpath-skip-device-configs-without-vendor-product.patch b/meta-oe/recipes-support/multipath-tools/files/0010-mpath-skip-device-configs-without-vendor-product.patch deleted file mode 100644 index 396b6d32e3..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0010-mpath-skip-device-configs-without-vendor-product.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f88d60a93e98d86ae294f2317a122c4efde276f0 Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Wed, 31 May 2017 17:58:59 -0500 -Subject: [PATCH 10/14] mpath: skip device configs without vendor/product - -Right now if multipath.conf includes a device configuration without a -vendor or product string, it will automatically be applied to all -devices, skipping all other configs entirely. This is clearly wrong. -This patch makes sure that user added configs include vendor and -product strings - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> ---- - libmultipath/config.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/libmultipath/config.c b/libmultipath/config.c -index c485748..bdde113 100644 ---- a/libmultipath/config.c -+++ b/libmultipath/config.c -@@ -452,6 +452,13 @@ restart: - break; - j = n; - vector_foreach_slot_after(hw, hwe2, j) { -+ /* drop invalid device configs */ -+ if (!hwe2->vendor || !hwe2->product) { -+ condlog(0, "device config missing vendor or product parameter"); -+ vector_del_slot(hw, j--); -+ free_hwe(hwe2); -+ continue; -+ } - if (hwe_regmatch(hwe1, hwe2)) - continue; - /* dup */ --- -2.8.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch new file mode 100644 index 0000000000..abaea2cfb6 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch @@ -0,0 +1,43 @@ +From 949070286692dfff89213792571da233fe82e440 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Sun, 10 May 2020 21:22:53 +0800 +Subject: [PATCH 11/12] fix bug of do_compile and do_install + +when multiple processes make run in parallel, +because of dependency error will occur. + +Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> + +[OP: Rebase to 0.9.3] +[OP: Drop dependencies that are already present in the 0.9.3 Makefile] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Upstream-Status: Pending +--- + Makefile | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/Makefile b/Makefile +index 4df5f161..065249c2 100644 +--- a/Makefile ++++ b/Makefile +@@ -91,6 +91,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath + libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath + mpathpersist multipathd: libmpathpersist + ++DEPS_ON_MULTIPATH := \ ++ multipath \ ++ multipathd \ ++ mpathpersist \ ++ libmpathpersist ++ ++$(DEPS_ON_MULTIPATH:=.install): libmultipath.install ++mpathpersist.install: libmpathpersist.install ++libdmmp.install libmultipath/foreign.install: mpathpersist.install ++ + libmultipath/checkers.install \ + libmultipath/prioritizers.install \ + libmultipath/foreign.install: libmultipath.install +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0011-multipathd-fix-show-maps-json-crash.patch b/meta-oe/recipes-support/multipath-tools/files/0011-multipathd-fix-show-maps-json-crash.patch deleted file mode 100644 index 12d6d38a78..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0011-multipathd-fix-show-maps-json-crash.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bc3ceda747104afdc24386df5dc45ca86f6c2936 Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Thu, 1 Jun 2017 17:52:28 -0500 -Subject: [PATCH 11/14] multipathd: fix "show maps json" crash - -If there are no multipath devices, show_maps_json sets the maximum size -of the reply buffer to 0. Having a size of 0 causes the calls to calloc -and realloc to behave in ways that the code isn't designed to handle, -leading to a double-free crash. Instead, show_maps_json should just -use the INITIAL_REPLY_LEN if there are no multipath devices. - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> ---- - multipathd/cli_handlers.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c -index 04c7386..7b0d00c 100644 ---- a/multipathd/cli_handlers.c -+++ b/multipathd/cli_handlers.c -@@ -162,10 +162,12 @@ show_maps_json (char ** r, int * len, struct vectors * vecs) - struct multipath * mpp; - char * c; - char * reply; -- unsigned int maxlen = INITIAL_REPLY_LEN * -- PRINT_JSON_MULTIPLIER * VECTOR_SIZE(vecs->mpvec); -+ unsigned int maxlen = INITIAL_REPLY_LEN; - int again = 1; - -+ if (VECTOR_SIZE(vecs->mpvec) > 0) -+ maxlen *= PRINT_JSON_MULTIPLIER * VECTOR_SIZE(vecs->mpvec); -+ - vector_foreach_slot(vecs->mpvec, mpp, i) { - if (update_multipath(vecs, mpp->alias, 0)) { - return 1; --- -2.8.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch new file mode 100644 index 0000000000..2f774940d6 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch @@ -0,0 +1,40 @@ +From 7a46f43682641436464579d8bf76c382e71ea557 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Mon, 25 May 2020 23:22:55 -0700 +Subject: [PATCH 12/12] add explicit dependency on libraries + +[snip] +gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist +collect2: error: ld returned 1 exit status +Makefile:36: recipe for target 'multipathd' failed +make[1]: *** [multipathd] Error 1 +make[1]: Leaving directory 'git/multipathd' +Makefile:29: recipe for target 'multipathd' failed +make: *** [multipathd] Error 2 +ln -sf libmpathpersist.so.0 libmpathpersist.so +[snip] + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 065249c2..0444c2ea 100644 +--- a/Makefile ++++ b/Makefile +@@ -90,6 +90,7 @@ libmultipath: libmpathutil + libmpathpersist libmpathvalid multipath multipathd: libmultipath + libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath + mpathpersist multipathd: libmpathpersist ++libmultipath mpathpersist multipath multipathd: libmpathcmd + + DEPS_ON_MULTIPATH := \ + multipath \ +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0012-multipath-tools-modify-Makefile.inc-for-cross-compil.patch b/meta-oe/recipes-support/multipath-tools/files/0012-multipath-tools-modify-Makefile.inc-for-cross-compil.patch deleted file mode 100644 index 5ccd4aed8b..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0012-multipath-tools-modify-Makefile.inc-for-cross-compil.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 6864ba28dec61609662ce5dc8bc7ed1925abb546 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 5 Jul 2017 02:56:13 -0400 -Subject: [PATCH 12/14] multipath-tools: modify Makefile.inc for - cross-compilation - -Do not look for systemd info on the host, and allow us to pass in CFLAGS -using the OPTFLAGS variable. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - -Update for version 0.5.0-144-g770e6d0 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -Update for version 0.7.1 - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.inc | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/Makefile.inc b/Makefile.inc -index e084fd1..c7f45fa 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -35,12 +35,6 @@ ifndef RUN - endif - endif - --ifndef SYSTEMD -- ifeq ($(shell systemctl --version > /dev/null 2>&1 && echo 1), 1) -- SYSTEMD = $(shell systemctl --version 2> /dev/null | sed -n 's/systemd \([0-9]*\)/\1/p') -- endif --endif -- - ifndef SYSTEMDPATH - SYSTEMDPATH=usr/lib - endif -@@ -82,11 +76,13 @@ TEST_CC_OPTION = $(shell \ - - STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) - -+ifndef OPTFLAGS - OPTFLAGS = -O2 -g -pipe -Wall -Wextra -Wformat=2 -Werror=implicit-int \ - -Werror=implicit-function-declaration -Werror=format-security \ - -Wno-sign-compare -Wno-unused-parameter -Wno-clobbered \ - -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \ - --param=ssp-buffer-size=4 -+endif - - CFLAGS = $(OPTFLAGS) -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" - BIN_CFLAGS = -fPIE -DPIE --- -2.8.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0013-Always-use-devmapper.patch b/meta-oe/recipes-support/multipath-tools/files/0013-Always-use-devmapper.patch deleted file mode 100644 index 52240f6439..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0013-Always-use-devmapper.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1498338970a093fccbda3e33f5588a289ef2c66a Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 5 Jul 2017 02:59:46 -0400 -Subject: [PATCH 13/14] Always use devmapper - -Do not try to compute several _API_ make variables -from host information when cross-compiling. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Aws Ismail <aws.ismail@windriver.com> -Signed-off-by: Joe Slater <joe.slater@windriver.com> - -Rebase to 0.7.1 - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - libmultipath/Makefile | 19 ++++--------------- - 1 file changed, 4 insertions(+), 15 deletions(-) - -diff --git a/libmultipath/Makefile b/libmultipath/Makefile -index b3244fc..9006b3f 100644 ---- a/libmultipath/Makefile -+++ b/libmultipath/Makefile -@@ -20,21 +20,10 @@ ifdef SYSTEMD - endif - endif - --ifneq ($(call check_func,dm_task_no_flush,/usr/include/libdevmapper.h),0) -- CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE --endif -- --ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) -- CFLAGS += -DLIBDM_API_COOKIE --endif -- --ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,/usr/include/libudev.h),0) -- CFLAGS += -DLIBUDEV_API_RECVBUF --endif -- --ifneq ($(call check_func,dm_task_deferred_remove,/usr/include/libdevmapper.h),0) -- CFLAGS += -DLIBDM_API_DEFERRED --endif -+CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE -+CFLAGS += -DLIBDM_API_COOKIE -+CFLAGS += -DLIBUDEV_API_RECVBUF -+CFLAGS += -DLIBDM_API_DEFERRED - - OBJS = memory.o parser.o vector.o devmapper.o callout.o \ - hwtable.o blacklist.o util.o dmparser.o config.o \ --- -2.8.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0014-Always-use-devmapper-for-kpartx.patch b/meta-oe/recipes-support/multipath-tools/files/0014-Always-use-devmapper-for-kpartx.patch deleted file mode 100644 index f951213c18..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0014-Always-use-devmapper-for-kpartx.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7f5869cd32a7b3f717d9544b35562d9d01ca6510 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 5 Jul 2017 03:03:16 -0400 -Subject: [PATCH 14/14] Always use devmapper for kpartx - -Do not try to compute the LIBDM_API_COOKIE make variable -from host information when cross-compiling. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Aws Ismail <aws.ismail@windriver.com> -Signed-off-by: Joe Slater <joe.slater@windriver.com> - -Rebase to 0.7.1 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - kpartx/Makefile | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/kpartx/Makefile b/kpartx/Makefile -index bfa6fe8..be87124 100644 ---- a/kpartx/Makefile -+++ b/kpartx/Makefile -@@ -8,9 +8,7 @@ LDFLAGS += $(BIN_LDFLAGS) - - LIBDEPS += -ldevmapper - --ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) -- CFLAGS += -DLIBDM_API_COOKIE --endif -+CFLAGS += -DLIBDM_API_COOKIE - - OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ - gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o --- -2.8.1 - diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.7.1.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb index 6ec5dffcc0..374cda3b4e 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.7.1.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb @@ -19,6 +19,7 @@ and deletion" HOMEPAGE = "http://christophe.varoqui.free.fr/" DEPENDS = "libdevmapper \ + lvm2 \ libaio \ liburcu \ readline \ @@ -26,36 +27,36 @@ DEPENDS = "libdevmapper \ json-c \ " -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" -SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ +SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=master \ file://multipathd.oe \ file://multipath.conf.example \ - file://0001-multipath-attempt-at-common-multipath.rules.patch \ - file://0002-RH-fixup-udev-rules-for-redhat.patch \ - file://0003-RH-Remove-the-property-blacklist-exception-builtin.patch \ - file://0004-RH-don-t-start-without-a-config-file.patch \ + file://0001-RH-fixup-udev-rules-for-redhat.patch \ + file://0002-RH-Remove-the-property-blacklist-exception-builtin.patch \ + file://0003-RH-don-t-start-without-a-config-file.patch \ + file://0004-RH-use-rpm-optflags-if-present.patch \ file://0005-RH-add-mpathconf.patch \ file://0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch \ - file://0007-RH-trigger-change-uevent-on-new-device-creation.patch \ - file://0008-libmultipath-change-how-RADOS-checker-is-enabled.patch \ - file://0009-multipath-set-verbosity-to-default-during-config.patch \ - file://0010-mpath-skip-device-configs-without-vendor-product.patch \ - file://0011-multipathd-fix-show-maps-json-crash.patch \ - file://0012-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \ - file://0013-Always-use-devmapper.patch \ - file://0014-Always-use-devmapper-for-kpartx.patch \ - file://0001-kpartx-include-limits.h-for-PATH_MAX.patch \ + file://0007-RH-warn-on-invalid-regex-instead-of-failing.patch \ + file://0008-RH-reset-default-find_mutipaths-value-to-off.patch \ + file://0009-multipath-tools-modify-create-config.mk-for-cross-co.patch \ + file://0010-Subject-PATCH-Always-use-devmapper.patch \ + file://0011-fix-bug-of-do_compile-and-do_install.patch \ + file://0012-add-explicit-dependency-on-libraries.patch \ + file://0001-libmultipath-always-use-glibc-basename.patch \ " + LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" -SRCREV = "f21166a812a2cfb50ecf9550d32947c83103f83a" +SRCREV = "3daacfdfd110b24a3a7d5a276dcf8512b7039199" S = "${WORKDIR}/git" inherit systemd pkgconfig -SYSTEMD_SERVICE_${PN} = "multipathd.service" +SYSTEMD_SERVICE:${PN} = "multipathd.service" +SYSTEMD_AUTO_ENABLE = "disable" TARGET_CC_ARCH += "${LDFLAGS}" @@ -64,16 +65,22 @@ TARGET_CC_ARCH += "${LDFLAGS}" # that only works on ARM when thumb is disabled. Otherwise one gets: # Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#3' # ../Makefile.inc:66: recipe for target 'debug.o' failed -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" # The exact version of SYSTEMD does not matter but should be greater than 209. # EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \ OPTFLAGS="${CFLAGS}" \ + prefix=${prefix} \ bindir=${base_sbindir} \ LIB=${base_libdir} libdir=${base_libdir}/multipath \ + usrlibdir=${libdir} \ + plugindir=${base_libdir}/multipath \ unitdir=${systemd_system_unitdir} \ + libudevdir=${nonarch_base_libdir}/udev \ + modulesloaddir=${sysconfdir}/modules-load.d \ + tmpfilesdir=${sysconfdir}/tmpfiles.d \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \ ' @@ -84,30 +91,35 @@ do_install() { # if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)};then install -d ${D}${sysconfdir}/init.d - cp ${WORKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd + cp ${UNPACKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd fi + sed -i "s:/usr/lib/udev/kpartx_id:${nonarch_base_libdir}/udev/kpartx_id:g" \ + ${D}${nonarch_base_libdir}/udev/rules.d/11-dm-mpath.rules + install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/multipath.conf.example \ + install -m 0644 ${UNPACKDIR}/multipath.conf.example \ ${D}${sysconfdir}/multipath.conf.example } -FILES_${PN}-dbg += "${base_libdir}/multipath/.debug" +FILES:${PN} += "${systemd_system_unitdir}" +FILES:${PN}-dbg += "${base_libdir}/multipath/.debug" PACKAGES =+ "${PN}-libs" -FILES_${PN}-libs = "${base_libdir}/lib*.so.* \ +FILES:${PN}-libs = "${base_libdir}/lib*.so.* \ ${base_libdir}/multipath/lib*.so*" -RDEPENDS_${PN} += "${PN}-libs bash" +RDEPENDS:${PN} += "${PN}-libs bash libgcc" PROVIDES += "device-mapper-multipath" -RPROVIDES_${PN} += "device-mapper-multipath" -RPROVIDES_${PN}-libs += "device-mapper-multipath-libs" +RPROVIDES:${PN} += "device-mapper-multipath" +RPROVIDES:${PN}-libs += "device-mapper-multipath-libs" -FILES_${PN}-dev += "${base_libdir}/pkgconfig" +FILES:${PN}-dev += "${base_libdir}/pkgconfig" PACKAGES =+ "kpartx" -FILES_kpartx = "${base_sbindir}/kpartx \ - ${nonarch_libdir}/udev/kpartx_id \ +FILES:kpartx = "${base_sbindir}/kpartx \ + ${nonarch_base_libdir}/udev/kpartx_id \ " -RDEPENDS_${PN} += "bash kpartx" +RDEPENDS:${PN} += "kpartx" +PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb deleted file mode 100644 index 4ce960d7da..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb +++ /dev/null @@ -1,19 +0,0 @@ -require mariadb.inc -inherit native - -PROVIDES += "mysql5-native" -DEPENDS = "ncurses-native zlib-native bison-native" - -RDEPENDS_${PN} = "" -PACKAGES = "" -EXTRA_OEMAKE = "" - -do_install() { - oe_runmake 'DESTDIR=${D}' install - - install -d ${D}${bindir} - install -m 0755 sql/gen_lex_hash ${D}${bindir}/ - install -m 0755 extra/comp_err ${D}${bindir}/ - install -m 0755 scripts/comp_sql ${D}${bindir}/ -} - diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc deleted file mode 100644 index 263b3139e7..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ /dev/null @@ -1,293 +0,0 @@ -SUMMARY = "A robust, scalable, and reliable SQL server" -HOMEPAGE = "http://mariadb.org" -SECTION = "libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \ - file://fix-cmake-module-path.patch \ - file://remove-bad-path.patch \ - file://fix-mysqlclient-r-version.patch \ - file://my.cnf \ - file://mysqld.service \ - file://install_db.service \ - file://install_db \ - file://mysql-systemd-start \ - file://configure.cmake-fix-valgrind.patch \ - file://fix-a-building-failure.patch \ - file://change-cc-to-cc-version.patch \ - file://0001-disable-ucontext-on-musl.patch \ - " - -SRC_URI[md5sum] = "2d4104aae0b9e5efa8878918bd329cb4" -SRC_URI[sha256sum] = "5dbde98d7e4a5a1721b6cbed7898b2549a88866247951cf586057975c6cea641" - -S = "${WORKDIR}/mariadb-${PV}" - -BINCONFIG_GLOB = "mysql_config" - -inherit cmake gettext binconfig update-rc.d useradd systemd - -INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" -INITSCRIPT_NAME_${PN}-server = "mysqld" -INITSCRIPT_PARAMS_${PN}-server ?= "start 45 5 . stop 45 0 6 1 ." - -USERADD_PACKAGES = "${PN}-server" -USERADD_PARAM_${PN}-server = "--system --home-dir /var/mysql -g mysql --shell /bin/false mysql" -GROUPADD_PARAM_${PN}-server = "--system mysql" - -INITSCRIPT_NAME_${PN}-setupdb = "install_db" -INITSCRIPT_PARAMS_${PN}-setupdb ?= "defaults 44 44" - -SYSTEMD_PACKAGES = "${PN}-server ${PN}-setupdb" -SYSTEMD_SERVICE_${PN}-server = "mysqld.service" -SYSTEMD_AUTO_ENABLE_${PN}-server ?= "disable" - -SYSTEMD_SERVICE_${PN}-setupdb = "install_db.service" -SYSTEMD_AUTO_ENABLE_${PN}-setupdb ?= "enable" -ALLOW_EMPTY_${PN}-setupdb ?= "1" -FILES_${PN}-setupdb = "${sysconfdir}/init.d/install_db" - -EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} setupdb" -PACKAGECONFIG_class-native = "" -PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" -PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind" -PACKAGECONFIG[libedit] = "-DLIBEDIT_INTERFACE=TRUE,-DLIBEDIT_INTERFACE=FALSE,libedit" -PACKAGECONFIG[krb5] = ", ,krb5" -PACKAGECONFIG[setupdb] = ", ,,${PN}-setupdb" - -# MariaDB doesn't link properly with gold -# https://mariadb.atlassian.net/browse/MDEV-5982 -TARGET_CFLAGS += "-fuse-ld=bfd" - -BUILD_CFLAGS += "-fuse-ld=bfd" -BUILD_CXXFLAGS += "-fuse-ld=bfd" - -EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \ - -DWITH_JEMALLOC=no \ - -DWITHOUT_TOKUDB=TRUE \ - -DCMAKE_DISABLE_FIND_PACKAGE_Boost=TRUE \ - -DGROFF=FALSE \ - -DNROFF=FALSE \ - -DENABLE_DTRACE=FALSE \ - -DWITH_PIC=ON \ - -DINSTALL_LAYOUT=RPM \ - -DINSTALL_DOCDIR:PATH=${datadir}/doc/${BPN} \ - -DINSTALL_LIBDIR:PATH=${baselib} \ - -DINSTALL_PLUGINDIR:PATH=${baselib}/plugin \ - -DINSTALL_SYSCONFDIR:PATH=${sysconfdir} \ - -DMYSQL_DATADIR:PATH=/var/mysql \ - -DCAT_EXECUTABLE=`which cat` \ - -DCMAKE_AR:FILEPATH=${AR}" - -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -do_configure_append() { - # handle distros with different values of ${libexecdir} - libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'` - sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysql_install_db.sh - sed -i -e "s:mysqld libexec:mysqld $libexecdir2:g" ${S}/scripts/mysql_install_db.sh - sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysqld_safe.sh -} - -do_generate_toolchain_file_append_class-native () { - # If these are set cmake will assume we're cross-compiling, which will - # result in certain things we want being disabled - sed -i "/set( CMAKE_SYSTEM_NAME/d" ${WORKDIR}/toolchain.cmake - sed -i "/set( CMAKE_SYSTEM_PROCESSOR/d" ${WORKDIR}/toolchain.cmake -} - -do_compile_prepend_class-target () { - # These need to be in-tree or make will think they need to be built, - # and since we're cross-compiling that is disabled - cp ${STAGING_BINDIR_NATIVE}/comp_err ${S}/extra - cp ${STAGING_BINDIR_NATIVE}/comp_sql ${S}/scripts - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'krb5', 'yes', 'no', d)}" = "no" ]; then - if ! [ -e ${B}/include/openssl/kssl.h ] ; then - mkdir -p ${B}/include/openssl - echo "#ifndef KSSL_H" >${B}/include/openssl/kssl.h - echo "#define KSSL_H" >>${B}/include/openssl/kssl.h - echo "#include <openssl/opensslconf.h>">>${B}/include/openssl/kssl.h - echo "#endif" >>${B}/include/openssl/kssl.h - fi - fi -} - -SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess" - -# We need to append this so it runs *after* binconfig's preprocess function -# -# We really don't care exactly what the directories were set to originally. -# plugindir is not fixed, but we don't create any plugins. -# -mariadb_sysroot_preprocess () { - sed -i -es,^pkgincludedir=.*,pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config - sed -i -es,^pkglibdir=.*,pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install - - install -d ${D}/${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/my.cnf ${D}/${sysconfdir}/ - install -m 0755 ${WORKDIR}/install_db ${D}/${sysconfdir}/init.d/ - mv ${D}/${sysconfdir}/init.d/mysql ${D}/${sysconfdir}/init.d/mysqld - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/mysqld.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/install_db.service ${D}${systemd_unitdir}/system - sed -i -e 's,@BINDIR@,${bindir},g' -e 's,@PREFIX@,${prefix},g' ${D}${systemd_unitdir}/system/mysqld.service \ - ${D}${systemd_unitdir}/system/install_db.service - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "f /var/log/mysqld.err 0640 mysql mysql -" \ - > ${D}${sysconfdir}/tmpfiles.d/99-mysqld.conf - fi - install -d ${D}${bindir} - install -m 755 ${WORKDIR}/mysql-systemd-start ${D}${bindir} - install -d ${D}${datadir}/doc/${PN} - if [ -f ${D}${datadir}/doc/README ]; then - mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/ - fi -} - -PACKAGES = "${PN}-dbg ${PN} \ - libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \ - libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \ - libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-setupdb ${PN}-leftovers" -CONFFILES_${PN}-server += "${sysconfdir}/my.cnf ${sysconfdir}/my.cnf.d/server.cnf" -CONFFILES_${PN}-client += "${sysconfdir}/my.cnf.d/mysql-clients.cnf" -CONFFILES_libmysqlclient += "${sysconfdir}/my.cnf.d/client.cnf" - -FILES_${PN} = " " -RDEPENDS_${PN} = "${PN}-client ${PN}-server" -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN}-client = "perl perl-module-getopt-long perl-module-file-temp \ - perl-module-fcntl perl-module-sys-hostname perl-module-ipc-open3 \ - perl-module-exporter" -RDEPENDS_${PN}-server = "perl perl-module-getopt-long perl-module-data-dumper \ - perl-module-file-basename perl-module-file-path perl-module-sys-hostname \ - perl-module-file-copy perl-module-file-temp perl-module-posix \ - ${PN}-client libdbi-perl libdbd-mysql-perl" -RDEPENDS_${PN}-leftovers = "perl perl-module-cwd perl-module-benchmark perl-module-getopt-long \ - perl-module-posix perl-module-data-dumper perl-module-sigtrap perl-module-threads \ - perl-module-threads-shared perl-module-io-socket perl-module-sys-hostname perl-module-file-copy \ - perl-module-file-spec perl-module-file-find perl-module-file-basename perl-module-file-path \ - perl-module-constant perl-module-lib perl-module-file-temp perl-module-file-spec-functions \ - perl-module-io-socket-inet perl-module-io-select" -RDEPENDS_${PN}-setupdb = "coreutils" - -# Allow old code to link to the backward compatible library -RDEPENDS_libmysqlclient-dev = "libmysqlclient-r-dev" - -FILES_libmysqlclient = "\ - ${libdir}/libmysqlclient.so.* \ - ${sysconfdir}/my.cnf.d/client.cnf" -FILES_libmysqlclient-dev = " \ - ${includedir}/mysql/ \ - ${libdir}/libmysqlclient.so \ - ${sysconfdir}/aclocal \ - ${bindir}/mysql_config" -FILES_libmysqlclient-staticdev = "\ - ${libdir}/*.a" -FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \ - ${datadir}/mysql-test/lib/My/SafeProcess/.debug/my_safe_process" - -# Avoid warnings about ha_xtradb.so.0.0.0 and ha_innodb_plugin.so.0.0.0 -# which are intentionally non-PIC on 32-bit x86 (see e.g. -# storage/xtradb/plug.in in the source) -INSANE_SKIP_libmysqlclient_append_x86 = " textrel" - -FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*" -FILES_libmysqlclient-r-dev = "\ - ${libdir}/libmysqlclient_r.so" -FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a" -FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*" - -FILES_libmysqld = "\ - ${libdir}/libmysqld.so.*" -FILES_libmysqld-dev = "\ - ${libdir}/libmysqld.so" - -FILES_${PN}-client = "\ - ${bindir}/myisam_ftdump \ - ${bindir}/mysql \ - ${bindir}/mysql_client_test \ - ${bindir}/mysql_client_test_embedded \ - ${bindir}/mysql_find_rows \ - ${bindir}/mysql_fix_extensions \ - ${bindir}/mysql_waitpid \ - ${bindir}/mysqlaccess \ - ${bindir}/mysqladmin \ - ${bindir}/mysqlbug \ - ${bindir}/mysqlcheck \ - ${bindir}/mysqldump \ - ${bindir}/mysqldumpslow \ - ${bindir}/mysqlimport \ - ${bindir}/mysqlshow \ - ${bindir}/mysqlslap \ - ${bindir}/mysqltest_embedded \ - ${libexecdir}/mysqlmanager \ - ${sysconfdir}/my.cnf.d/mysql-clients.cnf" - -FILES_${PN}-server = "\ - ${bindir}/comp_err \ - ${bindir}/isamchk \ - ${bindir}/isamlog \ - ${bindir}/msql2mysql \ - ${bindir}/my_print_defaults \ - ${bindir}/myisamchk \ - ${bindir}/myisamlog \ - ${bindir}/myisampack \ - ${bindir}/mysql_convert_table_format \ - ${bindir}/mysql_fix_privilege_tables \ - ${bindir}/mysql_install_db \ - ${bindir}/mysql_secure_installation \ - ${bindir}/mysql_setpermission \ - ${bindir}/mysql-systemd-start \ - ${bindir}/mysql_tzinfo_to_sql \ - ${bindir}/mysql_upgrade \ - ${bindir}/mysql_plugin \ - ${bindir}/mysql_zap \ - ${bindir}/mysqlbinlog \ - ${bindir}/mysqld_multi \ - ${bindir}/mysqld_safe \ - ${bindir}/mysqld_safe_helper \ - ${bindir}/mysqlhotcopy \ - ${bindir}/mysqltest \ - ${bindir}/ndb_delete_all \ - ${bindir}/ndb_desc \ - ${bindir}/ndb_drop_index \ - ${bindir}/ndb_drop_table \ - ${bindir}/ndb_mgm \ - ${bindir}/ndb_restore \ - ${bindir}/ndb_select_all \ - ${bindir}/ndb_select_count \ - ${bindir}/ndb_show_tables \ - ${bindir}/ndb_waiter \ - ${bindir}/pack_isam \ - ${bindir}/perror \ - ${bindir}/replace \ - ${bindir}/resolve_stack_dump \ - ${bindir}/resolveip \ - ${libexecdir}/mysqld \ - ${sbindir}/mysqld \ - ${sbindir}/ndb_cpcd \ - ${sbindir}/ndbd \ - ${sbindir}/ndb_mgmd \ - ${libdir}/plugin/*.so \ - ${datadir}/mysql/ \ - ${localstatedir}/mysql/ \ - ${sysconfdir}/init.d/mysqld \ - ${sysconfdir}/my.cnf \ - ${sysconfdir}/my.cnf.d/server.cnf \ - ${sysconfdir}/tmpfiles.d" - -DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}" -FILES_${PN}-leftovers = "/" diff --git a/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch deleted file mode 100644 index 60e9199f95..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5bc3e7ef9700d12054e0125a126f1bb093f01ef9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 26 Mar 2017 14:30:33 -0700 -Subject: [PATCH] disable ucontext on musl - -musl does not have *contex() APIs even though it has ucontext.h header - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - include/my_context.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/my_context.h b/include/my_context.h -index dd44103..9b28c17 100644 ---- a/include/my_context.h -+++ b/include/my_context.h -@@ -31,7 +31,7 @@ - #define MY_CONTEXT_USE_X86_64_GCC_ASM - #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) - #define MY_CONTEXT_USE_I386_GCC_ASM --#elif defined(HAVE_UCONTEXT_H) -+#elif defined(__GLIBC__) && defined(HAVE_UCONTEXT_H) - #define MY_CONTEXT_USE_UCONTEXT - #else - #define MY_CONTEXT_DISABLE --- -2.12.1 - diff --git a/meta-oe/recipes-support/mysql/mariadb/change-cc-to-cc-version.patch b/meta-oe/recipes-support/mysql/mariadb/change-cc-to-cc-version.patch deleted file mode 100644 index 02bda24f7b..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb/change-cc-to-cc-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -mariadb: replace the CC with CC_VERSION and CXX with CXX_VERSION - -mysqlbug.sh is a bug report script. It makes a report with the build information, -including gcc version. The CC is the local path of gcc, which is useless for bug -report, and the path may expose private information, so change it to CC_VERSION. - -Upstream-Status: Pending - -Signed-off-by: Yue Tao <Yue.Tao@windriver.com> -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> -================================ -diff --git a/scripts/mysqlbug.sh.old b/scripts/mysqlbug.sh -index e9df210..d4b8d53 100644 ---- a/scripts/mysqlbug.sh.old -+++ b/scripts/mysqlbug.sh -@@ -24,8 +24,8 @@ VERSION="@VERSION@@MYSQL_SERVER_SUFFIX@" - COMPILATION_COMMENT="@COMPILATION_COMMENT@" - BUGmysql="maria-developers@lists.launchpad.net" - # This is set by configure --COMP_CALL_INFO="CC='@SAVE_CC@' CFLAGS='@SAVE_CFLAGS@' CXX='@SAVE_CXX@' CXXFLAGS='@SAVE_CXXFLAGS@' LDFLAGS='@SAVE_LDFLAGS@' ASFLAGS='@SAVE_ASFLAGS@'" --COMP_RUN_INFO="CC='@CC@' CFLAGS='@CFLAGS@' CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' LDFLAGS='@LDFLAGS@' ASFLAGS='@ASFLAGS@'" -+COMP_CALL_INFO="CC='@CC_VERSION@' CFLAGS='@SAVE_CFLAGS@' CXX='@CXX_VERSION@' CXXFLAGS='@SAVE_CXXFLAGS@' LDFLAGS='@SAVE_LDFLAGS@' ASFLAGS='@SAVE_ASFLAGS@'" -+COMP_RUN_INFO="CC='@CC_VERSION@' CFLAGS='@CFLAGS@' CXX='@CXX_VERSION@' CXXFLAGS='@CXXFLAGS@' LDFLAGS='@LDFLAGS@' ASFLAGS='@ASFLAGS@'" - CONFIGURE_LINE="@CONF_COMMAND@" - - LIBC_INFO="" diff --git a/meta-oe/recipes-support/mysql/mariadb/configure.cmake-fix-valgrind.patch b/meta-oe/recipes-support/mysql/mariadb/configure.cmake-fix-valgrind.patch deleted file mode 100644 index e97def6021..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb/configure.cmake-fix-valgrind.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5effba0d7d47071a3f1bca56823190d5a95bb1a6 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Wed, 12 Nov 2014 03:09:10 -0500 -Subject: [PATCH] configure.cmake: fix valgrind - -Check valgrind headers only if WITH_VALGRIND is set. - -mariadb uses two macros for valgrind compilations: -HAVE_valgrind - valgrind is installed and can be set by configure option -DWITH_VALGRIND -HAVE_VALGRIND - valgrind debug libraries is installed, set by auto check - -We would like to set them both by the configure option so that we can use -PACKAGECONFIG to decide if valgrind is needed or not. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - configure.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.cmake b/configure.cmake -index 0bd7bbe..51a098f 100644 ---- a/configure.cmake -+++ b/configure.cmake -@@ -1047,10 +1047,10 @@ MARK_AS_ADVANCED(WITH_ATOMIC_LOCKS MY_ATOMIC_MODE_RWLOCK MY_ATOMIC_MODE_DUMMY) - - IF(WITH_VALGRIND) - SET(HAVE_valgrind 1) -+ CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" -+ HAVE_VALGRIND) - ENDIF() - --CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" -- HAVE_VALGRIND) - - #-------------------------------------------------------------------- - # Check for IPv6 support --- -2.0.0 - diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch b/meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch deleted file mode 100644 index 0c4e10237c..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch +++ /dev/null @@ -1,31 +0,0 @@ -[PATCH] fix a building failure - -Upstream-Status: Inappropriate [configuration] - -building failed since native does not generate import_executables.cmake -In fact, our building system will export the needed commands - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - CMakeLists.txt | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c1ce1c5..83b3a7e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -350,11 +350,6 @@ MYSQL_CHECK_READLINE() - - CHECK_JEMALLOC() - --IF(CMAKE_CROSSCOMPILING) -- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") -- INCLUDE(${IMPORT_EXECUTABLES}) --ENDIF() -- - # - # Setup maintainer mode options by the end. Platform checks are - # not run with the warning options as to not perturb fragile checks --- -1.9.1 - diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch b/meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch deleted file mode 100644 index 8d9f558d05..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -Avoid CMAKE_MODULE_PATH being overwritten - -OE-Core's setting of CMAKE_MODULE_PATH stomps on MariaDB's value unless -we set it after setting the project name. - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - -Upstream-Status: Inappropriate [working around OE-Core bug] - ---- mariadb/CMakeLists.txt 2014-07-17 11:01:07.676353047 +0100 -+++ mariadb/CMakeLists.txt 2014-07-17 11:01:31.299353107 +0100 -@@ -28,8 +28,6 @@ - - MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}") - --SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) -- - # Distinguish between community and non-community builds, with the - # default being a community build. This does not impact the feature - # set that will be compiled in; it's merely provided as a hint to -@@ -77,6 +75,8 @@ - ENDIF() - PROJECT(${MYSQL_PROJECT_NAME}) - -+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) -+ - IF(BUILD_CONFIG) - INCLUDE( - ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake) diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch b/meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch deleted file mode 100644 index 7516619ebb..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 6db2a606196fb38a6d106dc409eee1cb9a40a440 Mon Sep 17 00:00:00 2001 -From: Tor Didriksen <tor.didriksen@oracle.com> -Date: Mon, 24 Jun 2013 17:15:35 +0200 -Subject: [PATCH] Bug#16809055 MYSQL 5.6 AND 5.7 STILL USE LIBMYSQLCLIENT.SO.18 - -With this patch, the libmysql/ directory contains: -libmysqlclient.a -libmysqlclient_r.a -> libmysqlclient.a -libmysqlclient_r.so -> libmysqlclient.so* -libmysqlclient_r.so.18 -> libmysqlclient.so.18* -libmysqlclient_r.so.18.1.0 -> libmysqlclient.so.18.1.0* -libmysqlclient.so -> libmysqlclient.so.18* -libmysqlclient.so.18 -> libmysqlclient.so.18.1.0* -libmysqlclient.so.18.1.0* - -This fixes libmysqlclient_r symlinks pointing to the unversioned -libmysqlclient.so symlink (leading to package QA errors since the -libmysqlclient-r package ends up depending on libmysqlclient-dev). - -Borrowed from MySQL 5.6 tree at https://github.com/percona/mysql/ - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - ---- - cmake/install_macros.cmake | 25 +++++++++++++++---------- - cmake/mysql_version.cmake | 3 ++- - libmysql/CMakeLists.txt | 36 ++++++++++++++++++++++++++++-------- - 3 files changed, 45 insertions(+), 19 deletions(-) - -diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake -index b8efdf8..a0d0e68 100644 ---- a/cmake/install_macros.cmake -+++ b/cmake/install_macros.cmake -@@ -1,4 +1,4 @@ --# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -111,28 +111,33 @@ FUNCTION(INSTALL_SCRIPT) - ENDFUNCTION() - - # Install symbolic link to CMake target. --# the link is created in the same directory as target --# and extension will be the same as for target file. --MACRO(INSTALL_SYMLINK linkname target destination component) -+# We do 'cd path; ln -s target_name link_name' -+# We also add an INSTALL target for "${path}/${link_name}" -+MACRO(INSTALL_SYMLINK target target_name link_name destination component) - IF(UNIX) - GET_TARGET_PROPERTY(location ${target} LOCATION) - GET_FILENAME_COMPONENT(path ${location} PATH) -- GET_FILENAME_COMPONENT(name ${location} NAME) -- SET(output ${path}/${linkname}) -+ MESSAGE(STATUS "target ${target}") -+ MESSAGE(STATUS "link_name ${link_name}") -+ MESSAGE(STATUS "target_name ${target_name}") -+ MESSAGE(STATUS "path ${path}") -+ MESSAGE(STATUS "") -+ -+ SET(output ${path}/${link_name}) - ADD_CUSTOM_COMMAND( - OUTPUT ${output} - COMMAND ${CMAKE_COMMAND} ARGS -E remove -f ${output} - COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink -- ${name} -- ${linkname} -+ ${target_name} -+ ${link_name} - WORKING_DIRECTORY ${path} - DEPENDS ${target} - ) - -- ADD_CUSTOM_TARGET(symlink_${linkname} -+ ADD_CUSTOM_TARGET(symlink_${link_name} - ALL - DEPENDS ${output}) -- SET_TARGET_PROPERTIES(symlink_${linkname} PROPERTIES CLEAN_DIRECT_OUTPUT 1) -+ SET_TARGET_PROPERTIES(symlink_${link_name} PROPERTIES CLEAN_DIRECT_OUTPUT 1) - IF(CMAKE_GENERATOR MATCHES "Xcode") - # For Xcode, replace project config with install config - STRING(REPLACE "${CMAKE_CFG_INTDIR}" -diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt -index be5760f..96286ff 100644 ---- a/libmysql/CMakeLists.txt -+++ b/libmysql/CMakeLists.txt -@@ -180,6 +180,12 @@ IF(MSVC) - INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) - ENDIF() - -+MACRO(GET_TARGET_NAME target out_name) -+ GET_TARGET_PROPERTY(location ${target} LOCATION) -+ GET_FILENAME_COMPONENT(name ${location} NAME) -+ SET(${out_name} ${name}) -+ENDMACRO() -+ - IF(UNIX) - MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) - SET(DOT_VERSION ".${VERSION}") -@@ -192,7 +198,13 @@ IF(UNIX) - SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION}) - ENDIF() - ENDMACRO() -- INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) -+ENDIF() -+ -+IF(UNIX) -+ GET_TARGET_NAME(mysqlclient lib_name) -+ INSTALL_SYMLINK(mysqlclient -+ ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a -+ ${INSTALL_LIBDIR} Development) - ENDIF() - - IF(NOT DISABLE_SHARED) -@@ -205,10 +217,9 @@ IF(NOT DISABLE_SHARED) - # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") -- ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") -- SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0") - ELSE() -- SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0") -+ SET(OS_SHARED_LIB_VERSION -+ "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0") - ENDIF() - # Name of shared library is mysqlclient on Unix - SET_TARGET_PROPERTIES(libmysql PROPERTIES -@@ -239,8 +250,13 @@ IF(NOT DISABLE_SHARED) - "${CMAKE_SHARED_LIBRARY_SUFFIX}" - "" - linkname) -- INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries) -- SET(OS_SHARED_LIB_SYMLINKS "${SHARED_LIB_MAJOR_VERSION}" "${OS_SHARED_LIB_VERSION}") -+ GET_TARGET_NAME(libmysql lib_name) -+ GET_FILENAME_COMPONENT(lib_name_we ${lib_name} NAME_WE) -+ INSTALL_SYMLINK(libmysql -+ ${lib_name} ${linkname} -+ ${INSTALL_LIBDIR} SharedLibraries) -+ SET(OS_SHARED_LIB_SYMLINKS -+ "${SHARED_LIB_MAJOR_VERSION}" "${OS_SHARED_LIB_VERSION}") - LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS) - FOREACH(ver ${OS_SHARED_LIB_SYMLINKS}) - GET_VERSIONED_LIBNAME( -@@ -248,7 +264,11 @@ IF(NOT DISABLE_SHARED) - "${CMAKE_SHARED_LIBRARY_SUFFIX}" - "${ver}" - linkname) -- INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries) -+ GET_VERSIONED_LIBNAME( -+ ${lib_name_we} "${CMAKE_SHARED_LIBRARY_SUFFIX}" "${ver}" lib_name_ver) -+ INSTALL_SYMLINK(libmysql -+ ${lib_name_ver} ${linkname} -+ ${INSTALL_LIBDIR} SharedLibraries) - ENDFOREACH() - ENDIF() - ENDIF() --- -2.0.3 - diff --git a/meta-oe/recipes-support/mysql/mariadb/install_db b/meta-oe/recipes-support/mysql/mariadb/install_db deleted file mode 100755 index 512a7da7ee..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb/install_db +++ /dev/null @@ -1,13 +0,0 @@ -#! /bin/sh -case "$1" in - start) - echo "Starting to install database for mariadb" - /usr/bin/mysql-systemd-start pre - echo "done." - ;; - *) - echo "Usage: /etc/init.d/install_db start" - exit 1 -esac - -exit 0 diff --git a/meta-oe/recipes-support/mysql/mariadb/install_db.service b/meta-oe/recipes-support/mysql/mariadb/install_db.service deleted file mode 100644 index c8369f569b..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb/install_db.service +++ /dev/null @@ -1,17 +0,0 @@ -# -# Simple install MySQL database service file -# It shoulb be done before mysqld.service - -[Unit] -Description=Install MySQL Community Server Database -After=network.target -After=syslog.target -Before=mysqld.service - -[Install] -WantedBy=multi-user.target - -[Service] -Type=oneshot -ExecStart=@BINDIR@/mysql-systemd-start pre - diff --git a/meta-oe/recipes-support/mysql/mariadb/my.cnf b/meta-oe/recipes-support/mysql/mariadb/my.cnf deleted file mode 100644 index dc4c172e54..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb/my.cnf +++ /dev/null @@ -1,25 +0,0 @@ -[client] -#password = password -port = 3306 -socket = /var/lib/mysql/mysql.sock - -[mysqld_safe] - -[mysqld] -user = mysql -port = 3306 -socket = /var/lib/mysql/mysql.sock -pid-file = /var/lib/mysql/mysqld.pid -log-error = /var/log/mysqld.err -basedir = /usr -datadir = /var/lib/mysql -skip-external-locking -skip-networking -ignore-builtin-innodb -default-storage-engine = myisam -bind-address = localhost - -# -# include all files from the config directory -# -!includedir /etc/my.cnf.d diff --git a/meta-oe/recipes-support/mysql/mariadb/mysql-systemd-start b/meta-oe/recipes-support/mysql/mariadb/mysql-systemd-start deleted file mode 100644 index 189c02021d..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb/mysql-systemd-start +++ /dev/null @@ -1,66 +0,0 @@ -#! /bin/sh -# -# Needed argument: pre | post -# -# pre mode : try to run mysql_install_db and fix perms and SELinux contexts -# post mode : ping server until answer is received -# - -get_option () { - local section=$1 - local option=$2 - local default=$3 - ret=$(/usr/bin/my_print_defaults $section | grep '^--'${option}'=' | cut -d= -f2-) - [ -z $ret ] && ret=$default - echo $ret -} - -install_db () { - # Note: something different than datadir=/var/lib/mysql requires SELinux policy changes (in enforcing mode) - datadir=$(get_option mysqld datadir "/var/lib/mysql") - - # Restore log, dir, perms and SELinux contexts - [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || exit 1 - log=/var/log/mysqld.log - [ -e $log ] || touch $log - chmod 0640 $log - chown mysql:mysql $log || exit 1 - if [ -x /usr/sbin/restorecon ]; then - /usr/sbin/restorecon "$datadir" - /usr/sbin/restorecon $log - fi - - # If special mysql dir is in place, skip db install - [ -d "$datadir/mysql" ] && exit 0 - - # Create initial db - /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql - exit 0 -} - -pinger () { - # Wait for ping to answer to signal startup completed, - # might take a while in case of e.g. crash recovery - # MySQL systemd service will timeout script if no answer - datadir=$(get_option mysqld datadir "/var/lib/mysql") - socket=$(get_option mysqld socket "$datadir/mysql.sock") - case $socket in - /*) adminsocket="$socket" ;; - *) adminsocket="$datadir/$socket" ;; - esac - - while /bin/true ; do - sleep 1 - mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break - done - exit 0 -} - -# main -case $1 in - "pre") install_db ;; - "post") pinger ;; -esac - -exit 0 - diff --git a/meta-oe/recipes-support/mysql/mariadb/mysqld.service b/meta-oe/recipes-support/mysql/mariadb/mysqld.service deleted file mode 100644 index d88361703d..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb/mysqld.service +++ /dev/null @@ -1,25 +0,0 @@ -[Unit] -Description=MariaDB database server -After=syslog.target -After=network.target - -[Service] -PIDFile=/var/lib/mysql/mysqld.pid -Type=simple -User=mysql -Group=mysql - -# Execute post scripts as root -PermissionsStartOnly=true - -# Start main service -ExecStart=@BINDIR@/mysqld_safe --basedir=@PREFIX@ - -# Don't signal startup success before a ping works -ExecStartPost=@BINDIR@/mysql-systemd-start post - -TimeoutSec=300 -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch b/meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch deleted file mode 100644 index ff26b0b86c..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch +++ /dev/null @@ -1,18 +0,0 @@ -Remove host path from include directories - -Naturally this breaks cross-compilation if present. - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - ---- mariadb-5.5.38/storage/tokudb/ft-index/CMakeLists.txt 2014-07-17 14:37:04.529327998 +0100 -+++ mariadb-5.5.38/storage/tokudb/ft-index/CMakeLists.txt 2014-07-17 14:43:56.991337895 +0100 -@@ -39,7 +39,6 @@ - - ## default includes and libraries - include_directories(SYSTEM -- /usr/local/include - ${ZLIB_INCLUDE_DIRS} - ) - diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb deleted file mode 100644 index d7895732a6..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb +++ /dev/null @@ -1,27 +0,0 @@ -require mariadb.inc - -EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" - -DEPENDS += "mariadb-native ncurses zlib readline libaio libevent" - -PROVIDES += "mysql5 libmysqlclient" - -RPROVIDES_${PN} += "mysql5" -RREPLACES_${PN} += "mysql5" -RCONFLICTS_${PN} += "mysql5" - -RPROVIDES_${PN}-dbg += "mysql5-dbg" -RREPLACES_${PN}-dbg += "mysql5-dbg" -RCONFLICTS_${PN}-dbg += "mysql5-dbg" - -RPROVIDES_${PN}-leftovers += "mysql5-leftovers" -RREPLACES_${PN}-leftovers += "mysql5-leftovers" -RCONFLICTS_${PN}-leftovers += "mysql5-leftovers" - -RPROVIDES_${PN}-client += "mysql5-client" -RREPLACES_${PN}-client += "mysql5-client" -RCONFLICTS_${PN}-client += "mysql5-client" - -RPROVIDES_${PN}-server += "mysql5-server" -RREPLACES_${PN}-server += "mysql5-server" -RCONFLICTS_${PN}-server += "mysql5-server" diff --git a/meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb b/meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb deleted file mode 100644 index ac0df4f066..0000000000 --- a/meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Python interface to MySQL" -HOMEPAGE = "https://github.com/farcepest/MySQLdb1" -SECTION = "devel/python" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "mysql5" - -SRCNAME = "MySQL-python" - -SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip" -SRC_URI[md5sum] = "654f75b302db6ed8dc5a898c625e030c" -SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit setuptools diff --git a/meta-oe/recipes-support/nano/nano_2.7.4.bb b/meta-oe/recipes-support/nano/nano_2.7.4.bb deleted file mode 100644 index eaf393e180..0000000000 --- a/meta-oe/recipes-support/nano/nano_2.7.4.bb +++ /dev/null @@ -1,4 +0,0 @@ -include nano.inc - -SRC_URI[md5sum] = "c011c7f9e47cb1da27d4e7cc8b56ec6a" -SRC_URI[sha256sum] = "752170643039e2c95a433de357f0c70a8c4c4c561a90a7e7259a63e225b659b9" diff --git a/meta-oe/recipes-support/nano/nano.inc b/meta-oe/recipes-support/nano/nano_8.2.bb index 22f0fb2a0a..46e5a15c1c 100644 --- a/meta-oe/recipes-support/nano/nano.inc +++ b/meta-oe/recipes-support/nano/nano_8.2.bb @@ -1,16 +1,21 @@ +SUMMARY = "Small and friendly console text editor" DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ Not ANOther editor) is an enhanced clone of the \ Pico text editor." HOMEPAGE = "http://www.nano-editor.org/" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" SECTION = "console/utils" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" + DEPENDS = "ncurses file" -RDEPENDS_${PN} = "ncurses-terminfo" +RDEPENDS:${PN} = "ncurses-terminfo-base" -PV_MAJOR = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" +PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" +SRC_URI[sha256sum] = "d5ad07dd862facae03051c54c6535e54c7ed7407318783fcad1ad2d7076fffeb" + +UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" inherit autotools gettext pkgconfig diff --git a/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch b/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch index 9f2faaa529..6b51f992f5 100644 --- a/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch +++ b/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch @@ -12,6 +12,8 @@ where this option is absent Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch b/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch index a8fea82dc3..cb99daf78c 100644 --- a/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch +++ b/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch @@ -15,6 +15,8 @@ Fixes Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb index e5b50ce755..b10c23984d 100644 --- a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb +++ b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb @@ -4,33 +4,28 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e7fe20c9be97be5579e3ab5d92d3a218" SECTION = "libs" -SRC_URI = "git://github.com/projectNe10/Ne10.git \ +SRC_URI = "git://github.com/projectNe10/Ne10.git;branch=master;protocol=https \ file://0001-CMakeLists.txt-Remove-mthumb-interwork.patch \ file://0001-Dont-specify-march-explicitly.patch \ " SRCREV = "18c4c982a595dad069cd8df4932aefb1d257591f" S = "${WORKDIR}/git" -PV .= "gitr+${SRCPV}" +PV .= "+git" inherit cmake +# Incompatible with archs other than armv7, armv7ve and aarch64 +COMPATIBLE_MACHINE = "(^$)" +COMPATIBLE_MACHINE:aarch64 = "(.*)" +COMPATIBLE_MACHINE:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","(.*)","(^$)",d)}" +COMPATIBLE_MACHINE:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon","(.*)","(^$)",d)}" NE10_TARGET_ARCH = "" -EXTRA_OECMAKE = '-DGNULINUX_PLATFORM=ON -DNE10_BUILD_SHARED=ON -DNE10_LINUX_TARGET_ARCH="${NE10_TARGET_ARCH}"' - -COMPATIBLE_MACHINE_aarch64 = "(.*)" -COMPATIBLE_MACHINE_armv7a = "(.*)" +NE10_TARGET_ARCH:aarch64 = "aarch64" +NE10_TARGET_ARCH:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","",d)}" +NE10_TARGET_ARCH:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","",d)}" -python () { - if any(t.startswith('armv7') for t in d.getVar('TUNE_FEATURES').split()): - d.setVar('NE10_TARGET_ARCH', 'armv7') - bb.debug(2, 'Building Ne10 for armv7') - elif any(t.startswith('aarch64') for t in d.getVar('TUNE_FEATURES').split()): - d.setVar('NE10_TARGET_ARCH', 'aarch64') - bb.debug(2, 'Building Ne10 for aarch64') - else: - raise bb.parse.SkipPackage("Incompatible with archs other than armv7 and aarch64") -} +EXTRA_OECMAKE = '-DGNULINUX_PLATFORM=ON -DNE10_BUILD_SHARED=ON -DNE10_LINUX_TARGET_ARCH="${NE10_TARGET_ARCH}"' do_install() { install -d ${D}${libdir} @@ -38,9 +33,9 @@ do_install() { install -m 0644 ${S}/inc/NE10*.h ${D}${includedir}/ install -m 0644 ${B}/modules/libNE10.a ${D}${libdir}/ install -m 0755 ${B}/modules/libNE10.so.* ${D}${libdir}/ - cp -a ${B}/modules/libNE10.so ${D}${libdir}/ + cp -d ${B}/modules/libNE10.so ${D}${libdir}/ } # ERROR: QA Issue: ELF binary 'ne10/1.2.1-r0/packages-split/ne10/usr/lib/libNE10.so.10' has relocations in .text [textrel] # ERROR: QA Issue: ELF binary 'ne10/1.2.1-r0/packages-split/ne10/usr/lib/libNE10.so.10' has relocations in .text [textrel] -INSANE_SKIP_${PN} += "textrel" +INSANE_SKIP:${PN} += "textrel" diff --git a/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch b/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch new file mode 100644 index 0000000000..177a71ec0a --- /dev/null +++ b/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch @@ -0,0 +1,30 @@ +From f477408f1c24ce6e5589e5a99d369279916c7c6e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 Aug 2022 13:11:12 -0700 +Subject: [PATCH] Disable installing documentation + +It does not build + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index ed87a69..c32405c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -125,7 +125,7 @@ Makefile: $(srcdir)/Makefile.in + neon-config: $(srcdir)/neon-config.in + @./config.status neon-config + +-install-docs: install-man install-html ++install-docs: + + install-html: + $(INSTALL) -d $(DESTDIR)$(docdir)/html +-- +2.37.2 + diff --git a/meta-oe/recipes-support/neon/neon/run-ptest b/meta-oe/recipes-support/neon/neon/run-ptest new file mode 100644 index 0000000000..602084a52c --- /dev/null +++ b/meta-oe/recipes-support/neon/neon/run-ptest @@ -0,0 +1,25 @@ +#!/bin/sh + +set -eux + +rm -f debug.log child.log + +ulimit -c unlimited +ulimit -t 120 + +cd test +echo foobar > foobar.txt + +BASIC_TESTS="auth basic redirect request session socket string-tests \ + stubs uri-tests util-tests" +DAV_TESTS="acl3744 lock oldacl props xml xmlreq" +for t in $BASIC_TESTS $DAV_TESTS +do + echo "Running $t..." + if "./$t" + then + echo "PASS:$t" + else + echo "FAIL:$t" + fi +done diff --git a/meta-oe/recipes-support/neon/neon_0.30.2.bb b/meta-oe/recipes-support/neon/neon_0.30.2.bb deleted file mode 100644 index 00b79f6330..0000000000 --- a/meta-oe/recipes-support/neon/neon_0.30.2.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "An HTTP and WebDAV client library with a C interface" -HOMEPAGE = "http://www.webdav.org/neon/" -SECTION = "libs" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ - file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037" - -SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \ - file://pkgconfig.patch \ - " - -SRC_URI[md5sum] = "e28d77bf14032d7f5046b3930704ef41" -SRC_URI[sha256sum] = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca" - -inherit autotools binconfig-disabled lib_package pkgconfig - -# Enable gnutls or openssl, not both -PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib" -PACKAGECONFIG_class-native = "expat gnutls webdav zlib" - -PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat" -PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" -PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" -PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy" -PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2" -PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl" -PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav," -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" - -EXTRA_OECONF += "--enable-shared" - -do_compile_append() { - oe_runmake -C test -} - -BINCONFIG = "${bindir}/neon-config" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/neon/neon_0.33.0.bb b/meta-oe/recipes-support/neon/neon_0.33.0.bb new file mode 100644 index 0000000000..a0333f4560 --- /dev/null +++ b/meta-oe/recipes-support/neon/neon_0.33.0.bb @@ -0,0 +1,63 @@ +SUMMARY = "An HTTP and WebDAV client library with a C interface" +HOMEPAGE = "http://www.webdav.org/neon/" +SECTION = "libs" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ + file://src/ne_utils.h;beginline=1;endline=20;md5=34c8e338bfa0237561e68d30c3c71133" + +SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \ + file://pkgconfig.patch \ + file://0001-Disable-installing-documentation.patch \ + file://run-ptest \ + " + +SRC_URI[sha256sum] = "659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8" + +inherit autotools-brokensep binconfig-disabled lib_package pkgconfig ptest + +# Enable gnutls or openssl, not both +PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib nls" +PACKAGECONFIG:class-native = "expat gnutls webdav zlib nls" +PACKAGECONFIG:remove:libc-musl = "nls" + +PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat" +PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" +PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" +PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy" +PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2" +PACKAGECONFIG[nls] = ",--disable-nls,gettext-native" +PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl" +PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav," +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" + +EXTRA_OECONF += "--enable-shared --enable-threadsafe-ssl=posix" + +# Do not install into /usr/local +EXTRA_OEMAKE:append:class-native = " prefix=${prefix_native}" + +do_configure:prepend() { + echo "${PV}" > ${S}/.version +} + +do_compile:append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'nls', 'true', 'false', d)}; then + oe_runmake compile-gmo + fi + oe_runmake -C test +} + +do_install_ptest(){ + BASIC_TESTS="auth basic redirect request session socket string-tests \ + stubs uri-tests util-tests" + DAV_TESTS="acl3744 lock oldacl props xml xmlreq" + mkdir "${D}${PTEST_PATH}/test" + for i in ${BASIC_TESTS} ${DAV_TESTS} + do + install -m 0755 "${B}/test/${i}" \ + "${D}${PTEST_PATH}/test" + done +} + +BINCONFIG = "${bindir}/neon-config" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/nghttp2/nghttp2_1.26.0.bb b/meta-oe/recipes-support/nghttp2/nghttp2_1.26.0.bb deleted file mode 100644 index 3ccd486be1..0000000000 --- a/meta-oe/recipes-support/nghttp2/nghttp2_1.26.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "HTTP/2 C Library and tools" -HOMEPAGE = "https://nghttp2.org/" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec" - -SRC_URI = "https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.bz2" -SRC_URI[md5sum] = "926f07ad3b50f38f7d8935ced04716cf" -SRC_URI[sha256sum] = "0df4229f4123b5aa96e834ebcfdffe954e93d986f0252fd10123d50c6f010983" - -DEPENDS = "libxml2 openssl zlib jansson cunit c-ares" - -inherit cmake pythonnative python-dir diff --git a/meta-oe/recipes-support/nmon/nmon/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch b/meta-oe/recipes-support/nmon/nmon/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch new file mode 100644 index 0000000000..af79efed96 --- /dev/null +++ b/meta-oe/recipes-support/nmon/nmon/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch @@ -0,0 +1,175 @@ +From eba852316735daec27d4ff11483018ca596312d0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Oct 2021 02:11:49 -0700 +Subject: [PATCH] Fix a lot of -Werror=format-security errors with + mvprintw/mvwprintw + +In all these places a non-constant is used as a format string which +compiler complains about. Fix by using "%s" as format. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lmon16m.c | 86 +++++++++++++++++++++++++++---------------------------- + 1 file changed, 43 insertions(+), 43 deletions(-) + +diff --git a/lmon16m.c b/lmon16m.c +index 7e46642..1d53367 100644 +--- a/lmon16m.c ++++ b/lmon16m.c +@@ -5475,20 +5475,20 @@ int main(int argc, char **argv) + /* + *mvwprintw(padsmp,2, 0, "CPU User%% Sys%% Wait%% Idle|0 |25 |50 |75 100|"); + */ +- mvwprintw(padsmp, 1, 0, cpu_line); +- mvwprintw(padsmp, 2, 0, "CPU "); ++ mvwprintw(padsmp, 1, 0, "%s", cpu_line); ++ mvwprintw(padsmp, 2, 0, "%s", "CPU "); + COLOUR wattrset(padsmp, COLOR_PAIR(2)); /* Green */ +- mvwprintw(padsmp, 2, 4, "User%%"); ++ mvwprintw(padsmp, 2, 4, "%s", "User%%"); + COLOUR wattrset(padsmp, COLOR_PAIR(1)); /* Red */ +- mvwprintw(padsmp, 2, 9, " Sys%%"); ++ mvwprintw(padsmp, 2, 9, "%s", " Sys%%"); + COLOUR wattrset(padsmp, COLOR_PAIR(4)); /* Blue */ +- mvwprintw(padsmp, 2, 15, " Wait%%"); ++ mvwprintw(padsmp, 2, 15, "%s", " Wait%%"); + if (p->cpu_total.steal != q->cpu_total.steal) { + COLOUR wattrset(padsmp, COLOR_PAIR(5)); +- mvwprintw(padsmp, 2, 22, "Steal"); ++ mvwprintw(padsmp, 2, 22, "%s", "Steal"); + } else { + COLOUR wattrset(padsmp, COLOR_PAIR(0)); +- mvwprintw(padsmp, 2, 22, " Idle"); ++ mvwprintw(padsmp, 2, 22, "%s", " Idle"); + } + COLOUR wattrset(padsmp, COLOR_PAIR(0)); + mvwprintw(padsmp, 2, 27, +@@ -5579,8 +5579,8 @@ int main(int argc, char **argv) + /* lparcfg gathered above */ + if (lparcfg.smt_mode > 1 + && i % lparcfg.smt_mode == 0) { +- mvwprintw(padsmp, 3 + i, 27, "*"); +- mvwprintw(padsmp, 3 + i, 77, "*"); ++ mvwprintw(padsmp, 3 + i, 27, "%s", "*"); ++ mvwprintw(padsmp, 3 + i, 77, "%s", "*"); + } + #endif + +@@ -5597,7 +5597,7 @@ int main(int argc, char **argv) + 100.0); + } + } /* for (i = 0; i < cpus; i++) */ +- CURSE mvwprintw(padsmp, i + 3, 0, cpu_line); ++ CURSE mvwprintw(padsmp, i + 3, 0, "%s", cpu_line); + #ifdef POWER + /* proc_lparcfg called above in previous ifdef + */ +@@ -5673,7 +5673,7 @@ int main(int argc, char **argv) + 100.0); + } + +- CURSE mvwprintw(padsmp, i + 5, 0, cpu_line); ++ CURSE mvwprintw(padsmp, i + 5, 0, "%s", cpu_line); + i = i + 2; + } /* if (cpus > 1 || !cursed) */ + smp_first_time = 0; +@@ -5704,16 +5704,16 @@ int main(int argc, char **argv) + char *wide10 = + " 10%%-| |-10%%"; + +- mvwprintw(padwide, 1, 0, wide1); +- mvwprintw(padwide, 2, 0, wide2); +- mvwprintw(padwide, 3, 0, wide3); +- mvwprintw(padwide, 4, 0, wide4); +- mvwprintw(padwide, 5, 0, wide5); +- mvwprintw(padwide, 6, 0, wide6); +- mvwprintw(padwide, 7, 0, wide7); +- mvwprintw(padwide, 8, 0, wide8); +- mvwprintw(padwide, 9, 0, wide9); +- mvwprintw(padwide, 10, 0, wide10); ++ mvwprintw(padwide, 1, 0, "%s", wide1); ++ mvwprintw(padwide, 2, 0, "%s", wide2); ++ mvwprintw(padwide, 3, 0, "%s", wide3); ++ mvwprintw(padwide, 4, 0, "%s", wide4); ++ mvwprintw(padwide, 5, 0, "%s", wide5); ++ mvwprintw(padwide, 6, 0, "%s", wide6); ++ mvwprintw(padwide, 7, 0, "%s", wide7); ++ mvwprintw(padwide, 8, 0, "%s", wide8); ++ mvwprintw(padwide, 9, 0, "%s", wide9); ++ mvwprintw(padwide, 10, 0, "%s", wide10); + mvwprintw(padwide, 11, 0, + " CPU +1--------+10-------+20-------+30-------+40-------+50-------+60--+--0%%"); + mvwprintw(padwide, 1, 6, "CPU(s)=%d", cpus); +@@ -5755,16 +5755,16 @@ int main(int argc, char **argv) + rows = 12; + } + if (cpus > 63) { +- mvwprintw(padwide, rows + 0, 0, wide1); +- mvwprintw(padwide, rows + 1, 0, wide2); +- mvwprintw(padwide, rows + 2, 0, wide3); +- mvwprintw(padwide, rows + 3, 0, wide4); +- mvwprintw(padwide, rows + 4, 0, wide5); +- mvwprintw(padwide, rows + 5, 0, wide6); +- mvwprintw(padwide, rows + 6, 0, wide7); +- mvwprintw(padwide, rows + 7, 0, wide8); +- mvwprintw(padwide, rows + 8, 0, wide9); +- mvwprintw(padwide, rows + 9, 0, wide10); ++ mvwprintw(padwide, rows + 0, 0, "%s", wide1); ++ mvwprintw(padwide, rows + 1, 0, "%s", wide2); ++ mvwprintw(padwide, rows + 2, 0, "%s", wide3); ++ mvwprintw(padwide, rows + 3, 0, "%s", wide4); ++ mvwprintw(padwide, rows + 4, 0, "%s", wide5); ++ mvwprintw(padwide, rows + 5, 0, "%s", wide6); ++ mvwprintw(padwide, rows + 6, 0, "%s", wide7); ++ mvwprintw(padwide, rows + 7, 0, "%s", wide8); ++ mvwprintw(padwide, rows + 8, 0, "%s", wide9); ++ mvwprintw(padwide, rows + 9, 0, "%s", wide10); + mvwprintw(padwide, rows + 10, 0, + " CPU +65---+70-------+80-------+90-------+100------+110------+120-----+--0%%"); + if (wide_first_time) { +@@ -5813,16 +5813,16 @@ int main(int argc, char **argv) + rows = 23; + } + if (cpus > 127) { +- mvwprintw(padwide, rows + 0, 0, wide1); +- mvwprintw(padwide, rows + 1, 0, wide2); +- mvwprintw(padwide, rows + 2, 0, wide3); +- mvwprintw(padwide, rows + 3, 0, wide4); +- mvwprintw(padwide, rows + 4, 0, wide5); +- mvwprintw(padwide, rows + 5, 0, wide6); +- mvwprintw(padwide, rows + 6, 0, wide7); +- mvwprintw(padwide, rows + 7, 0, wide8); +- mvwprintw(padwide, rows + 8, 0, wide9); +- mvwprintw(padwide, rows + 9, 0, wide10); ++ mvwprintw(padwide, rows + 0, 0, "%s", wide1); ++ mvwprintw(padwide, rows + 1, 0, "%s", wide2); ++ mvwprintw(padwide, rows + 2, 0, "%s", wide3); ++ mvwprintw(padwide, rows + 3, 0, "%s", wide4); ++ mvwprintw(padwide, rows + 4, 0, "%s", wide5); ++ mvwprintw(padwide, rows + 5, 0, "%s", wide6); ++ mvwprintw(padwide, rows + 6, 0, "%s", wide7); ++ mvwprintw(padwide, rows + 7, 0, "%s", wide8); ++ mvwprintw(padwide, rows + 8, 0, "%s", wide9); ++ mvwprintw(padwide, rows + 9, 0, "%s", wide10); + mvwprintw(padwide, rows + 10, 0, + " CPU +129--------+140------+150------+160------+170------+180------+190--0%%"); + if (wide_first_time) { +@@ -8274,7 +8274,7 @@ I/F Name Recv=KB/s Trans=KB/s packin packout insize outsize Peak->Recv Trans + formatstring = + " PID %%CPU Size Res Res Res Res Shared Faults Command"; + } +- CURSE mvwprintw(padtop, 1, y, formatstring); ++ CURSE mvwprintw(padtop, 1, y, "%s", formatstring); + + if (show_args == ARGS_ONLY) { + formatstring = +@@ -8294,7 +8294,7 @@ I/F Name Recv=KB/s Trans=KB/s packin packout insize outsize Peak->Recv Trans + formatstring = + " Used KB Set Text Data Lib KB Min Maj "; + } +- CURSE mvwprintw(padtop, 2, 1, formatstring); ++ CURSE mvwprintw(padtop, 2, 1, "%s", formatstring); + for (j = 0; j < max_sorted; j++) { + i = topper[j].index; + if (!show_all) { diff --git a/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch b/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch index e8debe56af..6721d2b5e5 100644 --- a/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch +++ b/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch @@ -9,13 +9,15 @@ defines from sys/cdefs.h is used Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - lmon16g.c | 4 ++-- +Upstream-Status: Pending + + lmon16m.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/lmon16g.c b/lmon16g.c +diff --git a/lmon16m.c b/lmon16m.c index cb27e09..d2a11c5 100644 ---- a/lmon16g.c -+++ b/lmon16g.c +--- a/lmon16m.c ++++ b/lmon16m.c @@ -63,7 +63,7 @@ static char *SccsId = "nmon " VERSION; #include <fcntl.h> #include <math.h> diff --git a/meta-oe/recipes-support/nmon/nmon_16g.bb b/meta-oe/recipes-support/nmon/nmon_16m.bb index e77faa30ad..495afd164f 100644 --- a/meta-oe/recipes-support/nmon/nmon_16g.bb +++ b/meta-oe/recipes-support/nmon/nmon_16m.bb @@ -1,25 +1,28 @@ SUMMARY = "nmon performance monitor" HOMEPAGE = "http://nmon.sf.net" SECTION = "console/utils" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://${WORKDIR}/Documentation.txt;md5=dbb13658cf55d687c4f2ff771a696d4a" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://Documentation.txt;md5=dbb13658cf55d687c4f2ff771a696d4a" DEPENDS = "ncurses" -DEPENDS_append_libc-musl = " bsd-headers" +DEPENDS:append:libc-musl = " bsd-headers" SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon${PV}.c;name=lmon \ ${SOURCEFORGE_MIRROR}/nmon/Documentation.txt;name=doc \ file://0001-lmon16g.c-Adjust-system-headers.patch \ -" -SRC_URI[lmon.md5sum] = "246ccfc74d5af55d992601fc4d3d4a72" -SRC_URI[lmon.sha256sum] = "da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688" -SRC_URI[doc.md5sum] = "dbb13658cf55d687c4f2ff771a696d4a" + file://0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch \ + " +SRC_URI[lmon.sha256sum] = "2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1" SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecca933869278" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/nmon/files/" +UPSTREAM_CHECK_REGEX = "lmon(?P<pver>.*).c" + CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM" LDFLAGS += "-ltinfo -lncursesw -lm" -ASNEEDED_pn-nmon = "" +ASNEEDED:pn-nmon = "" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_compile() { ${CC} ${CFLAGS} ${LDFLAGS} lmon${PV}.c -o nmon diff --git a/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch b/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch new file mode 100644 index 0000000000..8515075fe0 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch @@ -0,0 +1,39 @@ +From d24dc9bebaefbd8abf32707bad5efc0c811c0cd4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 13:04:56 -0800 +Subject: [PATCH] Fix -Wincompatible-function-pointer-types + +Fixes warnings with clang16 +testfile.c:576:31: error: incompatible function pointer types passing 'PRInt32 (void *)' (aka 'int (void *)') to parameter of type 'void (*)(void *)' [-Wincompatible-function-pointe r-types] + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pr/tests/testfile.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pr/tests/testfile.c b/pr/tests/testfile.c +index 79d8a05..42aa6a7 100644 +--- a/pr/tests/testfile.c ++++ b/pr/tests/testfile.c +@@ -123,7 +123,7 @@ PRThread* create_new_thread(PRThreadType type, + if (native_thread) { + #if defined(_PR_PTHREADS) + pthread_t tid; +- if (!pthread_create(&tid, NULL, start, arg)) { ++ if (!pthread_create(&tid, NULL, (void*(*)(void*))start, arg)) { + return((PRThread *) tid); + } + else { +@@ -573,7 +573,7 @@ static PRInt32 RunDirTest(void) + + thrarg.done= 0; + t = create_new_thread(PR_USER_THREAD, +- DirTest, &thrarg, ++ (void (*)(void *))DirTest, &thrarg, + PR_PRIORITY_NORMAL, + PR_LOCAL_THREAD, + PR_UNJOINABLE_THREAD, +-- +2.39.1 + diff --git a/meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch b/meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch new file mode 100644 index 0000000000..6ebc9c4ae6 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch @@ -0,0 +1,30 @@ +From 13e9d66c24d1dce5179805ae5e1bf940409b4914 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 10 Aug 2022 15:21:07 +0800 +Subject: [PATCH] config/nspr-config.in: don't pass LDFLAGS + +Don't pass LDFLAGS to avoid exposing the build env info. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + config/nspr-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/nspr-config.in b/config/nspr-config.in +index 2cb62a0..2bec715 100755 +--- a/config/nspr-config.in ++++ b/config/nspr-config.in +@@ -136,7 +136,7 @@ if test "$echo_libs" = "yes"; then + if test -n "$lib_nspr"; then + libdirs="$libdirs -lnspr${major_version}" + fi +- os_ldflags="@LDFLAGS@" ++ os_ldflags="LDFLAGS" + for i in $os_ldflags ; do + if echo $i | grep \^-L >/dev/null; then + libdirs="$libdirs $i" +-- +2.25.1 + diff --git a/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch new file mode 100644 index 0000000000..09855a03dc --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch @@ -0,0 +1,28 @@ +From 5f6fcaeb0b7a319c8afd32ddb48b3515b63a6c0c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 18 Sep 2017 17:22:43 -0700 +Subject: [PATCH] md: Fix build with musl + +The MIPS specific header <sgidefs.h> is not provided by musl +linux kernel headers provide <asm/sgidefs.h> which has same definitions + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + pr/include/md/_linux.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg +index aa3af78..899826f 100644 +--- a/pr/include/md/_linux.cfg ++++ b/pr/include/md/_linux.cfg +@@ -511,7 +511,7 @@ + #error "Unknown MIPS endianness." + #endif + +-#if _MIPS_SIM == _ABI64 ++#if _MIPS_SIM == _MIPS_SIM_ABI64 + + #define IS_64 + diff --git a/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch new file mode 100644 index 0000000000..dab2a4e291 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch @@ -0,0 +1,89 @@ +From 4760065a58153e4dae24e4e437a5136592c624bc Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Sat, 30 Jan 2016 07:18:02 +0100 +Subject: [PATCH] Add nios2 support + +Add support for the nios2 CPU. + +Signed-off-by: Marek Vasut <marex@denx.de> +Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] + +--- + pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++ + pr/include/md/_linux.h | 4 +++- + 2 files changed, 48 insertions(+), 1 deletion(-) + +--- a/pr/include/md/_linux.cfg ++++ b/pr/include/md/_linux.cfg +@@ -975,6 +975,51 @@ + #define PR_BYTES_PER_WORD_LOG2 2 + #define PR_BYTES_PER_DWORD_LOG2 3 + ++#elif defined(__nios2__) ++ ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 4 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 4 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #elif defined(__or1k__) + + #undef IS_LITTLE_ENDIAN +--- a/pr/include/md/_linux.h ++++ b/pr/include/md/_linux.h +@@ -55,6 +55,8 @@ + #define _PR_SI_ARCHITECTURE "avr32" + #elif defined(__m32r__) + #define _PR_SI_ARCHITECTURE "m32r" ++#elif defined(__nios2__) ++#define _PR_SI_ARCHITECTURE "nios2" + #elif defined(__or1k__) + #define _PR_SI_ARCHITECTURE "or1k" + #elif defined(__riscv) && (__riscv_xlen == 32) +@@ -143,7 +145,7 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn + #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet + #endif + +-#if defined(__loongarch__) ++#if defined(__loongarch__) || defined(__nios2__) + #if defined(__GNUC__) + /* Use GCC built-in functions */ + #define _PR_HAVE_ATOMIC_OPS diff --git a/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch new file mode 100644 index 0000000000..90fe45f34d --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch @@ -0,0 +1,103 @@ +From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <Mingli.Yu@windriver.com> +Date: Fri, 16 Nov 2018 13:52:49 +0800 +Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME + +Remove _BUILD_STRING and _BUILD_TIME to avoid +adding timestamp to _pl_bld.h which can result +in adding timestamp in library file such as +libnspr4.so. + $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so + [snip] + 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49 + [snip] + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +--- + lib/ds/Makefile.in | 8 +------- + lib/libc/src/Makefile.in | 8 +------- + lib/prstreams/Makefile.in | 8 +------- + pr/src/Makefile.in | 8 +------- + 4 files changed, 4 insertions(+), 28 deletions(-) + +diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in +index e737791..b578476 100644 +--- a/lib/ds/Makefile.in ++++ b/lib/ds/Makefile.in +@@ -114,13 +114,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in +index e8a6d9f..978ed28 100644 +--- a/lib/libc/src/Makefile.in ++++ b/lib/libc/src/Makefile.in +@@ -116,13 +116,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in +index aeb2944..f318097 100644 +--- a/lib/prstreams/Makefile.in ++++ b/lib/prstreams/Makefile.in +@@ -116,13 +116,7 @@ endif + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in +index 19c5a69..b4ac31c 100644 +--- a/pr/src/Makefile.in ++++ b/pr/src/Makefile.in +@@ -326,13 +326,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) +-- +2.7.4 + diff --git a/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch new file mode 100644 index 0000000000..f12acc8548 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch @@ -0,0 +1,52 @@ +Fix build failure on x86_64 + +When the target_cpu is x86_64, we should assume that the pkg uses 64bit, +only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a +opposite logic before. + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + +Upstream-Status: Pending +--- + configure.in | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +Index: nspr/configure.in +=================================================================== +--- nspr.orig/configure.in ++++ nspr/configure.in +@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve + PR_MD_ASFILES=os_Linux_ia64.s + ;; + x86_64) +- if test -n "$USE_64"; then +- PR_MD_ASFILES=os_Linux_x86_64.s +- elif test -n "$USE_X32"; then ++ if test -n "$USE_X32"; then ++ AC_DEFINE(i386) + PR_MD_ASFILES=os_Linux_x86_64.s + CC="$CC -mx32" + CXX="$CXX -mx32" + else +- AC_DEFINE(i386) +- PR_MD_ASFILES=os_Linux_x86.s +- CC="$CC -m32" +- CXX="$CXX -m32" ++ PR_MD_ASFILES=os_Linux_x86_64.s + fi + ;; + ppc|powerpc) + PR_MD_ASFILES=os_Linux_ppc.s + ;; + powerpc64) +- if test -n "$USE_64"; then ++ if test -n "$USE_N32"; then ++ PR_MD_ASFILES=os_Linux_ppc.s ++ else + CC="$CC -m64" + CXX="$CXX -m64" +- else +- PR_MD_ASFILES=os_Linux_ppc.s + fi + ;; + esac diff --git a/meta-oe/recipes-support/nspr/nspr/nspr.pc.in b/meta-oe/recipes-support/nspr/nspr/nspr.pc.in new file mode 100644 index 0000000000..1f15d19cfa --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/nspr.pc.in @@ -0,0 +1,11 @@ +os_libs=-lpthread -ldl +prefix=OEPREFIX +exec_prefix=OEEXECPREFIX +libdir=OELIBDIR +includedir=OEINCDIR + +Name: NSPR +Description: The Netscape Portable Runtime +Version: NSPRVERSION +Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl +Cflags: -I${includedir}/nspr diff --git a/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch new file mode 100644 index 0000000000..7ba59ed644 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch @@ -0,0 +1,26 @@ +Author: Andrei Gherzan <andrei@gherzan.ro> +Date: Thu Feb 9 00:03:38 2012 +0200 + +Avoid QA warnings by removing hardcoded rpath from binaries. + +[...] +WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib +in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait +[...] + +Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> +Upstream-Status: Pending + +Index: nspr/pr/tests/Makefile.in +=================================================================== +--- nspr.orig/pr/tests/Makefile.in ++++ nspr/pr/tests/Makefile.in +@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS) + endif # SunOS + + ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) +- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) ++ LDOPTS += -Xlinker + ifeq ($(USE_PTHREADS),1) + EXTRA_LIBS = -lpthread + endif diff --git a/meta-oe/recipes-support/nspr/nspr_4.35.bb b/meta-oe/recipes-support/nspr/nspr_4.35.bb new file mode 100644 index 0000000000..abd750b138 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr_4.35.bb @@ -0,0 +1,199 @@ +SUMMARY = "Netscape Portable Runtime Library" +HOMEPAGE = "http://www.mozilla.org/projects/nspr/" +LICENSE = "GPL-2.0-only | MPL-2.0 | LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ + file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" +SECTION = "libs/network" + +SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ + file://remove-rpath-from-tests.patch \ + file://fix-build-on-x86_64.patch \ + file://0002-Add-nios2-support.patch \ + file://0001-md-Fix-build-with-musl.patch \ + file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ + file://0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch \ + file://0001-Fix-Wincompatible-function-pointer-types.patch \ + file://nspr.pc.in \ + " + +CACHED_CONFIGUREVARS:append:libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ + -D_PR_HAVE_LARGE_OFF_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ + -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ + -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" + +UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" +UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/" + +SRC_URI[sha256sum] = "7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f" + +CVE_PRODUCT = "netscape_portable_runtime" + +S = "${WORKDIR}/nspr-${PV}/nspr" + +RDEPENDS:${PN}-dev += "perl" +TARGET_CC_ARCH += "${LDFLAGS}" + +TESTS = " \ + accept \ + acceptread \ + acceptreademu \ + affinity \ + alarm \ + anonfm \ + atomic \ + attach \ + bigfile \ + cleanup \ + cltsrv \ + concur \ + cvar \ + cvar2 \ + dlltest \ + dtoa \ + errcodes \ + exit \ + fdcach \ + fileio \ + foreign \ + formattm \ + fsync \ + gethost \ + getproto \ + i2l \ + initclk \ + inrval \ + instrumt \ + intrio \ + intrupt \ + io_timeout \ + ioconthr \ + join \ + joinkk \ + joinku \ + joinuk \ + joinuu \ + layer \ + lazyinit \ + libfilename \ + lltest \ + lock \ + lockfile \ + logfile \ + logger \ + many_cv \ + multiwait \ + nameshm1 \ + nblayer \ + nonblock \ + ntioto \ + ntoh \ + op_2long \ + op_excl \ + op_filnf \ + op_filok \ + op_nofil \ + parent \ + parsetm \ + peek \ + perf \ + pipeping \ + pipeping2 \ + pipeself \ + poll_nm \ + poll_to \ + pollable \ + prftest \ + primblok \ + provider \ + prpollml \ + ranfile \ + randseed \ + reinit \ + rwlocktest \ + sel_spd \ + selct_er \ + selct_nm \ + selct_to \ + selintr \ + sema \ + semaerr \ + semaping \ + sendzlf \ + server_test \ + servr_kk \ + servr_uk \ + servr_ku \ + servr_uu \ + short_thread \ + sigpipe \ + socket \ + sockopt \ + sockping \ + sprintf \ + stack \ + stdio \ + str2addr \ + strod \ + switch \ + system \ + testbit \ + testfile \ + threads \ + timemac \ + timetest \ + tpd \ + udpsrv \ + vercheck \ + version \ + writev \ + xnotify \ + zerolen" + +inherit autotools multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +# Do not install nspr in usr/include, but in usr/include/nspr, the +# preferred path upstream. +EXTRA_OECONF += "--includedir=${includedir}/nspr" + +EXTRA_OEMAKE:append:class-native = " EXTRA_LIBS='-lpthread -lrt -ldl'" + +do_compile:prepend() { + oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export +} + +do_compile:append() { + oe_runmake -C pr/tests +} + +do_install:append() { + install -D ${UNPACKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc + sed -i \ + -e 's:NSPRVERSION:${PV}:g' \ + -e 's:OEPREFIX:${prefix}:g' \ + -e 's:OELIBDIR:${libdir}:g' \ + -e 's:OEINCDIR:${includedir}:g' \ + -e 's:OEEXECPREFIX:${exec_prefix}:g' \ + ${D}${libdir}/pkgconfig/nspr.pc + + mkdir -p ${D}${libdir}/nspr/tests + install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests + install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests + cd ${B}/pr/tests + install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests + + # delete compile-et.pl and perr.properties from ${bindir} because these are + # only used to generate prerr.c and prerr.h files from prerr.et at compile + # time + rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties +} + +FILES:${PN} = "${libdir}/lib*.so" +FILES:${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ + ${includedir}/* ${datadir}/aclocal/* " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch new file mode 100644 index 0000000000..b7f1b01a14 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -0,0 +1,57 @@ +From 7c8f367faf8848a43a414079189e10270d6c0fcc Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 18 Dec 2019 12:29:50 +0100 +Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto + +Not all current hardware supports it, particularly anything +prior to armv8 does not. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +--- + nss/lib/freebl/Makefile | 3 +++ + nss/lib/freebl/gcm.c | 2 ++ + 2 files changed, 5 insertions(+) + +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index 7ee8736..f9b4925 100644 +--- a/nss/lib/freebl/Makefile ++++ b/nss/lib/freebl/Makefile +@@ -142,6 +142,8 @@ endif + endif + endif + endif ++ifdef NSS_USE_ARM_HW_CRYPTO ++ DEFINES += -DNSS_USE_ARM_HW_CRYPTO + ifeq ($(CPU_ARCH),aarch64) + ifdef CC_IS_CLANG + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 +@@ -183,6 +185,7 @@ endif + endif + endif + endif ++endif + + ifeq (OS2,$(OS_TARGET)) + ASFILES = mpi_x86_os2.s +diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c +index 2dae724..9ee7fc8 100644 +--- a/nss/lib/freebl/gcm.c ++++ b/nss/lib/freebl/gcm.c +@@ -18,6 +18,7 @@ + + #include <limits.h> + ++#ifdef NSS_USE_ARM_HW_CRYPTO + /* old gcc doesn't support some poly64x2_t intrinsic */ + #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ + (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) +@@ -27,6 +28,7 @@ + /* We don't test on big endian platform, so disable this on big endian. */ + #define USE_ARM_GCM + #endif ++#endif + + /* Forward declarations */ + SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch new file mode 100644 index 0000000000..2385fd3b9d --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch @@ -0,0 +1,51 @@ +From 46ab1ca6e6fb8e1196e0665a54506dff370f8f2a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 22 Feb 2017 11:36:11 +0200 +Subject: [PATCH] nss: fix support cross compiling + +Let some make variables be assigned from outside makefile. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +--- + nss/coreconf/arch.mk | 4 ++-- + nss/lib/freebl/Makefile | 6 ++++++ + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +index 17e9fae..bc4180a 100644 +--- a/nss/coreconf/arch.mk ++++ b/nss/coreconf/arch.mk +@@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s)) + # Attempt to differentiate between sparc and x86 Solaris + # + +-OS_TEST := $(shell uname -m) ++OS_TEST ?= $(shell uname -m) + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else +- OS_RELEASE := $(shell uname -r) ++ OS_RELEASE ?= $(shell uname -r) + endif + + +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index eeee90a..7ee8736 100644 +--- a/nss/lib/freebl/Makefile ++++ b/nss/lib/freebl/Makefile +@@ -36,6 +36,12 @@ ifdef USE_64 + DEFINES += -DNSS_USE_64 + endif + ++ifeq ($(OS_TEST),mips) ++ifndef USE_64 ++ DEFINES += -DNS_PTR_LE_32 ++endif ++endif ++ + ifdef USE_ABI32_FPU + DEFINES += -DNSS_USE_ABI32_FPU + endif diff --git a/meta-oe/recipes-support/nss/nss/blank-cert9.db b/meta-oe/recipes-support/nss/nss/blank-cert9.db Binary files differnew file mode 100644 index 0000000000..7d4bcf2582 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/blank-cert9.db diff --git a/meta-oe/recipes-support/nss/nss/blank-key4.db b/meta-oe/recipes-support/nss/nss/blank-key4.db Binary files differnew file mode 100644 index 0000000000..d47f08d04f --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/blank-key4.db diff --git a/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch new file mode 100644 index 0000000000..4c9bea30c0 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch @@ -0,0 +1,42 @@ +From f613c9a9107435a40d91329f33f12cfb16927f07 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss,nspr: Add recipes + +clang 3.9 add this warning to rightly flag undefined +behavior, we relegate this to be just a warning instead +of error and keep the behavior as it was. Right fix would +be to not pass enum to the function with variadic arguments +as last named argument + +Fixes errors like +ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] + va_start(ap, responseType0); + ^ +ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here + SECOidTag responseType0, ...) + +see +https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start +for more details + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +--- + nss/coreconf/Werror.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/coreconf/Werror.mk b/nss/coreconf/Werror.mk +index a569a49..687fe58 100644 +--- a/nss/coreconf/Werror.mk ++++ b/nss/coreconf/Werror.mk +@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS + ifdef CC_IS_CLANG + # -Qunused-arguments : clang objects to arguments that it doesn't understand + # and fixing this would require rearchitecture +- WARNING_CFLAGS += -Qunused-arguments ++ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs + # -Wno-parentheses-equality : because clang warns about macro expansions + WARNING_CFLAGS += $(call disable_warning,parentheses-equality) + ifdef BUILD_OPT diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch new file mode 100644 index 0000000000..735b06b5ca --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch @@ -0,0 +1,91 @@ +From 2ce67b1f4b1f582d556ae058da10698bbaa0edc1 Mon Sep 17 00:00:00 2001 +From: Ovidiu Panait <ovidiu.panait@windriver.com> +Date: Mon, 13 Jul 2020 12:12:31 +0300 +Subject: [PATCH] nss: fix incorrect shebang of perl + +Replace incorrect shebang of perl with `#!/usr/bin/env perl'. + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Upstream-Status: Pending +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +--- + nss/cmd/signver/examples/1/form.pl | 2 +- + nss/cmd/signver/examples/1/signedForm.pl | 2 +- + nss/cmd/smimetools/smime | 2 +- + nss/coreconf/version.pl | 2 +- + nss/tests/clean_tbx | 2 +- + nss/tests/iopr/server_scr/client.cgi | 2 +- + nss/tests/path_uniq | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/nss/cmd/signver/examples/1/form.pl b/nss/cmd/signver/examples/1/form.pl +index f2cfddc..af58d54 100755 +--- a/nss/cmd/signver/examples/1/form.pl ++++ b/nss/cmd/signver/examples/1/form.pl +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl ++#!/usr/bin/env perl + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +diff --git a/nss/cmd/signver/examples/1/signedForm.pl b/nss/cmd/signver/examples/1/signedForm.pl +index 847814c..64a31ff 100755 +--- a/nss/cmd/signver/examples/1/signedForm.pl ++++ b/nss/cmd/signver/examples/1/signedForm.pl +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl ++#!/usr/bin/env perl + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime +index e67f6be..6cd85e6 100755 +--- a/nss/cmd/smimetools/smime ++++ b/nss/cmd/smimetools/smime +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/env perl + + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl +index d2a4942..3ba7323 100644 +--- a/nss/coreconf/version.pl ++++ b/nss/coreconf/version.pl +@@ -1,4 +1,4 @@ +-#!/usr/sbin/perl ++#!/usr/bin/env perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx +index 4de9555..c15a069 100755 +--- a/nss/tests/clean_tbx ++++ b/nss/tests/clean_tbx +@@ -1,4 +1,4 @@ +-#! /bin/perl ++#!/usr/bin/env perl + + ####################################################################### + # +diff --git a/nss/tests/iopr/server_scr/client.cgi b/nss/tests/iopr/server_scr/client.cgi +index 581ad06..34ea170 100644 +--- a/nss/tests/iopr/server_scr/client.cgi ++++ b/nss/tests/iopr/server_scr/client.cgi +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/env perl + + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq +index f29f60a..850332a 100755 +--- a/nss/tests/path_uniq ++++ b/nss/tests/path_uniq +@@ -1,4 +1,4 @@ +-#! /bin/perl ++#!/usr/bin/env perl + + ######################################################################## + # diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch new file mode 100644 index 0000000000..a1897f88d8 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch @@ -0,0 +1,44 @@ +From f9b2b1c738576a17460aebd005f511f427aa1974 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <wenzong.fan@windriver.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit + +While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will +fail with error: + +* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled + +It caused by the '-m64' option which passed to host gcc. + +The nsinstall was built first while nss starting to build, it only runs +on host to install built files, it doesn't need any cross-compling or +multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this +error. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +=================================================== + +--- + nss/coreconf/nsinstall/Makefile | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile +index 08dfbc2..e97fb5f 100644 +--- a/nss/coreconf/nsinstall/Makefile ++++ b/nss/coreconf/nsinstall/Makefile +@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 + + include $(DEPTH)/coreconf/config.mk + ++# nsinstall is unfit for cross-compiling/multilib-build since it was ++# always run on local host to install built files. This change intends ++# to clean the '-m64' from ARCHFLAG and LDFLAGS. ++ARCHFLAG = ++LDFLAGS = ++# CFLAGS = ++ + ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) + PROGRAM = + TARGETS = diff --git a/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch new file mode 100644 index 0000000000..8c715cc447 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch @@ -0,0 +1,28 @@ +From 73edfbdf33fe4e41724e7e947033d8caeec8f3d0 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss:no rpath for cross compiling + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Upstream-Status: Inappropriate [configuration] + +--- + nss/cmd/platlibs.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +index 6401778..e5c4e16 100644 +--- a/nss/cmd/platlibs.mk ++++ b/nss/cmd/platlibs.mk +@@ -18,9 +18,9 @@ endif + + ifeq ($(OS_ARCH), Linux) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' + else +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' + endif + endif + diff --git a/meta-oe/recipes-support/nss/nss/nss.pc.in b/meta-oe/recipes-support/nss/nss/nss.pc.in new file mode 100644 index 0000000000..402b4ecb33 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/nss.pc.in @@ -0,0 +1,11 @@ +prefix=OEPREFIX +exec_prefix=OEEXECPREFIX +libdir=OELIBDIR +includedir=OEINCDIR + +Name: NSS +Description: Network Security Services +Version: %NSS_VERSION% +Requires: nspr >= %NSPR_VERSION% +Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 +Cflags: -IOEINCDIR diff --git a/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch new file mode 100644 index 0000000000..589b4d5e7f --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch @@ -0,0 +1,32 @@ +From cbd367160338847b28fc801a12c74f1c8b5b03ee Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss does not build on mips with clang because wrong types are + used? + +pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] + if (addend < MP_DIGIT_MAX) { + ~~~~~~ ^ ~~~~~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +--- + nss/lib/freebl/pqg.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c +index 1b03278..ad895b7 100644 +--- a/nss/lib/freebl/pqg.c ++++ b/nss/lib/freebl/pqg.c +@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H) + + static SECStatus + addToSeed(const SECItem *seed, +- unsigned long addend, +- int seedlen, /* g in 186-1 */ ++ unsigned long long addend, ++ int seedlen, /* g in 186-1 */ + SECItem *seedout) + { + mp_int s, sum, modulus, tmp; diff --git a/meta-oe/recipes-support/nss/nss/system-pkcs11.txt b/meta-oe/recipes-support/nss/nss/system-pkcs11.txt new file mode 100644 index 0000000000..1a264e9cc4 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/system-pkcs11.txt @@ -0,0 +1,5 @@ +library= +name=NSS Internal PKCS #11 Module +parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' +NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) + diff --git a/meta-oe/recipes-support/nss/nss_3.103.bb b/meta-oe/recipes-support/nss/nss_3.103.bb new file mode 100644 index 0000000000..64141e9383 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss_3.103.bb @@ -0,0 +1,289 @@ +SUMMARY = "Mozilla's SSL and TLS implementation" +DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ +designed to support cross-platform development of \ +security-enabled client and server applications. \ +Applications built with NSS can support SSL v2 and v3, \ +TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ +v3 certificates, and other security standards." +HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" +SECTION = "libs" + +DEPENDS = "sqlite3 nspr zlib nss-native" +DEPENDS:class-native = "sqlite3-native nspr-native zlib-native" + +LICENSE = "(MPL-2.0 & MIT) | (MPL-2.0 & GPL-2.0-or-later & MIT) | (MPL-2.0 & LGPL-2.1-or-later & MIT)" + +LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ + file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ + file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132 \ + file://nss/lib/freebl/verified/Hacl_Poly1305_256.c;beginline=1;endline=22;md5=cc22f07b95d28d56baeb757df46ee7c8" + +VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" + +SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ + file://nss.pc.in \ + file://0001-nss-fix-support-cross-compiling.patch \ + file://nss-no-rpath-for-cross-compiling.patch \ + file://nss-fix-incorrect-shebang-of-perl.patch \ + file://disable-Wvarargs-with-clang.patch \ + file://pqg.c-ULL_addend.patch \ + file://blank-cert9.db \ + file://blank-key4.db \ + file://system-pkcs11.txt \ + file://nss-fix-nsinstall-build.patch \ + file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ + " +SRC_URI[sha256sum] = "7b4ab657f772dc7520c46e8d481940b292dcfc6a4c90150a7c26672384cee962" + +UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/" +UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)" + +inherit siteinfo + +TD = "${S}/tentative-dist" +TDS = "${S}/tentative-dist-staging" + +TARGET_CC_ARCH += "${LDFLAGS}" + +CFLAGS:append:class-native = " -D_XOPEN_SOURCE " + +do_configure:prepend:libc-musl () { + sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk +} + +do_configure:prepend:powerpc64le:toolchain-clang () { + sed -i -e 's/\-std=c99/\-std=gnu99/g' ${S}/nss/coreconf/command.mk +} + +do_configure:prepend:powerpc64:toolchain-clang () { + sed -i -e 's/\-std=c99/\-std=gnu99/g' ${S}/nss/coreconf/command.mk +} + +do_compile:prepend:class-native() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr + export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} +} + +do_compile:prepend:class-nativesdk() { + export LDFLAGS="" +} + +do_compile:prepend:class-native() { + # Need to set RPATH so that chrpath will do its job correctly + RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" +} + +do_compile() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr + + export CROSS_COMPILE=1 + export NATIVE_CC="${BUILD_CC}" + # Additional defines needed on Centos 7 + export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" + export BUILD_OPT=1 + + # POSIX.1-2001 states that the behaviour of getcwd() when passing a null + # pointer as the buf argument, is unspecified. + export NATIVE_FLAGS="${NATIVE_FLAGS} -DGETCWD_CANT_MALLOC" + + export FREEBL_NO_DEPEND=1 + export FREEBL_LOWHASH=1 + + export LIBDIR=${libdir} + export MOZILLA_CLIENT=1 + export NS_USE_GCC=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + export NSS_ENABLE_WERROR=0 + + ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} + + export OS_RELEASE=3.4 + export OS_TARGET=Linux + export OS_ARCH=Linux + + if [ "${TARGET_ARCH}" = "powerpc" ]; then + OS_TEST=ppc + elif [ "${TARGET_ARCH}" = "powerpc64" -o "${TARGET_ARCH}" = "powerpc64le" ]; then + OS_TEST=ppc64 + elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then + OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + OS_TEST="aarch64" + else + OS_TEST="${TARGET_ARCH}" + fi + + if [ "${SITEINFO_BITS}" = "64" ]; then + export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 + fi + + export NSS_DISABLE_GTESTS=1 + # We can modify CC in the environment, but if we set it via an + # argument to make, nsinstall, a host program, will also build with it! + # + # nss pretty much does its own thing with CFLAGS, so we put them into CC. + # Optimization will get clobbered, but most of the stuff will survive. + # The motivation for this is to point to the correct place for debug + # source files and CFLAGS does that. Nothing uses CCC. + # + export CC="${CC} ${CFLAGS}" + make -C ./nss CCC="${CXX} -g" \ + OS_TEST=${OS_TEST} \ + RPATH="${RPATH}" \ + autobuild +} + +do_compile[vardepsexclude] += "SITEINFO_BITS" + +do_install:prepend:class-nativesdk() { + export LDFLAGS="" +} + +do_install() { + export CROSS_COMPILE=1 + export NATIVE_CC="${BUILD_CC}" + export BUILD_OPT=1 + + export FREEBL_NO_DEPEND=1 + + export LIBDIR=${libdir} + export MOZILLA_CLIENT=1 + export NS_USE_GCC=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + + export OS_RELEASE=3.4 + export OS_TARGET=Linux + export OS_ARCH=Linux + + if [ "${TARGET_ARCH}" = "powerpc" ]; then + OS_TEST=ppc + elif [ "${TARGET_ARCH}" = "powerpc64" -o "${TARGET_ARCH}" = "powerpc64le" ]; then + OS_TEST=ppc64 + elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then + OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + CPU_ARCH=aarch64 + OS_TEST="aarch64" + else + OS_TEST="${TARGET_ARCH}" + fi + if [ "${SITEINFO_BITS}" = "64" ]; then + export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 + fi + + export NSS_DISABLE_GTESTS=1 + + make -C ./nss \ + CCC="${CXX}" \ + OS_TEST=${OS_TEST} \ + SOURCE_LIB_DIR="${TD}/${libdir}" \ + SOURCE_BIN_DIR="${TD}/${bindir}" \ + install + + install -d ${D}/${libdir}/ + for file in ${S}/dist/*.OBJ/lib/*.so; do + echo "Installing `basename $file`..." + cp $file ${D}/${libdir}/ + done + + for shared_lib in ${TD}/${libdir}/*.so.*; do + if [ -f $shared_lib ]; then + cp $shared_lib ${D}/${libdir} + ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) + fi + done + for shared_lib in ${TD}/${libdir}/*.so; do + if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then + cp $shared_lib ${D}/${libdir} + fi + done + + install -d ${D}/${includedir}/nss3 + install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* + + install -d ${D}/${bindir} + for binary in ${TD}/${bindir}/*; do + install -m 755 -t ${D}/${bindir} $binary + done +} + +do_install[vardepsexclude] += "SITEINFO_BITS" + +do_install:append() { + # Create empty .chk files for the NSS libraries at build time. They could + # be regenerated at target's boot time. + for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do + touch ${D}/${libdir}/$file + chmod 755 ${D}/${libdir}/$file + done + + install -d ${D}${libdir}/pkgconfig/ + sed 's/%NSS_VERSION%/${PV}/' ${UNPACKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc +} + +do_install:append:class-target() { + # It used to call certutil to create a blank certificate with empty password at + # build time, but the checksum of key4.db changes every time when certutil is called. + # It causes non-determinism issue, so provide databases with a blank certificate + # which are originally from output of nss in qemux86-64 build. You can get these + # databases by: + # certutil -N -d sql:/database/path/ --empty-password + install -d ${D}${sysconfdir}/pki/nssdb/ + install -m 0644 ${UNPACKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db + install -m 0644 ${UNPACKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db + install -m 0644 ${UNPACKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt +} + +PACKAGE_WRITE_DEPS += "nss-native" + +pkg_postinst:${PN} () { + for I in $D${libdir}/lib*.chk; do + DN=`dirname $I` + BN=`basename $I .chk` + FN=$DN/$BN.so + shlibsign -i $FN + if [ $? -ne 0 ]; then + echo "shlibsign -i $FN failed" + fi + done +} + +PACKAGES =+ "${PN}-smime" +FILES:${PN}-smime = "\ + ${bindir}/smime \ +" + +FILES:${PN} = "\ + ${sysconfdir} \ + ${bindir} \ + ${libdir}/lib*.chk \ + ${libdir}/lib*.so \ + " + +FILES:${PN}-dev = "\ + ${libdir}/nss \ + ${libdir}/pkgconfig/* \ + ${includedir}/* \ + " + +RDEPENDS:${PN}-smime = "perl" + +BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT += "network_security_services" + +CVE_STATUS_GROUPS += "CVE_STATUS_NSS" +CVE_STATUS_NSS[status] = "not-applicable-config: This only affect the legacy db (libnssdbm), only compiled with --enable-legacy-db" +CVE_STATUS_NSS = "CVE-2017-11695 CVE-2017-11696 CVE-2017-11697 CVE-2017-11698" + +CVE_STATUS[CVE-2022-3479] = "not-applicable-config: vulnerability was introduced in 3.77 and fixed in 3.87" diff --git a/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch b/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch deleted file mode 100644 index 78ffb22f89..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch +++ /dev/null @@ -1,32 +0,0 @@ -rename test target as run-test - -Upstream-Statue: Pending - -test target not only compile the test files, but also run them, which is -not suitable for cross-compile environment, so rename it as run-test. - -and define test target to compile the test files. - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - Makefile.am | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index b6db339..de176c4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -124,7 +124,9 @@ regress2: $(check_PROGRAMS) - test_numademo: numademo - ./numademo -t -e 10M - --test: all $(check_PROGRAMS) regress1 regress2 test_numademo -+test: all $(check_PROGRAMS) -+ -+run-test: all $(check_PROGRAMS) regress1 regress2 test_numademo - - TESTS_ENVIRONMENT = builddir='$(builddir)'; export builddir; - --- -1.9.1 - diff --git a/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch b/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch deleted file mode 100644 index 9812ecc8b3..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 59fd750a84bbe5874dec936d2bee9ef11a1b6505 Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Tue, 21 Jul 2015 02:01:22 +0900 -Subject: [PATCH] Fix the test output format - -Upstream-Status: Pending - -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> ---- - test/regress | 6 +++--- - test/regress2 | 11 +++++------ - 2 files changed, 8 insertions(+), 9 deletions(-) - -diff --git a/test/regress b/test/regress -index 2ce1705..d086a47 100755 ---- a/test/regress -+++ b/test/regress -@@ -74,6 +74,7 @@ probe_hardware() - if [ $numnodes -lt 2 ] ; then - echo "need at least two nodes with at least $NEEDPAGES each of" - echo "free memory for mempolicy regression tests" -+ echo "FAIL: numa regress" - exit 77 # Skip test - fi - } -@@ -207,10 +208,9 @@ main() - rm A B - - if [ "$EXIT" = 0 ] ; then -- echo '========SUCCESS' -+ echo 'PASS: numactl regress' - else -- echo '========FAILURE' -- exit 1 -+ echo 'FAIL: numactl regress' - fi - } - -diff --git a/test/regress2 b/test/regress2 -index aa6ea41..450c510 100755 ---- a/test/regress2 -+++ b/test/regress2 -@@ -9,12 +9,11 @@ testdir=`dirname "$0"` - export PATH=${builddir}:$PATH - - T() { -- echo "$@" -- if ! $VALGRIND "$@" ; then -- echo $1 FAILED!!!! -- exit 1 -- fi -- echo -+ if ! $VALGRIND "$@" 2>&1 1>/dev/null; then -+ echo "FAIL: $1" -+ else -+ echo "PASS: $1" -+ fi - } - - # still broken --- -1.8.4.2 - diff --git a/meta-oe/recipes-support/numactl/numactl/Makefile b/meta-oe/recipes-support/numactl/numactl/Makefile deleted file mode 100644 index 9a5134c3f2..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -.PHONY: regress1 regress2 - -regress1: - cd test ; ./regress - -regress2: - cd test ; ./regress2 diff --git a/meta-oe/recipes-support/numactl/numactl/fix-null-pointer.patch b/meta-oe/recipes-support/numactl/numactl/fix-null-pointer.patch deleted file mode 100644 index 53952aef95..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/fix-null-pointer.patch +++ /dev/null @@ -1,28 +0,0 @@ -[PATCH] return 0 if distance_table is NULL - -Upstream-Status: Pending - -read_distance_table() maybe return 0, but distance_table is not set, -if distance_table is used, and will lead to SEGFAULT - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - distance.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/distance.c b/distance.c -index 4a26972..c6ca021 100755 ---- a/distance.c -+++ b/distance.c -@@ -113,6 +113,8 @@ int numa_distance(int a, int b) - int err = read_distance_table(); - if (err < 0) - return 0; -+ if (!distance_table) -+ return 0; - } - return distance_table[a * distance_numnodes + b]; - } --- -1.7.10.4 - diff --git a/meta-oe/recipes-support/numactl/numactl/run-ptest b/meta-oe/recipes-support/numactl/numactl/run-ptest deleted file mode 100755 index 215f7c25b9..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/run-ptest +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -make regress1 -make regress2 -if numademo -t -e 10M; then - echo "PASS: numademo" -else - echo "FAIL: numademo" -fi - diff --git a/meta-oe/recipes-support/numactl/numactl_git.bb b/meta-oe/recipes-support/numactl/numactl_git.bb deleted file mode 100644 index b9cbcf09d0..0000000000 --- a/meta-oe/recipes-support/numactl/numactl_git.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "Development package for building Applications that use numa" -HOMEPAGE = "http://oss.sgi.com/projects/libnuma/" -DESCRIPTION = "Simple NUMA policy support. It consists of a numactl program \ -to run other programs with a specific NUMA policy and a libnuma to do \ -allocations with NUMA policy in applications." -LICENSE = "GPL-2.0 & LGPL-2.1" -SECTION = "apps" -RDEPENDS_${PN} = "perl" - -inherit autotools-brokensep ptest - -LIC_FILES_CHKSUM = "file://README;beginline=19;endline=32;md5=5644cc3851cb2499f6c48e52fe198bd9" - -SRCREV = "ea3a70681c2f523fe58e1d44527f478ca76db74e" -PV = "2.0.11+git${SRCPV}" - -SRC_URI = "git://github.com/numactl/numactl \ - file://fix-null-pointer.patch \ - file://Fix-the-test-output-format.patch \ - file://Makefile \ - file://run-ptest \ - file://0001-define-run-test-target.patch \ -" - -S = "${WORKDIR}/git" - -# ARM does not currently support NUMA -COMPATIBLE_HOST = "^((?!arm).*)$" - -do_install() { - oe_runmake DESTDIR=${D} prefix=${D}/usr install - #remove the empty man2 directory - rm -r ${D}${mandir}/man2 -} - -do_compile_ptest() { - oe_runmake test -} - -do_install_ptest() { - #install tests binaries - local test_binaries="distance ftok mbind_mig_pages migrate_pages move_pages \ - mynode nodemap node-parse pagesize prefered randmap realloc_test \ - tbitmap tshared" - - [ ! -d ${D}/${PTEST_PATH}/test ] && mkdir -p ${D}/${PTEST_PATH}/test - for i in $test_binaries; do - install -m 0755 ${B}/test/.libs/$i ${D}${PTEST_PATH}/test - done - - local test_scripts="checktopology checkaffinity printcpu regress regress2 \ - shmtest runltp bind_range" - for i in $test_scripts; do - install -m 0755 ${B}/test/$i ${D}${PTEST_PATH}/test - done - - install -m 0755 ${WORKDIR}/Makefile ${D}${PTEST_PATH}/ - install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/ -} - -RDEPENDS_${PN}-ptest = "bash" diff --git a/meta-oe/recipes-support/ode/ode/install.patch b/meta-oe/recipes-support/ode/ode/install.patch deleted file mode 100644 index 2f6cdb0080..0000000000 --- a/meta-oe/recipes-support/ode/ode/install.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- ode-0.9.orig/Makefile.am 2007-02-21 15:54:54.000000000 +0100 -+++ ode-0.9/Makefile.am 2010-08-21 16:15:55.000000000 +0200 -@@ -25,13 +25,13 @@ - - if USE_SONAME - install-exec-hook: -- ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ -- $(libdir)/libode.so -- ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ -- $(libdir)/@ODE_SONAME@ -- ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ -- $(libdir)/@ODE_SONAME@.@ODE_REVISION@ -- /sbin/ldconfig -+ ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ -+ $(DESTDIR)/$(libdir)/libode.so -+ ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ -+ $(DESTDIR)/$(libdir)/@ODE_SONAME@ -+ ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ -+ $(DESTDIR)/$(libdir)/@ODE_SONAME@.@ODE_REVISION@ -+ echo /sbin/ldconfig - else - install-exec-hook: - endif diff --git a/meta-oe/recipes-support/onig/files/configure.patch b/meta-oe/recipes-support/onig/files/configure.patch deleted file mode 100644 index 5fa700f190..0000000000 --- a/meta-oe/recipes-support/onig/files/configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: onig-5.9.3/configure.in -=================================================================== ---- onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.000000000 +0000 -+++ onig-5.9.3/configure.in 2014-07-18 08:02:52.701574484 +0000 -@@ -3,7 +3,7 @@ - - AC_CONFIG_MACRO_DIR([m4]) - --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADER(config.h) - - diff --git a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch b/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch deleted file mode 100644 index b93602a268..0000000000 --- a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch +++ /dev/null @@ -1,44 +0,0 @@ -Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - -When build on host with older eglibc (Ubuntu 12.04) build fails with: - -/tmp/OE/build/tmp-eglibc/sysroots/genericarmv8/usr/include/bits/predefs.h:23:3: error: #error "Never use <bits/predefs.h> directly; include <stdc-predef.h> instead." - -Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - -Upstream-Status: Inappropriate [embedded specific] - ---- - Makefile.am | 2 +- - sample/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- onig-5.9.3.orig/Makefile.am -+++ onig-5.9.3/Makefile.am -@@ -4,11 +4,11 @@ sampledir = $(top_srcdir)/sample - libname = libonig.la - - ACLOCAL_AMFLAGS = -I m4 - #AM_CFLAGS = -DNOT_RUBY - AM_CFLAGS = --INCLUDES = -I$(top_srcdir) -I$(includedir) -+INCLUDES = -I$(top_srcdir) - - SUBDIRS = . sample - - include_HEADERS = oniguruma.h oniggnu.h onigposix.h - lib_LTLIBRARIES = $(libname) ---- onig-5.9.3.orig/sample/Makefile.am -+++ onig-5.9.3/sample/Makefile.am -@@ -1,10 +1,10 @@ - noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl - - libname = $(top_builddir)/libonig.la - LDADD = $(libname) --INCLUDES = -I$(top_srcdir) -I$(includedir) -+INCLUDES = -I$(top_srcdir) - - encode_SOURCES = encode.c - listcap_SOURCES = listcap.c - names_SOURCES = names.c - posix_SOURCES = posix.c diff --git a/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch new file mode 100644 index 0000000000..1db9684abd --- /dev/null +++ b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch @@ -0,0 +1,42 @@ +From 543990bc34a0e5d4f66a9167efb1f3b8de6a3635 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net> +Date: Mon, 6 Jan 2020 16:56:31 +0000 +Subject: [PATCH 1/2] build: don't link against (host) system libraries +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: André Draszik <git@andred.net> +--- + sample/Makefile.am | 1 - + test/Makefile.am | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/sample/Makefile.am b/sample/Makefile.am +index 681cd2a933de..c4f796d36da0 100644 +--- a/sample/Makefile.am ++++ b/sample/Makefile.am +@@ -4,7 +4,6 @@ lib_onig = ../src/libonig.la + LDADD = $(lib_onig) + + AM_CFLAGS = -Wall +-AM_LDFLAGS = -L$(libdir) + AM_CPPFLAGS = -I$(top_srcdir)/src + + if ENABLE_POSIX_API +diff --git a/test/Makefile.am b/test/Makefile.am +index 94739a24ab22..a23ef1e2e139 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -1,7 +1,6 @@ + ## Makefile.am for Oniguruma + lib_onig = ../src/libonig.la + +-AM_LDFLAGS = -L$(libdir) + AM_CFLAGS = -Wall -Wno-invalid-source-encoding + AM_CPPFLAGS = -I$(top_srcdir)/src + +-- +2.35.1 + diff --git a/meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch b/meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch new file mode 100644 index 0000000000..096b8baa79 --- /dev/null +++ b/meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch @@ -0,0 +1,38 @@ +From 1ab999aa5a7a21329bab13e05f843e5e029493e1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net> +Date: Mon, 6 Jan 2020 15:10:30 +0000 +Subject: [PATCH 2/2] build: enable serial-tests automake option (for ptest) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For ptest, we need to be able to compile the tests without +running them. + +Enabling the serial-tests automake option will add +buildtest-TESTS and runtest-TESTS makefile targets, the +former being what we want. + +Signed-off-by: André Draszik <git@andred.net> +--- +Upstream-Status: Pending + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 079fef9a1a52..058b5504b9b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.8) + + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([-Wno-portability]) ++AM_INIT_AUTOMAKE([-Wno-portability serial-tests]) + AC_CONFIG_HEADERS([src/config.h]) + + +-- +2.35.1 + diff --git a/meta-oe/recipes-support/onig/onig/run-ptest b/meta-oe/recipes-support/onig/onig/run-ptest new file mode 100755 index 0000000000..fbce336990 --- /dev/null +++ b/meta-oe/recipes-support/onig/onig/run-ptest @@ -0,0 +1,47 @@ +#!/bin/sh -eu + +my_cleanup() { + [ -n "${workdir:-}" ] && rm -rf "${workdir}" +} + +trap "my_cleanup" EXIT +for sig in INT TERM ; do + # We want sig to expand right here and now, as it's + # a loop variable, not when signalled. For $$ it + # doesn't matter. + # shellcheck disable=SC2064 + trap "my_cleanup ; trap - EXIT ; trap - ${sig} ; kill -s ${sig} $$" ${sig} +done + +workdir=$(mktemp -d -t onig.ptest.XXXXXX) +status="${workdir}/failed" +touch "${status}" + +find tests/ -perm -111 -type f ! -path "tests/.debug/*" -exec sh -c ' + workdir="${1}" + status="${2}" + t="${3}" + t_log="${workdir}/$(basename ${t}).log" + + res=0 + ./${t} > "${t_log}" 2>&1 \ + || res=$? + if [ $res -eq 0 ] ; then + echo "PASS: ${t}" + else + echo "FAIL: ${t}" + echo "$(basename ${t}): ${t_log}" >> "${status}" + fi + ' _ "${workdir}" "${status}" {} \; + +if [ $(stat -c '%s' "${status}") -ne 0 ] ; then + exec >&2 + while IFS=': ' read -r t t_log ; do + printf "\n=========================\n" + printf "ERROR: %s:\n" "${t}" + printf -- "-------------------------\n" + cat "${t_log}" + done < "${status}" +fi + +[ $(stat -c '%s' "${status}") -eq 0 ] diff --git a/meta-oe/recipes-support/onig/onig_5.9.6.bb b/meta-oe/recipes-support/onig/onig_5.9.6.bb deleted file mode 100644 index abbaf98c0a..0000000000 --- a/meta-oe/recipes-support/onig/onig_5.9.6.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Regular expressions library. The characteristics of this \ -library is that different character encoding for every regular expression \ -object can be specified." -HOMEPAGE = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=0d4861b5bc0c392a5aa90d9d76ebd86f" - -SRC_URI = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/archive/${BP}.tar.gz \ - file://do-not-use-system-headers.patch \ - file://configure.patch" - -SRC_URI[md5sum] = "d08f10ea5c94919780e6b7bed1ef9830" -SRC_URI[sha256sum] = "d5642010336a6f68b7f2e34b1f1cb14be333e4d95c2ac02b38c162caf44e47a7" - -BINCONFIG = "${bindir}/onig-config" - -inherit autotools binconfig-disabled - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/onig/onig_6.9.9.bb b/meta-oe/recipes-support/onig/onig_6.9.9.bb new file mode 100644 index 0000000000..414d9bfc16 --- /dev/null +++ b/meta-oe/recipes-support/onig/onig_6.9.9.bb @@ -0,0 +1,37 @@ +SUMMARY = "Regular expressions library" +DESCRIPTION = "Oniguruma is a modern and flexible regular expressions library. \ +It encompasses features from different regular expression \ +implementations that traditionally exist in different languages. \ +Character encoding can be specified per regular expression object." +HOMEPAGE = "https://github.com/kkos/oniguruma" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6365c225bb5cc4321d0913f0baffa04" + +SRC_URI = "\ + https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \ + file://0001-build-don-t-link-against-host-system-libraries.patch \ + file://0002-build-enable-serial-tests-automake-option-for-ptest.patch \ + file://run-ptest \ +" + +SRC_URI[sha256sum] = "60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf" + +UPSTREAM_CHECK_URI = "https://github.com/kkos/oniguruma/releases/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + +BINCONFIG = "${bindir}/onig-config" + +inherit autotools binconfig-disabled ptest + +BBCLASSEXTEND = "native" + +do_compile_ptest() { + oe_runmake -C test buildtest-TESTS +} + +do_install_ptest() { + mkdir -p ${D}${PTEST_PATH}/tests + install -m 0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/* +} + +PROVIDES += "oniguruma" diff --git a/meta-oe/recipes-support/open-vm-tools/files/tools.conf b/meta-oe/recipes-support/open-vm-tools/files/tools.conf deleted file mode 100644 index f6cae70cc5..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/files/tools.conf +++ /dev/null @@ -1,2 +0,0 @@ -[guestinfo] -disable-perf-mon=1 diff --git a/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.init b/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.init deleted file mode 100644 index 38280464a7..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.init +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# vmtoolsd Start/stop the vmware tools daemon -# -# chkconfig: 2345 90 60 -# description: vmtoolsd is a daemon that starts up. for some reason, it -# doesn't include a sysv init startup file in the latest release. -# so i have to write this -# - -### BEGIN INIT INFO -# Provides: vmtoolsd -# Required-Start: $local_fs $syslog -# Required-Stop: $local_fs $syslog -# Default-Start: 2345 -# Default-Stop: 90 -# Short-Description: Run vmware tools daemon -### END INIT INFO - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/bin/vmtoolsd -NAME=vmtoolsd -DESC="vmware tools daemon" -VMTOOLSDARGS=" -b /var/run/vmtoolsd.pid " -RETVAL="1" - -# source function library -. /etc/init.d/functions - -test -f $DAEMON || exit 0 - - -case "$1" in - start) - echo -n "Starting vmware tools daemon: " - start-stop-daemon --start --quiet --exec $DAEMON -- $VMTOOLSDARGS - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - echo "OK" - else - echo "FAIL" - fi - ;; - stop) - echo -n "Stopping vmware tools daemon: " - start-stop-daemon --stop --quiet --pidfile /var/run/vmtoolsd.pid - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - echo "OK" - else - echo "FAIL" - fi - ;; - status) - status vmtoolsd - exit $? - ;; - restart) - $0 stop && sleep 1 && $0 start - ;; - *) - echo "Usage: /etc/init.d/vmtoolsd {start|stop|status|restart}" - exit 1 -esac - -exit $RETVAL diff --git a/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.service b/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.service deleted file mode 100644 index d30e38055c..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Open Virtual Machine Tools (VMware Tools) -ConditionVirtualization=vmware - -[Service] -ExecStart=/usr/bin/vmtoolsd -Restart=on-failure -KillSignal=SIGKILL - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch deleted file mode 100644 index 9773b4a949..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a0983d84185f04c4e40778fe951fde4439894882 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 16 Jul 2017 07:37:03 -0700 -Subject: [PATCH 01/11] Remove assumptions about glibc being only libc - implementation on linux - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/file/fileIOPosix.c | 2 +- - open-vm-tools/lib/include/vm_basic_defs.h | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -Index: open-vm-tools/lib/file/fileIOPosix.c -=================================================================== ---- open-vm-tools.orig/lib/file/fileIOPosix.c -+++ open-vm-tools/lib/file/fileIOPosix.c -@@ -205,7 +205,7 @@ static AlignedPool alignedPool; - * are not available in any header file. - */ - --#if defined(__linux__) && !defined(__ANDROID__) -+#if defined(__linux__) && defined(__GLIBC__) - #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) - /* - * We want preadv/pwritev. But due to FOB=64, the symbols are -64. -Index: open-vm-tools/lib/include/vm_basic_defs.h -=================================================================== ---- open-vm-tools.orig/lib/include/vm_basic_defs.h -+++ open-vm-tools/lib/include/vm_basic_defs.h -@@ -571,6 +571,7 @@ typedef int pid_t; - #if defined __linux__ && !defined __KERNEL__ && !defined MODULE && \ - !defined VMM && !defined FROBOS && !defined __ANDROID__ - #include <features.h> -+#if __GLIBC__ - #if __GLIBC_PREREQ(2, 1) && !defined GLIBC_VERSION_21 - #define GLIBC_VERSION_21 - #endif -@@ -590,6 +591,7 @@ typedef int pid_t; - #define GLIBC_VERSION_212 - #endif - #endif -+#endif - - /* - * Convenience definitions of unicode characters. diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch deleted file mode 100644 index e9cb873f1a..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 929150608c16644695f19cd2e0cc8a06a41cd497 Mon Sep 17 00:00:00 2001 -From: Martin Kelly <mkelly@xevo.com> -Date: Fri, 7 Apr 2017 15:20:30 -0700 -Subject: [PATCH] configure.ac: don't use dnet-config - -The dnet-config tool doesn't know about cross-compilation, so it injects --I/usr/include into the path, causing compiler errors. So instead find dnet via --ldnet. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Martin Kelly <mkelly@xevo.com> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3400b86..7d6119e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -942,7 +942,7 @@ if test "$with_dnet" = "yes"; then - AC_VMW_CHECK_LIB([dnet], - [DNET], - [], -- [dnet-config], -+ [], - [], - [dnet.h], - [intf_open], -@@ -952,7 +952,7 @@ if test "$with_dnet" = "yes"; then - - if test $have_dnet = "no"; then - AC_MSG_ERROR( -- [dnet-config was not found on your PATH. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net]) -+ [dnet was not found. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net]) - fi - fi - --- -2.1.4 - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch deleted file mode 100644 index f905601d52..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5818acc8032e3247257730376e947330340a07b3 Mon Sep 17 00:00:00 2001 -From: Martin Kelly <mkelly@xevo.com> -Date: Mon, 22 May 2017 17:00:05 -0700 -Subject: [PATCH 2/2] add #include <sys/sysmacros.h> - -In newer glibc versions, the definition for major() has been moved to -sys/sysmacros.h, and using the older version in <sys/types.h> has been -deprecated. So, add an include for <sys/sysmacros.h>. - -Upstream-Status: Pending - -Signed-off-by: Martin Kelly <mkelly@xevo.com> ---- - lib/wiper/wiperPosix.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/open-vm-tools/lib/wiper/wiperPosix.c b/open-vm-tools/lib/wiper/wiperPosix.c -index d389eee..1f221fc 100644 ---- a/lib/wiper/wiperPosix.c -+++ b/lib/wiper/wiperPosix.c -@@ -40,6 +40,9 @@ - # include <libgen.h> - # endif /* __FreeBSD_version >= 500000 */ - #endif -+#if defined(__linux__) -+#include <sys/sysmacros.h> -+#endif - #include <unistd.h> - - #include "vmware.h" --- -2.7.4 - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch deleted file mode 100644 index d26bf2dd30..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d44c7c9de7380ad7b284231bd5b5c99b5c19758d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 16 Jul 2017 07:37:59 -0700 -Subject: [PATCH 02/11] include poll.h instead of obsolete sys/poll.h - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/asyncsocket/asyncSocketInt.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: open-vm-tools/lib/asyncsocket/asyncSocketInt.h -=================================================================== ---- open-vm-tools.orig/lib/asyncsocket/asyncSocketInt.h -+++ open-vm-tools/lib/asyncsocket/asyncSocketInt.h -@@ -71,8 +71,8 @@ - #else - #include <stddef.h> - #include <ctype.h> -+#include <poll.h> - #include <sys/types.h> --#include <sys/poll.h> - #include <sys/socket.h> - #include <sys/un.h> - #include <netdb.h> diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Rename-poll.h-to-vm_poll.h.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Rename-poll.h-to-vm_poll.h.patch deleted file mode 100644 index 8641778d0e..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Rename-poll.h-to-vm_poll.h.patch +++ /dev/null @@ -1,756 +0,0 @@ -From 687fca20b3417ac885b6961e6fe1126d4a3fe7a4 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 17 Nov 2015 10:57:31 +0000 -Subject: [PATCH 03/11] Rename poll.h to vm_poll.h - -musl libc's system headers pulls in open-vm-tools' poll.h. To avoid this -we rename poll.h to vm_poll.h. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- - open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +- - open-vm-tools/lib/include/asyncsocket.h | 2 +- - open-vm-tools/lib/include/pollImpl.h | 2 +- - open-vm-tools/lib/include/{poll.h => vm_poll.h} | 0 - open-vm-tools/lib/rpcIn/rpcin.c | 2 +- - open-vm-tools/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c | 2 +- - 7 files changed, 6 insertions(+), 6 deletions(-) - rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (100%) - -Index: open-vm-tools/lib/asyncsocket/asyncsocket.c -=================================================================== ---- open-vm-tools.orig/lib/asyncsocket/asyncsocket.c -+++ open-vm-tools/lib/asyncsocket/asyncsocket.c -@@ -52,7 +52,7 @@ - #include "vmware.h" - #include "asyncsocket.h" - #include "asyncSocketInt.h" --#include "poll.h" -+#include "vm_poll.h" - #include "log.h" - #include "err.h" - #include "hostinfo.h" -Index: open-vm-tools/lib/hgfsServer/hgfsServer.c -=================================================================== ---- open-vm-tools.orig/lib/hgfsServer/hgfsServer.c -+++ open-vm-tools/lib/hgfsServer/hgfsServer.c -@@ -48,7 +48,7 @@ - #include "hgfsServerOplock.h" - #include "hgfsDirNotify.h" - #include "userlock.h" --#include "poll.h" -+#include "vm_poll.h" - #include "mutexRankLib.h" - #include "vm_basic_asm.h" - #include "unicodeOperations.h" -Index: open-vm-tools/lib/include/asyncsocket.h -=================================================================== ---- open-vm-tools.orig/lib/include/asyncsocket.h -+++ open-vm-tools/lib/include/asyncsocket.h -@@ -129,7 +129,7 @@ typedef struct AsyncSocket AsyncSocket; - * Or the client can specify its favorite poll class and locking behavior. - * Use of IVmdbPoll is only supported for regular sockets and for Attach. - */ --#include "poll.h" -+#include "vm_poll.h" - struct IVmdbPoll; - typedef struct AsyncSocketPollParams { - int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */ -Index: open-vm-tools/lib/include/poll.h -=================================================================== ---- open-vm-tools.orig/lib/include/poll.h -+++ /dev/null -@@ -1,324 +0,0 @@ --/********************************************************* -- * Copyright (C) 1998-2016 VMware, Inc. All rights reserved. -- * -- * This program is free software; you can redistribute it and/or modify it -- * under the terms of the GNU Lesser General Public License as published -- * by the Free Software Foundation version 2.1 and no later version. -- * -- * This program is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- * or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public -- * License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this program; if not, write to the Free Software Foundation, Inc., -- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -- * -- *********************************************************/ -- --/********************************************************* -- * The contents of this file are subject to the terms of the Common -- * Development and Distribution License (the "License") version 1.0 -- * and no later version. You may not use this file except in -- * compliance with the License. -- * -- * You can obtain a copy of the License at -- * http://www.opensource.org/licenses/cddl1.php -- * -- * See the License for the specific language governing permissions -- * and limitations under the License. -- * -- *********************************************************/ -- -- --#ifndef _POLL_H_ --#define _POLL_H_ -- --#define INCLUDE_ALLOW_USERLEVEL --#define INCLUDE_ALLOW_VMCORE --#include "includeCheck.h" -- --#include "vm_basic_types.h" --#include "vm_basic_defs.h" --#include "vmware.h" --#include "userlock.h" -- --#ifdef _WIN32 --#define HZ 100 --#elif defined linux --#include <asm/param.h> --#elif __APPLE__ --#include <TargetConditionals.h> --/* -- * Old SDKs don't define TARGET_OS_IPHONE at all. -- * New ones define it to 0 on Mac OS X, 1 on iOS. -- */ --#if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 --#include <sys/kernel.h> --#endif --#include <sys/poll.h> --#define HZ 100 --#endif --#ifdef __ANDROID__ --/* -- * <poll.h> of android should be included, but its name is same -- * with this file. So its content is put here to avoid conflict. -- */ --#include <asm/poll.h> --#define HZ 100 --typedef unsigned int nfds_t; --int poll(struct pollfd *, nfds_t, long); --#endif -- -- --/* -- * Poll event types: each type has a different reason for firing, -- * or condition that must be met before firing. -- */ -- --typedef enum { -- /* -- * Actual Poll queue types against which you can register callbacks. -- */ -- POLL_VIRTUALREALTIME = -1, /* Negative because it doesn't have its own Q */ -- POLL_VTIME = 0, -- POLL_REALTIME, -- POLL_DEVICE, -- POLL_MAIN_LOOP, -- POLL_NUM_QUEUES --} PollEventType; -- -- --/* -- * Classes of events -- * -- * These are the predefined classes. More can be declared -- * with Poll_AllocClass(). -- */ -- --typedef enum PollClass { -- POLL_CLASS_MAIN, -- POLL_CLASS_PAUSE, -- POLL_CLASS_IPC, -- POLL_CLASS_CPT, -- POLL_CLASS_MKS, -- POLL_FIXED_CLASSES, -- POLL_MAX_CLASSES = 320 /* Size enum to maximum */ --} PollClass; -- -- --/* -- * Each callback is registered in a set of classes -- */ -- --typedef struct PollClassSet { -- /* Type is uintptr_t to give best 32/64-bit code. */ --#define _POLL_ELEMSIZE (sizeof (uintptr_t) * 8) -- uintptr_t bits[CEILING(POLL_MAX_CLASSES, _POLL_ELEMSIZE)]; --} PollClassSet; -- --/* An empty PollClassSet. */ --static INLINE PollClassSet --PollClassSet_Empty(void) --{ -- PollClassSet set = { { 0 } }; -- return set; --} -- --/* A PollClassSet with the single member. */ --static INLINE PollClassSet --PollClassSet_Singleton(PollClass c) --{ -- PollClassSet s = PollClassSet_Empty(); -- -- ASSERT_ON_COMPILE(sizeof s.bits[0] * 8 == _POLL_ELEMSIZE); /* Size correct */ -- ASSERT_ON_COMPILE((_POLL_ELEMSIZE & (_POLL_ELEMSIZE - 1)) == 0); /* power of 2 */ -- ASSERT_ON_COMPILE(POLL_MAX_CLASSES <= ARRAYSIZE(s.bits) * _POLL_ELEMSIZE); -- ASSERT(c < POLL_MAX_CLASSES); -- -- s.bits[c / _POLL_ELEMSIZE] = CONST3264U(1) << (c % _POLL_ELEMSIZE); -- return s; --} -- --/* Combine two PollClassSets. */ --static INLINE PollClassSet --PollClassSet_Union(PollClassSet lhs, PollClassSet rhs) --{ -- PollClassSet u; -- unsigned i; -- -- for (i = 0; i < ARRAYSIZE(u.bits); i++) { -- u.bits[i] = lhs.bits[i] | rhs.bits[i]; -- } -- return u; --} -- --/* Add single class to PollClassSet. */ --static INLINE PollClassSet --PollClassSet_Include(PollClassSet set, PollClass c) --{ -- return PollClassSet_Union(set, PollClassSet_Singleton(c)); --} -- -- --#define POLL_CS_MAIN PollClassSet_Singleton(POLL_CLASS_MAIN) --#define POLL_CS_PAUSE PollClassSet_Union(POLL_CS_MAIN, \ -- PollClassSet_Singleton(POLL_CLASS_PAUSE)) --#define POLL_CS_CPT PollClassSet_Union(POLL_CS_PAUSE, \ -- PollClassSet_Singleton(POLL_CLASS_CPT)) --#define POLL_CS_IPC PollClassSet_Union(POLL_CS_CPT, \ -- PollClassSet_Singleton(POLL_CLASS_IPC)) --#define POLL_CS_VMDB POLL_CS_PAUSE /* POLL_CLASS_VMDB is retired */ --#define POLL_CS_MKS PollClassSet_Singleton(POLL_CLASS_MKS) --/* -- * DANGER. You don't need POLL_CS_ALWAYS. Really. So don't use it. -- */ --#define POLL_CS_ALWAYS PollClassSet_Union(POLL_CS_CPT, POLL_CS_IPC) -- --/* -- * Poll class-set taxonomy: -- * POLL_CS_MAIN -- * - Unless you NEED another class, use POLL_CS_MAIN. -- * POLL_CS_PAUSE -- * - For callbacks that must occur even if the guest is paused. -- * Most VMDB or Foundry commands are in this category. -- * POLL_CS_CPT -- * - Only for callbacks which can trigger intermediate Checkpoint -- * transitions. -- * The ONLY such callback is Migrate. -- * POLL_CS_IPC -- * - Only for callbacks which can contain Msg_(Post|Hint|Question) -- * responses, and for signal handlers (why)? -- * Vigor, VMDB, and Foundry can contain Msg_* responses. -- * POLL_CS_MKS -- * - Callback runs in MKS thread. -- * POLL_CS_ALWAYS -- * - Only for events that must be processed immediately. -- * The ONLY such callback is OvhdMemVmxSizeCheck. -- */ -- -- --/* -- * Poll_Callback flags -- */ -- --#define POLL_FLAG_PERIODIC 0x01 // keep after firing --#define POLL_FLAG_REMOVE_AT_POWEROFF 0x02 // self-explanatory --#define POLL_FLAG_READ 0x04 // device is ready for reading --#define POLL_FLAG_WRITE 0x08 // device is ready for writing --#define POLL_FLAG_SOCKET 0x10 // device is a Windows socket --#define POLL_FLAG_NO_BULL 0x20 // callback does its own locking --#define POLL_FLAG_WINSOCK 0x40 // Winsock style write events --#define POLL_FLAG_FD 0x80 // device is a Windows file descriptor. --#define POLL_FLAG_ACCEPT_INVALID_FDS 0x100 // For broken 3rd party libs, e.g. curl --#define POLL_FLAG_THUNK_TO_WND 0x200 // thunk callback to window message loop -- -- --/* -- * Advisory minimum time period. -- * Users that want the fastest running real-time poll -- * should use TICKS_TO_USECS(1). -- */ -- --#define TICKS_TO_USECS(_x) ((_x) * (1000000 / HZ)) --#define USECS_TO_TICKS(_x) ((_x) / (1000000 / HZ)) -- -- --typedef void (*PollerFunction)(void *clientData); --typedef void (*PollerFireWrapper)(PollerFunction func, -- void *funcData, -- void *wrapperData); --typedef Bool (*PollerErrorFn)(const char *errorStr); -- --/* -- * Initialisers: -- * -- * For the sake of convenience, we declare the initialisers -- * for custom implmentations here, even though the actual -- * implementations are distinct from the core poll code. -- */ -- --typedef struct PollOptions { -- Bool locked; // Use internal MXUser for locking -- Bool allowFullQueue; // Don't assert when device event queue is full. -- VThreadID windowsMsgThread; // thread that processes Windows messages -- PollerFireWrapper fireWrapperFn; // optional; may be useful for stats -- void *fireWrapperData; // optional -- PollerErrorFn errorFn; // optional; called upon unrecoverable error --} PollOptions; -- -- --void Poll_InitDefault(void); --void Poll_InitDefaultEx(const PollOptions *opts); --void Poll_InitGtk(void); // On top of glib for Linux --void Poll_InitCF(void); // On top of CoreFoundation for OSX -- -- --/* -- * Functions -- */ --int Poll_SocketPair(Bool vmci, Bool stream, int fds[2]); --void Poll_Loop(Bool loop, Bool *exit, PollClass c); --void Poll_LoopTimeout(Bool loop, Bool *exit, PollClass c, int timeout); --Bool Poll_LockingEnabled(void); --void Poll_Exit(void); -- -- --/* -- * Poll_Callback adds a callback regardless of whether an identical one exists. -- * -- * Likewise, Poll_CallbackRemove removes exactly one callback. -- */ -- --VMwareStatus Poll_Callback(PollClassSet classSet, -- int flags, -- PollerFunction f, -- void *clientData, -- PollEventType type, -- PollDevHandle info, // fd/microsec delay -- MXUserRecLock *lck); --Bool Poll_CallbackRemove(PollClassSet classSet, -- int flags, -- PollerFunction f, -- void *clientData, -- PollEventType type); --Bool Poll_CallbackRemoveOneByCB(PollClassSet classSet, -- int flags, -- PollerFunction f, -- PollEventType type, -- void **clientData); -- --void Poll_NotifyChange(PollClassSet classSet); -- --/* -- * Wrappers for Poll_Callback and Poll_CallbackRemove that present -- * simpler subsets of those interfaces. -- */ -- --VMwareStatus Poll_CB_Device(PollerFunction f, -- void *clientData, -- PollDevHandle device, -- Bool periodic); -- --Bool Poll_CB_DeviceRemove(PollerFunction f, -- void *clientData, -- Bool periodic); -- -- --VMwareStatus Poll_CB_RTime(PollerFunction f, -- void *clientData, -- int delay, // microseconds -- Bool periodic, -- MXUserRecLock *lock); -- --Bool Poll_CB_RTimeRemove(PollerFunction f, -- void *clientData, -- Bool periodic); -- -- --#ifdef _WIN32 --void Poll_SetWindowMessageRecipient(HWND hWnd, UINT msg, Bool alwaysThunk); --Bool Poll_FireWndCallback(void *lparam); --#endif -- --#endif // _POLL_H_ -Index: open-vm-tools/lib/include/pollImpl.h -=================================================================== ---- open-vm-tools.orig/lib/include/pollImpl.h -+++ open-vm-tools/lib/include/pollImpl.h -@@ -44,7 +44,7 @@ - #define INCLUDE_ALLOW_USERLEVEL - #include "includeCheck.h" - --#include "poll.h" -+#include "vm_poll.h" - - /* - * PollImpl: -Index: open-vm-tools/lib/include/vm_poll.h -=================================================================== ---- /dev/null -+++ open-vm-tools/lib/include/vm_poll.h -@@ -0,0 +1,324 @@ -+/********************************************************* -+ * Copyright (C) 1998-2016 VMware, Inc. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU Lesser General Public License as published -+ * by the Free Software Foundation version 2.1 and no later version. -+ * -+ * This program is distributed in the hope that it will be useful, but -+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public -+ * License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public License -+ * along with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ *********************************************************/ -+ -+/********************************************************* -+ * The contents of this file are subject to the terms of the Common -+ * Development and Distribution License (the "License") version 1.0 -+ * and no later version. You may not use this file except in -+ * compliance with the License. -+ * -+ * You can obtain a copy of the License at -+ * http://www.opensource.org/licenses/cddl1.php -+ * -+ * See the License for the specific language governing permissions -+ * and limitations under the License. -+ * -+ *********************************************************/ -+ -+ -+#ifndef _POLL_H_ -+#define _POLL_H_ -+ -+#define INCLUDE_ALLOW_USERLEVEL -+#define INCLUDE_ALLOW_VMCORE -+#include "includeCheck.h" -+ -+#include "vm_basic_types.h" -+#include "vm_basic_defs.h" -+#include "vmware.h" -+#include "userlock.h" -+ -+#ifdef _WIN32 -+#define HZ 100 -+#elif defined linux -+#include <asm/param.h> -+#elif __APPLE__ -+#include <TargetConditionals.h> -+/* -+ * Old SDKs don't define TARGET_OS_IPHONE at all. -+ * New ones define it to 0 on Mac OS X, 1 on iOS. -+ */ -+#if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 -+#include <sys/kernel.h> -+#endif -+#include <sys/poll.h> -+#define HZ 100 -+#endif -+#ifdef __ANDROID__ -+/* -+ * <poll.h> of android should be included, but its name is same -+ * with this file. So its content is put here to avoid conflict. -+ */ -+#include <asm/poll.h> -+#define HZ 100 -+typedef unsigned int nfds_t; -+int poll(struct pollfd *, nfds_t, long); -+#endif -+ -+ -+/* -+ * Poll event types: each type has a different reason for firing, -+ * or condition that must be met before firing. -+ */ -+ -+typedef enum { -+ /* -+ * Actual Poll queue types against which you can register callbacks. -+ */ -+ POLL_VIRTUALREALTIME = -1, /* Negative because it doesn't have its own Q */ -+ POLL_VTIME = 0, -+ POLL_REALTIME, -+ POLL_DEVICE, -+ POLL_MAIN_LOOP, -+ POLL_NUM_QUEUES -+} PollEventType; -+ -+ -+/* -+ * Classes of events -+ * -+ * These are the predefined classes. More can be declared -+ * with Poll_AllocClass(). -+ */ -+ -+typedef enum PollClass { -+ POLL_CLASS_MAIN, -+ POLL_CLASS_PAUSE, -+ POLL_CLASS_IPC, -+ POLL_CLASS_CPT, -+ POLL_CLASS_MKS, -+ POLL_FIXED_CLASSES, -+ POLL_MAX_CLASSES = 320 /* Size enum to maximum */ -+} PollClass; -+ -+ -+/* -+ * Each callback is registered in a set of classes -+ */ -+ -+typedef struct PollClassSet { -+ /* Type is uintptr_t to give best 32/64-bit code. */ -+#define _POLL_ELEMSIZE (sizeof (uintptr_t) * 8) -+ uintptr_t bits[CEILING(POLL_MAX_CLASSES, _POLL_ELEMSIZE)]; -+} PollClassSet; -+ -+/* An empty PollClassSet. */ -+static INLINE PollClassSet -+PollClassSet_Empty(void) -+{ -+ PollClassSet set = { { 0 } }; -+ return set; -+} -+ -+/* A PollClassSet with the single member. */ -+static INLINE PollClassSet -+PollClassSet_Singleton(PollClass c) -+{ -+ PollClassSet s = PollClassSet_Empty(); -+ -+ ASSERT_ON_COMPILE(sizeof s.bits[0] * 8 == _POLL_ELEMSIZE); /* Size correct */ -+ ASSERT_ON_COMPILE((_POLL_ELEMSIZE & (_POLL_ELEMSIZE - 1)) == 0); /* power of 2 */ -+ ASSERT_ON_COMPILE(POLL_MAX_CLASSES <= ARRAYSIZE(s.bits) * _POLL_ELEMSIZE); -+ ASSERT(c < POLL_MAX_CLASSES); -+ -+ s.bits[c / _POLL_ELEMSIZE] = CONST3264U(1) << (c % _POLL_ELEMSIZE); -+ return s; -+} -+ -+/* Combine two PollClassSets. */ -+static INLINE PollClassSet -+PollClassSet_Union(PollClassSet lhs, PollClassSet rhs) -+{ -+ PollClassSet u; -+ unsigned i; -+ -+ for (i = 0; i < ARRAYSIZE(u.bits); i++) { -+ u.bits[i] = lhs.bits[i] | rhs.bits[i]; -+ } -+ return u; -+} -+ -+/* Add single class to PollClassSet. */ -+static INLINE PollClassSet -+PollClassSet_Include(PollClassSet set, PollClass c) -+{ -+ return PollClassSet_Union(set, PollClassSet_Singleton(c)); -+} -+ -+ -+#define POLL_CS_MAIN PollClassSet_Singleton(POLL_CLASS_MAIN) -+#define POLL_CS_PAUSE PollClassSet_Union(POLL_CS_MAIN, \ -+ PollClassSet_Singleton(POLL_CLASS_PAUSE)) -+#define POLL_CS_CPT PollClassSet_Union(POLL_CS_PAUSE, \ -+ PollClassSet_Singleton(POLL_CLASS_CPT)) -+#define POLL_CS_IPC PollClassSet_Union(POLL_CS_CPT, \ -+ PollClassSet_Singleton(POLL_CLASS_IPC)) -+#define POLL_CS_VMDB POLL_CS_PAUSE /* POLL_CLASS_VMDB is retired */ -+#define POLL_CS_MKS PollClassSet_Singleton(POLL_CLASS_MKS) -+/* -+ * DANGER. You don't need POLL_CS_ALWAYS. Really. So don't use it. -+ */ -+#define POLL_CS_ALWAYS PollClassSet_Union(POLL_CS_CPT, POLL_CS_IPC) -+ -+/* -+ * Poll class-set taxonomy: -+ * POLL_CS_MAIN -+ * - Unless you NEED another class, use POLL_CS_MAIN. -+ * POLL_CS_PAUSE -+ * - For callbacks that must occur even if the guest is paused. -+ * Most VMDB or Foundry commands are in this category. -+ * POLL_CS_CPT -+ * - Only for callbacks which can trigger intermediate Checkpoint -+ * transitions. -+ * The ONLY such callback is Migrate. -+ * POLL_CS_IPC -+ * - Only for callbacks which can contain Msg_(Post|Hint|Question) -+ * responses, and for signal handlers (why)? -+ * Vigor, VMDB, and Foundry can contain Msg_* responses. -+ * POLL_CS_MKS -+ * - Callback runs in MKS thread. -+ * POLL_CS_ALWAYS -+ * - Only for events that must be processed immediately. -+ * The ONLY such callback is OvhdMemVmxSizeCheck. -+ */ -+ -+ -+/* -+ * Poll_Callback flags -+ */ -+ -+#define POLL_FLAG_PERIODIC 0x01 // keep after firing -+#define POLL_FLAG_REMOVE_AT_POWEROFF 0x02 // self-explanatory -+#define POLL_FLAG_READ 0x04 // device is ready for reading -+#define POLL_FLAG_WRITE 0x08 // device is ready for writing -+#define POLL_FLAG_SOCKET 0x10 // device is a Windows socket -+#define POLL_FLAG_NO_BULL 0x20 // callback does its own locking -+#define POLL_FLAG_WINSOCK 0x40 // Winsock style write events -+#define POLL_FLAG_FD 0x80 // device is a Windows file descriptor. -+#define POLL_FLAG_ACCEPT_INVALID_FDS 0x100 // For broken 3rd party libs, e.g. curl -+#define POLL_FLAG_THUNK_TO_WND 0x200 // thunk callback to window message loop -+ -+ -+/* -+ * Advisory minimum time period. -+ * Users that want the fastest running real-time poll -+ * should use TICKS_TO_USECS(1). -+ */ -+ -+#define TICKS_TO_USECS(_x) ((_x) * (1000000 / HZ)) -+#define USECS_TO_TICKS(_x) ((_x) / (1000000 / HZ)) -+ -+ -+typedef void (*PollerFunction)(void *clientData); -+typedef void (*PollerFireWrapper)(PollerFunction func, -+ void *funcData, -+ void *wrapperData); -+typedef Bool (*PollerErrorFn)(const char *errorStr); -+ -+/* -+ * Initialisers: -+ * -+ * For the sake of convenience, we declare the initialisers -+ * for custom implmentations here, even though the actual -+ * implementations are distinct from the core poll code. -+ */ -+ -+typedef struct PollOptions { -+ Bool locked; // Use internal MXUser for locking -+ Bool allowFullQueue; // Don't assert when device event queue is full. -+ VThreadID windowsMsgThread; // thread that processes Windows messages -+ PollerFireWrapper fireWrapperFn; // optional; may be useful for stats -+ void *fireWrapperData; // optional -+ PollerErrorFn errorFn; // optional; called upon unrecoverable error -+} PollOptions; -+ -+ -+void Poll_InitDefault(void); -+void Poll_InitDefaultEx(const PollOptions *opts); -+void Poll_InitGtk(void); // On top of glib for Linux -+void Poll_InitCF(void); // On top of CoreFoundation for OSX -+ -+ -+/* -+ * Functions -+ */ -+int Poll_SocketPair(Bool vmci, Bool stream, int fds[2]); -+void Poll_Loop(Bool loop, Bool *exit, PollClass c); -+void Poll_LoopTimeout(Bool loop, Bool *exit, PollClass c, int timeout); -+Bool Poll_LockingEnabled(void); -+void Poll_Exit(void); -+ -+ -+/* -+ * Poll_Callback adds a callback regardless of whether an identical one exists. -+ * -+ * Likewise, Poll_CallbackRemove removes exactly one callback. -+ */ -+ -+VMwareStatus Poll_Callback(PollClassSet classSet, -+ int flags, -+ PollerFunction f, -+ void *clientData, -+ PollEventType type, -+ PollDevHandle info, // fd/microsec delay -+ MXUserRecLock *lck); -+Bool Poll_CallbackRemove(PollClassSet classSet, -+ int flags, -+ PollerFunction f, -+ void *clientData, -+ PollEventType type); -+Bool Poll_CallbackRemoveOneByCB(PollClassSet classSet, -+ int flags, -+ PollerFunction f, -+ PollEventType type, -+ void **clientData); -+ -+void Poll_NotifyChange(PollClassSet classSet); -+ -+/* -+ * Wrappers for Poll_Callback and Poll_CallbackRemove that present -+ * simpler subsets of those interfaces. -+ */ -+ -+VMwareStatus Poll_CB_Device(PollerFunction f, -+ void *clientData, -+ PollDevHandle device, -+ Bool periodic); -+ -+Bool Poll_CB_DeviceRemove(PollerFunction f, -+ void *clientData, -+ Bool periodic); -+ -+ -+VMwareStatus Poll_CB_RTime(PollerFunction f, -+ void *clientData, -+ int delay, // microseconds -+ Bool periodic, -+ MXUserRecLock *lock); -+ -+Bool Poll_CB_RTimeRemove(PollerFunction f, -+ void *clientData, -+ Bool periodic); -+ -+ -+#ifdef _WIN32 -+void Poll_SetWindowMessageRecipient(HWND hWnd, UINT msg, Bool alwaysThunk); -+Bool Poll_FireWndCallback(void *lparam); -+#endif -+ -+#endif // _POLL_H_ -Index: open-vm-tools/lib/rpcIn/rpcin.c -=================================================================== ---- open-vm-tools.orig/lib/rpcIn/rpcin.c -+++ open-vm-tools/lib/rpcIn/rpcin.c -@@ -57,7 +57,7 @@ - - #if defined(VMTOOLS_USE_VSOCKET) - # include <glib.h> --# include "poll.h" -+# include "vm_poll.h" - # include "asyncsocket.h" - # include "vmci_defs.h" - #include "dataMap.h" -Index: open-vm-tools/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c -=================================================================== ---- open-vm-tools.orig/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c -+++ open-vm-tools/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c -@@ -48,7 +48,7 @@ - #include "rpcout.h" - #include "rabbitmqProxyConst.h" - #include "vm_basic_types.h" --#include "poll.h" -+#include "vm_poll.h" - #ifdef OPEN_VM_TOOLS - #include "vmci_sockets.h" - #include "sslDirect.h" diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch deleted file mode 100644 index 010516761f..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cdb0b3c898c6b6b6c8259d9ddb8b00163ac5e419 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 16 Jul 2017 09:43:18 -0700 -Subject: [PATCH 04/11] Add -Wno-incompatible-pointer-types and - -Wno-error=address - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/dynxdr/Makefile.am | 2 +- - open-vm-tools/lib/file/Makefile.am | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -Index: open-vm-tools/lib/dynxdr/Makefile.am -=================================================================== ---- open-vm-tools.orig/lib/dynxdr/Makefile.am -+++ open-vm-tools/lib/dynxdr/Makefile.am -@@ -20,4 +20,4 @@ noinst_LTLIBRARIES = libDynxdr.la - libDynxdr_la_SOURCES = - libDynxdr_la_SOURCES += dynxdr.c - libDynxdr_la_SOURCES += xdrutil.c -- -+libDynxdr_la_CPPFLAGS = -Wno-incompatible-pointer-types -Index: open-vm-tools/lib/file/Makefile.am -=================================================================== ---- open-vm-tools.orig/lib/file/Makefile.am -+++ open-vm-tools/lib/file/Makefile.am -@@ -27,3 +27,4 @@ libFile_la_SOURCES += fileLockPrimitive. - libFile_la_SOURCES += fileLockPosix.c - libFile_la_SOURCES += fileTempPosix.c - libFile_la_SOURCES += fileTemp.c -+libFile_la_CPPFLAGS = -Wno-error=address diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-struct-timespec.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-struct-timespec.patch deleted file mode 100644 index f02d00f841..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-struct-timespec.patch +++ /dev/null @@ -1,45 +0,0 @@ -From bf1eafb07297711baf9320b1edcca8a3376f117d Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 18 Nov 2015 09:03:00 +0000 -Subject: [PATCH 05/11] Use configure test for struct timespec - -Use the configure script to test for struct time spec instead of trying -to keep track of what platforms has it. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - open-vm-tools/configure.ac | 1 + - open-vm-tools/lib/include/hgfsUtil.h | 8 +------- - 2 files changed, 2 insertions(+), 7 deletions(-) - -Index: open-vm-tools/configure.ac -=================================================================== ---- open-vm-tools.orig/configure.ac -+++ open-vm-tools/configure.ac -@@ -1127,6 +1127,7 @@ AC_TYPE_OFF_T - AC_TYPE_PID_T - AC_TYPE_SIZE_T - AC_CHECK_MEMBERS([struct stat.st_rdev]) -+AC_CHECK_MEMBERS([struct timespec.tv_sec],[],[],[[#include <time.h>]]) - AC_HEADER_TIME - AC_STRUCT_TM - AC_C_VOLATILE -Index: open-vm-tools/lib/include/hgfsUtil.h -=================================================================== ---- open-vm-tools.orig/lib/include/hgfsUtil.h -+++ open-vm-tools/lib/include/hgfsUtil.h -@@ -53,13 +53,7 @@ - # include <time.h> - # endif - # include "vm_basic_types.h" --# if !defined _STRUCT_TIMESPEC && \ -- !defined _TIMESPEC_DECLARED && \ -- !defined __timespec_defined && \ -- !defined sun && \ -- !defined __FreeBSD__ && \ -- !__APPLE__ && \ -- !defined _WIN32 -+# if !defined HAVE_STRUCT_TIMESPEC_TV_SEC - struct timespec { - time_t tv_sec; - long tv_nsec; diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch deleted file mode 100644 index d1f4eff9be..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 31ae6f42458f90d4994a4ad8e2b7673691612c36 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 18 Nov 2015 09:10:14 +0000 -Subject: [PATCH 06/11] Fix definition of ALLPERMS and ACCESSPERMS - -The ALLPERMS and ACCESSPERMS defines are not specified in POSIX so -assume it is not there instead of testing for specific implementations. - -This is needed for musl libc. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 8 +++++--- - open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c | 3 +-- - 2 files changed, 6 insertions(+), 5 deletions(-) - -Index: open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -=================================================================== ---- open-vm-tools.orig/lib/hgfsServer/hgfsServerLinux.c -+++ open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -@@ -107,11 +107,13 @@ typedef struct DirectoryEntry { - #endif - - /* -- * ALLPERMS (mode 07777) and ACCESSPERMS (mode 0777) are not defined in the -- * Solaris version of <sys/stat.h>. -+ * ALLPERMS (mode 07777) and ACCESSPERMS (mode 0777) are not specified in -+ * POSIX. - */ --#ifdef sun -+#ifndef ACCESSPERMS - # define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) -+#endif -+#ifndef ALLPERMS - # define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) - #endif - -Index: open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c -=================================================================== ---- open-vm-tools.orig/services/plugins/dndcp/dnd/dndLinux.c -+++ open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c -@@ -51,7 +51,7 @@ - - #define DND_ROOTDIR_PERMS (S_IRWXU | S_IRWXG | S_IRWXO) - #define DND_STAGINGDIR_PERMS (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) --#ifdef sun -+#ifndef ACCESSPERMS - #define ACCESSPERMS (S_IRWXU | S_IRWXG | S_IRWXO) - #endif - #ifdef __ANDROID__ -@@ -60,7 +60,6 @@ - */ - #define NO_SETMNTENT - #define NO_ENDMNTENT --#define ACCESSPERMS (S_IRWXU | S_IRWXG | S_IRWXO) - #endif - - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch deleted file mode 100644 index 5adf9b0f90..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 6cc1c22cc30320f56da552a76bd956db8f255b6a Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 18 Nov 2015 10:05:07 +0000 -Subject: [PATCH 07/11] Use configure to test for feature instead of platform - -Test for various functions instead of trying to keep track of what -platform and what version of the given platform has support for what. - -This should make it easier to port to currently unknown platforms and -will solve the issue if a platform add support for a missing feature in -the future. - -The features we test for are: -- getifaddrs -- getauxval -- issetugid -- __secure_getenv - -This is needed for musl libc. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - open-vm-tools/configure.ac | 4 ++++ - open-vm-tools/lib/misc/idLinux.c | 30 ++++++++++++++---------------- - open-vm-tools/lib/nicInfo/nicInfoPosix.c | 8 ++++++-- - 3 files changed, 24 insertions(+), 18 deletions(-) - -Index: open-vm-tools/configure.ac -=================================================================== ---- open-vm-tools.orig/configure.ac -+++ open-vm-tools/configure.ac -@@ -798,6 +798,7 @@ AC_CHECK_FUNCS( - - AC_CHECK_FUNCS([ecvt]) - AC_CHECK_FUNCS([fcvt]) -+AC_CHECK_FUNCS([getifaddrs getauxval issetugid __secure_getenv]) - - AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes]) - -@@ -1063,10 +1064,13 @@ AC_PATH_PROG( - ### - - AC_CHECK_HEADERS([crypt.h]) -+AC_CHECK_HEADERS([ifaddrs.h]) - AC_CHECK_HEADERS([inttypes.h]) - AC_CHECK_HEADERS([stdint.h]) - AC_CHECK_HEADERS([stdlib.h]) - AC_CHECK_HEADERS([wchar.h]) -+AC_CHECK_HEADERS([net/if.h]) -+AC_CHECK_HEADERS([sys/auxv.h]) - AC_CHECK_HEADERS([sys/inttypes.h]) - AC_CHECK_HEADERS([sys/io.h]) - AC_CHECK_HEADERS([sys/param.h]) # Required to make the sys/user.h check work correctly on FreeBSD -Index: open-vm-tools/lib/misc/idLinux.c -=================================================================== ---- open-vm-tools.orig/lib/misc/idLinux.c -+++ open-vm-tools/lib/misc/idLinux.c -@@ -27,12 +27,9 @@ - #include <sys/syscall.h> - #include <string.h> - #include <unistd.h> --#ifdef __linux__ --#if defined(__GLIBC__) && \ -- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) -+#ifdef HAVE_SYS_AUXV_H - #include <sys/auxv.h> - #endif --#endif - #ifdef __APPLE__ - #include <sys/socket.h> - #include <TargetConditionals.h> -@@ -997,31 +994,32 @@ Id_EndSuperUser(uid_t uid) // IN: - static Bool - IdIsSetUGid(void) - { --#if defined(__ANDROID__) -- /* Android does not have a secure_getenv, so be conservative. */ -- return TRUE; --#else - /* - * We use __secure_getenv, which returns NULL if the binary is -- * setuid or setgid. Alternatives include, -+ * setuid or setgid, when issetugid or getauxval(AT_SECURE) is not -+ * available. Alternatives include, - * -- * a) getauxval(AT_SECURE); not available until glibc 2.16. -- * b) __libc_enable_secure; may not be exported. -+ * a) issetugid(); not (yet?) available in glibc. -+ * b) getauxval(AT_SECURE); not available until glibc 2.16. -+ * c) __libc_enable_secure; may not be exported. - * -- * Use (a) when we are based on glibc 2.16, or newer. -+ * Use (b) when we are based on glibc 2.16, or newer. - */ - --#if defined(__GLIBC__) && \ -- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) -+#if HAVE_ISSETUGID -+ return issetugid(); -+#elif HAVE_GETAUXVAL - return getauxval(AT_SECURE) != 0; --#else -+#elif HAVE___SECURE_GETENV - static const char envName[] = "VMW_SETUGID_TEST"; - - if (setenv(envName, "1", TRUE) == -1) { - return TRUE; /* Conservative */ - } - return __secure_getenv(envName) == NULL; --#endif -+#else -+ /* Android does not have a secure_getenv, so be conservative. */ -+ return TRUE; - #endif - } - #endif -Index: open-vm-tools/lib/nicInfo/nicInfoPosix.c -=================================================================== ---- open-vm-tools.orig/lib/nicInfo/nicInfoPosix.c -+++ open-vm-tools/lib/nicInfo/nicInfoPosix.c -@@ -34,9 +34,13 @@ - #include <sys/socket.h> - #include <sys/stat.h> - #include <errno.h> --#if defined(__FreeBSD__) || defined(__APPLE__) -+#if HAVE_SYS_SYSCTL_H - # include <sys/sysctl.h> -+#endif -+#if HAVE_IFADDRS_H - # include <ifaddrs.h> -+#endif -+#if HAVE_NET_IF_H - # include <net/if.h> - #endif - #ifndef NO_DNET -@@ -348,7 +352,7 @@ GuestInfoGetNicInfo(NicInfoV3 *nicInfo) - * - ****************************************************************************** - */ --#if defined(__FreeBSD__) || defined(__APPLE__) || defined(USERWORLD) -+#if defined(NO_DNET) && defined(HAVE_GETIFADDRS) - - char * - GuestInfoGetPrimaryIP(void) diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-use-posix-strerror_r-unless-gnu.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-use-posix-strerror_r-unless-gnu.patch deleted file mode 100644 index 3d1291c9fa..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-use-posix-strerror_r-unless-gnu.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d4d1e7146ca2698089f6bd532f2fb8b9c1134ca7 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Mon, 2 Jan 2017 14:39:27 +0000 -Subject: [PATCH 08/11] use posix strerror_r unless gnu - ---- - open-vm-tools/lib/err/errPosix.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -Index: open-vm-tools/lib/err/errPosix.c -=================================================================== ---- open-vm-tools.orig/lib/err/errPosix.c -+++ open-vm-tools/lib/err/errPosix.c -@@ -63,11 +63,13 @@ ErrErrno2String(Err_Number errorNumber, - { - char *p; - --#if defined(linux) && !defined(N_PLAT_NLM) && !defined(__ANDROID__) -+#if defined(__GLIBC__) - p = strerror_r(errorNumber, buf, bufSize); - #else -- p = strerror(errorNumber); --#endif -+ if (strerror_r(errorNumber, buf, bufSize) != 0) -+ snprintf(buf, bufSize, "unknown error %i", errorNumber); -+ p = buf; -+#endif /* defined __GLIBC__ */ - ASSERT(p != NULL); - return p; - } diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Add-support-for-building-with-system-libtirpc.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Add-support-for-building-with-system-libtirpc.patch deleted file mode 100644 index 2bee5ac821..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Add-support-for-building-with-system-libtirpc.patch +++ /dev/null @@ -1,342 +0,0 @@ -From 5ae6c662fefa621f4600559e299a7d97c2254e69 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Sun, 16 Jul 2017 10:20:10 -0700 -Subject: [PATCH 1/3] Add support for building with system libtirpc - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - open-vm-tools/configure.ac | 14 ++++++++++++++ - open-vm-tools/lib/dynxdr/Makefile.am | 8 ++++++-- - open-vm-tools/lib/err/errPosix.c | 1 + - open-vm-tools/lib/guestRpc/Makefile.am | 6 ++++++ - open-vm-tools/lib/misc/Makefile.am | 1 + - open-vm-tools/lib/netUtil/Makefile.am | 4 ++++ - open-vm-tools/lib/nicInfo/Makefile.am | 2 ++ - open-vm-tools/lib/rpcChannel/Makefile.am | 4 ++++ - open-vm-tools/lib/slashProc/Makefile.am | 4 ++++ - open-vm-tools/lib/string/bsd_output_shared.c | 2 +- - open-vm-tools/libguestlib/Makefile.am | 2 ++ - open-vm-tools/rpctool/Makefile.am | 3 +++ - open-vm-tools/rpctool/rpctool.c | 2 ++ - open-vm-tools/services/plugins/dndcp/Makefile.am | 2 ++ - open-vm-tools/services/plugins/guestInfo/Makefile.am | 1 + - open-vm-tools/services/plugins/resolutionSet/Makefile.am | 2 ++ - open-vm-tools/services/plugins/vix/Makefile.am | 2 ++ - open-vm-tools/services/plugins/vmbackup/Makefile.am | 2 ++ - open-vm-tools/toolbox/Makefile.am | 2 ++ - 19 files changed, 61 insertions(+), 3 deletions(-) - -Index: open-vm-tools/configure.ac -=================================================================== ---- open-vm-tools.orig/configure.ac -+++ open-vm-tools/configure.ac -@@ -405,6 +405,20 @@ AC_VMW_CHECK_LIB([fuse], - AC_MSG_WARN([Fuse is missing, vmblock-fuse/vmhgfs-fuse will be disabled.])]) - - # -+# Check for libtirpc -+# -+AC_VMW_CHECK_LIB([libtirpc], -+ [LIBTIRPC], -+ [libtirpc], -+ [], -+ [], -+ [rpc/xdr.h], -+ [xdr_void], -+ [have_libtirpc=yes], -+ [have_libtitirpc=no; -+ AC_MSG_WARN([libtirpc is missing.])]) -+ -+# - # Check for PAM. - # - AC_ARG_WITH([pam], -Index: open-vm-tools/lib/dynxdr/Makefile.am -=================================================================== ---- open-vm-tools.orig/lib/dynxdr/Makefile.am -+++ open-vm-tools/lib/dynxdr/Makefile.am -@@ -17,7 +17,11 @@ - - noinst_LTLIBRARIES = libDynxdr.la - --libDynxdr_la_SOURCES = -+libDynxdr_la_SOURCES = - libDynxdr_la_SOURCES += dynxdr.c - libDynxdr_la_SOURCES += xdrutil.c --libDynxdr_la_CPPFLAGS = -Wno-incompatible-pointer-types -+libDynxdr_la_CPPFLAGS = @LIBTIRPC_CPPFLAGS@ -Wno-incompatible-pointer-types -+ -+libDynxdr_la_LIBADD = -+libDynxdr_la_LIBADD += @LIBTIRPC_LIBS@ -+ -Index: open-vm-tools/lib/err/errPosix.c -=================================================================== ---- open-vm-tools.orig/lib/err/errPosix.c -+++ open-vm-tools/lib/err/errPosix.c -@@ -31,6 +31,7 @@ - #include <errno.h> - #include <string.h> - #include <locale.h> -+#include <stdio.h> - - #include "vmware.h" - #include "errInt.h" -Index: open-vm-tools/lib/guestRpc/Makefile.am -=================================================================== ---- open-vm-tools.orig/lib/guestRpc/Makefile.am -+++ open-vm-tools/lib/guestRpc/Makefile.am -@@ -20,6 +20,12 @@ noinst_LTLIBRARIES = libGuestRpc.la - libGuestRpc_la_SOURCES = - libGuestRpc_la_SOURCES += nicinfo_xdr.c - -+libGuestRpc_la_CPPFLAGS = -+libGuestRpc_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ -+ -+libGuestRpc_la_LIBADD = -+libGuestRpc_la_LIBADD += @LIBTIRPC_LIBS@ -+ - # XXX: Autoreconf complains about this and recommends using AM_CFLAGS instead. - # Problem is, $(CFLAGS) is appended to the compiler command line after AM_CFLAGS - # and after libGuestRpc_la_CFLAGS, so "-Wall -Werror" will override this flag. -Index: open-vm-tools/lib/misc/Makefile.am -=================================================================== ---- open-vm-tools.orig/lib/misc/Makefile.am -+++ open-vm-tools/lib/misc/Makefile.am -@@ -52,4 +52,5 @@ libMisc_la_SOURCES += utilMem.c - libMisc_la_SOURCES += vmstdio.c - libMisc_la_SOURCES += strutil.c - libMisc_la_SOURCES += vthreadBase.c -+libMisc_la_CPPFLAGS = -Wno-error=int-conversion - -Index: open-vm-tools/lib/netUtil/Makefile.am -=================================================================== ---- open-vm-tools.orig/lib/netUtil/Makefile.am -+++ open-vm-tools/lib/netUtil/Makefile.am -@@ -20,3 +20,7 @@ noinst_LTLIBRARIES = libNetUtil.la - libNetUtil_la_SOURCES = - libNetUtil_la_SOURCES += netUtilLinux.c - -+libNetUtil_la_CPPFLAGS = -+libNetUtil_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ -+ -+libNetUtil_la_LIBADD = @LIBTIRPC_LIBS@ -Index: open-vm-tools/lib/nicInfo/Makefile.am -=================================================================== ---- open-vm-tools.orig/lib/nicInfo/Makefile.am -+++ open-vm-tools/lib/nicInfo/Makefile.am -@@ -25,12 +25,14 @@ libNicInfo_la_SOURCES += nicInfoPosix.c - - libNicInfo_la_CPPFLAGS = - libNicInfo_la_CPPFLAGS += @GLIB2_CPPFLAGS@ -+libNicInfo_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ - - AM_CFLAGS = $(DNET_CPPFLAGS) - if USE_SLASH_PROC - AM_CFLAGS += -DUSE_SLASH_PROC - endif - libNicInfo_la_LIBADD = -+libNicInfo_la_LIBADD += @LIBTIRPC_LIBS@ - if HAVE_DNET - libNicInfo_la_LIBADD += @DNET_LIBS@ - endif -Index: open-vm-tools/lib/rpcChannel/Makefile.am -=================================================================== ---- open-vm-tools.orig/lib/rpcChannel/Makefile.am -+++ open-vm-tools/lib/rpcChannel/Makefile.am -@@ -27,3 +27,7 @@ endif - - libRpcChannel_la_CPPFLAGS = - libRpcChannel_la_CPPFLAGS += @VMTOOLS_CPPFLAGS@ -+libRpcChannel_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ -+ -+libRpcChannel_la_LIBADD = -+libRpcChannel_la_LIBADD += @LIBTIRPC_LIBS@ -Index: open-vm-tools/lib/slashProc/Makefile.am -=================================================================== ---- open-vm-tools.orig/lib/slashProc/Makefile.am -+++ open-vm-tools/lib/slashProc/Makefile.am -@@ -22,6 +22,10 @@ libSlashProc_la_SOURCES += net.c - - libSlashProc_la_CPPFLAGS = - libSlashProc_la_CPPFLAGS += @GLIB2_CPPFLAGS@ -+libSlashProc_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ -+ -+libSlashProc_la_LIBADD = -+libSlashProc_la_LIBADD += @LIBTIRPC_LIBS@ - - AM_CFLAGS = $(DNET_CPPFLAGS) - -Index: open-vm-tools/lib/string/bsd_output_shared.c -=================================================================== ---- open-vm-tools.orig/lib/string/bsd_output_shared.c -+++ open-vm-tools/lib/string/bsd_output_shared.c -@@ -38,7 +38,7 @@ - //#include <sys/cdefs.h> - - #if !defined(STR_NO_WIN32_LIBS) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__) -- -+#define _GNU_SOURCE - #include <stdio.h> - #include <stdlib.h> - #ifndef _WIN32 -Index: open-vm-tools/libguestlib/Makefile.am -=================================================================== ---- open-vm-tools.orig/libguestlib/Makefile.am -+++ open-vm-tools/libguestlib/Makefile.am -@@ -22,6 +22,7 @@ AM_CFLAGS += -I$(top_srcdir)/include - - libguestlib_la_LIBADD = - libguestlib_la_LIBADD += @VMTOOLS_LIBS@ -+libguestlib_la_LIBADD += @LIBTIRPC_LIBS@ - - libguestlib_la_SOURCES = - libguestlib_la_SOURCES += guestlibV3_xdr.c -@@ -56,6 +57,7 @@ CFLAGS += -Wno-unused - libguestlib_la_CPPFLAGS = - libguestlib_la_CPPFLAGS += -DVMTOOLS_USE_GLIB - libguestlib_la_CPPFLAGS += @GLIB2_CPPFLAGS@ -+libguestlib_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ - - EXTRA_DIST = vmguestlib.pc.in - -Index: open-vm-tools/rpctool/Makefile.am -=================================================================== ---- open-vm-tools.orig/rpctool/Makefile.am -+++ open-vm-tools/rpctool/Makefile.am -@@ -17,10 +17,13 @@ - - bin_PROGRAMS = vmware-rpctool - -+vmware_rpctool_CFLAGS= @LIBTIRPC_LIBS@ -+ - vmware_rpctool_SOURCES = - vmware_rpctool_SOURCES += rpctool.c - - vmware_rpctool_LDADD = -+vmware_rpctool_LDADD += @LIBTIRPC_LIBS@ - vmware_rpctool_LDADD += ../lib/rpcOut/libRpcOut.la - vmware_rpctool_LDADD += ../lib/message/libMessage.la - vmware_rpctool_LDADD += ../lib/backdoor/libBackdoor.la -Index: open-vm-tools/rpctool/rpctool.c -=================================================================== ---- open-vm-tools.orig/rpctool/rpctool.c -+++ open-vm-tools/rpctool/rpctool.c -@@ -23,6 +23,8 @@ - */ - - #ifndef _WIN32 -+#define _GNU_SOURCE -+#include <signal.h> - #include "sigPosixRegs.h" - #include <errno.h> - #include <stdint.h> -Index: open-vm-tools/services/plugins/dndcp/Makefile.am -=================================================================== ---- open-vm-tools.orig/services/plugins/dndcp/Makefile.am -+++ open-vm-tools/services/plugins/dndcp/Makefile.am -@@ -23,6 +23,7 @@ plugin_LTLIBRARIES = libdndcp.la - libdndcp_la_CPPFLAGS = - libdndcp_la_CPPFLAGS += @GTK_CPPFLAGS@ - libdndcp_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ -+libdndcp_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ - libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dnd - libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dndGuest - libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/stringxx -@@ -44,6 +45,7 @@ libdndcp_la_LIBADD += @GTK_LIBS@ - libdndcp_la_LIBADD += @GTKMM_LIBS@ - libdndcp_la_LIBADD += @VMTOOLS_LIBS@ - libdndcp_la_LIBADD += @HGFS_LIBS@ -+libdndcp_la_LIBADD += @LIBTIRPC_LIBS@ - libdndcp_la_LIBADD += $(top_builddir)/lib/hgfsUri/hgfsUriPosix.lo - - libdndcp_la_SOURCES = -Index: open-vm-tools/services/plugins/guestInfo/Makefile.am -=================================================================== ---- open-vm-tools.orig/services/plugins/guestInfo/Makefile.am -+++ open-vm-tools/services/plugins/guestInfo/Makefile.am -@@ -22,6 +22,7 @@ plugin_LTLIBRARIES = libguestInfo.la - - libguestInfo_la_CPPFLAGS = - libguestInfo_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ -+libguestInfo_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ - - libguestInfo_la_LDFLAGS = - libguestInfo_la_LDFLAGS += @PLUGIN_LDFLAGS@ -Index: open-vm-tools/services/plugins/resolutionSet/Makefile.am -=================================================================== ---- open-vm-tools.orig/services/plugins/resolutionSet/Makefile.am -+++ open-vm-tools/services/plugins/resolutionSet/Makefile.am -@@ -21,6 +21,7 @@ plugin_LTLIBRARIES = libresolutionSet.la - libresolutionSet_la_CPPFLAGS = - libresolutionSet_la_CPPFLAGS += @GTK_CPPFLAGS@ - libresolutionSet_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ -+libresolutionSet_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ - libresolutionSet_la_CPPFLAGS += -DRESOLUTION_X11 - - libresolutionSet_la_LDFLAGS = -@@ -30,6 +31,7 @@ libresolutionSet_la_LIBADD = - libresolutionSet_la_LIBADD += @COMMON_XLIBS@ - libresolutionSet_la_LIBADD += @GTK_LIBS@ - libresolutionSet_la_LIBADD += @VMTOOLS_LIBS@ -+libresolutionSet_la_LIBADD += @LIBTIRPC_LIBS@ - - libresolutionSet_la_SOURCES = - libresolutionSet_la_SOURCES += libvmwarectrl.c -Index: open-vm-tools/services/plugins/vix/Makefile.am -=================================================================== ---- open-vm-tools.orig/services/plugins/vix/Makefile.am -+++ open-vm-tools/services/plugins/vix/Makefile.am -@@ -20,6 +20,7 @@ plugin_LTLIBRARIES = libvix.la - - libvix_la_CPPFLAGS = - libvix_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ -+libvix_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ - libvix_la_CPPFLAGS += -I$(top_srcdir)/vgauth/public - - libvix_la_LDFLAGS = -@@ -29,6 +30,7 @@ libvix_la_LIBADD = - libvix_la_LIBADD += @VIX_LIBADD@ - libvix_la_LIBADD += @VMTOOLS_LIBS@ - libvix_la_LIBADD += @HGFS_LIBS@ -+libvix_la_LIBADD += @LIBTIRPC_LIBS@ - libvix_la_LIBADD += $(top_builddir)/lib/auth/libAuth.la - libvix_la_LIBADD += $(top_builddir)/lib/foundryMsg/libFoundryMsg.la - libvix_la_LIBADD += $(top_builddir)/lib/impersonate/libImpersonate.la -Index: open-vm-tools/services/plugins/vmbackup/Makefile.am -=================================================================== ---- open-vm-tools.orig/services/plugins/vmbackup/Makefile.am -+++ open-vm-tools/services/plugins/vmbackup/Makefile.am -@@ -20,6 +20,7 @@ plugin_LTLIBRARIES = libvmbackup.la - - libvmbackup_la_CPPFLAGS = - libvmbackup_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ -+libvmbackup_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ - - libvmbackup_la_LDFLAGS = - libvmbackup_la_LDFLAGS += @PLUGIN_LDFLAGS@ -@@ -27,6 +28,7 @@ libvmbackup_la_LDFLAGS += @PLUGIN_LDFLAG - libvmbackup_la_LIBADD = - libvmbackup_la_LIBADD += @GOBJECT_LIBS@ - libvmbackup_la_LIBADD += @VMTOOLS_LIBS@ -+libvmbackup_la_LIBADD += @LIBTIRPC_LIBS@ - - libvmbackup_la_SOURCES = - libvmbackup_la_SOURCES += nullProvider.c -Index: open-vm-tools/toolbox/Makefile.am -=================================================================== ---- open-vm-tools.orig/toolbox/Makefile.am -+++ open-vm-tools/toolbox/Makefile.am -@@ -20,9 +20,11 @@ bin_PROGRAMS = vmware-toolbox-cmd - vmware_toolbox_cmd_LDADD = - vmware_toolbox_cmd_LDADD += ../libguestlib/libguestlib.la - vmware_toolbox_cmd_LDADD += @VMTOOLS_LIBS@ -+vmware_toolbox_cmd_LDADD += @LIBTIRPC_LIBS@ - - vmware_toolbox_cmd_CPPFLAGS = - vmware_toolbox_cmd_CPPFLAGS += @VMTOOLS_CPPFLAGS@ -+vmware_toolbox_cmd_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ - - vmware_toolbox_cmd_SOURCES = - vmware_toolbox_cmd_SOURCES += toolbox-cmd.c diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-gnu-ucontext.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-gnu-ucontext.patch deleted file mode 100644 index c9beac1fcd..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-gnu-ucontext.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 27442e2dd287d393d7b3f8bf164a887affef84df Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 18 Nov 2015 10:27:51 +0000 -Subject: [PATCH 10/11] gnu-ucontext - ---- - open-vm-tools/lib/include/sigPosixRegs.h | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -Index: open-vm-tools/lib/include/sigPosixRegs.h -=================================================================== ---- open-vm-tools.orig/lib/include/sigPosixRegs.h -+++ open-vm-tools/lib/include/sigPosixRegs.h -@@ -33,7 +33,7 @@ - #include "includeCheck.h" - - --#if __linux__ // We need the REG_foo offsets in the gregset_t; -+#if defined(__GLIBC__) // We need the REG_foo offsets in the gregset_t; - # define _GNU_SOURCE // _GNU_SOURCE maps to __USE_GNU - - /* And, the REG_foo definitions conflict with our own in x86.h */ -@@ -73,7 +73,7 @@ - #include <sys/ucontext.h> - #endif - --#if __linux__ -+#if defined(__GLIBC__) - # if defined(__x86_64__) - # undef REG_RAX - # undef REG_RBX -@@ -199,7 +199,7 @@ - #define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.mc_esp) - #define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.mc_eip) - #endif --#elif defined (sun) -+#elif !defined (__GLIBC__) - #ifdef __x86_64__ - #define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_RAX]) - #define SC_EBX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_RBX]) -@@ -219,15 +219,15 @@ - #define SC_R14(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_R14]) - #define SC_R15(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_R15]) - #else --#define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EAX]) --#define SC_EBX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EBX]) --#define SC_ECX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[ECX]) --#define SC_EDX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EDX]) --#define SC_EDI(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EDI]) --#define SC_ESI(uc) ((unsigned long) (uc)->uc_mcontext.gregs[ESI]) --#define SC_EBP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EBP]) --#define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[ESP]) --#define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EIP]) -+#define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EAX]) -+#define SC_EBX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EBX]) -+#define SC_ECX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_ECX]) -+#define SC_EDX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EDX]) -+#define SC_EDI(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EDI]) -+#define SC_ESI(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_ESI]) -+#define SC_EBP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EBP]) -+#define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_ESP]) -+#define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EIP]) - #endif - #elif defined(ANDROID_X86) - #define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.eax) diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-configure-test-for-sys-stat.h-include.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-configure-test-for-sys-stat.h-include.patch deleted file mode 100644 index 78722390e8..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-configure-test-for-sys-stat.h-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 95c6184d9ff70a47c41768850923a96de9e544aa Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 18 Nov 2015 10:41:01 +0000 -Subject: [PATCH 11/11] Use configure test for sys/stat.h include - -This is needed for musl libc. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - open-vm-tools/services/plugins/vix/vixTools.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: open-vm-tools/services/plugins/vix/vixTools.c -=================================================================== ---- open-vm-tools.orig/services/plugins/vix/vixTools.c -+++ open-vm-tools/services/plugins/vix/vixTools.c -@@ -66,7 +66,7 @@ - #include <unistd.h> - #endif - --#if defined(sun) || defined(__FreeBSD__) || defined(__APPLE__) -+#ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> - #endif - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb deleted file mode 100644 index c32d2c5b33..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb +++ /dev/null @@ -1,114 +0,0 @@ -# This recipe is modified from the recipe originally found in the Open-Switch -# repository: -# -# https://github.com/open-switch/ops-build -# yocto/openswitch/meta-foss-openswitch/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb -# Commit 9008de2d8e100f3f868c66765742bca9fa98f3f9 -# -# The recipe packaging has been relicensed under the MIT license for inclusion -# in meta-openembedded by agreement of the author (Diego Dompe). -# - -SUMMARY = "Tools to enhance VMWare guest integration and performance" -HOMEPAGE = "https://github.com/vmware/open-vm-tools" -SECTION = "vmware-tools" - -LICENSE = "LGPL-2.0 & GPL-2.0 & BSD & CDDL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b66ba4cb4fc017682c95efc300410e79" -LICENSE_modules/freebsd/vmblock = "BSD" -LICENSE_modules/freebsd/vmmemctl = "GPL-2.0" -LICENSE_modules/freebsd/vmxnet = "GPL-2.0" -LICENSE_modules/linux = "GPL-2.0" -LICENSE_modules/solaris = "CDDL-1.0" - -SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ - file://tools.conf \ - file://vmtoolsd.service \ - file://vmtoolsd.init \ - file://0001-configure.ac-don-t-use-dnet-config.patch \ - file://0002-add-include-sys-sysmacros.h.patch \ - file://0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch \ - file://0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch \ - file://0003-Rename-poll.h-to-vm_poll.h.patch \ - file://0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch \ - file://0005-Use-configure-test-for-struct-timespec.patch \ - file://0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch \ - file://0007-Use-configure-to-test-for-feature-instead-of-platfor.patch \ - file://0008-use-posix-strerror_r-unless-gnu.patch \ - file://0011-Use-configure-test-for-sys-stat.h-include.patch \ - " -SRC_URI_append_libc-musl = "\ - file://0009-Add-support-for-building-with-system-libtirpc.patch \ - file://0010-gnu-ucontext.patch \ - " -SRCREV = "854c0bb374612f7e633b448ca273f970f154458b" - -S = "${WORKDIR}/git/open-vm-tools" - -DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps" -DEPENDS_append_libc-musl = " libtirpc" - -# open-vm-tools is supported only on x86. -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' - -inherit autotools pkgconfig systemd update-rc.d - -SYSTEMD_SERVICE_${PN} = "vmtoolsd.service" - -EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ - --disable-tests --without-gtkmm --without-xerces --without-pam \ - --disable-grabbitmqproxy --disable-vgauth --disable-deploypkg \ - --without-root-privileges --without-kernel-modules" - -NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3" -X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf" -PACKAGECONFIG[x11] = ",${NO_X11_FLAGS},${X11_DEPENDS}" - -# fuse gets implicitly detected; there is no --without-fuse option. -PACKAGECONFIG[fuse] = ",,fuse" - -CFLAGS_append_toolchain-clang = " -Wno-address-of-packed-member" -FILES_${PN} += "\ - ${libdir}/open-vm-tools/plugins/vmsvc/lib*.so \ - ${libdir}/open-vm-tools/plugins/common/lib*.so \ - ${sysconfdir}/vmware-tools/tools.conf \ - " -FILES_${PN}-locale += "${datadir}/open-vm-tools/messages" -FILES_${PN}-dev += "${libdir}/open-vm-tools/plugins/common/lib*.la" -FILES_${PN}-dbg += "\ - ${libdir}/open-vm-tools/plugins/common/.debug \ - ${libdir}/open-vm-tools/plugins/vmsvc/.debug \ - " - -CONFFILES_${PN} += "${sysconfdir}/vmware-tools/tools.conf" - -RDEPENDS_${PN} = "util-linux libdnet fuse" - -do_install_append() { - ln -sf ${sbindir}/mount.vmhgfs ${D}/sbin/mount.vmhgfs - install -d ${D}${sysconfdir}/vmware-tools - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system - else - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/vmtoolsd.init ${D}${sysconfdir}/init.d/vmtoolsd - fi - install -m 0644 ${WORKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf -} - -do_configure_prepend() { - export CUSTOM_DNET_NAME=dnet - export CUSTOM_DNET_LIBS=-L${STAGING_LIBDIR}/libdnet.so -} - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "vmtoolsd" -INITSCRIPT_PARAMS_${PN} = "start 90 2 3 4 5 . stop 60 0 1 6 ." - -python() { - if 'networking-layer' not in d.getVar('BBFILE_COLLECTIONS').split() or \ - 'filesystems-layer' not in d.getVar('BBFILE_COLLECTIONS').split(): - raise bb.parse.SkipRecipe('Requires meta-networking and meta-filesystems to be present.') -} - diff --git a/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb b/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb new file mode 100644 index 0000000000..6cacd3722c --- /dev/null +++ b/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb @@ -0,0 +1,20 @@ +SUMMARY = "Enumerate all known properties of OpenCL platform and devices." +DESCRIPTION = "clinfo is a simple command-line application that enumerates \ +all possible (known) properties of the OpenCL platform and devices \ +available on the system." +HOMEPAGE = "https://github.com/Oblomov/clinfo" + +LICENSE = "CC0-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fd8857f774dfb0eefe1e80c8f9240a7e" + +SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https;branch=master" + +SRCREV = "748c3930a9b9cb826e631d77439e2cb8f84f5bcf" + +S = "${WORKDIR}/git" + +DEPENDS += "opencl-headers virtual/opencl-icd" + +do_install() { + oe_runmake install PREFIX=${D}${prefix} MANDIR=${D}${mandir} +} diff --git a/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch b/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch new file mode 100644 index 0000000000..73c9d06667 --- /dev/null +++ b/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch @@ -0,0 +1,65 @@ +From c4351058da555e1e6a2b4b15d913baee80f55865 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Thu, 27 Jun 2024 06:27:18 +0000 +Subject: Fix incompatible pointer type error with gcc option + -Wincompatible-pointer-types + +| ../../../openct-0.6.20/src/ifd/ifdhandler.c: In function 'ifdhandler_run': +| ../../../openct-0.6.20/src/ifd/ifdhandler.c:239:52: error: passing argument 2 of 'ifd_get_eventfd' from incompatible pointer type [-Wincompatible-pointer-types] +| 239 | sock->fd = ifd_get_eventfd(reader, &sock->events); +| | ^~~~~~~~~~~~~ +| | | +| | int * +| In file included from ../../../openct-0.6.20/src/ifd/internal.h:17, +| from ../../../openct-0.6.20/src/ifd/ifdhandler.c:7: +| ../../../openct-0.6.20/src/include/openct/ifd.h:182:65: note: expected 'short int *' but argument is of type 'int *' +| 182 | extern int ifd_get_eventfd(ifd_reader_t *, short *); +| | ^~~~~~~ + +| ../../../openct-0.6.20/src/ifd/process.c: In function 'do_memory_write': +| ../../../openct-0.6.20/src/ifd/process.c:461:61: error: passing argument 4 of 'ct_tlv_get_opaque' from incompatible pointer type [-Wincompatible-pointer-types] +| 461 | || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, &data_len)) +| | ^~~~~~~~~ +| | | +| | unsigned int * +| In file included from ../../../openct-0.6.20/src/ifd/process.c:20: +| ../../../openct-0.6.20/src/include/openct/tlv.h:40:62: note: expected 'size_t *' {aka 'long unsigned int *'} but argument is of type 'unsigned int *' +| 40 | ifd_tag_t, unsigned char **, size_t *); + +Upstream-Status: Submitted + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + src/ifd/ifdhandler.c | 2 +- + src/ifd/process.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ifd/ifdhandler.c b/src/ifd/ifdhandler.c +index 12686c9..ebd1b53 100644 +--- a/src/ifd/ifdhandler.c ++++ b/src/ifd/ifdhandler.c +@@ -236,7 +236,7 @@ static void ifdhandler_run(ifd_reader_t * reader) + sock->fd = -1; + } + else { +- sock->fd = ifd_get_eventfd(reader, &sock->events); ++ sock->fd = ifd_get_eventfd(reader, (short int *)&sock->events); + } + if (sock->fd == -1) { + ifd_debug(1, "events inactive for reader %s", reader->name); +diff --git a/src/ifd/process.c b/src/ifd/process.c +index 4563bdf..7088a76 100644 +--- a/src/ifd/process.c ++++ b/src/ifd/process.c +@@ -458,7 +458,7 @@ static int do_memory_write(ifd_reader_t * reader, int unit, + return IFD_ERROR_INVALID_SLOT; + + if (ct_tlv_get_int(args, CT_TAG_ADDRESS, &address) == 0 +- || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, &data_len)) ++ || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, (size_t *)&data_len)) + return IFD_ERROR_MISSING_ARG; + + rc = ifd_card_write_memory(reader, unit, address, data, data_len); +-- +2.34.1 + diff --git a/meta-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch b/meta-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch new file mode 100644 index 0000000000..9bd3d18d6e --- /dev/null +++ b/meta-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch @@ -0,0 +1,31 @@ +From 146b5116140d719e4e9ae19748c0b6dee7d82f96 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 22 May 2023 22:01:28 -0700 +Subject: [PATCH] m4: Just emit the first line of compiler version + +Avoids emitting buildpaths into comments +Fixes +WARNING: openct-0.6.20-r0 do_package_qa: QA Issue: File /usr/include/openct/types.h in package openct-dev contains reference to TMPDIR [buildpaths] + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/ac_create_stdint_h.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/ac_create_stdint_h.m4 b/m4/ac_create_stdint_h.m4 +index 66de704..4b7223a 100644 +--- a/m4/ac_create_stdint_h.m4 ++++ b/m4/ac_create_stdint_h.m4 +@@ -110,7 +110,7 @@ echo "#define" $_ac_stdint_h "1" >>$ac_stdint_h + echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint_h + echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint_h + if test "$GCC" = "yes" ; then +- echo "/* generated using a gnu compiler version" `$CC --version` "*/" \ ++ echo "/* generated using a gnu compiler version" `$CC --version|head -1` "*/" \ + >>$ac_stdint_h + else + echo "/* generated using $CC */" >>$ac_stdint_h +-- +2.40.1 + diff --git a/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch b/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch index 745f923af1..e2401bb31b 100644 --- a/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch +++ b/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch @@ -5,7 +5,7 @@ Subject: [PATCH 1/2] etc/openct.udev.in: disablePROGRAM Bug fix: https://bugzilla.redhat.com/show_bug.cgi?id=287871 -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch b/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch index d5e3fe5753..22eda729fb 100644 --- a/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch +++ b/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch @@ -5,7 +5,7 @@ Subject: [PATCH 2/2] etc/openct_usb.in: modify UDEVINFO this patch is from Fedora -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb index c7d7203eda..bcff90c86e 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -1,4 +1,4 @@ -Summanry = "Middleware framework for smart card terminals" +SUMMARY = "Middleware framework for smart card terminals" HOMEPAGE = "https://github.com/OpenSC/openct/wiki" DESCRIPTION = " \ OpenCT implements drivers for several smart card readers. \ @@ -11,22 +11,26 @@ readers to remote machines via TCP/IP." DEPENDS += "libtool pcsc-lite libusb-compat" SRC_URI = " \ - ${DEBIAN_MIRROR}/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz \ + https://downloads.sourceforge.net/project/opensc/${BPN}/${BPN}-${PV}.tar.gz \ file://etc-openct.udev.in-disablePROGRAM.patch \ file://etc-openct_usb.in-modify-UDEVINFO.patch \ + file://0001-m4-Just-emit-the-first-line-of-compiler-version.patch \ file://openct.init \ file://openct.sysconfig \ file://openct.service \ + file://0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch \ " SRC_URI[md5sum] = "a1da3358ab798f1cb9232f1dbababc21" SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d181a68" -LICENSE = "LGPLv2+" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/opensc/files/openct/" + +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)} -SYSTEMD_SERVICE_${PN} += "openct.service " +inherit systemd +SYSTEMD_SERVICE:${PN} += "openct.service " SYSTEMD_AUTO_ENABLE = "enable" EXTRA_OECONF=" \ @@ -35,62 +39,54 @@ EXTRA_OECONF=" \ --enable-pcsc \ --enable-doc \ --enable-api-doc \ - --with-udev=${nonarch_base_libdir}/udev \ + --with-udev=${nonarch_libdir}/udev \ --with-bundle=${libdir}/pcsc/drivers \ " inherit autotools pkgconfig -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/ctapi \ - ${nonarch_base_libdir}/udev \ + ${nonarch_libdir}/udev \ ${libdir}/openct-ifd.so \ ${libdir}/pcsc \ - /run/openct/status \ " -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${libdir}/ctapi/.debug \ ${libdir}/pcsc/drivers/openct-ifd.bundle/Contents/Linux/.debug \ " -INSANE_SKIP_${PN} += "dev-deps" +INSANE_SKIP:${PN} += "dev-deps" -do_install_append() { - rm -r ${D}/${localstatedir}/run -} +do_install[cleandirs] += "${D}" do_install () { - rm -rf ${D} - install -d ${D}/etc - install -dm 755 ${D}${nonarch_base_libdir}/udev + install -d ${D}${sysconfdir} # fix up hardcoded paths sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ - ${WORKDIR}/openct.service ${WORKDIR}/openct.init + ${UNPACKDIR}/openct.service ${UNPACKDIR}/openct.init oe_runmake install DESTDIR=${D} install -dm 755 ${D}${libdir}/ctapi/ mv ${D}${libdir}/libopenctapi.so ${D}${libdir}/ctapi/ - install -Dpm 644 etc/openct.udev ${D}/etc/udev/rules.d/60-openct.rules - install -pm 644 etc/openct.conf ${D}/etc/openct.conf + install -Dpm 644 etc/openct.udev ${D}${nonarch_libdir}/udev/rules.d/60-openct.rules + install -pm 644 etc/openct.conf ${D}${sysconfdir}/openct.conf - install -Dpm 755 ${WORKDIR}/openct.init ${D}/etc/init.d/openct - install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}/etc/sysconfig/openct + install -Dpm 755 ${UNPACKDIR}/openct.init ${D}${sysconfdir}/init.d/openct + install -Dpm 644 ${UNPACKDIR}/openct.sysconfig ${D}${sysconfdir}/sysconfig/openct - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system - fi + install -d ${D}${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/openct.service ${D}${systemd_unitdir}/system so=$(find ${D} -name \*.so | sed "s|^${D}||") sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf - install -Dpm 644 etc/reader.conf ${D}/etc/reader.conf.d/openct.conf - - install -dm 755 ${D}${localstatedir}/run/openct - touch ${D}${localstatedir}/run/openct/status - chmod 644 ${D}${localstatedir}/run/openct/status + install -Dpm 644 etc/reader.conf ${D}${sysconfdir}/reader.conf.d/openct.conf } -pkg_postinst_${PN} () { - ln -sf ctapi/libopenctapi.so ${libdir}/libopenctapi.so -} +BBCLASSEXTEND = "native" + +# http://errors.yoctoproject.org/Errors/Details/766890/ +# openct-0.6.20/src/ifd/ifdhandler.c:239:52: error: passing argument 2 of 'ifd_get_eventfd' from incompatible pointer type [-Wincompatible-pointer-types] +# openct-0.6.20/src/ifd/process.c:461:61: error: passing argument 4 of 'ct_tlv_get_opaque' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/opencv/ade_0.1.2.bb b/meta-oe/recipes-support/opencv/ade_0.1.2.bb new file mode 100644 index 0000000000..93b14ad4f3 --- /dev/null +++ b/meta-oe/recipes-support/opencv/ade_0.1.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "A graph construction, manipulation, and processing framework" +DESCRIPTION = "ADE Framework is a graph construction, manipulation, \ +and processing framework. ADE Framework is suitable for \ +organizing data flow processing and execution." +HOMEPAGE = "https://github.com/opencv/ade" + +SRC_URI = "git://github.com/opencv/ade.git;branch=master;protocol=https" + +SRCREV = "1e02d7486bdb9c87993d91b9910e7cc6c4ddbf66" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +inherit cmake + +S = "${WORKDIR}/git" + +EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release" + +FILES:${PN}-dev += "${datadir}/${BPN}/*.cmake" diff --git a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch deleted file mode 100644 index 4d76ad40ce..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4801a057730632225337d7f6d26b9335e6b9b078 Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> -Date: Thu, 31 Mar 2016 00:20:15 +0200 -Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp - -Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> -Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> ---- - 3rdparty/ippicv/ippicv.cmake | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake -index d601da4bb..f6fc1098c 100644 ---- a/3rdparty/ippicv/ippicv.cmake -+++ b/3rdparty/ippicv/ippicv.cmake -@@ -39,18 +39,5 @@ function(download_ippicv root_var) - endif() - - set(THE_ROOT "${OpenCV_BINARY_DIR}/3rdparty/ippicv") -- ocv_download(FILENAME ${OPENCV_ICV_NAME} -- HASH ${OPENCV_ICV_HASH} -- URL -- "${OPENCV_IPPICV_URL}" -- "$ENV{OPENCV_IPPICV_URL}" -- "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${IPPICV_COMMIT}/ippicv/" -- DESTINATION_DIR "${THE_ROOT}" -- ID IPPICV -- STATUS res -- UNPACK RELATIVE_URL) -- -- if(res) -- set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) -- endif() -+ set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) - endfunction() --- -2.13.4 - diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch b/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch index 6dd48fcdc3..948a80fafa 100644 --- a/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch +++ b/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch @@ -1,24 +1,26 @@ -From 2bc6bb9831d07f035fea74ea745cea43dd5f9ef9 Mon Sep 17 00:00:00 2001 +From 66e50ee69fa9ee2469d349100e70d8b296c4b4dc Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 9 Sep 2017 23:48:31 -0700 +Date: Tue, 11 Sep 2018 00:21:18 -0700 Subject: [PATCH] Dont use isystem -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- +clang really does not like it + Upstream-Status: Pending - cmake/OpenCVPCHSupport.cmake | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + cmake/OpenCVPCHSupport.cmake | 2 ++ + 1 file changed, 2 insertions(+) -Index: git/cmake/OpenCVPCHSupport.cmake -=================================================================== ---- git.orig/cmake/OpenCVPCHSupport.cmake -+++ git/cmake/OpenCVPCHSupport.cmake -@@ -17,7 +17,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX) - IF(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.2.0") +diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake +index 08cd06def4..46c9c02da3 100644 +--- a/cmake/OpenCVPCHSupport.cmake ++++ b/cmake/OpenCVPCHSupport.cmake +@@ -18,6 +18,8 @@ IF(CV_GCC) SET(PCHSupport_FOUND TRUE) ENDIF() -- + + SET(CMAKE_INCLUDE_SYSTEM_FLAG_C "-I") + SET(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-I") SET(_PCH_include_prefix "-I") diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch b/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch new file mode 100644 index 0000000000..d56b8ae67e --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch @@ -0,0 +1,42 @@ +From 11bbf909e08594628bd757d989ae34cf1bfe200b Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 18 Jun 2020 05:51:38 +0000 +Subject: [PATCH] Make ts module external + +Make ts module external + +Reference: https://github.com/qbonnard/opencv/commit/6b229c5834cb9a0930425e762a6c7b03244d7abb + +Upstream-Status: Submitted [https://github.com/opencv/opencv/issues/8408] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + modules/ts/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt +index f95bed0793..66f315bcca 100644 +--- a/modules/ts/CMakeLists.txt ++++ b/modules/ts/CMakeLists.txt +@@ -4,9 +4,6 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) + ocv_module_disable(ts) + endif() + +-set(OPENCV_MODULE_TYPE STATIC) +-set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) +- + if(WINRT) + # WINRT doesn't have access to environment variables + # so adding corresponding macros during CMake run +@@ -16,7 +13,7 @@ endif() + + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) + +-ocv_add_module(ts INTERNAL opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) ++ocv_add_module(ts opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) + + ocv_glob_module_sources() + ocv_module_include_directories() +-- +2.24.1 + diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch b/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch new file mode 100644 index 0000000000..a3bbefaabe --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch @@ -0,0 +1,33 @@ +From e4ec6cea72da9e9ae5ba57140fa2f5c63f1f8295 Mon Sep 17 00:00:00 2001 +From: Jason Wessel <jason.wessel@windriver.com> +Date: Wed, 9 May 2018 13:33:59 -0700 +Subject: [PATCH] Temporarliy work around deprecated ffmpeg RAW function + compile failure until next uprev + +Signed-off-by: Jason Wessel <jason.wessel@windriver.com> + +--- +Upstream-Status: Pending + + modules/videoio/src/cap_ffmpeg_impl.hpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp +index 6dca724a89..ae55dd4555 100644 +--- a/modules/videoio/src/cap_ffmpeg_impl.hpp ++++ b/modules/videoio/src/cap_ffmpeg_impl.hpp +@@ -774,6 +774,14 @@ struct ImplMutex::Impl + + #endif + ++/* NOTE This is deprecated in ffmpeg and the code should be removed */ ++#ifndef AVFMT_RAWPICTURE ++#define AVFMT_RAWPICTURE 0x0020 ++#endif /* AVFMT_RAWPICTURE */ ++#ifndef CODEC_FLAG_GLOBAL_HEADER ++#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER ++#endif ++ + void ImplMutex::init() + { + impl = new Impl(); diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch b/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch new file mode 100644 index 0000000000..c5a64387f5 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch @@ -0,0 +1,31 @@ +From 59fafe6e39759e193b5764b36b4c5a93da352123 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 18 Aug 2020 00:36:49 -0700 +Subject: [PATCH] Use -Os to compile tinyxml2.cpp + +This workarounds issue [1] seen on riscv with gcc + +[1] https://github.com/riscv/riscv-gnu-toolchain/issues/624 + +Upstream-Status: Inappropriate [ OE-Specific ] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + modules/datasets/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/datasets/CMakeLists.txt b/modules/datasets/CMakeLists.txt +index 56ca9e310..99b7a33f6 100644 +--- a/modules/datasets/CMakeLists.txt ++++ b/modules/datasets/CMakeLists.txt +@@ -2,7 +2,7 @@ set(the_description "datasets framework") + + set(filter_srcs "${CMAKE_CURRENT_LIST_DIR}/src/tinyxml2/tinyxml2.cpp") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override") # GCC ++ ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override -Os") # GCC + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-inconsistent-missing-override") # Clang + endif() +-- +2.28.0 + diff --git a/meta-oe/recipes-support/opencv/opencv/0001-build-workaround-GCC-7.1.1-compilation-issue-with-sa.patch b/meta-oe/recipes-support/opencv/opencv/0001-build-workaround-GCC-7.1.1-compilation-issue-with-sa.patch deleted file mode 100644 index 0140633db3..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-build-workaround-GCC-7.1.1-compilation-issue-with-sa.patch +++ /dev/null @@ -1,127 +0,0 @@ -Upstream-Status: Backport [https://github.com/opencv/opencv/pull/9376/commits/0d854db361106dfcb055231fd0112c5b85ef2287] - -Fix CVEs for opencv 3.3. - -* CVE-2017-12597 -* CVE-2017-12598 -* CVE-2017-12599 -* CVE-2017-12600 -* CVE-2017-12601 -* CVE-2017-12602 -* CVE-2017-12603 -* CVE-2017-12604 -* CVE-2017-12605 -* CVE-2017-12606 -* CVE-2017-12862 -* CVE-2017-12863 -* CVE-2017-12864 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From 0d854db361106dfcb055231fd0112c5b85ef2287 Mon Sep 17 00:00:00 2001 -From: Alexander Alekhin <alexander.a.alekhin@gmail.com> -Date: Tue, 15 Aug 2017 21:45:05 +0000 -Subject: [PATCH 1/3] build: workaround GCC 7.1.1 compilation issue with - sanitize flags - -Version: gcc (GCC) 7.1.1 20170622 (Red Hat 7.1.1-3) -Flags: -fsanitize=address,undefined ---- - modules/ts/src/cuda_test.cpp | 56 ++++++++++++++++++++++++++------------------ - 1 file changed, 33 insertions(+), 23 deletions(-) - -diff --git a/modules/ts/src/cuda_test.cpp b/modules/ts/src/cuda_test.cpp -index a48e0a087..eb4cee136 100644 ---- a/modules/ts/src/cuda_test.cpp -+++ b/modules/ts/src/cuda_test.cpp -@@ -322,16 +322,20 @@ namespace cvtest - - if (m1.size() != m2.size()) - { -- return AssertionFailure() << "Matrices \"" << expr1 << "\" and \"" << expr2 << "\" have different sizes : \"" -- << expr1 << "\" [" << PrintToString(m1.size()) << "] vs \"" -- << expr2 << "\" [" << PrintToString(m2.size()) << "]"; -+ std::stringstream msg; -+ msg << "Matrices \"" << expr1 << "\" and \"" << expr2 << "\" have different sizes : \"" -+ << expr1 << "\" [" << PrintToString(m1.size()) << "] vs \"" -+ << expr2 << "\" [" << PrintToString(m2.size()) << "]"; -+ return AssertionFailure() << msg.str(); - } - - if (m1.type() != m2.type()) - { -- return AssertionFailure() << "Matrices \"" << expr1 << "\" and \"" << expr2 << "\" have different types : \"" -- << expr1 << "\" [" << PrintToString(MatType(m1.type())) << "] vs \"" -- << expr2 << "\" [" << PrintToString(MatType(m2.type())) << "]"; -+ std::stringstream msg; -+ msg << "Matrices \"" << expr1 << "\" and \"" << expr2 << "\" have different types : \"" -+ << expr1 << "\" [" << PrintToString(MatType(m1.type())) << "] vs \"" -+ << expr2 << "\" [" << PrintToString(MatType(m2.type())) << "]"; -+ return AssertionFailure() << msg.str(); - } - - Mat diff; -@@ -343,12 +347,14 @@ namespace cvtest - - if (maxVal > eps) - { -- return AssertionFailure() << "The max difference between matrices \"" << expr1 << "\" and \"" << expr2 -- << "\" is " << maxVal << " at (" << maxLoc.y << ", " << maxLoc.x / m1.channels() << ")" -- << ", which exceeds \"" << eps_expr << "\", where \"" -- << expr1 << "\" at (" << maxLoc.y << ", " << maxLoc.x / m1.channels() << ") evaluates to " << printMatVal(m1, maxLoc) << ", \"" -- << expr2 << "\" at (" << maxLoc.y << ", " << maxLoc.x / m1.channels() << ") evaluates to " << printMatVal(m2, maxLoc) << ", \"" -- << eps_expr << "\" evaluates to " << eps; -+ std::stringstream msg; -+ msg << "The max difference between matrices \"" << expr1 << "\" and \"" << expr2 -+ << "\" is " << maxVal << " at (" << maxLoc.y << ", " << maxLoc.x / m1.channels() << ")" -+ << ", which exceeds \"" << eps_expr << "\", where \"" -+ << expr1 << "\" at (" << maxLoc.y << ", " << maxLoc.x / m1.channels() << ") evaluates to " << printMatVal(m1, maxLoc) << ", \"" -+ << expr2 << "\" at (" << maxLoc.y << ", " << maxLoc.x / m1.channels() << ") evaluates to " << printMatVal(m2, maxLoc) << ", \"" -+ << eps_expr << "\" evaluates to " << eps; -+ return AssertionFailure() << msg.str(); - } - - return AssertionSuccess(); -@@ -469,9 +475,11 @@ namespace cvtest - { - if (gold.size() != actual.size()) - { -- return testing::AssertionFailure() << "KeyPoints size mistmach\n" -- << "\"" << gold_expr << "\" : " << gold.size() << "\n" -- << "\"" << actual_expr << "\" : " << actual.size(); -+ std::stringstream msg; -+ msg << "KeyPoints size mistmach\n" -+ << "\"" << gold_expr << "\" : " << gold.size() << "\n" -+ << "\"" << actual_expr << "\" : " << actual.size(); -+ return AssertionFailure() << msg.str(); - } - - std::sort(actual.begin(), actual.end(), KeyPointLess()); -@@ -484,14 +492,16 @@ namespace cvtest - - if (!keyPointsEquals(p1, p2)) - { -- return testing::AssertionFailure() << "KeyPoints differ at " << i << "\n" -- << "\"" << gold_expr << "\" vs \"" << actual_expr << "\" : \n" -- << "pt : " << testing::PrintToString(p1.pt) << " vs " << testing::PrintToString(p2.pt) << "\n" -- << "size : " << p1.size << " vs " << p2.size << "\n" -- << "angle : " << p1.angle << " vs " << p2.angle << "\n" -- << "response : " << p1.response << " vs " << p2.response << "\n" -- << "octave : " << p1.octave << " vs " << p2.octave << "\n" -- << "class_id : " << p1.class_id << " vs " << p2.class_id; -+ std::stringstream msg; -+ msg << "KeyPoints differ at " << i << "\n" -+ << "\"" << gold_expr << "\" vs \"" << actual_expr << "\" : \n" -+ << "pt : " << testing::PrintToString(p1.pt) << " vs " << testing::PrintToString(p2.pt) << "\n" -+ << "size : " << p1.size << " vs " << p2.size << "\n" -+ << "angle : " << p1.angle << " vs " << p2.angle << "\n" -+ << "response : " << p1.response << " vs " << p2.response << "\n" -+ << "octave : " << p1.octave << " vs " << p2.octave << "\n" -+ << "class_id : " << p1.class_id << " vs " << p2.class_id; -+ return AssertionFailure() << msg.str(); - } - } - --- -2.14.1 - diff --git a/meta-oe/recipes-support/opencv/opencv/0001-carotene-don-t-use-__asm__-with-aarch64.patch b/meta-oe/recipes-support/opencv/opencv/0001-carotene-don-t-use-__asm__-with-aarch64.patch deleted file mode 100644 index a1a56e0e4d..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-carotene-don-t-use-__asm__-with-aarch64.patch +++ /dev/null @@ -1,1250 +0,0 @@ -From 353fc92618ce0dc6bab4a3e8bff1c13c3b613110 Mon Sep 17 00:00:00 2001 -From: Alexander Alekhin <alexander.alekhin@intel.com> -Date: Wed, 23 Aug 2017 17:41:23 +0300 -Subject: [PATCH 1/2] carotene: don't use __asm__ with aarch64 - ---- -Upstream-Status: Backport - - 3rdparty/carotene/src/channel_extract.cpp | 4 +- - 3rdparty/carotene/src/channels_combine.cpp | 2 +- - 3rdparty/carotene/src/colorconvert.cpp | 104 ++++++++++++++--------------- - 3rdparty/carotene/src/convert.cpp | 54 +++++++-------- - 3rdparty/carotene/src/convert_scale.cpp | 72 ++++++++++---------- - 3rdparty/carotene/src/gaussian_blur.cpp | 6 +- - 3rdparty/carotene/src/pyramid.cpp | 20 +++--- - 3rdparty/carotene/src/scharr.cpp | 4 +- - 8 files changed, 133 insertions(+), 133 deletions(-) - -diff --git a/3rdparty/carotene/src/channel_extract.cpp b/3rdparty/carotene/src/channel_extract.cpp -index f663bc6005..8238a3ece8 100644 ---- a/3rdparty/carotene/src/channel_extract.cpp -+++ b/3rdparty/carotene/src/channel_extract.cpp -@@ -231,7 +231,7 @@ void extract4(const Size2D &size, - srcStride == dst2Stride && \ - srcStride == dst3Stride && - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - - #define SPLIT_ASM2(sgn, bits) __asm__ ( \ - "vld2." #bits " {d0, d2}, [%[in0]] \n\t" \ -@@ -351,7 +351,7 @@ void extract4(const Size2D &size, - } \ - } - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - - #define ALPHA_QUAD(sgn, bits) { \ - internal::prefetch(src + sj); \ -diff --git a/3rdparty/carotene/src/channels_combine.cpp b/3rdparty/carotene/src/channels_combine.cpp -index 157c8b8121..fc98fb9181 100644 ---- a/3rdparty/carotene/src/channels_combine.cpp -+++ b/3rdparty/carotene/src/channels_combine.cpp -@@ -77,7 +77,7 @@ namespace CAROTENE_NS { - dstStride == src2Stride && \ - dstStride == src3Stride && - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - - #define MERGE_ASM2(sgn, bits) __asm__ ( \ - "vld1." #bits " {d0-d1}, [%[in0]] \n\t" \ -diff --git a/3rdparty/carotene/src/colorconvert.cpp b/3rdparty/carotene/src/colorconvert.cpp -index 3037fe672a..26ae54b15c 100644 ---- a/3rdparty/carotene/src/colorconvert.cpp -+++ b/3rdparty/carotene/src/colorconvert.cpp -@@ -97,7 +97,7 @@ void rgb2gray(const Size2D &size, COLOR_SPACE color_space, - const u32 G2Y = color_space == COLOR_SPACE_BT601 ? G2Y_BT601 : G2Y_BT709; - const u32 B2Y = color_space == COLOR_SPACE_BT601 ? B2Y_BT601 : B2Y_BT709; - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - register int16x4_t v_r2y asm ("d31") = vmov_n_s16(R2Y); - register int16x4_t v_g2y asm ("d30") = vmov_n_s16(G2Y); - register int16x4_t v_b2y asm ("d29") = vmov_n_s16(B2Y); -@@ -116,7 +116,7 @@ void rgb2gray(const Size2D &size, COLOR_SPACE color_space, - u8 * dst = internal::getRowPtr(dstBase, dstStride, i); - size_t sj = 0u, dj = 0u; - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - for (; dj < roiw8; sj += 24, dj += 8) - { - internal::prefetch(src + sj); -@@ -198,7 +198,7 @@ void rgbx2gray(const Size2D &size, COLOR_SPACE color_space, - const u32 G2Y = color_space == COLOR_SPACE_BT601 ? G2Y_BT601 : G2Y_BT709; - const u32 B2Y = color_space == COLOR_SPACE_BT601 ? B2Y_BT601 : B2Y_BT709; - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - register int16x4_t v_r2y asm ("d31") = vmov_n_s16(R2Y); - register int16x4_t v_g2y asm ("d30") = vmov_n_s16(G2Y); - register int16x4_t v_b2y asm ("d29") = vmov_n_s16(B2Y); -@@ -217,7 +217,7 @@ void rgbx2gray(const Size2D &size, COLOR_SPACE color_space, - u8 * dst = internal::getRowPtr(dstBase, dstStride, i); - size_t sj = 0u, dj = 0u; - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - for (; dj < roiw8; sj += 32, dj += 8) - { - internal::prefetch(src + sj); -@@ -300,7 +300,7 @@ void bgr2gray(const Size2D &size, COLOR_SPACE color_space, - const u32 G2Y = color_space == COLOR_SPACE_BT601 ? G2Y_BT601 : G2Y_BT709; - const u32 B2Y = color_space == COLOR_SPACE_BT601 ? B2Y_BT601 : B2Y_BT709; - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - register int16x4_t v_r2y asm ("d31") = vmov_n_s16(R2Y); - register int16x4_t v_g2y asm ("d30") = vmov_n_s16(G2Y); - register int16x4_t v_b2y asm ("d29") = vmov_n_s16(B2Y); -@@ -319,7 +319,7 @@ void bgr2gray(const Size2D &size, COLOR_SPACE color_space, - u8 * dst = internal::getRowPtr(dstBase, dstStride, i); - size_t sj = 0u, dj = 0u; - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - for (; dj < roiw8; sj += 24, dj += 8) - { - internal::prefetch(src + sj); -@@ -402,7 +402,7 @@ void bgrx2gray(const Size2D &size, COLOR_SPACE color_space, - const u32 G2Y = color_space == COLOR_SPACE_BT601 ? G2Y_BT601 : G2Y_BT709; - const u32 B2Y = color_space == COLOR_SPACE_BT601 ? B2Y_BT601 : B2Y_BT709; - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - register int16x4_t v_r2y asm ("d31") = vmov_n_s16(R2Y); - register int16x4_t v_g2y asm ("d30") = vmov_n_s16(G2Y); - register int16x4_t v_b2y asm ("d29") = vmov_n_s16(B2Y); -@@ -421,7 +421,7 @@ void bgrx2gray(const Size2D &size, COLOR_SPACE color_space, - u8 * dst = internal::getRowPtr(dstBase, dstStride, i); - size_t sj = 0u, dj = 0u; - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - for (; dj < roiw8; sj += 32, dj += 8) - { - internal::prefetch(src + sj); -@@ -512,7 +512,7 @@ void gray2rgb(const Size2D &size, - for (; sj < roiw16; sj += 16, dj += 48) - { - internal::prefetch(src + sj); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - __asm__ ( - "vld1.8 {d0-d1}, [%[in0]] \n\t" - "vmov.8 q1, q0 \n\t" -@@ -538,7 +538,7 @@ void gray2rgb(const Size2D &size, - - if (sj < roiw8) - { --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - __asm__ ( - "vld1.8 {d0}, [%[in]] \n\t" - "vmov.8 d1, d0 \n\t" -@@ -584,7 +584,7 @@ void gray2rgbx(const Size2D &size, - size_t roiw16 = size.width >= 15 ? size.width - 15 : 0; - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - register uint8x16_t vc255 asm ("q4") = vmovq_n_u8(255); - #else - uint8x16x4_t vRgba; -@@ -602,7 +602,7 @@ void gray2rgbx(const Size2D &size, - for (; sj < roiw16; sj += 16, dj += 64) - { - internal::prefetch(src + sj); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - __asm__ ( - "vld1.8 {d0-d1}, [%[in0]] \n\t" - "vmov.8 q1, q0 \n\t" -@@ -628,7 +628,7 @@ void gray2rgbx(const Size2D &size, - - if (sj < roiw8) - { --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - __asm__ ( - "vld1.8 {d5}, [%[in]] \n\t" - "vmov.8 d6, d5 \n\t" -@@ -672,7 +672,7 @@ void rgb2rgbx(const Size2D &size, - internal::assertSupportedConfiguration(); - #ifdef CAROTENE_NEON - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - register uint8x8_t vc255_0 asm ("d3") = vmov_n_u8(255); - #else - size_t roiw16 = size.width >= 15 ? size.width - 15 : 0; -@@ -688,7 +688,7 @@ void rgb2rgbx(const Size2D &size, - u8 * dst = internal::getRowPtr(dstBase, dstStride, i); - size_t sj = 0u, dj = 0u, j = 0u; - --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - for (; j < roiw8; sj += 24, dj += 32, j += 8) - { - internal::prefetch(src + sj); -@@ -742,7 +742,7 @@ void rgbx2rgb(const Size2D &size, - internal::assertSupportedConfiguration(); - #ifdef CAROTENE_NEON - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; --#if !defined(__GNUC__) || !defined(__arm__) -+#if !(!defined(__aarch64__) && defined(__GNUC__) && defined(__arm__)) - size_t roiw16 = size.width >= 15 ? size.width - 15 : 0; - union { uint8x16x4_t v4; uint8x16x3_t v3; } v_dst0; - union { uint8x8x4_t v4; uint8x8x3_t v3; } v_dst; -@@ -754,7 +754,7 @@ void rgbx2rgb(const Size2D &size, - u8 * dst = internal::getRowPtr(dstBase, dstStride, i); - size_t sj = 0u, dj = 0u, j = 0u; - --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - for (; j < roiw8; sj += 32, dj += 24, j += 8) - { - internal::prefetch(src + sj); -@@ -805,7 +805,7 @@ void rgb2bgr(const Size2D &size, - { - internal::assertSupportedConfiguration(); - #ifdef CAROTENE_NEON --#if !defined(__GNUC__) || !defined(__arm__) -+#if !(!defined(__aarch64__) && defined(__GNUC__) && defined(__arm__)) - size_t roiw16 = size.width >= 15 ? size.width - 15 : 0; - #endif - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; -@@ -817,7 +817,7 @@ void rgb2bgr(const Size2D &size, - size_t sj = 0u, dj = 0u, j = 0u; - - --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - for (; j < roiw8; sj += 24, dj += 24, j += 8) - { - internal::prefetch(src + sj); -@@ -874,7 +874,7 @@ void rgbx2bgrx(const Size2D &size, - { - internal::assertSupportedConfiguration(); - #ifdef CAROTENE_NEON --#if !defined(__GNUC__) || !defined(__arm__) -+#if !(!defined(__aarch64__) && defined(__GNUC__) && defined(__arm__)) - size_t roiw16 = size.width >= 15 ? size.width - 15 : 0; - #endif - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; -@@ -885,7 +885,7 @@ void rgbx2bgrx(const Size2D &size, - u8 * dst = internal::getRowPtr(dstBase, dstStride, i); - size_t sj = 0u, dj = 0u, j = 0u; - --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - for (; j < roiw8; sj += 32, dj += 32, j += 8) - { - internal::prefetch(src + sj); -@@ -943,7 +943,7 @@ void rgbx2bgr(const Size2D &size, - { - internal::assertSupportedConfiguration(); - #ifdef CAROTENE_NEON --#if !defined(__GNUC__) || !defined(__arm__) -+#if !(!defined(__aarch64__) && defined(__GNUC__) && defined(__arm__)) - size_t roiw16 = size.width >= 15 ? size.width - 15 : 0; - #endif - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; -@@ -954,7 +954,7 @@ void rgbx2bgr(const Size2D &size, - u8 * dst = internal::getRowPtr(dstBase, dstStride, i); - size_t sj = 0u, dj = 0u, j = 0u; - --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - for (; j < roiw8; sj += 32, dj += 24, j += 8) - { - internal::prefetch(src + sj); -@@ -1010,7 +1010,7 @@ void rgb2bgrx(const Size2D &size, - { - internal::assertSupportedConfiguration(); - #ifdef CAROTENE_NEON --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - register uint8x8_t vc255 asm ("d3") = vmov_n_u8(255); - #else - union { uint8x16x4_t v4; uint8x16x3_t v3; } vals0; -@@ -1019,7 +1019,7 @@ void rgb2bgrx(const Size2D &size, - vals8.v4.val[3] = vmov_n_u8(255); - #endif - --#if !defined(__GNUC__) || !defined(__arm__) -+#if !(!defined(__aarch64__) && defined(__GNUC__) && defined(__arm__)) - size_t roiw16 = size.width >= 15 ? size.width - 15 : 0; - #endif - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; -@@ -1030,7 +1030,7 @@ void rgb2bgrx(const Size2D &size, - u8 * dst = internal::getRowPtr(dstBase, dstStride, i); - size_t sj = 0u, dj = 0u, j = 0u; - --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - for (; j < roiw8; sj += 24, dj += 32, j += 8) - { - internal::prefetch(src + sj); -@@ -1409,7 +1409,7 @@ inline void convertToHSV(const s32 r, const s32 g, const s32 b, - "d24","d25","d26","d27","d28","d29","d30","d31" \ - ); - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - - #define YCRCB_CONSTS \ - register int16x4_t vcYR asm ("d31") = vmov_n_s16(4899); \ -@@ -1555,7 +1555,7 @@ inline uint8x8x3_t convertToYCrCb( const int16x8_t& vR, const int16x8_t& vG, con - #define COEFF_G ( 8663) - #define COEFF_B (-17705) - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - #define YUV420ALPHA3_CONST - #define YUV420ALPHA4_CONST register uint8x16_t c255 asm ("q13") = vmovq_n_u8(255); - #define YUV420ALPHA3_CONVERT -@@ -1852,7 +1852,7 @@ void rgb2hsv(const Size2D &size, - #ifdef CAROTENE_NEON - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; - const s32 hsv_shift = 12; --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - register const f32 vsdiv_table = f32(255 << hsv_shift); - register f32 vhdiv_table = f32(hrange << hsv_shift); - register const s32 vhrange = hrange; -@@ -1871,7 +1871,7 @@ void rgb2hsv(const Size2D &size, - for (; j < roiw8; sj += 24, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERT_TO_HSV_ASM(vld3.8 {d0-d2}, d0, d2) - #else - uint8x8x3_t vRgb = vld3_u8(src + sj); -@@ -1904,7 +1904,7 @@ void rgbx2hsv(const Size2D &size, - #ifdef CAROTENE_NEON - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; - const s32 hsv_shift = 12; --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - register const f32 vsdiv_table = f32(255 << hsv_shift); - register f32 vhdiv_table = f32(hrange << hsv_shift); - register const s32 vhrange = hrange; -@@ -1923,7 +1923,7 @@ void rgbx2hsv(const Size2D &size, - for (; j < roiw8; sj += 32, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERT_TO_HSV_ASM(vld4.8 {d0-d3}, d0, d2) - #else - uint8x8x4_t vRgb = vld4_u8(src + sj); -@@ -1956,7 +1956,7 @@ void bgr2hsv(const Size2D &size, - #ifdef CAROTENE_NEON - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; - const s32 hsv_shift = 12; --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - register const f32 vsdiv_table = f32(255 << hsv_shift); - register f32 vhdiv_table = f32(hrange << hsv_shift); - register const s32 vhrange = hrange; -@@ -1975,7 +1975,7 @@ void bgr2hsv(const Size2D &size, - for (; j < roiw8; sj += 24, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERT_TO_HSV_ASM(vld3.8 {d0-d2}, d2, d0) - #else - uint8x8x3_t vRgb = vld3_u8(src + sj); -@@ -2008,7 +2008,7 @@ void bgrx2hsv(const Size2D &size, - #ifdef CAROTENE_NEON - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; - const s32 hsv_shift = 12; --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - register const f32 vsdiv_table = f32(255 << hsv_shift); - register f32 vhdiv_table = f32(hrange << hsv_shift); - register const s32 vhrange = hrange; -@@ -2027,7 +2027,7 @@ void bgrx2hsv(const Size2D &size, - for (; j < roiw8; sj += 32, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERT_TO_HSV_ASM(vld4.8 {d0-d3}, d2, d0) - #else - uint8x8x4_t vRgb = vld4_u8(src + sj); -@@ -2068,7 +2068,7 @@ void rgbx2bgr565(const Size2D &size, - for (; j < roiw16; sj += 64, dj += 32, j += 16) - { - internal::prefetch(src + sj); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - __asm__ ( - "vld4.8 {d2, d4, d6, d8}, [%[in0]] @ q0 q1 q2 q3 q4 \n\t" - "vld4.8 {d3, d5, d7, d9}, [%[in1]] @ xxxxxxxx rrrrRRRR ggggGGGG bbbbBBBB xxxxxxxx \n\t" -@@ -2122,7 +2122,7 @@ void rgb2bgr565(const Size2D &size, - for (; j < roiw16; sj += 48, dj += 32, j += 16) - { - internal::prefetch(src + sj); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - __asm__ ( - "vld3.8 {d2, d4, d6}, [%[in0]] @ q0 q1 q2 q3 q4 \n\t" - "vld3.8 {d3, d5, d7}, [%[in1]] @ xxxxxxxx rrrrRRRR ggggGGGG bbbbBBBB xxxxxxxx \n\t" -@@ -2176,7 +2176,7 @@ void rgbx2rgb565(const Size2D &size, - for (; j < roiw16; sj += 64, dj += 32, j += 16) - { - internal::prefetch(src + sj); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - __asm__ ( - "vld4.8 {d0, d2, d4, d6}, [%[in0]] @ q0 q1 q2 q3 \n\t" - "vld4.8 {d1, d3, d5, d7}, [%[in1]] @ rrrrRRRR ggggGGGG bbbbBBBB aaaaAAAA \n\t" -@@ -2230,7 +2230,7 @@ void rgb2rgb565(const Size2D &size, - for (; j < roiw16; sj += 48, dj += 32, j += 16) - { - internal::prefetch(src + sj); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - __asm__ ( - "vld3.8 {d0, d2, d4}, [%[in0]] @ q0 q1 q2 q3 \n\t" - "vld3.8 {d1, d3, d5}, [%[in1]] @ rrrrRRRR ggggGGGG bbbbBBBB xxxxxxxx \n\t" -@@ -2285,7 +2285,7 @@ void rgb2ycrcb(const Size2D &size, - for (; j < roiw8; sj += 24, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERTTOYCRCB(vld3.8 {d0-d2}, d0, d1, d2) - #else - uint8x8x3_t vRgb = vld3_u8(src + sj); -@@ -2329,7 +2329,7 @@ void rgbx2ycrcb(const Size2D &size, - for (; j < roiw8; sj += 32, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERTTOYCRCB(vld4.8 {d0-d3}, d0, d1, d2) - #else - uint8x8x4_t vRgba = vld4_u8(src + sj); -@@ -2373,7 +2373,7 @@ void bgr2ycrcb(const Size2D &size, - for (; j < roiw8; sj += 24, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERTTOYCRCB(vld3.8 {d0-d2}, d2, d1, d0) - #else - uint8x8x3_t vBgr = vld3_u8(src + sj); -@@ -2417,7 +2417,7 @@ void bgrx2ycrcb(const Size2D &size, - for (; j < roiw8; sj += 32, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERTTOYCRCB(vld4.8 {d0-d3}, d2, d1, d0) - #else - uint8x8x4_t vBgra = vld4_u8(src + sj); -@@ -2499,7 +2499,7 @@ void yuv420sp2rgb(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERTYUV420TORGB(3, d1, d0, q5, q6) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -@@ -2545,7 +2545,7 @@ void yuv420sp2rgbx(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERTYUV420TORGB(4, d1, d0, q5, q6) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -@@ -2591,7 +2591,7 @@ void yuv420i2rgb(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERTYUV420TORGB(3, d0, d1, q5, q6) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -@@ -2637,7 +2637,7 @@ void yuv420i2rgbx(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERTYUV420TORGB(4, d0, d1, q5, q6) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -@@ -2683,7 +2683,7 @@ void yuv420sp2bgr(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERTYUV420TORGB(3, d1, d0, q6, q5) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -@@ -2729,7 +2729,7 @@ void yuv420sp2bgrx(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERTYUV420TORGB(4, d1, d0, q6, q5) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -@@ -2775,7 +2775,7 @@ void yuv420i2bgr(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERTYUV420TORGB(3, d0, d1, q6, q5) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -@@ -2821,7 +2821,7 @@ void yuv420i2bgrx(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CONVERTYUV420TORGB(4, d0, d1, q6, q5) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -diff --git a/3rdparty/carotene/src/convert.cpp b/3rdparty/carotene/src/convert.cpp -index 403f16d86a..64b6db78ab 100644 ---- a/3rdparty/carotene/src/convert.cpp -+++ b/3rdparty/carotene/src/convert.cpp -@@ -101,7 +101,7 @@ CVT_FUNC(u8, s8, 16, - } - }) - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVT_FUNC(u8, u16, 16, - register uint8x16_t zero0 asm ("q1") = vmovq_n_u8(0);, - { -@@ -135,7 +135,7 @@ CVT_FUNC(u8, u16, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVT_FUNC(u8, s32, 16, - register uint8x16_t zero0 asm ("q1") = vmovq_n_u8(0); - register uint8x16_t zero1 asm ("q2") = vmovq_n_u8(0); -@@ -173,7 +173,7 @@ CVT_FUNC(u8, s32, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(u8, f32, 16, - , - { -@@ -248,7 +248,7 @@ CVT_FUNC(s8, u8, 16, - } - }) - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVT_FUNC(s8, u16, 16, - register uint8x16_t zero0 asm ("q1") = vmovq_n_u8(0);, - { -@@ -284,7 +284,7 @@ CVT_FUNC(s8, u16, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(s8, s16, 16, - , - { -@@ -323,7 +323,7 @@ CVT_FUNC(s8, s16, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVT_FUNC(s8, s32, 16, - , - { -@@ -377,7 +377,7 @@ CVT_FUNC(s8, s32, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(s8, f32, 16, - , - { -@@ -440,7 +440,7 @@ CVT_FUNC(s8, f32, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(u16, u8, 16, - , - { -@@ -479,7 +479,7 @@ CVT_FUNC(u16, u8, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(u16, s8, 16, - register uint8x16_t v127 asm ("q4") = vmovq_n_u8(127);, - { -@@ -522,7 +522,7 @@ CVT_FUNC(u16, s8, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVT_FUNC(u16, s16, 8, - register uint16x8_t v32767 asm ("q4") = vmovq_n_u16(0x7FFF);, - { -@@ -555,7 +555,7 @@ CVT_FUNC(u16, s16, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVT_FUNC(u16, s32, 8, - register uint16x8_t zero0 asm ("q1") = vmovq_n_u16(0);, - { -@@ -589,7 +589,7 @@ CVT_FUNC(u16, s32, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(u16, f32, 8, - , - { -@@ -633,7 +633,7 @@ CVT_FUNC(u16, f32, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(s16, u8, 16, - , - { -@@ -672,7 +672,7 @@ CVT_FUNC(s16, u8, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(s16, s8, 16, - , - { -@@ -711,7 +711,7 @@ CVT_FUNC(s16, s8, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVT_FUNC(s16, u16, 8, - register int16x8_t vZero asm ("q4") = vmovq_n_s16(0);, - { -@@ -747,7 +747,7 @@ CVT_FUNC(s16, u16, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(s16, s32, 8, - , - { -@@ -786,7 +786,7 @@ CVT_FUNC(s16, s32, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(s16, f32, 8, - , - { -@@ -829,7 +829,7 @@ CVT_FUNC(s16, f32, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(s32, u8, 8, - , - { -@@ -870,7 +870,7 @@ CVT_FUNC(s32, u8, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(s32, s8, 8, - , - { -@@ -911,7 +911,7 @@ CVT_FUNC(s32, s8, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(s32, u16, 8, - , - { -@@ -950,7 +950,7 @@ CVT_FUNC(s32, u16, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(s32, s16, 8, - , - { -@@ -989,7 +989,7 @@ CVT_FUNC(s32, s16, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(s32, f32, 8, - , - { -@@ -1034,7 +1034,7 @@ CVT_FUNC(s32, f32, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(f32, u8, 8, - register float32x4_t vmult asm ("q0") = vdupq_n_f32((float)(1 << 16)); - register uint32x4_t vmask asm ("q1") = vdupq_n_u32(1<<16);, -@@ -1101,7 +1101,7 @@ CVT_FUNC(f32, u8, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(f32, s8, 8, - register float32x4_t vhalf asm ("q0") = vdupq_n_f32(0.5f);, - { -@@ -1153,7 +1153,7 @@ CVT_FUNC(f32, s8, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(f32, u16, 8, - register float32x4_t vhalf asm ("q0") = vdupq_n_f32(0.5f);, - { -@@ -1212,7 +1212,7 @@ CVT_FUNC(f32, u16, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(f32, s16, 8, - register float32x4_t vhalf asm ("q0") = vdupq_n_f32(0.5f);, - { -@@ -1271,7 +1271,7 @@ CVT_FUNC(f32, s16, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - CVT_FUNC(f32, s32, 8, - register float32x4_t vhalf asm ("q0") = vdupq_n_f32(0.5f);, - { -diff --git a/3rdparty/carotene/src/convert_scale.cpp b/3rdparty/carotene/src/convert_scale.cpp -index 0a14a8035c..ae41a985c8 100644 ---- a/3rdparty/carotene/src/convert_scale.cpp -+++ b/3rdparty/carotene/src/convert_scale.cpp -@@ -135,7 +135,7 @@ namespace CAROTENE_NS { - - #endif - --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - CVTS_FUNC1(u8, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -220,7 +220,7 @@ CVTS_FUNC1(u8, 16, - }) - #endif - --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - CVTS_FUNC(u8, s8, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -305,7 +305,7 @@ CVTS_FUNC(u8, s8, 16, - }) - #endif - --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - CVTS_FUNC(u8, u16, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -389,7 +389,7 @@ CVTS_FUNC(u8, u16, 16, - }) - #endif - --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - CVTS_FUNC(u8, s16, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -473,7 +473,7 @@ CVTS_FUNC(u8, s16, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(u8, s32, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -562,7 +562,7 @@ CVTS_FUNC(u8, s32, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(u8, f32, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta);, -@@ -643,7 +643,7 @@ CVTS_FUNC(u8, f32, 16, - }) - #endif - --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - CVTS_FUNC(s8, u8, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -728,7 +728,7 @@ CVTS_FUNC(s8, u8, 16, - }) - #endif - --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - CVTS_FUNC1(s8, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -813,7 +813,7 @@ CVTS_FUNC1(s8, 16, - }) - #endif - --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - CVTS_FUNC(s8, u16, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -899,7 +899,7 @@ CVTS_FUNC(s8, u16, 16, - }) - #endif - --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - CVTS_FUNC(s8, s16, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -985,7 +985,7 @@ CVTS_FUNC(s8, s16, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(s8, s32, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1074,7 +1074,7 @@ CVTS_FUNC(s8, s32, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(s8, f32, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta);, -@@ -1155,7 +1155,7 @@ CVTS_FUNC(s8, f32, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(u16, u8, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1214,7 +1214,7 @@ CVTS_FUNC(u16, u8, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(u16, s8, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1273,7 +1273,7 @@ CVTS_FUNC(u16, s8, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC1(u16, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1330,7 +1330,7 @@ CVTS_FUNC1(u16, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(u16, s16, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1387,7 +1387,7 @@ CVTS_FUNC(u16, s16, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(u16, s32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1443,7 +1443,7 @@ CVTS_FUNC(u16, s32, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(u16, f32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta);, -@@ -1495,7 +1495,7 @@ CVTS_FUNC(u16, f32, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(s16, u8, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1554,7 +1554,7 @@ CVTS_FUNC(s16, u8, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(s16, s8, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1613,7 +1613,7 @@ CVTS_FUNC(s16, s8, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(s16, u16, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1670,7 +1670,7 @@ CVTS_FUNC(s16, u16, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC1(s16, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1727,7 +1727,7 @@ CVTS_FUNC1(s16, 16, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(s16, s32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1783,7 +1783,7 @@ CVTS_FUNC(s16, s32, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(s16, f32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta);, -@@ -1835,7 +1835,7 @@ CVTS_FUNC(s16, f32, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(s32, u8, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1893,7 +1893,7 @@ CVTS_FUNC(s32, u8, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(s32, s8, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1951,7 +1951,7 @@ CVTS_FUNC(s32, s8, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(s32, u16, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -2007,7 +2007,7 @@ CVTS_FUNC(s32, u16, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(s32, s16, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -2063,7 +2063,7 @@ CVTS_FUNC(s32, s16, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC1(s32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -2118,7 +2118,7 @@ CVTS_FUNC1(s32, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(s32, f32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta);, -@@ -2169,7 +2169,7 @@ CVTS_FUNC(s32, f32, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(f32, u8, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)((1 << 16)*alpha)); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)((1 << 16)*beta)); -@@ -2239,7 +2239,7 @@ CVTS_FUNC(f32, u8, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(f32, s8, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -2293,7 +2293,7 @@ CVTS_FUNC(f32, s8, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(f32, u16, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -2345,7 +2345,7 @@ CVTS_FUNC(f32, u16, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(f32, s16, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -2397,7 +2397,7 @@ CVTS_FUNC(f32, s16, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC(f32, s32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -2448,7 +2448,7 @@ CVTS_FUNC(f32, s32, 8, - }) - #endif - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - CVTS_FUNC1(f32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta);, -diff --git a/3rdparty/carotene/src/gaussian_blur.cpp b/3rdparty/carotene/src/gaussian_blur.cpp -index 1b5399436f..f7b5f18d79 100644 ---- a/3rdparty/carotene/src/gaussian_blur.cpp -+++ b/3rdparty/carotene/src/gaussian_blur.cpp -@@ -327,7 +327,7 @@ void gaussianBlur5x5(const Size2D &size, s32 cn, - u16* lidx1 = lane + x - 1*2; - u16* lidx3 = lane + x + 1*2; - u16* lidx4 = lane + x + 2*2; --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - __asm__ __volatile__ ( - "vld2.16 {d0, d2}, [%[in0]]! \n\t" - "vld2.16 {d1, d3}, [%[in0]] \n\t" -@@ -398,7 +398,7 @@ void gaussianBlur5x5(const Size2D &size, s32 cn, - u16* lidx1 = lane + x - 1*3; - u16* lidx3 = lane + x + 1*3; - u16* lidx4 = lane + x + 2*3; --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - __asm__ __volatile__ ( - "vld3.16 {d0, d2, d4}, [%[in0]]! \n\t" - "vld3.16 {d1, d3, d5}, [%[in0]] \n\t" -@@ -482,7 +482,7 @@ void gaussianBlur5x5(const Size2D &size, s32 cn, - u16* lidx1 = lane + x - 1*4; - u16* lidx3 = lane + x + 1*4; - u16* lidx4 = lane + x + 2*4; --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - __asm__ __volatile__ ( - "vld4.16 {d0, d2, d4, d6}, [%[in0]]! \n\t" - "vld4.16 {d1, d3, d5, d7}, [%[in0]] \n\t" -diff --git a/3rdparty/carotene/src/pyramid.cpp b/3rdparty/carotene/src/pyramid.cpp -index 8ef1268933..232ccf3efd 100644 ---- a/3rdparty/carotene/src/pyramid.cpp -+++ b/3rdparty/carotene/src/pyramid.cpp -@@ -331,7 +331,7 @@ void gaussianPyramidDown(const Size2D &srcSize, - for (; x < roiw8; x += 8) - { - internal::prefetch(lane + 2 * x); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - __asm__ ( - "vld2.16 {d0-d3}, [%[in0]] \n\t" - "vld2.16 {d4-d7}, [%[in4]] \n\t" -@@ -538,7 +538,7 @@ void gaussianPyramidDown(const Size2D &srcSize, - for (; x < roiw4; x += 4) - { - internal::prefetch(lane + 2 * x); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - __asm__ ( - "vld2.32 {d0-d3}, [%[in0]] \n\t" - "vld2.32 {d4-d7}, [%[in4]] \n\t" -@@ -672,7 +672,7 @@ void gaussianPyramidDown(const Size2D &srcSize, - std::vector<f32> _buf(cn*(srcSize.width + 4) + 32/sizeof(f32)); - f32* lane = internal::alignPtr(&_buf[2*cn], 32); - --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - register float32x4_t vc6d4f32 asm ("q11") = vmovq_n_f32(1.5f); // 6/4 - register float32x4_t vc1d4f32 asm ("q12") = vmovq_n_f32(0.25f); // 1/4 - -@@ -739,7 +739,7 @@ void gaussianPyramidDown(const Size2D &srcSize, - for (; x < roiw4; x += 4) - { - internal::prefetch(lane + 2 * x); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - __asm__ __volatile__ ( - "vld2.32 {d0-d3}, [%[in0]] \n\t" - "vld2.32 {d8-d11}, [%[in4]] \n\t" -@@ -932,7 +932,7 @@ pyrUp8uHorizontalConvolution: - for (; x < lim; x += 8) - { - internal::prefetch(lane + x); --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - __asm__ ( - "vld1.16 {d0-d1}, [%[in0]] /*q0 = v0*/ \n\t" - "vld1.16 {d2-d3}, [%[in2]] /*q1 = v2*/ \n\t" -@@ -973,7 +973,7 @@ pyrUp8uHorizontalConvolution: - for (; x < lim; x += 24) - { - internal::prefetch(lane + x); --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - __asm__ ( - "vmov.u16 q9, #6 \n\t" - "vld3.16 {d0, d2, d4}, [%[in0]] /*v0*/ \n\t" -@@ -1064,7 +1064,7 @@ pyrUp8uHorizontalConvolution: - for (; x < lim; x += 8) - { - internal::prefetch(lane + x); --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - __asm__ ( - "vld1.16 {d0-d1}, [%[in0]] /*q0 = v0*/ \n\t" - "vld1.16 {d2-d3}, [%[in2]] /*q1 = v2*/ \n\t" -@@ -1210,7 +1210,7 @@ pyrUp16sHorizontalConvolution: - for (; x < lim; x += 4) - { - internal::prefetch(lane + x); --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - __asm__ ( - "vld1.32 {d0-d1}, [%[in0]] /*q0 = v0*/ \n\t" - "vld1.32 {d2-d3}, [%[in2]] /*q1 = v2*/ \n\t" -@@ -1251,7 +1251,7 @@ pyrUp16sHorizontalConvolution: - for (; x < lim; x += 12) - { - internal::prefetch(lane + x + 3); --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - __asm__ ( - "vmov.s32 q9, #6 \n\t" - "vld3.32 {d0, d2, d4}, [%[in0]] /*v0*/ \n\t" -@@ -1343,7 +1343,7 @@ pyrUp16sHorizontalConvolution: - for (; x < lim; x += 4) - { - internal::prefetch(lane + x); --#if defined(__GNUC__) && defined(__arm__) -+#if !defined(__aarch64__) && defined(__GNUC__) && defined(__arm__) - __asm__ ( - "vld1.32 {d0-d1}, [%[in0]] /*q0 = v0*/ \n\t" - "vld1.32 {d2-d3}, [%[in2]] /*q1 = v2*/ \n\t" -diff --git a/3rdparty/carotene/src/scharr.cpp b/3rdparty/carotene/src/scharr.cpp -index 5695804fe4..8d3b6328b1 100644 ---- a/3rdparty/carotene/src/scharr.cpp -+++ b/3rdparty/carotene/src/scharr.cpp -@@ -109,7 +109,7 @@ void ScharrDeriv(const Size2D &size, s32 cn, - internal::prefetch(srow0 + x); - internal::prefetch(srow1 + x); - internal::prefetch(srow2 + x); --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 - __asm__ ( - "vld1.8 {d0}, [%[src0]] \n\t" - "vld1.8 {d2}, [%[src2]] \n\t" -@@ -161,7 +161,7 @@ void ScharrDeriv(const Size2D &size, s32 cn, - x = 0; - for( ; x < roiw8; x += 8 ) - { --#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 - __asm__ ( - "vld1.16 {d4-d5}, [%[s2ptr]] \n\t" - "vld1.16 {d8-d9}, [%[s4ptr]] \n\t" --- -2.14.1 - diff --git a/meta-oe/recipes-support/opencv/opencv/0002-Do-not-enable-asm-with-clang.patch b/meta-oe/recipes-support/opencv/opencv/0002-Do-not-enable-asm-with-clang.patch deleted file mode 100644 index 22e868a031..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0002-Do-not-enable-asm-with-clang.patch +++ /dev/null @@ -1,993 +0,0 @@ -From 333f60165b6737588eb975a5e4393d847011a1cd Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 19 Sep 2017 18:07:35 -0700 -Subject: [PATCH 2/2] Do not enable asm with clang - -clang pretends to be gcc 4.2.0 which means we will -use inline asm for no reason, instead of builtins -on clang when possible. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - 3rdparty/carotene/src/channel_extract.cpp | 4 +- - 3rdparty/carotene/src/channels_combine.cpp | 2 +- - 3rdparty/carotene/src/colorconvert.cpp | 78 +++++++++++++++--------------- - 3rdparty/carotene/src/convert.cpp | 54 ++++++++++----------- - 3rdparty/carotene/src/convert_scale.cpp | 56 ++++++++++----------- - 3rdparty/carotene/src/gaussian_blur.cpp | 2 +- - 3rdparty/carotene/src/pyramid.cpp | 8 +-- - 3rdparty/carotene/src/scharr.cpp | 4 +- - 8 files changed, 104 insertions(+), 104 deletions(-) - -diff --git a/3rdparty/carotene/src/channel_extract.cpp b/3rdparty/carotene/src/channel_extract.cpp -index 8238a3ece8..ff4fb3770c 100644 ---- a/3rdparty/carotene/src/channel_extract.cpp -+++ b/3rdparty/carotene/src/channel_extract.cpp -@@ -231,7 +231,7 @@ void extract4(const Size2D &size, - srcStride == dst2Stride && \ - srcStride == dst3Stride && - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - - #define SPLIT_ASM2(sgn, bits) __asm__ ( \ - "vld2." #bits " {d0, d2}, [%[in0]] \n\t" \ -@@ -351,7 +351,7 @@ void extract4(const Size2D &size, - } \ - } - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - - #define ALPHA_QUAD(sgn, bits) { \ - internal::prefetch(src + sj); \ -diff --git a/3rdparty/carotene/src/channels_combine.cpp b/3rdparty/carotene/src/channels_combine.cpp -index fc98fb9181..5d9251d51c 100644 ---- a/3rdparty/carotene/src/channels_combine.cpp -+++ b/3rdparty/carotene/src/channels_combine.cpp -@@ -77,7 +77,7 @@ namespace CAROTENE_NS { - dstStride == src2Stride && \ - dstStride == src3Stride && - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - - #define MERGE_ASM2(sgn, bits) __asm__ ( \ - "vld1." #bits " {d0-d1}, [%[in0]] \n\t" \ -diff --git a/3rdparty/carotene/src/colorconvert.cpp b/3rdparty/carotene/src/colorconvert.cpp -index 26ae54b15c..d3a40fe64e 100644 ---- a/3rdparty/carotene/src/colorconvert.cpp -+++ b/3rdparty/carotene/src/colorconvert.cpp -@@ -97,7 +97,7 @@ void rgb2gray(const Size2D &size, COLOR_SPACE color_space, - const u32 G2Y = color_space == COLOR_SPACE_BT601 ? G2Y_BT601 : G2Y_BT709; - const u32 B2Y = color_space == COLOR_SPACE_BT601 ? B2Y_BT601 : B2Y_BT709; - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - register int16x4_t v_r2y asm ("d31") = vmov_n_s16(R2Y); - register int16x4_t v_g2y asm ("d30") = vmov_n_s16(G2Y); - register int16x4_t v_b2y asm ("d29") = vmov_n_s16(B2Y); -@@ -116,7 +116,7 @@ void rgb2gray(const Size2D &size, COLOR_SPACE color_space, - u8 * dst = internal::getRowPtr(dstBase, dstStride, i); - size_t sj = 0u, dj = 0u; - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - for (; dj < roiw8; sj += 24, dj += 8) - { - internal::prefetch(src + sj); -@@ -198,7 +198,7 @@ void rgbx2gray(const Size2D &size, COLOR_SPACE color_space, - const u32 G2Y = color_space == COLOR_SPACE_BT601 ? G2Y_BT601 : G2Y_BT709; - const u32 B2Y = color_space == COLOR_SPACE_BT601 ? B2Y_BT601 : B2Y_BT709; - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - register int16x4_t v_r2y asm ("d31") = vmov_n_s16(R2Y); - register int16x4_t v_g2y asm ("d30") = vmov_n_s16(G2Y); - register int16x4_t v_b2y asm ("d29") = vmov_n_s16(B2Y); -@@ -217,7 +217,7 @@ void rgbx2gray(const Size2D &size, COLOR_SPACE color_space, - u8 * dst = internal::getRowPtr(dstBase, dstStride, i); - size_t sj = 0u, dj = 0u; - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - for (; dj < roiw8; sj += 32, dj += 8) - { - internal::prefetch(src + sj); -@@ -300,7 +300,7 @@ void bgr2gray(const Size2D &size, COLOR_SPACE color_space, - const u32 G2Y = color_space == COLOR_SPACE_BT601 ? G2Y_BT601 : G2Y_BT709; - const u32 B2Y = color_space == COLOR_SPACE_BT601 ? B2Y_BT601 : B2Y_BT709; - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - register int16x4_t v_r2y asm ("d31") = vmov_n_s16(R2Y); - register int16x4_t v_g2y asm ("d30") = vmov_n_s16(G2Y); - register int16x4_t v_b2y asm ("d29") = vmov_n_s16(B2Y); -@@ -319,7 +319,7 @@ void bgr2gray(const Size2D &size, COLOR_SPACE color_space, - u8 * dst = internal::getRowPtr(dstBase, dstStride, i); - size_t sj = 0u, dj = 0u; - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - for (; dj < roiw8; sj += 24, dj += 8) - { - internal::prefetch(src + sj); -@@ -402,7 +402,7 @@ void bgrx2gray(const Size2D &size, COLOR_SPACE color_space, - const u32 G2Y = color_space == COLOR_SPACE_BT601 ? G2Y_BT601 : G2Y_BT709; - const u32 B2Y = color_space == COLOR_SPACE_BT601 ? B2Y_BT601 : B2Y_BT709; - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - register int16x4_t v_r2y asm ("d31") = vmov_n_s16(R2Y); - register int16x4_t v_g2y asm ("d30") = vmov_n_s16(G2Y); - register int16x4_t v_b2y asm ("d29") = vmov_n_s16(B2Y); -@@ -421,7 +421,7 @@ void bgrx2gray(const Size2D &size, COLOR_SPACE color_space, - u8 * dst = internal::getRowPtr(dstBase, dstStride, i); - size_t sj = 0u, dj = 0u; - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - for (; dj < roiw8; sj += 32, dj += 8) - { - internal::prefetch(src + sj); -@@ -512,7 +512,7 @@ void gray2rgb(const Size2D &size, - for (; sj < roiw16; sj += 16, dj += 48) - { - internal::prefetch(src + sj); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - __asm__ ( - "vld1.8 {d0-d1}, [%[in0]] \n\t" - "vmov.8 q1, q0 \n\t" -@@ -538,7 +538,7 @@ void gray2rgb(const Size2D &size, - - if (sj < roiw8) - { --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - __asm__ ( - "vld1.8 {d0}, [%[in]] \n\t" - "vmov.8 d1, d0 \n\t" -@@ -584,7 +584,7 @@ void gray2rgbx(const Size2D &size, - size_t roiw16 = size.width >= 15 ? size.width - 15 : 0; - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - register uint8x16_t vc255 asm ("q4") = vmovq_n_u8(255); - #else - uint8x16x4_t vRgba; -@@ -602,7 +602,7 @@ void gray2rgbx(const Size2D &size, - for (; sj < roiw16; sj += 16, dj += 64) - { - internal::prefetch(src + sj); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - __asm__ ( - "vld1.8 {d0-d1}, [%[in0]] \n\t" - "vmov.8 q1, q0 \n\t" -@@ -628,7 +628,7 @@ void gray2rgbx(const Size2D &size, - - if (sj < roiw8) - { --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - __asm__ ( - "vld1.8 {d5}, [%[in]] \n\t" - "vmov.8 d6, d5 \n\t" -@@ -1409,7 +1409,7 @@ inline void convertToHSV(const s32 r, const s32 g, const s32 b, - "d24","d25","d26","d27","d28","d29","d30","d31" \ - ); - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - - #define YCRCB_CONSTS \ - register int16x4_t vcYR asm ("d31") = vmov_n_s16(4899); \ -@@ -1555,7 +1555,7 @@ inline uint8x8x3_t convertToYCrCb( const int16x8_t& vR, const int16x8_t& vG, con - #define COEFF_G ( 8663) - #define COEFF_B (-17705) - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - #define YUV420ALPHA3_CONST - #define YUV420ALPHA4_CONST register uint8x16_t c255 asm ("q13") = vmovq_n_u8(255); - #define YUV420ALPHA3_CONVERT -@@ -1852,7 +1852,7 @@ void rgb2hsv(const Size2D &size, - #ifdef CAROTENE_NEON - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; - const s32 hsv_shift = 12; --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - register const f32 vsdiv_table = f32(255 << hsv_shift); - register f32 vhdiv_table = f32(hrange << hsv_shift); - register const s32 vhrange = hrange; -@@ -1871,7 +1871,7 @@ void rgb2hsv(const Size2D &size, - for (; j < roiw8; sj += 24, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERT_TO_HSV_ASM(vld3.8 {d0-d2}, d0, d2) - #else - uint8x8x3_t vRgb = vld3_u8(src + sj); -@@ -1904,7 +1904,7 @@ void rgbx2hsv(const Size2D &size, - #ifdef CAROTENE_NEON - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; - const s32 hsv_shift = 12; --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - register const f32 vsdiv_table = f32(255 << hsv_shift); - register f32 vhdiv_table = f32(hrange << hsv_shift); - register const s32 vhrange = hrange; -@@ -1923,7 +1923,7 @@ void rgbx2hsv(const Size2D &size, - for (; j < roiw8; sj += 32, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERT_TO_HSV_ASM(vld4.8 {d0-d3}, d0, d2) - #else - uint8x8x4_t vRgb = vld4_u8(src + sj); -@@ -1956,7 +1956,7 @@ void bgr2hsv(const Size2D &size, - #ifdef CAROTENE_NEON - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; - const s32 hsv_shift = 12; --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - register const f32 vsdiv_table = f32(255 << hsv_shift); - register f32 vhdiv_table = f32(hrange << hsv_shift); - register const s32 vhrange = hrange; -@@ -1975,7 +1975,7 @@ void bgr2hsv(const Size2D &size, - for (; j < roiw8; sj += 24, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERT_TO_HSV_ASM(vld3.8 {d0-d2}, d2, d0) - #else - uint8x8x3_t vRgb = vld3_u8(src + sj); -@@ -2008,7 +2008,7 @@ void bgrx2hsv(const Size2D &size, - #ifdef CAROTENE_NEON - size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; - const s32 hsv_shift = 12; --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - register const f32 vsdiv_table = f32(255 << hsv_shift); - register f32 vhdiv_table = f32(hrange << hsv_shift); - register const s32 vhrange = hrange; -@@ -2027,7 +2027,7 @@ void bgrx2hsv(const Size2D &size, - for (; j < roiw8; sj += 32, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERT_TO_HSV_ASM(vld4.8 {d0-d3}, d2, d0) - #else - uint8x8x4_t vRgb = vld4_u8(src + sj); -@@ -2068,7 +2068,7 @@ void rgbx2bgr565(const Size2D &size, - for (; j < roiw16; sj += 64, dj += 32, j += 16) - { - internal::prefetch(src + sj); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - __asm__ ( - "vld4.8 {d2, d4, d6, d8}, [%[in0]] @ q0 q1 q2 q3 q4 \n\t" - "vld4.8 {d3, d5, d7, d9}, [%[in1]] @ xxxxxxxx rrrrRRRR ggggGGGG bbbbBBBB xxxxxxxx \n\t" -@@ -2122,7 +2122,7 @@ void rgb2bgr565(const Size2D &size, - for (; j < roiw16; sj += 48, dj += 32, j += 16) - { - internal::prefetch(src + sj); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - __asm__ ( - "vld3.8 {d2, d4, d6}, [%[in0]] @ q0 q1 q2 q3 q4 \n\t" - "vld3.8 {d3, d5, d7}, [%[in1]] @ xxxxxxxx rrrrRRRR ggggGGGG bbbbBBBB xxxxxxxx \n\t" -@@ -2176,7 +2176,7 @@ void rgbx2rgb565(const Size2D &size, - for (; j < roiw16; sj += 64, dj += 32, j += 16) - { - internal::prefetch(src + sj); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - __asm__ ( - "vld4.8 {d0, d2, d4, d6}, [%[in0]] @ q0 q1 q2 q3 \n\t" - "vld4.8 {d1, d3, d5, d7}, [%[in1]] @ rrrrRRRR ggggGGGG bbbbBBBB aaaaAAAA \n\t" -@@ -2230,7 +2230,7 @@ void rgb2rgb565(const Size2D &size, - for (; j < roiw16; sj += 48, dj += 32, j += 16) - { - internal::prefetch(src + sj); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - __asm__ ( - "vld3.8 {d0, d2, d4}, [%[in0]] @ q0 q1 q2 q3 \n\t" - "vld3.8 {d1, d3, d5}, [%[in1]] @ rrrrRRRR ggggGGGG bbbbBBBB xxxxxxxx \n\t" -@@ -2285,7 +2285,7 @@ void rgb2ycrcb(const Size2D &size, - for (; j < roiw8; sj += 24, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERTTOYCRCB(vld3.8 {d0-d2}, d0, d1, d2) - #else - uint8x8x3_t vRgb = vld3_u8(src + sj); -@@ -2329,7 +2329,7 @@ void rgbx2ycrcb(const Size2D &size, - for (; j < roiw8; sj += 32, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERTTOYCRCB(vld4.8 {d0-d3}, d0, d1, d2) - #else - uint8x8x4_t vRgba = vld4_u8(src + sj); -@@ -2373,7 +2373,7 @@ void bgr2ycrcb(const Size2D &size, - for (; j < roiw8; sj += 24, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERTTOYCRCB(vld3.8 {d0-d2}, d2, d1, d0) - #else - uint8x8x3_t vBgr = vld3_u8(src + sj); -@@ -2417,7 +2417,7 @@ void bgrx2ycrcb(const Size2D &size, - for (; j < roiw8; sj += 32, dj += 24, j += 8) - { - internal::prefetch(src + sj); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERTTOYCRCB(vld4.8 {d0-d3}, d2, d1, d0) - #else - uint8x8x4_t vBgra = vld4_u8(src + sj); -@@ -2499,7 +2499,7 @@ void yuv420sp2rgb(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERTYUV420TORGB(3, d1, d0, q5, q6) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -@@ -2545,7 +2545,7 @@ void yuv420sp2rgbx(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERTYUV420TORGB(4, d1, d0, q5, q6) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -@@ -2591,7 +2591,7 @@ void yuv420i2rgb(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERTYUV420TORGB(3, d0, d1, q5, q6) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -@@ -2637,7 +2637,7 @@ void yuv420i2rgbx(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERTYUV420TORGB(4, d0, d1, q5, q6) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -@@ -2683,7 +2683,7 @@ void yuv420sp2bgr(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERTYUV420TORGB(3, d1, d0, q6, q5) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -@@ -2729,7 +2729,7 @@ void yuv420sp2bgrx(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERTYUV420TORGB(4, d1, d0, q6, q5) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -@@ -2775,7 +2775,7 @@ void yuv420i2bgr(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERTYUV420TORGB(3, d0, d1, q6, q5) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -@@ -2821,7 +2821,7 @@ void yuv420i2bgrx(const Size2D &size, - internal::prefetch(uv + j); - internal::prefetch(y1 + j); - internal::prefetch(y2 + j); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CONVERTYUV420TORGB(4, d0, d1, q6, q5) - #else - convertYUV420.ToRGB(y1 + j, y2 + j, uv + j, dst1 + dj, dst2 + dj); -diff --git a/3rdparty/carotene/src/convert.cpp b/3rdparty/carotene/src/convert.cpp -index 64b6db78ab..f0c2d153f2 100644 ---- a/3rdparty/carotene/src/convert.cpp -+++ b/3rdparty/carotene/src/convert.cpp -@@ -101,7 +101,7 @@ CVT_FUNC(u8, s8, 16, - } - }) - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVT_FUNC(u8, u16, 16, - register uint8x16_t zero0 asm ("q1") = vmovq_n_u8(0);, - { -@@ -135,7 +135,7 @@ CVT_FUNC(u8, u16, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVT_FUNC(u8, s32, 16, - register uint8x16_t zero0 asm ("q1") = vmovq_n_u8(0); - register uint8x16_t zero1 asm ("q2") = vmovq_n_u8(0); -@@ -173,7 +173,7 @@ CVT_FUNC(u8, s32, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(u8, f32, 16, - , - { -@@ -248,7 +248,7 @@ CVT_FUNC(s8, u8, 16, - } - }) - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVT_FUNC(s8, u16, 16, - register uint8x16_t zero0 asm ("q1") = vmovq_n_u8(0);, - { -@@ -284,7 +284,7 @@ CVT_FUNC(s8, u16, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(s8, s16, 16, - , - { -@@ -323,7 +323,7 @@ CVT_FUNC(s8, s16, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVT_FUNC(s8, s32, 16, - , - { -@@ -377,7 +377,7 @@ CVT_FUNC(s8, s32, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(s8, f32, 16, - , - { -@@ -440,7 +440,7 @@ CVT_FUNC(s8, f32, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(u16, u8, 16, - , - { -@@ -479,7 +479,7 @@ CVT_FUNC(u16, u8, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(u16, s8, 16, - register uint8x16_t v127 asm ("q4") = vmovq_n_u8(127);, - { -@@ -522,7 +522,7 @@ CVT_FUNC(u16, s8, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVT_FUNC(u16, s16, 8, - register uint16x8_t v32767 asm ("q4") = vmovq_n_u16(0x7FFF);, - { -@@ -555,7 +555,7 @@ CVT_FUNC(u16, s16, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVT_FUNC(u16, s32, 8, - register uint16x8_t zero0 asm ("q1") = vmovq_n_u16(0);, - { -@@ -589,7 +589,7 @@ CVT_FUNC(u16, s32, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(u16, f32, 8, - , - { -@@ -633,7 +633,7 @@ CVT_FUNC(u16, f32, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(s16, u8, 16, - , - { -@@ -672,7 +672,7 @@ CVT_FUNC(s16, u8, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(s16, s8, 16, - , - { -@@ -711,7 +711,7 @@ CVT_FUNC(s16, s8, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVT_FUNC(s16, u16, 8, - register int16x8_t vZero asm ("q4") = vmovq_n_s16(0);, - { -@@ -747,7 +747,7 @@ CVT_FUNC(s16, u16, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(s16, s32, 8, - , - { -@@ -786,7 +786,7 @@ CVT_FUNC(s16, s32, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(s16, f32, 8, - , - { -@@ -829,7 +829,7 @@ CVT_FUNC(s16, f32, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(s32, u8, 8, - , - { -@@ -870,7 +870,7 @@ CVT_FUNC(s32, u8, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(s32, s8, 8, - , - { -@@ -911,7 +911,7 @@ CVT_FUNC(s32, s8, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(s32, u16, 8, - , - { -@@ -950,7 +950,7 @@ CVT_FUNC(s32, u16, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(s32, s16, 8, - , - { -@@ -989,7 +989,7 @@ CVT_FUNC(s32, s16, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(s32, f32, 8, - , - { -@@ -1034,7 +1034,7 @@ CVT_FUNC(s32, f32, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(f32, u8, 8, - register float32x4_t vmult asm ("q0") = vdupq_n_f32((float)(1 << 16)); - register uint32x4_t vmask asm ("q1") = vdupq_n_u32(1<<16);, -@@ -1101,7 +1101,7 @@ CVT_FUNC(f32, u8, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(f32, s8, 8, - register float32x4_t vhalf asm ("q0") = vdupq_n_f32(0.5f);, - { -@@ -1153,7 +1153,7 @@ CVT_FUNC(f32, s8, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(f32, u16, 8, - register float32x4_t vhalf asm ("q0") = vdupq_n_f32(0.5f);, - { -@@ -1212,7 +1212,7 @@ CVT_FUNC(f32, u16, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(f32, s16, 8, - register float32x4_t vhalf asm ("q0") = vdupq_n_f32(0.5f);, - { -@@ -1271,7 +1271,7 @@ CVT_FUNC(f32, s16, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - CVT_FUNC(f32, s32, 8, - register float32x4_t vhalf asm ("q0") = vdupq_n_f32(0.5f);, - { -diff --git a/3rdparty/carotene/src/convert_scale.cpp b/3rdparty/carotene/src/convert_scale.cpp -index ae41a985c8..d599d24c1e 100644 ---- a/3rdparty/carotene/src/convert_scale.cpp -+++ b/3rdparty/carotene/src/convert_scale.cpp -@@ -473,7 +473,7 @@ CVTS_FUNC(u8, s16, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(u8, s32, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -562,7 +562,7 @@ CVTS_FUNC(u8, s32, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(u8, f32, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta);, -@@ -985,7 +985,7 @@ CVTS_FUNC(s8, s16, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(s8, s32, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1074,7 +1074,7 @@ CVTS_FUNC(s8, s32, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(s8, f32, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta);, -@@ -1155,7 +1155,7 @@ CVTS_FUNC(s8, f32, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(u16, u8, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1214,7 +1214,7 @@ CVTS_FUNC(u16, u8, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(u16, s8, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1273,7 +1273,7 @@ CVTS_FUNC(u16, s8, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC1(u16, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1330,7 +1330,7 @@ CVTS_FUNC1(u16, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(u16, s16, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1387,7 +1387,7 @@ CVTS_FUNC(u16, s16, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(u16, s32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1443,7 +1443,7 @@ CVTS_FUNC(u16, s32, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(u16, f32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta);, -@@ -1495,7 +1495,7 @@ CVTS_FUNC(u16, f32, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(s16, u8, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1554,7 +1554,7 @@ CVTS_FUNC(s16, u8, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(s16, s8, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1613,7 +1613,7 @@ CVTS_FUNC(s16, s8, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(s16, u16, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1670,7 +1670,7 @@ CVTS_FUNC(s16, u16, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC1(s16, 16, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1727,7 +1727,7 @@ CVTS_FUNC1(s16, 16, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(s16, s32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1783,7 +1783,7 @@ CVTS_FUNC(s16, s32, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(s16, f32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta);, -@@ -1835,7 +1835,7 @@ CVTS_FUNC(s16, f32, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(s32, u8, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1893,7 +1893,7 @@ CVTS_FUNC(s32, u8, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(s32, s8, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -1951,7 +1951,7 @@ CVTS_FUNC(s32, s8, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(s32, u16, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -2007,7 +2007,7 @@ CVTS_FUNC(s32, u16, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(s32, s16, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -2063,7 +2063,7 @@ CVTS_FUNC(s32, s16, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC1(s32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -2118,7 +2118,7 @@ CVTS_FUNC1(s32, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(s32, f32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta);, -@@ -2169,7 +2169,7 @@ CVTS_FUNC(s32, f32, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(f32, u8, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)((1 << 16)*alpha)); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)((1 << 16)*beta)); -@@ -2239,7 +2239,7 @@ CVTS_FUNC(f32, u8, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(f32, s8, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -2293,7 +2293,7 @@ CVTS_FUNC(f32, s8, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(f32, u16, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -2345,7 +2345,7 @@ CVTS_FUNC(f32, u16, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(f32, s16, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -2397,7 +2397,7 @@ CVTS_FUNC(f32, s16, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC(f32, s32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta + 0.5f);, -@@ -2448,7 +2448,7 @@ CVTS_FUNC(f32, s32, 8, - }) - #endif - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - CVTS_FUNC1(f32, 8, - register float32x4_t vscale asm ("q0") = vdupq_n_f32((f32)alpha); - register float32x4_t vshift asm ("q1") = vdupq_n_f32((f32)beta);, -diff --git a/3rdparty/carotene/src/gaussian_blur.cpp b/3rdparty/carotene/src/gaussian_blur.cpp -index f7b5f18d79..e5aa8fc75b 100644 ---- a/3rdparty/carotene/src/gaussian_blur.cpp -+++ b/3rdparty/carotene/src/gaussian_blur.cpp -@@ -327,7 +327,7 @@ void gaussianBlur5x5(const Size2D &size, s32 cn, - u16* lidx1 = lane + x - 1*2; - u16* lidx3 = lane + x + 1*2; - u16* lidx4 = lane + x + 2*2; --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - __asm__ __volatile__ ( - "vld2.16 {d0, d2}, [%[in0]]! \n\t" - "vld2.16 {d1, d3}, [%[in0]] \n\t" -diff --git a/3rdparty/carotene/src/pyramid.cpp b/3rdparty/carotene/src/pyramid.cpp -index 232ccf3efd..d4e32ea50f 100644 ---- a/3rdparty/carotene/src/pyramid.cpp -+++ b/3rdparty/carotene/src/pyramid.cpp -@@ -331,7 +331,7 @@ void gaussianPyramidDown(const Size2D &srcSize, - for (; x < roiw8; x += 8) - { - internal::prefetch(lane + 2 * x); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - __asm__ ( - "vld2.16 {d0-d3}, [%[in0]] \n\t" - "vld2.16 {d4-d7}, [%[in4]] \n\t" -@@ -538,7 +538,7 @@ void gaussianPyramidDown(const Size2D &srcSize, - for (; x < roiw4; x += 4) - { - internal::prefetch(lane + 2 * x); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - __asm__ ( - "vld2.32 {d0-d3}, [%[in0]] \n\t" - "vld2.32 {d4-d7}, [%[in4]] \n\t" -@@ -672,7 +672,7 @@ void gaussianPyramidDown(const Size2D &srcSize, - std::vector<f32> _buf(cn*(srcSize.width + 4) + 32/sizeof(f32)); - f32* lane = internal::alignPtr(&_buf[2*cn], 32); - --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - register float32x4_t vc6d4f32 asm ("q11") = vmovq_n_f32(1.5f); // 6/4 - register float32x4_t vc1d4f32 asm ("q12") = vmovq_n_f32(0.25f); // 1/4 - -@@ -739,7 +739,7 @@ void gaussianPyramidDown(const Size2D &srcSize, - for (; x < roiw4; x += 4) - { - internal::prefetch(lane + 2 * x); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - __asm__ __volatile__ ( - "vld2.32 {d0-d3}, [%[in0]] \n\t" - "vld2.32 {d8-d11}, [%[in4]] \n\t" -diff --git a/3rdparty/carotene/src/scharr.cpp b/3rdparty/carotene/src/scharr.cpp -index 8d3b6328b1..36f6b2276e 100644 ---- a/3rdparty/carotene/src/scharr.cpp -+++ b/3rdparty/carotene/src/scharr.cpp -@@ -109,7 +109,7 @@ void ScharrDeriv(const Size2D &size, s32 cn, - internal::prefetch(srow0 + x); - internal::prefetch(srow1 + x); - internal::prefetch(srow2 + x); --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 && !defined(__clang__) - __asm__ ( - "vld1.8 {d0}, [%[src0]] \n\t" - "vld1.8 {d2}, [%[src2]] \n\t" -@@ -161,7 +161,7 @@ void ScharrDeriv(const Size2D &size, s32 cn, - x = 0; - for( ; x < roiw8; x += 8 ) - { --#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 -+#if !defined(__aarch64__) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6 && !defined(__clang__) - __asm__ ( - "vld1.16 {d4-d5}, [%[s2ptr]] \n\t" - "vld1.16 {d8-d9}, [%[s4ptr]] \n\t" --- -2.14.1 - diff --git a/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch b/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch deleted file mode 100644 index a845505a85..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 350525293aef65490e80104ddd99e1b21c5d54b0 Mon Sep 17 00:00:00 2001 -From: Bian Naimeng <biannm@cn.fujitsu.com> -Date: Wed, 19 Apr 2017 03:11:37 +0900 -Subject: [PATCH 2/3] Make opencv-ts create share library intead of static. - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - modules/ts/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt -index f95bed079..ee67858df 100644 ---- a/modules/ts/CMakeLists.txt -+++ b/modules/ts/CMakeLists.txt -@@ -4,7 +4,7 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) - ocv_module_disable(ts) - endif() - --set(OPENCV_MODULE_TYPE STATIC) -+#set(OPENCV_MODULE_TYPE STATIC) - set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) - - if(WINRT) --- -2.13.4 - diff --git a/meta-oe/recipes-support/opencv/opencv/0002-imgcodecs-refactoring-improve-code-quality.patch b/meta-oe/recipes-support/opencv/opencv/0002-imgcodecs-refactoring-improve-code-quality.patch deleted file mode 100644 index 39f33af9de..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0002-imgcodecs-refactoring-improve-code-quality.patch +++ /dev/null @@ -1,656 +0,0 @@ -Upstream-Status: Backport [https://github.com/opencv/opencv/pull/9376/commits/999f41fb4f4aa94a0cb47256919ae8b5c29ca5f3] - -Fix CVEs for opencv 3.3: - -* CVE-2017-12597 -* CVE-2017-12598 -* CVE-2017-12599 -* CVE-2017-12600 -* CVE-2017-12601 -* CVE-2017-12602 -* CVE-2017-12603 -* CVE-2017-12604 -* CVE-2017-12605 -* CVE-2017-12606 -* CVE-2017-12862 -* CVE-2017-12863 -* CVE-2017-12864 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From 999f41fb4f4aa94a0cb47256919ae8b5c29ca5f3 Mon Sep 17 00:00:00 2001 -From: Alexander Alekhin <alexander.a.alekhin@gmail.com> -Date: Tue, 15 Aug 2017 22:04:55 +0000 -Subject: [PATCH 2/3] imgcodecs: refactoring, improve code quality - ---- - modules/imgcodecs/src/bitstrm.cpp | 2 + - modules/imgcodecs/src/bitstrm.hpp | 19 +++-- - modules/imgcodecs/src/grfmt_bmp.cpp | 13 ++- - modules/imgcodecs/src/grfmt_pxm.cpp | 122 ++++++++++++++++----------- - modules/imgcodecs/src/loadsave.cpp | 164 +++++++++++++++++++++++++++++------- - 5 files changed, 231 insertions(+), 89 deletions(-) - -diff --git a/modules/imgcodecs/src/bitstrm.cpp b/modules/imgcodecs/src/bitstrm.cpp -index a7e187fa0..0a8941aec 100644 ---- a/modules/imgcodecs/src/bitstrm.cpp -+++ b/modules/imgcodecs/src/bitstrm.cpp -@@ -209,6 +209,8 @@ int RLByteStream::getByte() - current = m_current; - } - -+ CV_Assert(current < m_end); -+ - val = *((uchar*)current); - m_current = current + 1; - return val; -diff --git a/modules/imgcodecs/src/bitstrm.hpp b/modules/imgcodecs/src/bitstrm.hpp -index 465c0a847..26947971f 100644 ---- a/modules/imgcodecs/src/bitstrm.hpp -+++ b/modules/imgcodecs/src/bitstrm.hpp -@@ -48,13 +48,20 @@ - namespace cv - { - --enum --{ -- RBS_THROW_EOS=-123, // <end of stream> exception code -- RBS_THROW_FORB=-124, // <forrbidden huffman code> exception code -- RBS_HUFF_FORB=2047, // forrbidden huffman code "value" -- RBS_BAD_HEADER=-125 // invalid header -+#define DECLARE_RBS_EXCEPTION(name) \ -+class RBS_ ## name ## _Exception : public cv::Exception \ -+{ \ -+public: \ -+ RBS_ ## name ## _Exception(int code_, const String& err_, const String& func_, const String& file_, int line_) : \ -+ cv::Exception(code_, err_, func_, file_, line_) \ -+ {} \ - }; -+DECLARE_RBS_EXCEPTION(THROW_EOS) -+#define RBS_THROW_EOS RBS_THROW_EOS_Exception(cv::Error::StsError, "Unexpected end of input stream", CV_Func, __FILE__, __LINE__) -+DECLARE_RBS_EXCEPTION(THROW_FORB) -+#define RBS_THROW_FORB RBS_THROW_FORB_Exception(cv::Error::StsError, "Forrbidden huffman code", CV_Func, __FILE__, __LINE__) -+DECLARE_RBS_EXCEPTION(BAD_HEADER) -+#define RBS_BAD_HEADER RBS_BAD_HEADER_Exception(cv::Error::StsError, "Invalid header", CV_Func, __FILE__, __LINE__) - - typedef unsigned long ulong; - -diff --git a/modules/imgcodecs/src/grfmt_bmp.cpp b/modules/imgcodecs/src/grfmt_bmp.cpp -index 86cacd316..257f97c2d 100644 ---- a/modules/imgcodecs/src/grfmt_bmp.cpp -+++ b/modules/imgcodecs/src/grfmt_bmp.cpp -@@ -118,8 +118,9 @@ bool BmpDecoder::readHeader() - - if( m_bpp <= 8 ) - { -- memset( m_palette, 0, sizeof(m_palette)); -- m_strm.getBytes( m_palette, (clrused == 0? 1<<m_bpp : clrused)*4 ); -+ CV_Assert(clrused < 256); -+ memset(m_palette, 0, sizeof(m_palette)); -+ m_strm.getBytes(m_palette, (clrused == 0? 1<<m_bpp : clrused)*4 ); - iscolor = IsColorPalette( m_palette, m_bpp ); - } - else if( m_bpp == 16 && m_rle_code == BMP_BITFIELDS ) -@@ -290,7 +291,9 @@ bool BmpDecoder::readData( Mat& img ) - else if( code > 2 ) // absolute mode - { - if( data + code*nch > line_end ) goto decode_rle4_bad; -- m_strm.getBytes( src, (((code + 1)>>1) + 1) & -2 ); -+ int sz = (((code + 1)>>1) + 1) & (~1); -+ CV_Assert((size_t)sz < _src.size()); -+ m_strm.getBytes(src, sz); - if( color ) - data = FillColorRow4( data, src, code, m_palette ); - else -@@ -379,7 +382,9 @@ decode_rle4_bad: ; - - if( data + code3 > line_end ) - goto decode_rle8_bad; -- m_strm.getBytes( src, (code + 1) & -2 ); -+ int sz = (code + 1) & (~1); -+ CV_Assert((size_t)sz < _src.size()); -+ m_strm.getBytes(src, sz); - if( color ) - data = FillColorRow8( data, src, code, m_palette ); - else -diff --git a/modules/imgcodecs/src/grfmt_pxm.cpp b/modules/imgcodecs/src/grfmt_pxm.cpp -index 1750cb705..68bd8fd93 100644 ---- a/modules/imgcodecs/src/grfmt_pxm.cpp -+++ b/modules/imgcodecs/src/grfmt_pxm.cpp -@@ -43,50 +43,58 @@ - #include "precomp.hpp" - #include "utils.hpp" - #include "grfmt_pxm.hpp" -+#include <iostream> - - namespace cv - { - - ///////////////////////// P?M reader ////////////////////////////// - --static int ReadNumber( RLByteStream& strm, int maxdigits ) -+static int ReadNumber(RLByteStream& strm, int maxdigits = 0) - { - int code; -- int val = 0; -+ int64 val = 0; - int digits = 0; - - code = strm.getByte(); - -- if( !isdigit(code)) -+ while (!isdigit(code)) - { -- do -+ if (code == '#' ) - { -- if( code == '#' ) -+ do - { -- do -- { -- code = strm.getByte(); -- } -- while( code != '\n' && code != '\r' ); -+ code = strm.getByte(); - } -- -+ while (code != '\n' && code != '\r'); - code = strm.getByte(); -- -- while( isspace(code)) -+ } -+ else if (isspace(code)) -+ { -+ while (isspace(code)) - code = strm.getByte(); - } -- while( !isdigit( code )); -+ else -+ { -+#if 1 -+ CV_ErrorNoReturn_(Error::StsError, ("PXM: Unexpected code in ReadNumber(): 0x%x (%d)", code, code)); -+#else -+ code = strm.getByte(); -+#endif -+ } - } - - do - { -- val = val*10 + code - '0'; -- if( ++digits >= maxdigits ) break; -+ val = val*10 + (code - '0'); -+ CV_Assert(val <= INT_MAX && "PXM: ReadNumber(): result is too large"); -+ digits++; -+ if (maxdigits != 0 && digits >= maxdigits) break; - code = strm.getByte(); - } -- while( isdigit(code)); -+ while (isdigit(code)); - -- return val; -+ return (int)val; - } - - -@@ -122,13 +130,13 @@ ImageDecoder PxMDecoder::newDecoder() const - return makePtr<PxMDecoder>(); - } - --void PxMDecoder::close() -+void PxMDecoder::close() - { - m_strm.close(); - } - - --bool PxMDecoder::readHeader() -+bool PxMDecoder::readHeader() - { - bool result = false; - -@@ -158,10 +166,10 @@ bool PxMDecoder::readHeader() - m_binary = code >= '4'; - m_type = m_bpp > 8 ? CV_8UC3 : CV_8UC1; - -- m_width = ReadNumber( m_strm, INT_MAX ); -- m_height = ReadNumber( m_strm, INT_MAX ); -+ m_width = ReadNumber(m_strm); -+ m_height = ReadNumber(m_strm); - -- m_maxval = m_bpp == 1 ? 1 : ReadNumber( m_strm, INT_MAX ); -+ m_maxval = m_bpp == 1 ? 1 : ReadNumber(m_strm); - if( m_maxval > 65535 ) - throw RBS_BAD_HEADER; - -@@ -175,8 +183,14 @@ bool PxMDecoder::readHeader() - result = true; - } - } -- catch(...) -+ catch (const cv::Exception&) -+ { -+ throw; -+ } -+ catch (...) - { -+ std::cerr << "PXM::readHeader(): unknown C++ exception" << std::endl << std::flush; -+ throw; - } - - if( !result ) -@@ -189,33 +203,28 @@ bool PxMDecoder::readHeader() - } - - --bool PxMDecoder::readData( Mat& img ) -+bool PxMDecoder::readData( Mat& img ) - { - int color = img.channels() > 1; - uchar* data = img.ptr(); - PaletteEntry palette[256]; - bool result = false; -- int bit_depth = CV_ELEM_SIZE1(m_type)*8; -- int src_pitch = (m_width*m_bpp*bit_depth/8 + 7)/8; -+ const int bit_depth = CV_ELEM_SIZE1(m_type)*8; -+ const int src_pitch = divUp(m_width*m_bpp*(bit_depth/8), 8); - int nch = CV_MAT_CN(m_type); - int width3 = m_width*nch; -- int i, x, y; - - if( m_offset < 0 || !m_strm.isOpened()) - return false; - -- AutoBuffer<uchar> _src(src_pitch + 32); -- uchar* src = _src; -- AutoBuffer<uchar> _gray_palette; -- uchar* gray_palette = _gray_palette; -+ uchar gray_palette[256] = {0}; - - // create LUT for converting colors - if( bit_depth == 8 ) - { -- _gray_palette.allocate(m_maxval + 1); -- gray_palette = _gray_palette; -+ CV_Assert(m_maxval < 256); - -- for( i = 0; i <= m_maxval; i++ ) -+ for (int i = 0; i <= m_maxval; i++) - gray_palette[i] = (uchar)((i*255/m_maxval)^(m_bpp == 1 ? 255 : 0)); - - FillGrayPalette( palette, m_bpp==1 ? 1 : 8 , m_bpp == 1 ); -@@ -229,12 +238,16 @@ bool PxMDecoder::readData( Mat& img ) - { - ////////////////////////// 1 BPP ///////////////////////// - case 1: -+ CV_Assert(CV_MAT_DEPTH(m_type) == CV_8U); - if( !m_binary ) - { -- for( y = 0; y < m_height; y++, data += img.step ) -+ AutoBuffer<uchar> _src(m_width); -+ uchar* src = _src; -+ -+ for (int y = 0; y < m_height; y++, data += img.step) - { -- for( x = 0; x < m_width; x++ ) -- src[x] = ReadNumber( m_strm, 1 ) != 0; -+ for (int x = 0; x < m_width; x++) -+ src[x] = ReadNumber(m_strm, 1) != 0; - - if( color ) - FillColorRow8( data, src, m_width, palette ); -@@ -244,7 +257,10 @@ bool PxMDecoder::readData( Mat& img ) - } - else - { -- for( y = 0; y < m_height; y++, data += img.step ) -+ AutoBuffer<uchar> _src(src_pitch); -+ uchar* src = _src; -+ -+ for (int y = 0; y < m_height; y++, data += img.step) - { - m_strm.getBytes( src, src_pitch ); - -@@ -260,13 +276,17 @@ bool PxMDecoder::readData( Mat& img ) - ////////////////////////// 8 BPP ///////////////////////// - case 8: - case 24: -- for( y = 0; y < m_height; y++, data += img.step ) -+ { -+ AutoBuffer<uchar> _src(std::max<size_t>(width3*2, src_pitch)); -+ uchar* src = _src; -+ -+ for (int y = 0; y < m_height; y++, data += img.step) - { - if( !m_binary ) - { -- for( x = 0; x < width3; x++ ) -+ for (int x = 0; x < width3; x++) - { -- int code = ReadNumber( m_strm, INT_MAX ); -+ int code = ReadNumber(m_strm); - if( (unsigned)code > (unsigned)m_maxval ) code = m_maxval; - if( bit_depth == 8 ) - src[x] = gray_palette[code]; -@@ -279,7 +299,7 @@ bool PxMDecoder::readData( Mat& img ) - m_strm.getBytes( src, src_pitch ); - if( bit_depth == 16 && !isBigEndian() ) - { -- for( x = 0; x < width3; x++ ) -+ for (int x = 0; x < width3; x++) - { - uchar v = src[x * 2]; - src[x * 2] = src[x * 2 + 1]; -@@ -290,7 +310,7 @@ bool PxMDecoder::readData( Mat& img ) - - if( img.depth() == CV_8U && bit_depth == 16 ) - { -- for( x = 0; x < width3; x++ ) -+ for (int x = 0; x < width3; x++) - { - int v = ((ushort *)src)[x]; - src[x] = (uchar)(v >> 8); -@@ -331,12 +351,19 @@ bool PxMDecoder::readData( Mat& img ) - } - result = true; - break; -+ } - default: -- assert(0); -+ CV_ErrorNoReturn(Error::StsError, "m_bpp is not supported"); - } - } -- catch(...) -+ catch (const cv::Exception&) -+ { -+ throw; -+ } -+ catch (...) - { -+ std::cerr << "PXM::readData(): unknown exception" << std::endl << std::flush; -+ throw; - } - - return result; -@@ -412,8 +439,9 @@ bool PxMEncoder::write( const Mat& img, const std::vector<int>& params ) - char* buffer = _buffer; - - // write header; -- sprintf( buffer, "P%c\n%d %d\n%d\n", -+ sprintf( buffer, "P%c\n# Generated by OpenCV %s\n%d %d\n%d\n", - '2' + (channels > 1 ? 1 : 0) + (isBinary ? 3 : 0), -+ CV_VERSION, - width, height, (1 << depth) - 1 ); - - strm.putBytes( buffer, (int)strlen(buffer) ); -diff --git a/modules/imgcodecs/src/loadsave.cpp b/modules/imgcodecs/src/loadsave.cpp -index 3b2366217..5ee4ca354 100644 ---- a/modules/imgcodecs/src/loadsave.cpp -+++ b/modules/imgcodecs/src/loadsave.cpp -@@ -55,6 +55,27 @@ - /****************************************************************************************\ - * Image Codecs * - \****************************************************************************************/ -+ -+namespace cv { -+ -+// TODO Add runtime configuration -+#define CV_IO_MAX_IMAGE_PARAMS (50) -+#define CV_IO_MAX_IMAGE_WIDTH (1<<20) -+#define CV_IO_MAX_IMAGE_HEIGHT (1<<20) -+#define CV_IO_MAX_IMAGE_PIXELS (1<<30) // 1 Gigapixel -+ -+static Size validateInputImageSize(const Size& size) -+{ -+ CV_Assert(size.width > 0); -+ CV_Assert(size.width <= CV_IO_MAX_IMAGE_WIDTH); -+ CV_Assert(size.height > 0); -+ CV_Assert(size.height <= CV_IO_MAX_IMAGE_HEIGHT); -+ uint64 pixels = (uint64)size.width * (uint64)size.height; -+ CV_Assert(pixels <= CV_IO_MAX_IMAGE_PIXELS); -+ return size; -+} -+ -+ - namespace { - - class ByteStreamBuffer: public std::streambuf -@@ -94,9 +115,6 @@ protected: - - } - --namespace cv --{ -- - /** - * @struct ImageCodecInitializer - * -@@ -408,14 +426,26 @@ imread_( const String& filename, int flags, int hdrtype, Mat* mat=0 ) - /// set the filename in the driver - decoder->setSource( filename ); - -- // read the header to make sure it succeeds -- if( !decoder->readHeader() ) -+ try -+ { -+ // read the header to make sure it succeeds -+ if( !decoder->readHeader() ) -+ return 0; -+ } -+ catch (const cv::Exception& e) -+ { -+ std::cerr << "imread_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush; - return 0; -+ } -+ catch (...) -+ { -+ std::cerr << "imread_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush; -+ return 0; -+ } -+ - - // established the required input image size -- CvSize size; -- size.width = decoder->width(); -- size.height = decoder->height(); -+ Size size = validateInputImageSize(Size(decoder->width(), decoder->height())); - - // grab the decoded type - int type = decoder->type(); -@@ -451,7 +481,21 @@ imread_( const String& filename, int flags, int hdrtype, Mat* mat=0 ) - } - - // read the image data -- if( !decoder->readData( *data )) -+ bool success = false; -+ try -+ { -+ if (decoder->readData(*data)) -+ success = true; -+ } -+ catch (const cv::Exception& e) -+ { -+ std::cerr << "imread_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush; -+ } -+ catch (...) -+ { -+ std::cerr << "imread_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush; -+ } -+ if (!success) - { - cvReleaseImage( &image ); - cvReleaseMat( &matrix ); -@@ -504,8 +548,22 @@ imreadmulti_(const String& filename, int flags, std::vector<Mat>& mats) - decoder->setSource(filename); - - // read the header to make sure it succeeds -- if (!decoder->readHeader()) -+ try -+ { -+ // read the header to make sure it succeeds -+ if( !decoder->readHeader() ) -+ return 0; -+ } -+ catch (const cv::Exception& e) -+ { -+ std::cerr << "imreadmulti_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush; - return 0; -+ } -+ catch (...) -+ { -+ std::cerr << "imreadmulti_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush; -+ return 0; -+ } - - for (;;) - { -@@ -523,17 +581,32 @@ imreadmulti_(const String& filename, int flags, std::vector<Mat>& mats) - type = CV_MAKETYPE(CV_MAT_DEPTH(type), 1); - } - -+ // established the required input image size -+ Size size = validateInputImageSize(Size(decoder->width(), decoder->height())); -+ - // read the image data -- Mat mat(decoder->height(), decoder->width(), type); -- if (!decoder->readData(mat)) -+ Mat mat(size.height, size.width, type); -+ bool success = false; -+ try - { -- // optionally rotate the data if EXIF' orientation flag says so -- if( (flags & IMREAD_IGNORE_ORIENTATION) == 0 && flags != IMREAD_UNCHANGED ) -- { -- ApplyExifOrientation(filename, mat); -- } -- -+ if (decoder->readData(mat)) -+ success = true; -+ } -+ catch (const cv::Exception& e) -+ { -+ std::cerr << "imreadmulti_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush; -+ } -+ catch (...) -+ { -+ std::cerr << "imreadmulti_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush; -+ } -+ if (!success) - break; -+ -+ // optionally rotate the data if EXIF' orientation flag says so -+ if( (flags & IMREAD_IGNORE_ORIENTATION) == 0 && flags != IMREAD_UNCHANGED ) -+ { -+ ApplyExifOrientation(filename, mat); - } - - mats.push_back(mat); -@@ -616,6 +689,7 @@ static bool imwrite_( const String& filename, const Mat& image, - } - - encoder->setDestination( filename ); -+ CV_Assert(params.size() <= CV_IO_MAX_IMAGE_PARAMS*2); - bool code = encoder->write( *pimage, params ); - - // CV_Assert( code ); -@@ -663,22 +737,35 @@ imdecode_( const Mat& buf, int flags, int hdrtype, Mat* mat=0 ) - decoder->setSource(filename); - } - -- if( !decoder->readHeader() ) -+ bool success = false; -+ try -+ { -+ if (decoder->readHeader()) -+ success = true; -+ } -+ catch (const cv::Exception& e) -+ { -+ std::cerr << "imdecode_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush; -+ } -+ catch (...) -+ { -+ std::cerr << "imdecode_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush; -+ } -+ if (!success) - { - decoder.release(); -- if ( !filename.empty() ) -+ if (!filename.empty()) - { -- if ( remove(filename.c_str()) != 0 ) -+ if (0 != remove(filename.c_str())) - { -- CV_Error( CV_StsError, "unable to remove temporary file" ); -+ std::cerr << "unable to remove temporary file:" << filename << std::endl << std::flush; - } - } - return 0; - } - -- CvSize size; -- size.width = decoder->width(); -- size.height = decoder->height(); -+ // established the required input image size -+ Size size = validateInputImageSize(Size(decoder->width(), decoder->height())); - - int type = decoder->type(); - if( (flags & IMREAD_LOAD_GDAL) != IMREAD_LOAD_GDAL && flags != IMREAD_UNCHANGED ) -@@ -712,17 +799,30 @@ imdecode_( const Mat& buf, int flags, int hdrtype, Mat* mat=0 ) - temp = cvarrToMat(image); - } - -- bool code = decoder->readData( *data ); -+ success = false; -+ try -+ { -+ if (decoder->readData(*data)) -+ success = true; -+ } -+ catch (const cv::Exception& e) -+ { -+ std::cerr << "imdecode_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush; -+ } -+ catch (...) -+ { -+ std::cerr << "imdecode_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush; -+ } - decoder.release(); -- if ( !filename.empty() ) -+ if (!filename.empty()) - { -- if ( remove(filename.c_str()) != 0 ) -+ if (0 != remove(filename.c_str())) - { -- CV_Error( CV_StsError, "unable to remove temporary file" ); -+ std::cerr << "unable to remove temporary file:" << filename << std::endl << std::flush; - } - } - -- if( !code ) -+ if (!success) - { - cvReleaseImage( &image ); - cvReleaseMat( &matrix ); -@@ -859,7 +959,7 @@ cvSaveImage( const char* filename, const CvArr* arr, const int* _params ) - if( _params ) - { - for( ; _params[i] > 0; i += 2 ) -- ; -+ CV_Assert(i < CV_IO_MAX_IMAGE_PARAMS*2); // Limit number of params for security reasons - } - return cv::imwrite_(filename, cv::cvarrToMat(arr), - i > 0 ? std::vector<int>(_params, _params+i) : std::vector<int>(), -@@ -890,7 +990,7 @@ cvEncodeImage( const char* ext, const CvArr* arr, const int* _params ) - if( _params ) - { - for( ; _params[i] > 0; i += 2 ) -- ; -+ CV_Assert(i < CV_IO_MAX_IMAGE_PARAMS*2); // Limit number of params for security reasons - } - cv::Mat img = cv::cvarrToMat(arr); - if( CV_IS_IMAGE(arr) && ((const IplImage*)arr)->origin == IPL_ORIGIN_BL ) --- -2.14.1 - diff --git a/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch b/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch index a22b04a905..9df419d0b8 100644 --- a/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch +++ b/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch @@ -1,7 +1,7 @@ -From ace48a628dca34d742615598afeef42ed323a029 Mon Sep 17 00:00:00 2001 +From f42c9b8c7bafcadc7e95fb25a391707f970eb426 Mon Sep 17 00:00:00 2001 From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Date: Fri, 19 May 2017 04:27:50 +0900 -Subject: [PATCH 3/3] To fix errors as following: +Subject: [PATCH] To fix errors as following: "test_main.cpp:45: undefined reference to `parseCustomOptions(int, char**)'" "perf_abs.cpp:13: undefined reference to `cvtest::param_seed'" @@ -13,35 +13,30 @@ Also add the visibility changes for certain OpenCL-related functions in ts module. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> + --- - modules/ts/include/opencv2/ts.hpp | 6 +++--- +Upstream-Status: Pending + + modules/ts/include/opencv2/ts.hpp | 4 ++-- modules/ts/include/opencv2/ts/ocl_test.hpp | 2 +- modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp -index 41a76b13e..205646140 100644 +index ed7491a89a..80919d13ee 100644 --- a/modules/ts/include/opencv2/ts.hpp +++ b/modules/ts/include/opencv2/ts.hpp -@@ -555,7 +555,7 @@ protected: +@@ -728,7 +728,7 @@ protected: } }; -extern uint64 param_seed; +CV_EXPORTS extern uint64 param_seed; - struct CV_EXPORTS DefaultRngAuto + struct DefaultRngAuto { -@@ -611,14 +611,14 @@ CV_EXPORTS std::string findDataFile(const std::string& relative_path, bool requi - - #ifdef HAVE_OPENCL - namespace ocl { --void dumpOpenCLDevice(); -+CV_EXPORTS void dumpOpenCLDevice(); - } - #define TEST_DUMP_OCL_INFO cvtest::ocl::dumpOpenCLDevice(); - #else - #define TEST_DUMP_OCL_INFO +@@ -791,7 +791,7 @@ private: + #endif #endif -void parseCustomOptions(int argc, char **argv); @@ -50,7 +45,7 @@ index 41a76b13e..205646140 100644 #define CV_TEST_INIT0_NOOP (void)0 diff --git a/modules/ts/include/opencv2/ts/ocl_test.hpp b/modules/ts/include/opencv2/ts/ocl_test.hpp -index 54b33ece8..ef56bf9ef 100644 +index 11572e9f48..438112e2aa 100644 --- a/modules/ts/include/opencv2/ts/ocl_test.hpp +++ b/modules/ts/include/opencv2/ts/ocl_test.hpp @@ -82,7 +82,7 @@ inline UMat ToUMat(InputArray src) @@ -63,7 +58,7 @@ index 54b33ece8..ef56bf9ef 100644 #define MAX_VALUE 357 diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp -index 0bdd346dd..2cd34dfce 100644 +index b2a4cac241..b94c681c0c 100644 --- a/modules/ts/include/opencv2/ts/ts_ext.hpp +++ b/modules/ts/include/opencv2/ts/ts_ext.hpp @@ -9,7 +9,7 @@ @@ -72,9 +67,6 @@ index 0bdd346dd..2cd34dfce 100644 namespace cvtest { -void checkIppStatus(); +CV_EXPORTS void checkIppStatus(); - } - - #define CV_TEST_INIT \ --- -2.13.4 - + extern bool skipUnstableTests; + extern bool runBigDataTests; + extern int testThreads; diff --git a/meta-oe/recipes-support/opencv/opencv/0003-imgproc-test-add-checks-for-remove-call.patch b/meta-oe/recipes-support/opencv/opencv/0003-imgproc-test-add-checks-for-remove-call.patch deleted file mode 100644 index 5f4a60c960..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0003-imgproc-test-add-checks-for-remove-call.patch +++ /dev/null @@ -1,186 +0,0 @@ -Upstream-Status: Backport [https://github.com/opencv/opencv/pull/9376/commits/78a310630fb0a1f6d089576202343e672f27609d] - -Fix CVEs for opencv 3.3. - -* CVE-2017-12597 -* CVE-2017-12598 -* CVE-2017-12599 -* CVE-2017-12600 -* CVE-2017-12601 -* CVE-2017-12602 -* CVE-2017-12603 -* CVE-2017-12604 -* CVE-2017-12605 -* CVE-2017-12606 -* CVE-2017-12862 -* CVE-2017-12863 -* CVE-2017-12864 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From 78a310630fb0a1f6d089576202343e672f27609d Mon Sep 17 00:00:00 2001 -From: Alexander Alekhin <alexander.alekhin@intel.com> -Date: Wed, 16 Aug 2017 13:53:12 +0300 -Subject: [PATCH 3/3] imgproc(test): add checks for remove() call - ---- - modules/imgcodecs/test/test_grfmt.cpp | 2 +- - modules/imgcodecs/test/test_jpeg.cpp | 12 ++++++------ - modules/imgcodecs/test/test_png.cpp | 2 +- - modules/imgcodecs/test/test_read_write.cpp | 4 ++-- - modules/imgcodecs/test/test_tiff.cpp | 8 ++++---- - modules/imgcodecs/test/test_webp.cpp | 6 +++--- - 6 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/modules/imgcodecs/test/test_grfmt.cpp b/modules/imgcodecs/test/test_grfmt.cpp -index 64a0c1e3a..74b72c3b3 100644 ---- a/modules/imgcodecs/test/test_grfmt.cpp -+++ b/modules/imgcodecs/test/test_grfmt.cpp -@@ -175,7 +175,7 @@ TEST_P(Imgcodecs_ExtSize, write_imageseq) - EXPECT_LT(n, 1.); - EXPECT_PRED_FORMAT2(cvtest::MatComparator(0, 0), img, img_gt); - } -- remove(filename.c_str()); -+ EXPECT_EQ(0, remove(filename.c_str())); - } - } - -diff --git a/modules/imgcodecs/test/test_jpeg.cpp b/modules/imgcodecs/test/test_jpeg.cpp -index 5546f2d91..6ddb02840 100644 ---- a/modules/imgcodecs/test/test_jpeg.cpp -+++ b/modules/imgcodecs/test/test_jpeg.cpp -@@ -123,8 +123,8 @@ TEST(Imgcodecs_Jpeg, encode_decode_progressive_jpeg) - - EXPECT_EQ(0, cvtest::norm(img_jpg_progressive, img_jpg_normal, NORM_INF)); - -- remove(output_progressive.c_str()); -- remove(output_normal.c_str()); -+ EXPECT_EQ(0, remove(output_progressive.c_str())); -+ EXPECT_EQ(0, remove(output_normal.c_str())); - } - - TEST(Imgcodecs_Jpeg, encode_decode_optimize_jpeg) -@@ -148,8 +148,8 @@ TEST(Imgcodecs_Jpeg, encode_decode_optimize_jpeg) - - EXPECT_EQ(0, cvtest::norm(img_jpg_optimized, img_jpg_normal, NORM_INF)); - -- remove(output_optimized.c_str()); -- remove(output_normal.c_str()); -+ EXPECT_EQ(0, remove(output_optimized.c_str())); -+ EXPECT_EQ(0, remove(output_normal.c_str())); - } - - TEST(Imgcodecs_Jpeg, encode_decode_rst_jpeg) -@@ -173,8 +173,8 @@ TEST(Imgcodecs_Jpeg, encode_decode_rst_jpeg) - - EXPECT_EQ(0, cvtest::norm(img_jpg_rst, img_jpg_normal, NORM_INF)); - -- remove(output_rst.c_str()); -- remove(output_normal.c_str()); -+ EXPECT_EQ(0, remove(output_rst.c_str())); -+ EXPECT_EQ(0, remove(output_normal.c_str())); - } - - #endif // HAVE_JPEG -diff --git a/modules/imgcodecs/test/test_png.cpp b/modules/imgcodecs/test/test_png.cpp -index c46f90119..4e97043e1 100644 ---- a/modules/imgcodecs/test/test_png.cpp -+++ b/modules/imgcodecs/test/test_png.cpp -@@ -17,7 +17,7 @@ TEST(Imgcodecs_Png, write_big) - EXPECT_EQ(13043, img.cols); - EXPECT_EQ(13917, img.rows); - ASSERT_NO_THROW(imwrite(dst_file, img)); -- remove(dst_file.c_str()); -+ EXPECT_EQ(0, remove(dst_file.c_str())); - } - - TEST(Imgcodecs_Png, encode) -diff --git a/modules/imgcodecs/test/test_read_write.cpp b/modules/imgcodecs/test/test_read_write.cpp -index 38f10225f..5119813bf 100644 ---- a/modules/imgcodecs/test/test_read_write.cpp -+++ b/modules/imgcodecs/test/test_read_write.cpp -@@ -50,7 +50,7 @@ TEST(Imgcodecs_Image, read_write_bmp) - psnr = cvtest::PSNR(buf_loaded, image); - EXPECT_GT(psnr, thresDbell); - -- remove(dst_name.c_str()); -+ EXPECT_EQ(0, remove(dst_name.c_str())); - } - } - -@@ -95,7 +95,7 @@ TEST_P(Imgcodecs_Image, read_write) - psnr = cvtest::PSNR(buf_loaded, image); - EXPECT_GT(psnr, thresDbell); - -- remove(full_name.c_str()); -+ EXPECT_EQ(0, remove(full_name.c_str())); - } - - const string exts[] = { -diff --git a/modules/imgcodecs/test/test_tiff.cpp b/modules/imgcodecs/test/test_tiff.cpp -index 0264da4cd..6ef0c1748 100644 ---- a/modules/imgcodecs/test/test_tiff.cpp -+++ b/modules/imgcodecs/test/test_tiff.cpp -@@ -41,8 +41,8 @@ TEST(Imgcodecs_Tiff, decode_tile16384x16384) - // not enough memory - } - -- remove(file3.c_str()); -- remove(file4.c_str()); -+ EXPECT_EQ(0, remove(file3.c_str())); -+ EXPECT_EQ(0, remove(file4.c_str())); - } - - TEST(Imgcodecs_Tiff, write_read_16bit_big_little_endian) -@@ -88,7 +88,7 @@ TEST(Imgcodecs_Tiff, write_read_16bit_big_little_endian) - EXPECT_EQ(0xDEAD, img.at<ushort>(0,0)); - EXPECT_EQ(0xBEEF, img.at<ushort>(0,1)); - -- remove(filename.c_str()); -+ EXPECT_EQ(0, remove(filename.c_str())); - } - } - -@@ -143,7 +143,7 @@ TEST(Imgcodecs_Tiff, decode_infinite_rowsperstrip) - - EXPECT_NO_THROW(cv::imread(filename, IMREAD_UNCHANGED)); - -- remove(filename.c_str()); -+ EXPECT_EQ(0, remove(filename.c_str())); - } - - //================================================================================================== -diff --git a/modules/imgcodecs/test/test_webp.cpp b/modules/imgcodecs/test/test_webp.cpp -index 6d40ce21e..d82fdd289 100644 ---- a/modules/imgcodecs/test/test_webp.cpp -+++ b/modules/imgcodecs/test/test_webp.cpp -@@ -44,7 +44,7 @@ TEST(Imgcodecs_WebP, encode_decode_lossless_webp) - } - } - -- remove(output.c_str()); -+ EXPECT_EQ(0, remove(output.c_str())); - - cv::Mat decode = cv::imdecode(buf, IMREAD_COLOR); - ASSERT_FALSE(decode.empty()); -@@ -71,7 +71,7 @@ TEST(Imgcodecs_WebP, encode_decode_lossy_webp) - - EXPECT_NO_THROW(cv::imwrite(output, img, params)); - cv::Mat img_webp = cv::imread(output); -- remove(output.c_str()); -+ EXPECT_EQ(0, remove(output.c_str())); - EXPECT_FALSE(img_webp.empty()); - EXPECT_EQ(3, img_webp.channels()); - EXPECT_EQ(512, img_webp.cols); -@@ -96,7 +96,7 @@ TEST(Imgcodecs_WebP, encode_decode_with_alpha_webp) - - EXPECT_NO_THROW(cv::imwrite(output, img)); - cv::Mat img_webp = cv::imread(output); -- remove(output.c_str()); -+ EXPECT_EQ(0, remove(output.c_str())); - EXPECT_FALSE(img_webp.empty()); - EXPECT_EQ(4, img_webp.channels()); - EXPECT_EQ(512, img_webp.cols); --- -2.14.1 - diff --git a/meta-oe/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch b/meta-oe/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch new file mode 100644 index 0000000000..8fda857080 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch @@ -0,0 +1,138 @@ +From: Victor Westerhuis <victor@westerhu.is> +Date: Sat, 19 Nov 2022 21:45:39 +0100 +Subject: Do not embed build directory in binaries + +This makes the opencv core module build reproducibly. + +https://salsa.debian.org/science-team/opencv/-/raw/master/debian/patches/0008-Do-not-embed-build-directory-in-binaries.patch +Upstream-Status: Backport +Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> +--- + modules/core/CMakeLists.txt | 10 ------ + modules/core/include/opencv2/core/private.hpp | 4 +-- + modules/core/include/opencv2/core/utility.hpp | 4 +-- + modules/core/src/utils/datafile.cpp | 48 +-------------------------- + 4 files changed, 5 insertions(+), 61 deletions(-) + +diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt +index b78bb98..d96b669 100644 +--- a/modules/core/CMakeLists.txt ++++ b/modules/core/CMakeLists.txt +@@ -188,16 +188,6 @@ if(OPENCV_OTHER_INSTALL_PATH) + ") + endif() + +-set(OPENCV_DATA_CONFIG_STR "${OPENCV_DATA_CONFIG_STR} +-#define OPENCV_BUILD_DIR \"${CMAKE_BINARY_DIR}\" +-") +- +-file(RELATIVE_PATH SOURCE_DIR_RELATIVE ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}) +-set(OPENCV_DATA_CONFIG_STR "${OPENCV_DATA_CONFIG_STR} +-#define OPENCV_DATA_BUILD_DIR_SEARCH_PATHS \\ +- \"${SOURCE_DIR_RELATIVE}/\" +-") +- + if(WIN32) + file(RELATIVE_PATH INSTALL_DATA_DIR_RELATIVE "${CMAKE_INSTALL_PREFIX}/${OPENCV_BIN_INSTALL_PATH}" "${CMAKE_INSTALL_PREFIX}/${OPENCV_OTHER_INSTALL_PATH}") + else() +diff --git a/modules/core/include/opencv2/core/private.hpp b/modules/core/include/opencv2/core/private.hpp +index 146d37f..dd675bc 100644 +--- a/modules/core/include/opencv2/core/private.hpp ++++ b/modules/core/include/opencv2/core/private.hpp +@@ -818,10 +818,10 @@ Search directories: + 2. Check path specified by configuration parameter with "_HINT" suffix (name of environment variable). + 3. Check path specified by configuration parameter (name of environment variable). + If parameter value is not empty and nothing is found then stop searching. +-4. Detects build/install path based on: ++4. Detects install path based on: + a. current working directory (CWD) + b. and/or binary module location (opencv_core/opencv_world, doesn't work with static linkage) +-5. Scan `<source>/{,data}` directories if build directory is detected or the current directory is in source tree. ++5. Scan `<source>/{,data}` directories if the current directory is in source tree. + 6. Scan `<install>/share/OpenCV` directory if install directory is detected. + + @param relative_path Relative path to data file +diff --git a/modules/core/include/opencv2/core/utility.hpp b/modules/core/include/opencv2/core/utility.hpp +index 108c0d9..f15d9ea 100644 +--- a/modules/core/include/opencv2/core/utility.hpp ++++ b/modules/core/include/opencv2/core/utility.hpp +@@ -1163,10 +1163,10 @@ Search directories: + 2. OPENCV_SAMPLES_DATA_PATH_HINT environment variable + 3. OPENCV_SAMPLES_DATA_PATH environment variable + If parameter value is not empty and nothing is found then stop searching. +-4. Detects build/install path based on: ++4. Detects install path based on: + a. current working directory (CWD) + b. and/or binary module location (opencv_core/opencv_world, doesn't work with static linkage) +-5. Scan `<source>/{,data,samples/data}` directories if build directory is detected or the current directory is in source tree. ++5. Scan `<source>/{,data,samples/data}` directories if the current directory is in source tree. + 6. Scan `<install>/share/OpenCV` directory if install directory is detected. + + @see cv::utils::findDataFile +diff --git a/modules/core/src/utils/datafile.cpp b/modules/core/src/utils/datafile.cpp +index 3af83a5..6bda857 100644 +--- a/modules/core/src/utils/datafile.cpp ++++ b/modules/core/src/utils/datafile.cpp +@@ -280,32 +280,8 @@ cv::String findDataFile(const cv::String& relative_path, + + + // Steps: 4, 5, 6 +- cv::String cwd = utils::fs::getcwd(); +- cv::String build_dir(OPENCV_BUILD_DIR); +- bool has_tested_build_directory = false; +- if (isSubDirectory(build_dir, cwd) || isSubDirectory(utils::fs::canonical(build_dir), utils::fs::canonical(cwd))) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): the current directory is build sub-directory: " << cwd); +- const char* build_subdirs[] = { OPENCV_DATA_BUILD_DIR_SEARCH_PATHS }; +- for (size_t k = 0; k < sizeof(build_subdirs)/sizeof(build_subdirs[0]); k++) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): <build>/" << build_subdirs[k]); +- cv::String datapath = utils::fs::join(build_dir, build_subdirs[k]); +- if (utils::fs::isDirectory(datapath)) +- { +- for(size_t i = search_subdir.size(); i > 0; i--) +- { +- const cv::String& subdir = search_subdir[i - 1]; +- cv::String prefix = utils::fs::join(datapath, subdir); +- TRY_FILE_WITH_PREFIX(prefix); +- } +- } +- } +- has_tested_build_directory = true; +- } +- + cv::String source_dir; +- cv::String try_source_dir = cwd; ++ cv::String try_source_dir = utils::fs::getcwd(); + for (int levels = 0; levels < 3; ++levels) + { + if (utils::fs::exists(utils::fs::join(try_source_dir, "modules/core/include/opencv2/core/version.hpp"))) +@@ -341,28 +317,6 @@ cv::String findDataFile(const cv::String& relative_path, + CV_LOG_INFO(NULL, "Can't detect module binaries location"); + } + +- if (!has_tested_build_directory && +- (isSubDirectory(build_dir, module_path) || isSubDirectory(utils::fs::canonical(build_dir), utils::fs::canonical(module_path))) +- ) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): the binary module directory is build sub-directory: " << module_path); +- const char* build_subdirs[] = { OPENCV_DATA_BUILD_DIR_SEARCH_PATHS }; +- for (size_t k = 0; k < sizeof(build_subdirs)/sizeof(build_subdirs[0]); k++) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): <build>/" << build_subdirs[k]); +- cv::String datapath = utils::fs::join(build_dir, build_subdirs[k]); +- if (utils::fs::isDirectory(datapath)) +- { +- for(size_t i = search_subdir.size(); i > 0; i--) +- { +- const cv::String& subdir = search_subdir[i - 1]; +- cv::String prefix = utils::fs::join(datapath, subdir); +- TRY_FILE_WITH_PREFIX(prefix); +- } +- } +- } +- } +- + #if defined OPENCV_INSTALL_DATA_DIR_RELATIVE + if (!module_path.empty()) // require module path + { diff --git a/meta-oe/recipes-support/opencv/opencv/CVE-2017-14136.patch b/meta-oe/recipes-support/opencv/opencv/CVE-2017-14136.patch deleted file mode 100644 index 7ad50a2d2f..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/CVE-2017-14136.patch +++ /dev/null @@ -1,288 +0,0 @@ -Upstream-Status: Backport [https://github.com/opencv/opencv/pull/9448/commits/aacae20] - -Backport patch to fix CVE-2017-14136. - -Ref: https://github.com/opencv/opencv/issues/9443 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From aacae2065744adb05e858d327198c7bbe7f452b0 Mon Sep 17 00:00:00 2001 -From: Alexander Alekhin <alexander.alekhin@intel.com> -Date: Wed, 23 Aug 2017 15:15:27 +0300 -Subject: [PATCH] imgcodesc: fix code problems with integer overflow / address - arithmetic / UB - ---- - modules/imgcodecs/src/grfmt_bmp.cpp | 8 ++--- - modules/imgcodecs/src/grfmt_exr.cpp | 10 +++---- - modules/imgcodecs/src/grfmt_jpeg.cpp | 2 +- - modules/imgcodecs/src/grfmt_jpeg2000.cpp | 6 ++-- - modules/imgcodecs/src/grfmt_pam.cpp | 2 +- - modules/imgcodecs/src/grfmt_sunras.cpp | 6 ++-- - modules/imgcodecs/src/utils.cpp | 51 +++++++++++++++++++------------- - modules/imgcodecs/src/utils.hpp | 2 ++ - 8 files changed, 50 insertions(+), 37 deletions(-) - -diff --git a/modules/imgcodecs/src/grfmt_bmp.cpp b/modules/imgcodecs/src/grfmt_bmp.cpp -index 257f97c2d8b..69768e276a3 100644 ---- a/modules/imgcodecs/src/grfmt_bmp.cpp -+++ b/modules/imgcodecs/src/grfmt_bmp.cpp -@@ -193,7 +193,7 @@ bool BmpDecoder::readHeader() - bool BmpDecoder::readData( Mat& img ) - { - uchar* data = img.ptr(); -- int step = (int)img.step; -+ int step = validateToInt(img.step); - bool color = img.channels() > 1; - uchar gray_palette[256] = {0}; - bool result = false; -@@ -206,7 +206,7 @@ bool BmpDecoder::readData( Mat& img ) - - if( m_origin == IPL_ORIGIN_BL ) - { -- data += (m_height - 1)*step; -+ data += (m_height - 1)*(size_t)step; - step = -step; - } - -@@ -530,7 +530,7 @@ bool BmpEncoder::write( const Mat& img, const std::vector<int>& ) - int bitmapHeaderSize = 40; - int paletteSize = channels > 1 ? 0 : 1024; - int headerSize = 14 /* fileheader */ + bitmapHeaderSize + paletteSize; -- int fileSize = fileStep*height + headerSize; -+ size_t fileSize = (size_t)fileStep*height + headerSize; - PaletteEntry palette[256]; - - if( m_buf ) -@@ -540,7 +540,7 @@ bool BmpEncoder::write( const Mat& img, const std::vector<int>& ) - strm.putBytes( fmtSignBmp, (int)strlen(fmtSignBmp) ); - - // write file header -- strm.putDWord( fileSize ); // file size -+ strm.putDWord( validateToInt(fileSize) ); // file size - strm.putDWord( 0 ); - strm.putDWord( headerSize ); - -diff --git a/modules/imgcodecs/src/grfmt_exr.cpp b/modules/imgcodecs/src/grfmt_exr.cpp -index 0d2ae9fa7d2..78ffe6c7668 100644 ---- a/modules/imgcodecs/src/grfmt_exr.cpp -+++ b/modules/imgcodecs/src/grfmt_exr.cpp -@@ -195,7 +195,7 @@ bool ExrDecoder::readData( Mat& img ) - bool color = img.channels() > 1; - - uchar* data = img.ptr(); -- int step = img.step; -+ size_t step = img.step; - bool justcopy = m_native_depth; - bool chromatorgb = false; - bool rgbtogray = false; -@@ -203,8 +203,8 @@ bool ExrDecoder::readData( Mat& img ) - FrameBuffer frame; - int xsample[3] = {1, 1, 1}; - char *buffer; -- int xstep; -- int ystep; -+ size_t xstep = 0; -+ size_t ystep = 0; - - xstep = m_native_depth ? 4 : 1; - -@@ -593,7 +593,7 @@ bool ExrEncoder::write( const Mat& img, const std::vector<int>& ) - bool issigned = depth == CV_8S || depth == CV_16S || depth == CV_32S; - bool isfloat = depth == CV_32F || depth == CV_64F; - depth = CV_ELEM_SIZE1(depth)*8; -- const int step = img.step; -+ const size_t step = img.step; - - Header header( width, height ); - Imf::PixelType type; -@@ -623,7 +623,7 @@ bool ExrEncoder::write( const Mat& img, const std::vector<int>& ) - FrameBuffer frame; - - char *buffer; -- int bufferstep; -+ size_t bufferstep; - int size; - if( type == FLOAT && depth == 32 ) - { -diff --git a/modules/imgcodecs/src/grfmt_jpeg.cpp b/modules/imgcodecs/src/grfmt_jpeg.cpp -index ce942ca1995..caf768d2569 100644 ---- a/modules/imgcodecs/src/grfmt_jpeg.cpp -+++ b/modules/imgcodecs/src/grfmt_jpeg.cpp -@@ -396,7 +396,7 @@ int my_jpeg_load_dht (struct jpeg_decompress_struct *info, unsigned char *dht, - bool JpegDecoder::readData( Mat& img ) - { - volatile bool result = false; -- int step = (int)img.step; -+ size_t step = img.step; - bool color = img.channels() > 1; - - if( m_state && m_width && m_height ) -diff --git a/modules/imgcodecs/src/grfmt_jpeg2000.cpp b/modules/imgcodecs/src/grfmt_jpeg2000.cpp -index 950ec21375f..24dfb38bb9d 100644 ---- a/modules/imgcodecs/src/grfmt_jpeg2000.cpp -+++ b/modules/imgcodecs/src/grfmt_jpeg2000.cpp -@@ -156,7 +156,7 @@ bool Jpeg2KDecoder::readData( Mat& img ) - bool result = false; - int color = img.channels() > 1; - uchar* data = img.ptr(); -- int step = (int)img.step; -+ size_t step = img.step; - jas_stream_t* stream = (jas_stream_t*)m_stream; - jas_image_t* image = (jas_image_t*)m_image; - -@@ -252,9 +252,9 @@ bool Jpeg2KDecoder::readData( Mat& img ) - if( !jas_image_readcmpt( image, cmptlut[i], 0, 0, xend / xstep, yend / ystep, buffer )) - { - if( img.depth() == CV_8U ) -- result = readComponent8u( data + i, buffer, step, cmptlut[i], maxval, offset, ncmpts ); -+ result = readComponent8u( data + i, buffer, validateToInt(step), cmptlut[i], maxval, offset, ncmpts ); - else -- result = readComponent16u( ((unsigned short *)data) + i, buffer, step / 2, cmptlut[i], maxval, offset, ncmpts ); -+ result = readComponent16u( ((unsigned short *)data) + i, buffer, validateToInt(step / 2), cmptlut[i], maxval, offset, ncmpts ); - if( !result ) - { - i = ncmpts; -diff --git a/modules/imgcodecs/src/grfmt_pam.cpp b/modules/imgcodecs/src/grfmt_pam.cpp -index 11195dc342c..8eb9e012309 100644 ---- a/modules/imgcodecs/src/grfmt_pam.cpp -+++ b/modules/imgcodecs/src/grfmt_pam.cpp -@@ -479,7 +479,7 @@ bool PAMDecoder::readData( Mat& img ) - { - uchar* data = img.ptr(); - int target_channels = img.channels(); -- int imp_stride = (int)img.step; -+ size_t imp_stride = img.step; - int sample_depth = CV_ELEM_SIZE1(m_type); - int src_elems_per_row = m_width*m_channels; - int src_stride = src_elems_per_row*sample_depth; -diff --git a/modules/imgcodecs/src/grfmt_sunras.cpp b/modules/imgcodecs/src/grfmt_sunras.cpp -index aca9b369318..6d448f94ed3 100644 ---- a/modules/imgcodecs/src/grfmt_sunras.cpp -+++ b/modules/imgcodecs/src/grfmt_sunras.cpp -@@ -160,7 +160,7 @@ bool SunRasterDecoder::readData( Mat& img ) - { - int color = img.channels() > 1; - uchar* data = img.ptr(); -- int step = (int)img.step; -+ size_t step = img.step; - uchar gray_palette[256] = {0}; - bool result = false; - int src_pitch = ((m_width*m_bpp + 7)/8 + 1) & -2; -@@ -308,11 +308,11 @@ bool SunRasterDecoder::readData( Mat& img ) - code = m_strm.getByte(); - - if( color ) -- data = FillUniColor( data, line_end, step, width3, -+ data = FillUniColor( data, line_end, validateToInt(step), width3, - y, m_height, len, - m_palette[code] ); - else -- data = FillUniGray( data, line_end, step, width3, -+ data = FillUniGray( data, line_end, validateToInt(step), width3, - y, m_height, len, - gray_palette[code] ); - if( y >= m_height ) -diff --git a/modules/imgcodecs/src/utils.cpp b/modules/imgcodecs/src/utils.cpp -index 2ee5bafc712..474dae008ca 100644 ---- a/modules/imgcodecs/src/utils.cpp -+++ b/modules/imgcodecs/src/utils.cpp -@@ -42,6 +42,13 @@ - #include "precomp.hpp" - #include "utils.hpp" - -+int validateToInt(size_t sz) -+{ -+ int valueInt = (int)sz; -+ CV_Assert((size_t)valueInt == sz); -+ return valueInt; -+} -+ - #define SCALE 14 - #define cR (int)(0.299*(1 << SCALE) + 0.5) - #define cG (int)(0.587*(1 << SCALE) + 0.5) -@@ -537,23 +544,25 @@ uchar* FillColorRow1( uchar* data, uchar* indices, int len, PaletteEntry* palett - { - uchar* end = data + len*3; - -+ const PaletteEntry p0 = palette[0], p1 = palette[1]; -+ - while( (data += 24) < end ) - { - int idx = *indices++; -- *((PaletteEntry*)(data - 24)) = palette[(idx & 128) != 0]; -- *((PaletteEntry*)(data - 21)) = palette[(idx & 64) != 0]; -- *((PaletteEntry*)(data - 18)) = palette[(idx & 32) != 0]; -- *((PaletteEntry*)(data - 15)) = palette[(idx & 16) != 0]; -- *((PaletteEntry*)(data - 12)) = palette[(idx & 8) != 0]; -- *((PaletteEntry*)(data - 9)) = palette[(idx & 4) != 0]; -- *((PaletteEntry*)(data - 6)) = palette[(idx & 2) != 0]; -- *((PaletteEntry*)(data - 3)) = palette[(idx & 1) != 0]; -+ *((PaletteEntry*)(data - 24)) = (idx & 128) ? p1 : p0; -+ *((PaletteEntry*)(data - 21)) = (idx & 64) ? p1 : p0; -+ *((PaletteEntry*)(data - 18)) = (idx & 32) ? p1 : p0; -+ *((PaletteEntry*)(data - 15)) = (idx & 16) ? p1 : p0; -+ *((PaletteEntry*)(data - 12)) = (idx & 8) ? p1 : p0; -+ *((PaletteEntry*)(data - 9)) = (idx & 4) ? p1 : p0; -+ *((PaletteEntry*)(data - 6)) = (idx & 2) ? p1 : p0; -+ *((PaletteEntry*)(data - 3)) = (idx & 1) ? p1 : p0; - } - -- int idx = indices[0] << 24; -+ int idx = indices[0]; - for( data -= 24; data < end; data += 3, idx += idx ) - { -- PaletteEntry clr = palette[idx < 0]; -+ const PaletteEntry clr = (idx & 128) ? p1 : p0; - WRITE_PIX( data, clr ); - } - -@@ -565,23 +574,25 @@ uchar* FillGrayRow1( uchar* data, uchar* indices, int len, uchar* palette ) - { - uchar* end = data + len; - -+ const uchar p0 = palette[0], p1 = palette[1]; -+ - while( (data += 8) < end ) - { - int idx = *indices++; -- *((uchar*)(data - 8)) = palette[(idx & 128) != 0]; -- *((uchar*)(data - 7)) = palette[(idx & 64) != 0]; -- *((uchar*)(data - 6)) = palette[(idx & 32) != 0]; -- *((uchar*)(data - 5)) = palette[(idx & 16) != 0]; -- *((uchar*)(data - 4)) = palette[(idx & 8) != 0]; -- *((uchar*)(data - 3)) = palette[(idx & 4) != 0]; -- *((uchar*)(data - 2)) = palette[(idx & 2) != 0]; -- *((uchar*)(data - 1)) = palette[(idx & 1) != 0]; -+ *((uchar*)(data - 8)) = (idx & 128) ? p1 : p0; -+ *((uchar*)(data - 7)) = (idx & 64) ? p1 : p0; -+ *((uchar*)(data - 6)) = (idx & 32) ? p1 : p0; -+ *((uchar*)(data - 5)) = (idx & 16) ? p1 : p0; -+ *((uchar*)(data - 4)) = (idx & 8) ? p1 : p0; -+ *((uchar*)(data - 3)) = (idx & 4) ? p1 : p0; -+ *((uchar*)(data - 2)) = (idx & 2) ? p1 : p0; -+ *((uchar*)(data - 1)) = (idx & 1) ? p1 : p0; - } - -- int idx = indices[0] << 24; -+ int idx = indices[0]; - for( data -= 8; data < end; data++, idx += idx ) - { -- data[0] = palette[idx < 0]; -+ data[0] = (idx & 128) ? p1 : p0; - } - - return data; -diff --git a/modules/imgcodecs/src/utils.hpp b/modules/imgcodecs/src/utils.hpp -index cab10609db2..7af4c6174ee 100644 ---- a/modules/imgcodecs/src/utils.hpp -+++ b/modules/imgcodecs/src/utils.hpp -@@ -42,6 +42,8 @@ - #ifndef _UTILS_H_ - #define _UTILS_H_ - -+int validateToInt(size_t step); -+ - struct PaletteEntry - { - unsigned char b, g, r, a; diff --git a/meta-oe/recipes-support/opencv/opencv/already-exists.patch b/meta-oe/recipes-support/opencv/opencv/already-exists.patch deleted file mode 100644 index 6e24f2de87..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/already-exists.patch +++ /dev/null @@ -1,394 +0,0 @@ -From e4bf148cddf277834e57c9afeec8daff8378a655 Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> -Date: Wed, 22 Nov 2017 15:27:07 +0100 -Subject: [PATCH] Fix: File already exists in database: caffe.proto - -Fixes error when importing python cv - -Upstream-status: Backport https://github.com/opencv/opencv/pull/10092 -Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> ---- - modules/dnn/CMakeLists.txt | 6 +++--- - modules/dnn/src/caffe/caffe_importer.cpp | 1 - - modules/dnn/src/caffe/caffe_io.cpp | 1 - - modules/dnn/src/caffe/caffe_io.hpp | 2 +- - modules/dnn/src/caffe/{caffe.proto => opencv-caffe.proto} | 0 - 5 files changed, 4 insertions(+), 6 deletions(-) - rename modules/dnn/src/caffe/{caffe.proto => opencv-caffe.proto} (100%) - -diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt -index c6329a742263..8ef00ef983ff 100644 ---- a/modules/dnn/CMakeLists.txt -+++ b/modules/dnn/CMakeLists.txt -@@ -55,13 +55,13 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS - - if(PROTOBUF_UPDATE_FILES) - file(GLOB proto_files src/tensorflow/*.proto) -- list(APPEND proto_files src/caffe/caffe.proto) -+ list(APPEND proto_files src/caffe/opencv-caffe.proto) - PROTOBUF_GENERATE_CPP(Protobuf_HDRS Protobuf_SRCS ${proto_files}) - else() - file(GLOB fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow/*.cc) - file(GLOB fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow/*.h) -- list(APPEND fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/caffe.pb.cc) -- list(APPEND fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/caffe.pb.h) -+ list(APPEND fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/opencv-caffe.pb.cc) -+ list(APPEND fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/opencv-caffe.pb.h) - list(APPEND Protobuf_SRCS ${fw_srcs}) - list(APPEND Protobuf_HDRS ${fw_hdrs}) - list(APPEND Protobuf_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe) -diff --git a/modules/dnn/src/caffe/caffe_importer.cpp b/modules/dnn/src/caffe/caffe_importer.cpp -index c075651b95b3..2c977c84b0f4 100644 ---- a/modules/dnn/src/caffe/caffe_importer.cpp -+++ b/modules/dnn/src/caffe/caffe_importer.cpp -@@ -42,7 +42,6 @@ - #include "../precomp.hpp" - - #ifdef HAVE_PROTOBUF --#include "caffe.pb.h" - - #include <iostream> - #include <fstream> -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp -index 0f46ea77df9a..1d3c518f1328 100644 ---- a/modules/dnn/src/caffe/caffe_io.cpp -+++ b/modules/dnn/src/caffe/caffe_io.cpp -@@ -99,7 +99,6 @@ - #include <fstream> - #include <vector> - --#include "caffe.pb.h" - #include "caffe_io.hpp" - #include "glog_emulator.hpp" - -diff --git a/modules/dnn/src/caffe/caffe_io.hpp b/modules/dnn/src/caffe/caffe_io.hpp -index 09bc5709a24e..f5912c3bcec1 100644 ---- a/modules/dnn/src/caffe/caffe_io.hpp -+++ b/modules/dnn/src/caffe/caffe_io.hpp -@@ -91,7 +91,7 @@ - #define __OPENCV_DNN_CAFFE_IO_HPP__ - #ifdef HAVE_PROTOBUF - --#include "caffe.pb.h" -+#include "opencv-caffe.pb.h" - - namespace cv { - namespace dnn { -diff --git a/modules/dnn/src/caffe/caffe.proto b/modules/dnn/src/caffe/opencv-caffe.proto -similarity index 100% -rename from modules/dnn/src/caffe/caffe.proto -rename to modules/dnn/src/caffe/opencv-caffe.proto -diff --git a/modules/dnn/src/layers/detection_output_layer.cpp b/modules/dnn/src/layers/detection_output_layer.cpp -index 0b72326f7e7d..f413bad5b81a 100644 ---- a/modules/dnn/src/layers/detection_output_layer.cpp -+++ b/modules/dnn/src/layers/detection_output_layer.cpp -@@ -44,7 +44,7 @@ - #include "layers_common.hpp" - #include <float.h> - #include <string> --#include <caffe.pb.h> -+#include <opencv-caffe.pb.h> - - namespace cv - { -diff --git a/modules/dnn/src/caffe/caffe_importer.cpp b/modules/dnn/src/caffe/caffe_importer.cpp -index 2c977c84b0f4..a1827a381117 100644 ---- a/modules/dnn/src/caffe/caffe_importer.cpp -+++ b/modules/dnn/src/caffe/caffe_importer.cpp -@@ -78,8 +78,8 @@ static cv::String toString(const T &v) - - class CaffeImporter : public Importer - { -- caffe::NetParameter net; -- caffe::NetParameter netBinary; -+ opencvcaffe::NetParameter net; -+ opencvcaffe::NetParameter netBinary; - - public: - -@@ -197,7 +197,7 @@ public: - } - } - -- void blobShapeFromProto(const caffe::BlobProto &pbBlob, MatShape& shape) -+ void blobShapeFromProto(const opencvcaffe::BlobProto &pbBlob, MatShape& shape) - { - shape.clear(); - if (pbBlob.has_num() || pbBlob.has_channels() || pbBlob.has_height() || pbBlob.has_width()) -@@ -209,7 +209,7 @@ public: - } - else if (pbBlob.has_shape()) - { -- const caffe::BlobShape &_shape = pbBlob.shape(); -+ const opencvcaffe::BlobShape &_shape = pbBlob.shape(); - - for (int i = 0; i < _shape.dim_size(); i++) - shape.push_back((int)_shape.dim(i)); -@@ -218,7 +218,7 @@ public: - CV_Error(Error::StsError, "Unknown shape of input blob"); - } - -- void blobFromProto(const caffe::BlobProto &pbBlob, cv::Mat &dstBlob) -+ void blobFromProto(const opencvcaffe::BlobProto &pbBlob, cv::Mat &dstBlob) - { - MatShape shape; - blobShapeFromProto(pbBlob, shape); -@@ -233,7 +233,7 @@ public: - dstData[i] = pbBlob.data(i); - } - -- void extractBinaryLayerParms(const caffe::LayerParameter& layer, LayerParams& layerParams) -+ void extractBinaryLayerParms(const opencvcaffe::LayerParameter& layer, LayerParams& layerParams) - { - const std::string &name = layer.name(); - -@@ -247,7 +247,7 @@ public: - if (li == netBinary.layer_size() || netBinary.layer(li).blobs_size() == 0) - return; - -- const caffe::LayerParameter &binLayer = netBinary.layer(li); -+ const opencvcaffe::LayerParameter &binLayer = netBinary.layer(li); - layerParams.blobs.resize(binLayer.blobs_size()); - for (int bi = 0; bi < binLayer.blobs_size(); bi++) - { -@@ -289,7 +289,7 @@ public: - - for (int li = 0; li < layersSize; li++) - { -- const caffe::LayerParameter &layer = net.layer(li); -+ const opencvcaffe::LayerParameter &layer = net.layer(li); - String name = layer.name(); - String type = layer.type(); - LayerParams layerParams; -@@ -313,7 +313,7 @@ public: - addedBlobs.clear(); - } - -- void addOutput(const caffe::LayerParameter &layer, int layerId, int outNum) -+ void addOutput(const opencvcaffe::LayerParameter &layer, int layerId, int outNum) - { - const std::string &name = layer.top(outNum); - -diff --git a/modules/dnn/src/caffe/caffe_io.hpp b/modules/dnn/src/caffe/caffe_io.hpp -index f5912c3bcec1..24cd5fa254eb 100644 ---- a/modules/dnn/src/caffe/caffe_io.hpp -+++ b/modules/dnn/src/caffe/caffe_io.hpp -@@ -98,9 +98,9 @@ namespace dnn { - - // Read parameters from a file into a NetParameter proto message. - void ReadNetParamsFromTextFileOrDie(const char* param_file, -- caffe::NetParameter* param); -+ opencvcaffe::NetParameter* param); - void ReadNetParamsFromBinaryFileOrDie(const char* param_file, -- caffe::NetParameter* param); -+ opencvcaffe::NetParameter* param); - - } - } -diff --git a/modules/dnn/src/caffe/opencv-caffe.proto b/modules/dnn/src/caffe/opencv-caffe.proto -index 3d23fb48ea6a..df4e1d3269ae 100644 ---- a/modules/dnn/src/caffe/opencv-caffe.proto -+++ b/modules/dnn/src/caffe/opencv-caffe.proto -@@ -48,7 +48,7 @@ - - syntax = "proto2"; - --package caffe; -+package opencvcaffe; - - // Specifies the shape (dimensions) of a Blob. - message BlobShape { -diff --git a/modules/dnn/src/layers/detection_output_layer.cpp b/modules/dnn/src/layers/detection_output_layer.cpp -index f413bad5b81a..832c257eebf9 100644 ---- a/modules/dnn/src/layers/detection_output_layer.cpp -+++ b/modules/dnn/src/layers/detection_output_layer.cpp -@@ -72,7 +72,7 @@ public: - - int _backgroundLabelId; - -- typedef caffe::PriorBoxParameter_CodeType CodeType; -+ typedef opencvcaffe::PriorBoxParameter_CodeType CodeType; - CodeType _codeType; - - bool _varianceEncodedInTarget; -@@ -85,7 +85,7 @@ public: - enum { _numAxes = 4 }; - static const std::string _layerName; - -- typedef std::map<int, std::vector<caffe::NormalizedBBox> > LabelBBox; -+ typedef std::map<int, std::vector<opencvcaffe::NormalizedBBox> > LabelBBox; - - bool getParameterDict(const LayerParams ¶ms, - const std::string ¶meterName, -@@ -131,11 +131,11 @@ public: - { - String codeTypeString = params.get<String>("code_type").toLowerCase(); - if (codeTypeString == "corner") -- _codeType = caffe::PriorBoxParameter_CodeType_CORNER; -+ _codeType = opencvcaffe::PriorBoxParameter_CodeType_CORNER; - else if (codeTypeString == "center_size") -- _codeType = caffe::PriorBoxParameter_CodeType_CENTER_SIZE; -+ _codeType = opencvcaffe::PriorBoxParameter_CodeType_CENTER_SIZE; - else -- _codeType = caffe::PriorBoxParameter_CodeType_CORNER; -+ _codeType = opencvcaffe::PriorBoxParameter_CodeType_CORNER; - } - - DetectionOutputLayerImpl(const LayerParams ¶ms) -@@ -215,7 +215,7 @@ public: - GetConfidenceScores(confidenceData, num, numPriors, _numClasses, allConfidenceScores); - - // Retrieve all prior bboxes -- std::vector<caffe::NormalizedBBox> priorBBoxes; -+ std::vector<opencvcaffe::NormalizedBBox> priorBBoxes; - std::vector<std::vector<float> > priorVariances; - GetPriorBBoxes(priorData, numPriors, priorBBoxes, priorVariances); - -@@ -272,7 +272,7 @@ public: - for (size_t j = 0; j < indices.size(); ++j, ++count) - { - int idx = indices[j]; -- const caffe::NormalizedBBox& decode_bbox = label_bboxes->second[idx]; -+ const opencvcaffe::NormalizedBBox& decode_bbox = label_bboxes->second[idx]; - outputsData[count * 7] = i; - outputsData[count * 7 + 1] = label; - outputsData[count * 7 + 2] = scores[idx]; -@@ -355,7 +355,7 @@ public: - - // Compute bbox size - template<bool normalized> -- static float BBoxSize(const caffe::NormalizedBBox& bbox) -+ static float BBoxSize(const opencvcaffe::NormalizedBBox& bbox) - { - if (bbox.xmax() < bbox.xmin() || bbox.ymax() < bbox.ymin()) - { -@@ -388,10 +388,10 @@ public: - // Decode a bbox according to a prior bbox - template<bool variance_encoded_in_target> - static void DecodeBBox( -- const caffe::NormalizedBBox& prior_bbox, const std::vector<float>& prior_variance, -+ const opencvcaffe::NormalizedBBox& prior_bbox, const std::vector<float>& prior_variance, - const CodeType code_type, -- const bool clip_bbox, const caffe::NormalizedBBox& bbox, -- caffe::NormalizedBBox& decode_bbox) -+ const bool clip_bbox, const opencvcaffe::NormalizedBBox& bbox, -+ opencvcaffe::NormalizedBBox& decode_bbox) - { - float bbox_xmin = variance_encoded_in_target ? bbox.xmin() : prior_variance[0] * bbox.xmin(); - float bbox_ymin = variance_encoded_in_target ? bbox.ymin() : prior_variance[1] * bbox.ymin(); -@@ -399,13 +399,13 @@ public: - float bbox_ymax = variance_encoded_in_target ? bbox.ymax() : prior_variance[3] * bbox.ymax(); - switch(code_type) - { -- case caffe::PriorBoxParameter_CodeType_CORNER: -+ case opencvcaffe::PriorBoxParameter_CodeType_CORNER: - decode_bbox.set_xmin(prior_bbox.xmin() + bbox_xmin); - decode_bbox.set_ymin(prior_bbox.ymin() + bbox_ymin); - decode_bbox.set_xmax(prior_bbox.xmax() + bbox_xmax); - decode_bbox.set_ymax(prior_bbox.ymax() + bbox_ymax); - break; -- case caffe::PriorBoxParameter_CodeType_CENTER_SIZE: -+ case opencvcaffe::PriorBoxParameter_CodeType_CENTER_SIZE: - { - float prior_width = prior_bbox.xmax() - prior_bbox.xmin(); - CV_Assert(prior_width > 0); -@@ -431,7 +431,7 @@ public: - }; - if (clip_bbox) - { -- // Clip the caffe::NormalizedBBox such that the range for each corner is [0, 1] -+ // Clip the opencvcaffe::NormalizedBBox such that the range for each corner is [0, 1] - decode_bbox.set_xmin(std::max(std::min(decode_bbox.xmin(), 1.f), 0.f)); - decode_bbox.set_ymin(std::max(std::min(decode_bbox.ymin(), 1.f), 0.f)); - decode_bbox.set_xmax(std::max(std::min(decode_bbox.xmax(), 1.f), 0.f)); -@@ -443,11 +443,11 @@ public: - - // Decode a set of bboxes according to a set of prior bboxes - static void DecodeBBoxes( -- const std::vector<caffe::NormalizedBBox>& prior_bboxes, -+ const std::vector<opencvcaffe::NormalizedBBox>& prior_bboxes, - const std::vector<std::vector<float> >& prior_variances, - const CodeType code_type, const bool variance_encoded_in_target, -- const bool clip_bbox, const std::vector<caffe::NormalizedBBox>& bboxes, -- std::vector<caffe::NormalizedBBox>& decode_bboxes) -+ const bool clip_bbox, const std::vector<opencvcaffe::NormalizedBBox>& bboxes, -+ std::vector<opencvcaffe::NormalizedBBox>& decode_bboxes) - { - CV_Assert(prior_bboxes.size() == prior_variances.size()); - CV_Assert(prior_bboxes.size() == bboxes.size()); -@@ -470,7 +470,7 @@ public: - - // Decode all bboxes in a batch - static void DecodeBBoxesAll(const std::vector<LabelBBox>& all_loc_preds, -- const std::vector<caffe::NormalizedBBox>& prior_bboxes, -+ const std::vector<opencvcaffe::NormalizedBBox>& prior_bboxes, - const std::vector<std::vector<float> >& prior_variances, - const int num, const bool share_location, - const int num_loc_classes, const int background_label_id, -@@ -503,10 +503,10 @@ public: - // Get prior bounding boxes from prior_data - // prior_data: 1 x 2 x num_priors * 4 x 1 blob. - // num_priors: number of priors. -- // prior_bboxes: stores all the prior bboxes in the format of caffe::NormalizedBBox. -+ // prior_bboxes: stores all the prior bboxes in the format of opencvcaffe::NormalizedBBox. - // prior_variances: stores all the variances needed by prior bboxes. - static void GetPriorBBoxes(const float* priorData, const int& numPriors, -- std::vector<caffe::NormalizedBBox>& priorBBoxes, -+ std::vector<opencvcaffe::NormalizedBBox>& priorBBoxes, - std::vector<std::vector<float> >& priorVariances) - { - priorBBoxes.clear(); priorBBoxes.resize(numPriors); -@@ -514,7 +514,7 @@ public: - for (int i = 0; i < numPriors; ++i) - { - int startIdx = i * 4; -- caffe::NormalizedBBox& bbox = priorBBoxes[i]; -+ opencvcaffe::NormalizedBBox& bbox = priorBBoxes[i]; - bbox.set_xmin(priorData[startIdx]); - bbox.set_ymin(priorData[startIdx + 1]); - bbox.set_xmax(priorData[startIdx + 2]); -@@ -565,7 +565,7 @@ public: - { - labelBBox[label].resize(numPredsPerClass); - } -- caffe::NormalizedBBox& bbox = labelBBox[label][p]; -+ opencvcaffe::NormalizedBBox& bbox = labelBBox[label][p]; - bbox.set_xmin(locData[startIdx + c * 4]); - bbox.set_ymin(locData[startIdx + c * 4 + 1]); - bbox.set_xmax(locData[startIdx + c * 4 + 2]); -@@ -612,7 +612,7 @@ public: - // nms_threshold: a threshold used in non maximum suppression. - // top_k: if not -1, keep at most top_k picked indices. - // indices: the kept indices of bboxes after nms. -- static void ApplyNMSFast(const std::vector<caffe::NormalizedBBox>& bboxes, -+ static void ApplyNMSFast(const std::vector<opencvcaffe::NormalizedBBox>& bboxes, - const std::vector<float>& scores, const float score_threshold, - const float nms_threshold, const float eta, const int top_k, - std::vector<int>& indices) -@@ -674,10 +674,10 @@ public: - - // Compute the jaccard (intersection over union IoU) overlap between two bboxes. - template<bool normalized> -- static float JaccardOverlap(const caffe::NormalizedBBox& bbox1, -- const caffe::NormalizedBBox& bbox2) -+ static float JaccardOverlap(const opencvcaffe::NormalizedBBox& bbox1, -+ const opencvcaffe::NormalizedBBox& bbox2) - { -- caffe::NormalizedBBox intersect_bbox; -+ opencvcaffe::NormalizedBBox intersect_bbox; - if (bbox2.xmin() > bbox1.xmax() || bbox2.xmax() < bbox1.xmin() || - bbox2.ymin() > bbox1.ymax() || bbox2.ymax() < bbox1.ymin()) - { -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp -index 1d3c518f1328..3cf6e255aa60 100644 ---- a/modules/dnn/src/caffe/caffe_io.cpp -+++ b/modules/dnn/src/caffe/caffe_io.cpp -@@ -107,7 +107,7 @@ namespace dnn { - - using std::string; - using std::map; --using namespace caffe; -+using namespace opencvcaffe; - using namespace ::google::protobuf; - using namespace ::google::protobuf::io; - diff --git a/meta-oe/recipes-support/opencv/opencv/download.patch b/meta-oe/recipes-support/opencv/opencv/download.patch new file mode 100644 index 0000000000..33ac483123 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/download.patch @@ -0,0 +1,41 @@ +From b18a280fab06a680d9f831bf8b462647f3cb6214 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Thu, 9 Jan 2020 16:24:24 +0000 +Subject: [PATCH] opencv: abort configure if we need to download + +This CMake module will download files during do_configure. This is bad as it +means we can't do offline builds. + +Add an option to disallow downloads by emitting a fatal error. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +--- + cmake/OpenCVDownload.cmake | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake +index 63cf6d3238..4acf477f70 100644 +--- a/cmake/OpenCVDownload.cmake ++++ b/cmake/OpenCVDownload.cmake +@@ -14,6 +14,7 @@ + # RELATIVE_URL - if set, then URL is treated as a base, and FILENAME will be appended to it + # Note: uses OPENCV_DOWNLOAD_PATH folder as cache, default is <opencv>/.cache + ++set(OPENCV_ALLOW_DOWNLOADS ON CACHE BOOL "Allow downloads") + set(HELP_OPENCV_DOWNLOAD_PATH "Cache directory for downloaded files") + if(DEFINED ENV{OPENCV_DOWNLOAD_PATH}) + set(OPENCV_DOWNLOAD_PATH "$ENV{OPENCV_DOWNLOAD_PATH}" CACHE PATH "${HELP_OPENCV_DOWNLOAD_PATH}") +@@ -156,6 +157,11 @@ function(ocv_download) + + # Download + if(NOT EXISTS "${CACHE_CANDIDATE}") ++ if(NOT OPENCV_ALLOW_DOWNLOADS) ++ message(FATAL_ERROR "Not going to download ${DL_FILENAME}") ++ return() ++ endif() ++ + ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"") + foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST}) + ocv_download_log("#try ${try}") diff --git a/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch b/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch deleted file mode 100644 index 3aeda7d443..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake -index b8cb8777c06b..75281ee964fd 100644 ---- a/cmake/OpenCVGenPkgconfig.cmake -+++ b/cmake/OpenCVGenPkgconfig.cmake -@@ -27,7 +27,7 @@ macro(fix_prefix lst isown) - get_filename_component(libdir "${item}" PATH) - get_filename_component(libname "${item}" NAME_WE) - string(REGEX REPLACE "^lib(.*)" "\\1" libname "${libname}") -- list(APPEND _lst "-L${libdir}" "-l${libname}") -+ list(APPEND _lst "-l${libname}") - else() - list(APPEND _lst "-l${item}") - endif() -@@ -66,10 +66,14 @@ ocv_list_unique(_3rdparty) - - set(OPENCV_PC_LIBS - "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}" -+ "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}" - "${_modules}" - ) - if (BUILD_SHARED_LIBS) -- set(OPENCV_PC_LIBS_PRIVATE "${_extra}") -+ set(OPENCV_PC_LIBS_PRIVATE -+ "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}" -+ "${_extra}" -+ ) - else() - set(OPENCV_PC_LIBS_PRIVATE - "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}" diff --git a/meta-oe/recipes-support/opencv/opencv/javagen.patch b/meta-oe/recipes-support/opencv/opencv/javagen.patch deleted file mode 100644 index 56526ecd80..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/javagen.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstream-status: Inappropriate [OE specific] https://github.com/opencv/opencv/pull/10039#issuecomment-342539288 - -Signed-off-by: Ricardo Ribalda <ricardo.ribalda@gmail.com> -diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt -index 74bc0ef04169..4622fbf9a5f1 100644 ---- a/modules/java/CMakeLists.txt -+++ b/modules/java/CMakeLists.txt -@@ -291,7 +291,7 @@ foreach(java_file ${step3_input_files}) - endif() - if(__configure) - configure_file("${java_file}" "${java_src_dir}/${output_name}" @ONLY) -- elseif(NOT "${java_file}" MATCHES "${OpenCV_BINARY_DIR}/") -+ elseif(EXISTS "${java_file}" AND NOT "${java_file}" MATCHES "${OpenCV_BINARY_DIR}/") - configure_file("${java_file}" "${java_src_dir}/${output_name}" COPYONLY) - else() - add_custom_command(OUTPUT "${java_src_dir}/${output_name}" diff --git a/meta-oe/recipes-support/opencv/opencv/protobuf.patch b/meta-oe/recipes-support/opencv/opencv/protobuf.patch deleted file mode 100644 index c63dc142ea..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/protobuf.patch +++ /dev/null @@ -1,57 +0,0 @@ -Upstream-status: Inappropriate [OE specific] - -Signed-off-by: Ricardo Ribalda <ricardo.ribalda@gmail.com> -diff --git a/cmake/OpenCVFindLibProtobuf.cmake b/cmake/OpenCVFindLibProtobuf.cmake -index b6ce1e7fd56b..e916ec0df2a6 100644 ---- a/cmake/OpenCVFindLibProtobuf.cmake -+++ b/cmake/OpenCVFindLibProtobuf.cmake -@@ -7,21 +7,21 @@ OCV_OPTION(BUILD_PROTOBUF "Force to build libprotobuf from sources" ON) - OCV_OPTION(PROTOBUF_UPDATE_FILES "Force to rebuild .proto files" OFF) - - if(PROTOBUF_UPDATE_FILES) -- if(NOT DEFINED Protobuf_PROTOC_EXECUTABLE) -+ if(NOT DEFINED PROTOBUF_PROTOC_EXECUTABLE) - find_package(Protobuf QUIET) - endif() -- if(DEFINED Protobuf_PROTOC_EXECUTABLE AND EXISTS ${Protobuf_PROTOC_EXECUTABLE}) -- message(STATUS "The protocol buffer compiler is found (${Protobuf_PROTOC_EXECUTABLE})") -+ if(DEFINED PROTOBUF_PROTOC_EXECUTABLE AND EXISTS ${PROTOBUF_PROTOC_EXECUTABLE}) -+ message(STATUS "The protocol buffer compiler is found (${PROTOBUF_PROTOC_EXECUTABLE})") - else() -- message(FATAL_ERROR "The protocol buffer compiler is not found (Protobuf_PROTOC_EXECUTABLE='${Protobuf_PROTOC_EXECUTABLE}')") -+ message(FATAL_ERROR "The protocol buffer compiler is not found (PROTOBUF_PROTOC_EXECUTABLE='${PROTOBUF_PROTOC_EXECUTABLE}')") - endif() - endif() - --if(NOT BUILD_PROTOBUF AND NOT (DEFINED Protobuf_INCLUDE_DIRS AND DEFINED Protobuf_LIBRARIES)) -+if(NOT BUILD_PROTOBUF AND NOT (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF_LIBRARIES)) - find_package(Protobuf QUIET) - endif() - --if(Protobuf_FOUND) -+if(PROTOBUF_FOUND OR (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF_LIBRARIES)) - # nothing - else() - set(Protobuf_LIBRARIES libprotobuf) -diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt -index 2a71568d1a44..c6329a742263 100644 ---- a/modules/dnn/CMakeLists.txt -+++ b/modules/dnn/CMakeLists.txt -@@ -7,7 +7,7 @@ if(DEFINED BUILD_opencv_dnn AND NOT BUILD_opencv_dnn) - endif() - - include(${OpenCV_SOURCE_DIR}/cmake/OpenCVFindLibProtobuf.cmake) --if(NOT Protobuf_FOUND) -+if(NOT PROTOBUF_FOUND) - ocv_module_disable(opencv_dnn) - endif() - -@@ -72,7 +72,7 @@ ocv_source_group("Src\\protobuf" FILES ${Protobuf_SRCS} ${Protobuf_HDRS}) - ocv_module_include_directories(include ${Protobuf_INCLUDE_DIRS}) - - ocv_glob_module_sources(${Protobuf_SRCS} ${Protobuf_HDRS} ${CBLAS_H_PROXY_PATH}) --ocv_create_module(${Protobuf_LIBRARIES} ${LAPACK_LIBRARIES}) -+ocv_create_module(${PROTOBUF_LIBRARIES} ${LAPACK_LIBRARIES}) - ocv_add_samples() - ocv_add_accuracy_tests() - ocv_add_perf_tests() diff --git a/meta-oe/recipes-support/opencv/opencv/tinydnn.patch b/meta-oe/recipes-support/opencv/opencv/tinydnn.patch deleted file mode 100644 index c433fc312d..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/tinydnn.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-status: Inappropriate [OE specific] - -Signed-off-by: Ricardo Ribalda <ricardo.ribalda@gmail.com> -diff --git a/modules/dnn_modern/CMakeLists.txt b/modules/dnn_modern/CMakeLists.txt -index 79b64b12160b..ba06a0a163e4 100644 ---- a/modules/dnn_modern/CMakeLists.txt -+++ b/modules/dnn_modern/CMakeLists.txt -@@ -15,24 +15,8 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - # MODULE REQUIREMENTS - # ---------------------------------------------------------------------------- - --set(TINY_DNN_CPP_PATH "${OpenCV_BINARY_DIR}/3rdparty/tinydnn") --set(TINY_DNN_CPP_ROOT "${TINY_DNN_CPP_PATH}/tiny-dnn-1.0.0a3") --ocv_download(FILENAME "v1.0.0a3.tar.gz" -- HASH "adb1c512e09ca2c7a6faef36f9c53e59" -- URL -- "${OPENCV_TINY_DNN_URL}" -- "$ENV{OPENCV_TINY_DNN_URL}" -- "https://github.com/tiny-dnn/tiny-dnn/archive/" -- DESTINATION_DIR "${TINY_DNN_CPP_PATH}" -- STATUS TINY_DNN_DOWNLOAD_SUCCESS -- ID "tiny-dnn" -- UNPACK RELATIVE_URL) -- --if(NOT TINY_DNN_DOWNLOAD_SUCCESS) -- message(STATUS "Failed to download tiny-dnn sources") --endif() -- --find_package(TinyDNN QUIET) -+set(TINYDNN_INCLUDE_DIRS "${OpenCV_SOURCE_DIR}/3rdparty/tinydnn/tiny-dnn-1.0.0a3") -+set(TinyDNN_FOUND TRUE) - - include(CheckCXXCompilerFlag) - CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) diff --git a/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch b/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch deleted file mode 100644 index fc273a8911..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/modules/xfeatures2d/CMakeLists.txt b/modules/xfeatures2d/CMakeLists.txt -index e1755595..c7009c47 100644 ---- a/modules/xfeatures2d/CMakeLists.txt -+++ b/modules/xfeatures2d/CMakeLists.txt -@@ -5,10 +5,10 @@ ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d openc - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_boostdesc.cmake) - set(DOWNLOAD_DIR "${OpenCV_BINARY_DIR}/downloads/xfeatures2d") --download_boost_descriptors("${DOWNLOAD_DIR}" boost_status) --download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status) --if(NOT boost_status OR NOT vgg_status) -- ocv_module_disable(xfeatures2d) --endif() -+#download_boost_descriptors("${DOWNLOAD_DIR}" boost_status) -+#download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status) -+#if(NOT boost_status OR NOT vgg_status) -+# ocv_module_disable(xfeatures2d) -+#endif() - - ocv_module_include_directories("${DOWNLOAD_DIR}") diff --git a/meta-oe/recipes-support/opencv/opencv_3.3.bb b/meta-oe/recipes-support/opencv/opencv_3.3.bb deleted file mode 100644 index 3663d30e92..0000000000 --- a/meta-oe/recipes-support/opencv/opencv_3.3.bb +++ /dev/null @@ -1,203 +0,0 @@ -SUMMARY = "Opencv : The Open Computer Vision Library" -HOMEPAGE = "http://opencv.org/" -SECTION = "libs" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2b2f8752cc5edf504d283107d033f544" - -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" - -SRCREV_opencv = "87c27a074db9f6d9d60513f351daa903606ca370" -SRCREV_contrib = "2a9d1b22ed76eb22fad1a5edf6faf4d05f207b13" -SRCREV_ipp = "a62e20676a60ee0ad6581e217fe7e4bada3b95db" -SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" -SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" -SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59" -SRC_URI[tinydnn.sha256sum] = "e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5175846505aa18b" - -def ipp_filename(d): - import re - arch = d.getVar('TARGET_ARCH', True) - if re.match("i.86$", arch): - return "ippicv_2017u2_lnx_ia32_20170418.tgz" - else: - return "ippicv_2017u2_lnx_intel64_20170418.tgz" - -def ipp_md5sum(d): - import re - arch = d.getVar('TARGET_ARCH', True) - if re.match("i.86$", arch): - return "f2cece00d802d4dea86df52ed095257e" - else: - return "808b791a6eac9ed78d32a7666804320e" - -IPP_FILENAME = "${@ipp_filename(d)}" -IPP_MD5 = "${@ipp_md5sum(d)}" - -SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" -SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ - git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20170418;destsuffix=ipp;name=ipp \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ - https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz;destsuffix=git/3rdparty/tinydnn/tiny-dnn-1.0.0a3;name=tinydnn;unpack=false \ - file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ - file://fixpkgconfig.patch \ - file://uselocalxfeatures.patch;patchdir=../contrib/ \ - file://tinydnn.patch;patchdir=../contrib/ \ - file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ - file://0003-To-fix-errors-as-following.patch \ - file://0001-build-workaround-GCC-7.1.1-compilation-issue-with-sa.patch \ - file://0002-imgcodecs-refactoring-improve-code-quality.patch \ - file://0003-imgproc-test-add-checks-for-remove-call.patch \ - file://0001-Dont-use-isystem.patch \ - file://0001-carotene-don-t-use-__asm__-with-aarch64.patch \ - file://0002-Do-not-enable-asm-with-clang.patch \ - file://CVE-2017-14136.patch \ - file://javagen.patch \ - file://protobuf.patch \ - file://already-exists.patch \ -" -PV = "3.3+git${SRCPV}" - -S = "${WORKDIR}/git" - -do_unpack_extra() { - mkdir -p ${S}/3rdparty/tinydnn/ - tar xzf ${WORKDIR}/v1.0.0a3.tar.gz -C ${S}/3rdparty/tinydnn/ - tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} - cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src - cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src -} -addtask unpack_extra after do_unpack before do_patch - -EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ - -DWITH_1394=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DOPENCV_ICV_HASH=${IPP_MD5} \ - -DIPPROOT=${WORKDIR}/ippicv_lnx \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ - ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ -" -EXTRA_OECMAKE_append_x86 = " -DX86=ON" - -PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" - -PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," -PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," -PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," -PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," -PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," -PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," -PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," -PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," -PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," -PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," -PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," -PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," -PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," -PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," -PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," -PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," -PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," -PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," -PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," -PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," - -inherit pkgconfig cmake - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} - -export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" -export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" -export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" -export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" -export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" - -TARGET_CC_ARCH += "-I${S}/include " - -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ - ${PN}-apps" - -python populate_packages_prepend () { - cv_libdir = d.expand('${libdir}') - do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) - - pn = d.getVar('PN') - metapkg = pn + '-dev' - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - blacklist = [ metapkg ] - metapkg_rdepends = [ ] - packages = d.getVar('PACKAGES').split() - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): - metapkg_rdepends.append(pkg) - d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) - - metapkg = pn - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - blacklist = [ metapkg, "libopencv-ts" ] - metapkg_rdepends = [ ] - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): - metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) -} - -PACKAGES_DYNAMIC += "^libopencv-.*" - -FILES_${PN} = "" -FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake" -FILES_${PN}-staticdev += "${datadir}/OpenCV/3rdparty/lib/*.a" -FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV" -FILES_${PN}-java = "${datadir}/OpenCV/java" -FILES_${PN}-samples = "${datadir}/OpenCV/samples/" - -INSANE_SKIP_${PN}-java = "libdir" -INSANE_SKIP_${PN}-dbg = "libdir" - -ALLOW_EMPTY_${PN} = "1" - -SUMMARY_python-opencv = "Python bindings to opencv" -FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python-opencv = "python-core python-numpy" - -SUMMARY_python3-opencv = "Python bindings to opencv" -FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python3-opencv = "python3-core python3-numpy" - -do_install_append() { - cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/ - sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h - - # Move Python files into correct library folder (for multilib build) - if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then - mv ${D}/usr/lib/* ${D}/${libdir}/ - rm -rf ${D}/usr/lib - fi - - if ${@bb.utils.contains("PACKAGECONFIG", "samples", "true", "false", d)}; then - install -d ${D}${datadir}/OpenCV/samples/bin/ - cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/ - fi -} diff --git a/meta-oe/recipes-support/opencv/opencv_4.10.0.bb b/meta-oe/recipes-support/opencv/opencv_4.10.0.bb new file mode 100644 index 0000000000..07bdb37b75 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv_4.10.0.bb @@ -0,0 +1,210 @@ +SUMMARY = "Opencv : The Open Computer Vision Library" +HOMEPAGE = "http://opencv.org/" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" + +DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" + +SRCREV_opencv = "a7d942b681c5edd0cc27407d8e4d3dbf36c7a40e" +SRCREV_contrib = "1aab1f34815a58a5a63aee6d510fe234129754a2" +SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" +SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" +SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" +SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252" + + +SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" +SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=https \ + git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=4.x;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=git/boostdesc;name=boostdesc;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \ + git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \ + file://0003-To-fix-errors-as-following.patch \ + file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ + file://0001-Dont-use-isystem.patch \ + file://download.patch \ + file://0001-Make-ts-module-external.patch \ + file://0008-Do-not-embed-build-directory-in-binaries.patch \ + " +SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" + +S = "${WORKDIR}/git" + +# OpenCV wants to download more files during configure. We download these in +# do_fetch and construct a source cache in the format it expects +OPENCV_DLDIR = "${WORKDIR}/downloads" + +do_unpack_extra() { + + md5() { + # Return the MD5 of $1 + echo $(md5sum $1 | cut -d' ' -f1) + } + cache() { + TAG=$1 + shift + mkdir --parents ${OPENCV_DLDIR}/$TAG + for F in $*; do + DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F) + test -e $DEST || ln -s $F $DEST + done + } + cache xfeatures2d/boostdesc ${S}/boostdesc/*.i + cache xfeatures2d/vgg ${S}/vgg/*.i + cache data ${S}/face/*.dat + cache wechat_qrcode ${S}/wechat_qrcode/*.caffemodel + cache wechat_qrcode ${S}/wechat_qrcode/*.prototxt +} +addtask unpack_extra after do_unpack before do_patch + +CMAKE_VERBOSE = "VERBOSE=1" + +EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${S}/contrib/modules \ + -DWITH_1394=OFF \ + -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DWITH_IPP=OFF \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ + -DOPENCV_ALLOW_DOWNLOADS=OFF \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ +" +LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed" +LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed" + +EXTRA_OECMAKE:append:x86 = " -DX86=ON" +# disable sse4.1 and sse4.2 to fix 32bit build failure +# https://github.com/opencv/opencv/issues/21597 +EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1" + +PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ + ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)} \ + ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}" + +# TBB does not build for powerpc so disable that package config +PACKAGECONFIG:remove:powerpc = "tbb" +# tbb now needs getcontect/setcontext which is not there for all arches on musl +PACKAGECONFIG:remove:libc-musl:riscv64 = "tbb" +PACKAGECONFIG:remove:libc-musl:riscv32 = "tbb" + +PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" +PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," +PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," +PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF -DCMAKE_CXX_STANDARD=17,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," +PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," +PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," +PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," +PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," +PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," +PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," +PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," +PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," +PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," +PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," +PACKAGECONFIG[openvino] = "-DWITH_OPENVINO=ON,-DWITH_OPENVINO=OFF,openvino-inference-engine,openvino-inference-engine" +PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," +PACKAGECONFIG[python3] = "-DPYTHON3_INCLUDE_PATH=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} -DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," +PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," +PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," +PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON,-DBUILD_TESTS=OFF,," +PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," +PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," + +inherit pkgconfig cmake setuptools3-base python3native + +export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" +export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" +export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" +export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" + +TARGET_CC_ARCH += "-I${S}/include " + +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ + ${PN}-apps" + +python populate_packages:prepend () { + cv_libdir = d.expand('${libdir}') + do_split_packages(d, cv_libdir, r'^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, r'^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, r'^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) + + pn = d.getVar('PN') + metapkg = pn + '-dev' + d.setVar('ALLOW_EMPTY:' + metapkg, "1") + blacklist = [ metapkg ] + metapkg_rdepends = [ ] + packages = d.getVar('PACKAGES').split() + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): + metapkg_rdepends.append(pkg) + d.setVar('RRECOMMENDS:' + metapkg, ' '.join(metapkg_rdepends)) + + metapkg = pn + d.setVar('ALLOW_EMPTY:' + metapkg, "1") + blacklist = [ metapkg ] + metapkg_rdepends = [ ] + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): + metapkg_rdepends.append(pkg) + d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends)) +} + +PACKAGES_DYNAMIC += "^libopencv-.*" + +FILES:${PN} = "" +FILES:${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" +FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/cmake/opencv4/*.cmake" +FILES:${PN}-staticdev += "${libdir}/opencv4/3rdparty/*.a" +FILES:${PN}-apps = "${bindir}/* ${datadir}/opencv4 ${datadir}/licenses" +FILES:${PN}-java = "${datadir}/OpenCV/java" +FILES:${PN}-samples = "${datadir}/opencv4/samples/" + +INSANE_SKIP:${PN}-java = "libdir" +INSANE_SKIP:${PN}-dbg = "libdir" + +ALLOW_EMPTY:${PN} = "1" + +SUMMARY:python3-opencv = "Python bindings to opencv" +FILES:python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS:python3-opencv = "python3-core python3-numpy" + +RDEPENDS:${PN}-apps = "bash" + +do_compile:prepend() { + # remove the build host info to improve reproducibility + if [ -f ${WORKDIR}/build/modules/core/version_string.inc ]; then + sed -i "s#${WORKDIR}#/workdir#g" ${WORKDIR}/build/modules/core/version_string.inc + fi +} + +do_install:append() { + # Move Python files into correct library folder (for multilib build) + if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then + mv ${D}/usr/lib/* ${D}/${libdir}/ + rm -rf ${D}/usr/lib + fi + # remove build host path to improve reproducibility + if [ -f ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake ]; then + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake + fi + # remove setup_vars_opencv4.sh as its content is confusing and useless + if [ -f ${D}${bindir}/setup_vars_opencv4.sh ]; then + rm -rf ${D}${bindir}/setup_vars_opencv4.sh + fi +} diff --git a/meta-oe/recipes-support/openldap/openldap/0001-build-top.mk-unset-STRIP_OPTS.patch b/meta-oe/recipes-support/openldap/openldap/0001-build-top.mk-unset-STRIP_OPTS.patch new file mode 100644 index 0000000000..9d25f2c599 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap/0001-build-top.mk-unset-STRIP_OPTS.patch @@ -0,0 +1,38 @@ +From 321839cbd1d57f12d3d6695254d2003473d8dd1a Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 8 Dec 2021 16:58:55 +0800 +Subject: [PATCH] build/top.mk: unset STRIP_OPTS + +Unset STRIP_OPTS to disable strip to fix QA errors: + +ERROR: openldap-2.5.9-r0 do_package: QA Issue: File +'/usr/bin/ldapcompare' from openldap was already stripped, this will +prevent future debugging! [already-stripped] + +ERROR: openldap-2.5.9-r0 do_package: QA Issue: File +'/usr/bin/ldapdelete' from openldap was already stripped, this will +prevent future debugging! [already-stripped] + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + build/top.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/top.mk b/build/top.mk +index 38ce146..6e9fe1f 100644 +--- a/build/top.mk ++++ b/build/top.mk +@@ -60,7 +60,7 @@ INSTALL_PROGRAM = $(INSTALL) + INSTALL_DATA = $(INSTALL) -m 644 + INSTALL_SCRIPT = $(INSTALL) + +-STRIP_OPTS = -s ++STRIP_OPTS = + + LINT = lint + 5LINT = 5lint +-- +2.17.1 + diff --git a/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch b/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch new file mode 100644 index 0000000000..e6ab4e5a46 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch @@ -0,0 +1,40 @@ +From 634017950c1c920d0de63fffa5c52e621de1d603 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Wed, 26 Jun 2024 07:41:01 +0000 +Subject: Fix incompatible pointer type error with gcc option + -Wincompatible-pointer-types + +lib32-openldap do_compile failure with gcc-14: +| tls_g.c:971:57: error: passing argument 4 of 'gnutls_fingerprint' from incompatible pointer type [-Wincompatible-pointer-types] +| 971 | keyhash.bv_val, &keyhash.bv_len ) < 0 ) { +| | ^~~~~~~~~~~~~~~ +| | | +| | ber_len_t * {aka long unsigned int *} +| In file included from tls_g.c:44: +| /usr/include/gnutls/gnutls.h:2406:32: note: expected 'size_t *' {aka 'unsigned int *'} but argument is of type 'ber_len_t *' {aka 'long unsigned int *'} +| 2406 | size_t *result_size); +| | ^~~ + +Upstream-Status: Submitted + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + libraries/libldap/tls_g.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c +index 7c23875..b4b487d 100644 +--- a/libraries/libldap/tls_g.c ++++ b/libraries/libldap/tls_g.c +@@ -968,7 +968,7 @@ tlsg_session_pinning( LDAP *ld, tls_session *sess, char *hashalg, struct berval + keyhash.bv_len = gnutls_hash_get_len( alg ); + keyhash.bv_val = LDAP_MALLOC( keyhash.bv_len ); + if ( !keyhash.bv_val || gnutls_fingerprint( alg, &key, +- keyhash.bv_val, &keyhash.bv_len ) < 0 ) { ++ keyhash.bv_val, (size_t *)&keyhash.bv_len ) < 0 ) { + goto done; + } + } else { +-- +2.34.1 + diff --git a/meta-oe/recipes-support/openldap/openldap/install-strip.patch b/meta-oe/recipes-support/openldap/openldap/install-strip.patch deleted file mode 100644 index 2992b7030d..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/install-strip.patch +++ /dev/null @@ -1,14 +0,0 @@ -# This patch ensures that the install operations which strip -# programs and libraries (LTINSTALL) work in a cross build -# environment. ---- openldap-2.2.24/.pc/install-strip.patch/build/top.mk 2005-01-20 09:00:55.000000000 -0800 -+++ openldap-2.2.24/build/top.mk 2005-04-16 13:48:20.536710376 -0700 -@@ -116,7 +116,7 @@ - LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \ - $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD) - --LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) -+LTINSTALL = STRIPPROG="" $(LIBTOOL) --mode=install $(top_srcdir)/contrib/ldapc++/install-sh -c - LTFINISH = $(LIBTOOL) --mode=finish - - # Misc UNIX commands used in build environment diff --git a/meta-oe/recipes-support/openldap/openldap/kill-icu.patch b/meta-oe/recipes-support/openldap/openldap/kill-icu.patch deleted file mode 100644 index dcf5411372..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/kill-icu.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - -slapd depends on ICU if it was built first. - -Upstream-status: inappropiate [embedded specific] ---- - configure.in | 8 -------- - 1 file changed, 8 deletions(-) - ---- openldap-2.4.23.orig/configure.in -+++ openldap-2.4.23/configure.in -@@ -2045,18 +2045,10 @@ if test $ol_enable_ndb != no ; then - SLAPD_LIBS="$SLAPD_LIBS \$(SLAPD_NDB_LIBS)" - fi - fi - - dnl ---------------------------------------------------------------- --dnl International Components for Unicode --OL_ICU --if test "$ol_icu" = no ; then -- AC_MSG_WARN([ICU not available]) --else -- ICU_LIBS="$ol_icu" --fi --dnl ---------------------------------------------------------------- - dnl - dnl Check for Cyrus SASL - dnl - WITH_SASL=no - ol_link_sasl=no diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch b/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch deleted file mode 100644 index c7b1552c1c..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch +++ /dev/null @@ -1,17 +0,0 @@ -From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/ - -Upstream-status: Unknown - --- - ---- openldap-2.4.28/configure.in.orig 2012-02-11 22:40:36.004360795 +0000 -+++ openldap-2.4.28/configure.in 2012-02-11 22:40:13.410986851 +0000 -@@ -1214,7 +1214,7 @@ - ol_with_tls=gnutls - ol_link_tls=yes - -- TLS_LIBS="-lgnutls" -+ TLS_LIBS="-lgnutls -lgcrypt" - - AC_DEFINE(HAVE_GNUTLS, 1, - [define if you have GNUtls]) diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch b/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch deleted file mode 100644 index de9ca528a2..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch +++ /dev/null @@ -1,59 +0,0 @@ -openldap CVE-2015-3276 - -the patch comes from: -https://bugzilla.redhat.com/show_bug.cgi?id=1238322 -https://bugzilla.redhat.com/attachment.cgi?id=1055640 - -The nss_parse_ciphers function in libraries/libldap/tls_m.c in -OpenLDAP does not properly parse OpenSSL-style multi-keyword mode -cipher strings, which might cause a weaker than intended cipher to -be used and allow remote attackers to have unspecified impact via -unknown vectors. - -Signed-off-by: Li Wang <li.wang@windriver.com> ---- - libraries/libldap/tls_m.c | 27 ++++++++++++++++----------- - 1 file changed, 16 insertions(+), 11 deletions(-) - -diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c -index 9b101f9..e6f3051 100644 ---- a/libraries/libldap/tls_m.c -+++ b/libraries/libldap/tls_m.c -@@ -621,18 +621,23 @@ nss_parse_ciphers(const char *cipherstr, int cipher_list[ciphernum]) - */ - if (mask || strength || protocol) { - for (i=0; i<ciphernum; i++) { -- if (((ciphers_def[i].attr & mask) || -- (ciphers_def[i].strength & strength) || -- (ciphers_def[i].version & protocol)) && -- (cipher_list[i] != -1)) { -- /* Enable the NULL ciphers only if explicity -- * requested */ -- if (ciphers_def[i].attr & SSL_eNULL) { -- if (mask & SSL_eNULL) -- cipher_list[i] = action; -- } else -+ /* if more than one mask is provided -+ * then AND logic applies (to match openssl) -+ */ -+ if ( cipher_list[i] == -1) ) -+ continue; -+ if ( mask && ! (ciphers_def[i].attr & mask) ) -+ continue; -+ if ( strength && ! (ciphers_def[i].strength & strength) ) -+ continue; -+ if ( protocol && ! (ciphers_def[i].version & protocol) ) -+ continue; -+ /* Enable the NULL ciphers only if explicity requested */ -+ if (ciphers_def[i].attr & SSL_eNULL) { -+ if (mask & SSL_eNULL) - cipher_list[i] = action; -- } -+ } else -+ cipher_list[i] = action; - } - } else { - for (i=0; i<ciphernum; i++) { --- -1.7.9.5 - diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch b/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch deleted file mode 100644 index b669b7254d..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- openldap-2.3.11/build/openldap.m4.orig 2005-11-11 00:11:18.604322590 -0800 -+++ openldap-2.3.11/build/openldap.m4 2005-11-11 00:26:21.621145856 -0800 -@@ -788,7 +788,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ - ]]) - - AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], --AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES -+[AC_LANG_SOURCE([[OL_PTHREAD_TEST_INCLUDES - - int main(argc, argv) - int argc; -@@ -796,7 +796,7 @@ int main(argc, argv) - { - OL_PTHREAD_TEST_FUNCTION - } --])) -+]])]) - dnl -------------------------------------------------------------------- - AC_DEFUN([OL_PTHREAD_TRY], [# Pthread try link: $1 ($2) - if test "$ol_link_threads" = no ; then diff --git a/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch new file mode 100644 index 0000000000..7a1b5aaad7 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch @@ -0,0 +1,39 @@ +From 868a04b0596e2df708ba14ed70815b1411db3db1 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 21 Feb 2019 11:33:24 +0800 +Subject: [PATCH] mkversion: remove user host pwd from version + +Upstream-Status: Pending + +Update this patch to version 2.4.47 + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + build/mkversion | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/build/mkversion ++++ b/build/mkversion +@@ -53,8 +53,12 @@ APPLICATION=$1 + # Reproducible builds set SOURCE_DATE_EPOCH, want constant strings + if [ -n "${SOURCE_DATE_EPOCH}" ]; then + WHOWHERE="openldap" ++ DATE=$(date -d@$SOURCE_DATE_EPOCH +' %b %d %Y ') ++ TIME=$(date -d@$SOURCE_DATE_EPOCH +' %H:%M:%S ') + else +- WHOWHERE="$USER@$(uname -n):$(pwd)" ++ WHOWHERE="openldap" ++ DATE='" __DATE__ "' ++ TIME='" __TIME__ "' + fi + + cat << __EOF__ +@@ -77,7 +81,7 @@ static const char copyright[] = + "COPYING RESTRICTIONS APPLY\n"; + + $static $const char $SYMBOL[] = +-"@(#) \$$PACKAGE: $APPLICATION $VERSION (" __DATE__ " " __TIME__ ") \$\n" ++"@(#) \$$PACKAGE: $APPLICATION $VERSION ($DATE $TIME) \$\n" + "\t$WHOWHERE\n"; + + __EOF__ diff --git a/meta-oe/recipes-support/openldap/openldap/thread_stub.patch b/meta-oe/recipes-support/openldap/openldap/thread_stub.patch deleted file mode 100644 index 540ba4a635..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/thread_stub.patch +++ /dev/null @@ -1,20 +0,0 @@ -openldap: set pointer - -When the function ldap_pvt_thread_pool_getkey() succeeds, it -must set the value of *data since the caller may try to use it. - -Upstream-Status: pending - -Signed-off-by: Joe Slater <jslater@windriver.com> - - ---- a/libraries/libldap_r/thr_stub.c -+++ b/libraries/libldap_r/thr_stub.c -@@ -217,6 +217,7 @@ ldap_pvt_thread_pool_unidle ( ldap_pvt_t - int ldap_pvt_thread_pool_getkey ( - void *ctx, void *key, void **data, ldap_pvt_thread_pool_keyfree_t **kfree ) - { -+ if (data) *data = NULL; /* avoid problems with uninitialized *data */ - return(0); - } - diff --git a/meta-oe/recipes-support/openldap/openldap/use-urandom.patch b/meta-oe/recipes-support/openldap/openldap/use-urandom.patch deleted file mode 100644 index e7b988fafd..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/use-urandom.patch +++ /dev/null @@ -1,38 +0,0 @@ -openldap: assume /dev/urandom exists - -When we are cross-compiling, we want to assume -that /dev/urandom exists. We could change the source -code to look for it, but this is the easy way out. - -Upstream-Status: pending - -Signed-off-by: Joe Slater <jslater@windriver.com> - - ---- a/configure.in -+++ b/configure.in -@@ -2142,8 +2142,8 @@ fi - - dnl ---------------------------------------------------------------- - dnl Check for entropy sources -+dev=no - if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then -- dev=no - if test -r /dev/urandom ; then - dev="/dev/urandom"; - elif test -r /idev/urandom ; then -@@ -2156,9 +2156,11 @@ if test $cross_compiling != yes && test - dev="/idev/random"; - fi - -- if test $dev != no ; then -- AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) -- fi -+elif test $cross_compiling == yes ; then -+ dev="/dev/urandom"; -+fi -+if test $dev != no ; then -+ AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) - fi - - dnl ---------------------------------------------------------------- diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.45.bb b/meta-oe/recipes-support/openldap/openldap_2.6.8.bb index 82d6619838..ca27ab23ec 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.45.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.6.8.bb @@ -1,5 +1,3 @@ -# OpenLDAP, a license free (see http://www.OpenLDAP.org/license.html) -# SUMMARY = "OpenLDAP Directory Service" DESCRIPTION = "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol." HOMEPAGE = "http://www.OpenLDAP.org/license.html" @@ -9,35 +7,26 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html" # basically BSD. opensource.org does not record this license # at present (so it is apparently not OSI certified). LICENSE = "OpenLDAP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=25fd3721960f39128cd15a749fd21139 \ +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a41b4ed95ab4a20f366a8d82536afe4 \ file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ -" + " SECTION = "libs" LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" -SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${BP}.tgz \ - file://openldap-m4-pthread.patch \ - file://kill-icu.patch \ - file://openldap-2.4.28-gnutls-gcrypt.patch \ - file://use-urandom.patch \ +SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \ file://initscript \ file://slapd.service \ - file://thread_stub.patch \ - file://openldap-CVE-2015-3276.patch \ + file://remove-user-host-pwd-from-version.patch \ + file://0001-build-top.mk-unset-STRIP_OPTS.patch \ + file://0001-fix-incompatible-pointer-type-error.patch \ " -SRC_URI[md5sum] = "00ff8301277cdfd0af728a6927042a13" -SRC_URI[sha256sum] = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824" +SRC_URI[sha256sum] = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e" DEPENDS = "util-linux groff-native" -# The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when -# installing .so and executables, this fails in cross compilation -# environments -SRC_URI += "file://install-strip.patch" - -inherit autotools-brokensep update-rc.d systemd +inherit autotools-brokensep update-rc.d systemd pkgconfig # CV SETTINGS # Required to work round AC_FUNC_MEMCMP which gets the wrong answer @@ -52,12 +41,12 @@ EXTRA_OECONF += "--with-yielding-select=yes" # Shared libraries are nice... EXTRA_OECONF += "--enable-dynamic" -PACKAGECONFIG ??= "gnutls modules \ - mdb ldap meta monitor null passwd shell proxycache dnssrv \ +PACKAGECONFIG ??= "asyncmeta gnutls modules \ + mdb ldap meta null passwd proxycache dnssrv \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " #--with-tls with TLS/SSL support auto|openssl|gnutls [auto] -PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls libgcrypt" +PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls" PACKAGECONFIG[openssl] = "--with-tls=openssl,,openssl" PACKAGECONFIG[sasl] = "--with-cyrus-sasl,--without-cyrus-sasl,cyrus-sasl" @@ -74,25 +63,20 @@ EXTRA_OECONF += "--enable-crypt" # The backend must be set by the configuration. This controls the # required database. # -# Backends="bdb dnssrv hdb ldap mdb meta monitor ndb null passwd perl relay shell sock sql" +# Backends="asyncmeta dnssrv ldap mdb meta null passwd perl relay sock sql wt" # # Note that multiple backends can be built. The ldbm backend requires a -# build-time choice of database API. The bdb backend forces this to be -# DB4. To use the gdbm (or other) API the Berkely database module must -# be removed from the build. +# build-time choice of database API. To use the gdbm (or other) API the +# Berkely database module must be removed from the build. md = "${libexecdir}/openldap" # -#--enable-bdb enable Berkeley DB backend no|yes|mod yes -# The Berkely DB is the standard choice. This version of OpenLDAP requires -# the version 4 implementation or better. -PACKAGECONFIG[bdb] = "--enable-bdb=yes,--enable-bdb=no,db" + +#--enable-asyncmeta enable asyncmeta backend no|yes|mod no +PACKAGECONFIG[asyncmeta] = "--enable-asyncmeta=mod,--enable-asyncmeta=no" #--enable-dnssrv enable dnssrv backend no|yes|mod no PACKAGECONFIG[dnssrv] = "--enable-dnssrv=mod,--enable-dnssrv=no" -#--enable-hdb enable Hierarchical DB backend no|yes|mod no -PACKAGECONFIG[hdb] = "--enable-hdb=yes,--enable-hdb=no,db" - #--enable-ldap enable ldap backend no|yes|mod no PACKAGECONFIG[ldap] = "--enable-ldap=mod,--enable-ldap=no," @@ -102,12 +86,6 @@ PACKAGECONFIG[mdb] = "--enable-mdb=yes,--enable-mdb=no," #--enable-meta enable metadirectory backend no|yes|mod no PACKAGECONFIG[meta] = "--enable-meta=mod,--enable-meta=no," -#--enable-monitor enable monitor backend no|yes|mod yes -PACKAGECONFIG[monitor] = "--enable-monitor=mod,--enable-monitor=no," - -#--enable-ndb enable MySQL NDB Cluster backend no|yes|mod [no] -PACKAGECONFIG[ndb] = "--enable-ndb=mod,--enable-ndb=no," - #--enable-null enable null backend no|yes|mod no PACKAGECONFIG[null] = "--enable-null=mod,--enable-null=no," @@ -123,10 +101,6 @@ PACKAGECONFIG[perl] = "--enable-perl=mod,--enable-perl=no,perl" #--enable-relay enable relay backend no|yes|mod [yes] PACKAGECONFIG[relay] = "--enable-relay=mod,--enable-relay=no," -#--enable-shell enable shell backend no|yes|mod no -# configure: WARNING: Use of --without-threads is recommended with back-shell -PACKAGECONFIG[shell] = "--enable-shell=mod --without-threads,--enable-shell=no," - #--enable-sock enable sock backend no|yes|mod [no] PACKAGECONFIG[sock] = "--enable-sock=mod,--enable-sock=no," @@ -135,6 +109,10 @@ PACKAGECONFIG[sock] = "--enable-sock=mod,--enable-sock=no," # sqlite.h (which may be compatible but hasn't been tried.) PACKAGECONFIG[sql] = "--enable-sql=mod,--enable-sql=no,sqlite3" +#--enable-wt enable wt backend no|yes|mod no +# back-wt is marked currently as experimental +PACKAGECONFIG[wt] = "--enable-wt=mod,--enable-wt=no" + #--enable-dyngroup Dynamic Group overlay no|yes|mod no # This is a demo, Proxy Cache defines init_module which conflicts with the # same symbol in dyngroup @@ -142,22 +120,24 @@ PACKAGECONFIG[dyngroup] = "--enable-dyngroup=mod,--enable-dyngroup=no," #--enable-proxycache Proxy Cache overlay no|yes|mod no PACKAGECONFIG[proxycache] = "--enable-proxycache=mod,--enable-proxycache=no," -FILES_${PN}-overlay-proxycache = "${md}/pcache-*.so.*" +FILES:${PN}-overlay-proxycache = "${md}/pcache.so.*" PACKAGES += "${PN}-overlay-proxycache" # Append URANDOM_DEVICE='/dev/urandom' to CPPFLAGS: # This allows tls to obtain random bits from /dev/urandom, by default # it was disabled for cross-compiling. -CPPFLAGS_append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\'/dev/urandom\' -fPIC" +CPPFLAGS:append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\\"/dev/urandom\\" -fPIC" -LDFLAGS_append = " -pthread" +LDFLAGS:append = " -pthread" do_configure() { - cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build rm -f ${S}/libtool aclocal libtoolize --force --copy gnu-configize + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/missing ${S}/build + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/compile ${S}/build autoconf oe_runconf } @@ -170,18 +150,18 @@ LEAD_SONAME = "libldap-${LDAP_VER}.so.*" PACKAGES += "${PN}-slapd ${PN}-slurpd ${PN}-bin" # Package contents - shift most standard contents to -bin -FILES_${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir}/${BPN}/data" -FILES_${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run ${localstatedir}/volatile/run \ +FILES:${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir}/${BPN}/data" +FILES:${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run ${localstatedir}/volatile/run \ ${sysconfdir}/openldap/slapd.* ${sysconfdir}/openldap/schema \ ${sysconfdir}/openldap/DB_CONFIG.example ${systemd_unitdir}/system/*" -FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp ${localstatedir}/run ${localstatedir}/volatile/run" -FILES_${PN}-bin = "${bindir}" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so" -FILES_${PN}-dbg += "${libexecdir}/openldap/.debug" +FILES:${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp" +FILES:${PN}-bin = "${bindir}" +FILES:${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so ${libdir}/pkgconfig/*.pc" +FILES:${PN}-dbg += "${libexecdir}/openldap/.debug" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d - cat ${WORKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap + cat ${UNPACKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap chmod 755 ${D}${sysconfdir}/init.d/openldap # This is duplicated in /etc/openldap and is for slapd rm -f ${D}${localstatedir}/openldap-data/DB_CONFIG.example @@ -189,7 +169,7 @@ do_install_append() { # Installing slapd under ${sbin} is more FHS and LSB compliance mv ${D}${libexecdir}/slapd ${D}/${sbindir}/slapd rmdir --ignore-fail-on-non-empty ${D}${libexecdir} - SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema" + SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema slapmodify" cd ${D}/${sbindir}/ rm -f ${SLAPTOOLS} for i in ${SLAPTOOLS}; do ln -sf slapd $i; done @@ -198,7 +178,7 @@ do_install_append() { rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/slapd.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/slapd.service ${D}${systemd_unitdir}/system/ sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/*.service # Uses mdm as the database @@ -210,47 +190,48 @@ do_install_append() { -i ${D}${sysconfdir}/openldap/slapd.conf mkdir -p ${D}${localstatedir}/${BPN}/data - - } INITSCRIPT_PACKAGES = "${PN}-slapd" -INITSCRIPT_NAME_${PN}-slapd = "openldap" -INITSCRIPT_PARAMS_${PN}-slapd = "defaults" -SYSTEMD_SERVICE_${PN}-slapd = "hostapd.service" -SYSTEMD_AUTO_ENABLE_${PN}-slapd ?= "disable" - +INITSCRIPT_NAME:${PN}-slapd = "openldap" +INITSCRIPT_PARAMS:${PN}-slapd = "defaults" +SYSTEMD_PACKAGES = "${PN}-slapd" +SYSTEMD_SERVICE:${PN}-slapd = "slapd.service" +SYSTEMD_AUTO_ENABLE:${PN}-slapd ?= "disable" PACKAGES_DYNAMIC += "^${PN}-backends.* ^${PN}-backend-.*" # The modules require their .so to be dynamicaly loaded -INSANE_SKIP_${PN}-backend-dnssrv += "dev-so" -INSANE_SKIP_${PN}-backend-ldap += "dev-so" -INSANE_SKIP_${PN}-backend-meta += "dev-so" -INSANE_SKIP_${PN}-backend-mdb += "dev-so" -INSANE_SKIP_${PN}-backend-monitor += "dev-so" -INSANE_SKIP_${PN}-backend-null += "dev-so" -INSANE_SKIP_${PN}-backend-passwd += "dev-so" -INSANE_SKIP_${PN}-backend-shell += "dev-so" - - -python populate_packages_prepend () { +INSANE_SKIP:${PN}-backend-asyncmeta += "dev-so" +INSANE_SKIP:${PN}-backend-dnssrv += "dev-so" +INSANE_SKIP:${PN}-backend-ldap += "dev-so" +INSANE_SKIP:${PN}-backend-meta += "dev-so" +INSANE_SKIP:${PN}-backend-mdb += "dev-so" +INSANE_SKIP:${PN}-backend-null += "dev-so" +INSANE_SKIP:${PN}-backend-passwd += "dev-so" + +python populate_packages:prepend () { backend_dir = d.expand('${libexecdir}/openldap') - do_split_packages(d, backend_dir, 'back_([a-z]*)\.so$', 'openldap-backend-%s', 'OpenLDAP %s backend', prepend=True, extra_depends='', allow_links=True) - do_split_packages(d, backend_dir, 'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True) + do_split_packages(d, backend_dir, r'back_([a-z]*)\.so$', 'openldap-backend-%s', 'OpenLDAP %s backend', prepend=True, extra_depends='', allow_links=True) + do_split_packages(d, backend_dir, r'back_([a-z]*)\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True) metapkg = "${PN}-backends" - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - d.setVar('FILES_' + metapkg, "") + d.setVar('ALLOW_EMPTY:' + metapkg, "1") + d.setVar('FILES:' + metapkg, "") metapkg_rdepends = [] packages = d.getVar('PACKAGES').split() for pkg in packages[1:]: if pkg.count("openldap-backend-") and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale"): metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) - d.setVar('DESCRIPTION_' + metapkg, 'OpenLDAP backends meta package') + d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends)) + d.setVar('DESCRIPTION:' + metapkg, 'OpenLDAP backends meta package') packages.append(metapkg) d.setVar('PACKAGES', ' '.join(packages)) } BBCLASSEXTEND = "native" + +# This one is reproducible only on 32bit MACHINEs +# http://errors.yoctoproject.org/Errors/Details/766968/ +# tls_g.c:971:57: error: passing argument 4 of 'gnutls_fingerprint' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/opensc/opensc_0.16.0.bb b/meta-oe/recipes-support/opensc/opensc_0.25.1.bb index fd67181dc2..636bfa0366 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.16.0.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.25.1.bb @@ -5,40 +5,42 @@ functionality (e.g. SELECT FILE, READ BINARY) should work on any ISO\ keys on the smart card is possible with PKCS\ such as the FINEID (Finnish Electronic IDentity) card. Swedish Posten\ eID cards have also been confirmed to work." - -HOMEPAGE = "http://www.opensc-project.org/opensc/" +HOMEPAGE = "https://github.com/OpenSC/OpenSC/wiki" SECTION = "System Environment/Libraries" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" +DEPENDS = "openssl" -SRC_URI = "${DEBIAN_MIRROR}/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz" - -SRC_URI[md5sum] = "724d128f23cd7a74b28d04300ce7bcbd" -SRC_URI[sha256sum] = "3ac8c29542bb48179e7086d35a1b8907a4e86aca3de3323c2f48bd74eaaf5729" - -DEPENDS = "openct pcsc-lite virtual/libiconv openssl" +SRCREV = "0a4b772d6fdab9bfaaa3123775a48a7cb6c5e7c6" +SRC_URI = "git://github.com/OpenSC/OpenSC;branch=stable-0.25;protocol=https" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" +S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig bash-completion EXTRA_OECONF = " \ - --disable-static \ - --enable-openct \ - --disable-pcsc \ --disable-ctapi \ --disable-doc \ + --disable-static \ + --disable-strict \ " EXTRA_OEMAKE = "DESTDIR=${D}" -RDEPENDS_${PN} = "readline" +PACKAGECONFIG ??= "pcsc" -FILES_${PN} += "\ +PACKAGECONFIG[openct] = "--enable-openct,--disable-openct,openct" +PACKAGECONFIG[pcsc] = "--enable-pcsc,--disable-pcsc,pcsc-lite,pcsc-lite pcsc-lite-lib" +PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" + +FILES:${PN} += "\ ${libdir}/opensc-pkcs11.so \ - ${libdir}/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11-spy.so \ " -FILES_${PN}-dev += "\ +FILES:${PN}-dev += "\ + ${libdir}/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11/opensc-pkcs11.so \ ${libdir}/pkcs11/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11/pkcs11-spy.so \ " + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb index 8c948c5655..1c5a18e863 100644 --- a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb +++ b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb @@ -1,7 +1,7 @@ SUMMARY = "WBXML parsing and encoding library" HOMEPAGE = "http://libwbxml.opensync.org/" SECTION = "libs" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=c1128ee5341ccd5927d8bafe4b6266e1" DEPENDS = "expat" @@ -19,5 +19,5 @@ EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" PACKAGES += "${PN}-tools" -FILES_${PN}-tools = "${bindir}" -FILES_${PN} = "${libdir}/*.so.*" +FILES:${PN}-tools = "${bindir}" +FILES:${PN} = "${libdir}/*.so.*" diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch new file mode 100644 index 0000000000..2651eb6a72 --- /dev/null +++ b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch @@ -0,0 +1,56 @@ +From 1a5b4035e4cb75b87c716b4ebd5ffe32cd604c6e Mon Sep 17 00:00:00 2001 +From: "Sergey A. Osokin" <osa@FreeBSD.org.ru> +Date: Sun, 8 Sep 2024 17:14:25 -0400 +Subject: [PATCH] Fix build with clang 19 + +Please see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281359 +for details. + +Upstream-Status: Submitted [https://github.com/open-telemetry/opentelemetry-cpp/pull/3055] +Credit: Dimitry Andric <dim@FreeBSD.org> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + api/include/opentelemetry/logs/event_logger.h | 2 +- + api/include/opentelemetry/logs/logger.h | 2 +- + api/include/opentelemetry/logs/logger_type_traits.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/api/include/opentelemetry/logs/event_logger.h b/api/include/opentelemetry/logs/event_logger.h +index b5c94a70..5892e041 100644 +--- a/api/include/opentelemetry/logs/event_logger.h ++++ b/api/include/opentelemetry/logs/event_logger.h +@@ -66,7 +66,7 @@ class EventLogger + nostd::unique_ptr<LogRecord> log_record = delegate_logger->CreateLogRecord(); + + IgnoreTraitResult( +- detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set( ++ detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set<>( + log_record.get(), std::forward<ArgumentType>(args))...); + + EmitEvent(event_name, std::move(log_record)); +diff --git a/api/include/opentelemetry/logs/logger.h b/api/include/opentelemetry/logs/logger.h +index dc09a0c2..19da3942 100644 +--- a/api/include/opentelemetry/logs/logger.h ++++ b/api/include/opentelemetry/logs/logger.h +@@ -73,7 +73,7 @@ class Logger + } + + IgnoreTraitResult( +- detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set( ++ detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set<>( + log_record.get(), std::forward<ArgumentType>(args))...); + + EmitLogRecord(std::move(log_record)); +diff --git a/api/include/opentelemetry/logs/logger_type_traits.h b/api/include/opentelemetry/logs/logger_type_traits.h +index 48613513..f140a545 100644 +--- a/api/include/opentelemetry/logs/logger_type_traits.h ++++ b/api/include/opentelemetry/logs/logger_type_traits.h +@@ -166,7 +166,7 @@ struct LogRecordSetterTrait + * = nullptr> + inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept + { +- return LogRecordSetterTrait<common::KeyValueIterable>::template Set( ++ return LogRecordSetterTrait<common::KeyValueIterable>::template Set<>( + log_record, std::forward<ArgumentType>(arg)); + } + diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.1.bb b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.1.bb new file mode 100644 index 0000000000..1d86f1abce --- /dev/null +++ b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "Open Telemetry Library" +DESCRIPTION = "An Observability framework to create and manage telemetry data \ +such as traces, metrics, and logs." +HOMEPAGE = "https://github.com/open-telemetry/opentelemetry-cpp" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +DEPENDS = "nlohmann-json" + +SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main \ + file://0001-Fix-build-with-clang-19.patch" +SRCREV = "baecbb95bd63df53e0af16e87bc683967962c5f8" + +S = "${WORKDIR}/git" +inherit cmake pkgconfig lib_package + +LDFLAGS:append:riscv32 = " -latomic" + +PACKAGECONFIG ?= "opentelemety_install otlp_api" + +PACKAGECONFIG[opentelemety_install]="-DOPENTELEMETRY_INSTALL=ON,-DOPENTELEMETRY_INSTALL=OFF" +PACKAGECONFIG[build_package]="-DBUILD_PACKAGE=ON,-DBUILD_PACKAGE=OFF" +PACKAGECONFIG[otlp_api]="-DWITH_OTLP_API=ON,-DWITH_OTLP_API=OFF" +PACKAGECONFIG[otlp_grpc]="-DWITH_OTLP_GRPC=ON,-DWITH_OTLP_GRPC=OFF" +PACKAGECONFIG[otlp_http]="-DWITH_OTLP_HTTP=ON,-DWITH_OTLP_HTTP=OFF" +PACKAGECONFIG[otlp_prometheus]="-DWITH_PROMETHEUS=ON,-DWITH_PROMETHEUS=OFF" +PACKAGECONFIG[benchmark]="-DWITH_BENCHMARK=ON,-DWITH_BENCHMARK=OFF" +PACKAGECONFIG[testing]="-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF" diff --git a/meta-oe/recipes-support/openwbem/openwbem/checkserverkey b/meta-oe/recipes-support/openwbem/openwbem/checkserverkey deleted file mode 100644 index bcfa361010..0000000000 --- a/meta-oe/recipes-support/openwbem/openwbem/checkserverkey +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -if [ ! -f "/etc/openwbem/serverkey.pem" ]; then - if [ -f "/etc/ssl/servercerts/servercert.pem" \ - -a -f "/etc/ssl/servercerts/serverkey.pem" ]; then - echo "Using common server certificate /etc/ssl/servercerts/servercert.pem" - ln -s /etc/ssl/servercerts/server{cert,key}.pem /etc/openwbem/ - else - echo "FAILED: Starting OpenWBEM server" - echo "There is no ssl server key available for OpenWBEM server to use." - echo -e "Please generate one with the following script and start the OpenWBEM service again:\n" - echo "##################################" - echo "/etc/openwbem/owgencert" - echo "=================================" - - echo "NOTE: The script uses /dev/random device for generating some random bits while generating the server key." - echo " If this takes too long, you can replace the value of \"RANDFILE\" in /etc/openwsman/ssleay.cnf with /dev/urandom. Please understand the implications" - exit 1 - fi -fi diff --git a/meta-oe/recipes-support/openwbem/openwbem/loadmof.sh b/meta-oe/recipes-support/openwbem/openwbem/loadmof.sh deleted file mode 100644 index dd87811a37..0000000000 --- a/meta-oe/recipes-support/openwbem/openwbem/loadmof.sh +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh -# -# options: -# loadmof.sh <MOF_PATH> <NAMESPACE> <FILES> -# -# - or - -# -# options: -# loadmof.sh -n <NAMESPACE> <FILES> [...] -# -# The former is preserved for compatibility with Pegasus and -# sblim providers. The latter is preferred. If $1 is "-n", -# the latter code path is executed. Otherwise the former is -# executed. - -if [ "x$1" != "x-n" -a "x$1" != "x-v" ]; then -# OLD STYLE -if [ -f "/etc/init.d/owcimomd" ]; then - /etc/init.d/owcimomd status 1>&2 > /dev/null - if [ $? = "0" ]; then - CIMOM_RUNNING="true" - else - CIMOM_RUNNING="false" - fi -else - exit 1 -fi -if [ "$YAST_IS_RUNNING" = "instsys" ]; then - CIMOM_RUNNING="false" -fi - -CIMOM=$1 -shift -case "$CIMOM" in - pegasus) - exit 0 - ;; -esac -MOF_PATH=$1 -shift -NS=$1 -shift - -REPOSITORY="/var/lib/openwbem" -#tmp_dir=`mktemp -d -p /tmp openwbem.XXXXXX` -case "$CIMOM_RUNNING" in - true|false) - while [ "$#" -gt 0 ] - do - echo "Loading $MOF_PATH/$1" - #sed "s/cmpi:/cmpi::/g" $MOF_PATH/$1 > $tmp_dir/$1 - /usr/bin/owmofc -c -n $NS -d $REPOSITORY $MOF_PATH/$1 > /dev/null 2>&1 - shift - done - ;; -esac -#rm -rf $tmp_dir -# END OLD STYLE - -else -# NEW STYLE -if [ "x$3" = "x" ]; then - echo "Usage: $0 -n <NAMESPACE> <FILES> [...]" - exit 1 -fi - -if [ "x$1" = "x-v" ]; then - VERBOSE=1 - shift -fi - -# get rid of "-n" arg -shift - -NS="$1" - -shift - -DBDIR=/var/lib/openwbem -LOGFILE=$DBDIR/loadmof.log -CIMOM_INIT=/etc/init.d/owcimomd -if [ "$YAST_IS_RUNNING" != "instsys" ] ; then - $CIMOM_INIT status > /dev/null 2>&1 - CIMOM_RUNNING=$? -fi -if [ "x$CIMOM_RUNNING" = "x0" ]; then - $CIMOM_INIT stop > /dev/null 2>&1 -fi -bkpdir=$DBDIR/backup-$$ -mkdir $bkpdir -cp -a $DBDIR/*.{dat,ndx,lock} $bkpdir/ -rm -f $LOGFILE.9 -for i in 8 7 6 5 4 3 2 1 0; do - let newI=$i+1 - if [ -f $LOGFILE.$i ]; then - mv $LOGFILE.$i $LOGFILE.$newI - fi -done -if [ -f $LOGFILE ]; then - mv $LOGFILE $LOGFILE.0 -fi -if [ "x$VERBOSE" = "x1" ]; then - /usr/bin/owmofc -c -n $NS -d $DBDIR -s /usr/share/mof/cim-current "$@" 2>&1 | tee $LOGFILE -else - /usr/bin/owmofc -c -n $NS -d $DBDIR -s /usr/share/mof/cim-current "$@" > $LOGFILE 2>&1 -fi -RVAL=$? -if [ "x$RVAL" != "x0" ]; then - echo "MOF import failed! Check $LOGFILE for details." - mv $bkpdir/* $DBDIR/ -fi -rm -rf $bkpdir -if [ "x$CIMOM_RUNNING" = "x0" ]; then - $CIMOM_INIT start > /dev/null 2>&1 -fi -exit $RVAL -fi - diff --git a/meta-oe/recipes-support/openwbem/openwbem/novell-openwbem-root-acl.mof b/meta-oe/recipes-support/openwbem/openwbem/novell-openwbem-root-acl.mof deleted file mode 100644 index c9970c79e9..0000000000 --- a/meta-oe/recipes-support/openwbem/openwbem/novell-openwbem-root-acl.mof +++ /dev/null @@ -1,21 +0,0 @@ -#pragma namespace("root/security") - -instance of OpenWBEM_NamespaceACL -{ - nspace = "root"; - capability = ""; -}; - -instance of OpenWBEM_NamespaceACL -{ - nspace = "root/cimv2"; - capability = ""; -}; - -instance of OpenWBEM_UserACL -{ - nspace = "root/cimv2"; - username = "root"; - capability = "rw"; -}; - diff --git a/meta-oe/recipes-support/openwbem/openwbem/openwbem-etc_pam.d_openwbem b/meta-oe/recipes-support/openwbem/openwbem/openwbem-etc_pam.d_openwbem deleted file mode 100644 index b3785aa49d..0000000000 --- a/meta-oe/recipes-support/openwbem/openwbem/openwbem-etc_pam.d_openwbem +++ /dev/null @@ -1,7 +0,0 @@ -#%PAM-1.0 -auth required pam_unix2.so nullok -auth required pam_nologin.so -account required pam_unix2.so -password required pam_pwcheck.so nullok -password required pam_unix2.so nullok use_first_pass use_authtok -session required pam_unix2.so none diff --git a/meta-oe/recipes-support/openwbem/openwbem/openwbem-owcimomd.init b/meta-oe/recipes-support/openwbem/openwbem/openwbem-owcimomd.init deleted file mode 100644 index 47fa8a7c67..0000000000 --- a/meta-oe/recipes-support/openwbem/openwbem/openwbem-owcimomd.init +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: owcimomd -# Required-Start: $network -# Required-Stop: $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: OpenWBEM CIMOM Daemon -# Description: owcimomd -# Start/Stop the OpenWBEM CIMOM Daemon -### END INIT INFO -# -# -# chkconfig: 2345 36 64 -# description: OpenWBEM CIMOM Daemon -# processname: owcimomd - -NAME=owcimomd -DAEMON=/usr/sbin/$NAME -OPTIONS= -PIDFILE=/var/run/$NAME.pid - -if [ $EUID != 0 ]; then - echo "This script must be run as root." - exit 1; -fi - -if [ "$DESCRIPTIVE" = "" ]; then - DESCRIPTIVE="OpenWBEM CIMOM Daemon" -fi - -lockfile=${SVIlock:-/var/lock/subsys/$NAME} - -[ -x $DAEMON ] || exit 0 - -# See how we were called. -. /etc/init.d/functions - -start() { - if [ ! -f "/etc/openwbem/serverkey.pem" ]; then - if [ -f "/etc/ssl/servercerts/servercert.pem" \ - -a -f "/etc/ssl/servercerts/serverkey.pem" ]; then - echo "Using common server certificate /etc/ssl/servercerts/servercert.pem" - ln -s /etc/ssl/servercerts/server{cert,key}.pem /etc/openwbem/ - else - echo "Generating OpenWBEM server public certificate and private key" - FQDN=`hostname --fqdn` - if [ "x${FQDN}" = "x" ]; then - FQDN=localhost.localdomain - fi -cat << EOF | sh /etc/openwbem/owgencert > /dev/null 2>&1 --- -SomeState -SomeCity -SomeOrganization -SomeOrganizationalUnit -${FQDN} -root@${FQDN} -EOF - fi - fi - - # Start daemons. - echo -n "Starting the $DESCRIPTIVE" - daemon $DAEMON $OPTIONS > /dev/null 2>&1 - RETVAL=$? - - if [ $RETVAL -eq 0 ]; then - touch $lockfile - success - fi - - echo - return $RETVAL -} - -stop() { - # Stop daemons. - echo -n "Shutting down $DESCRIPTIVE" - killproc $DAEMON - RETVAL=$? - - if [ $RETVAL -eq 0 ]; then - rm -f $lockfile - success - else - failure - fi - echo - return $RETVAL -} - -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - - stop) - stop - ;; - - restart|force-reload) - restart - ;; - - reload) - echo -n "Reload service $DESCRIPTIVE" - killproc -p $PIDFILE -HUP $DAEMON - RETVAL=$? - echo - exit $RETVAL - ;; - - status) - echo -n "Checking for service $DESCRIPTIVE" - status $DAEMON - RETVAL=$? - exit $RETVAL - ;; - - *) - echo "Usage: $0 {restart|start|stop|reload|force-reload|status}" -esac - -exit $RETVAL diff --git a/meta-oe/recipes-support/openwbem/openwbem/openwbem-rpmlintrc b/meta-oe/recipes-support/openwbem/openwbem/openwbem-rpmlintrc deleted file mode 100644 index 785e32aaa6..0000000000 --- a/meta-oe/recipes-support/openwbem/openwbem/openwbem-rpmlintrc +++ /dev/null @@ -1,2 +0,0 @@ -addFilter("devel-file-in-non-devel-package .*/lib.*\.so") - diff --git a/meta-oe/recipes-support/openwbem/openwbem/owcimomd.service b/meta-oe/recipes-support/openwbem/openwbem/owcimomd.service deleted file mode 100644 index c6694b7196..0000000000 --- a/meta-oe/recipes-support/openwbem/openwbem/owcimomd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Web Based Enterprise Management (WBEM) Implementation -After=syslog.target - -[Service] -Type=forking -ExecStart=/usr/sbin/owcimomd -ExecStartPre=/etc/openwbem/checkserverkey -PIDFile=/var/run/owcimomd.pid - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/openwbem/openwbem/rmmof.sh b/meta-oe/recipes-support/openwbem/openwbem/rmmof.sh deleted file mode 100644 index a495415be5..0000000000 --- a/meta-oe/recipes-support/openwbem/openwbem/rmmof.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# -# options: -# rmmof.sh <MOF_PATH> <NAMESPACE> <FILES> -# -# - or - -# -# options: -# loadmof.sh -n <NAMESPACE> <FILES> [...] -# -# The former is preserved for compatibility with Pegasus and -# sblim providers. The latter is preferred. If $1 is "-n", -# the latter code path is executed. Otherwise the former is -# executed. - -if [ "x$3" = "x" ]; then - echo "Usage: $0 -n <NAMESPACE> <FILES> [...]" - exit 1 -fi - -# get rid of "-n" arg -shift - -NS="$1" - -shift - -DBDIR=/var/lib/openwbem -CIMOM_INIT=/etc/init.d/owcimomd -if [ "$YAST_IS_RUNNING" != "instsys" ] ; then - $CIMOM_INIT status - CIMOM_RUNNING=$? -fi -if [ "x$CIMOM_RUNNING" = "x0" ]; then - $CIMOM_INIT stop -fi -bkpdir=/tmp/owrep.bkp-$$ -mkdir $bkpdir -cp -a $DBDIR $bkpdir/ -echo "Compiling MOF files" -/usr/bin/owmofc -r -n $NS -d $DBDIR "$@" > /dev/null 2>&1 -RVAL=$? -if [ "x$RVAL" != "x0" ]; then - echo "MOF import failed!" - rm -rf $DBDIR - mv $bkpdir/openwbem $DBDIR -fi -rm -rf $bkpdir -if [ "x$CIMOM_RUNNING" = "x0" ]; then - $CIMOM_INIT start -fi -exit $RVAL - diff --git a/meta-oe/recipes-support/p910nd/p910nd_0.95.bb b/meta-oe/recipes-support/p910nd/p910nd_0.95.bb deleted file mode 100644 index 5ebbb29e10..0000000000 --- a/meta-oe/recipes-support/p910nd/p910nd_0.95.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "A small network printer daemon for embedded situations that passes the job directly to the printer" -HOMEPAGE = "http://p910nd.sourceforge.net/" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/p910nd/p910nd-${PV}.tar.bz2 \ - file://fix-var-lock.patch" - -SRC_URI[md5sum] = "c7ac6afdf7730ac8387a8e87198d4491" -SRC_URI[sha256sum] = "7d78642c86dc247fbdef1ff85c56629dcdc6b2a457c786420299e284fffcb029" - -do_compile () { - ${CC} ${LDFLAGS} -o p910nd p910nd.c -} - -do_install () { - install -D -m 0755 ${S}/p910nd ${D}${sbindir}/p910nd - install -D -m 0644 ${S}/p910nd.conf ${D}${sysconfdir}/p910nd.conf -} diff --git a/meta-oe/recipes-support/p910nd/p910nd_0.97.bb b/meta-oe/recipes-support/p910nd/p910nd_0.97.bb new file mode 100644 index 0000000000..c6a3079ea2 --- /dev/null +++ b/meta-oe/recipes-support/p910nd/p910nd_0.97.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "A small network printer daemon for embedded situations that passes the job directly to the printer" +HOMEPAGE = "http://p910nd.sourceforge.net/" +SECTION = "console/utils" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=3d82780e8917b360cbee7b9ec3e40734" + + +# v0.97 +SRCREV = "57ebc07ad8723ea4106090536c58c7f7160743e2" +SRC_URI = "git://github.com/kenyapcomau/p910nd;protocol=https;branch=master \ + file://fix-var-lock.patch" + +S = "${WORKDIR}/git" + +inherit update-rc.d + +INITSCRIPT_NAME = "p910nd" +INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." + +do_compile () { + ${CC} ${CFLAGS} ${LDFLAGS} -o p910nd p910nd.c +} + +do_install () { + install -D -m 0755 ${S}/p910nd ${D}${sbindir}/p910nd + install -D -m 0644 ${S}/aux/p910nd.conf ${D}${sysconfdir}/sysconfig/p910nd.conf + install -D -m 0644 ${S}/aux/p910nd.init ${D}${sysconfdir}/init.d/p910nd +} diff --git a/meta-oe/recipes-support/passwdqc/passwdqc/makefile-add-ldflags.patch b/meta-oe/recipes-support/passwdqc/passwdqc/makefile-add-ldflags.patch deleted file mode 100644 index e9023492e0..0000000000 --- a/meta-oe/recipes-support/passwdqc/passwdqc/makefile-add-ldflags.patch +++ /dev/null @@ -1,31 +0,0 @@ -Add LDFLAGS variable to Makefile so that extra linker flags can be sent via this variable. - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> - -diff --git a/Makefile b/Makefile -index 49d622d..cd17334 100644 ---- a/Makefile -+++ b/Makefile -@@ -48,18 +48,17 @@ CFLAGS = -Wall -W -O2 - CFLAGS_lib = $(CFLAGS) -fPIC - CFLAGS_bin = $(CFLAGS) -fomit-frame-pointer - --LDFLAGS = - LDFLAGS_shared = --shared - LDFLAGS_shared_LINUX = --shared - LDFLAGS_shared_SUN = -G - LDFLAGS_shared_HP = -b - LDFLAGS_lib = $(LDFLAGS_shared) --LDFLAGS_lib_LINUX = $(LDFLAGS_shared_LINUX) \ -+LDFLAGS_lib_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \ - -Wl,--soname,$(SHARED_LIB),--version-script,$(MAP_LIB) - LDFLAGS_lib_SUN = $(LDFLAGS_shared_SUN) - LDFLAGS_lib_HP = $(LDFLAGS_shared_HP) - LDFLAGS_pam = $(LDFLAGS_shared) --LDFLAGS_pam_LINUX = $(LDFLAGS_shared_LINUX) \ -+LDFLAGS_pam_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \ - -Wl,--version-script,$(MAP_PAM) - LDFLAGS_pam_SUN = $(LDFLAGS_shared_SUN) - LDFLAGS_pam_HP = $(LDFLAGS_shared_HP) diff --git a/meta-oe/recipes-support/passwdqc/passwdqc_1.3.1.bb b/meta-oe/recipes-support/passwdqc/passwdqc_1.3.1.bb deleted file mode 100644 index 198db3ce72..0000000000 --- a/meta-oe/recipes-support/passwdqc/passwdqc_1.3.1.bb +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY = "A password/passphrase strength checking and enforcement toolset" -DESCRIPTION = "\ -passwdqc is a password/passphrase strength checking and policy enforcement \ -toolset, including an optional PAM module (pam_passwdqc), command-line \ -programs (pwqcheck and pwqgen), and a library (libpasswdqc). \ -pam_passwdqc is normally invoked on password changes by programs such as \ -passwd(1). It is capable of checking password or passphrase strength, \ -enforcing a policy, and offering randomly-generated passphrases, with \ -all of these features being optional and easily (re-)configurable. \ -\ -pwqcheck and pwqgen are standalone password/passphrase strength checking \ -and random passphrase generator programs, respectively, which are usable \ -from scripts. \ -\ -libpasswdqc is the underlying library, which may also be used from \ -third-party programs. \ -" - -HOMEPAGE = "http://www.openwall.com/passwdqc" -SECTION = "System Environment/Base" - -DEPENDS += "libpam" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1b4af6f3d4ee079a38107366e93b334d" - -SRC_URI = "http://www.openwall.com/${BPN}/${BP}.tar.gz \ - file://makefile-add-ldflags.patch \ - " -SRC_URI[md5sum] = "3878b57bcd3fdbcf3d4b362dbc6228b9" -SRC_URI[sha256sum] = "d1fedeaf759e8a0f32d28b5811ef11b5a5365154849190f4b7fab670a70ffb14" - -# explicitly define LINUX_PAM in case DISTRO_FEATURES no pam -# this package's pam_passwdqc.so needs pam -CFLAGS_append += "-Wall -fPIC -DHAVE_SHADOW -DLINUX_PAM" - -# -e is no longer default setting in bitbake.conf -EXTRA_OEMAKE = "-e" - -do_compile() { - # make sure sub make use environment to override variables in Makefile - # Linux) $(MAKE), there is a tab between - sed -i -e 's/Linux) $(MAKE) CFLAGS_lib/Linux) $(MAKE) -e CFLAGS_lib/' ${S}/Makefile - - # LD_lib and LD must be CC because of Makefile - oe_runmake LD="${CC}" -} - -do_install() { - oe_runmake install DESTDIR=${D} SHARED_LIBDIR=${base_libdir} \ - DEVEL_LIBDIR=${libdir} SECUREDIR=${base_libdir}/security \ - INSTALL="install -p" -} - -PROVIDES += "pam-${BPN}" -PACKAGES =+ "lib${BPN} pam-${BPN}" - -FILES_lib${BPN} = "${base_libdir}/libpasswdqc.so.0" -FILES_pam-${BPN} = "${base_libdir}/security/pam_passwdqc.so" -FILES_${PN}-dbg += "${base_libdir}/security/.debug" - -RDEPENDS_${PN} = "lib${BPN} pam-${BPN}" -RDEPENDS_pam-${BPN} = "lib${BPN}" diff --git a/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb new file mode 100644 index 0000000000..2f37b099b4 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb @@ -0,0 +1,48 @@ +require pcp.inc +inherit python3native native +#autotools-brokensep +DEPENDS = "python3-native python3-setuptools-native flex-native bison-native" + +export PCP_DIR = "${D}" +export PCP_TMP_DIR = "${D}/tmp" +export PCP_BIN_DIR = "${D}/usr/bin" + +B = "${S}" + +do_configure:prepend() { + export SED=${TMPDIR}/hosttools/sed + export AR=${TMPDIR}/hosttools/ar +# export PYTHON=python3 + + rm -rf ${S}/include/pcp/configsz.h + rm -rf ${S}/include/pcp/platformsz.h + +} +do_compile:prepend() { + sed -i -e "s,#undef HAVE_64BIT_LONG,,g" \ + -e "s,#undef HAVE_64BIT_PTR,,g" \ + -e "s,#undef PM_SIZEOF_SUSECONDS_T,,g" \ + -e "s,#undef PM_SIZEOF_TIME_T,,g" \ + ${S}/src/include/pcp/config.h.in + + export AR=${TMPDIR}/hosttools/ar +# export PYTHON=python3 +} + +do_compile() { + oe_runmake default_pcp +} + +do_install () { + oe_runmake install \ + PCP_ETC_DIR=${D}/${sysconfdir} \ + PCP_SYSCONF_DIR=${D}/${sysconfdir} \ + PCP_VAR_DIR=${D}/${localstatedir} \ + PCP_SHARE_DIR=${D}/${datadir} \ + PCP_BIN_DIR=${D}/${bindir} \ + PCP_BINADM_DIR=${D}/${libexecdir}/pcp/bin \ + PCP_LIBADM_DIR=${D}/${libdir} \ + PCP_LIB_DIR=${D}/${libdir} \ + PCP_MAN_DIR=${D}/${mandir} \ + PCP_DOC_DIR=${D}/${docdir} +} diff --git a/meta-oe/recipes-support/pcp/pcp.inc b/meta-oe/recipes-support/pcp/pcp.inc new file mode 100644 index 0000000000..4cafa7234b --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp.inc @@ -0,0 +1,40 @@ +SUMMARY = "System-level performance monitoring and performance management" +HOMEPAGE = "http://www.pcp.io" +SECTION = "Applications/System" + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=37ab75b580d5aad4ada04260efa3702f \ + " +COMPATIBLE_HOST:libc-musl = "null" + +SRC_URI = "https://performancecopilot.jfrog.io/artifactory/pcp-source-release/${BP}.src.tar.gz \ + file://0001-configure-Limit-the-header-search-to-sysroot.patch \ + file://0001-htop-Change-dependency-order-of-header-and-sourcefil.patch \ + file://config.linux \ + " +SRC_URI[sha256sum] = "dacf92ba195f1f2ea8f40bf0c455d2cd2456273a1e30dcc3ee5b5bfd099a99ee" + +inherit setuptools3-base pkgconfig autotools-brokensep + +# Specify any options you want to pass to the configure script using EXTRA_OECONF: +CACHED_CONFIGUREVARS = "PACKAGE_DISTRIBUTION=arch" +EXTRA_OECONF:append = "\ + --with-dstat-symlink=yes \ + --with-infiniband=no \ + --with-python=no \ + --with-perl=no \ + --with-python3=yes \ + --with-pmdajson=no \ + --with-perfevent=no \ + --with-pmdabcc=yes \ + --with-rundir=${localstatedir}/run \ + --with-sysconfigdir=${sysconfdir} \ + --with-logdir=${localstatedir}/log \ + --with-docdir=${docdir} \ + " + +PACKAGECONFIG[qt5] = "--with-qt=yes --with-qt3d=yes,--with-qt=no --with-qt3d=no,qtbase qt3d" + +PACKAGECONFIG ?= "" + +PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch b/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch new file mode 100644 index 0000000000..abf4aee61d --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch @@ -0,0 +1,39 @@ +From db9e6a4b7a48dee62fccb662347dd638a2d286d5 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Thu, 2 Dec 2021 14:29:06 +0900 +Subject: [PATCH] Remove unsuitble part for cross-compile. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + configure.ac | 6 ------ + src/libpcp/src/GNUmakefile | 1 - + 2 files changed, 7 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -607,12 +607,6 @@ fi + which=$WHICH + AC_SUBST(which) + +-if test -z "$AR"; then +- AC_PATH_PROGS(AR, [gcc-ar ar], /usr/bin/ar) +-fi +-if test ! -x "$AR"; then +- AC_MSG_ERROR([cannot find a valid 'ar' command.]) +-fi + ar=$AR + AC_SUBST(ar) + +--- a/src/libpcp/src/GNUmakefile ++++ b/src/libpcp/src/GNUmakefile +@@ -179,8 +179,6 @@ exports: exports.in mk.exports + # consistent in all placess. + # + check.done: $(OBJECTS) +- ./check-statics +- ./check-errorcodes + touch check.done + + ifneq ($(LIBTARGET),) diff --git a/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch b/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch new file mode 100644 index 0000000000..b03c48e581 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch @@ -0,0 +1,45 @@ +From 1eb68f65fd73443d862ca5f36f3b6041e2b0f13a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 10 Mar 2022 18:53:13 -0800 +Subject: [PATCH] configure: Limit the header search to sysroot + +Hardcoded paths in configure.ac means it starts to poke at host system +include paths, which is least we want in a cross build, therefore prefix +these paths with STAGING_SYSROOT + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -907,7 +907,7 @@ AC_DEFUN([PCP_CHECK_PYTHON_HEADER], + [ PY_MAJOR="$1" + PY_MINOR="$2" + PY_VERSION="python$PY_MAJOR.$PY_MINOR" +- PY_INCLUDE_DIRS="-I/usr/include/${PY_VERSION}m -I/usr/include/${PY_VERSION}" ++ PY_INCLUDE_DIRS="-I${STAGING_INCDIR}/${PY_VERSION}m -I${STAGING_INCDIR}/${PY_VERSION}" + saved_CFLAGS="$CFLAGS" + saved_CPPFLAGS="$CPPFLAGS" + CFLAGS="$CFLAGS $PY_INCLUDE_DIRS" +@@ -1603,7 +1603,7 @@ AC_SUBST(qmake) + + enable_qt3d=false + AS_IF([test "x$do_qt3d" != "xno"], [ +- if test -f /usr/include/Coin3/Inventor/Qt/SoQt.h -o -f /usr/include/Inventor/Qt/SoQt.h ++ if test -f ${STAGING_INCDIR}/Coin3/Inventor/Qt/SoQt.h -o -f ${STAGING_INCDIR}/Inventor/Qt/SoQt.h + then + enable_qt3d=$enable_qt + elif test x"$do_qt3d" = x"yes" +@@ -3699,7 +3699,7 @@ AC_SUBST(enable_decompression) + AC_SUBST(enable_lzma) + + dnl check for array sessions +-if test -f /usr/include/sn/arsess.h ++if test -f ${STAGING_INCDIR}/sn/arsess.h + then + pcp_mpi_dirs=libpcp_mpi\ libpcp_mpiread + else diff --git a/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch new file mode 100644 index 0000000000..009dfe2d04 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch @@ -0,0 +1,36 @@ +From c123980d6bf1bc2bf93ee0dd0d7f8fee3d4ddc96 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 5 Jul 2023 08:45:14 -0700 +Subject: [PATCH] htop: Change dependency order of header and sourcefiles + +Fixes build race +| pcp/Platform.h:29:10: fatal error: DiskIOMeter.h: No such file or directory +| 29 | #include "DiskIOMeter.h" +| | ^~~~~~~~~~~~~~~ +| compilation terminated. +| make[3]: *** [<builtin>: pcp-htop.o] Error 1 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/pcp/htop/GNUmakefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/pcp/htop/GNUmakefile b/src/pcp/htop/GNUmakefile +index 6b7c0c5..5153c63 100644 +--- a/src/pcp/htop/GNUmakefile ++++ b/src/pcp/htop/GNUmakefile +@@ -186,8 +186,8 @@ CFGMETERS = $(patsubst %,pcp/meters/%,$(METERS)) + CFGCOLUMNS = $(patsubst %,pcp/columns/%,$(COLUMNS)) + + CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS) +-TOPXFILES = $(TOPCFILES) $(TOPHFILES) $(DOCFILES) +-SUBXFILES = $(SUBCFILES) $(SUBHFILES) ++TOPXFILES = $(TOPHFILES) $(TOPCFILES) $(DOCFILES) ++SUBXFILES = $(SUBHFILES) $(SUBCFILES) + CFILES = $(TOPCFILES) $(SUBCFILES) + HFILES = $(TOPHFILES) $(SUBHFILES) + LDIRT = $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) \ +-- +2.41.0 + diff --git a/meta-oe/recipes-support/pcp/pcp/config.linux b/meta-oe/recipes-support/pcp/pcp/config.linux new file mode 100644 index 0000000000..191f87acc6 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/config.linux @@ -0,0 +1,13 @@ +sizeof_int=4 +sizeof_long=4 +sizeof_pointer=8 +sizeof_suseconds_t=8 +sizeof_time_t=8 +bit_field_scheme=2100 +enable_python3='yes' +enable_python3='true' +have_python_OrderedDict="true" +have_python=python3 +printf_p_prefix=0x +printf_fmt_int64=I64d +strtoint64=strtoll diff --git a/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch b/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch new file mode 100644 index 0000000000..9cb649a594 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch @@ -0,0 +1,13 @@ +Upstream-Status: Pending + +--- a/qa/src/GNUlocaldefs ++++ b/qa/src/GNUlocaldefs +@@ -728,7 +728,7 @@ scale.o: localconfig.h + 779246.o: libpcp.h + aggrstore.o: libpcp.h + badmmv.o: libpcp.h +-chkacc1.o: libpcp.h ++chkacc1.o: libpcp.h localconfig.h + chkacc2.o: libpcp.h + chkacc3.o: libpcp.h + chkacc4.o: libpcp.h diff --git a/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch b/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch new file mode 100644 index 0000000000..6fa864cd21 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch @@ -0,0 +1,29 @@ +Do not pass cr option + +These options are already coming from builddefs + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/src/include/builddefs.in ++++ b/src/include/builddefs.in +@@ -167,7 +167,7 @@ OBJECTS = $(ASFILES:.s=.o) \ + + #NB: don't override $(MAKE); gnumake sets it well, propagating -j etc. + #MAKE = @make@ +-AR = @ar@ ++AR = @ar@ cqs + CC = @cc@ + CXX = @cxx@ + LD = @ld@ +--- a/src/include/buildrules ++++ b/src/include/buildrules +@@ -93,7 +93,7 @@ $(STATICLIBTARGET) : $(SUBDIRS) $(OBJECT + ifeq ($(TARGET_OS), darwin) + libtool -static -o $(STATICLIBTARGET) $? + else +- $(AR) cr $(STATICLIBTARGET) $? ++ $(AR) $(STATICLIBTARGET) $? + endif + endif + diff --git a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb new file mode 100644 index 0000000000..f6f2a65752 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb @@ -0,0 +1,240 @@ +require pcp.inc +#inherit perlnative + +# NOTE: the following prog dependencies are unknown, ignoring: gtar gzip pkgmk xmlto lzma qshape md5sum pod2man publican git makedepend qmake-qt4 xconfirm true gmake xz dblatex hdiutil rpm bzip2 which mkinstallp dtrace seinfo qmake-qt5 gawk dlltool rpmbuild dpkg makepkg qmake echo +# NOTE: unable to map the following pkg-config dependencies: libmicrohttpd libsystemd-journal +# (this is based on recipes that have previously been built and packaged) +# NOTE: the following library dependencies are unknown, ignoring: nspr gen ibumad regex sasl2 pfm nss papi ibmad +# (this is based on recipes that have previously been built and packaged) +DEPENDS += "perl-native bison-native flex-native python3-native python3-setuptools python3 \ + pcp-native cairo zlib ncurses readline libx11 avahi openssl" + + +SRC_URI += "file://0001-Remove-unsuitble-part-for-cross-compile.patch \ + file://pass-options-to-AR.patch \ + file://fix_parallel_make.patch \ + " + +export PCP_DIR="${RECIPE_SYSROOT_NATIVE}" +#export PCP_RUN_DIR="${RECIPE_SYSROOT_NATIVE}" +EXTRA_OEMAKE = "CC="${CC}" LD="${LD}"" +inherit useradd systemd features_check python3targetconfig + +# Needs libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +SYSTEMD_AUTO_ENABLE:${PN} = "enable" +SYSTEMD_SERVICE:${PN} = "\ + pmie_farm_check.service \ + pmie_farm.service \ + pmfind.service \ + pmlogger_farm_check.service \ + pmcd.service \ + pmie.service \ + pmlogger_daily.service \ + pmlogger.service \ + pmlogger_farm.service \ + pmie_check.service \ + pmproxy.service \ + pmlogger_check.service \ + pmie_daily.service" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/lib/pcp --no-create-home \ + --user-group pcp" + +USERADD_PACKAGES += "${PN}-testsuite" +USERADD_PARAM:${PN}-testsuite = "--system --home ${localstatedir}/lib/pcp/testsuite --no-create-home \ + --user-group pcpqa" + +RDEPENDS:${PN} += "perl" +RDEPENDS:${PN}-testsuite += "${PN} bash perl" +RDEPENDS:python3-${PN} += "${PN} python3" + +do_configure:prepend () { + cp ${UNPACKDIR}/config.linux ${B} + rm -rf ${S}/include/pcp/configsz.h + rm -rf ${S}/include/pcp/platformsz.h + export SED=${TMPDIR}/hosttools/sed + export PYTHON=python3 +} + +do_compile:prepend() { + sed -i -e "s,#undef HAVE_64BIT_LONG,,g" \ + -e "s,#undef HAVE_64BIT_PTR,,g" \ + -e "s,#undef PM_SIZEOF_SUSECONDS_T,,g" \ + -e "s,#undef PM_SIZEOF_TIME_T,,g" \ + ${S}/src/include/pcp/config.h.in + sed -i -e "s,HAVE_PYTHON_ORDEREDDICT = false,HAVE_PYTHON_ORDEREDDICT = true,g" \ + ${S}/src/include/builddefs + sed -i -e "s,TOPDIR)/python3-pcp.list,TOPDIR)/python3-pcp.list --install-lib=${PYTHON_SITEPACKAGES_DIR},g" ${S}/src/python/GNUmakefile + export PYTHON=python3 + #export PYTHON3=${STAGING_BINDIR_NATIVE}/python3-native/python3 +} + +do_compile() { + oe_runmake default_pcp +} + +do_install () { + export NO_CHOWN=true + oe_runmake install DIST_ROOT=${D}\ + install_pcp + + rm -rf ${D}${localstatedir}/log + rm -rf ${D}${localstatedir}/lib/pcp/pmcd + rm -rf ${D}${localstatedir}/lib/pcp/tmp + rm -rf ${D}${localstatedir}/run + mv ${D}${docdir}/C* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/I* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/R* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/V* ${D}${docdir}/pcp-doc/ + sed -i "s#PCP_AWK_PROG=.*#PCP_AWK_PROG=awk#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_WHICH_PROG=.*#PCP_WHICH_PROG=which#" ${D}/${sysconfdir}/pcp.conf + sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}/${sysconfdir}/pcp.conf + sed -i -e 's#${RECIPE_SYSROOT}##g' \ + -e 's#${RECIPE_SYSROOT_NATIVE}##g' \ + -e 's#${TMPDIR}##g' ${D}${includedir}/pcp/builddefs +} + +PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ + libpcp-gui2 libpcp-gui2-dev \ + libpcp-import1 libpcp-archive1 \ + libpcp-mmv1 libpcp-mmv1-dev \ + libpcp-pmda3 libpcp-pmda3-dev \ + libpcp-trace2 libpcp-trace2-dev \ + libpcp-web1 libpcp-web1-dev \ + libpcp3 libpcp3-dev python3-${PN}\ +" +FILES:libpcp-gui2 = "${libdir}/libpcp_gui.so.2 \ +" +FILES:libpcp-archive1 = "${libdir}/libpcp_archive.so.1 \ +" +FILES:libpcp-gui2-dev = " \ + ${libdir}/libpcp_gui.so \ + ${libdir}/libpcp_gui.a \ + ${includedir}/pmafm.h \ + ${includedir}/pmtime.h \ +" +FILES:libpcp-mmv1 = " \ + ${libdir}/libpcp_mmv.so.1 \ +" +FILES:libpcp-mmv1-dev = " \ + ${libdir}/libpcp_mmv.a \ + ${libdir}/libpcp_mmv.so \ + ${libdir}/libpcp_mmv.so \ + ${includedir}/mmv_stats.h \ + ${includedir}/mmv_dev.h \ + ${datadir}/man/man3/mmv_* \ + ${datadir}/man/man5/mmv.5.gz \ +" +FILES:libpcp-import1 = " \ + ${libdir}/libpcp_import.so.1 \ +" +FILES:libpcp-pmda3 = " \ + ${libdir}/libpcp_pmda.so.3 \ +" +FILES:libpcp-pmda3-dev = " \ + ${includedir}/pmda.h \ + ${includedir}/pmdaroot.h \ + ${libdir}/libpcp_pmda.a \ + ${libdir}/libpcp_pmda.so \ + ${libdir}/pkgconfig/libpcp_pmda.pc \ + ${datadir}/man/man3/PMDA.3.gz \ + ${datadir}/man/man3/pmda* \ +" +FILES:libpcp-trace2 = " \ + ${libdir}/libpcp_trace.so.2 \ +" +FILES:libpcp-trace2-dev = " \ + ${includedir}/trace.h \ + ${includedir}/trace_dev.h \ + ${libdir}/libpcp_trace.a \ + ${libdir}/libpcp_trace.so \ + ${datadir}/man/man3/pmtrace* \ +" +FILES:libpcp-web1 = " \ + ${libdir}/libpcp_web.so.1 \ +" +FILES:libpcp-web1-dev = " \ + ${includedir}/pmhttp.h \ + ${includedir}/pmjson.h \ + ${libdir}/libpcp_web.a \ + ${libdir}/libpcp_web.so \ + ${datadir}/man/man3/pmhttp* \ + ${datadir}/man/man3/pmjson* \ +" +FILES:libpcp3 = " \ + ${libdir}/libpcp.so.3 \ +" + +FILES:${PN} = " \ + ${sysconfdir}/pcp \ + ${sysconfdir}/cron.d \ + ${sysconfdir}/init.d \ + ${libexecdir} \ + ${bindir} \ + ${datadir}/bash-completion \ + ${datadir}/pcp-gui \ + ${datadir}/zsh \ + ${systemd_system_unitdir}/ \ + ${libdir}/pcp/ \ + ${libdir}/sysusers.d/pcp.conf \ + ${datadir}/pcp \ + ${libdir}/*.sh \ + ${datadir}/man \ + ${libdir}/rc-proc.sh.minimal \ + ${sysconfdir}/p* \ + ${sysconfdir}/s* \ + ${localstatedir}/lib/pcp/config \ + ${localstatedir}/lib/pcp/pmdas/ \ + ${localstatedir}/lib/pcp/pmns \ + ${libdir}/libpcp_fault.so.3 \ +" + +FILES:${PN}-export-zabbix-agent += " \ + ${libdir}/zabbix \ + ${sysconfdir}/zabbix \ + ${mandir}/man3/zbxpcp.3.gz \ + ${libdir}/zabbix \ +" +FILES:${PN}-testsuite = "${localstatedir}/lib/pcp/testsuite/ ${libdir}/sysusers.d/pcp-testsuite.conf" +FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-dev += " \ + ${includedir}/pcp \ + ${libdir}/libpcp.a \ + ${libdir}/libpcp.so \ + ${localstatedir}/lib/pcp/pmdas/*/*.so \ + ${libexecdir}/pcp/bin/install-sh \ + ${libdir}/pkgconfig/libpcp.pc \ + ${libdir}/zabbix/modules/*.so \ + ${datadir}/man/man3/LOGIMPORT.3.gz \ + ${datadir}/man/man3/P* \ + ${datadir}/man/man3/Q* \ + ${datadir}/man/man3/__pm* \ + ${datadir}/man/man3/pmA* \ + ${datadir}/man/man3/pmC* \ + ${datadir}/man/man3/pmD* \ + ${datadir}/man/man3/pmE* \ + ${datadir}/man/man3/pmF* \ + ${datadir}/man/man3/pmG* \ + ${datadir}/man/man3/pmH* \ + ${datadir}/man/man3/pmI* \ + ${datadir}/man/man3/pmL* \ + ${datadir}/man/man3/pmM* \ + ${datadir}/man/man3/pmN* \ + ${datadir}/man/man3/pmO* \ + ${datadir}/man/man3/pmP* \ + ${datadir}/man/man3/pmR* \ + ${datadir}/man/man3/pmS* \ + ${datadir}/man/man3/pmT* \ + ${datadir}/man/man3/pmU* \ + ${datadir}/man/man3/pmW* \ + ${datadir}/man/man3/pmf* \ + ${datadir}/man/man3/pmg* \ + ${datadir}/man/man3/pmi* \ + ${datadir}/man/man3/pms* \ + ${datadir}/man/man3/pmt* \ +" diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb deleted file mode 100644 index 90d58b00d9..0000000000 --- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "PC/SC Lite smart card framework and applications" -HOMEPAGE = "http://pcsclite.alioth.debian.org/" -LICENSE = "BSD & GPLv3+" -LICENSE_${PN} = "BSD" -LICENSE_${PN}-lib = "BSD" -LICENSE_${PN}-doc = "BSD" -LICENSE_${PN}-dev = "BSD" -LICENSE_${PN}-dbg = "BSD & GPLv3+" -LICENSE_${PN}-spy = "GPLv3+" -LICENSE_${PN}-spy-dev = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=f38b3d1c7ef7fc2c8b6d20cd38efdc29" -DEPENDS = "udev" - -SRC_URI = "https://alioth.debian.org/frs/download.php/file/4225/pcsc-lite-${PV}.tar.bz2" -SRC_URI[md5sum] = "0ec103b1ef298d0c58d6ef6b00b9cf17" -SRC_URI[sha256sum] = "6a358f61ed3b66a7f6e1f4e794a94c7be4c81b7a58ec360c33791e8d7d9bd405" - - -inherit autotools systemd pkgconfig - -EXTRA_OECONF = " \ - --disable-libusb \ - --enable-libudev \ - --enable-usbdropdir=${libdir}/pcsc/drivers \ -" - -S = "${WORKDIR}/pcsc-lite-${PV}" - -PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev" - -RRECOMMENDS_${PN} = "ccid" - -FILES_${PN} = "${sbindir}/pcscd" -FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" -FILES_${PN}-dev = "${includedir} \ - ${libdir}/pkgconfig \ - ${libdir}/libpcsclite.la \ - ${libdir}/libpcsclite.so" - -FILES_${PN}-spy = "${bindir}/pcsc-spy \ - ${libdir}/libpcscspy*${SOLIBS}" -FILES_${PN}-spy-dev = "${libdir}/libpcscspy.la \ - ${libdir}/libpcscspy.so " - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "pcscd.socket" -RDEPENDS_${PN}-spy +="python" diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb new file mode 100644 index 0000000000..d5a560a6a0 --- /dev/null +++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb @@ -0,0 +1,58 @@ +SUMMARY = "PC/SC Lite smart card framework and applications" +HOMEPAGE = "https://pcsclite.apdu.fr/" +LICENSE = "BSD-3-Clause & GPL-3.0-or-later" +LICENSE:${PN} = "BSD-3-Clause" +LICENSE:${PN}-lib = "BSD-3-Clause" +LICENSE:${PN}-doc = "BSD-3-Clause" +LICENSE:${PN}-dev = "BSD-3-Clause" +LICENSE:${PN}-dbg = "BSD-3-Clause & GPL-3.0-or-later" +LICENSE:${PN}-spy = "GPL-3.0-or-later" +LICENSE:${PN}-spy-dev = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6" +DEPENDS = "autoconf-archive-native flex-native" + +SRC_URI = "https://pcsclite.apdu.fr/files/${BP}.tar.bz2" +SRC_URI[sha256sum] = "f42ee9efa489e9ff5d328baefa26f9c515be65021856e78d99ad1f0ead9ec85d" + +inherit autotools systemd pkgconfig perlnative + +EXTRA_OECONF = " \ + --disable-libusb \ + --enable-usbdropdir=${libdir}/pcsc/drivers \ +" + +S = "${WORKDIR}/pcsc-lite-${PV}" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} udev" +PACKAGECONFIG:class-native ??= "" + +PACKAGECONFIG[systemd] = ",--disable-libsystemd,systemd," +PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev" +PACKAGECONFIG[polkit] = ",--disable-polkit,polkit" + +PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev" + +RRECOMMENDS:${PN} = "ccid" +RRECOMMENDS:${PN}:class-native = "" +RPROVIDES:${PN}:class-native += "pcsc-lite-lib-native" + +FILES:${PN} = "${sbindir}/pcscd \ + ${datadir}/polkit-1" +FILES:${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" +FILES:${PN}-dev = "${includedir} \ + ${libdir}/pkgconfig \ + ${libdir}/libpcsclite.la \ + ${libdir}/libpcsclite.so" + +FILES:${PN}-spy = "${bindir}/pcsc-spy \ + ${libdir}/libpcscspy*${SOLIBS}" +FILES:${PN}-spy-dev = "${libdir}/libpcscspy.la \ + ${libdir}/libpcscspy.so " + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "pcscd.socket" +RDEPENDS:${PN}-spy += "python3-core" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.2.bb b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.2.bb new file mode 100644 index 0000000000..1dfba7c716 --- /dev/null +++ b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.2.bb @@ -0,0 +1,25 @@ +SUMMARY = "Some tools to be used with smart cards and PC/SC" +HOMEPAGE = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master" + +SRCREV = "778da3d86a59f5166443118c158e11ba4da9a5f1" + +inherit autotools pkgconfig + +S = "${WORKDIR}/git" + +DEPENDS = "pcsc-lite autoconf-archive-native" + +RDEPENDS:${PN} += " \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','pcsc-lite-systemd', 'pcsc-lite', d)} \ + perl \ + perl-module-getopt-std \ + perl-module-file-stat \ + libpcsc-perl \ +" + +FILES:${PN} += "${datadir}/pcsc/smartcard_list.txt \ + ${datadir}/pcsc/gscriptor.png" diff --git a/meta-oe/recipes-support/picocom/picocom_2024.bb b/meta-oe/recipes-support/picocom/picocom_2024.bb new file mode 100644 index 0000000000..c0c3e25de9 --- /dev/null +++ b/meta-oe/recipes-support/picocom/picocom_2024.bb @@ -0,0 +1,21 @@ +SUMMARY = "Lightweight and minimal dumb-terminal emulation program" +SECTION = "console/utils" +LICENSE = "GPL-2.0-or-later" +HOMEPAGE = "https://gitlab.com/wsakernel/picocom" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a" + +SRCREV = "7b6acbd421a2d4ca99376b7b427828dc1bcba4d8" + +SRC_URI = "git://gitlab.com/wsakernel/picocom;branch=master;protocol=https \ + " + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${PV}' \ + 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' " + +do_install () { + install -d ${D}${bindir} + install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/ +} + diff --git a/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-oe/recipes-support/picocom/picocom_git.bb deleted file mode 100644 index e091094cf4..0000000000 --- a/meta-oe/recipes-support/picocom/picocom_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program" -SECTION = "console/utils" -LICENSE = "GPLv2+" -HOMEPAGE = "http://code.google.com/p/picocom/" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a" - -BASEPV = "2.2" -PV = "${BASEPV}+git${SRCPV}" - -SRCREV = "deffd18c24145bd6f965f44e735a50b65810ccdc" - -SRC_URI = "git://github.com/npat-efault/picocom" - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${BASEPV}' \ - 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' " - -do_install () { - install -d ${D}${bindir} - install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/ -} - diff --git a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb new file mode 100644 index 0000000000..9337ae5966 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb @@ -0,0 +1,28 @@ +SUMMARY = "Protocol plugin for New Yahoo (2016) for Adium, Pidgin, Miranda and Telepathy IM Framework" +SECTION = "webos/services" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" + +DEPENDS = "pidgin json-glib glib-2.0" + +inherit pkgconfig + +SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=https" +SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f" + +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake CC="${CC}" CXX="${CXX}" EXTRA_INCLUDES="${TARGET_CFLAGS}" AR="${AR}"; +} + +do_install() { + oe_runmake DESTDIR="${D}" install; +} + +FILES:${PN} += " \ + ${libdir} \ +" diff --git a/meta-oe/recipes-support/pidgin/icyque_git.bb b/meta-oe/recipes-support/pidgin/icyque_git.bb new file mode 100644 index 0000000000..b2f9944c16 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/icyque_git.bb @@ -0,0 +1,30 @@ +SUMMARY = "WIM Protocol plugin for ICQ for Adium, Pidgin, Miranda and Telepathy IM Framework" +SECTION = "webos/services" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464" + +DEPENDS = "pidgin json-glib" + +PV = "0.1+git" + +inherit pkgconfig + +SRC_URI = "git://github.com/EionRobb/icyque;branch=master;protocol=https" +SRCREV = "513fc162d5d1a201c2b044e2b42941436d1069d5" + +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake; +} + +do_install() { + oe_runmake DESTDIR="${D}" install; +} + +FILES:${PN} += " \ + ${libdir} \ +" diff --git a/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch b/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch new file mode 100644 index 0000000000..8bb60b5557 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch @@ -0,0 +1,215 @@ +From 51d66c1c257f7487497f562033ac32ac75f648cb Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Mon, 8 Feb 2021 12:27:51 +0100 +Subject: [PATCH] meson: import changes from 3.0.* version + +* we need to use the meson option to disable introspection and docs + +Upstream-Status: Backport +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + meson.build | 139 ++++++++++++++++++++++++++++------------------ + meson_options.txt | 5 ++ + 2 files changed, 90 insertions(+), 54 deletions(-) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index 1084c82..ed040b4 100644 +--- a/meson.build ++++ b/meson.build +@@ -53,9 +53,9 @@ compiler = meson.get_compiler('c') + pkgconfig = import('pkgconfig') + + # ####################################################################### +-# # Check for GLib 2.16 ++# # Check for GLib 2.44 + # ####################################################################### +-glib = dependency('glib-2.0', version : '>= 2.16.0') ++glib = dependency('glib-2.0', version : '>= 2.44.0') + gobject = dependency('gobject-2.0') + gmodule = dependency('gmodule-2.0') + gnome = import('gnome') +@@ -63,74 +63,88 @@ gnome = import('gnome') + ####################################################################### + # Check for LibXML2 + ####################################################################### +-libxml = dependency('libxml-2.0', version : '>= 2.6.0', required : false) +-gnt_config.set('NO_LIBXML', not libxml.found()) ++libxml = dependency('libxml-2.0', version : '>= 2.6.0') + + ####################################################################### + # Check for ncurses and other things used by it + ####################################################################### + ncurses_available = true +-ncurses_inc = [] +-# The order of this list is important to the condition that follows. +-ncurses_libs = [ +- compiler.find_library('ncursesw', required : false), +- compiler.find_library('panelw', required : false), +- compiler.find_library('tinfow', required : false), +-] +-if not ncurses_libs[0].found() or not ncurses_libs[1].found() +- ncurses_available = false +-endif ++ncurses_widechar = true ++ncurses_header = 'ncurses.h' ++# Some distros put the headers in ncursesw/, some don't. These are ordered to ++# pick the last available as most-specific version. ++ncursesw_header_paths = ['', 'ncursesw/'] + +-if host_machine.system() == 'windows' +- # FIXME: $host ? +- ncurses_sys_prefix = '/usr/$host/sys-root/mingw' ++ncurses = [ ++ dependency('ncursesw', required : false), ++ dependency('panelw', required : false), ++] ++if ncurses[0].found() and ncurses[1].found() ++ foreach location : ncursesw_header_paths ++ f = location + 'ncurses.h' ++ if compiler.has_header_symbol(f, 'get_wch', ++ prefix : '#define _XOPEN_SOURCE_EXTENDED') ++ ncurses_header = f ++ endif ++ endforeach + else +- ncurses_sys_prefix = '/usr' +-endif +- +-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw', +- ncurses_sys_prefix + '/include'] +- +-if ncurses_available +- # Some distros put the headers in ncursesw/, some don't +- found_ncurses_h = false +- foreach location : ncurses_sys_dirs +- f = location + '/ncurses.h' +- if not found_ncurses_h ++ ncurses_available = false ++ ncurses_inc = [] ++ ncurses_libs = [ ++ compiler.find_library('ncursesw', required : false), ++ compiler.find_library('panelw', required : false) ++ ] ++ if ncurses_libs[0].found() and ncurses_libs[1].found() ++ foreach location : ncursesw_header_paths ++ f = location + 'ncurses.h' + if compiler.has_header_symbol(f, 'get_wch', + prefix : '#define _XOPEN_SOURCE_EXTENDED') +- if location != '.' +- ncurses_inc += [include_directories(location)] +- endif +- found_ncurses_h = true ++ ncurses_available = true ++ ncurses_header = f + endif +- endif +- endforeach ++ endforeach + +- if not found_ncurses_h +- ncurses_inc = [] +- ncurses_libs = [] +- ncurses_available = false ++ if ncurses_available ++ ncurses = declare_dependency( ++ include_directories : ncurses_inc, ++ dependencies : ncurses_libs ++ ) ++ endif + endif +-else ++endif ++ ++if not ncurses_available + # ncursesw was not found. Look for plain old ncurses +- # The order of this list is important to the condition that follows. +- ncurses_libs = [ +- compiler.find_library('ncurses', required : false), +- compiler.find_library('panel', required : false), +- compiler.find_library('tinfo', required : false), ++ ncurses = [ ++ dependency('ncurses', required : false), ++ dependency('panel', required : false), + ] +- ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found() +- gnt_config.set('NO_WIDECHAR', true) ++ if ncurses[0].found() and ncurses_libs[1].found() ++ ncurses_available = true ++ else ++ ncurses_libs = [ ++ compiler.find_library('ncurses', required : false), ++ compiler.find_library('panel', required : false), ++ ] ++ ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found() ++ ncurses = declare_dependency(dependencies : ncurses_libs) ++ endif ++ ncurses_widechar = false + endif ++ ++if not ncurses_available and host_machine.system() == 'windows' ++ # Try pdcurses too. ++ ncurses_header = 'curses.h' ++ ncurses_libs = compiler.find_library('pdcurses', required : false) ++ ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found() ++ ncurses = declare_dependency(dependencies : ncurses_libs) ++endif ++ + if not ncurses_available + error('ncurses could not be found!') + endif +- +-ncurses = declare_dependency( +- include_directories : ncurses_inc, +- dependencies : ncurses_libs +-) ++gnt_config.set('NCURSES_HEADER', ncurses_header) ++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar) + + libgnt_SOURCES = [ + 'gntwidget.c', +@@ -191,7 +205,10 @@ libgnt_headers = [ + ] + + # Check for Python headers +-python_dep = dependency('python2', required : false) ++python_dep = dependency('python3-embed', required: false) ++if not python_dep.found() ++ python_dep = dependency('python3', required : false) ++endif + gnt_config.set('USE_PYTHON', python_dep.found()) + + configure_file(output : 'gntconfig.h', +@@ -233,6 +250,20 @@ pkgconfig.generate( + variables : ['plugindir = ${libdir}/gnt'], + ) + ++if get_option('introspection') ++ libgnt_gir = gnome.generate_gir(libgnt, ++ sources : libgnt_headers + [gnt_h], ++ includes : 'GObject-2.0', ++ namespace : 'Gnt', ++ symbol_prefix : 'gnt', ++ identifier_prefix : 'Gnt', ++ nsversion : '@0@.@1@'.format(gnt_major_version, gnt_minor_version), ++ install : true, ++ extra_args : ['-DGNT_COMPILATION', '--quiet']) ++endif ++ + subdir('wms') + subdir('test') +-subdir('doc') ++if get_option('doc') ++ subdir('doc') ++endif +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 0000000..f2414e2 +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1,5 @@ ++option('doc', type : 'boolean', value : true, yield : true, ++ description : 'build documentation with gtk-doc') ++ ++option('introspection', type : 'boolean', value : true, yield : true, ++ description : 'build introspection data') diff --git a/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb b/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb new file mode 100644 index 0000000000..f2fe4a7a93 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb @@ -0,0 +1,23 @@ +SUMMARY = "GNT: The GLib Ncurses Toolkit" + +SECTION = "libs" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=c9a1abacd0166f595a9fbe6afb1f0d5e" +DEPENDS = "glib-2.0 ncurses libxml2 glib-2.0-native" + +inherit meson pkgconfig + +# SRCREV = "0a44b1d01c41" +# SRC_URI = "hg://keep.imfreedom.org/${BPN};module=${BPN} + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/pidgin/${BPN}/${PV}/${BP}.tar.xz \ + file://0001-meson-import-changes-from-3.0.-version.patch \ +" +SRC_URI[sha256sum] = "5ec3e68e18f956e9998d79088b299fa3bca689bcc95c86001bc5da17c1eb4bd8" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/pidgin/files/libgnt/" +UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)" + +EXTRA_OEMESON = "-Dintrospection=false -Ddoc=false" + +FILES:${PN} += "${libdir}/gnt/s.so ${libdir}/gnt/irssi.so" diff --git a/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch b/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch new file mode 100644 index 0000000000..5b2e14b7b9 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch @@ -0,0 +1,31 @@ +From aa2362e50d54fce8464d85766f5b230bf453c1f0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 8 Apr 2022 20:15:03 -0700 +Subject: [PATCH] tests: Include missing sys/socket.h header + +Helps define +| ../../../../libotr-4.1.1/tests/regression/client/client.c:979:21: error: use of undeclared identifier 'PF_UNIX' +| ../../../../libotr-4.1.1/tests/regression/client/client.c:979:30: error: use of undeclared identifier 'SOCK_STREAM' +| ../../../../libotr-4.1.1/tests/regression/client/client.c:986:20: error: use of undeclared identifier 'AF_UNIX' + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/regression/client/client.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/regression/client/client.c b/tests/regression/client/client.c +index e72b661..e0b3453 100644 +--- a/tests/regression/client/client.c ++++ b/tests/regression/client/client.c +@@ -26,6 +26,7 @@ + #include <stdlib.h> + #include <syscall.h> + #include <sys/epoll.h> ++#include <sys/socket.h> + #include <sys/types.h> + #include <sys/un.h> + #include <unistd.h> +-- +2.35.1 + diff --git a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb index c701244219..115a6968eb 100644 --- a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb +++ b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb @@ -1,12 +1,13 @@ SUMMARY = "(OTR) Messaging allows you to have private conversations over instant messaging" HOMEPAGE = "http://www.cypherpunks.ca/otr/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24" DEPENDS = "libgcrypt libgpg-error" SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \ file://fix_qa-issue_include.patch \ file://sepbuild.patch \ + file://0001-tests-Include-missing-sys-socket.h-header.patch \ " SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81" diff --git a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb index 5a21cd3fc9..326c5bfc57 100644 --- a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb +++ b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb @@ -1,6 +1,6 @@ SUMMARY = "(OTR) Messaging allows you to have private conversations over instant messaging" HOMEPAGE = "https://otr.cypherpunks.ca/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24" DEPENDS = "libgcrypt libotr pidgin gtk+ intltool-native glib-2.0 glib-2.0-native" REQUIRED_DISTRO_FEATURES = "x11" @@ -10,6 +10,6 @@ SRC_URI = "https://otr.cypherpunks.ca/${BP}.tar.gz \ SRC_URI[md5sum] = "7ef14e1334a4bc80e5d530f9a3cfc626" SRC_URI[sha256sum] = "f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4" -FILES_${PN} = "${libdir}/pidgin/*" +FILES:${PN} = "${libdir}/pidgin/*" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch new file mode 100644 index 0000000000..87a6435f7e --- /dev/null +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch @@ -0,0 +1,50 @@ +From 1110d3036e73d0571f70f6758f3179e5048c0b5d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 16 Nov 2019 11:07:42 -0800 +Subject: [PATCH] Align structs casts with time_t elements to 8byte boundary + +This helps with 64bit time_t conversion, especially where these +structures are typcasted to another struct types which have time_t +element, that now increases the natural alignment boundary of structures +to 8-bytes. + +Fixes +../../../pidgin-sipe-1.25.0/src/core/sipe-user.c:124:43: error: cast from 'struct sipe_core_public *' to 'struct sipe_core_private *' increases required alignment from 4 to 8 [-Werror,-Wcast-align] + struct sipe_core_private *sipe_private = SIPE_CORE_PRIVATE; + ^~~~~~~~~~~~~~~~~ +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/api/sipe-core.h | 2 +- + src/core/sipe-http-transport.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/api/sipe-core.h b/src/api/sipe-core.h +index cde0a9c..bd818bb 100644 +--- a/src/api/sipe-core.h ++++ b/src/api/sipe-core.h +@@ -148,7 +148,7 @@ struct sipe_core_public { + + /* server information */ + /* currently nothing */ +-}; ++} __attribute__((aligned(8))); + + /** + * Initialize & destroy functions for the SIPE core +diff --git a/src/core/sipe-http-transport.h b/src/core/sipe-http-transport.h +index d82cd1b..08eb150 100644 +--- a/src/core/sipe-http-transport.h ++++ b/src/core/sipe-http-transport.h +@@ -46,7 +46,7 @@ struct sipe_http_connection_public { + gchar *host; + guint32 port; + gboolean connected; +-}; ++} __attribute__((aligned(8))); + + /** + * Check if we're shutting down the HTTP stack +-- +2.24.0 + diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch new file mode 100644 index 0000000000..ceb48d21fc --- /dev/null +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch @@ -0,0 +1,192 @@ +From 51c95a23bff3a024dc19e3127ca751e1458be0f0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 5 Apr 2021 11:36:50 -0700 +Subject: [PATCH] Migrate to use g_memdup2 + +g_memdup has been deprecated for long and latest glib-2.0 2.68+ has +turned it int an error to use old function. + +The fall-back to g_memdup isn't needed because pidgin provides g_memdup2 +in pidgin-sipe/1.25.0-r0/recipe-sysroot/usr/include/libpurple/glibcompat.h +based on glib-2.0 version: + /* Backport the static inline version of g_memdup2 if we don't have g_memdup2. + * see https://mail.gnome.org/archives/desktop-devel-list/2021-February/msg00000.html + * for more information. + */ + #if !GLIB_CHECK_VERSION(2, 67, 3) + static inline gpointer + g_memdup2(gconstpointer mem, gsize byte_size) { + gpointer new_mem = NULL; + + if(mem && byte_size != 0) { + new_mem = g_malloc (byte_size); + memcpy (new_mem, mem, byte_size); + } + + return new_mem; + } + #endif /* !GLIB_CHECK_VERSION(2, 67, 3) */ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/api/sipe-common.h | 3 +++ + src/core/sip-sec-gssapi.c | 4 ++-- + src/core/sip-sec-ntlm.c | 12 ++++++------ + src/core/sip-sec-tls-dsk.c | 4 ++-- + src/core/sipe-media.c | 2 +- + src/core/sipe-tls-tester.c | 2 +- + src/core/sipe-tls.c | 4 ++-- + src/telepathy/telepathy-protocol.c | 2 +- + 8 files changed, 18 insertions(+), 15 deletions(-) + +diff --git a/src/api/sipe-common.h b/src/api/sipe-common.h +index c964f15..cab81e0 100644 +--- a/src/api/sipe-common.h ++++ b/src/api/sipe-common.h +@@ -51,3 +51,6 @@ + #ifdef _MSC_VER + typedef long ssize_t; + #endif ++ ++// for g_memdup2 ++#include <libpurple/glibcompat.h> +diff --git a/src/core/sip-sec-gssapi.c b/src/core/sip-sec-gssapi.c +index 873080f..4c63868 100644 +--- a/src/core/sip-sec-gssapi.c ++++ b/src/core/sip-sec-gssapi.c +@@ -602,7 +602,7 @@ sip_sec_init_sec_context__gssapi(SipSecContext context, + + out_buff->length = output_token.length; + if (out_buff->length) +- out_buff->value = g_memdup(output_token.value, output_token.length); ++ out_buff->value = g_memdup2(output_token.value, output_token.length); + else + /* Special case: empty token */ + out_buff->value = (guint8 *) g_strdup(""); +@@ -653,7 +653,7 @@ sip_sec_make_signature__gssapi(SipSecContext context, + return FALSE; + } else { + signature->length = output_token.length; +- signature->value = g_memdup(output_token.value, ++ signature->value = g_memdup2(output_token.value, + output_token.length); + gss_release_buffer(&minor, &output_token); + return TRUE; +diff --git a/src/core/sip-sec-ntlm.c b/src/core/sip-sec-ntlm.c +index 2e2354f..1fa4daa 100644 +--- a/src/core/sip-sec-ntlm.c ++++ b/src/core/sip-sec-ntlm.c +@@ -951,7 +951,7 @@ sip_sec_ntlm_parse_challenge(SipSecBuffer in_buff, + + /* server challenge (nonce) */ + if (server_challenge) { +- *server_challenge = g_memdup(cmsg->nonce, 8); ++ *server_challenge = g_memdup2(cmsg->nonce, 8); + } + + /* flags */ +@@ -984,7 +984,7 @@ sip_sec_ntlm_parse_challenge(SipSecBuffer in_buff, + *target_info_len = len; + } + if (target_info) { +- *target_info = g_memdup(content, len); ++ *target_info = g_memdup2(content, len); + } + } + } +@@ -1117,13 +1117,13 @@ sip_sec_ntlm_gen_authenticate(guchar **client_sign_key, + Set ServerSigningKey to SIGNKEY(ExportedSessionKey, "Server") + */ + SIGNKEY(exported_session_key, TRUE, key); +- *client_sign_key = g_memdup(key, 16); ++ *client_sign_key = g_memdup2(key, 16); + SIGNKEY(exported_session_key, FALSE, key); +- *server_sign_key = g_memdup(key, 16); ++ *server_sign_key = g_memdup2(key, 16); + SEALKEY(neg_flags, exported_session_key, TRUE, key); +- *client_seal_key = g_memdup(key, 16); ++ *client_seal_key = g_memdup2(key, 16); + SEALKEY(neg_flags, exported_session_key, FALSE, key); +- *server_seal_key = g_memdup(key, 16); ++ *server_seal_key = g_memdup2(key, 16); + } + + /* @TODO: */ +diff --git a/src/core/sip-sec-tls-dsk.c b/src/core/sip-sec-tls-dsk.c +index 70433ea..2d3f2db 100644 +--- a/src/core/sip-sec-tls-dsk.c ++++ b/src/core/sip-sec-tls-dsk.c +@@ -88,9 +88,9 @@ sip_sec_init_sec_context__tls_dsk(SipSecContext context, + /* copy key pair */ + ctx->algorithm = state->algorithm; + ctx->key_length = state->key_length; +- ctx->client_key = g_memdup(state->client_key, ++ ctx->client_key = g_memdup2(state->client_key, + state->key_length); +- ctx->server_key = g_memdup(state->server_key, ++ ctx->server_key = g_memdup2(state->server_key, + state->key_length); + + /* extract certicate expiration time */ +diff --git a/src/core/sipe-media.c b/src/core/sipe-media.c +index e9c4b8a..936e31c 100644 +--- a/src/core/sipe-media.c ++++ b/src/core/sipe-media.c +@@ -578,7 +578,7 @@ media_stream_to_sdpmedia(struct sipe_media_call_private *call_private, + // Set our key if encryption is enabled. + if (stream_private->encryption_key && + encryption_policy != SIPE_ENCRYPTION_POLICY_REJECTED) { +- sdpmedia->encryption_key = g_memdup(stream_private->encryption_key, ++ sdpmedia->encryption_key = g_memdup2(stream_private->encryption_key, + SIPE_SRTP_KEY_LEN); + sdpmedia->encryption_key_id = stream_private->encryption_key_id; + } +diff --git a/src/core/sipe-tls-tester.c b/src/core/sipe-tls-tester.c +index e80d715..5fbb5f8 100644 +--- a/src/core/sipe-tls-tester.c ++++ b/src/core/sipe-tls-tester.c +@@ -155,7 +155,7 @@ static guchar *read_tls_record(int fd, + printf("received %d bytes from server\n", result); + record = g_new0(struct record, 1); + record->length = result; +- record->msg = g_memdup(buffer, result); ++ record->msg = g_memdup2(buffer, result); + length += result; + fragments = g_slist_append(fragments, record); + } +diff --git a/src/core/sipe-tls.c b/src/core/sipe-tls.c +index b0235d5..020aedb 100644 +--- a/src/core/sipe-tls.c ++++ b/src/core/sipe-tls.c +@@ -427,7 +427,7 @@ static guchar *sipe_tls_prf(SIPE_UNUSED_PARAMETER struct tls_internal_state *sta + gsize half = (secret_length + 1) / 2; + gsize newseed_length = label_length + seed_length; + /* secret: used as S1; secret2: last half of original secret (S2) */ +- guchar *secret2 = g_memdup(secret + secret_length - half, half); ++ guchar *secret2 = g_memdup2(secret + secret_length - half, half); + guchar *newseed = g_malloc(newseed_length); + guchar *md5, *dest; + guchar *sha1, *src; +@@ -1525,7 +1525,7 @@ static struct tls_compiled_message *tls_client_key_exchange(struct tls_internal_ + + /* found all the required fields */ + state->server_random.length = server_random->length; +- state->server_random.buffer = g_memdup(server_random->data, ++ state->server_random.buffer = g_memdup2(server_random->data, + server_random->length); + tls_calculate_secrets(state); + +diff --git a/src/telepathy/telepathy-protocol.c b/src/telepathy/telepathy-protocol.c +index f6e5337..1dde579 100644 +--- a/src/telepathy/telepathy-protocol.c ++++ b/src/telepathy/telepathy-protocol.c +@@ -237,7 +237,7 @@ static void get_connection_details(SIPE_UNUSED_PARAMETER TpBaseProtocol *self, + SIPE_TYPE_SEARCH_MANAGER, + G_TYPE_INVALID + }; +- *channel_managers = g_memdup(types, sizeof(types)); ++ *channel_managers = g_memdup2(types, sizeof(types)); + } + if (icon_name) + *icon_name = g_strdup("im-" SIPE_TELEPATHY_DOMAIN); diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch new file mode 100644 index 0000000000..1dc7ca3f17 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch @@ -0,0 +1,36 @@ +From fedef3c0b1772cee97d7288bee7d5d50805a5964 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 12 Dec 2020 08:56:04 -0800 +Subject: [PATCH] configure: Do not add native paths to pkgconfig search + +This does not work in cross environments, secondly in OE we already +point pkkconfig into recipe sysroot where it will find all the +dependencies therefore this setting is not needed + +Upstream-Status: Inappropriate [ OE-Specific ] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0df85b0..2481153 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -70,12 +70,6 @@ AC_CHECK_HEADERS([]) + dnl checks for library functions + AC_CHECK_FUNCS([]) + +-dnl tell pkgconfig to look in the same prefix where we're installing this to, +-dnl as that is likely where libpurple will be found if it is not in the default +-dnl pkgconfig path +-PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${libdir}/pkgconfig" +-export PKG_CONFIG_PATH +- + dnl debug mode + AC_ARG_ENABLE(debug, + [AS_HELP_STRING([--enable-debug], +-- +2.29.2 + diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-sipe-consider-64bit-time_t-when-printing.patch b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-sipe-consider-64bit-time_t-when-printing.patch new file mode 100644 index 0000000000..e7a72953da --- /dev/null +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-sipe-consider-64bit-time_t-when-printing.patch @@ -0,0 +1,31 @@ +From ae6fa551907006c612cca98b87f339d4d6f45e25 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 11 Nov 2019 21:08:11 -0800 +Subject: [PATCH] sipe: consider 64bit time_t when printing + +This helps printing 64bit time_t on 32bit architectures + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/core/sipe-utils.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/core/sipe-utils.c b/src/core/sipe-utils.c +index 12ff8d6..d3d4071 100644 +--- a/src/core/sipe-utils.c ++++ b/src/core/sipe-utils.c +@@ -414,8 +414,8 @@ sipe_utils_time_to_str(time_t timestamp) + if (result) + return(result); + +- SIPE_DEBUG_ERROR("sipe_utils_time_to_str: failed to convert %lu to ISO8601 string", +- timestamp); ++ SIPE_DEBUG_ERROR("sipe_utils_time_to_str: failed to convert %lld to ISO8601 string", ++ (long long int)timestamp); + return(g_strdup("")); + } + +-- +2.24.0 + diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb new file mode 100644 index 0000000000..e96e118611 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -0,0 +1,43 @@ +SUMMARY = "Protocol plugin for Office 365/Lync/OCS for Adium, Pidgin, Miranda and Telepathy IM Framework" +SECTION = "webos/services" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "pidgin gmime intltool-native glib-2.0-native" + +inherit autotools gettext pkgconfig + +SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \ + file://0001-sipe-consider-64bit-time_t-when-printing.patch \ + file://0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch \ + file://0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch \ + file://0001-Migrate-to-use-g_memdup2.patch \ +" + +SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314" +SRC_URI[sha256sum] = "738b121b11f2b3f1744150c00cb381222eb6cf67161a7742797eb4f03e64a2ba" + +PACKAGECONFIG ??= "nss krb5" +PACKAGECONFIG[nss] = "--enable-nss=yes,--enable-nss=no,nss" +PACKAGECONFIG[openssl] = "--enable-openssl=yes,--enable-openssl=no,openssl" +PACKAGECONFIG[krb5] = "--with-krb5=yes,--with-krb5=no,krb5" +#PACKAGECONFIG[voice_and_video] = "--with-vv=yes,--with-vv=no,libnice gstreamer" +PACKAGECONFIG[telepathy] = "--enable-telepathy=yes,--enable-telepathy=no,telepathy-glib" +#PACKAGECONFIG[gssapi_only] = "--enable-gssapi-only=yes,--enable-gssapi-only=no,krb5" +PACKAGECONFIG[debug] = "--enable-debug=yes,--enable-debug=no,valgrind" +# disable Werror by default, useful for dev mode +PACKAGECONFIG[quality] = "--enable-quality-check=yes,--enable-quality-check=no," + +FILES:${PN}-dev += " \ + ${libdir}/purple-2/*.la \ +" + +FILES:${PN} += " \ + ${libdir}/purple-2/libsipe.so \ + ${datadir}/appdata \ + ${datadir}/metainfo \ +" + +# http://errors.yoctoproject.org/Errors/Details/766947/ +# pidgin-sipe-1.25.0/src/core/sipe-xml.c:210:9: error: initialization of 'void (*)(void *, const xmlError *)' {aka 'void (*)(void *, const struct _xmlError *)'} from incompatible pointer type 'void (*)(void *, xmlError *)' {aka 'void (*)(void *, struct _xmlError *)'} [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch b/meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch new file mode 100644 index 0000000000..4e088ffc11 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch @@ -0,0 +1,177 @@ +# HG changeset patch +# User Yoann Congal <yoann.congal@smile.fr> +# Date 1720270125 -7200 +# Sat Jul 06 14:48:45 2024 +0200 +# Branch gcc-14-incompatible-pointer-types +# Node ID 06721b86a5a8e6fb8163d9411a7778d2a0274b26 +# Parent 21a56db5f9987efb88d76ab26ee1eadf316f3d7d +Fix incompatible pointer types for GtkItemFactoryCallbacks on gcc-14 + +The GtkItemFactoryEntry struct callback is of type GtkItemFactoryCallbacks +(aka void (*)(void)) but is initialised with GtkItemFactoryCallback1 types +(aka void (*)(void *, guint, GtkWidget *)). + +This is coherent with the gtk-2 documentation: +> gtk_item_factory_create_items(..., GtkItemFactoryEntry *entries,...) +> entries : an array of GtkItemFactoryEntrys whose callback members must by of +> type GtkItemFactoryCallback1 + +But, under gcc-14, the implicit cast from GtkItemFactoryCallback1 to +GtkItemFactoryCallback triggers an incompatible-pointer-types error (See [0]). + +An exemple of this error: +pidgin/gtkconv.c:3096:66: error: initialization of 'void (*)(void)' from incompatible pointer type 'void (*)(void *, guint, GtkWidget *)' {aka 'void (*)(void *, unsigned int, struct _GtkWidget *)'} [-Wincompatible-pointer-types] + 3096 | { N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb, + | ^~~~~~~~~~~~~~~~ +pidgin/gtkconv.c:3096:66: note: (near initialization for 'menu_items[1].callback') + +To fix this, explicitely cast to GtkItemFactoryCallback where needed. + +Testing Done: +Built with gcc-14, started and clicked on some affected menus + +[0]: https://gcc.gnu.org/gcc-14/porting_to.html#incompatible-pointer-types + +Upstream-Status: Backport [https://keep.imfreedom.org/pidgin/pidgin/rev/210f318db492] +Signed-off-by: Yoann Congal <yoann.congal@smile.fr> + +diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c +--- a/pidgin/gtkblist.c ++++ b/pidgin/gtkblist.c +@@ -3624,11 +3624,11 @@ static GtkItemFactoryEntry blist_menu[] + { N_("/Buddies/View User _Log..."), "<CTL>L", pidgin_dialogs_log, 0, "<Item>", NULL }, + { "/Buddies/sep1", NULL, NULL, 0, "<Separator>", NULL }, + { N_("/Buddies/Sh_ow"), NULL, NULL, 0, "<Branch>", NULL}, +- { N_("/Buddies/Show/_Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL }, +- { N_("/Buddies/Show/_Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL }, +- { N_("/Buddies/Show/Buddy _Details"), NULL, pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL }, +- { N_("/Buddies/Show/Idle _Times"), NULL, pidgin_blist_show_idle_time_cb, 1, "<CheckItem>", NULL }, +- { N_("/Buddies/Show/_Protocol Icons"), NULL, pidgin_blist_show_protocol_icons_cb, 1, "<CheckItem>", NULL }, ++ { N_("/Buddies/Show/_Offline Buddies"), NULL, (GtkItemFactoryCallback)pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL }, ++ { N_("/Buddies/Show/_Empty Groups"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL }, ++ { N_("/Buddies/Show/Buddy _Details"), NULL, (GtkItemFactoryCallback)pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL }, ++ { N_("/Buddies/Show/Idle _Times"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_idle_time_cb, 1, "<CheckItem>", NULL }, ++ { N_("/Buddies/Show/_Protocol Icons"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_protocol_icons_cb, 1, "<CheckItem>", NULL }, + { N_("/Buddies/_Sort Buddies"), NULL, NULL, 0, "<Branch>", NULL }, + { "/Buddies/sep2", NULL, NULL, 0, "<Separator>", NULL }, + { N_("/Buddies/_Add Buddy..."), "<CTL>B", pidgin_blist_add_buddy_cb, 0, "<StockItem>", GTK_STOCK_ADD }, +@@ -3651,11 +3651,11 @@ static GtkItemFactoryEntry blist_menu[] + { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL }, + { N_("/Tools/Set _Mood"), "<CTL>D", set_mood_show, 0, "<Item>", NULL }, + { "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL }, +- { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER }, ++ { N_("/Tools/_File Transfers"), "<CTL>T", (GtkItemFactoryCallback)pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER }, + { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL }, + { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 3, "<Item>", NULL }, + { "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL }, +- { N_("/Tools/Mute _Sounds"), NULL, pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL }, ++ { N_("/Tools/Mute _Sounds"), NULL, (GtkItemFactoryCallback)pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL }, + /* Help */ + { N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL }, + { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP }, +diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c +--- a/pidgin/gtkconv.c ++++ b/pidgin/gtkconv.c +@@ -3093,76 +3093,76 @@ static GtkItemFactoryEntry menu_items[] + /* Conversation menu */ + { N_("/_Conversation"), NULL, NULL, 0, "<Branch>", NULL }, + +- { N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb, ++ { N_("/Conversation/New Instant _Message..."), "<CTL>M", (GtkItemFactoryCallback)menu_new_conv_cb, + 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW }, +- { N_("/Conversation/Join a _Chat..."), NULL, menu_join_chat_cb, ++ { N_("/Conversation/Join a _Chat..."), NULL, (GtkItemFactoryCallback)menu_join_chat_cb, + 0, "<StockItem>", PIDGIN_STOCK_CHAT }, + + { "/Conversation/sep0", NULL, NULL, 0, "<Separator>", NULL }, + +- { N_("/Conversation/_Find..."), NULL, menu_find_cb, 0, ++ { N_("/Conversation/_Find..."), NULL, (GtkItemFactoryCallback)menu_find_cb, 0, + "<StockItem>", GTK_STOCK_FIND }, +- { N_("/Conversation/View _Log"), NULL, menu_view_log_cb, 0, "<Item>", NULL }, +- { N_("/Conversation/_Save As..."), NULL, menu_save_as_cb, 0, ++ { N_("/Conversation/View _Log"), NULL, (GtkItemFactoryCallback)menu_view_log_cb, 0, "<Item>", NULL }, ++ { N_("/Conversation/_Save As..."), NULL, (GtkItemFactoryCallback)menu_save_as_cb, 0, + "<StockItem>", GTK_STOCK_SAVE_AS }, +- { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", menu_clear_cb, 0, "<StockItem>", GTK_STOCK_CLEAR }, ++ { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", (GtkItemFactoryCallback)menu_clear_cb, 0, "<StockItem>", GTK_STOCK_CLEAR }, + + { "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL }, + + #ifdef USE_VV + { N_("/Conversation/M_edia"), NULL, NULL, 0, "<Branch>", NULL }, + +- { N_("/Conversation/Media/_Audio Call"), NULL, menu_initiate_media_call_cb, 0, ++ { N_("/Conversation/Media/_Audio Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 0, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_AUDIO_CALL }, +- { N_("/Conversation/Media/_Video Call"), NULL, menu_initiate_media_call_cb, 1, ++ { N_("/Conversation/Media/_Video Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 1, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_VIDEO_CALL }, +- { N_("/Conversation/Media/Audio\\/Video _Call"), NULL, menu_initiate_media_call_cb, 2, ++ { N_("/Conversation/Media/Audio\\/Video _Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 2, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_VIDEO_CALL }, + #endif + +- { N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE }, +- { N_("/Conversation/Get _Attention"), NULL, menu_get_attention_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION }, +- { N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb, ++ { N_("/Conversation/Se_nd File..."), NULL, (GtkItemFactoryCallback)menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE }, ++ { N_("/Conversation/Get _Attention"), NULL, (GtkItemFactoryCallback)menu_get_attention_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION }, ++ { N_("/Conversation/Add Buddy _Pounce..."), NULL, (GtkItemFactoryCallback)menu_add_pounce_cb, + 0, "<Item>", NULL }, +- { N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0, ++ { N_("/Conversation/_Get Info"), "<CTL>O", (GtkItemFactoryCallback)menu_get_info_cb, 0, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO }, +- { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0, ++ { N_("/Conversation/In_vite..."), NULL, (GtkItemFactoryCallback)menu_invite_cb, 0, + "<Item>", NULL }, + { N_("/Conversation/M_ore"), NULL, NULL, 0, "<Branch>", NULL }, + + { "/Conversation/sep2", NULL, NULL, 0, "<Separator>", NULL }, + +- { N_("/Conversation/Al_ias..."), NULL, menu_alias_cb, 0, ++ { N_("/Conversation/Al_ias..."), NULL, (GtkItemFactoryCallback)menu_alias_cb, 0, + "<Item>", NULL }, +- { N_("/Conversation/_Block..."), NULL, menu_block_cb, 0, ++ { N_("/Conversation/_Block..."), NULL, (GtkItemFactoryCallback)menu_block_cb, 0, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_BLOCK }, +- { N_("/Conversation/_Unblock..."), NULL, menu_unblock_cb, 0, ++ { N_("/Conversation/_Unblock..."), NULL, (GtkItemFactoryCallback)menu_unblock_cb, 0, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_UNBLOCK }, +- { N_("/Conversation/_Add..."), NULL, menu_add_remove_cb, 0, ++ { N_("/Conversation/_Add..."), NULL, (GtkItemFactoryCallback)menu_add_remove_cb, 0, + "<StockItem>", GTK_STOCK_ADD }, +- { N_("/Conversation/_Remove..."), NULL, menu_add_remove_cb, 0, ++ { N_("/Conversation/_Remove..."), NULL, (GtkItemFactoryCallback)menu_add_remove_cb, 0, + "<StockItem>", GTK_STOCK_REMOVE }, + + { "/Conversation/sep3", NULL, NULL, 0, "<Separator>", NULL }, + +- { N_("/Conversation/Insert Lin_k..."), NULL, menu_insert_link_cb, 0, ++ { N_("/Conversation/Insert Lin_k..."), NULL, (GtkItemFactoryCallback)menu_insert_link_cb, 0, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_INSERT_LINK }, +- { N_("/Conversation/Insert Imag_e..."), NULL, menu_insert_image_cb, 0, ++ { N_("/Conversation/Insert Imag_e..."), NULL, (GtkItemFactoryCallback)menu_insert_image_cb, 0, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE }, + + { "/Conversation/sep4", NULL, NULL, 0, "<Separator>", NULL }, + + +- { N_("/Conversation/_Close"), NULL, menu_close_conv_cb, 0, ++ { N_("/Conversation/_Close"), NULL, (GtkItemFactoryCallback)menu_close_conv_cb, 0, + "<StockItem>", GTK_STOCK_CLOSE }, + + /* Options */ + { N_("/_Options"), NULL, NULL, 0, "<Branch>", NULL }, +- { N_("/Options/Enable _Logging"), NULL, menu_logging_cb, 0, "<CheckItem>", NULL }, +- { N_("/Options/Enable _Sounds"), NULL, menu_sounds_cb, 0, "<CheckItem>", NULL }, ++ { N_("/Options/Enable _Logging"), NULL, (GtkItemFactoryCallback)menu_logging_cb, 0, "<CheckItem>", NULL }, ++ { N_("/Options/Enable _Sounds"), NULL, (GtkItemFactoryCallback)menu_sounds_cb, 0, "<CheckItem>", NULL }, + { "/Options/sep0", NULL, NULL, 0, "<Separator>", NULL }, +- { N_("/Options/Show Formatting _Toolbars"), NULL, menu_toolbar_cb, 0, "<CheckItem>", NULL }, +- { N_("/Options/Show Ti_mestamps"), NULL, menu_timestamps_cb, 0, "<CheckItem>", NULL }, ++ { N_("/Options/Show Formatting _Toolbars"), NULL, (GtkItemFactoryCallback)menu_toolbar_cb, 0, "<CheckItem>", NULL }, ++ { N_("/Options/Show Ti_mestamps"), NULL, (GtkItemFactoryCallback)menu_timestamps_cb, 0, "<CheckItem>", NULL }, + }; + + static const int menu_item_count = diff --git a/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch b/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch deleted file mode 100644 index 72bf4ed41b..0000000000 --- a/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +++ /dev/null @@ -1,34 +0,0 @@ -Use pkg-config instead of ${PYTHON}-config to find python - -diff -uNr pidgin-2.10.12.orig/configure.ac pidgin-2.10.12/configure.ac ---- pidgin-2.10.12.orig/configure.ac 2016-01-01 00:19:40.000000000 +0100 -+++ pidgin-2.10.12/configure.ac 2016-05-05 16:55:13.258945925 +0200 -@@ -1585,20 +1585,15 @@ - dnl Check for Python headers (currently useful only for libgnt) - dnl (Thanks to XChat) - if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then -- AC_MSG_CHECKING(for Python compile flags) -- if test -f ${PYTHON}-config; then -- PY_CFLAGS=`${PYTHON}-config --includes` -- PY_LIBS=`${PYTHON}-config --libs` -- AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.]) -- AC_MSG_RESULT(ok) -- else -- AC_MSG_RESULT([Cannot find ${PYTHON}-config]) -- PY_CFLAGS="" -- PY_LIBS="" -- fi -+ AC_MSG_CHECKING(for Python compile flags) -+ PKG_CHECK_MODULES(PY, python, [ -+ AC_SUBST(PY_CFLAGS) -+ AC_SUBST(PY_LIBS) -+ ], [ -+ AC_MSG_RESULT(no) -+ AC_MSG_ERROR([Can't find python]) -+ ]) - fi --AC_SUBST(PY_CFLAGS) --AC_SUBST(PY_LIBS) - - dnl ####################################################################### - dnl # Check for Mono support diff --git a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch deleted file mode 100644 index 293ef709d1..0000000000 --- a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: pidgin-2.5.0/libpurple/protocols/irc/irc.h -=================================================================== ---- pidgin-2.5.0.orig/libpurple/protocols/irc/irc.h 2008-08-19 01:53:38.000000000 +0000 -+++ pidgin-2.5.0/libpurple/protocols/irc/irc.h 2008-08-27 11:15:58.000000000 +0000 -@@ -36,9 +36,9 @@ - - #define IRC_DEFAULT_CHARSET "UTF-8" - #define IRC_DEFAULT_AUTODETECT FALSE --#define IRC_DEFAULT_ALIAS "purple" -+#define IRC_DEFAULT_ALIAS "OE-user" - --#define IRC_DEFAULT_QUIT "Leaving." -+#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org" - - #define IRC_INITIAL_BUFSIZE 1024 - diff --git a/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch b/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch index a77d64f40b..cf6207423d 100644 --- a/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch +++ b/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch @@ -1,6 +1,18 @@ ---- /tmp/configure.ac 2007-05-08 17:29:02.000000000 +0200 -+++ pidgin-2.0.0/configure.ac 2007-05-08 17:30:30.325251000 +0200 -@@ -472,7 +472,7 @@ +From c3058f9eadaf5ff28ba776cfed54b609a93a1249 Mon Sep 17 00:00:00 2001 +From: Herrie <github.com@herrie.org> +Date: Mon, 24 Jul 2017 21:30:16 +0200 + +--- +Upstream-Status: Pending + + configure.ac | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b8acd2a..d20a18e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -642,7 +642,7 @@ if test "x$enable_consoleui" = "xyes"; then if test "x$enable_consoleui" = "xyes"; then dnl # Some distros put the headers in ncursesw/, some don't found_ncurses_h=no @@ -8,8 +20,8 @@ + for location in $ac_ncurses_includes $NCURSES_HEADERS do f="$location/ncurses.h" - AC_CHECK_HEADER($f,[ -@@ -1860,10 +1860,6 @@ + orig_CFLAGS="$CFLAGS" +@@ -2397,10 +2397,6 @@ if test "$kerberos" != "no" ; then KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV" fi KRB4_LDFLAGS="-L${kerberos}/lib" @@ -20,7 +32,7 @@ fi AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.]) -@@ -1896,10 +1892,6 @@ +@@ -2433,10 +2429,6 @@ if test "$zephyr" != "no" ; then ZEPHYR_LDFLAGS="-L${zephyr}/lib" elif test -d /usr/athena/include/zephyr ; then ZEPHYR_CFLAGS="-I/usr/athena/include" diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.12.0.bb b/meta-oe/recipes-support/pidgin/pidgin_2.14.13.bb index 088f08b7d6..ac62863f5c 100644 --- a/meta-oe/recipes-support/pidgin/pidgin_2.12.0.bb +++ b/meta-oe/recipes-support/pidgin/pidgin_2.14.13.bb @@ -1,25 +1,26 @@ SUMMARY = "multi-protocol instant messaging client" + SECTION = "x11/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "python virtual/libintl intltool-native libxml2 gconf glib-2.0-native" +DEPENDS = "python3 virtual/libintl intltool-native libxml2 gconf glib-2.0-native" -inherit autotools gettext pkgconfig gconf perlnative +inherit autotools gettext pkgconfig gconf perlnative python3native SRC_URI = "\ ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://sanitize-configure.ac.patch \ - file://purple-OE-branding-25.patch \ - file://pidgin-cross-python-265.patch \ + file://fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch \ " -SRC_URI[md5sum] = "8287400c4e5663e0e7844e868d5152af" -SRC_URI[sha256sum] = "8c3d3536d6d3c971bd433ff9946678af70a0f6aa4e6969cc2a83bb357015b7f8" +SRC_URI[sha256sum] = "120049dc8e17e09a2a7d256aff2191ff8491abb840c8c7eb319a161e2df16ba8" + +CVE_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." +CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ " -PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2" # --disable-gstreamer compile without GStreamer audio support # --disable-gstreamer-video # compile without GStreamer 1.0 Video Overlay support @@ -27,17 +28,17 @@ PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2" # compile without GStreamer 0.10 interface support # --with-gstreamer=<version> # compile with GStreamer 0.10 or 1.0 interface -PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer" -PACKAGECONFIG[vv] = "--enable-vv,--disable-vv,gstreamer" +PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer1.0" PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn" PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+" PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" -PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,ncurses" +PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,libgnt" PACKAGECONFIG[gnutls] = "--enable-gnutls --with-gnutls-includes=${STAGING_INCDIR} --with-gnutls-libs=${STAGING_LIBDIR},--disable-gnutls,gnutls,libpurple-plugin-ssl-gnutls" PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" PACKAGECONFIG[nss] = "--enable-nss,--disable-nss,nss nspr,libpurple-plugin-ssl-nss" +PACKAGECONFIG[cyrus-sasl] = "--enable-cyrus-sasl,--disable-cyrus-sasl,cyrus-sasl" EXTRA_OECONF = " \ --disable-perl \ @@ -48,72 +49,71 @@ EXTRA_OECONF = " \ --disable-meanwhile \ --disable-nm \ --disable-screensaver \ + --disable-farstream \ + --disable-vv \ " -do_configure_prepend() { - touch ${S}/po/Makefile - sed -i "s#PY_VERSION=`$PYTHON -c 'import sys ; print sys.version[0:3]'`#PY_VERSION=${PYTHON_BASEVERSION}#g" ${S}/configure.ac +# CONFIG_ARGS is used to display build info. Replace full paths by reproducible +# variables ($S, $WORKDIR) +do_configure:append() { + sed -i -e "/CONFIG_ARGS/s|${S}|\$S|g" ${B}/config.h + sed -i -e "/CONFIG_ARGS/s|${WORKDIR}|\$WORKDIR|g" ${B}/config.h } OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" OE_LT_RPATH_ALLOW[export]="1" -PACKAGES =+ "libpurple-dbg libpurple-dev libpurple libgnt-dbg libgnt libgnt-dev finch-dbg finch finch-dev ${PN}-data" +PACKAGES =+ "libpurple-dev libpurple finch finch-dev ${PN}-data" + +RPROVIDES:${PN}-dbg += "libpurple-dbg finch-dbg" LEAD_SONAME = "libpurple.so.0" -FILES_libpurple = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple* ${datadir}/purple/ca-certs" -FILES_libpurple-dev = "${libdir}/libpurple*.la \ +FILES:libpurple = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple* ${datadir}/purple/ca-certs" +FILES:libpurple-dev = "${libdir}/libpurple*.la \ ${libdir}/libpurple*.so \ ${libdir}/purple-2/*.la \ ${libdir}/purple-2/libjabber.so \ ${libdir}/purple-2/liboscar.so \ ${libdir}/purple-2/libymsg.so \ ${datadir}/aclocal" -FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \ - ${libdir}/purple-2/.debug" -FILES_libgnt = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so" -FILES_libgnt-dev = "${libdir}/gnt/*.la" -FILES_libgnt-dbg = "${libdir}/gnt/.debug" -FILES_finch = "${bindir}/finch" -FILES_finch-dev = "${libdir}/finch/*.la" -FILES_finch-dbg = "${bindir}/.debug/finch \ - ${libdir}/finch/.debug" - -FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ - ${datadir}/applications" -RRECOMMENDS_${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp" - -FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata" -FILES_${PN}-dev += "${libdir}/${PN}/*.la" +FILES:finch = "${bindir}/finch" +FILES:finch-dev = "${libdir}/finch/*.la" + +FILES:${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ + ${datadir}/applications ${datadir}/metainfo" +RRECOMMENDS:${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp" + +FILES:${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata" +FILES:${PN}-dev += "${libdir}/${PN}/*.la" PACKAGES_DYNAMIC += "^libpurple-protocol-.* ^libpurple-plugin-.* ^pidgin-plugin-.* ^finch-plugin-.*" -python populate_packages_prepend () { +python populate_packages:prepend () { pidgroot = d.expand('${libdir}/pidgin') purple = d.expand('${libdir}/purple-2') finch = d.expand('${libdir}/finch') - do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$', + do_split_packages(d, pidgroot, r'^([^l][^i][^b].*)\.so$', output_pattern='pidgin-plugin-%s', description='Pidgin plugin %s', prepend=True, extra_depends='') - do_split_packages(d, purple, '^lib(.*)\.so$', + do_split_packages(d, purple, r'^lib(.*)\.so$', output_pattern='libpurple-protocol-%s', description='Libpurple protocol plugin for %s', prepend=True, extra_depends='') - do_split_packages(d, purple, '^(ssl-.*)\.so$', + do_split_packages(d, purple, r'^(ssl-.*)\.so$', output_pattern='libpurple-plugin-%s', description='libpurple plugin %s', prepend=True, extra_depends='libpurple-plugin-ssl') - do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', + do_split_packages(d, purple, r'^([^l][^i][^b].*)\.so$', output_pattern='libpurple-plugin-%s', description='libpurple plugin %s', prepend=True, extra_depends='') - do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', + do_split_packages(d, finch, r'^([^l][^i][^b].*)\.so$', output_pattern='finch-plugin-%s', description='Finch plugin %s', prepend=True, extra_depends='') diff --git a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb new file mode 100644 index 0000000000..1981f1ee9c --- /dev/null +++ b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb @@ -0,0 +1,26 @@ +SUMMARY = "Skype protocol plug-in for libpurple" +SECTION = "webos/services" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://skypeweb/gpl3.txt;md5=d90260d32cef39f3c8d6c0f05d3adb8e" + +DEPENDS = "pidgin json-glib glib-2.0 zlib" + +inherit pkgconfig + +SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=https" +SRCREV = "b226d1c457d73900ae89b8a7469247fbe33677a6" + +S = "${WORKDIR}/git" +PV = "1.7+git" + +do_compile() { + oe_runmake -C skypeweb; +} + +do_install() { + oe_runmake -C skypeweb DESTDIR="${D}" install; +} + +FILES:${PN} += " \ + ${libdir} \ +" diff --git a/meta-oe/recipes-support/pkcs11-helper/pkcs11-helper_1.11.bb b/meta-oe/recipes-support/pkcs11-helper/pkcs11-helper_1.11.bb deleted file mode 100644 index db71bd03b7..0000000000 --- a/meta-oe/recipes-support/pkcs11-helper/pkcs11-helper_1.11.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "A library for using PKCS" -DESCRIPTION = "pkcs11-helper is a library that simplifies the interaction with PKCS \ -providers for end-user applications using a simple API and optional OpenSSL \ -engine. The library allows using multiple PKCS enumerating available token \ -certificates, or selecting a certificate directly by serialized id, handling \ -card removal and card insert events, handling card ie-insert to a different \ -slot, supporting session expiration and much more all using a simple API." - -HOMEPAGE = "http://www.opensc-project.org/pkcs11-helper/" -SECTION = "Development/Libraries" - -LICENSE = "GPLv2 & BSD" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=4948810631bcac142af53d32df5b6ee1 \ - file://COPYING.GPL;md5=8a71d0475d08eee76d8b6d0c6dbec543 \ - file://COPYING.BSD;md5=f79f90ea7a106796af80b5d05f1f8da1 \ -" -SRC_URI = "git://github.com/OpenSC/${BPN}.git" -SRC_URI[md5sum] = "9f62af9f475901b89355266141306673" -SRC_URI[sha256sum] = "494ec59c93e7c56c528f335d9353849e2e7c94a6b1b41c89604694e738113386" - -S = "${WORKDIR}/git" -SRCREV = "e7adf8f35be232a4f04c53b4ac409be52792093e" - -DEPENDS = "zlib nettle gnutls gmp openssl nss nspr" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-static" diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider/0001-Fix-types-for-old-32-bit-systems.patch b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider/0001-Fix-types-for-old-32-bit-systems.patch new file mode 100644 index 0000000000..189a0e21b3 --- /dev/null +++ b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider/0001-Fix-types-for-old-32-bit-systems.patch @@ -0,0 +1,49 @@ +From 088f038de633b5de777fb0f95cd9598f320151f6 Mon Sep 17 00:00:00 2001 +From: Simo Sorce <simo@redhat.com> +Date: Wed, 5 Jun 2024 11:22:35 -0400 +Subject: [PATCH] Fix types for old 32 bit systems + +On x86 CK_ULONG and size_t have different sizes, ensure we use +compatible types on our helper functions. + +Signed-off-by: Simo Sorce <simo@redhat.com> +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- +Upstream-Status: Backport [https://github.com/latchset/pkcs11-provider/commit/9fa16b7fd398b62f06cb10892fe93dc574d67399] + + src/asymmetric_cipher.c | 4 ++-- + src/util.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/asymmetric_cipher.c b/src/asymmetric_cipher.c +index 4d87b1c..3256fd2 100644 +--- a/src/asymmetric_cipher.c ++++ b/src/asymmetric_cipher.c +@@ -251,12 +251,12 @@ static int p11prov_rsaenc_decrypt_init(void *ctx, void *provkey, + static int + p11prov_tls_constant_time_depadding(struct p11prov_rsaenc_ctx *encctx, + unsigned char *out, unsigned char *buf, +- size_t *out_size, CK_ULONG *ret_cond) ++ CK_ULONG *out_size, CK_ULONG *ret_cond) + { + unsigned char randbuf[SSL_MAX_MASTER_KEY_LENGTH]; + CK_ULONG ver_cond = 0; + CK_ULONG cond = 0; +- size_t length = SSL_MAX_MASTER_KEY_LENGTH; ++ CK_ULONG length = SSL_MAX_MASTER_KEY_LENGTH; + int err; + + /* always generate a random buffer, to constant_time swap in +diff --git a/src/util.h b/src/util.h +index bcbc2db..1b24666 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -120,7 +120,7 @@ static inline int constant_select_int(CK_ULONG cond, int a, int b) + return (int)((A & mask) | (B & ~mask)); + } + +-static inline void constant_select_buf(CK_ULONG cond, size_t size, ++static inline void constant_select_buf(CK_ULONG cond, CK_ULONG size, + unsigned char *dst, unsigned char *a, + unsigned char *b) + { diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.5.bb b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.5.bb new file mode 100644 index 0000000000..fcd8fe631e --- /dev/null +++ b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.5.bb @@ -0,0 +1,25 @@ +SUMMARY = "An OpenSSL provider that allows direct interfacing with pkcs11 drivers" +DESCRIPTION = "\ +This is an Openssl 3.x provider to access Hardware or Software Tokens using \ +the PKCS#11 Cryptographic Token Interface\ +\ +This code targets version 3.1 of the interface but should be backwards \ +compatible to previous versions as well.\ +" +HOMEPAGE = "https://github.com/latchset/pkcs11-provider" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45" +DEPENDS = "openssl" + +SRCREV = "3a4fdd2a2e5643af2a0f857b66a19b9fa109d40f" + +SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https \ + file://0001-Fix-types-for-old-32-bit-systems.patch \ +" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so" diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch b/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch index 2d0ea0252c..12333cc1f1 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch +++ b/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch @@ -7,6 +7,8 @@ link with shared zlib Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile.unx | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch b/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch index 6d4465fbed..0fc5a8e0d2 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch +++ b/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch @@ -6,6 +6,8 @@ Subject: [PATCH 1/2] png-fix-IDAT-windowsize: Fix format string errors in Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + gpl/png-fix-IDAT-windowsize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch b/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch index f2c86689ec..2ff6d664c0 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch +++ b/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch @@ -2,6 +2,8 @@ From: Jari Aalto <jari.aalto@cante.net> Subject: Correct fomat strings fro hardened build flags --- +Upstream-Status: Pending + gpl/pngsplit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb index 9f617ecda5..9cd27a2e63 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb +++ b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb @@ -1,6 +1,6 @@ SUMMARY = "pngcheck verifies the integrity of PNG, JNG and MNG files" HOMEPAGE = "http://www.libpng.org/pub/png/apps/pngcheck.html" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://gpl/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "zlib libpng" @@ -13,6 +13,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/png-mng/${BPN}/${PV}/${BPN}-${PV}.tar.g SRC_URI[md5sum] = "980bd6d9a3830fdce746d7fe3c9166ee" SRC_URI[sha256sum] = "77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db25690f35f" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/png-mng/files/pngcheck/" +UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" + CFLAGS += "-DUSE_ZLIB" EXTRA_OEMAKE = "-f ${S}/Makefile.unx" diff --git a/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch new file mode 100644 index 0000000000..d172c8dbf2 --- /dev/null +++ b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch @@ -0,0 +1,66 @@ +From 6b1123b313e439d8bfae3570a3e541b3aa26f3ad Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 16 Sep 2023 19:52:56 -0700 +Subject: [PATCH] cppignore.lnx: Ignore PKCS12 and testLaunch test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +These tests fail on Linux + +There were 4 failures: + 1: N7CppUnit10TestCallerI11ProcessTestEE.testLaunch + "rc == 3" + in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 79 + 2: N7CppUnit10TestCallerI11ProcessTestEE.testLaunchRedirectIn + "rc == 100" + in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 106 + 3: N7CppUnit10TestCallerI11ProcessTestEE.testLaunchRedirectOut + "s == "Hello, world!"" + in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 134 + 4: N7CppUnit10TestCallerI11ProcessTestEE.testLaunchEnv + "s == "test"" + in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 166 + + There were 4 errors:- + 1: N7CppUnit10TestCallerI7EVPTestEE.testRSAEVPKeyFromPKCS12 + │ │ "N4Poco17NotFoundExceptionE: + Not found: POCO_BASE" + │ │ in "<unknown>", line -1 + 2: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testFullPKCS12 + │ │ "N4Poco17NotFoundExceptionE: + Not found: POCO_BASE" + │ │ in "<unknown>", line -1 + 3: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testCertsOnlyPKCS12 + │ │ "N4Poco17NotFoundExceptionE: + Not found: POCO_BASE" + │ │ in "<unknown>", line -1 + 4: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testPEMReadWrite + │ │ "N4Poco17NotFoundExceptionE: + Not found: POCO_BASE" + │ │ in "<unknown>", line -1 + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com> +--- + cppignore.lnx | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/cppignore.lnx b/cppignore.lnx +index b3288d474..9aad48ca5 100644 +--- a/cppignore.lnx ++++ b/cppignore.lnx +@@ -30,3 +30,12 @@ CppUnit::TestCaller<HTTPSClientSessionTest>.testProxy + CppUnit::TestCaller<HTTPSStreamFactoryTest>.testProxy + CppUnit::TestCaller<DNSTest>.testHostByAddress + CppUnit::TestCaller<DNSTest>.testHostByName ++CppUnit::TestCaller<ProcessTest>.testLaunch ++CppUnit::TestCaller<ProcessTest>.testLaunchRedirectIn ++CppUnit::TestCaller<ProcessTest>.testLaunchRedirectOut ++CppUnit::TestCaller<ProcessTest>.testLaunchEnv ++CppUnit::TestCaller<EVPTest>.testRSAEVPKeyFromPKCS12 ++CppUnit::TestCaller<PKCS12ContainerTest>.testFullPKCS12 ++CppUnit::TestCaller<PKCS12ContainerTest>.testCertsOnlyPKCS12 ++CppUnit::TestCaller<PKCS12ContainerTest>.testPEMReadWrite ++CppUnit::TestCaller<MongoDBTest>.testArray diff --git a/meta-oe/recipes-support/poco/poco/run-ptest b/meta-oe/recipes-support/poco/poco/run-ptest index c479f7ac10..c8e50fc967 100644 --- a/meta-oe/recipes-support/poco/poco/run-ptest +++ b/meta-oe/recipes-support/poco/poco/run-ptest @@ -1,9 +1,21 @@ #!/bin/sh +export POCO_BASE=/usr/lib/poco/ptest +export LD_LIBRARY_PATH=${POCO_BASE}/bin:${LD_LIBRARY_PATH} +i=0 while read runner; do - pushd . >/dev/null + oldpath=`pwd` >/dev/null cd bin echo Testing $runner - ./$runner-testrunner -all - popd >/dev/null + ./$runner -ignore $oldpath/cppignore.lnx -all + export res$((i++))=$? + cd $oldpath >/dev/null +done < testrunners +i=0 +while read runner; do + eval assign=\$res$((i++)) + if [ $assign -ne 0 ]; then + echo "FAIL: $runner" + else + echo "PASS: $runner" + fi done < testrunners - diff --git a/meta-oe/recipes-support/poco/poco_1.13.3.bb b/meta-oe/recipes-support/poco/poco_1.13.3.bb new file mode 100644 index 0000000000..0beffab99f --- /dev/null +++ b/meta-oe/recipes-support/poco/poco_1.13.3.bb @@ -0,0 +1,117 @@ +SUMMARY = "Modern, powerful open source cross-platform C++ class libraries" +DESCRIPTION = "Modern, powerful open source C++ class libraries and frameworks for building network- and internet-based applications that run on desktop, server, mobile and embedded systems." +HOMEPAGE = "http://pocoproject.org/" +SECTION = "libs" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" + +# These dependencies are required by Foundation +DEPENDS = "libpcre2 zlib" + +SRC_URI = "git://github.com/pocoproject/poco.git;branch=poco-1.13.3;protocol=https \ + file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ + file://run-ptest \ + " +SRCREV = "7f848d25aa0461d3beeff1189dc61b48ffe8e2f4" + +UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit cmake ptest + +# By default the most commonly used poco components are built +# Foundation is built anyway and doesn't need to be listed explicitly +# these don't have dependencies outside oe-core +PACKAGECONFIG ??= "XML JSON PDF Util Net NetSSL Crypto JWT Data DataSQLite Zip Encodings Redis Prometheus" +# MongoDB does not build for all architectures yet keep in sync with COMPATIBLE_HOST list in mongodb recipe +# and mongodb needs meta-python enabled as well +PACKAGECONFIG:remove:riscv32 = "MongoDB" +PACKAGECONFIG:remove:riscv64 = "MongoDB" +PACKAGECONFIG:remove:mipsarch = "MongoDB" +PACKAGECONFIG:remove:powerpc = "MongoDB" + +PACKAGECONFIG[XML] = "-DENABLE_XML=ON,-DENABLE_XML=OFF,expat" +PACKAGECONFIG[JSON] = "-DENABLE_JSON=ON,-DENABLE_JSON=OFF" +PACKAGECONFIG[MongoDB] = "-DENABLE_MONGODB=ON,-DENABLE_MONGODB=OFF" +PACKAGECONFIG[PDF] = "-DENABLE_PDF=ON,-DENABLE_PDF=OFF,zlib" +PACKAGECONFIG[Util] = "-DENABLE_UTIL=ON,-DENABLE_UTIL=OFF" +PACKAGECONFIG[Net] = "-DENABLE_NET=ON,-DENABLE_NET=OFF" +PACKAGECONFIG[NetSSL] = "-DENABLE_NETSSL=ON,-DENABLE_NETSSL=OFF,openssl" +PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON,-DENABLE_CRYPTO=OFF,openssl" +PACKAGECONFIG[JWT] = "-DENABLE_JWT=ON,-DENABLE_JWT=OFF,openssl" +PACKAGECONFIG[Data] = "-DENABLE_DATA=ON,-DENABLE_DATA=OFF" +PACKAGECONFIG[DataSQLite] = "-DENABLE_DATA_SQLITE=ON -DSQLITE3_LIBRARY:STRING=sqlite3,-DENABLE_DATA_SQLITE=OFF,sqlite3" +PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF" +PACKAGECONFIG[Encodings] = "-DENABLE_ENCODINGS=ON,-DENABLE_ENCODINGS=OFF" +PACKAGECONFIG[Redis] = "-DENABLE_REDIS=ON,-DENABLE_REDIS=OFF" +PACKAGECONFIG[Prometheus] = "-DENABLE_PROMETHEUS=ON,-DENABLE_PROMETHEUS=OFF" + +# Additional components not build by default, +# they might have dependencies not included in oe-core +# or they don't work on all architectures +PACKAGECONFIG[mod_poco] = "-DENABLE_APACHECONNECTOR=ON,-DENABLE_APACHECONNECTOR=OFF,apr apache2" +PACKAGECONFIG[CppParser] = "-DENABLE_CPPPARSER=ON,-DENABLE_CPPPARSER=OFF" +PACKAGECONFIG[DataMySQL] = "-DENABLE_DATA_MYSQL=ON -DMYSQL_LIB:STRING=mysqlclient_r,-DENABLE_DATA_MYSQL=OFF,mariadb" +PACKAGECONFIG[DataODBC] = "-DENABLE_DATA_ODBC=ON,-DENABLE_DATA_ODBC=OFF,libiodbc" +PACKAGECONFIG[ActiveRecord] = "-DENABLE_ACTIVERECORD=ON,-DENABLE_ACTIVERECORD=OFF" +PACKAGECONFIG[ActiveRecordCompiler] = "-DENABLE_ACTIVERECORD_COMPILER=ON,-DENABLE_ACTIVERECORD_COMPILER=OFF" +PACKAGECONFIG[PageCompiler] = "-DENABLE_PAGECOMPILER=ON,-DENABLE_PAGECOMPILER=OFF" +PACKAGECONFIG[PageCompilerFile2Page] = "-DENABLE_PAGECOMPILER_FILE2PAGE=ON,-DENABLE_PAGECOMPILER_FILE2PAGE=OFF" +PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF" + +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}" + +# For the native build we want to use the bundled version +EXTRA_OECMAKE:append:class-native = " -DPOCO_UNBUNDLED=OFF" + +# do not use rpath +EXTRA_OECMAKE:append = " -DCMAKE_SKIP_RPATH=ON" + +LDFLAGS:append:riscv32 = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" +LDFLAGS:append:mips = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" +LDFLAGS:append:powerpc = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" + +python populate_packages:prepend () { + poco_libdir = d.expand('${libdir}') + pn = d.getVar("PN") + packages = [] + + def hook(f, pkg, file_regex, output_pattern, modulename): + packages.append(pkg) + + do_split_packages(d, poco_libdir, r'^libPoco(.*)\.so\..*$', + 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) + + d.setVar("RRECOMMENDS:%s" % pn, " ".join(packages)) +} + +do_install_ptest () { + cp -rf ${B}/bin/ ${D}${PTEST_PATH} + cp -f ${B}/lib/libCppUnit.so* ${D}${libdir} + cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/ + find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \; + rm -f ${D}${PTEST_PATH}/testrunners + for f in ${D}${PTEST_PATH}/bin/*-testrunner; do + echo `basename $f` >> ${D}${PTEST_PATH}/testrunners + done + install -Dm 0644 ${S}/cppignore.lnx ${D}${PTEST_PATH}/cppignore.lnx +} + +PACKAGES_DYNAMIC = "poco-.*" + +# "poco" is a metapackage which pulls in all Poco components +ALLOW_EMPTY:${PN} = "1" + +# cppunit is only built if tests are enabled +PACKAGES =+ "${PN}-cppunit" +FILES:${PN}-cppunit += "${libdir}/libCppUnit.so*" +ALLOW_EMPTY:${PN}-cppunit = "1" + +RDEPENDS:${PN}-ptest += "${PN}-cppunit" +RDEPENDS:${PN}-ptest += "${@bb.utils.contains('PACKAGECONFIG', 'MongoDB', 'mongodb', '', d)}" +RDEPENDS:${PN}-ptest += "${@bb.utils.contains('PACKAGECONFIG', 'Redis', 'redis', '', d)}" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/poco/poco_1.8.0.1.bb b/meta-oe/recipes-support/poco/poco_1.8.0.1.bb deleted file mode 100644 index 160b4d3916..0000000000 --- a/meta-oe/recipes-support/poco/poco_1.8.0.1.bb +++ /dev/null @@ -1,106 +0,0 @@ -SUMMARY = "Modern, powerful open source cross-platform C++ class libraries" -DESCRIPTION = "Modern, powerful open source C++ class libraries and frameworks for building network- and internet-based applications that run on desktop, server, mobile and embedded systems." -SECTION = "libs" -HOMEPAGE = "http://pocoproject.org/" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" - -# These dependencies are required by Foundation -DEPENDS = "libpcre zlib" - -inherit cmake ptest - -BBCLASSEXTEND = "native" - -SRCREV = "af527ab21fca5ab2659285408aec9920ed7c7b17" -SRC_URI = " \ - git://github.com/pocoproject/poco.git \ - file://run-ptest \ - " - -S = "${WORKDIR}/git" - -EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \ - -DZLIB_LIBRARY_RELEASE:STRING=z -DPCRE_LIBRARY:STRING=pcre \ - ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}" - -# For the native build we want to use the bundled version -EXTRA_OECMAKE_append_class-native = " -DPOCO_UNBUNDLED=OFF" - -# do not use rpath -EXTRA_OECMAKE_append = " -DCMAKE_SKIP_RPATH=ON" - -# By default the most commonly used poco components are built -# Foundation is built anyway and doesn't need to be listed explicitly -# these don't have dependencies outside oe-core -PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto Data DataSQLite Zip" - -PACKAGECONFIG[XML] = "-DENABLE_XML=ON -DEXPAT_LIBRARY:STRING=expat,-DENABLE_XML=OFF,expat" -PACKAGECONFIG[JSON] = "-DENABLE_JSON=ON,-DENABLE_JSON=OFF" -PACKAGECONFIG[MongoDB] = "-DENABLE_MONGODB=ON,-DENABLE_MONGODB=OFF" -PACKAGECONFIG[PDF] = "-DENABLE_PDF=ON,-DENABLE_PDF=OFF,zlib" -PACKAGECONFIG[Util] = "-DENABLE_UTIL=ON,-DENABLE_UTIL=OFF" -PACKAGECONFIG[Net] = "-DENABLE_NET=ON,-DENABLE_NET=OFF" -PACKAGECONFIG[NetSSL] = "-DENABLE_NETSSL=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_NETSSL=OFF,openssl" -PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_CRYPTO=OFF,openssl" -PACKAGECONFIG[Data] = "-DENABLE_DATA=ON,-DENABLE_DATA=OFF" -PACKAGECONFIG[DataSQLite] = "-DENABLE_DATA_SQLITE=ON -DSQLITE3_LIBRARY:STRING=sqlite3,-DENABLE_DATA_SQLITE=OFF,sqlite3" -PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF" - -# Additional components not build by default, -# they might have dependencies not included in oe-core -# or they don't work on all architectures -PACKAGECONFIG[mod_poco] = "-DENABLE_APACHECONNECTOR=ON,-DENABLE_APACHECONNECTOR=OFF,apr apache2" -PACKAGECONFIG[CppParser] = "-DENABLE_CPPPARSER=ON,-DENABLE_CPPPARSER=OFF" -PACKAGECONFIG[DataMySQL] = "-DENABLE_DATA_MYSQL=ON -DMYSQL_LIB:STRING=mysqlclient_r,-DENABLE_DATA_MYSQL=OFF,mariadb" -PACKAGECONFIG[DataODBC] = "-DENABLE_DATA_ODBC=ON,-DENABLE_DATA_ODBC=OFF,libiodbc" -PACKAGECONFIG[PageCompiler] = "-DENABLE_PAGECOMPILER=ON,-DENABLE_PAGECOMPILER=OFF" -PACKAGECONFIG[PageCompilerFile2Page] = "-DENABLE_PAGECOMPILER_FILE2PAGE=ON,-DENABLE_PAGECOMPILER_FILE2PAGE=OFF" -PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF" - -# Make a package for each library -PACKAGES = "${PN}-dbg ${POCO_PACKAGES}" -python __anonymous () { - packages = [] - testrunners = [] - components = d.getVar("PACKAGECONFIG").split() - components.append("Foundation") - for lib in components: - pkg = ("poco-%s" % lib.lower()).replace("_","") - packages.append(pkg) - if not d.getVar("FILES_%s" % pkg): - d.setVar("FILES_%s" % pkg, "${libdir}/libPoco%s.so.*" % lib) - testrunners.append("%s" % lib) - - d.setVar("POCO_PACKAGES", " ".join(packages)) - d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners)) -} - -# "poco" is a metapackage which pulls in all Poco components -PACKAGES += "${PN}" -RRECOMMENDS_${PN} += "${POCO_PACKAGES}" -RRECOMMENDS_${PN}_class-native = "" -ALLOW_EMPTY_${PN} = "1" - -# -dev last to pick up the remaining stuff -PACKAGES += "${PN}-dev ${PN}-staticdev" -FILES_${PN}-dev = "${includedir} ${libdir}/libPoco*.so ${libdir}/cmake" -FILES_${PN}-staticdev = "${libdir}/libPoco*.a" - -# ptest support -FILES_${PN}-dbg += "${PTEST_PATH}/bin/.debug" - -# cppunit is only built if tests are enabled -PACKAGES += "${PN}-cppunit" -FILES_${PN}-cppunit += "${libdir}/libCppUnit.so*" -ALLOW_EMPTY_${PN}-cppunit = "1" - -RDEPENDS_${PN}-ptest += "${PN}-cppunit" - -do_install_ptest () { - cp -rf ${B}/bin/ ${D}${PTEST_PATH} - cp -f ${B}/lib/libCppUnit.so* ${D}${libdir} - cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/ - find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \; - echo "${POCO_TESTRUNNERS}" > "${D}${PTEST_PATH}/testrunners" -} diff --git a/meta-oe/recipes-support/poppler/poppler-data_0.4.8.bb b/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb index 343b6db812..5433659af4 100644 --- a/meta-oe/recipes-support/poppler/poppler-data_0.4.8.bb +++ b/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb @@ -1,9 +1,10 @@ SUMMARY = "Encoding files for Poppler" DESCRIPTION = "Encoding files for use with poppler that enable poppler to \ correctly render CJK and Cyrrilic." -LICENSE = "BSD & GPLv2 & GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4870b98343f0bbb25fa43b9d2ba59448 \ - file://COPYING.adobe;md5=63c6a8a9df204c00461fa5f163d8a663 \ +HOMEPAGE = "https://poppler.freedesktop.org/" +LICENSE = "BSD-3-Clause & GPL-2.0-only & GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=96287d49ec274d9c3222b5f966c132fd \ + file://COPYING.adobe;md5=a790726a74164c30b5de1ef93fd69e99 \ file://COPYING.gpl2;md5=751419260aa954499f7abaabaa882bbe \ " @@ -17,8 +18,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.gz \ ${CMAP_RESOURCES_BASE}/Identity-H;name=idh \ ${CMAP_RESOURCES_BASE}/Identity-V;name=idv" -SRC_URI[md5sum] = "00f8989c804de84af0ba2ea629949980" -SRC_URI[sha256sum] = "1096a18161f263cccdc6d8a2eb5548c41ff8fcf9a3609243f1b6296abdf72872" +SRC_URI[sha256sum] = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74" SRC_URI[idh.md5sum] = "009c93cf0141ab7bd6acb7eea14306cc" SRC_URI[idh.sha256sum] = "ae702c203a82ea124e9b96590f821db6fbf8754e2c4547a9dba0e82f94739e95" SRC_URI[idv.md5sum] = "2f32a45d43d001c26eeac6b878855fbf" @@ -30,7 +30,7 @@ do_compile() { do_install() { oe_runmake install DESTDIR=${D} prefix=${prefix} datadir=${datadir} install -d ${D}${datadir}/poppler/cMap - install -m644 ${WORKDIR}/Identity-* ${D}${datadir}/poppler/cMap/ + install -m644 ${UNPACKDIR}/Identity-* ${D}${datadir}/poppler/cMap/ } -FILES_${PN} += "${datadir}" +FILES:${PN} += "${datadir}" diff --git a/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch b/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch new file mode 100644 index 0000000000..e07da387b2 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch @@ -0,0 +1,55 @@ +From b6fc6c36d359a50503138cd87d7147faf6dff893 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 17 Mar 2018 20:52:10 +0100 +Subject: [PATCH] Do not overwrite all our build flags +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + cmake/modules/PopplerMacros.cmake | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake +index 2aed028..3c30f3f 100644 +--- a/cmake/modules/PopplerMacros.cmake ++++ b/cmake/modules/PopplerMacros.cmake +@@ -117,13 +117,13 @@ if(CMAKE_COMPILER_IS_GNUCXX) + set(DEFAULT_COMPILE_WARNINGS "${_warn}") + set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") + +- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") ++ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") +- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") ++ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") +@@ -161,14 +161,14 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set(DEFAULT_COMPILE_WARNINGS "${_warn}") + set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") + +- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") ++ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") + # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 + set(CMAKE_CXX_FLAGS_DEBUG "-g") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") +- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") ++ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") + # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 +-- +2.25.1 + diff --git a/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch b/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch deleted file mode 100644 index 4e80d240fa..0000000000 --- a/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 91b6275f0e91c25beb040b4ef9484053ae305d86 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 26 May 2015 12:45:47 +0200 -Subject: [PATCH] add manadatory options to find qt4/qt5 moc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 55 ++++++++----------------------------------------------- - 1 file changed, 8 insertions(+), 47 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c4cfc2c..8e961c7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -712,25 +712,10 @@ AC_SUBST(POPPLER_QT4_LIBS) - AC_SUBST(POPPLER_QT4_TEST_LIBS) - - if test x$enable_poppler_qt4 = xyes; then -- AC_CHECK_TOOL(MOCQT4, moc) -- AC_MSG_CHECKING([for Qt4 moc]) -- mocversion=`$MOCQT4 -v 2>&1` -- mocversiongrep=`echo $mocversion | grep "Qt 4"` -- if test x"$mocversiongrep" != x"$mocversion"; then -- AC_MSG_RESULT([no]) -- # moc was not the qt4 one, try with moc-qt4 -- AC_CHECK_TOOL(MOCQT42, moc-qt4) -- AC_MSG_CHECKING([for Qt4 moc-qt4]) -- mocversion=`$MOCQT42 -v 2>&1` -- mocversiongrep=`echo $mocversion | grep "Qt 4"` -- if test x"$mocversiongrep" != x"$mocversion"; then -- # no valid moc found -- enable_poppler_qt4=no; -- MOCQT4="not found" -- else -- MOCQT4=$MOCQT42 -- fi -- fi -+ AC_ARG_WITH([moc-qt4], -+ AS_HELP_STRING([--with-moc-qt4], [Set location of qt4 moc]), -+ [MOCQT4=$withval] -+ ) - AC_SUBST(MOCQT4) - AC_MSG_RESULT([$MOCQT4]) - fi -@@ -769,34 +754,10 @@ AC_SUBST(POPPLER_QT5_LIBS) - AC_SUBST(POPPLER_QT5_TEST_LIBS) - - if test x$enable_poppler_qt5 = xyes; then -- AC_CHECK_TOOL(MOCQT5, moc) -- AC_MSG_CHECKING([for Qt5 moc]) -- mocversion=`$MOCQT5 -v 2>&1` -- mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` -- if test x"$mocversiongrep" != x"$mocversion"; then -- AC_MSG_RESULT([no]) -- # moc was not the qt5 one, try with moc-qt5 -- AC_CHECK_TOOL(MOCQT52, moc-qt5) -- AC_MSG_CHECKING([for Qt5 moc-qt5]) -- mocversion=`$MOCQT52 -v 2>&1` -- mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"` -- if test x"$mocversiongrep" != x"$mocversion"; then -- AC_CHECK_TOOL(QTCHOOSER, qtchooser) -- AC_MSG_CHECKING([for qtchooser]) -- qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` -- mocversion=`$qt5tooldir/moc -v 2>&1` -- mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` -- if test x"$mocversiongrep" != x"$mocversion"; then -- # no valid moc found -- enable_poppler_qt5=no; -- MOCQT5="not found" -- else -- MOCQT5=$qt5tooldir/moc -- fi -- else -- MOCQT5=$MOCQT52 -- fi -- fi -+ AC_ARG_WITH([moc-qt5], -+ AS_HELP_STRING([--with-moc-qt5], [Set location of qt5 moc]), -+ [MOCQT5=$withval] -+ ) - AC_SUBST(MOCQT5) - AC_MSG_RESULT([$MOCQT5]) - fi --- -2.5.5 - diff --git a/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch new file mode 100644 index 0000000000..ab2fbf7d9b --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch @@ -0,0 +1,180 @@ +From 04686340c4cd375a17d60d31bf6943367cc33214 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 21 Jan 2023 03:09:08 -0800 +Subject: [PATCH] cmake: Do not use -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like <cstdlib> + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/thrift/0.17.0-r0/recipe-sysroot/usr/include/c++/v1/cstdlib:90:5: error: <cstdlib> tried including <stdlib.h> but didn't find libc++'s <stdlib.h> header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard Library, and you are probably using compiler flags that make that not be the case. + ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +<sysroot>/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- +Upstream-Status: Pending + + CMakeLists.txt | 4 ++-- + glib/CMakeLists.txt | 4 ++-- + qt5/src/CMakeLists.txt | 4 ++-- + qt6/src/CMakeLists.txt | 4 ++-- + test/CMakeLists.txt | 6 +++--- + utils/CMakeLists.txt | 10 +++++----- + 6 files changed, 16 insertions(+), 16 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -628,10 +628,10 @@ add_library(poppler ${poppler_SRCS} ${LI + if (OpenJPEG_FOUND) + # check if we can remove this when we depend on newer openjpeg versions, 2.5 seems fixed + # target openjp2 may lack interface include directories +- target_include_directories(poppler SYSTEM PRIVATE ${OPENJPEG_INCLUDE_DIRS}) ++ target_include_directories(poppler PRIVATE ${OPENJPEG_INCLUDE_DIRS}) + endif() + if(USE_CMS) +- target_include_directories(poppler SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h") + set_target_properties(poppler PROPERTIES +--- a/glib/CMakeLists.txt ++++ b/glib/CMakeLists.txt +@@ -4,7 +4,7 @@ include_directories( + ) + + include_directories( +- SYSTEM ++ + ${GLIB2_INCLUDE_DIRS} + ${CAIRO_INCLUDE_DIRS} + ) +@@ -96,7 +96,7 @@ if(MINGW AND BUILD_SHARED_LIBS) + set_target_properties(poppler-glib PROPERTIES SUFFIX "-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") + endif() + target_link_libraries(poppler-glib poppler PkgConfig::GLIB2 ${CAIRO_LIBRARIES} Freetype::Freetype) +-target_include_directories(poppler-glib SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++target_include_directories(poppler-glib PRIVATE ${CAIRO_INCLUDE_DIRS}) + install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + if (ENABLE_NSS3) +--- a/qt5/src/CMakeLists.txt ++++ b/qt5/src/CMakeLists.txt +@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) + endif() + target_link_libraries(poppler-qt5 poppler Qt5::Core Qt5::Gui Qt5::Xml Freetype::Freetype) + if (ENABLE_NSS3) +- target_include_directories(poppler-qt5 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(poppler-qt5 PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if(USE_CMS) + target_link_libraries(poppler-qt5 poppler ${LCMS2_LIBRARIES}) +- target_include_directories(poppler-qt5 SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler-qt5 PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS poppler-qt5 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +--- a/qt6/src/CMakeLists.txt ++++ b/qt6/src/CMakeLists.txt +@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) + endif() + target_link_libraries(poppler-qt6 poppler Qt6::Core Qt6::Gui Freetype::Freetype) + if (ENABLE_NSS3) +- target_include_directories(poppler-qt6 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(poppler-qt6 PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if(USE_CMS) + target_link_libraries(poppler-qt6 poppler ${LCMS2_LIBRARIES}) +- target_include_directories(poppler-qt6 SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler-qt6 PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS poppler-qt6 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -23,7 +23,7 @@ if (GTK_FOUND) + ) + poppler_add_test(gtk-test BUILD_GTK_TESTS ${gtk_splash_test_SRCS}) + target_link_libraries(gtk-test ${CAIRO_LIBRARIES} poppler-glib PkgConfig::GTK3) +- target_include_directories(gtk-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(gtk-test PRIVATE ${CAIRO_INCLUDE_DIRS}) + + if (HAVE_CAIRO) + +@@ -35,7 +35,7 @@ if (GTK_FOUND) + ) + poppler_add_test(pdf-inspector BUILD_GTK_TESTS ${pdf_inspector_SRCS}) + target_link_libraries(pdf-inspector ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs} PkgConfig::GTK3 poppler) +- target_include_directories(pdf-inspector SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(pdf-inspector PRIVATE ${CAIRO_INCLUDE_DIRS}) + target_compile_definitions(pdf-inspector PRIVATE -DSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}") + endif () + +@@ -59,7 +59,7 @@ if (HAVE_CAIRO) + ) + add_executable(cairo-thread-test ${cairo_thread_test_SRCS}) + target_link_libraries(cairo-thread-test ${CAIRO_LIBRARIES} Freetype::Freetype Threads::Threads poppler) +- target_include_directories(cairo-thread-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(cairo-thread-test PRIVATE ${CAIRO_INCLUDE_DIRS}) + endif () + endif () + +--- a/utils/CMakeLists.txt ++++ b/utils/CMakeLists.txt +@@ -18,7 +18,7 @@ add_executable(pdftoppm ${pdftoppm_SOURC + target_link_libraries(pdftoppm ${common_libs}) + if(LCMS2_FOUND) + target_link_libraries(pdftoppm ${LCMS2_LIBRARIES}) +- target_include_directories(pdftoppm SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftoppm PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftoppm DESTINATION bin) + install(FILES pdftoppm.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -39,10 +39,10 @@ if (HAVE_CAIRO) + add_definitions(${CAIRO_CFLAGS}) + add_executable(pdftocairo ${pdftocairo_SOURCES}) + target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs}) +- target_include_directories(pdftocairo SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(pdftocairo PRIVATE ${CAIRO_INCLUDE_DIRS}) + if(LCMS2_FOUND) + target_link_libraries(pdftocairo ${LCMS2_LIBRARIES}) +- target_include_directories(pdftocairo SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftocairo PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftocairo DESTINATION bin) + install(FILES pdftocairo.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -109,7 +109,7 @@ if (ENABLE_SIGNATURES) + add_executable(pdfsig ${pdfsig_SOURCES}) + target_link_libraries(pdfsig ${common_libs}) + if (ENABLE_NSS3) +- target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(pdfsig PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if (Intl_FOUND) + target_link_libraries(pdfsig Intl::Intl) +@@ -127,7 +127,7 @@ add_executable(pdftops ${pdftops_SOURCES + target_link_libraries(pdftops ${common_libs}) + if(LCMS2_FOUND) + target_link_libraries(pdftops ${LCMS2_LIBRARIES}) +- target_include_directories(pdftops SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftops PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftops DESTINATION bin) + install(FILES pdftops.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) diff --git a/meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch b/meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch deleted file mode 100644 index 406009f4fa..0000000000 --- a/meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- poppler-0.45.0/poppler/CairoOutputDev.cc.orig 2016-06-17 14:23:35.399083929 -0400 -+++ poppler-0.45.0/poppler/CairoOutputDev.cc 2016-06-17 14:36:53.351097825 -0400 -@@ -42,7 +42,7 @@ - #endif - - #include <string.h> --#include <math.h> -+#include <cmath> - #include <assert.h> - #include <cairo.h> - diff --git a/meta-oe/recipes-support/poppler/poppler/basename-include.patch b/meta-oe/recipes-support/poppler/poppler/basename-include.patch new file mode 100644 index 0000000000..4a18ba3504 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/basename-include.patch @@ -0,0 +1,34 @@ +From 2ac679158062b14729f82f513fc7cafbb6f4f7a6 Mon Sep 17 00:00:00 2001 +From: Randy MacLeod <Randy.MacLeod@windriver.com> +Date: Fri, 26 Jul 2019 14:26:54 -0400 +Subject: [PATCH 3/3] Minic GNU basename() API for non-glibc library e.g. musl + +Upstream-Status: Pending + +Rework for poppler 0.90.1 +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> +--- + goo/gbasename.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/goo/gbasename.cc b/goo/gbasename.cc +index 69236d8..3858415 100644 +--- a/goo/gbasename.cc ++++ b/goo/gbasename.cc +@@ -46,6 +46,10 @@ + #include <cstdlib> + #include <cstring> + ++#if !defined(__GLIBC__) ++#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) ++#endif ++ + std::string gbasename(const char *filename) + { + #ifdef _MSC_VER +-- +2.21.3 + diff --git a/meta-oe/recipes-support/poppler/poppler_0.57.0.bb b/meta-oe/recipes-support/poppler/poppler_0.57.0.bb deleted file mode 100644 index 63b77aafe8..0000000000 --- a/meta-oe/recipes-support/poppler/poppler_0.57.0.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = " \ - http://poppler.freedesktop.org/${BP}.tar.xz \ - file://0001-add-manadatory-options-to-find-qt4-qt5-moc.patch \ - file://0002-fix-gcc-6-math-ambiguous-errors.patch \ -" -SRC_URI[md5sum] = "bc5a191741604552c90d484103229374" -SRC_URI[sha256sum] = "0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8" - -DEPENDS = "fontconfig zlib cairo lcms" - -inherit autotools pkgconfig gtk-doc gobject-introspection - -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" -PACKAGECONFIG[jpeg] = "--enable-dctdecoder=libjpeg,--enable-dctdecoder=none,jpeg" -PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng" -PACKAGECONFIG[tiff] = "--enable-libtiff,--disable-libtiff,tiff" -PACKAGECONFIG[curl] = "--enable-libcurl,--disable-libcurl,curl" -PACKAGECONFIG[openjpeg] = "--enable-libopenjpeg=openjpeg2,--disable-libopenjpeg,openjpeg" -PACKAGECONFIG[qt5] = "--enable-poppler-qt5 --with-moc-qt5=${STAGING_BINDIR_NATIVE}/qt5/moc,--disable-poppler-qt5,qtbase qttools-native" -PACKAGECONFIG[qt4e] = "--enable-poppler-qt4 --with-moc-qt4=${STAGING_BINDIR_NATIVE}/moc4,--disable-poppler-qt4,qt4-embedded" -PACKAGECONFIG[nss] = "--enable-libnss,--disable-libnss,nss" - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -EXTRA_OECONF = "\ - --enable-xpdf-headers \ - --disable-gtk-test \ - --enable-zlib \ -" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/poppler/.libs" -} - -# Adjust library names when building for QT4e -QT4E_PATCHES = "${@bb.utils.contains('PACKAGECONFIG', 'qt4e', 'file://fix-qt4e-library-dependencies.patch', '', d)}" -SRC_URI_append = "${QT4E_PATCHES}" - -# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points -def get_poppler_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft' ]: - return "--enable-fixedpoint" - return "" - -EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}" - -PACKAGES =+ "libpoppler libpoppler-glib" -FILES_libpoppler = "${libdir}/libpoppler.so.*" -FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" - -RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-oe/recipes-support/poppler/poppler_24.09.0.bb b/meta-oe/recipes-support/poppler/poppler_24.09.0.bb new file mode 100644 index 0000000000..fb6b534cf4 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler_24.09.0.bb @@ -0,0 +1,57 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE = "https://poppler.freedesktop.org/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ + file://0001-Do-not-overwrite-all-our-build-flags.patch \ + file://basename-include.patch \ + file://0001-cmake-Do-not-use-isystem.patch \ + " +SRC_URI[sha256sum] = "ebd857987e2395608c69fdc44009692d5906f13b612c5280beff65a0b75dc255" + +DEPENDS = "fontconfig zlib cairo lcms glib-2.0 glib-2.0-native" + +inherit cmake pkgconfig gobject-introspection + +PACKAGECONFIG ??= "boost jpeg nss openjpeg png tiff" +PACKAGECONFIG[boost] = "-DENABLE_BOOST=ON,-DENABLE_BOOST=OFF,boost" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" +PACKAGECONFIG[tiff] = "-DENABLE_LIBTIFF=ON,-DENABLE_LIBTIFF=OFF,tiff" +PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" +PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" +PACKAGECONFIG[nss] = "-DENABLE_NSS3=ON,-DENABLE_NSS3=OFF,nss" +PACKAGECONFIG[gpgme] = "-DENABLE_GPGME=ON,-DENABLE_GPGME=OFF,gpgme" +PACKAGECONFIG[qt6] = "-DENABLE_QT6=ON,-DENABLE_QT6=OFF,qtbase" + +# surprise - did not expect this to work :) +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +EXTRA_OECMAKE += " \ + -DENABLE_LCMS=ON \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -DBUILD_GTK_TESTS=OFF \ + -DRUN_GPERF_IF_PRESENT=OFF \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ +" +EXTRA_OECMAKE:append:class-native = " -DENABLE_CPP=OFF" + +do_configure:append() { + # poppler macro uses pkg-config to check for g-ir runtimes. Something + # makes them point to /usr/bin. Align them to sysroot - that's where the + # gir-wrappers are: + sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja +} + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES:libpoppler = "${libdir}/libpoppler.so.*" +FILES:libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + +RDEPENDS:libpoppler = "poppler-data" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/portaudio/files/ldflags.patch b/meta-oe/recipes-support/portaudio/files/ldflags.patch deleted file mode 100644 index aca93a51f2..0000000000 --- a/meta-oe/recipes-support/portaudio/files/ldflags.patch +++ /dev/null @@ -1,51 +0,0 @@ -Upstream forgot to pass LDFLAGS to everything apart from the main library. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/Makefile.in b/Makefile.in -index 5e1a764..61ecdd1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -171,20 +171,20 @@ lib/$(PALIB): lib-stamp $(LTOBJS) $(MAKEFILE) $(PAINC) - @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) $(PA_LDFLAGS) -o lib/$(PALIB) $(LTOBJS) $(DLL_LIBS) - - $(ALL_TESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) test/%.c -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) - - $(EXAMPLES): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) examples/%.c -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) - - $(SELFTESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) qa/%.c -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) - - bin/paloopback: lib/$(PALIB) $(MAKEFILE) $(PAINC) $(LOOPBACK_OBJS) -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) - - install: lib/$(PALIB) portaudio-2.0.pc - $(INSTALL) -d $(DESTDIR)$(libdir) -@@ -224,10 +224,10 @@ distclean: clean - $(CC) -c $(CFLAGS) $< -o $@ - - %.lo: %.c $(MAKEFILE) $(PAINC) -- $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@ -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(LDFLAGS) $< -o $@ - - %.lo: %.cpp $(MAKEFILE) $(PAINC) -- $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(CXXFLAGS) $< -o $@ -+ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(CXXFLAGS) $(LDFLAGS) $< -o $@ - - %.o: %.cpp $(MAKEFILE) $(PAINC) - $(CXX) -c $(CXXFLAGS) $< -o $@ diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb new file mode 100644 index 0000000000..2bf4d0a449 --- /dev/null +++ b/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "A portable audio library" +SECTION = "libs/multimedia" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df" + +PV .= "+git" + +SRC_URI = "git://github.com/PortAudio/portaudio.git;branch=master;protocol=https" +SRCREV = "929e2e8f7af281c5eb4fa07758930d542ec43d97" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" + +PACKAGECONFIG ??= "alsa jack" +PACKAGECONFIG[alsa] = ",,alsa-lib" +PACKAGECONFIG[jack] = ",,jack" +PACKAGECONFIG[examples] = "-DPA_BUILD_EXAMPLES=ON,-DPA_BUILD_EXAMPLES=OFF" + +do_install:append() { + if [ -d ${B}/examples ]; then + install -d ${D}${bindir} + for example in ${B}/examples/pa*; do + install -m755 $example ${D}${bindir}/ + done + fi +} diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb b/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb deleted file mode 100644 index 489f8ad9e2..0000000000 --- a/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "A portable audio library" -SECTION = "libs/multimedia" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df" - -PV = "v190600" - -SRC_URI = "http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz \ - file://ldflags.patch" -SRC_URI[md5sum] = "4df8224e047529ca9ad42f0521bf81a8" -SRC_URI[sha256sum] = "f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513" - -S = "${WORKDIR}/portaudio" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "alsa jack" -PACKAGECONFIG[alsa] = "--with-alsa, --without-alsa, alsa-lib," -PACKAGECONFIG[jack] = "--with-jack, --without-jack, jack," - -EXTRA_OECONF = "--without-oss --without-asihpi" - -do_install_append() { - mkdir --parents ${D}${bindir} - for b in ${B}/bin/pa*; do - # Bit nasty, should always work - ${B}/*-libtool --mode install install $b ${D}${bindir} - done -} - -PACKAGES += "portaudio-examples" -FILES_portaudio-examples = "${bindir}" diff --git a/meta-oe/recipes-support/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-oe/recipes-support/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch deleted file mode 100644 index d08ec6af1d..0000000000 --- a/meta-oe/recipes-support/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d52e330be895bb8c5f0fb3e2884766acbd942a85 Mon Sep 17 00:00:00 2001 -From: Philip Balister <philip@balister.org> -Date: Tue, 1 Jul 2014 09:40:44 -0400 -Subject: [PATCH] Use pkg-config for libxml2 detection. - -Upstream-Status: Inappropriate [configuration] - -xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS. - -Signed-off-by: Philip Balister <philip@balister.org> ---- - configure.in | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) - -diff --git a/configure.in b/configure.in -index f8bf466..1f4fabf 100644 ---- a/configure.in -+++ b/configure.in -@@ -734,19 +734,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], - [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])]) - - if test "$with_libxml" = yes ; then -- AC_CHECK_PROGS(XML2_CONFIG, xml2-config) -- if test -n "$XML2_CONFIG"; then -- for pgac_option in `$XML2_CONFIG --cflags`; do -- case $pgac_option in -- -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";; -- esac -- done -- for pgac_option in `$XML2_CONFIG --libs`; do -- case $pgac_option in -- -L*) LDFLAGS="$LDFLAGS $pgac_option";; -- esac -- done -- fi -+ CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "libxml-2.0" 2>&1`" -+ LIBS="`pkg-config --short-errors --print-errors --libs "libxml-2.0" 2>&1` $LIBS" - fi - - AC_SUBST(with_libxml) --- -1.8.3.1 - diff --git a/meta-oe/recipes-support/postgresql/files/not-check-libperl.patch b/meta-oe/recipes-support/postgresql/files/not-check-libperl.patch deleted file mode 100644 index e199f39143..0000000000 --- a/meta-oe/recipes-support/postgresql/files/not-check-libperl.patch +++ /dev/null @@ -1,31 +0,0 @@ -[PATCH] not check libperl under cross compiling - -Upstream-Status: Inappropriate [configuration] - -libperl ldflags returned by PGAC_CHECK_PERL_EMBED_LDFLAGS are native, -can not be used to check target library. - -postpresql has the dependency on perl, so not need to check libperl -again, like in postgresql-9.2.4 - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index ae1a5a0..9a0970d 100644 ---- a/configure.in -+++ b/configure.in -@@ -1877,7 +1877,7 @@ if test "$with_tcl" = yes; then - fi - - # check for <perl.h> --if test "$with_perl" = yes; then -+if test "$with_perl" = yes && test "$cross_compiling" = no; then - ac_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$perl_archlibexp/CORE" - AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])], --- -1.9.1 - diff --git a/meta-oe/recipes-support/postgresql/files/postgresql-bashprofile b/meta-oe/recipes-support/postgresql/files/postgresql-bashprofile deleted file mode 100644 index 1c931f37fd..0000000000 --- a/meta-oe/recipes-support/postgresql/files/postgresql-bashprofile +++ /dev/null @@ -1,4 +0,0 @@ -[ -f /etc/profile ] && source /etc/profile - -PGDATA=/var/lib/postgresql/data -export PGDATA diff --git a/meta-oe/recipes-support/postgresql/files/postgresql-setup b/meta-oe/recipes-support/postgresql/files/postgresql-setup deleted file mode 100644 index 75bb01e05f..0000000000 --- a/meta-oe/recipes-support/postgresql/files/postgresql-setup +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# -# postgresql-setup Initialization operation for PostgreSQL - -# For SELinux we need to use 'runuser' not 'su' -if [ -x /sbin/runuser ] -then - SU=runuser -else - SU=su -fi - -PGENGINE=/usr/bin -PGDATA=/var/lib/postgresql/data -PGLOG=/var/lib/postgresql/pgstartup.log -script_result=0 - -initdb(){ - if [ -f "$PGDATA/PG_VERSION" ] - then - echo -n "Data directory is not empty!" - echo -n " [FAILED] " - echo - script_result=1 - else - echo -n "Initializing database: " - if [ ! -e "$PGDATA" -a ! -h "$PGDATA" ] - then - mkdir -p "$PGDATA" || exit 1 - chown postgres:postgres "$PGDATA" - chmod go-rwx "$PGDATA" - fi - # Clean up SELinux tagging for PGDATA - [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA" - - # Make sure the startup-time log file is OK, too - if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ] - then - touch "$PGLOG" || exit 1 - chown postgres:postgres "$PGLOG" - chmod go-rwx "$PGLOG" - [ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG" - fi - - # Initialize the database - $SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'" >> "$PGLOG" 2>&1 < /dev/null - - # Create directory for postmaster log - mkdir "$PGDATA/pg_log" - chown postgres:postgres "$PGDATA/pg_log" - chmod go-rwx "$PGDATA/pg_log" - - if [ -f "$PGDATA/PG_VERSION" ] - then - echo -n " [ OK ] " - else - echo -n " [FAILED] " - script_result=1 - fi - echo - fi -} - -case "$1" in - initdb) - initdb - ;; - *) - echo "Usage: $0 initdb" - exit 2 -esac - -exit $script_result diff --git a/meta-oe/recipes-support/postgresql/files/postgresql.init b/meta-oe/recipes-support/postgresql/files/postgresql.init deleted file mode 100644 index 4a4f0cd168..0000000000 --- a/meta-oe/recipes-support/postgresql/files/postgresql.init +++ /dev/null @@ -1,193 +0,0 @@ -#!/bin/sh -# -# postgresql This is the init script for starting up the PostgreSQL -# server. -# -# chkconfig: - 64 36 -# description: PostgreSQL database server. -# processname: postmaster -# pidfile: /var/run/postmaster.PORT.pid - -# This script is slightly unusual in that the name of the daemon (postmaster) -# is not the same as the name of the subsystem (postgresql) - -# PGVERSION is the full package version, e.g., 8.4.0 -# Note: the specfile inserts the correct value during package build -PGVERSION=9.2.4 -# PGMAJORVERSION is major version, e.g., 8.4 (this should match PG_VERSION) -PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'` - -# Source function library. -. /etc/init.d/functions - -# Find the name of the script -NAME=`basename $0` -if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ] -then - NAME=${NAME:3} -fi - -# For SELinux we need to use 'runuser' not 'su' -if [ -x /sbin/runuser ] -then - SU=runuser -else - SU=su -fi - - -# Set defaults for configuration variables -PGENGINE=/usr/bin -PGPORT=5432 -PGDATA=/var/lib/postgresql/data -PGLOG=/var/lib/postgresql/pgstartup.log -# Value to set as postmaster process's oom_adj -PG_OOM_ADJ=-17 - -# Override defaults from /etc/sysconfig/postgresql if file is present -[ -f /etc/default/postgresql/${NAME} ] && . /etc/default/postgresql/${NAME} - -export PGDATA -export PGPORT - -lockfile="/var/lock/subsys/${NAME}" -pidfile="/var/run/postmaster.${PGPORT}.pid" - -script_result=0 - -start(){ - [ -x "$PGENGINE/postmaster" ] || exit 5 - - PSQL_START=$"Starting ${NAME} service: " - - # Make sure startup-time log file is valid - if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ] - then - touch "$PGLOG" || exit 4 - chown postgres:postgres "$PGLOG" - chmod go-rwx "$PGLOG" - [ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG" - fi - - # Check for the PGDATA structure - if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ] - then - # Check version of existing PGDATA - if [ x`cat "$PGDATA/PG_VERSION"` != x"$PGMAJORVERSION" ] - then - SYSDOCDIR="(Your System's documentation directory)" - if [ -d "/usr/doc/postgresql-$PGVERSION" ] - then - SYSDOCDIR=/usr/doc - fi - if [ -d "/usr/share/doc/postgresql-$PGVERSION" ] - then - SYSDOCDIR=/usr/share/doc - fi - if [ -d "/usr/doc/packages/postgresql-$PGVERSION" ] - then - SYSDOCDIR=/usr/doc/packages - fi - if [ -d "/usr/share/doc/packages/postgresql-$PGVERSION" ] - then - SYSDOCDIR=/usr/share/doc/packages - fi - echo - echo $"An old version of the database format was found." - echo $"You need to upgrade the data format before using PostgreSQL." - echo $"See $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information." - exit 1 - fi - else - # No existing PGDATA! Warn the user to initdb it. - echo - echo "$PGDATA is missing. Use \"postgresql-setup initdb\" to initialize the cluster first." - echo -n " [FAILED] " - echo - exit 1 - fi - - echo -n "$PSQL_START" - test x"$PG_OOM_ADJ" != x && echo "$PG_OOM_ADJ" > /proc/self/oom_score_adj - $SU -l postgres -c "$PGENGINE/postmaster -p '$PGPORT' -D '$PGDATA' ${PGOPTS} &" >> "$PGLOG" 2>&1 < /dev/null - sleep 2 - pid=`head -n 1 "$PGDATA/postmaster.pid" 2>/dev/null` - if [ "x$pid" != x ] - then - echo -n " [ OK ]" - touch "$lockfile" - echo $pid > "$pidfile" - echo - else - echo -n " [FAILED]" - echo - script_result=1 - fi -} - -stop(){ - echo -n $"Stopping ${NAME} service: " - if [ -e "$lockfile" ] - then - $SU -l postgres -c "$PGENGINE/pg_ctl stop -D '$PGDATA' -s -m fast" > /dev/null 2>&1 < /dev/null - ret=$? - if [ $ret -eq 0 ] - then - echo -n " [ OK ] " - rm -f "$pidfile" - rm -f "$lockfile" - else - echo -n " [FAILED] " - script_result=1 - fi - else - # not running; per LSB standards this is "ok" - echo -n " [ OK ] " - fi - echo -} - -restart(){ - stop - start -} - -condrestart(){ - [ -e "$lockfile" ] && restart || : -} - -reload(){ - $SU -l postgres -c "$PGENGINE/pg_ctl reload -D '$PGDATA' -s" > /dev/null 2>&1 < /dev/null -} - - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status postmaster - script_result=$? - ;; - restart) - restart - ;; - condrestart|try-restart) - condrestart - ;; - reload) - reload - ;; - force-reload) - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac - -exit $script_result diff --git a/meta-oe/recipes-support/postgresql/files/postgresql.pam b/meta-oe/recipes-support/postgresql/files/postgresql.pam deleted file mode 100644 index 0b6fdc5f26..0000000000 --- a/meta-oe/recipes-support/postgresql/files/postgresql.pam +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth include common-auth -account include common-account -password include common-password diff --git a/meta-oe/recipes-support/postgresql/files/postgresql.service b/meta-oe/recipes-support/postgresql/files/postgresql.service deleted file mode 100644 index 4ec959e842..0000000000 --- a/meta-oe/recipes-support/postgresql/files/postgresql.service +++ /dev/null @@ -1,27 +0,0 @@ -[Unit] -Description=PostgreSQL database server -After=network.target - -[Service] -Type=forking -User=postgres -Group=postgres - -# Port number for server to listen on -Environment=PGPORT=5432 - -# Location of database directory -Environment=PGDATA=/var/lib/postgresql/data - -# Disable OOM kill on the postmaster -OOMScoreAdjust=-17 - -ExecStart=@BINDIR@/pg_ctl start -D ${PGDATA} -s -o "-p ${PGPORT}" -w -t 300 -ExecStop=@BINDIR@/pg_ctl stop -D ${PGDATA} -s -m fast -ExecReload=@BINDIR@/pg_ctl reload -D ${PGDATA} -s - -# Give a reasonable amount of time for the server to start up/shut down -TimeoutSec=300 - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/postgresql/files/remove.autoconf.version.check.patch b/meta-oe/recipes-support/postgresql/files/remove.autoconf.version.check.patch deleted file mode 100644 index be23fd419d..0000000000 --- a/meta-oe/recipes-support/postgresql/files/remove.autoconf.version.check.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: postgresql-9.2.4/configure.in -=================================================================== ---- postgresql-9.2.4.orig/configure.in -+++ postgresql-9.2.4/configure.in -@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un - - AC_INIT([PostgreSQL], [9.4.2], [pgsql-bugs@postgresql.org]) - --m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. --Untested combinations of 'autoconf' and PostgreSQL versions are not --recommended. You can remove the check from 'configure.in' but it is then --your responsibility whether the result works or not.])]) - AC_COPYRIGHT([Copyright (c) 1996-2014, PostgreSQL Global Development Group]) - AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) - AC_CONFIG_AUX_DIR(config) - diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc deleted file mode 100644 index 812c2aed48..0000000000 --- a/meta-oe/recipes-support/postgresql/postgresql.inc +++ /dev/null @@ -1,383 +0,0 @@ -SUMMARY = "PostgreSQL is a powerful, open source relational database system." -DESCRIPTION = "\ - PostgreSQL is an advanced Object-Relational database management system \ - (DBMS) that supports almost all SQL constructs (including \ - transactions, subselects and user-defined types and functions). The \ - postgresql package includes the client programs and libraries that \ - you'll need to access a PostgreSQL DBMS server. These PostgreSQL \ - client programs are programs that directly manipulate the internal \ - structure of PostgreSQL databases on a PostgreSQL server. These client \ - programs can be located on the same machine with the PostgreSQL \ - server, or may be on a remote machine which accesses a PostgreSQL \ - server over a network connection. This package contains the docs \ - in HTML for the whole package, as well as command-line utilities for \ - managing PostgreSQL databases on a PostgreSQL server. \ - \ - If you want to manipulate a PostgreSQL database on a local or remote \ - PostgreSQL server, you need this package. You also need to install \ - this package if you're installing the postgresql-server package. \ -" -HOMEPAGE = "http://www.postgresql.com" -LICENSE = "BSD" -DEPENDS = "zlib readline tzcode-native" - -ARM_INSTRUCTION_SET = "arm" - -SRC_URI = "http://ftp.postgresql.org/pub/source/v${PV}/${BP}.tar.bz2 \ - file://postgresql.init \ - file://postgresql-bashprofile \ - file://postgresql.pam \ - file://postgresql-setup \ - file://postgresql.service \ - file://0001-Use-pkg-config-for-libxml2-detection.patch \ -" - -LEAD_SONAME = "libpq.so" - -# LDFLAGS for shared libraries -export LDFLAGS_SL = "${LDFLAGS}" - -inherit autotools pkgconfig perlnative pythonnative useradd update-rc.d systemd gettext - -CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6" - -SYSTEMD_SERVICE_${PN} = "postgresql.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" - -DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-systemctl-native', '', d)}" -pkg_postinst_${PN} () { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd sysvinit', 'true', 'false', d)}; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask postgresql-server.service - fi -} - -enable_pam = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -PACKAGECONFIG ??= "${enable_pam} openssl python uuid libxml tcl nls libxml perl" -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," -PACKAGECONFIG[python] = "--with-python,--without-python,python,python" -PACKAGECONFIG[uuid] = "--with-ossp-uuid,--without-ossp-uuid,ossp-uuid," -PACKAGECONFIG[tcl] = "--with-tcl --with-tclconfig=${STAGING_BINDIR_CROSS},--without-tcl,tcl tcl-native," -PACKAGECONFIG[nls] = "--enable-nls,--disable-nls,," -PACKAGECONFIG[libxml] = "--with-libxml,--without-libxml,libxml2,libxml2" -PACKAGECONFIG[perl] = "--with-perl,--without-perl,perl,perl" - -EXTRA_OECONF += "--enable-thread-safety --disable-rpath \ - --datadir=${datadir}/${BPN} \ - --sysconfdir=${sysconfdir}/${BPN} \ -" -EXTRA_OECONF_sh4 += "--disable-spinlocks" -EXTRA_OECONF_aarch64 += "--disable-spinlocks" - -PACKAGES_DYNAMIC += "^${PN}-plperl ^${PN}-plperl-dbg \ - ^${PN}-pltcl ^${PN}-pltcl-dbg \ - ^${PN}-plpython ^${PN}-plpython-dbg \ -" - -python populate_packages_prepend() { - - def fill_more(name, dbg=True): - if name is None or name.strip() == "": - return - - fpack=d.getVar('PACKAGES', False) or "" - fpack="${PN}-" + name + " " + fpack - if dbg: - fpack="${PN}-" + name + "-dbg" + " " + fpack - d.setVar('PACKAGES', fpack) - - conf=(d.getVar('PACKAGECONFIG') or "").split() - pack=d.getVar('PACKAGES', False) or "" - bb.debug(1, "PACKAGECONFIG=%s" % conf) - bb.debug(1, "PACKAGES1=%s" % pack ) - - if "perl" in conf : - fill_more("plperl") - - if "tcl" in conf: - fill_more("pltcl") - - if "python" in conf: - fill_more("plpython") - - pack=d.getVar('PACKAGES') or "" - bb.debug(1, "PACKAGES2=%s" % pack) - -} - -do_configure() { - # do_configure - autotools_do_configure - - # do_configure_append - # workaround perl package related bugs - sed -i -e "s:-L/usr/local/lib:-L=/usr/local/lib:g" \ - ${B}/src/Makefile.global - LIBPNA="\${STAGING_LIBDIR_NATIVE}/perl-native" - LIBNA="\${STAGING_LIBDIR_NATIVE}" - BLIBNA="\${STAGING_BASE_LIBDIR_NATIVE}" - sed -i -e "/^perl_archlibexp/s:${LIBPNA}:${STAGING_LIBDIR}:g" \ - ${B}/src/Makefile.global - sed -i -e "/^perl_privlibexp/s:${LIBPNA}:${STAGING_LIBDIR}:g" \ - ${B}/src/Makefile.global - # remove the rpath, replace with correct lib path - sed -i \ - -e "/^perl_embed_ldflags/s:-Wl,-rpath,${LIBNA}::g" \ - -e "/^perl_embed_ldflags/s:-Wl,-rpath,${BLIBNA}::g" \ - -e "/^perl_embed_ldflags/s:-Wl,-rpath-link,${LIBNA}::g" \ - -e "/^perl_embed_ldflags/s:-Wl,-rpath-link,${BLIBNA}::g" \ - -e "/^perl_embed_ldflags/s:${LIBPNA}:${STAGING_LIBDIR}:g" \ - -e "/^perl_embed_ldflags/s:${LIBNA}:${STAGING_LIBDIR}:g" \ - -e "/^perl_embed_ldflags/s:${BLIBNA}:${STAGING_BASELIBDIR}:g" \ - -e "/^TCLSH/s:=.*:= ${bindir}/tclsh:g" \ - ${B}/src/Makefile.global - - if ${@bb.utils.contains('PACKAGECONFIG', 'perl', 'true', 'false', d)}; then - # workaround perl package's libperl.so problem - # we are using perlnative so this perl should have same version - perl_version=`perl -v 2>/dev/null | \ - sed -n 's/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p'` - if [ ! -h "${STAGING_LIBDIR}/perl/$perl_version/CORE/libperl.so" -a \ - ! -h "${STAGING_LIBDIR}/libperl.so" ]; then - ln -sf ../../../libperl.so.5 \ - ${STAGING_LIBDIR}/perl/$perl_version/CORE/libperl.so - fi - fi -} - -do_compile_append() { - oe_runmake -C contrib all -} - -# server needs to configure user and group -usernum = "28" -groupnum = "28" -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-M -g postgres -o -r -d ${localstatedir}/lib/${BPN} \ - -s /bin/bash -c 'PostgreSQL Server' -u ${usernum} postgres" -GROUPADD_PARAM_${PN} = "-g ${groupnum} -o -r postgres" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME = "${BPN}-server" -INITSCRIPT_PARAMS = "start 64 . stop 36 0 1 2 3 4 5 6 ." - -do_install_append() { - # install contrib - oe_runmake DESTDIR=${D} -C contrib install - # install tutorial - install -d -m 0755 ${D}${libdir}/${BPN}/tutorial - install ${B}/src/tutorial/* ${D}${libdir}/${BPN}/tutorial - - # install COPYRIGHT README HISTORY - install -d -m 0755 ${D}${docdir}/${BPN} - for i in ${B}/COPYRIGHT ${B}/README ${B}/HISTORY ${B}/doc/KNOWN_BUGS ${B}/doc/MISSING_FEATURES ${B}/doc/README* ${B}/doc/bug.template; do - [ -f $i ] && install $i ${D}${docdir}/${BPN} - done - - # install dirs and server init - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/${BPN}.init ${D}${sysconfdir}/init.d/${BPN}-server - sed -i -e "s/^PGVERSION=.*$/PGVERSION=${PV}/g" ${D}${sysconfdir}/init.d/${BPN}-server - install -m 0755 ${WORKDIR}/${BPN}-setup ${D}${bindir}/${BPN}-setup - install -d -m 700 ${D}${localstatedir}/lib/${BPN}/data - install -d -m 700 ${D}${localstatedir}/lib/${BPN}/backups - install -m 644 ${WORKDIR}/${BPN}-bashprofile ${D}${localstatedir}/lib/${BPN}/.bash_profile - chown -R postgres:postgres ${D}${localstatedir}/lib/${BPN} - # multiple server config directory - install -d -m 700 ${D}${sysconfdir}/default/${BPN} - - if [ "${@d.getVar('enable_pam')}" = "pam" ]; then - install -d ${D}${sysconfdir}/pam.d - install -m 644 ${WORKDIR}/postgresql.pam ${D}${sysconfdir}/pam.d/postgresql - fi - - # Install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/postgresql.service ${D}${systemd_unitdir}/system - sed -i -e 's,@BINDIR@,${bindir},g' \ - ${D}${systemd_unitdir}/system/postgresql.service -} - -SSTATE_SCAN_FILES += "Makefile.global" - -PACKAGES =+ "${PN}-client ${PN}-server-dev ${PN}-timezone \ - libecpg-compat-dbg libecpg-compat libecpg-compat-dev \ - libecpg-dbg libecpg libecpg-dev libecpg-staticdev libecpg-doc \ - libpq-dbg libpq libpq-dev libpq-staticdev \ - libpgtypes-dbg libpgtypes libpgtypes-staticdev libpgtypes-dev \ - ${PN}-contrib ${PN}-contrib-dbg \ -" - -FILES_${PN} += "${sysconfdir}/init.d/${BPN}-server \ - ${localstatedir}/lib/${BPN}/data ${localstatedir}/lib/${BPN}/backups \ - ${localstatedir}/lib/${BPN}/.bash_profile ${sysconfdir}/default/${BPN} \ - ${libdir}/${BPN}/dict_snowball.so ${libdir}/${BPN}/plpgsql.so \ - ${libdir}/${BPN}/euc2004_sjis2004.so \ - ${libdir}/${BPN}/libpqwalreceiver.so \ - ${libdir}/${BPN}/*_and_*.so \ - ${@'${sysconfdir}/pam.d/postgresql' \ - if 'pam' == d.getVar('enable_pam') \ - else ''} \ -" - -FILES_${PN}-dbg += " ${libdir}/${BPN}/.debug/dict_snowball.so \ - ${libdir}/${BPN}/.debug/plpgsql.so \ - ${libdir}/${BPN}/.debug/euc2004_sjis2004.so \ - ${libdir}/${BPN}/.debug/libpqwalreceiver.so \ - ${libdir}/${BPN}/.debug/*_and_*.so \ -" - -FILES_${PN}-client = "${bindir}/clusterdb \ - ${bindir}/createdb \ - ${bindir}/createlang \ - ${bindir}/createuser \ - ${bindir}/dropdb \ - ${bindir}/droplang \ - ${bindir}/dropuser \ - ${bindir}/pg_dump \ - ${bindir}/pg_dumpall \ - ${bindir}/pg_restore \ - ${bindir}/psql \ - ${bindir}/reindexdb \ - ${bindir}/vacuumdb \ - ${bindir}/vacuumlo \ - ${datadir}/${BPN}/psqlrc.sample \ -" -FILES_${PN}-client-doc = "${mandir}/man1/clusterdb.* \ - ${mandir}/man1/createdb.* ${mandir}/man1/createlang.* \ - ${mandir}/man1/createuser.* ${mandir}/man1/dropdb.* \ - ${mandir}/man1/droplang.* ${mandir}/man1/dropuser.* \ - ${mandir}/man1/pg_dump.* ${mandir}/man1/pg_dumpall.* \ - ${mandir}/man1/pg_restore.* ${mandir}/man1/psql.* \ - ${mandir}/man1/reindexdb.* ${mandir}/man1/vacuumdb.* \ - ${mandir}/man7/* \ -" -FILES_${PN}-doc += "${docdir}/${BPN}/html ${libdir}/${BPN}/tutorial/ \ - ${mandir}/man1/initdb.* ${mandir}/man1/pg_controldata.* \ - ${mandir}/man1/pg_ctl.* ${mandir}/man1/pg_resetxlog.* \ - ${mandir}/man1/postgres.* ${mandir}/man1/postmaster.* \ -" -FILES_${PN}-timezone = "${datadir}/${BPN}/timezone \ - ${datadir}/${BPN}/timezonesets \ -" -RDEPENDS_${PN} += "${PN}-timezone" -FILES_${PN}-server-dev = "${includedir}/${BPN}/server" - -FILES_libecpg = "${libdir}/libecpg*${SOLIBS}" -FILES_libecpg-dbg = "${libdir}/.debug/libecpg*" -FILES_libecpg-dev = "${libdir}/libecpg*${SOLIBSDEV} \ - ${libdir}/libpgtypes*${SOLIBSDEV} \ - ${includedir}/ecpg*.h ${includedir}/${BPN}/ecpg*.h \ - ${includedir}/pgtypes*.h ${includedir}/${BPN}/informix \ - ${includedir}/sql3types.h ${includedir}/sqlca.h \ -" -FILES_libecpg-doc = "${mandir}/man1/ecpg.*" -FILES_libecpg-staticdev = "${libdir}/libecpg*.a" -SECTION_libecpg-staticdev = "devel" -RDEPENDS_libecpg-staticdev = "libecpg-dev (= ${EXTENDPKGV})" - -FILES_libpq = "${libdir}/libpq*${SOLIBS}" -FILES_libpq-dbg = "${libdir}/.debug/libpq* ${libdir}/${BPN}/pgxs/src/test/regress/.debug/*" -FILES_libpq-dev = "${libdir}/libpq*${SOLIBSDEV} \ - ${includedir} \ -" -FILES_libpq-staticdev = "${libdir}/libpq*.a ${libdir}/libpgport.a" -SECTION_libpq-staticdev = "devel" -RDEPENDS_libpq-staticdev = "libpq-dev (= ${EXTENDPKGV})" - -FILES_libecpg-compat = "${libdir}/libecpg_compat*${SOLIBS}" -FILES_libecpg-compat-dbg = "${libdir}/.debug/libecpg_compat*" -FILES_libecpg-compat-dev = "${libdir}/libecpg_compat*${SOLIBS}" -FILES_libpgtypes = "${libdir}/libpgtypes*${SOLIBS}" -FILES_libpgtypes-dbg = "${libdir}/.debug/libpgtypes*" -FILES_libpgtypes-staticdev = "${libdir}/libpgtypes*.a" -FILES_libpgtypes-dev = "${libdir}/libpgtypes*${SOLIBS} ${includedir}/pgtypes*.h" - -FILES_${PN}-contrib = " ${bindir}/oid2name ${bindir}/pg_standby \ - ${bindir}/pgbench ${bindir}/vacuumlo \ - ${S}/contrib/spi/*.example \ - ${libdir}/${BPN}/_int.so ${libdir}/${BPN}/adminpack.so \ - ${libdir}/${BPN}/autoinc.so ${libdir}/${BPN}/auto_explain.so \ - ${libdir}/${BPN}/auth_delay.so ${libdir}/${BPN}/btree_gin.so \ - ${libdir}/${BPN}/btree_gist.so ${libdir}/${BPN}/.so \ - ${libdir}/${BPN}/chkpass.so ${libdir}/${BPN}/citext.so \ - ${libdir}/${BPN}/cube.so ${libdir}/${BPN}/dblink.so \ - ${libdir}/${BPN}/dict_int.so ${libdir}/${BPN}/dict_xsyn.so \ - ${libdir}/${BPN}/dummy_seclabel.so ${libdir}/${BPN}/earthdistance.so \ - ${libdir}/${BPN}/file_fdw.so ${libdir}/${BPN}/fuzzystrmatch.so \ - ${libdir}/${BPN}/hstore.so ${libdir}/${BPN}/insert_username.so \ - ${libdir}/${BPN}/isn.so ${libdir}/${BPN}/lo.so \ - ${libdir}/${BPN}/ltree.so ${libdir}/${BPN}/moddatetime.so \ - ${libdir}/${BPN}/pageinspect.so ${libdir}/${BPN}/pg_buffercache.so \ - ${libdir}/${BPN}/pg_freespacemap.so ${libdir}/${BPN}/pg_trgm.so \ - ${libdir}/${BPN}/pgcrypto.so ${libdir}/${BPN}/pgrowlocks.so \ - ${libdir}/${BPN}/pgstattuple.so ${libdir}/${BPN}/pg_stat_statements.so \ - ${libdir}/${BPN}/refint.so ${libdir}/${BPN}/seg.so \ - ${libdir}/${BPN}/sslinfo.so \ - ${libdir}/${BPN}/tablefunc.so \ - ${libdir}/${BPN}/test_parser.so ${libdir}/${BPN}/timetravel.so \ - ${libdir}/${BPN}/tsearch2.so ${libdir}/${BPN}/uuid-ossp.so \ - ${libdir}/${BPN}/pgxml.so ${libdir}/${BPN}/passwordcheck.so \ - ${libdir}/${BPN}/pg_upgrade_support.so ${libdir}/${BPN}/.so \ - ${libdir}/${BPN}/unaccent.so \ -" -FILES_${PN}-contrib-dbg = " \ - ${libdir}/${BPN}/.debug/_int.so ${libdir}/${BPN}/.debug/adminpack.so \ - ${libdir}/${BPN}/.debug/autoinc.so ${libdir}/${BPN}/.debug/auto_explain.so \ - ${libdir}/${BPN}/.debug/auth_delay.so ${libdir}/${BPN}/.debug/btree_gin.so \ - ${libdir}/${BPN}/.debug/btree_gist.so ${libdir}/${BPN}/.debug/.so \ - ${libdir}/${BPN}/.debug/chkpass.so ${libdir}/${BPN}/.debug/citext.so \ - ${libdir}/${BPN}/.debug/cube.so ${libdir}/${BPN}/.debug/dblink.so \ - ${libdir}/${BPN}/.debug/dict_int.so ${libdir}/${BPN}/.debug/dict_xsyn.so \ - ${libdir}/${BPN}/.debug/dummy_seclabel.so \ - ${libdir}/${BPN}/.debug/earthdistance.so \ - ${libdir}/${BPN}/.debug/file_fdw.so ${libdir}/${BPN}/.debug/fuzzystrmatch.so \ - ${libdir}/${BPN}/.debug/hstore.so ${libdir}/${BPN}/.debug/insert_username.so \ - ${libdir}/${BPN}/.debug/isn.so ${libdir}/${BPN}/.debug/lo.so \ - ${libdir}/${BPN}/.debug/ltree.so ${libdir}/${BPN}/.debug/moddatetime.so \ - ${libdir}/${BPN}/.debug/pageinspect.so \ - ${libdir}/${BPN}/.debug/pg_buffercache.so \ - ${libdir}/${BPN}/.debug/pg_freespacemap.so \ - ${libdir}/${BPN}/.debug/pg_trgm.so \ - ${libdir}/${BPN}/.debug/pgcrypto.so ${libdir}/${BPN}/.debug/pgrowlocks.so \ - ${libdir}/${BPN}/.debug/pgstattuple.so \ - ${libdir}/${BPN}/.debug/pg_stat_statements.so \ - ${libdir}/${BPN}/.debug/refint.so ${libdir}/${BPN}/.debug/seg.so \ - ${libdir}/${BPN}/.debug/sslinfo.so \ - ${libdir}/${BPN}/.debug/tablefunc.so \ - ${libdir}/${BPN}/.debug/test_parser.so ${libdir}/${BPN}/.debug/timetravel.so \ - ${libdir}/${BPN}/.debug/tsearch2.so ${libdir}/${BPN}/.debug/uuid-ossp.so \ - ${libdir}/${BPN}/.debug/pgxml.so ${libdir}/${BPN}/.debug/passwordcheck.so \ - ${libdir}/${BPN}/.debug/pg_upgrade_support.so \ - ${libdir}/${BPN}/.debug/unaccent.so \ -" -DESCRIPTION_${PN}-contrib = "The postgresql-contrib package contains \ - contributed packages that are included in the PostgreSQL distribution." - -FILES_${PN}-pltcl = "${libdir}/${BPN}/pltcl.so ${bindir}/pltcl_delmod \ - ${binddir}/pltcl_listmod ${bindir}/pltcl_loadmod \ - ${datadir}/${BPN}/unknown.pltcl" -FILES_${PN}-pltcl-dbg = "${libdir}/${BPN}/.debug/pltcl.so" -SUMMARY_${PN}-pltcl = "The Tcl procedural language for PostgreSQL" -DESCRIPTION_${PN}-pltcl = "PostgreSQL is an advanced Object-Relational \ - database management system. The postgresql-pltcl package contains the PL/Tcl \ - procedural language for the backend." - -FILES_${PN}-plperl = "${libdir}/${BPN}/plperl.so" -FILES_${PN}-plperl-dbg = "${libdir}/${BPN}/.debug/plperl.so" -SUMMARY_${PN}-plperl = "The Perl procedural language for PostgreSQL" -DESCRIPTION_${PN}-plperl = "PostgreSQL is an advanced Object-Relational \ - database management system. The postgresql-plperl package contains the \ - PL/Perl procedural language for the backend." - -# In version 8, it will be plpython.so -# In version 9, it might be plpython{2,3}.so depending on python2 or 3 -FILES_${PN}-plpython = "${libdir}/${BPN}/plpython*.so" -FILES_${PN}-plpython-dbg = "${libdir}/${BPN}/.debug/plpython*.so" -SUMMARY_${PN}-plpython = "The Python procedural language for PostgreSQL" -DESCRIPTION_${PN}-plpython = "PostgreSQL is an advanced Object-Relational \ - database management system. The postgresql-plpython package contains \ - the PL/Python procedural language for the backend." diff --git a/meta-oe/recipes-support/postgresql/postgresql_9.4.15.bb b/meta-oe/recipes-support/postgresql/postgresql_9.4.15.bb deleted file mode 100644 index eec099a129..0000000000 --- a/meta-oe/recipes-support/postgresql/postgresql_9.4.15.bb +++ /dev/null @@ -1,15 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=81b69ddb31a8be66baafd14a90146ee2" - -SRC_URI += "\ - file://remove.autoconf.version.check.patch \ - file://not-check-libperl.patch \ -" - -do_compile_prepend_libc-musl() { - sed -i -e 's/\-lnsl//g' ${B}/src/Makefile.global -} - -SRC_URI[md5sum] = "0aada0833a9208ae5fab966c73c39379" -SRC_URI[sha256sum] = "12bfb3c7e8e45515ef921ad365e122682a5c4935dcc0032644433af2de31acc4" diff --git a/meta-oe/recipes-support/pps-tools/pps-tools_git.bb b/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb index 8bf9036990..65c06c1bd5 100644 --- a/meta-oe/recipes-support/pps-tools/pps-tools_git.bb +++ b/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb @@ -1,15 +1,16 @@ SUMMARY = "User-space tools for LinuxPPS" HOMEPAGE = "http://linuxpps.org" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PV = "0.0.0+git${SRCPV}" -SRCREV = "0deb9c7e135e9380a6d09e9d2e938a146bb698c8" -SRC_URI = "git://github.com/ago/pps-tools.git" +SRCREV = "c50cb7183e252b47308fa22f420e0a877277aa29" +SRC_URI = "git://github.com/ago/pps-tools.git;branch=master;protocol=https" S = "${WORKDIR}/git" +RDEPENDS:${PN} = "bash" + do_install() { install -d ${D}${bindir} ${D}${includedir} \ ${D}${includedir}/sys diff --git a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch index 8341a8ecde..c1f9ce7eca 100644 --- a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch +++ b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/3] From debian to fix compile errors Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + src/Makefile.0 | 7 +++---- src/autoconf | 64 +++++++++++++------------------------------------------- src/comsat.c | 65 +++++++++++++++++++-------------------------------------- diff --git a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch index 7b3c643b2b..78ac6241d0 100644 --- a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch +++ b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch @@ -5,6 +5,8 @@ Subject: [PATCH 2/3] From debian to fix man file Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + man/procmail.man | 24 +++++++++++++++++------- man/procmailrc.man | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch b/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch index a94e436703..2bebccc0b2 100644 --- a/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch +++ b/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch @@ -5,6 +5,8 @@ Subject: [PATCH 3/3] From debian to modify parameters Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + Makefile | 16 ++++++++-------- config.h | 13 +++++++------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch b/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch index 46d973e060..72fa27a834 100644 --- a/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch +++ b/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch @@ -5,6 +5,8 @@ Subject: [PATCH] man file mailstat.1 from debian Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + debian/mailstat.1 | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 debian/mailstat.1 diff --git a/meta-oe/recipes-support/procmail/procmail_3.22.bb b/meta-oe/recipes-support/procmail/procmail_3.22.bb index aa474ceb14..abb87f9935 100644 --- a/meta-oe/recipes-support/procmail/procmail_3.22.bb +++ b/meta-oe/recipes-support/procmail/procmail_3.22.bb @@ -16,7 +16,7 @@ SRC_URI = "http://www.ring.gr.jp/archives/net/mail/${BPN}/${BP}.tar.gz \ SRC_URI[md5sum] = "1678ea99b973eb77eda4ecf6acae53f1" SRC_URI[sha256sum] = "087c75b34dd33d8b9df5afe9e42801c9395f4bf373a784d9bc97153b0062e117" -LICENSE = "GPL-2.0 & Artistic-1.0" +LICENSE = "GPL-2.0-only & Artistic-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=a71e50e197a992c862379e576e669757 \ file://Artistic;md5=505e00d03c3428cde21b17b2a386590e" @@ -29,11 +29,11 @@ do_configure() { export CFLAGS="${BUILD_CFLAGS}" export AR="${BUILD_AR}" export AS="${BUILD_AS}" - make TARGET_CFLAGS="$TARGET_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS0="${LDFLAGS}" autoconf.h + make TARGET_CFLAGS="$TARGET_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS0="${BUILD_LDFLAGS}" autoconf.h } do_compile() { - oe_runmake -i TARGET_CFLAGS="$TARGET_CFLAGS -Wno-comments -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS0="${LDFLAGS}" + oe_runmake -i CFLAGS="$TARGET_CFLAGS -Wno-comments -Wno-implicit-int -Wno-implicit-function-declaration -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS0="${LDFLAGS}" } do_install() { @@ -43,3 +43,5 @@ do_install() { oe_runmake -i BASENAME=${D}/usr MANDIR=${D}${mandir} install install -m 0644 debian/mailstat.1 ${D}${mandir}/man1 } + +CVE_STATUS[CVE-1999-0475] = "fixed-version: No action required. The current version (3.22) is not affected by the CVE." diff --git a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch b/meta-oe/recipes-support/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch deleted file mode 100644 index 7eda038756..0000000000 --- a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch +++ /dev/null @@ -1,26 +0,0 @@ -[PATCH] do not use the hardcode libdir - -Upstream-status: Pending - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 9b88d4c..df5ad7a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -140,7 +140,7 @@ if test "$with_libpq" != yes; then - if test -d "$with_libpq"; then - PATH="$PATH:$with_libpq/bin" - CPPFLAGS="$CPPFLAGS -I$with_libpq/include" -- LDFLAGS="$LDFLAGS -L$with_libpq/lib" -+ LDFLAGS="$LDFLAGS -L$with_libpq/${base_libdir}" - else - if test -x "$with_libpq"; then - PG_CONFIG=$with_libpq --- -2.8.1 - diff --git a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch b/meta-oe/recipes-support/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch deleted file mode 100644 index a8f14e7689..0000000000 --- a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch +++ /dev/null @@ -1,148 +0,0 @@ -Subject: [PATCH] psqlodbc: fixes for ptest support - -* Fix the LIBODBC since we don't use ODBC_CONFIG. -* Fix the path for driver. -* Add the default info of postgresql server. -* Fix the output format for ptest. -* Fix the results and exe dir. - -Upstream-Status: Inappropriate [OE ptest specific] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - test/Makefile.in | 2 +- - test/odbcini-gen.sh | 8 ++++---- - test/runsuite.c | 26 +++++++++++++------------- - 3 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/test/Makefile.in b/test/Makefile.in -index 8710616..fcb470e 100644 ---- a/test/Makefile.in -+++ b/test/Makefile.in -@@ -18,7 +18,7 @@ CFLAGS = @CFLAGS@ - ODBC_CONFIG = @ODBC_CONFIG@ - PROVE = @PROVE@ - --LIBODBC := $(shell $(ODBC_CONFIG) --libs) -+LIBODBC = -lodbc - - all: $(TESTBINS) runsuite reset-db - -diff --git a/test/odbcini-gen.sh b/test/odbcini-gen.sh -index d2c2c87..6068d9d 100755 ---- a/test/odbcini-gen.sh -+++ b/test/odbcini-gen.sh -@@ -6,7 +6,7 @@ - outini=odbc.ini - outinstini=odbcinst.ini - --drvr=../.libs/psqlodbcw -+drvr=@LIBDIR@/psqlodbca - driver=${drvr}.so - if test ! -e $driver ; then - driver=${drvr}.dll -@@ -33,10 +33,10 @@ Driver = psqlodbc test driver - Trace = No - TraceFile = - Database = contrib_regression --Servername = --Username = -+Servername = localhost -+Username = postgres - Password = --Port = -+Port = 5432 - ReadOnly = No - RowVersioning = No - ShowSystemTables = No -diff --git a/test/runsuite.c b/test/runsuite.c -index 583cf35..fd2a90e 100644 ---- a/test/runsuite.c -+++ b/test/runsuite.c -@@ -51,7 +51,7 @@ bailout(const char *fmt, ...) - - /* Given a test program's name, get the test name */ - void --parse_argument(const char *in, char *testname, char *binname) -+parse_argument(const char *in, char *testname, char *binname, const char *inputdir) - { - const char *basename; - #ifdef WIN32 -@@ -65,7 +65,7 @@ parse_argument(const char *in, char *testname, char *binname) - if (strchr(in, DIR_SEP) == NULL) - { - strcpy(testname, in); -- sprintf(binname, "exe%c%s-test", DIR_SEP, in); -+ sprintf(binname, "%s%cexe%c%s-test", inputdir, DIR_SEP, DIR_SEP, in); - return; - } - -@@ -127,7 +127,7 @@ int main(int argc, char **argv) - failures = 0; - for (i = 1, j = 1; i <= numtests; i++, j++) - { -- parse_argument(argv[j], testname, binname); -+ parse_argument(argv[j], testname, binname, inputdir); - if (runtest(binname, testname, i, inputdir) != 0) - failures++; - } -@@ -157,29 +157,29 @@ runtest(const char *binname, const char *testname, int testno, const char *input - #ifndef WIN32 - snprintf(cmdline, sizeof(cmdline), - "ODBCSYSINI=. ODBCINSTINI=./odbcinst.ini ODBCINI=./odbc.ini " -- "%s > results/%s.out", -- binname, testname); -+ "%s > %s/results/%s.out", -+ binname, inputdir, testname); - #else - snprintf(cmdline, sizeof(cmdline), -- "%s > results\\%s.out", -- binname, testname); -+ "%s > %s/results\\%s.out", -+ binname, inputdir, testname); - #endif - rc = system(cmdline); - - diff = rundiff(testname, inputdir); - if (rc != 0) - { -- printf("not ok %d - %s test returned %d\n", testno, testname, rc); -+ printf("FAIL: %d - %s\n\ttest returned %d\n", testno, testname, rc); - ret = 1; - } - else if (diff != 0) - { -- printf("not ok %d - %s test output differs\n", testno, testname); -+ printf("FAIL: %d - %s\n\ttest output differs\n", testno, testname); - ret = 1; - } - else - { -- printf("ok %d - %s\n", testno, testname); -+ printf("PASS: %d - %s\n", testno, testname); - ret = 0; - } - fflush(stdout); -@@ -196,7 +196,7 @@ rundiff(const char *testname, const char *inputdir) - char *result; - size_t result_len; - -- snprintf(filename, sizeof(filename), "results/%s.out", testname); -+ snprintf(filename, sizeof(filename), "%s/results/%s.out", inputdir, testname); - result = slurpfile(filename, &result_len); - - outputno = 0; -@@ -244,8 +244,8 @@ rundiff(const char *testname, const char *inputdir) - * files and print the smallest diff? - */ - snprintf(cmdline, sizeof(cmdline), -- "diff -c %s/expected/%s.out results/%s.out >> regression.diffs", -- inputdir, testname, testname); -+ "diff -c %s/expected/%s.out %s/results/%s.out >> regression.diffs", -+ inputdir, testname, inputdir, testname); - if (system(cmdline) == -1) - printf("# diff failed\n"); - --- -2.8.2 - diff --git a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch b/meta-oe/recipes-support/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch deleted file mode 100644 index 1d988182e7..0000000000 --- a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch +++ /dev/null @@ -1,118 +0,0 @@ -Subject: [PATCH] remove some checks for cross-compiling - -some lib check is not suitable for -cross-compiling, so remove them. - -Upstream-Status: Inappropriate [not a real bug,just for cross-compiling] - -Signed-off-by: Song.Li <Song.Li@windriver.com> -Signed-off-by: Kai Kang <kai.kang@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - configure.ac | 66 +++++++----------------------------------------------------- - 1 file changed, 7 insertions(+), 59 deletions(-) - -diff --git a/configure.ac b/configure.ac -index df5ad7a..b72bd4c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -46,57 +46,19 @@ AC_ARG_WITH(iodbc, [ --with-iodbc[[=DIR]] [[default=no]] DIR is the iODBC bas - if test "$with_iodbc" != no; then - with_unixodbc=no - AC_DEFINE(WITH_IODBC, 1, [Define to 1 to build with iODBC support]) -- if test "$with_iodbc" = yes; then -- AC_PATH_PROGS(ODBC_CONFIG, iodbc-config) -- else -- ODBC_CONFIG=$with_iodbc -- fi -- if test ! -x "${ODBC_CONFIG}/bin/iodbc-config"; then -- if test ! -x "${ODBC_CONFIG}"; then -- AC_MSG_ERROR([iodbc-config not found (required for iODBC build)]) -- fi -- else -- ODBC_CONFIG=${ODBC_CONFIG}/bin/iodbc-config -- fi - fi - - if test "$with_unixodbc" != no; then - AC_DEFINE(WITH_UNIXODBC, 1, - [Define to 1 to build with unixODBC support]) -- if test "$with_unixodbc" = yes; then -- AC_PATH_PROGS(ODBC_CONFIG, odbc_config) -- else -- ODBC_CONFIG=$with_unixodbc -- fi -- if test ! -x "${ODBC_CONFIG}/bin/odbc_config"; then -- if test ! -x "${ODBC_CONFIG}"; then -- AC_MSG_ERROR([odbc_config not found (required for unixODBC build)]) -- fi -- else -- ODBC_CONFIG=${ODBC_CONFIG}/bin/odbc_config -- fi - fi - - # - # ODBC include and library - # -- --if test "$ODBC_CONFIG" != ""; then -- if test "$with_iodbc" != no; then -- ODBC_INCLUDE=`${ODBC_CONFIG} --cflags` -- CPPFLAGS="$CPPFLAGS ${ODBC_INCLUDE}" -- # Linking libiodoc is rather problematic -- [ODBC_LIBDIR=`${ODBC_CONFIG} --libs | sed -e "s/^\(-L\|.*[ \t]-L\)\([^ \n\r\f\t]*\).*$/-L\2/"`] -- LDFLAGS="$LDFLAGS ${ODBC_LIBDIR}" -- else -- ODBC_INCLUDE=`${ODBC_CONFIG} --include-prefix` -- CPPFLAGS="$CPPFLAGS -I${ODBC_INCLUDE}" -- # Linking libodoc is rather problematic -- ODBC_LIBDIR=`${ODBC_CONFIG} --lib-prefix` -- LDFLAGS="$LDFLAGS -L${ODBC_LIBDIR}" -- fi -- AC_MSG_NOTICE([using $ODBC_INCLUDE $ODBC_LIBDIR]) --fi -+ODBC_LIBS="-lodbcinst" -+LIBS="$LIBS ${ODBC_LIBS}" -+AC_MSG_NOTICE([using $ODBC_INCLUDE $ODBC_LIBS]) - - # - # SQLCOLATTRIBUTE_SQLLEN check -@@ -176,18 +138,10 @@ PGAC_ARG_BOOL(enable, pthreads, yes, - # Find libpq headers and libraries - # - --if test -z "$PG_CONFIG"; then -- AC_PATH_PROGS(PG_CONFIG, pg_config) --fi -- --if test -n "$PG_CONFIG"; then -- pg_includedir=`"$PG_CONFIG" --includedir` -- pg_libdir=`"$PG_CONFIG" --libdir` -- CPPFLAGS="$CPPFLAGS -I$pg_includedir" -- LDFLAGS="$LDFLAGS -L$pg_libdir" --fi -- -- -+pg_includedir="" -+pg_libdir="" -+CPPFLAGS="$CPPFLAGS" -+LDFLAGS="$LDFLAGS" - - # 1. Programs - -@@ -211,12 +165,6 @@ if test "$with_iodbc" != no; then - [AC_MSG_ERROR([iODBC library "iodbcinst" not found])]) - fi - --if test "$enable_pthreads" = yes; then -- AC_CHECK_LIB(pthreads, pthread_create, -- [], -- [AC_CHECK_LIB(pthread, pthread_create)]) --fi -- - AC_CHECK_LIB(pq, PQsetSingleRowMode, [], - [AC_MSG_ERROR([libpq library version >= 9.2 is required])]) - --- -2.8.1 - diff --git a/meta-oe/recipes-support/psqlodbc/files/run-ptest b/meta-oe/recipes-support/psqlodbc/files/run-ptest deleted file mode 100644 index 6b41c63693..0000000000 --- a/meta-oe/recipes-support/psqlodbc/files/run-ptest +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -BASEDIR="$(dirname $(readlink -f $0))" - -# init and start postgresql server for testing -PGDATA="/var/lib/postgresql/data" -if [ -f "${PGDATA}/PG_VERSION" ]; then - echo "Data directory is not empty! Skip initdb." -else - echo "Initializing database: " - chown -R postgres:postgres ${PGDATA} - su -l postgres -c "/usr/bin/initdb --pgdata='$PGDATA'" -fi - -SYSV_INIT="/etc/init.d/postgresql-server" -if [ -e ${SYSV_INIT} ]; then - RESTART_POSTGRESQL="${SYSV_INIT} restart" - STOP_POSTGRESQL="${SYSV_INIT} stop" -else - RESTART_POSTGRESQL="systemctl restart postgresql" - STOP_POSTGRESQL="systemctl stop postgresql" -fi - -${RESTART_POSTGRESQL} || echo "Failed to restart postgresql, skip the tests." - -if [ ! -d ${BASEDIR}/results ]; then - mkdir ${BASEDIR}/results -fi - -# Generate odbc config files and reset db -${BASEDIR}/odbcini-gen.sh || echo "FAIL: Generate odbc config files" -ODBCSYSINI=. ODBCINSTINI=./odbcinst.ini ODBCINI=./odbc.ini \ - ${BASEDIR}/reset-db < ${BASEDIR}/sampletables.sql \ - || echo "FAIL: reset db with sample tables" - -# Run the actual tests -TESTS= -for i in `ls ${BASEDIR}/exe/*-test`; do - TESTS="$TESTS $(basename ${i%-test})" -done - -${BASEDIR}/runsuite ${TESTS} --inputdir=${BASEDIR} - -# Cleanup -${STOP_POSTGRESQL} -rm -f regression.diffs odbcinst.ini odbc.ini diff --git a/meta-oe/recipes-support/psqlodbc/psqlodbc.inc b/meta-oe/recipes-support/psqlodbc/psqlodbc.inc deleted file mode 100644 index 5337b45695..0000000000 --- a/meta-oe/recipes-support/psqlodbc/psqlodbc.inc +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "ODBC driver for PostgreSQL" -DESCRIPTION = "\ - This package provides a driver that allows ODBC-enabled applications to \ - access PostgreSQL databases. ODBC is an abstraction layer that allows \ - applications written for that layer to access databases in a manner \ - that is relatively independent of the particular database management \ - system. \ - . \ - You need to install this package if you want to use an application that \ - provides database access through ODBC and you want that application to \ - access a PostgreSQL database. This package would need to be installed \ - on the same machine as that client application; the PostgreSQL database \ - server can be on a different machine and does not need any additional \ - software to accept ODBC clients. \ -" -SECTION = "libs" -HOMEPAGE = "http://psqlodbc.projects.postgresql.org/" - -DEPENDS += "postgresql unixodbc" - -EXTRA_OECONF = "\ - ac_cv_lib_ltdl_lt_dlopen=no \ - ac_cv_lib_pq_PQconnectdb=yes \ - --with-unixodbc=yes \ - --with-libpq=${STAGING_LIBDIR}/.. \ - --enable-pthreads \ - --disable-unicode \ - LIBS="-lpthread" \ -" - -inherit autotools pkgconfig ptest - -do_compile_ptest() { - oe_runmake -C ${B}/test -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH} - cp -a --no-preserve=ownership ${B}/test/exe ${S}/test/expected ${D}${PTEST_PATH} - install -m 0755 ${B}/test/reset-db ${D}${PTEST_PATH} - install -m 0755 ${B}/test/runsuite ${D}${PTEST_PATH} - install -m 0755 ${S}/test/odbcini-gen.sh ${D}${PTEST_PATH} - install -m 0755 ${S}/test/sampletables.sql ${D}${PTEST_PATH} - sed -i -e 's|@LIBDIR@|${libdir}|' ${D}${PTEST_PATH}/odbcini-gen.sh -} - -FILES_${PN} += "${libdir}" - -# The tests need a local PostgreSQL server running -RDEPENDS_${PN}-ptest = "postgresql" diff --git a/meta-oe/recipes-support/psqlodbc/psqlodbc_09.05.0300.bb b/meta-oe/recipes-support/psqlodbc/psqlodbc_09.05.0300.bb deleted file mode 100644 index 6e1c8ab4a0..0000000000 --- a/meta-oe/recipes-support/psqlodbc/psqlodbc_09.05.0300.bb +++ /dev/null @@ -1,14 +0,0 @@ -require ${PN}.inc - -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692" - -SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions/src/${BPN}-${PV}.tar.gz \ - file://psqlodbc-remove-some-checks-for-cross-compiling.patch \ - file://psqlodbc-donot-use-the-hardcode-libdir.patch \ - file://psqlodbc-fix-for-ptest-support.patch \ - file://run-ptest \ -" - -SRC_URI[md5sum] = "4c6e0b22187d7bb1c998ffac89e50f6b" -SRC_URI[sha256sum] = "9521f328bf28aaaf5c8488dc89792b614f9d6271742c0baf9bb41c97537764a8" diff --git a/meta-oe/recipes-support/psutils/psutils_2.10.bb b/meta-oe/recipes-support/psutils/psutils_2.10.bb new file mode 100644 index 0000000000..1f1894a5f2 --- /dev/null +++ b/meta-oe/recipes-support/psutils/psutils_2.10.bb @@ -0,0 +1,24 @@ +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=87212b5f1ae096371049a12f80034f32" + +SRC_URI = "https://github.com/rrthomas/psutils/releases/download/v${PV}/psutils-${PV}.tar.gz" +SRC_URI[sha256sum] = "6f8339fd5322df5c782bfb355d9f89e513353220fca0700a5a28775404d7e98b" + +inherit perlnative autotools + +export PERL="/usr/bin/env perl" + +DEPENDS += "libpaper-native" + +do_install:append() { + sed -i -e 's|${STAGING_BINDIR_NATIVE}/perl-native/|/usr/bin/env |g' ${D}${bindir}/pstops + for f in psbook psresize psnup psselect; do + grep -v '${B}' ${D}${bindir}/$f > ${D}${bindir}/$f.temp + install -m 0755 ${D}${bindir}/$f.temp ${D}${bindir}/$f + rm -f ${D}${bindir}/$f.temp + done +} + +BBCLASSEXTEND += "native" +# /usr/bin/pstops contained in package psutils requires perl +RDEPENDS:${PN} += "perl" diff --git a/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch b/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch new file mode 100644 index 0000000000..c51fb1cfdb --- /dev/null +++ b/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch @@ -0,0 +1,40 @@ +From c5cd932fb08e7ce90cdbf9ae6c5cc7e65ac0738e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20Wei=C3=9F?= <michael.weiss@aisec.fraunhofer.de> +Date: Tue, 9 May 2023 20:00:26 +0200 +Subject: [PATCH] pv/display: handle error of tcgetpgrp() in pv_in_foreground() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Show pv progress bar even if no terminal is set, e.g., in a busybox +init script. The description of pv_in_forground() states it will +return true "if we aren't outputting to a terminal". However, this +is not the case since tcgetpgrg() will return an error and set ERRNO +to ENOTTY if the output fd is not an tty. We now handle this error +correctly and pv_in_foreground() returns also true in that case. + +Signed-off-by: Michael Weiß <michael.weiss@aisec.fraunhofer.de> +--- +Upstream-Status: Pending + + src/pv/display.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/pv/display.c b/src/pv/display.c +index aff643b..8d1f4c9 100644 +--- a/src/pv/display.c ++++ b/src/pv/display.c +@@ -48,6 +48,10 @@ bool pv_in_foreground(void) + + our_process_group = getpgrp(); + tty_process_group = tcgetpgrp(STDERR_FILENO); ++ ++ if (tty_process_group == -1 && errno == ENOTTY) ++ return true; ++ + if (our_process_group == tty_process_group) + return true; + +-- +2.30.2 + diff --git a/meta-oe/recipes-support/pv/pv/run-ptest b/meta-oe/recipes-support/pv/pv/run-ptest new file mode 100644 index 0000000000..3f5956f4c0 --- /dev/null +++ b/meta-oe/recipes-support/pv/pv/run-ptest @@ -0,0 +1,7 @@ +#!/bin/sh + +rm -rf tests.log +sh -e run-test.sh pv . > tests.log 2>&1 +sed -e 's|\(.*\):.*OK|PASS: \1|' \ + -e 's|\(.*\):.*FAILED|FAIL: \1|' \ + tests.log diff --git a/meta-oe/recipes-support/pv/pv_1.5.3.bb b/meta-oe/recipes-support/pv/pv_1.5.3.bb deleted file mode 100644 index 5e3dd67c5b..0000000000 --- a/meta-oe/recipes-support/pv/pv_1.5.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Terminal-based tool for monitoring the progress of data through a pipeline" - -LICENSE = "Artistic-2.0" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02" - -SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.bz2" -SRC_URI[md5sum] = "efe8e9e4cad5f3264a32258a63bf2c8e" -SRC_URI[sha256sum] = "76f3999b1c3b3027163dce6ef667cdf8dafb75218ee25e54a03bfe590478f90e" - -inherit autotools - diff --git a/meta-oe/recipes-support/pv/pv_1.6.20.bb b/meta-oe/recipes-support/pv/pv_1.6.20.bb new file mode 100644 index 0000000000..ac26ef9365 --- /dev/null +++ b/meta-oe/recipes-support/pv/pv_1.6.20.bb @@ -0,0 +1,28 @@ +SUMMARY = "Terminal-based tool for monitoring the progress of data through a pipeline" +HOMEPAGE = "http://www.ivarch.com/programs/pv.shtml" + +LICENSE = "Artistic-2.0" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02" + +SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.bz2 \ + file://0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603" + +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml" +UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar" + +inherit autotools ptest + +LDEMULATION:mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}" +export LDEMULATION + +RDEPENDS:${PN}-ptest += "coreutils ${PN}" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests + cp -r ${S}/autoconf/scripts/run-test.sh ${D}${PTEST_PATH} + # sed -i -e 's@\$SRCDIR/@./@g' ${D}${PTEST_PATH}/run-ptest +} diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch index 36983ec479..2b5b5caa6f 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch index a9c4b95cf0..c0f81725d9 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch index 06853851d0..fba2e7f513 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch index 59f21fe3c1..91ca0a7742 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb index 30c41fffbe..09534c44fd 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb +++ b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb @@ -1,7 +1,6 @@ SUMMARY = "Tool to display and modify PXA registers at runtime" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://pxaregs.c;endline=12;md5=668d061b7637acc68cb8071c9be372e6" -AUTHOR = "Holger Schurig <hs4233@mail.mn-solutions.de>" HOMEPAGE = "http://www.mn-logistik.de/unsupported/pxa250/" SRC_URI = "file://pxaregs.c \ @@ -10,7 +9,8 @@ SRC_URI = "file://pxaregs.c \ file://serial.patch \ file://usb.patch " -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_compile() { ${CC} pxaregs.c -o pxaregs ${CFLAGS} ${LDFLAGS} diff --git a/meta-oe/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb b/meta-oe/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb new file mode 100644 index 0000000000..323ddb4157 --- /dev/null +++ b/meta-oe/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb @@ -0,0 +1,14 @@ +# Copyright (C) 2024 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Version numbering for anarchists and software realists" +HOMEPAGE = "https://github.com/effigies/looseversion" +LICENSE = "PSF-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d5605fc335ce1bab614032468d0a1e00" + +DEPENDS = "python3-hatchling-native" +SRC_URI[sha256sum] = "ebde65f3f6bb9531a81016c6fef3eb95a61181adc47b7f949e9c0ea47911669e" + +inherit pypi python_hatchling + +PYPI_PACKAGE = "looseversion" diff --git a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch deleted file mode 100644 index 7faeb130a7..0000000000 --- a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3f97aac5a1f43ef57b02fb9ccdcadd41a6b69fa9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 27 Oct 2015 10:21:24 +0100 -Subject: [PATCH] configure.ac: do additional checks on libxml2 also when - detected by pkg-config -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Applied [1] - -[1] https://github.com/dajobe/raptor/pull/33 - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 10ff870..35fa08e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -601,7 +601,7 @@ have_libxml=0 - need_libxml=0 - - oCPPFLAGS="$CPPFLAGS" --if test "X$XML_CONFIG" != X; then -+if test "X$libxml_source" != X; then - CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS" - LIBS="$LIBS $LIBXML_LIBS" - AC_CHECK_FUNC(xmlCreatePushParserCtxt, have_xmlCreatePushParserCtxt=yes, have_xmlCreatePushParserCtxt=no) --- -2.1.0 - diff --git a/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch b/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch new file mode 100644 index 0000000000..e709616797 --- /dev/null +++ b/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch @@ -0,0 +1,34 @@ +From da171e12d961b41b89196627ef5e5baae1e637ce Mon Sep 17 00:00:00 2001 +From: David Anes <david.anes@suse.com> +Date: Thu, 4 May 2023 11:54:02 +0200 +Subject: [PATCH] Remove the access to entities 'checked' private symbol for + libxml2 2.11.0 + +Since version 2.11.0, some private symbols that were never intended +as public API/ABI have been removed from libxml2, therefore the field +'checked' is no longer present and raptor fails to build in this +scenario. + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Backport [https://github.com/dajobe/raptor/commit/ac914399b9013c54572833d4818e6ce008136dc9] +--- + src/raptor_libxml.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c +index 538c2c8..8bcee13 100644 +--- a/src/raptor_libxml.c ++++ b/src/raptor_libxml.c +@@ -246,10 +246,11 @@ raptor_libxml_getEntity(void* user_data, const xmlChar *name) + + ret->owner = 1; + +-#if LIBXML_VERSION >= 20627 ++#if LIBXML_VERSION >= 20627 && LIBXML_VERSION < 21100 + /* Checked field was released in 2.6.27 on 2006-10-25 + * http://git.gnome.org/browse/libxml2/commit/?id=a37a6ad91a61d168ecc4b29263def3363fff4da6 + * ++ * and was later removed in version 2.11.0 + */ + + /* Mark this entity as having been checked - never do this again */ diff --git a/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch b/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch new file mode 100644 index 0000000000..b12beff6cb --- /dev/null +++ b/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch @@ -0,0 +1,73 @@ +Do not use curl-config + +Sourced from +https://bugs.gentoo.org/552474 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/configure.ac ++++ b/configure.ac +@@ -596,49 +596,12 @@ else + PKG_CHECK_MODULES([XSLT], [libxslt > $libxslt_min_version], [have_libxslt=1], [have_libxslt=0]) + fi + +-dnl curl +-AC_ARG_WITH(curl-config, [ --with-curl-config=PATH Location of libcurl curl-config []], curl_config="$withval", curl_config="") +- +-if test "X$curl_config" != "Xno" ; then +- if test "X$curl_config" != "X" ; then +- AC_MSG_CHECKING(for $curl_config) +- +- if test -f $curl_config ; then +- CURL_CONFIG=$curl_config +- AC_MSG_RESULT(yes) +- else +- AC_MSG_RESULT(no - searching PATH) +- fi +- fi +- if test "X$CURL_CONFIG" = "X" ; then +- AC_CHECK_PROGS(CURL_CONFIG, curl-config) +- fi +-fi +- + libcurl_source=no +-if test "X$CURL_CONFIG" != "X"; then +- LIBCURL_CFLAGS=`$CURL_CONFIG --cflags` +- LIBCURL_LIBS=`$CURL_CONFIG --libs` +- +- CPPFLAGS="$LIBCURL_CFLAGS $CPPFLAGS" +- LIBS="$LIBS $LIBCURL_LIBS" +- AC_CHECK_HEADER(curl/curl.h) +- AC_CHECK_FUNC(curl_easy_init, have_curl_easy_init=yes, have_curl_easy_init=no) +- +- AC_MSG_CHECKING(for libcurl via curl-config) +- if test $have_curl_easy_init = yes; then +- libcurl_source="curl-config" +- LIBCURL_VERSION=`$CURL_CONFIG --version | sed -e 's/^libcurl *//'` +- fi +- CPPFLAGS="$oCPPFLAGS" +- LIBS="$oLIBS" +-else +- PKG_CHECK_MODULES([LIBCURL],[libcurl],[ +- LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` +- libcurl_source="pkg-config" +- ], [:]) +- AC_MSG_CHECKING(for libcurl via pkg-config) +-fi ++PKG_CHECK_MODULES([LIBCURL],[libcurl],[ ++ LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` ++ libcurl_source="pkg-config" ++], [:]) ++AC_MSG_CHECKING(for libcurl via pkg-config) + + if test "$libcurl_source" = "no"; then + AC_MSG_RESULT(no - not found) +@@ -1033,7 +996,7 @@ need_libcurl=0 + need_libxml_www=0 + need_libfetch=0 + +-if test "X$CURL_CONFIG" != X; then ++if test "$libcurl_source" != "no"; then + CPPFLAGS="$CPPFLAGS $LIBCURL_CFLAGS" + LIBS="$LIBS $LIBCURL_LIBS" + AC_CHECK_HEADER(curl/curl.h) diff --git a/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb b/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb deleted file mode 100644 index dd00c14f72..0000000000 --- a/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Library for parsing and serializing RDF syntaxes" -LICENSE = "GPLv2 | LGPLv2.1 | Apache-2.0" -LIC_FILES_CHKSUM = " \ - file://LICENSE.txt;md5=b840e5ae3aeb897f45b473341348cd9c \ - file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ -" - -DEPENDS = "libxml2 libxslt curl yajl" - -SRC_URI = " \ - http://download.librdf.org/source/${BPN}-${PV}.tar.gz \ - file://0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch \ -" -SRC_URI[md5sum] = "a39f6c07ddb20d7dd2ff1f95fa21e2cd" -SRC_URI[sha256sum] = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed" - -inherit autotools pkgconfig - -EXTRA_OECONF = " \ - --without-xml2-config \ - --without-curl-config \ - --without-xslt-config \ -" diff --git a/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb new file mode 100644 index 0000000000..7014a28c02 --- /dev/null +++ b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb @@ -0,0 +1,24 @@ +SUMMARY = "Library for parsing and serializing RDF syntaxes" +LICENSE = "GPL-2.0-only | LGPL-2.1-only | Apache-2.0" +LIC_FILES_CHKSUM = " \ + file://LICENSE.txt;md5=f7fed8b6ab9289b77f5c14f3f79572cc \ + file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ +" + +DEPENDS = "bison-native flex-native libxml2 libxslt curl yajl" + +SRC_URI = " \ + http://download.librdf.org/source/${BPN}-${PV}.tar.gz \ + file://0001-Remove-the-access-to-entities-checked-private-symbol.patch \ + file://raptor-2.0.16-dont_use_curl-config.patch \ +" +SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680" + +inherit autotools pkgconfig gtk-doc perlnative + +EXTRA_OECONF = " \ + --without-xml2-config \ + --without-xslt-config \ +" diff --git a/meta-oe/recipes-support/rdfind/files/reproducible_build.patch b/meta-oe/recipes-support/rdfind/files/reproducible_build.patch deleted file mode 100644 index 36728a7885..0000000000 --- a/meta-oe/recipes-support/rdfind/files/reproducible_build.patch +++ /dev/null @@ -1,46 +0,0 @@ -Description: sort the filelist when it is complete to get reproducible behaviour -Author: Reiner Herrmann <reiner@reiner-h.de> -Bug-Debian: https://bugs.debian.org/795790 - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> - -Index: rdfind-1.3.4/Fileinfo.hh -=================================================================== ---- rdfind-1.3.4.orig/Fileinfo.hh -+++ rdfind-1.3.4/Fileinfo.hh -@@ -189,6 +189,10 @@ public: - static bool compareondepth(const Fileinfo &a, const Fileinfo &b) - {return (a.depth() < b.depth());} - -+ //returns true if a has lower filename than b) -+ static bool compareonfilename(const Fileinfo &a, const Fileinfo &b) -+ {return (a.name().compare(b.name()) < 0);} -+ - //fills with bytes from the file. if lasttype is supplied, - //it is used to see if the file needs to be read again - useful if - //file is shorter than the length of the bytes field. -@@ -235,6 +239,10 @@ public: - static bool equaldepth(const Fileinfo &a, const Fileinfo &b) - {return (a.depth()==b.depth());} - -+ //returns true if filenames are equal -+ static bool equalfilename(const Fileinfo &a, const Fileinfo &b) -+ {return (a.name()==b.name());} -+ - //returns true if file is a regular file. call readfileinfo first! - bool isRegularFile() {return m_info.is_file;} - -Index: rdfind-1.3.4/rdfind.cc -=================================================================== ---- rdfind-1.3.4.orig/rdfind.cc -+++ rdfind-1.3.4/rdfind.cc -@@ -349,6 +349,7 @@ int main(int narg, char *argv[]) - cout<<dryruntext<<"Now have "<<filelist1.size()<<" files in total."<<endl; - - -+ gswd.sortlist(&Fileinfo::compareonfilename,&Fileinfo::equalfilename); - - //mark files with a unique number - gswd.markitems(); diff --git a/meta-oe/recipes-support/rdfind/rdfind_1.3.4.bb b/meta-oe/recipes-support/rdfind/rdfind_1.3.4.bb deleted file mode 100644 index 4d984ee05f..0000000000 --- a/meta-oe/recipes-support/rdfind/rdfind_1.3.4.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Rdfind is a program that finds duplicate files" -HOMEPAGE = "https://rdfind.pauldreik.se/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" - -DEPENDS = "nettle" - -SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz \ - file://reproducible_build.patch \ -" - -SRC_URI[md5sum] = "97c0cb35933588413583c61d3b5f9adf" -SRC_URI[sha256sum] = "a5f0b3f72093d927b93898c993479b35682cccb47f7393fb72bd4803212fcc7d" - -inherit autotools - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb b/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb new file mode 100644 index 0000000000..3a15fe6c9a --- /dev/null +++ b/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Rdfind is a program that finds duplicate files" +HOMEPAGE = "https://rdfind.pauldreik.se/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=fa22e16ebbe6638b2bd253338fbded9f" + +DEPENDS = "nettle autoconf-archive" + +SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz" +SRC_URI[sha256sum] = "7a406e8ef1886a5869655604618dd98f672f12c6a6be4926d053be65070f3279" + +inherit autotools + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/re2/re2/run-ptest b/meta-oe/recipes-support/re2/re2/run-ptest new file mode 100644 index 0000000000..8bd5fd1efb --- /dev/null +++ b/meta-oe/recipes-support/re2/re2/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +ctest --force-new-ctest-process | sed -u 's/\*\*\*/ /g' | awk '/Test +#/{gsub(/Passed/,"PASS"); gsub(/Failed/,"FAIL"); gsub(/Skipped/,"SKIP"); print $6": "$4; fflush();}' diff --git a/meta-oe/recipes-support/re2/re2_2024.03.01.bb b/meta-oe/recipes-support/re2/re2_2024.03.01.bb new file mode 100644 index 0000000000..76d6f0c7a9 --- /dev/null +++ b/meta-oe/recipes-support/re2/re2_2024.03.01.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "A regular expression library" +HOMEPAGE = "https://github.com/google/re2/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760" + +# tag 2024-03-01 +SRCREV = "2d866a3d0753f4f4fce93cccc6c59c4b052d7db4" + +SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \ + " + +S = "${WORKDIR}/git" + +DEPENDS = "abseil-cpp ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest googlebenchmark', '', d)}" + +inherit cmake ptest +RDEPENDS:${PN}-ptest += "cmake sed" + +EXTRA_OECMAKE += " \ + -DBUILD_SHARED_LIBS=ON \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-DRE2_BUILD_TESTING=ON', '-DRE2_BUILD_TESTING=OFF', d)} \ +" + +do_install_ptest () { + cp -r ${B}/*_test ${D}${PTEST_PATH} + cp -r ${B}/CTestTestfile.cmake ${D}${PTEST_PATH} + sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` + sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` + # ERROR: re2-2024.03.01-r0 do_package_qa: QA Issue: /usr/lib64/re2/ptest/string_generator_test contained in package re2-ptest requires libtesting.so()(64bit), but no providers found in RDEPENDS:re2-ptest? [file-rdeps] + cp -r ${B}/libtesting.so ${D}${PTEST_PATH} +} + +# ignore .so in /usr/lib64 +SOLIBS = ".so*" +FILES_SOLIBSDEV = "" +INSANE_SKIP:${PN} += "dev-so" + +# Don't include so files in dev package +FILES:${PN}-dev = "${includedir} ${libdir}/cmake ${libdir}/pkgconfig" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/read-edid/read-edid/0001-Do-not-install-license-file.patch b/meta-oe/recipes-support/read-edid/read-edid/0001-Do-not-install-license-file.patch new file mode 100644 index 0000000000..a9b9476bd6 --- /dev/null +++ b/meta-oe/recipes-support/read-edid/read-edid/0001-Do-not-install-license-file.patch @@ -0,0 +1,17 @@ +Do not install license file + +File name is incorrect as well; must be LICENSE instead of COPYING. + +Upstream-Status: Submitted [pyrophobicman@gmail.com] + +Signed-off-by: Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com> + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,5 +13,5 @@ + add_subdirectory (parse-edid) + + INSTALL(FILES get-edid.1 DESTINATION share/man/man1) +-INSTALL(FILES AUTHORS ChangeLog COPYING README DESTINATION ++INSTALL(FILES AUTHORS ChangeLog README DESTINATION + share/doc/read-edid) diff --git a/meta-oe/recipes-support/read-edid/read-edid/0001-configure-remove-check-for-x86.h-we-don-t-build-get-.patch b/meta-oe/recipes-support/read-edid/read-edid/0001-configure-remove-check-for-x86.h-we-don-t-build-get-.patch deleted file mode 100644 index 4408002356..0000000000 --- a/meta-oe/recipes-support/read-edid/read-edid/0001-configure-remove-check-for-x86.h-we-don-t-build-get-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From eb7590cc2cdd5c35403af4567d8524e017010f1c Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Sat, 11 May 2013 07:58:17 +0200 -Subject: [PATCH] configure: remove check for x86.h, we don't build get-edid - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> - -Upstream-status: Inappropriate [OE specific] ---- - configure.in | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.in b/configure.in -index ac85a21..f53e904 100644 ---- a/configure.in -+++ b/configure.in -@@ -8,8 +8,6 @@ dnl Checks for programs - - AC_PROG_CC - --AC_CHECK_HEADER([libx86.h], [], [AC_MSG_ERROR([libx86.h not found])]) -- - dnl Simple, huh? - - AC_OUTPUT([Makefile]) --- -1.8.1.4 - diff --git a/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch b/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch new file mode 100644 index 0000000000..5147f17c3a --- /dev/null +++ b/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch @@ -0,0 +1,44 @@ +From 9da8eb6663d0ba046bc0570172c549d421de043a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 12 Aug 2020 23:39:32 -0700 +Subject: [PATCH] get-edid: define quiet once + +Fixes build with gcc 10 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + get-edid/classic.c | 2 +- + get-edid/i2c.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/get-edid/classic.c b/get-edid/classic.c +index 9cc8ee3..b13f5f0 100644 +--- a/get-edid/classic.c ++++ b/get-edid/classic.c +@@ -26,7 +26,7 @@ typedef byte* real_ptr; + #define dosmemput(buffer,length,offset) memcpy(offset,buffer,length) + + #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } +-int quiet; ++extern int quiet; + + real_ptr far_ptr_to_real_ptr( uint32 farptr ) + { +diff --git a/get-edid/i2c.c b/get-edid/i2c.c +index 625d7cb..0929e98 100644 +--- a/get-edid/i2c.c ++++ b/get-edid/i2c.c +@@ -15,7 +15,7 @@ + + //Ideas (but not too much actual code) taken from i2c-tools. Thanks guys. + +-int quiet; ++extern int quiet; + + #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } + +-- +2.28.0 + diff --git a/meta-oe/recipes-support/read-edid/read-edid_2.0.0.bb b/meta-oe/recipes-support/read-edid/read-edid_2.0.0.bb deleted file mode 100644 index b002906fa6..0000000000 --- a/meta-oe/recipes-support/read-edid/read-edid_2.0.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "read-edid elucidates various very useful informations from a conforming PnP monitor" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d0bf70fa1ef81fe4741ec0e6231dadfd" - -SRC_URI = "http://polypux.org/projects/read-edid/read-edid-${PV}.tar.gz \ - file://0001-configure-remove-check-for-x86.h-we-don-t-build-get-.patch" - -SRC_URI[md5sum] = "586e7fa1167773b27f4e505edc93274b" -SRC_URI[sha256sum] = "246ec14ec509e09ac26fe6862b120481b2cc881e2f142ba40886d6eec15e77e8" - -inherit autotools - -do_compile() { - oe_runmake parse-edid -} - -do_install() { - install -d ${D}${bindir} - install -m 0755 parse-edid ${D}${bindir} -} - -PACKAGES =+ "parse-edid" -FILES_parse-edid = "${bindir}/parse-edid" diff --git a/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb b/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb new file mode 100644 index 0000000000..28da51a21c --- /dev/null +++ b/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "A pair of tools for reading the EDID from a monitor" +DESCRIPTION = "read-edid is a set of two tools - get-edid, which gets the raw \ + EDID information from the monitor, and parse-edid, which turns \ + the raw binary information into a xorg.conf-compatible monitor \ + section." +HOMEPAGE = "http://www.polypux.org/projects/read-edid/" +SECTION = "console/utils" +LICENSE = "read-edid" +LIC_FILES_CHKSUM = "file://LICENSE;md5=292c42e2aedc4af636636bf7af0e2b26" + +SRC_URI = "http://polypux.org/projects/read-edid/read-edid-${PV}.tar.gz \ + file://0001-Do-not-install-license-file.patch \ + file://0001-get-edid-define-quiet-once.patch \ + " +SRC_URI[md5sum] = "016546e438bf6c98739ff74061df9854" +SRC_URI[sha256sum] = "c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f" + +EXTRA_OECMAKE = "-DCLASSICBUILD=OFF" + +inherit cmake diff --git a/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb b/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb new file mode 100644 index 0000000000..5e0c6cd21c --- /dev/null +++ b/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "Reboot the device to a specific mode." + +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" + +SRC_URI = "git://gitlab.com/postmarketOS/reboot-mode.git;protocol=http;branch=master" +SRCREV = "84831b20512abd9033414ca5f5a023f333525335" + +S = "${WORKDIR}/git" + +# Upstream repo has not made releases/tags after 1.0.0 +UPSTREAM_CHECK_COMMITS = "1" + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} ${S}/reboot-mode.c -o ${B}/reboot-mode +} + +do_install() { + install -D -m 0755 ${B}/reboot-mode ${D}${bindir}/reboot-mode +} diff --git a/meta-oe/recipes-support/remmina/remmina_1.4.35.bb b/meta-oe/recipes-support/remmina/remmina_1.4.35.bb new file mode 100644 index 0000000000..0cad52df3a --- /dev/null +++ b/meta-oe/recipes-support/remmina/remmina_1.4.35.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "A feature rich Remote Desktop Application written in GTK+" +HOMEPAGE = "https://remmina.org" +SECTION = "Support" +LICENSE = "GPL-2.0-only & OpenSSL" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" + +DEPENDS = " \ + glib-2.0-native \ + openssl \ + freerdp \ + gtk+3 \ + gdk-pixbuf \ + atk \ + libgcrypt \ + libsodium \ + libssh \ + vte \ + json-glib \ + libsoup-3.0 \ + libvncserver \ + libsecret \ + libxkbfile \ +" + +DEPENDS:append:libc-musl = " libexecinfo" +LDFLAGS:append:libc-musl = " -lexecinfo" + +SRCREV = "2a455eadd6462457d08c2d066c5c245e0dee3bf9" +SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master" +S = "${WORKDIR}/git" + +inherit cmake features_check mime mime-xdg gtk-icon-cache pkgconfig +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DHAVE_LIBAPPINDICATOR=OFF -DWITH_WEBKIT2GTK=OFF" + +PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" +# Switch on gtk support in avahi recipe if you want to enable avahi support +PACKAGECONFIG[avahi] = "-DWITH_AVAHI=ON, -DWITH_AVAHI=OFF, avahi" + +do_configure:append() { + sed -i -e 's|${WORKDIR}|<WORKDIR>|g' ${B}/generated/buildflags.h +} + +RDEPENDS:${PN} = "bash" + +FILES:${PN}+= " \ + ${datadir}/metainfo \ + ${datadir}/mime \ +" diff --git a/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb b/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb new file mode 100644 index 0000000000..6889758224 --- /dev/null +++ b/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "Reparent a running program to a new terminal" +DESCRIPTION = "reptyr is a utility for taking an existing running program and \ +attaching it to a new terminal. Started a long-running process over ssh, but \ +have to leave and don't want to interrupt it? Just start a screen, use reptyr \ +to grab it, and then kill the ssh session and head on home." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=25a0555028c71837623fa6dfa4cc45c0" + +SRC_URI = "git://github.com/nelhage/reptyr.git;protocol=https;branch=master" +SRCREV = "1238097fc2cd15db058d2185cc4985daa87bcd41" + +S = "${WORKDIR}/git" + +inherit bash-completion github-releases manpages pkgconfig + +GITHUB_BASE_URI = "https://github.com/nelhage/${BPN}/releases/" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[manpages] = "" + +EXTRA_OEMAKE = "'BINDIR=${bindir}' 'MANDIR=${mandir}' 'PKG_CONFIG=${STAGING_BINDIR_NATIVE}/pkg-config'" + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake install 'DESTDIR=${D}' +} + +COMPATIBLE_HOST:riscv32 = "null" diff --git a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index aefe3627eb..3cbd04bd5c 100644 --- a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -3,33 +3,35 @@ HOMEPAGE = "http://www.rsnapshot.org" BUGTRACKER = "https://sourceforge.net/projects/rsnapshot/" SECTION = "console/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" -RDEPENDS_${PN} = "rsync \ +RDEPENDS:${PN} = "rsync \ perl \ perl-module-dirhandle \ perl-module-cwd \ perl-module-getopt-std \ perl-module-file-path \ perl-module-file-stat \ + perl-module-file-spec \ perl-module-posix \ perl-module-fcntl \ perl-module-io-file \ perl-module-constant \ perl-module-overloading \ + perl-module-ipc-open3 \ " -SRCREV = "27209563f924a22f510698ea225f53ea52f07cb4" -PV = "1.4.2+git${SRCPV}" +SRCREV = "1b943dbc7695d62fac5c0f9549ec696a538be19c" +PV = "1.4.5" -SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ +SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=https \ file://configure-fix-cmd_rsync.patch \ " S = "${WORKDIR}/git" -inherit autotools +inherit autotools perlnative # Fix rsnapshot.conf.default: # don't inject the host path into target configs. @@ -46,7 +48,7 @@ EXTRA_OECONF += "--without-cp \ # Create 't/include.ac' before starting the autoreconf to fix configure # error: configure.ac:302: file 't/include.ac' does not exist -do_configure_prepend(){ +do_configure:prepend(){ saved_dir=`pwd` cd ${S}; ./autogen.sh cd ${saved_dir} diff --git a/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb b/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb new file mode 100644 index 0000000000..d65f5da859 --- /dev/null +++ b/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb @@ -0,0 +1,14 @@ +SUMMARY = "Useful programs to test rtc drivers" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=74274e8a218423e49eefdea80bc55038" + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/${BPN}.git;protocol=https;branch=master" +SRCREV = "61839777afedcc7bdb68ea4628c5ce5ca72c2ac8" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "DESTDIR=${D}" + +do_install() { + oe_runmake install +} diff --git a/meta-oe/recipes-support/rtkit/rtkit_0.13.bb b/meta-oe/recipes-support/rtkit/rtkit_0.13.bb new file mode 100644 index 0000000000..4f06e55e8e --- /dev/null +++ b/meta-oe/recipes-support/rtkit/rtkit_0.13.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "REALTIMEKIT Realtime Policy and Watchdog Daemon" +LICENSE = "GPL-3.0-only & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a8e768468b658b3ed44971b53d4a6716" + +SRC_URI = "git://github.com/heftig/rtkit.git;protocol=https;branch=master" + +SRCREV = "b9169402fe5e82d20efb754509eb0b191f214599" +S = "${WORKDIR}/git" + +inherit meson pkgconfig features_check useradd + +REQUIRED_DISTRO_FEATURES = "polkit" + +DEPENDS = "dbus libcap polkit xxd-native" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = ",,systemd" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --shell /bin/nologin rtkit" + +FILES:${PN} += "${libdir} ${datadir} ${systemd_system_unitdir}" + diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb deleted file mode 100644 index 255754d5d1..0000000000 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform" -SECTION = "console/utils" -AUTHOR = "Werner Almesberger <werner@openmoko.org>" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://gpio.c;endline=12;md5=cfb91c686857b2e60852b4925d90a3e1" -SRCREV = "4949" -PV = "1.0+svnr${SRCPV}" -PR = "r2" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http" -S = "${WORKDIR}/gpio" - -CLEANBROKEN = "1" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio.c -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${PN} ${D}${sbindir} -} diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb deleted file mode 100644 index 976a4f15ec..0000000000 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "A user-space tool to show and modify the state of GPIOs on the S3c64xx platform" -SECTION = "console/utils" -AUTHOR = "Werner Almesberger <werner@openmoko.org>" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://gpio-s3c6410.c;endline=12;md5=060cda1be945ad9194593f11d56d55c7" -SRCREV = "4949" -PV = "1.0+svnr${SRCPV}" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http" -S = "${WORKDIR}/gpio" - -CLEANBROKEN = "1" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio-s3c6410.c -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${PN} ${D}${sbindir} -} diff --git a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb deleted file mode 100644 index 2d5935dd3c..0000000000 --- a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "JTAG utility to interface w/ a S3C2410 device" -SECTION = "devel" -AUTHOR = "Harald Welte <laforge@openmoko.org>" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://parport.c;endline=19;md5=b5681091b0fd8c5f7068835c441bf0c8" -SRCREV = "4268" -PV = "0.1+svnr${SRCPV}" -PR = "r1" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;protocol=http" -S = "${WORKDIR}/sjf2410-linux" - -inherit native deploy -do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" - -CFLAGS += "-DLINUX_PPDEV" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}/${bindir} - install -m 0755 sjf2410 ${D}/${bindir} -} - -do_deploy() { - install -d ${DEPLOY_DIR_TOOLS} - install -m 0755 sjf2410 ${DEPLOY_DIR_TOOLS}/sjf2410-${PV} -} - -addtask deploy before do_build after do_install diff --git a/meta-oe/recipes-support/sass/libsass_git.bb b/meta-oe/recipes-support/sass/libsass_git.bb new file mode 100644 index 0000000000..f0824944b9 --- /dev/null +++ b/meta-oe/recipes-support/sass/libsass_git.bb @@ -0,0 +1,14 @@ +SUMMARY = "C/C++ port of the Sass CSS precompiler" +HOMEPAGE = "http://sass-lang.com/libsass" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" + +inherit autotools + +SRC_URI = "git://github.com/sass/libsass.git;branch=master;protocol=https" +SRCREV = "7037f03fabeb2b18b5efa84403f5a6d7a990f460" +PV = "3.6.6" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/sass/sassc_git.bb b/meta-oe/recipes-support/sass/sassc_git.bb new file mode 100644 index 0000000000..9bb8c76e87 --- /dev/null +++ b/meta-oe/recipes-support/sass/sassc_git.bb @@ -0,0 +1,14 @@ +SUMMARY = "libsass command line driver " +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744" + +DEPENDS = "libsass" + +inherit autotools pkgconfig + +SRC_URI = "git://github.com/sass/sassc.git;branch=master;protocol=https" +SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0" +S = "${WORKDIR}/git" +PV = "3.6.2" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch b/meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch deleted file mode 100644 index 9e95a3f9d1..0000000000 --- a/meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 206f334d62da17093e784094c9d9e80c853f704f Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 12 May 2017 03:03:46 -0400 -Subject: [PATCH] do not support python2 - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - configure.ac | 16 ---------------- - python/Makefile.am | 24 ------------------------ - 2 files changed, 40 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 200a7cc..8431c51 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,22 +22,6 @@ AM_MISSING_PROG([AUTOM4TE], [autom4te]) - # Needed by tests/atlocal.in. - AC_SUBST([O0CFLAGS], [`echo $CFLAGS | sed 's/-O[[0-9]] *//'`]) - --AM_PATH_PYTHON --AM_CONDITIONAL([HAVE_PYTHON], test -n "$PYTHON") --[if test -z "$PYTHON"; then] -- [echo "The python interpreter was not found in the search path. The Python language bindings"] -- [echo "will not be built. If you want to build the Python language bindings, please ensure"] -- [echo "that python is installed and its directory is included in the search path."] -- [echo "Then run configure again before attempting to build Satyr."] --[fi] -- --# Just PKG_CHECK_MODULES([PYTHON], [python]) works only with python2.7+ --# Below, if python is not found, we set up for python2.6 w/o checking: --PKG_CHECK_MODULES([PYTHON], [python2],,[ -- PYTHON_LIBS='-L/usr/lib64 -lpython2.6' -- PYTHON_CFLAGS='-I/usr/include/python2.6' --]) -- - AC_ARG_ENABLE([python-manpage], - [AS_HELP_STRING([--disable-python-manpage], - [Disable python bindings manpage build])], -diff --git a/python/Makefile.am b/python/Makefile.am -index 36fc2e9..0b73f66 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -1,12 +1,5 @@ - SUBDIRS = . doc - --py2satyrdir = $(pyexecdir)/satyr -- --py2satyr_PYTHON = \ -- __init__.py -- --py2satyr_LTLIBRARIES = _satyr.la -- - PYEXTFILES = \ - py_cluster.h \ - py_cluster.c \ -@@ -75,23 +68,6 @@ PYEXTLDFLAGS = \ - -module \ - -avoid-version - --_satyr_la_SOURCES = $(PYEXTFILES) --_satyr_la_CPPFLAGS = \ -- $(PYEXTCPPFLAGS) \ -- $(PYTHON_CFLAGS) --_satyr_la_LDFLAGS = \ -- $(PYEXTLDFLAGS) \ -- -export-symbols-regex init_satyr -- --# Depending on the configure option, we either link libsatyr.so dynamically (as --# is usual), or directly include its object files (by including the --# convenience library). --if ENABLE_STATIC_PYTHON_MODULE --_satyr_la_LIBADD = ../lib/libsatyr_conv.la --else --_satyr_la_LIBADD = ../lib/libsatyr.la --endif -- - if WITH_PYTHON3 - py3satyrdir = $(py3execdir)/satyr - --- -2.8.1 - diff --git a/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch b/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch index 5827eb4d18..24efc13560 100644 --- a/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch +++ b/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch @@ -10,19 +10,17 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> lib/rpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lib/rpm.c b/lib/rpm.c -index 920e145..58140bf 100644 --- a/lib/rpm.c +++ b/lib/rpm.c -@@ -188,7 +188,7 @@ sr_rpm_package_sort(struct sr_rpm_package *packages) - } +@@ -34,6 +34,11 @@ + #include <assert.h> + #include <string.h> - /* Sort the array. */ -- qsort(array, count, sizeof(struct sr_rpm_package*), (comparison_fn_t)cmp_nevra_qsort_wrapper); -+ qsort(array, count, sizeof(struct sr_rpm_package*), cmp_nevra_qsort_wrapper); - - /* Create a linked list from the sorted array. */ - for (size_t loop = 0; loop < count; ++loop) --- -2.8.1 - ++#if !defined(__GLIBC__) ++typedef int (*__compar_fn_t) (const void*, const void*); ++typedef __compar_fn_t comparison_fn_t; ++#endif ++ + struct sr_rpm_package * + sr_rpm_package_new() + { diff --git a/meta-oe/recipes-support/satyr/satyr_0.23.bb b/meta-oe/recipes-support/satyr/satyr_0.43.bb index f795c3717b..9e6d701c7f 100644 --- a/meta-oe/recipes-support/satyr/satyr_0.23.bb +++ b/meta-oe/recipes-support/satyr/satyr_0.43.bb @@ -3,31 +3,33 @@ failure processing, analysis, and reporting supporting kernel space, user \ space, Python, and Java programs" HOMEPAGE = "https://github.com/abrt/satyr" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" -inherit autotools-brokensep python3native pkgconfig +inherit autotools-brokensep python3native python3targetconfig pkgconfig -SRC_URI = "git://github.com/abrt/satyr.git \ - file://0001-do-not-support-python2.patch \ +SRC_URI = "git://github.com/abrt/satyr.git;branch=master;protocol=https \ file://0002-fix-compile-failure-against-musl-C-library.patch \ -" -SRCREV = "4742fd4857c446b96f712d52e2e4cd0b6cfe7398" + " +SRCREV = "5891618d6a95afc4cde6757374485adf9bf0e9a5" S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS += " \ gdb \ + gperf-native \ + json-c \ + nettle \ + glib-2.0 \ " -PACKAGES += "python3-${PN}" -FILES_python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" +PACKAGES += "python3-${BPN}" +FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" PACKAGECONFIG ??= "python3 rpm" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" -PACKAGECONFIG[pythonmanpage] = "--enable-python-manpage, --disable-python-manpage" PACKAGECONFIG[rpm] = "--with-rpm, --without-rpm, rpm" -do_configure_prepend() { +do_configure:prepend() { ${S}/gen-version } diff --git a/meta-oe/recipes-support/sdmon/sdmon_git.bb b/meta-oe/recipes-support/sdmon/sdmon_git.bb new file mode 100644 index 0000000000..81c8033c15 --- /dev/null +++ b/meta-oe/recipes-support/sdmon/sdmon_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "Get SD card health data" +HOMEPAGE = "https://github.com/Ognian/sdmon" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/Ognian/sdmon;protocol=https;branch=master" + +PV = "0.9.0" +SRCREV = "4dff9b690e8d4454fada6abfbb6b32fcb794968c" + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake -C ${S}/src CC="${CC}" CFLAGS="${CFLAGS} -D_REENTRANT -DVERSION=\"\\\"${PV}\\\"\"" LDFLAGS="${LDFLAGS}" +} + +do_install() { + install -Dm 0755 ${S}/src/sdmon ${D}${bindir}/sdmon +} diff --git a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch index 3fd85d9e25..f58091ad7f 100644 --- a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch +++ b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch @@ -17,13 +17,13 @@ diff --git a/src/Makefile.am b/src/Makefile.am index 61dd9f8..42c911f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -41,7 +41,7 @@ sglib_SOURCES = ../lib/sg_lib.c \ +@@ -53,7 +53,7 @@ sglib_SOURCES = ../lib/sg_lib.c \ ../lib/sg_pt_common.c if HAVE_SGUTILS -INCLUDES = -I/scsi +INCLUDES = -I=@includedir@/scsi - sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@ + sdparm_LDADD = @GETOPT_O_FILES@ @SGUTILS_LIBS@ sdparm_DEPENDENCIES = @GETOPT_O_FILES@ else -- diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.10.bb b/meta-oe/recipes-support/sdparm/sdparm_1.12.bb index 3299a77aaa..a5f98e6723 100644 --- a/meta-oe/recipes-support/sdparm/sdparm_1.10.bb +++ b/meta-oe/recipes-support/sdparm/sdparm_1.12.bb @@ -3,22 +3,24 @@ DESCRIPTION = "The sdparm utility accesses and optionally modifies \ SCSI devices' mode page and inquiry data." HOMEPAGE = "http://sg.danny.cz/sg/sdparm.html" SECTION = "console/utils" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \ - file://lib/BSD_LICENSE;md5=1d52f4a66f1e0ed96776bf354ab7a2ed" + file://lib/BSD_LICENSE;md5=12cde17a04c30dece2752f36b7192c64" DEPENDS="sg3-utils" SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \ file://make-sysroot-work.patch \ " MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" +UPSTREAM_CHECK_REGEX = "sdparm-(?P<pver>\d+(\.\d+)+)\.tgz" + PACKAGES =+ "${PN}-scripts" -RDEPENDS_${PN}-scripts += "bash ${PN}" +RDEPENDS:${PN}-scripts += "bash ${PN}" -SRC_URI[md5sum] = "bdae64375376ce8fe4bf9521c1db858f" -SRC_URI[sha256sum] = "1ea1ed1bb1ee2aef62392618fa42da9ed027d5e655f174525c39235778292ab3" +SRC_URI[md5sum] = "2902fd29e6834fd62c16bb5d1ac53c7e" +SRC_URI[sha256sum] = "e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124" inherit autotools # Put the bash scripts to ${PN}-scripts -FILES_${PN}-scripts = "${bindir}/sas_disk_blink ${bindir}/scsi_ch_swp" +FILES:${PN}-scripts = "${bindir}/sas_disk_blink ${bindir}/scsi_ch_swp" diff --git a/meta-oe/recipes-support/serial-utils/pty-forward-native.bb b/meta-oe/recipes-support/serial-utils/pty-forward-native.bb index 7f59b3ecad..82994331ee 100644 --- a/meta-oe/recipes-support/serial-utils/pty-forward-native.bb +++ b/meta-oe/recipes-support/serial-utils/pty-forward-native.bb @@ -1,12 +1,11 @@ SUMMARY = "Receive a forwarded serial from serial-forward and provide a PTY" -AUTHOR = "Holger 'Zecke' Freyther" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07" SECTION = "console/network" SRCREV = "00dbec2636ae0385ad028587e20e446272ff97ec" -PV = "1.1+gitr${SRCPV}" +PV = "1.1+git" -SRC_URI = "git://github.com/freesmartphone/cornucopia.git;protocol=https" +SRC_URI = "git://github.com/freesmartphone/cornucopia.git;protocol=https;branch=master" S = "${WORKDIR}/git/tools/serial_forward" inherit autotools native diff --git a/meta-oe/recipes-support/serial-utils/serial-forward/0001-correct-the-typo-in-include-file-name-string.h.patch b/meta-oe/recipes-support/serial-utils/serial-forward/0001-correct-the-typo-in-include-file-name-string.h.patch new file mode 100644 index 0000000000..f65d2c4bbf --- /dev/null +++ b/meta-oe/recipes-support/serial-utils/serial-forward/0001-correct-the-typo-in-include-file-name-string.h.patch @@ -0,0 +1,27 @@ +From 2897794c337625d1951eb0b402cd8840ae2182a8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 10:33:57 -0700 +Subject: [PATCH] correct the typo in include file name string.h + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tools/serial_forward/src/forward.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/serial_forward/src/forward.c b/tools/serial_forward/src/forward.c +index 9fad6f9b..4c0dd9df 100644 +--- a/tools/serial_forward/src/forward.c ++++ b/tools/serial_forward/src/forward.c +@@ -20,7 +20,7 @@ + #include <stdlib.h> + #include <unistd.h> + #include <termios.h> +-#include <strings.h> ++#include <string.h> + #include <getopt.h> + + #include "forward.h" +-- +2.37.3 + diff --git a/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch b/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch index 7dcc67d114..a3fb678965 100644 --- a/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch +++ b/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch @@ -7,6 +7,8 @@ This does not work with ssp turned on with hardening flags on musl Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tools/serial_forward/src/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb index 0ef829856c..541ae84a93 100644 --- a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb +++ b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb @@ -1,13 +1,13 @@ SUMMARY = "Forward a serial using TCP/IP" -AUTHOR = "Holger 'Zecke' Freyther'" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07" SECTION = "console/devel" SRCREV = "07c6fdede0870edc37a8d51d033b6e7e29aa7c91" -PV = "1.1+gitr${SRCPV}" +PV = "1.1+git" -SRC_URI = "git://github.com/freesmartphone/cornucopia.git \ +SRC_URI = "git://github.com/freesmartphone/cornucopia.git;branch=master;protocol=https \ file://0001-serial_forward-Disable-default-static-linking.patch;striplevel=3 \ + file://0001-correct-the-typo-in-include-file-name-string.h.patch;striplevel=3 \ " S = "${WORKDIR}/git/tools/serial_forward" diff --git a/meta-oe/recipes-support/serial/serial/0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch b/meta-oe/recipes-support/serial/serial/0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch new file mode 100644 index 0000000000..5f4a81a72c --- /dev/null +++ b/meta-oe/recipes-support/serial/serial/0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch @@ -0,0 +1,46 @@ +From 23ae981ba46f6d5af03b12083ad32de9c1f148b2 Mon Sep 17 00:00:00 2001 +From: magicWenli <48174882+magicwenli@users.noreply.github.com> +Date: Fri, 12 Apr 2024 07:52:53 +0000 +Subject: [PATCH] Add SOVERSION for shared lib, and comment example by default + +Upstream-Status: Pending +--- + CMakeLists.txt | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,8 @@ + cmake_minimum_required(VERSION 2.8.3) + project(serial) ++set (SERIAL_VERSION_MAJOR 1) ++set (SERIAL_VERSION_MINOR 2) ++set (SERIAL_VERSION_PATCH 1) + + # Find catkin + find_package(catkin REQUIRED) +@@ -45,7 +48,7 @@ else() + endif() + + ## Add serial library +-add_library(${PROJECT_NAME} ${serial_SRCS}) ++add_library(${PROJECT_NAME} SHARED ${serial_SRCS}) + if(APPLE) + target_link_libraries(${PROJECT_NAME} ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY}) + elseif(UNIX) +@@ -55,9 +58,12 @@ else() + endif() + + ## Uncomment for example +-add_executable(serial_example examples/serial_example.cc) +-add_dependencies(serial_example ${PROJECT_NAME}) +-target_link_libraries(serial_example ${PROJECT_NAME}) ++# add_executable(serial_example examples/serial_example.cc) ++# add_dependencies(serial_example ${PROJECT_NAME}) ++# target_link_libraries(serial_example ${PROJECT_NAME}) ++ ++set (SERIAL_VERSION_STRING ${SERIAL_VERSION_MAJOR}.${SERIAL_VERSION_MINOR}.${SERIAL_VERSION_PATCH}) ++set_target_properties (${PROJECT_NAME} PROPERTIES VERSION ${SERIAL_VERSION_STRING} SOVERSION ${SERIAL_VERSION_MAJOR}) + + ## Include headers + include_directories(include) diff --git a/meta-oe/recipes-support/serial/serial/Findcatkin.cmake b/meta-oe/recipes-support/serial/serial/Findcatkin.cmake new file mode 100644 index 0000000000..2f93564be3 --- /dev/null +++ b/meta-oe/recipes-support/serial/serial/Findcatkin.cmake @@ -0,0 +1,5 @@ +# Work-around for https://github.com/wjwwood/serial/issues/135 + +function(catkin_package) +endfunction() + diff --git a/meta-oe/recipes-support/serial/serial_1.2.1.bb b/meta-oe/recipes-support/serial/serial_1.2.1.bb new file mode 100644 index 0000000000..c3f13d1af5 --- /dev/null +++ b/meta-oe/recipes-support/serial/serial_1.2.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "Cross-platform library for interfacing with rs-232 serial like ports" +HOMEPAGE = "http://wjwwood.io/serial/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://README.md;beginline=53;endline=62;md5=049c68d559533f90250404746e6a1045" + +SRC_URI = " \ + git://github.com/wjwwood/${BPN}.git;protocol=https;branch=main \ + file://Findcatkin.cmake \ + file://0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch \ +" +SRCREV = "10ac4e1c25c2cda1dc0a32a8e12b87fd89f3bb4f" +SRC_URI[sha256sum] = "c8cd235dda2ef7d977ba06dfcb35c35e42f45cfd9149ba3ad257756123d8ff96" + +S = "${WORKDIR}/git" + +inherit cmake + +# Work-around for https://github.com/wjwwood/serial/issues/135 +EXTRA_OECMAKE = " \ + -DCMAKE_MODULE_PATH=${UNPACKDIR} \ + -DCATKIN_PACKAGE_LIB_DESTINATION=${libdir} \ + -DCATKIN_PACKAGE_BIN_DESTINATION=${bindir} \ + -DCATKIN_GLOBAL_INCLUDE_DESTINATION=${includedir} \ + -DCATKIN_ENABLE_TESTING=OFF \ +" + +# Do not depend on the main package since it will be empty +RDEPENDS:${PN}-dev = "" + diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb index c7de057402..6c3d813983 100644 --- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb +++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb @@ -5,17 +5,18 @@ DESCRIPTION = "This package contains low level utilities for devices that use th HOMEPAGE = "http://sg.danny.cz/sg/sg3_utils.html" SECTION = "console/admin" -LICENSE = "GPLv2+ & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=f90da7fc52172599dbf082d7620f18ca" +LICENSE = "GPL-2.0-or-later & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=f685699d3ac82f108aa880043fa3feb7" SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz" MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" -SRC_URI[md5sum] = "28080de5bf2222f8b55a29093bec8aea" -SRC_URI[sha256sum] = "1dcb7a0309bd0ba3d4a83acb526973b80106ee26cd9f7398186cd3f0633c9ef3" +UPSTREAM_CHECK_REGEX = "sg3_utils-(?P<pver>\d+(\.\d+)+)\.tgz" + +SRC_URI[sha256sum] = "d62b6c3cf20390fa7357044390084166d25f1d932a1135c450b69fe5c283d773" inherit autotools-brokensep S = "${WORKDIR}/sg3_utils-${PV}" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch index 7b627c16dd..583fe33ece 100644 --- a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch @@ -8,6 +8,8 @@ whereas it does support format attribute, we hard code it Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/shar-opts.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-recent-gettext.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-recent-gettext.patch new file mode 100644 index 0000000000..7924fa55e2 --- /dev/null +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-recent-gettext.patch @@ -0,0 +1,22 @@ +From 7a2fe915dded27630a345762628cdd542ea5d58a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 20 Dec 2019 13:56:16 +0100 +Subject: [PATCH] Fix build with recent gettext + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 03d1131..65609e7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -17,5 +17,5 @@ + ## Process this file with automake to produce Makefile.in. + + EXTRA_DIST = config.rpath m4 $(DIST_ALPHA) +-SUBDIRS = intl lib libopts src doc po tests ++SUBDIRS = lib libopts src doc po tests + ACLOCAL_AMFLAGS = -I m4 diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch new file mode 100644 index 0000000000..0d9978a214 --- /dev/null +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch @@ -0,0 +1,100 @@ +From b7dd97708b9d0ed09d8d7ac435f8b25eadbf6487 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=83=C2=ADsa=C3=85=E2=84=A2?= <address@hidden> +Date: Thu, 13 Aug 2020 11:20:38 -0700 +Subject: [PATCH 1/2] Fix building with GCC 10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC 10 defaults to -fno-common that results into errors on multiple +global variable definitions: + +/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: +shar-opts.o:(.data.rel.ro.local+0x0): multiple definition of +`program_name'; shar.o:(.rodata+0x10): first defined here + +This patch fixes it by changing the definitions in header files into extern +declarations. + +<https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/msg00001.html> + +Signed-off-by: Petr PÃÂsaÃ…â„¢ <address@hidden> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/shar-opts.h | 2 +- + src/shar-std.def | 2 +- + src/unshar-opts.h | 2 +- + src/uudecode-opts.h | 2 +- + src/uuencode-opts.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/shar-opts.h b/src/shar-opts.h +index 172676f..f6e4e79 100644 +--- a/src/shar-opts.h ++++ b/src/shar-opts.h +@@ -352,7 +352,7 @@ extern "C" { + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + extern bool initialization_done; + extern int optidx; +diff --git a/src/shar-std.def b/src/shar-std.def +index ed06b77..a28f61c 100644 +--- a/src/shar-std.def ++++ b/src/shar-std.def +@@ -41,7 +41,7 @@ no-misuse-usage; + usage-message; + die-code; + +-export = '#include "local.h"'"\nchar const * const program_name;"; ++export = '#include "local.h"'"\nextern char const * const program_name;"; + + #shell + echo "include = 'char const * const program_name = \"${progname}\";';" +diff --git a/src/unshar-opts.h b/src/unshar-opts.h +index 568ffca..aa85833 100644 +--- a/src/unshar-opts.h ++++ b/src/unshar-opts.h +@@ -192,7 +192,7 @@ extern "C" { + extern size_t separator_str_len; + + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * +diff --git a/src/uudecode-opts.h b/src/uudecode-opts.h +index 5b74419..289a366 100644 +--- a/src/uudecode-opts.h ++++ b/src/uudecode-opts.h +@@ -170,7 +170,7 @@ extern "C" { + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * +diff --git a/src/uuencode-opts.h b/src/uuencode-opts.h +index 1a5b7bc..f2df0a8 100644 +--- a/src/uuencode-opts.h ++++ b/src/uuencode-opts.h +@@ -166,7 +166,7 @@ extern "C" { + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * +-- +2.28.0 + diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-configure.ac-Check-and-define-intmax_t-type.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-configure.ac-Check-and-define-intmax_t-type.patch new file mode 100644 index 0000000000..32562a08bc --- /dev/null +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-configure.ac-Check-and-define-intmax_t-type.patch @@ -0,0 +1,32 @@ +From ea6f7a4c22f1b6f28cf426566cccd65eb9a0e9de Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 10 Sep 2023 13:52:31 -0700 +Subject: [PATCH] configure.ac: Check and define intmax_t type + +If stdint.h or inttypes.h defines the type intmax_t, define HAVE_INTMAX_T. +Otherwise, define intmax_t to the widest signed integer type. + +intmax_t is defined in lib/system.h if system is not providing it but it +needs to be checked by configure for existence first. + +Upstream-Status: Submitted [https://savannah.gnu.org/bugs/index.php?64653] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 1242cb7..2ccaac9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -72,6 +72,7 @@ AC_HEADER_STAT + AC_HEADER_STDC + AC_STRUCT_TIMEZONE + AC_TYPE_SIZE_T ++AC_TYPE_INTMAX_T + AC_CHECK_FUNCS([fchmod isascii strchr]) + AC_FUNC_CLOSEDIR_VOID + AC_FUNC_FSEEKO +-- +2.42.0 + diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch new file mode 100644 index 0000000000..6d8a5e2128 --- /dev/null +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch @@ -0,0 +1,47 @@ +From fb8bf1c1b1d0bf8e9bc637c0e67219fab1a9eb03 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 14 Aug 2024 15:24:57 -0700 +Subject: [PATCH] libopts.m4: accept POSIX_SHELL from the environment during + the configure step + +This lets us set it to the canonical path /bin/bash, even on systems +where both /bin/bash and /usr/bin/bash are available, and therefore +which(1) might return /usr/bin/bash (depending on PATH order). + +Both copies of libopts.m4 are marked as generated files, but the files +from which they were generated do not seem to be present in the sharutils +package. This change is equivalent to part of a 2016 autogen commit +<https://git.savannah.gnu.org/cgit/autogen.git/commit/?id=db064b9a>. + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/autogen.git/commit/?id=db064b9a] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libopts/m4/libopts.m4 | 1 + + m4/libopts.m4 | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libopts/m4/libopts.m4 b/libopts/m4/libopts.m4 +index 1a896d9..3b88426 100644 +--- a/libopts/m4/libopts.m4 ++++ b/libopts/m4/libopts.m4 +@@ -114,6 +114,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ + AC_PROG_SED + [while : + do ++ test -x "$POSIX_SHELL" && break + POSIX_SHELL=`which bash` + test -x "$POSIX_SHELL" && break + POSIX_SHELL=`which dash` +diff --git a/m4/libopts.m4 b/m4/libopts.m4 +index c7ba4f3..a1127e1 100644 +--- a/m4/libopts.m4 ++++ b/m4/libopts.m4 +@@ -114,6 +114,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ + AC_PROG_SED + [while : + do ++ test -x "$POSIX_SHELL" && break + POSIX_SHELL=`which bash` + test -x "$POSIX_SHELL" && break + POSIX_SHELL=`which dash` diff --git a/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch b/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch new file mode 100644 index 0000000000..5932ddf1c0 --- /dev/null +++ b/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch @@ -0,0 +1,42 @@ +From ab981e1a973e83edb6ea19e6e84102f43ded0dcb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 13 Aug 2020 11:22:40 -0700 +Subject: [PATCH 2/2] Do not include lib/md5.c into src/shar.c +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +ib/md5.o is part of libgnu.a that is linked to shar. There is no +point in linking md5.o twice into shar executable. Moreover SuSE +reports that this triggers a linking error with GCC 10: + +/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: +../lib/libgnu.a(md5.o): in function `md5_stream': +[ 30s] md5.c:(.text+0x15d): multiple definition of `md5_stream'; +shar.o:shar.c:(.text+0x28): first defined here + +<https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/msg00001.html> + +Signed-off-by: Petr PÃÂsaÃ…â„¢ <address@hidden> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/shar.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/shar.c b/src/shar.c +index 11cbada..6d7ed1d 100644 +--- a/src/shar.c ++++ b/src/shar.c +@@ -53,7 +53,6 @@ static const char cright_years_z[] = + + #include "inttostr.h" + #include "liballoca.h" +-#include "md5.c" + #include "md5.h" + #include "quotearg.h" + #include "xalloc.h" +-- +2.28.0 + diff --git a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch new file mode 100644 index 0000000000..47eb9cfd64 --- /dev/null +++ b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch @@ -0,0 +1,61 @@ +From bd68ae1271598e8fdc72f2adb457e6882604582d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> +Date: Thu, 22 Feb 2018 16:39:43 +0100 +Subject: [PATCH] Fix a heap-buffer-overflow in find_archive() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +rw_buffer has allocated rw_base_size bytes. But subsequend fgets() in +find_archive() reads up-to BUFSIZ bytes. + +On my system, BUFSIZ is 8192. rw_base_size is usually equaled to +a memory page size, 4096 on my system. Thus find_archive() can write +beyonded allocated memmory for rw_buffer array: + +$ valgrind -- ./unshar /tmp/id\:000000\,sig\:06\,src\:000005+000030\,op\:splice\,rep\:4 +==30582== Memcheck, a memory error detector +==30582== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al. +==30582== Using Valgrind-3.13.0 and LibVEX; rerun with -h for copyright info +==30582== Command: ./unshar /tmp/id:000000,sig:06,src:000005+000030,op:splice,rep:4 +==30582== +==30582== Invalid write of size 1 +==30582== at 0x4EAB480: _IO_getline_info (in /usr/lib64/libc-2.27.so) +==30582== by 0x4EB47C2: fgets_unlocked (in /usr/lib64/libc-2.27.so) +==30582== by 0x10BF60: fgets_unlocked (stdio2.h:320) +==30582== by 0x10BF60: find_archive (unshar.c:243) +==30582== by 0x10BF60: unshar_file (unshar.c:379) +==30582== by 0x10BCCC: validate_fname (unshar-opts.c:604) +==30582== by 0x10BCCC: main (unshar-opts.c:639) +==30582== Address 0x523a790 is 0 bytes after a block of size 4,096 alloc'd +==30582== at 0x4C2DBBB: malloc (vg_replace_malloc.c:299) +==30582== by 0x10C670: init_unshar (unshar.c:450) +==30582== by 0x10BC55: main (unshar-opts.c:630) + +This was reported in +<http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html>. + +CVE: CVE-2018-1000097 +Upstream-Status: Inappropriate [no upstream] +Signed-off-by: Petr PÃsaÅ™ <ppisar@redhat.com> +Signed-off-by: Sinan Kaya <okaya@kernel.org> +--- + src/unshar.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/unshar.c b/src/unshar.c +index 80bc3a9..0fc3773 100644 +--- a/src/unshar.c ++++ b/src/unshar.c +@@ -240,7 +240,7 @@ find_archive (char const * name, FILE * file, off_t start) + off_t position = ftello (file); + + /* Read next line, fail if no more and no previous process. */ +- if (!fgets (rw_buffer, BUFSIZ, file)) ++ if (!fgets (rw_buffer, rw_base_size, file)) + { + if (!start) + error (0, 0, _("Found no shell commands in %s"), name); +-- +2.19.0 + diff --git a/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb b/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb index 812fee955b..7a506d034d 100644 --- a/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb +++ b/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb @@ -1,21 +1,35 @@ SUMMARY = "This is the set of GNU shar utilities." HOMEPAGE = "http://www.gnu.org/software/sharutils/" SECTION = "console/utils" -LICENSE="GPLv3+" +LICENSE="GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -inherit gettext autotools +inherit gettext autotools update-alternatives -SRC_URI = "ftp://ftp.gnu.org/gnu/${BPN}/${BP}.tar.gz \ +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-Fix-build-with-clang.patch \ -" + file://CVE-2018-1000097.patch \ + file://0001-Fix-build-with-recent-gettext.patch \ + file://0001-Fix-building-with-GCC-10.patch \ + file://0002-Do-not-include-lib-md5.c-into-src-shar.c.patch \ + file://0001-configure.ac-Check-and-define-intmax_t-type.patch \ + file://0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch \ + " SRC_URI[md5sum] = "32a51b23e25ad5e6af4b89f228be1800" SRC_URI[sha256sum] = "ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637" -do_install_append() { +EXTRA_OECONF = "POSIX_SHELL=${base_bindir}/sh" + +do_install:append() { if [ -e ${D}${libdir}/charset.alias ] then rm -rf ${D}${libdir}/charset.alias rmdir --ignore-fail-on-non-empty ${D}${libdir} fi } + +BBCLASSEXTEND = "native nativesdk" + +ALTERNATIVE:${PN} = "uudecode uuencode" +ALTERNATIVE_LINK_NAME[uudecode] = "${bindir}/uudecode" +ALTERNATIVE_LINK_NAME[uuencode] = "${bindir}/uuencode" diff --git a/meta-oe/recipes-support/smarty/smarty_4.4.1.bb b/meta-oe/recipes-support/smarty/smarty_4.4.1.bb new file mode 100644 index 0000000000..e0979bb5aa --- /dev/null +++ b/meta-oe/recipes-support/smarty/smarty_4.4.1.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "the compiling PHP template engine" +SECTION = "console/network" +HOMEPAGE = "https://www.smarty.net/" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3" + +DEPENDS += "php" + +SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=support/4.3" + +SRCREV = "f4152e9b814ae2369b6e4935c05e1e0c3654318d" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${datadir}/php/smarty3/libs/ + install -m 0644 ${S}/libs/*.php ${D}${datadir}/php/smarty3/libs/ + + install -d ${D}${datadir}/php/smarty3/libs/plugins + install -m 0644 ${S}/libs/plugins/*.php ${D}${datadir}/php/smarty3/libs/plugins/ + + install -d ${D}${datadir}/php/smarty3/libs/sysplugins + install -m 0644 ${S}/libs/sysplugins/*.php ${D}${datadir}/php/smarty3/libs/sysplugins/ +} +FILES:${PN} = "${datadir}/php/smarty3/" + +CVE_STATUS[CVE-2020-10375] = "cpe-incorrect: The recipe used in the meta-openembedded is a different smarty package compared to the one which has the CVE issue." diff --git a/meta-oe/recipes-support/smem/smem_1.4.bb b/meta-oe/recipes-support/smem/smem_1.4.bb deleted file mode 100644 index 519020f3b0..0000000000 --- a/meta-oe/recipes-support/smem/smem_1.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Report application memory usage in a meaningful way" -DESCRIPTION = "smem is a tool that can give numerous reports on memory usage on Linux \ -systems. Unlike existing tools, smem can report proportional set size (PSS), \ -which is a more meaningful representation of the amount of memory used by \ -libraries and applications in a virtual memory system." -HOMEPAGE = "http://www.selenic.com/smem/" -SECTION = "Applications/System" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "http://www.selenic.com/${BPN}/download/${BP}.tar.gz" -SRC_URI[md5sum] = "fe79435c3930389bfdb560255c802162" -SRC_URI[sha256sum] = "2ea9f878f4cf3c276774c3f7e2a41977a1f2d64f98d2dcb6a15f1f3d84df61ec" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} smemcap.c -o smemcap -} - -do_install() { - install -d ${D}/${bindir}/ - install -d ${D}/${mandir}/man8 - install -m 0755 ${S}/smem ${D}${bindir}/ - install -m 0755 ${S}/smemcap ${D}${bindir}/ - install -m 0644 ${S}/smem.8 ${D}/${mandir}/man8/ -} -RDEPENDS_${PN} += "python-textutils python-compression python-shell python-codecs" diff --git a/meta-oe/recipes-support/soci/soci/soci_libdir.patch b/meta-oe/recipes-support/soci/soci/soci_libdir.patch deleted file mode 100644 index 00a1a5c862..0000000000 --- a/meta-oe/recipes-support/soci/soci/soci_libdir.patch +++ /dev/null @@ -1,28 +0,0 @@ -Define SOCI_LIBDIR only if its not passed via environemnt. In OE we -want to set it per our choice since we use 'lib' for 64bit unless we -are using multilib - --Khem - -Index: soci-3.2.2/CMakeLists.txt -=================================================================== ---- soci-3.2.2.orig/CMakeLists.txt -+++ soci-3.2.2/CMakeLists.txt -@@ -69,11 +69,12 @@ include(SociDependencies) - ############################################################################### - # Installation - ############################################################################### -- --if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4) -- set(SOCI_LIBDIR "lib") --else() -- set(SOCI_LIBDIR "lib64") -+if(NOT DEFINED SOCI_LIBDIR) -+ if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4) -+ set(SOCI_LIBDIR "lib") -+ else() -+ set(SOCI_LIBDIR "lib") -+ endif() - endif() - - set(BINDIR "bin" CACHE PATH "The directory to install binaries into.") diff --git a/meta-oe/recipes-support/soci/soci_3.2.2.bb b/meta-oe/recipes-support/soci/soci_3.2.2.bb deleted file mode 100644 index 1f5a485a7d..0000000000 --- a/meta-oe/recipes-support/soci/soci_3.2.2.bb +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (C) 2015 Khem Raj <raj.khem@gmail.com> -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "The C++ Database Access Library" -HOMEPAGE = "http://soci.sourceforge.net" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SECTION = "libs" -DEPENDS = "boost" - - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.gz \ - file://soci_libdir.patch \ - " -SRC_URI[md5sum] = "bc3c35f6cd3f80a1be19fe30b3c111bf" -SRC_URI[sha256sum] = "30ea2f4d26639ef5b5cdc24fb300b3896746243dbb77b743582de2ff443ccb1c" - -TESTCONFIG = '-DSOCI_TEST_EMPTY_CONNSTR="dummy" -DSOCI_TEST_SQLITE3_CONNSTR="test.db" \ - -DSOCI_TEST_POSTGRESQL_CONNSTR:STRING="dbname=soci_test" \ - -DSOCI_TEST_MYSQL_CONNSTR:STRING="db=soci_test user=oe password=oe"' - -OBASEDIR ?= "/opt/oracle" -OINCDIR = "rdbms/public" -OLIBDIR = "lib" - -PACKAGECONFIG[sqlite3] = "-DSOCI_SQLITE3=ON,-DSOCI_SQLITE3=OFF,sqlite3," -PACKAGECONFIG[mysql] = "-DSOCI_MYSQL=ON,-DSOCI_MYSQL=OFF,mariadb," -PACKAGECONFIG[postgresql] = "-DSOCI_POSTGRESQL=ON,-DSOCI_POSTGRESQL=OFF,postgresql," -PACKAGECONFIG[odbc] = "-DSOCI_ODBC=ON,-DSOCI_ODBC=OFF,," -PACKAGECONFIG[empty] = "-DSOCI_EMPTY=ON,-DSOCI_EMPTY=OFF,," -PACKAGECONFIG[oracle] = "-DWITH_ORACLE=ON --with-oracle-include=${OINCDIR} --with-oracle-lib=${OLIBDIR},-DWITH_ORACLE=OFF,," -PACKAGECONFIG[ptest] = "${TESTCONFIG},,," - -# enable your backend by default we enable 'empty' -PACKAGECONFIG ??= "empty" - -# Take the flags added by PACKAGECONFIG and pass them to cmake. -EXTRA_OECMAKE = "${EXTRA_OECONF} -DSOCI_LIBDIR=${libdir}" -DISABLE_STATIC = "" - -inherit cmake - -PACKAGES += "${PN}-sqlite3 ${PN}-mysql ${PN}-postgresql ${PN}-odbc ${PN}-oracle" - -FILES_${PN}-sqlite3 = "${libdir}/lib${BPN}_sqlite3.so.*" -FILES_${PN}-mysql = "${libdir}/lib${BPN}_mysql.so.*" -FILES_${PN}-postgresql = "${libdir}/lib${BPN}_postgresql.so.*" -FILES_${PN}-odbc = "${libdir}/lib${BPN}_odbc.so.*" -FILES_${PN}-oracle = "${libdir}/lib${BPN}_oracle.so.*" diff --git a/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb b/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb new file mode 100644 index 0000000000..9dc393fd08 --- /dev/null +++ b/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb @@ -0,0 +1,11 @@ +SUMMARY = "single-file header-only version of a C++20-like span for C++98, C++11 and later" +HOMEPAGE = "https://github.com/martinmoene/span-lite" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +SRC_URI += "git://github.com/martinmoene/span-lite;branch=master;protocol=https" +SRCREV = "50f55c59d1b66910837313c40d11328d03447a41" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb b/meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb new file mode 100644 index 0000000000..19bac0be89 --- /dev/null +++ b/meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Very fast, header only, C++ logging library." +HOMEPAGE = "https://github.com/gabime/spdlog/wiki" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9573510928429ad0cbe5ba4de77546e9" + +SRCREV = "27cb4c76708608465c413f6d0e6b8d99a4d84302" +SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x" + +DEPENDS = "fmt" + +S = "${WORKDIR}/git" + +inherit cmake + +# no need to build example & tests & benchmarks on pure yocto +EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLE=off -DSPDLOG_FMT_EXTERNAL=on" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-oe/recipes-support/spitools/spitools_git.bb index 3f6cdc63d1..1e3d6beaf4 100644 --- a/meta-oe/recipes-support/spitools/spitools_git.bb +++ b/meta-oe/recipes-support/spitools/spitools_git.bb @@ -1,19 +1,14 @@ DESCRIPTION = "This package contains some simple command line tools to help using Linux spidev devices" HOMEPAGE = "https://github.com/cpb-/spi-tools" -AUTHOR = "Christophe BLAESS" -LICENSE="GPLv2" +LICENSE="GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381" -PR = "r0" - -BPV = "0.8.1" -PV = "${BPV}" -SRCREV = "318bcae5249722873bf58b27afdd20473c7047cc" +PV = "1.0.2" +SRCREV = "1748e092425a4a0ff693aa347062a57fc1ffdd00" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=git" +SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=https;branch=master" inherit autotools - diff --git a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch b/meta-oe/recipes-support/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch deleted file mode 100644 index c5d7c0c81a..0000000000 --- a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 443980ddc82fb40e2e1f9544f2be169bd23dd246 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Jun 2017 16:49:24 -0700 -Subject: [PATCH] shell.c: Fix format not a string literal warning - -src/shell.c:695:20: error: format not a string literal and no format arguments [-Werror=format-security] -| fprintf(stderr,zHelp); -| ^~~~~ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/shell.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/shell.c b/src/shell.c -index bb46c49..3c6fe0f 100644 ---- a/src/shell.c -+++ b/src/shell.c -@@ -692,7 +692,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){ - }else - - if( c=='h' && strncmp(azArg[0], "help", n)==0 ){ -- fprintf(stderr,zHelp); -+ fprintf(stderr, "%s", zHelp); - }else - - if( c=='i' && strncmp(azArg[0], "indices", n)==0 && nArg>1 ){ --- -2.13.1 - diff --git a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch b/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch deleted file mode 100644 index 914422f1df..0000000000 --- a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -urN sqlite-2.8.17.orig/main.mk sqlite-2.8.17/main.mk ---- sqlite-2.8.17.orig/main.mk 2005-04-23 22:43:23.000000000 +0000 -+++ sqlite-2.8.17/main.mk 2009-04-02 20:10:36.000000000 +0000 -@@ -139,7 +139,7 @@ - # This is the default Makefile target. The objects listed here - # are what get build when you type just "make" with no arguments. - # --all: sqlite.h config.h libsqlite.a sqlite$(EXE) -+all: sqlite.h config.h libsqlite.so sqlite$(EXE) - - # Generate the file "last_change" which contains the date of change - # of the most recently modified source code file -@@ -148,13 +148,12 @@ - cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \ - | awk '{print $$5,$$6}' >last_change - --libsqlite.a: $(LIBOBJ) -- $(AR) libsqlite.a $(LIBOBJ) -- $(RANLIB) libsqlite.a -- --sqlite$(EXE): $(TOP)/src/shell.c libsqlite.a sqlite.h -- $(TCCX) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \ -- libsqlite.a $(LIBREADLINE) $(THREADLIB) -+libsqlite.so: $(LIBOBJ) -+ $(CC) $(LDFLAGS) -shared -o libsqlite.so -Wl,-soname,libsqlite.so.0 $(LIBOBJ) -+ -+sqlite$(EXE): $(TOP)/src/shell.c libsqlite.so sqlite.h -+ $(TCCX) $(LDFLAGS) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \ -+ -lsqlite $(LIBREADLINE) $(THREADLIB) - - sqlite_analyzer$(EXE): $(TOP)/src/tclsqlite.c libsqlite.a $(TESTSRC) \ - $(TOP)/tool/spaceanal.tcl diff --git a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch b/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch deleted file mode 100644 index b84b6486ef..0000000000 --- a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -bur sqlite-2.8.17~orig/main.mk sqlite-2.8.17/main.mk ---- sqlite-2.8.17~orig/main.mk 2006-02-13 04:09:33.000000000 -0600 -+++ sqlite-2.8.17/main.mk 2006-02-13 04:15:42.000000000 -0600 -@@ -58,7 +58,7 @@ - expr.o func.o hash.o insert.o \ - main.o opcodes.o os.o pager.o parse.o pragma.o printf.o random.o \ - select.o table.o tokenize.o trigger.o update.o util.o \ -- vacuum.o vdbe.o vdbeaux.o where.o tclsqlite.o -+ vacuum.o vdbe.o vdbeaux.o where.o - - # All of the source code files. - # -@@ -91,7 +91,6 @@ - $(TOP)/src/sqlite.h.in \ - $(TOP)/src/sqliteInt.h \ - $(TOP)/src/table.c \ -- $(TOP)/src/tclsqlite.c \ - $(TOP)/src/tokenize.c \ - $(TOP)/src/trigger.c \ - $(TOP)/src/update.c \ diff --git a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc b/meta-oe/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc deleted file mode 100644 index 6bc742eecb..0000000000 --- a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc +++ /dev/null @@ -1,12 +0,0 @@ -# Package Information for pkg-config - -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: SQLite -Description: SQL database engine -Version: 2.8.17 -Libs: -L${libdir} -lsqlite -Cflags: -I${includedir} diff --git a/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb b/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb deleted file mode 100644 index 501c0e3e77..0000000000 --- a/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "An Embeddable SQL Database Engine" -HOMEPAGE = "http://www.sqlite.org/" -SECTION = "libs" -DEPENDS = "readline ncurses" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=10;md5=e98469a8efa024a38ad5b2e4b92f4a96" - -PR = "r7" - -SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \ - file://mainmk_build_dynamic.patch \ - file://mainmk_no_tcl.patch \ - file://sqlite.pc \ - file://0001-shell.c-Fix-format-not-a-string-literal-warning.patch \ - " - -SOURCES = "attach.o auth.o btree.o btree_rb.o build.o copy.o date.o delete.o \ - expr.o func.o hash.o insert.o main.o opcodes.o os.o pager.o \ - parse.o pragma.o printf.o random.o select.o table.o tokenize.o \ - trigger.o update.o util.o vacuum.o vdbe.o vdbeaux.o where.o" - -inherit autotools pkgconfig - -do_configure() { - echo "main.mk is patched, no need to configure" - # make pkgconfig.bbclass pick this up - cp ${WORKDIR}/sqlite.pc ${S} -} - -do_compile() { - oe_runmake -f ${S}/Makefile.linux-gcc \ - TOP="${S}" \ - BCC="${BUILD_CC}" \ - TCC="${CC}" \ - OPTS="-fPIC -D'INTPTR_TYPE=int'" \ - TCL_FLAGS= LIBTCL= \ - READLINE_FLAGS="-DHAVE_READLINE=1 -I${STAGING_INCDIR}" \ - LIBREADLINE="-L. -L${STAGING_LIBDIR} -lreadline -lncurses" -} - -do_install() { - install -d ${D}${libdir} ${D}${bindir} - install sqlite ${D}${bindir} - install -m 0755 libsqlite.so ${D}${libdir}/libsqlite.so.0.8.6 - ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so - ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0 - ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0.8 - install -d ${D}${includedir} - install -m 0644 sqlite.h ${D}${includedir}/sqlite.h - install -d ${D}${libdir}/pkgconfig - install -m 0644 ${S}/sqlite.pc ${D}${libdir}/pkgconfig/sqlite.pc -} - -PACKAGES += "${PN}-bin" -FILES_${PN}-bin = "${bindir}/*" -FILES_${PN} = "${libdir}/*.so.*" - -SRC_URI[md5sum] = "838dbac20b56d2c4292e98848505a05b" -SRC_URI[sha256sum] = "3f35ebfb67867fb5b583a03e480f900206af637efe7179b32294a6a0cf806f37" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/srecord/files/0001-Disable-doxygen.patch b/meta-oe/recipes-support/srecord/files/0001-Disable-doxygen.patch new file mode 100644 index 0000000000..0ed9e87771 --- /dev/null +++ b/meta-oe/recipes-support/srecord/files/0001-Disable-doxygen.patch @@ -0,0 +1,85 @@ +From d75193671c235e4b3bd02417b40516f3bfeb55b6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 30 Apr 2023 14:09:21 -0700 +Subject: [PATCH] Disable doxygen + +doxygen (dot) detect does not work in cross environment here with cmake + +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + etc/configure.cmake | 2 +- + srecord/CMakeLists.txt | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +--- a/etc/configure.cmake ++++ b/etc/configure.cmake +@@ -103,32 +103,3 @@ option(_TANDEM_SOURCE ON) + # Enable general extensions on Solaris. + option(__EXTENSIONS__ ON) + +-# Doxygen configuration +-find_package(Doxygen REQUIRED doxygen dot) +- +-set(DOXYGEN_DOT_GRAPH_MAX_NODES 150) +-set(DOXYGEN_ALPHABETICAL_INDEX NO) +-set(DOXYGEN_BUILTIN_STL_SUPPORT YES) +-set(DOXYGEN_CASE_SENSE_NAMES NO) +-set(DOXYGEN_CLASS_DIAGRAMS YES) +-set(DOXYGEN_DISTRIBUTE_GROUP_DOC YES) +-set(DOXYGEN_EXCLUDE bin) +-set(DOXYGEN_EXTRACT_ALL YES) +-set(DOXYGEN_EXTRACT_LOCAL_CLASSES NO) +-set(DOXYGEN_FILE_PATTERNS *.h) +-set(DOXYGEN_GENERATE_TREEVIEW YES) +-set(DOXYGEN_HIDE_FRIEND_COMPOUNDS YES) +-set(DOXYGEN_HIDE_IN_BODY_DOCS YES) +-set(DOXYGEN_HIDE_UNDOC_CLASSES YES) +-set(DOXYGEN_HIDE_UNDOC_MEMBERS YES) +-set(DOXYGEN_JAVADOC_AUTOBRIEF YES) +-set(DOXYGEN_QT_AUTOBRIEF YES) +-set(DOXYGEN_QUIET YES) +-set(DOXYGEN_RECURSIVE YES) +-set(DOXYGEN_REFERENCED_BY_RELATION YES) +-set(DOXYGEN_REFERENCES_RELATION YES) +-set(DOXYGEN_SORT_BY_SCOPE_NAME YES) +-set(DOXYGEN_SORT_MEMBER_DOCS NO) +-set(DOXYGEN_SOURCE_BROWSER YES) +-set(DOXYGEN_STRIP_CODE_COMMENTS NO) +-set(DOXYGEN_GENERATE_HTML YES) +--- a/srecord/CMakeLists.txt ++++ b/srecord/CMakeLists.txt +@@ -34,9 +34,9 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE + FILES_MATCHING PATTERN "*.h") + + # Install the Doxygen output for the website +-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html +- DESTINATION ${CMAKE_INSTALL_DOCDIR}/htdocs/srecord +- COMPONENT website) ++#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html ++# DESTINATION ${CMAKE_INSTALL_DOCDIR}/htdocs/srecord ++# COMPONENT website) + + # Generate config.h to suit local environment + configure_file(config.h.in config.h @ONLY) +@@ -44,6 +44,6 @@ configure_file(patchlevel.h.in patchleve + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + + # Generate doxygen content +-doxygen_add_docs(doxygen +- ${LIB_SRECORD_HDR} +- ALL) ++#doxygen_add_docs(doxygen ++# ${LIB_SRECORD_HDR} ++# ALL) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,7 +55,7 @@ enable_testing() + add_subdirectory(test) + + # Documentation & Man Pages +-add_subdirectory(doc) ++# add_subdirectory(doc) + + # Package SRecord + include(CPack) diff --git a/meta-oe/recipes-support/srecord/files/0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch b/meta-oe/recipes-support/srecord/files/0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch new file mode 100644 index 0000000000..524dc74611 --- /dev/null +++ b/meta-oe/recipes-support/srecord/files/0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch @@ -0,0 +1,45 @@ +From 756169511ed13e4c7adc06c7c108d365ac66b9f8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 30 Apr 2023 22:58:47 -0700 +Subject: [PATCH] cmake: Do not try to compute library dependencies during + install + +Since we are cross-building the dependencies are not in final install +location but in a staging area in recipe specific sysroot and it wont be +able to resolve the libraries all the time + +Fixes +| CMake Error at srec_cat/cmake_install.cmake:66 (file): +| file Could not resolve runtime dependencies: +| +| libc++.so.1 +| libc.so +| Call Stack (most recent call first): +| cmake_install.cmake:52 (include) + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + etc/packaging.cmake | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/etc/packaging.cmake b/etc/packaging.cmake +index ee2a32c..9804fd8 100644 +--- a/etc/packaging.cmake ++++ b/etc/packaging.cmake +@@ -45,12 +45,6 @@ FUNCTION(INSTALL_SRECORD_EXECUTABLE_TARGET target) + + install(IMPORTED_RUNTIME_ARTIFACTS ${target} + RUNTIME_DEPENDENCY_SET ${PROJECT_NAME}_dlls COMPONENT ${target}) +- install(RUNTIME_DEPENDENCY_SET ${PROJECT_NAME}_dlls +- PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-" +- POST_EXCLUDE_REGEXES ".*system32/.*\\.dll" +- DIRECTORIES ${DLL_SEARCH_DIRS} +- COMPONENT ${target} +- ) + ENDFUNCTION() + + # Packaging +-- +2.40.1 + diff --git a/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch b/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch new file mode 100644 index 0000000000..64584656fa --- /dev/null +++ b/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch @@ -0,0 +1,31 @@ +From 4aa8cf8c93e1fa6ffeb40fc3473f32b1b83af141 Mon Sep 17 00:00:00 2001 +From: "Ilya A. Kriveshko" <iillyyaa@gmail.com> +Date: Tue, 2 Jan 2024 15:37:10 -0500 +Subject: [PATCH] cmake: respect explicit install prefix + +If CMAKE_INSTALL_PREFIX was supplied externally, use it. This follows +the pattern suggested by cmake documentation in: +https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.html + +Upstream-Status: Submitted [https://github.com/sierrafoxtrot/srecord/pull/68] +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 74b8108c..ac9f464e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,9 +30,9 @@ include(InstallRequiredSystemLibraries) + include(GNUInstallDirs) + + # FHS compliant paths for Linux installation +-if(NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +-# set(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}") +- set(CMAKE_INSTALL_PREFIX "/usr") ++if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT ++ AND NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) ++ set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install prefix" FORCE) + endif() + + # Pull in the rest of the pieces diff --git a/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch b/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch deleted file mode 100644 index 9b2bd99795..0000000000 --- a/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch +++ /dev/null @@ -1,57 +0,0 @@ -Add option to build this utility without a documentation. - -For full documentation building are necessary utilities like -groff and ps2pdf. Full documentation can takes a lot of space. -So it can be disabled by overloading makefile variable WITHOUT_DOC. - -Upstream-Status: Inappropriate [Other] -Workaround specific to our build system. - -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> - -diff --git a/Makefile.in b/Makefile.in -index 9bdd8f1..a2b5494 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -141,6 +141,14 @@ GROFF = @GROFF@ - # - SOELIM = @SOELIM@ - -+# Option to build this utility without building and installing the documentation. -+WITHOUT_DOC ?= 0 -+ifeq ($(WITHOUT_DOC),0) -+ BUILD_DOC = all-doc -+ INST_DOC = install-doc -+ CLR_DOC = clean-doc -+endif -+ - # --------------------------------------------------------- - # You should not need to change anything below this line. - -@@ -4090,7 +4098,7 @@ bin/test_url_decode: $(test_url_decode_obj) .bin srecord/libsrecord.la - $(LIBTOOL) --mode=link --tag=CXX $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ \ - $(test_url_decode_obj) srecord/libsrecord.la $(LDFLAGS) $(LIBS) - --all: all-bin all-doc -+all: all-bin $(BUILD_DOC) - - all-bin: bin/srec_cat bin/srec_cmp bin/srec_info bin/test_arglex_ambiguous \ - bin/test_crc16 bin/test_fletcher16 bin/test_gecos \ -@@ -4156,7 +4164,7 @@ test_files = t0001a t0002a t0003a t0004a t0005a t0006a t0007a t0008a t0009a \ - sure: $(test_files) - @echo Passed All Tests - --clean: clean-bin clean-doc clean-misc clean-obj -+clean: clean-bin $(CLR_DOC) clean-misc clean-obj - - clean-bin: - rm -f bin/srec_cat bin/srec_cmp bin/srec_info bin/test_arglex_ambiguous -@@ -4443,7 +4451,7 @@ distclean-directories: - rm -rf test/fletcher16/.libs test/gecos/.libs test/hyphen/.libs - rm -rf test/url_decode/.libs - --install: install-bin install-doc install-include install-libdir install-man -+install: install-bin $(INST_DOC) install-include install-libdir install-man - - install-bin: $(bindir)/srec_cat $(bindir)/srec_cmp $(bindir)/srec_info - diff --git a/meta-oe/recipes-support/srecord/srecord_1.64.bb b/meta-oe/recipes-support/srecord/srecord_1.64.bb deleted file mode 100644 index fe1af476f2..0000000000 --- a/meta-oe/recipes-support/srecord/srecord_1.64.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "A collection of powerful tools for manipulating EPROM load files." -SECTION = "devel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8dfcbf2f0a144b97f0931b6394debea7" - -SRC_URI = " \ - http://srecord.sourceforge.net/srecord-${PV}.tar.gz \ - file://add-option-to-remove-docs.patch \ -" - -SRC_URI[md5sum] = "4de4a7497472d7972645c2af91313769" -SRC_URI[sha256sum] = "49a4418733c508c03ad79a29e95acec9a2fbc4c7306131d2a8f5ef32012e67e2" - -DEPENDS = "libtool-native boost groff-native" - -inherit autotools-brokensep - -EXTRA_OECONF = "--without-gcrypt LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" - -# Set variable WITHOUT_DOC=0 to enable documentation generation -EXTRA_OEMAKE = "WITHOUT_DOC=1" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb new file mode 100644 index 0000000000..3e8a87d07f --- /dev/null +++ b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "A collection of powerful tools for manipulating EPROM load files." +SECTION = "devel" +LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = " \ + https://sourceforge.net/projects/${BPN}/files/srecord/${@oe.utils.trim_version('${PV}', 2)}/${BP}-Source.tar.gz \ + file://0001-Disable-doxygen.patch \ + file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch \ + file://0001-cmake-respect-explicit-install-prefix.patch" +SRC_URI[sha256sum] = "81c3d07cf15ce50441f43a82cefd0ac32767c535b5291bcc41bd2311d1337644" +S = "${WORKDIR}/${BP}-Source" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/srecord/files/releases" + +DEPENDS = "boost libgcrypt" + +inherit cmake + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch new file mode 100644 index 0000000000..5842ff1f36 --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch @@ -0,0 +1,118 @@ +From dd6ad8ca447457c812809791ab8622da8646104c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 30 Aug 2019 13:07:33 -0700 +Subject: [PATCH] Don't use __GNUC_PREREQ + +These are not official GCC predefined macros; they are macros defined +by GNU libc and some versions of BSD libc for internal use by their +own headers, and we shouldn't be using them without checking for their +availability first + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + lib/efi/efi.h | 4 ++-- + lib/engine/pragma.h | 4 ++-- + lib/log/log.h | 4 ++-- + lib/mpb/machine_bytes.h | 4 ++-- + lib/mpb/mpb.h | 4 ++-- + lib/orom/orom.h | 4 ++-- + 6 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/lib/efi/efi.h b/lib/efi/efi.h +index 0620d9c..c8358db 100644 +--- a/lib/efi/efi.h ++++ b/lib/efi/efi.h +@@ -33,9 +33,9 @@ + #include <features.h> + #include <ssi.h> + +-#if __GNUC_PREREQ(3, 4) ++#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__) + #pragma once +-#endif /* __GNUC_PREREQ */ ++#endif + + #if defined(__cplusplus) + extern "C" { +diff --git a/lib/engine/pragma.h b/lib/engine/pragma.h +index 8205ed3..fa0b268 100644 +--- a/lib/engine/pragma.h ++++ b/lib/engine/pragma.h +@@ -32,9 +32,9 @@ + + #include <features.h> + +-#if __GNUC_PREREQ(3, 4) ++#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__) + #define SSI_HAS_PRAGMA_ONCE +-#endif /* __GNUC_PREREQ */ ++#endif + + #ifdef SSI_HAS_PRAGMA_ONCE + #pragma once +diff --git a/lib/log/log.h b/lib/log/log.h +index 66a707b..ca5000a 100644 +--- a/lib/log/log.h ++++ b/lib/log/log.h +@@ -32,9 +32,9 @@ + + #include <features.h> + +-#if __GNUC_PREREQ(3, 4) ++#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__) + #pragma once +-#endif /* __GNUC_PREREQ */ ++#endif + + #if defined(__cplusplus) + extern "C" { +diff --git a/lib/mpb/machine_bytes.h b/lib/mpb/machine_bytes.h +index 6cb81c9..807461f 100644 +--- a/lib/mpb/machine_bytes.h ++++ b/lib/mpb/machine_bytes.h +@@ -27,9 +27,9 @@ + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#if __GNUC_PREREQ(3, 4) ++#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__) + #pragma once +-#endif /* __GNUC_PREREQ */ ++#endif + + #ifndef __ENDIAN_H__INCLUDED__ + #define __ENDIAN_H__INCLUDED__ +diff --git a/lib/mpb/mpb.h b/lib/mpb/mpb.h +index 32beb21..98f82fe 100644 +--- a/lib/mpb/mpb.h ++++ b/lib/mpb/mpb.h +@@ -27,9 +27,9 @@ + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#if __GNUC_PREREQ(3, 4) ++#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__) + #pragma once +-#endif /* __GNUC_PREREQ */ ++#endif + + #ifndef __MPB_H__INCLUDED__ + #define __MPB_H__INCLUDED__ +diff --git a/lib/orom/orom.h b/lib/orom/orom.h +index 4492066..16b03a6 100644 +--- a/lib/orom/orom.h ++++ b/lib/orom/orom.h +@@ -32,9 +32,9 @@ + + #include <features.h> + +-#if __GNUC_PREREQ(3, 4) ++#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__) + #pragma once +-#endif /* __GNUC_PREREQ */ ++#endif + + #if defined(__cplusplus) + extern "C" { diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch new file mode 100644 index 0000000000..b522146602 --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch @@ -0,0 +1,34 @@ +From 258a1d128581f185a7a5070f47df06e5c29c9db8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 30 Aug 2019 13:43:32 -0700 +Subject: [PATCH] Include libgen.h + +Use XPG version of basename on non gnu libc systems +ideally posix version should be used everywhere but that +would be upstreams choice to make + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + tools/ssieventmonitor.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp +index 0d11975..af7e09c 100644 +--- a/tools/ssieventmonitor.cpp ++++ b/tools/ssieventmonitor.cpp +@@ -39,7 +39,9 @@ + #include <sys/select.h> + #include <sys/wait.h> + #include <sys/inotify.h> +- ++#ifndef __GLIBC__ ++#include <libgen.h> ++#endif + extern "C" { + #include "lib/safeclib/safe_str_lib.h" + } +-- +2.23.0 + diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch deleted file mode 100644 index ef6ae00e3d..0000000000 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch +++ /dev/null @@ -1,872 +0,0 @@ -From 3100e23c50e38bff0c2ec77bc30049c113c29414 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 16 Jun 2017 20:44:31 -0700 -Subject: [PATCH 1/6] Use pragma once unconditionally - -in OE we do not worry about supporting -gcc 3.4 anyway - -Upstream-Status: Inappropriate[Bumps required gcc to be > 3.4] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/efi/efi.h | 2 -- - lib/engine/ahci.h | 2 -- - lib/engine/ahci_cdrom.h | 2 -- - lib/engine/ahci_disk.h | 2 -- - lib/engine/ahci_multiplier.h | 2 -- - lib/engine/ahci_multiplier_phy.h | 2 -- - lib/engine/ahci_multiplier_port.h | 2 -- - lib/engine/ahci_phy.h | 2 -- - lib/engine/ahci_port.h | 2 -- - lib/engine/ahci_raid_info.h | 2 -- - lib/engine/ahci_tape.h | 2 -- - lib/engine/array.h | 2 -- - lib/engine/block_device.h | 2 -- - lib/engine/cache.h | 2 -- - lib/engine/container.h | 2 -- - lib/engine/context_manager.h | 2 -- - lib/engine/controller.h | 2 -- - lib/engine/enclosure.h | 2 -- - lib/engine/end_device.h | 2 -- - lib/engine/event.h | 2 -- - lib/engine/event_manager.h | 2 -- - lib/engine/exception.h | 2 -- - lib/engine/filesystem.h | 2 -- - lib/engine/isci.h | 2 -- - lib/engine/isci_cdrom.h | 2 -- - lib/engine/isci_disk.h | 2 -- - lib/engine/isci_expander.h | 2 -- - lib/engine/isci_expander_phy.h | 2 -- - lib/engine/isci_expander_port.h | 2 -- - lib/engine/isci_phy.h | 2 -- - lib/engine/isci_port.h | 2 -- - lib/engine/isci_raid_info.h | 2 -- - lib/engine/isci_tape.h | 2 -- - lib/engine/list.h | 2 -- - lib/engine/mdadm_config.h | 2 -- - lib/engine/multimedia_device.h | 2 -- - lib/engine/nondisk_device.h | 2 -- - lib/engine/object.h | 2 -- - lib/engine/pci_header.h | 2 -- - lib/engine/phy.h | 2 -- - lib/engine/port.h | 2 -- - lib/engine/raid_device.h | 2 -- - lib/engine/raid_info.h | 2 -- - lib/engine/remote_port.h | 2 -- - lib/engine/routing_device.h | 2 -- - lib/engine/session.h | 2 -- - lib/engine/session_manager.h | 2 -- - lib/engine/storage_device.h | 2 -- - lib/engine/stream_device.h | 2 -- - lib/engine/string.h | 2 -- - lib/engine/unique_id_manager.h | 2 -- - lib/engine/utils.h | 2 -- - lib/engine/volume.h | 2 -- - lib/log/log.h | 2 -- - lib/mpb/machine_bytes.h | 2 -- - lib/mpb/mpb.h | 2 -- - lib/orom/orom.h | 2 -- - 57 files changed, 114 deletions(-) - -diff --git a/lib/efi/efi.h b/lib/efi/efi.h -index 9e7e41b..804e567 100644 ---- a/lib/efi/efi.h -+++ b/lib/efi/efi.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __EFI_H__INCLUDED__ - #define __EFI_H__INCLUDED__ -diff --git a/lib/engine/ahci.h b/lib/engine/ahci.h -index e883d1a..80a9699 100644 ---- a/lib/engine/ahci.h -+++ b/lib/engine/ahci.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_H__INCLUDED__ - #define __AHCI_H__INCLUDED__ -diff --git a/lib/engine/ahci_cdrom.h b/lib/engine/ahci_cdrom.h -index 442f301..d8ca042 100644 ---- a/lib/engine/ahci_cdrom.h -+++ b/lib/engine/ahci_cdrom.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_CDROM_H__INCLUDED__ - #define __AHCI_CDROM_H__INCLUDED__ -diff --git a/lib/engine/ahci_disk.h b/lib/engine/ahci_disk.h -index 7892a53..1bad9ad 100644 ---- a/lib/engine/ahci_disk.h -+++ b/lib/engine/ahci_disk.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_DISK_H__INCLUDED__ - #define __AHCI_DISK_H__INCLUDED__ -diff --git a/lib/engine/ahci_multiplier.h b/lib/engine/ahci_multiplier.h -index d63e9bc..1029af2 100644 ---- a/lib/engine/ahci_multiplier.h -+++ b/lib/engine/ahci_multiplier.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_MULTIPLIER_H__INCLUDED__ - #define __AHCI_MULTIPLIER_H__INCLUDED__ -diff --git a/lib/engine/ahci_multiplier_phy.h b/lib/engine/ahci_multiplier_phy.h -index 58ecebc..2132c23 100644 ---- a/lib/engine/ahci_multiplier_phy.h -+++ b/lib/engine/ahci_multiplier_phy.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_MULTIPLIER_PHY_H__INCLUDED__ - #define __AHCI_MULTIPLIER_PHY_H__INCLUDED__ -diff --git a/lib/engine/ahci_multiplier_port.h b/lib/engine/ahci_multiplier_port.h -index 5ff4cf7..2402473 100644 ---- a/lib/engine/ahci_multiplier_port.h -+++ b/lib/engine/ahci_multiplier_port.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_MULTIPLIER_PORT_H__INCLUDED__ - #define __AHCI_MULTIPLIER_PORT_H__INCLUDED__ -diff --git a/lib/engine/ahci_phy.h b/lib/engine/ahci_phy.h -index e2254e7..a44dae0 100644 ---- a/lib/engine/ahci_phy.h -+++ b/lib/engine/ahci_phy.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_PHY_H__INCLUDED__ - #define __AHCI_PHY_H__INCLUDED__ -diff --git a/lib/engine/ahci_port.h b/lib/engine/ahci_port.h -index f9e3308..03c109b 100644 ---- a/lib/engine/ahci_port.h -+++ b/lib/engine/ahci_port.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_PORT_H__INCLUDED__ - #define __AHCI_PORT_H__INCLUDED__ -diff --git a/lib/engine/ahci_raid_info.h b/lib/engine/ahci_raid_info.h -index e1c81ae..c70e63e 100644 ---- a/lib/engine/ahci_raid_info.h -+++ b/lib/engine/ahci_raid_info.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_RAID_INFO_H__INCLUDED__ - #define __AHCI_RAID_INFO_H__INCLUDED__ -diff --git a/lib/engine/ahci_tape.h b/lib/engine/ahci_tape.h -index cdd9f13..a91fd2c 100644 ---- a/lib/engine/ahci_tape.h -+++ b/lib/engine/ahci_tape.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_TAPE_H__INCLUDED__ - #define __AHCI_TAPE_H__INCLUDED__ -diff --git a/lib/engine/array.h b/lib/engine/array.h -index 36fb4a4..0986ce3 100644 ---- a/lib/engine/array.h -+++ b/lib/engine/array.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ARRAY_H__INCLUDED__ - #define __ARRAY_H__INCLUDED__ -diff --git a/lib/engine/block_device.h b/lib/engine/block_device.h -index 4503914..45dd3db 100644 ---- a/lib/engine/block_device.h -+++ b/lib/engine/block_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __BLOCK_DEVICE_H__INCLUDED__ - #define __BLOCK_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/cache.h b/lib/engine/cache.h -index 72cf521..72da20b 100644 ---- a/lib/engine/cache.h -+++ b/lib/engine/cache.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3,4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __CACHE_H__INCLUDED__ - #define __CACHE_H__INCLUDED__ -diff --git a/lib/engine/container.h b/lib/engine/container.h -index 53867b0..c71180c 100644 ---- a/lib/engine/container.h -+++ b/lib/engine/container.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3,4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __CONTAINER_H__INCLUDED__ - #define __CONTAINER_H__INCLUDED__ -diff --git a/lib/engine/context_manager.h b/lib/engine/context_manager.h -index fe9c256..6b4a2e7 100644 ---- a/lib/engine/context_manager.h -+++ b/lib/engine/context_manager.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3,4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __CONTEXT_H__INCLUDED__ - #define __CONTEXT_H__INCLUDED__ -diff --git a/lib/engine/controller.h b/lib/engine/controller.h -index a2f188a..6bd078f 100644 ---- a/lib/engine/controller.h -+++ b/lib/engine/controller.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __CONTROLLER_H__INCLUDED__ - #define __CONTROLLER_H__INCLUDED__ -diff --git a/lib/engine/enclosure.h b/lib/engine/enclosure.h -index 3faef0c..f4b13cc 100644 ---- a/lib/engine/enclosure.h -+++ b/lib/engine/enclosure.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ENCLOSURE_H__INCLUDED__ - #define __ENCLOSURE_H__INCLUDED__ -diff --git a/lib/engine/end_device.h b/lib/engine/end_device.h -index f147e41..269b236 100644 ---- a/lib/engine/end_device.h -+++ b/lib/engine/end_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __END_DEVICE_H__INCLUDED__ - #define __END_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/event.h b/lib/engine/event.h -index cf9bb4f..11a4926 100644 ---- a/lib/engine/event.h -+++ b/lib/engine/event.h -@@ -12,9 +12,7 @@ Redistribution and use in source and binary forms, with or without modification, - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __EVENT_H__INCLUDED__ - #define __EVENT_H__INCLUDED__ -diff --git a/lib/engine/event_manager.h b/lib/engine/event_manager.h -index 65007b9..a7a8fc3 100644 ---- a/lib/engine/event_manager.h -+++ b/lib/engine/event_manager.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __EVENT_MANAGER_H__INCLUDED__ - #define __EVENT_MANAGER_H__INCLUDED__ -diff --git a/lib/engine/exception.h b/lib/engine/exception.h -index 171e45d..183ebb5 100644 ---- a/lib/engine/exception.h -+++ b/lib/engine/exception.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __EXCEPTION_H__INCLUDED__ - #define __EXCEPTION_H__INCLUDED__ -diff --git a/lib/engine/filesystem.h b/lib/engine/filesystem.h -index 9c2ce39..b49df07 100644 ---- a/lib/engine/filesystem.h -+++ b/lib/engine/filesystem.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __FILESYSTEM_H__INCLUDED__ - #define __FILESYSTEM_H__INCLUDED__ -diff --git a/lib/engine/isci.h b/lib/engine/isci.h -index ea35cd4..0fa602a 100644 ---- a/lib/engine/isci.h -+++ b/lib/engine/isci.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_H__INCLUDED__ - #define __ISCI_H__INCLUDED__ -diff --git a/lib/engine/isci_cdrom.h b/lib/engine/isci_cdrom.h -index 87b7e7b..25637f9 100644 ---- a/lib/engine/isci_cdrom.h -+++ b/lib/engine/isci_cdrom.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_CDROM_H__INCLUDED__ - #define __ISCI_CDROM_H__INCLUDED__ -diff --git a/lib/engine/isci_disk.h b/lib/engine/isci_disk.h -index 596c3cf..8dd0dae 100644 ---- a/lib/engine/isci_disk.h -+++ b/lib/engine/isci_disk.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_DISK_H__INCLUDED__ - #define __ISCI_DISK_H__INCLUDED__ -diff --git a/lib/engine/isci_expander.h b/lib/engine/isci_expander.h -index ca7c2f1..7dc1920 100644 ---- a/lib/engine/isci_expander.h -+++ b/lib/engine/isci_expander.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_EXPANDER_H__INCLUDED__ - #define __ISCI_EXPANDER_H__INCLUDED__ -diff --git a/lib/engine/isci_expander_phy.h b/lib/engine/isci_expander_phy.h -index c9cd770..d3d2832 100644 ---- a/lib/engine/isci_expander_phy.h -+++ b/lib/engine/isci_expander_phy.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_EXPANDER_PHY_H__INCLUDED__ - #define __ISCI_EXPANDER_PHY_H__INCLUDED__ -diff --git a/lib/engine/isci_expander_port.h b/lib/engine/isci_expander_port.h -index e65a124..4fc9310 100644 ---- a/lib/engine/isci_expander_port.h -+++ b/lib/engine/isci_expander_port.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_EXPANDER_PORT_H__INCLUDED__ - #define __ISCI_EXPANDER_PORT_H__INCLUDED__ -diff --git a/lib/engine/isci_phy.h b/lib/engine/isci_phy.h -index 767a5b2..105c697 100644 ---- a/lib/engine/isci_phy.h -+++ b/lib/engine/isci_phy.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_PHY_H__INCLUDED__ - #define __ISCI_PHY_H__INCLUDED__ -diff --git a/lib/engine/isci_port.h b/lib/engine/isci_port.h -index b80be7f..5ccc151 100644 ---- a/lib/engine/isci_port.h -+++ b/lib/engine/isci_port.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_PORT_H__INCLUDED__ - #define __ISCI_PORT_H__INCLUDED__ -diff --git a/lib/engine/isci_raid_info.h b/lib/engine/isci_raid_info.h -index 1df6477..b0b046a 100644 ---- a/lib/engine/isci_raid_info.h -+++ b/lib/engine/isci_raid_info.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_RAID_INFO_H__INCLUDED__ - #define __ISCI_RAID_INFO_H__INCLUDED__ -diff --git a/lib/engine/isci_tape.h b/lib/engine/isci_tape.h -index 985f767..a2cef2d 100644 ---- a/lib/engine/isci_tape.h -+++ b/lib/engine/isci_tape.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_TAPE_H__INCLUDED__ - #define __ISCI_TAPE_H__INCLUDED__ -diff --git a/lib/engine/list.h b/lib/engine/list.h -index 9a7c3c3..6395830 100644 ---- a/lib/engine/list.h -+++ b/lib/engine/list.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __LIST_H__INCLUDED__ - #define __LIST_H__INCLUDED__ -diff --git a/lib/engine/mdadm_config.h b/lib/engine/mdadm_config.h -index c94020f..e415b4f 100644 ---- a/lib/engine/mdadm_config.h -+++ b/lib/engine/mdadm_config.h -@@ -11,9 +11,7 @@ Redistribution and use in source and binary forms, with or without modification, - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __MDADM_CONFIG_H__INCLUDED__ - #define __MDADM_CONFIG_H__INCLUDED__ -diff --git a/lib/engine/multimedia_device.h b/lib/engine/multimedia_device.h -index 533370e..694e2a5 100644 ---- a/lib/engine/multimedia_device.h -+++ b/lib/engine/multimedia_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __MULTIMEDIA_DEVICE_H__INCLUDED__ - #define __MULTIMEDIA_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/nondisk_device.h b/lib/engine/nondisk_device.h -index 70ebb32..0f00e52 100644 ---- a/lib/engine/nondisk_device.h -+++ b/lib/engine/nondisk_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __CHARACTER_DEVICE_H__INCLUDED__ - #define __CHARACTER_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/object.h b/lib/engine/object.h -index b52d3d3..345d58c 100644 ---- a/lib/engine/object.h -+++ b/lib/engine/object.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __OBJECT_H__INCLUDED__ - #define __OBJECT_H__INCLUDED__ -diff --git a/lib/engine/pci_header.h b/lib/engine/pci_header.h -index 376f296..c5129a0 100644 ---- a/lib/engine/pci_header.h -+++ b/lib/engine/pci_header.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __PCI_HEADER_H__INCLUDED__ - #define __PCI_HEADER_H__INCLUDED__ -diff --git a/lib/engine/phy.h b/lib/engine/phy.h -index f5730a0..c59f7c8 100644 ---- a/lib/engine/phy.h -+++ b/lib/engine/phy.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __PHY_H__INCLUDED__ - #define __PHY_H__INCLUDED__ -diff --git a/lib/engine/port.h b/lib/engine/port.h -index 2f33876..cc48c7c 100644 ---- a/lib/engine/port.h -+++ b/lib/engine/port.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3,4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __PORT_H__INCLUDED__ - #define __PORT_H__INCLUDED__ -diff --git a/lib/engine/raid_device.h b/lib/engine/raid_device.h -index 998e80c..2174162 100644 ---- a/lib/engine/raid_device.h -+++ b/lib/engine/raid_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __RAID_DEVICE_H__INCLUDED__ - #define __RAID_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/raid_info.h b/lib/engine/raid_info.h -index 174698a..302be9b 100644 ---- a/lib/engine/raid_info.h -+++ b/lib/engine/raid_info.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __RAID_INFO_H__INCLUDED__ - #define __RAID_INFO_H__INCLUDED__ -diff --git a/lib/engine/remote_port.h b/lib/engine/remote_port.h -index c086656..4ddfee3 100644 ---- a/lib/engine/remote_port.h -+++ b/lib/engine/remote_port.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __REMOTE_PORT_H__INCLUDED__ - #define __REMOTE_PORT_H__INCLUDED__ -diff --git a/lib/engine/routing_device.h b/lib/engine/routing_device.h -index 5f857a6..284621e 100644 ---- a/lib/engine/routing_device.h -+++ b/lib/engine/routing_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ROUTING_DEVICE_H__INCLUDED__ - #define __ROUTING_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/session.h b/lib/engine/session.h -index a901d1c..3200da1 100644 ---- a/lib/engine/session.h -+++ b/lib/engine/session.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __SESSION_H__INCLUDED__ - #define __SESSION_H__INCLUDED__ -diff --git a/lib/engine/session_manager.h b/lib/engine/session_manager.h -index 7177064..87e16c3 100644 ---- a/lib/engine/session_manager.h -+++ b/lib/engine/session_manager.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __SESSION_MANAGER_H__INCLUDED__ - #define __SESSION_MANAGER_H__INCLUDED__ -diff --git a/lib/engine/storage_device.h b/lib/engine/storage_device.h -index ddeb66f..20bdab2 100644 ---- a/lib/engine/storage_device.h -+++ b/lib/engine/storage_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __STORAGE_DEVICE_H__INCLUDED__ - #define __STORAGE_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/stream_device.h b/lib/engine/stream_device.h -index 9bc111a..b29bd68 100644 ---- a/lib/engine/stream_device.h -+++ b/lib/engine/stream_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __STREAM_DEVICE_H__INCLUDED__ - #define __STREAM_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/string.h b/lib/engine/string.h -index 3007dc7..6f348c9 100644 ---- a/lib/engine/string.h -+++ b/lib/engine/string.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __STRING_H__INCLUDED__ - #define __STRING_H__INCLUDED__ -diff --git a/lib/engine/unique_id_manager.h b/lib/engine/unique_id_manager.h -index fe79eac..4a13627 100644 ---- a/lib/engine/unique_id_manager.h -+++ b/lib/engine/unique_id_manager.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __UNIQUE_ID_MANAGER_H__INCLUDED__ - #define __UNIQUE_ID_MANAGER_H__INCLUDED__ -diff --git a/lib/engine/utils.h b/lib/engine/utils.h -index 86c20cf..5525303 100644 ---- a/lib/engine/utils.h -+++ b/lib/engine/utils.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __UTILS_H__INCLUDED__ - #define __UTILS_H__INCLUDED__ -diff --git a/lib/engine/volume.h b/lib/engine/volume.h -index 9a63cbf..3347b31 100644 ---- a/lib/engine/volume.h -+++ b/lib/engine/volume.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - // Forward declarations - class Array; -diff --git a/lib/log/log.h b/lib/log/log.h -index c0bd63e..8b5f171 100644 ---- a/lib/log/log.h -+++ b/lib/log/log.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __LOG_H__INCLUDED__ - #define __LOG_H__INCLUDED__ -diff --git a/lib/mpb/machine_bytes.h b/lib/mpb/machine_bytes.h -index 7fbb0e9..800b120 100644 ---- a/lib/mpb/machine_bytes.h -+++ b/lib/mpb/machine_bytes.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ENDIAN_H__INCLUDED__ - #define __ENDIAN_H__INCLUDED__ -diff --git a/lib/mpb/mpb.h b/lib/mpb/mpb.h -index 01782af..c42cdfb 100644 ---- a/lib/mpb/mpb.h -+++ b/lib/mpb/mpb.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __MPB_H__INCLUDED__ - #define __MPB_H__INCLUDED__ -diff --git a/lib/orom/orom.h b/lib/orom/orom.h -index f76e3ee..e10311d 100644 ---- a/lib/orom/orom.h -+++ b/lib/orom/orom.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __OROM_H__INCLUDED__ - #define __OROM_H__INCLUDED__ --- -2.13.1 - diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch new file mode 100644 index 0000000000..c01c7e5ccd --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch @@ -0,0 +1,59 @@ +From 874da836bc857e5942675c59e19f4fd8ad09b13e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Aug 2019 14:08:19 -0700 +Subject: [PATCH 1/4] log: Avoid shadowing functions from std lib + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + lib/log/log.c | 2 +- + lib/log/log.h | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/log/log.c b/lib/log/log.c +index 7d8e17c..18b67a5 100644 +--- a/lib/log/log.c ++++ b/lib/log/log.c +@@ -82,7 +82,7 @@ enum log_level log_get_level(void) { + } + + /* */ +-void __log(enum log_level level, const char *message) { ++void _ssiap_log(enum log_level level, const char *message) { + struct tm tm; + struct timeval tv; + +diff --git a/lib/log/log.h b/lib/log/log.h +index d94e482..66a707b 100644 +--- a/lib/log/log.h ++++ b/lib/log/log.h +@@ -53,13 +53,13 @@ enum log_level { + }; + + /* */ +-#define log(__level, __message) \ ++#define ssiap_log(__level, __message) \ + do { if (log_get_level() >= (enum log_level)(__level)) \ +- __log(__level, __message); \ ++ _ssiap_log(__level, __message); \ + } while (0) + + #define dlog(__message) \ +- log(LOG_DEBUG, __message); ++ ssiap_log(LOG_DEBUG, __message); + + /* */ + void log_init(enum log_level level, const char *path); +@@ -68,7 +68,7 @@ void log_init(enum log_level level, const char *path); + void log_fini(void); + + /* */ +-void __log(enum log_level level, const char *message); ++void _ssiap_log(enum log_level level, const char *message); + + /* */ + enum log_level log_get_level(void); +-- +2.23.0 + diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-ssieventmonitor-ordered-comparison-between-pointers-.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-ssieventmonitor-ordered-comparison-between-pointers-.patch deleted file mode 100644 index 27df9b5de3..0000000000 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0001-ssieventmonitor-ordered-comparison-between-pointers-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ea9ecf4bf305f9509d5822b3823658a40162f43c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 25 Jul 2017 19:08:21 -0700 -Subject: [PATCH] ssieventmonitor: ordered comparison between pointers and - zero, actually with NULL - -Comparing which is large or small between a pointer and NULL -however, looks completely illogical. Ordered comparison of -two valid pointers is legit, but no pointer will be smaller -than NULL , so comparing if a pointer is larger than NULL -simply means if the pointer is not NULL. - -Fixes errors found with clang e.g. - -| ssieventmonitor.cpp:339:53: error: ordered comparison between pointer and zero ('char *' and 'int') -| if (fgets(nextline, sizeof(nextline) - 1, mdstat) < 0) { -| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tools/ssieventmonitor.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp -index f04b8f0..7a00122 100644 ---- a/tools/ssieventmonitor.cpp -+++ b/tools/ssieventmonitor.cpp -@@ -336,7 +336,7 @@ static int _read_mdstat(int fd) - if (!strncmp(line, "md", 2)) { - if (strstr(line, INACTIVE_STR)) { /* possibly container */ - char nextline[1024]; -- if (fgets(nextline, sizeof(nextline) - 1, mdstat) < 0) { -+ if (fgets(nextline, sizeof(nextline) - 1, mdstat) != (char *) NULL) { - fclose(mdstat); - return 1; - } --- -2.13.3 - diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch deleted file mode 100644 index 351301cdc3..0000000000 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 1338ee4e69c465f8f381ec3bfe5058080236edba Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 16 Jun 2017 22:08:35 -0700 -Subject: [PATCH 2/6] Convert macros into functions - -This helps in fixing the security format warnings -add -fno-builtin-log - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/engine/Makefile.am | 3 ++- - lib/log/Makefile.am | 2 ++ - lib/log/log.h | 34 +++++++++++++++++++++------------- - src/Makefile.am | 3 ++- - 4 files changed, 27 insertions(+), 15 deletions(-) - -Index: ssiapi.1.0.1/lib/engine/Makefile.am -=================================================================== ---- ssiapi.1.0.1.orig/lib/engine/Makefile.am -+++ ssiapi.1.0.1/lib/engine/Makefile.am -@@ -113,4 +113,5 @@ libengine_la_SOURCES = \ - libengine_la_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/include \ -- -I$(top_srcdir)/lib -+ -I$(top_srcdir)/lib \ -+ -fno-builtin-log -Index: ssiapi.1.0.1/lib/log/Makefile.am -=================================================================== ---- ssiapi.1.0.1.orig/lib/log/Makefile.am -+++ ssiapi.1.0.1/lib/log/Makefile.am -@@ -5,3 +5,5 @@ noinst_LTLIBRARIES = liblog.la - liblog_la_SOURCES = \ - log.c \ - log.h -+ -+liblog_la_CPPFLAGS = -fno-builtin-log -Index: ssiapi.1.0.1/lib/log/log.h -=================================================================== ---- ssiapi.1.0.1.orig/lib/log/log.h -+++ ssiapi.1.0.1/lib/log/log.h -@@ -23,7 +23,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIG - #if defined(__cplusplus) - extern "C" { - #endif /* __cplusplus */ -- -+#include <stdarg.h> - /* */ - enum log_level { - LOG_FIRST = 0, -@@ -37,26 +37,34 @@ enum log_level { - }; - - /* */ --#define log(__level, __format, ...) \ -- do { if (log_get_level() >= (enum log_level)(__level)) \ -- __log(__level, __format, ## __VA_ARGS__); \ -- } while (0) -- --#define dlog(__format, ...) \ -- log(LOG_DEBUG, __format, ## __VA_ARGS__); -+void __log(enum log_level level, const char *format, ...) -+ __attribute__((format(printf, 2, 3))); - - /* */ --void log_init(enum log_level level, const char *path); -+enum log_level log_get_level(void); - - /* */ --void log_fini(void); -- -+static inline void log(enum log_level __level, const char* __format, ...) { -+ va_list ap; -+ va_start(ap, __format); -+ do { -+ if (log_get_level() >= (enum log_level)(__level)) -+ __log(__level, __format, ap); -+ } while (0); -+ va_end(ap); -+} -+ -+static inline void dlog(const char* __format, ...) { -+ va_list ap; -+ va_start(ap, __format); -+ log(LOG_DEBUG, __format, ap); -+ va_end(ap); -+} - /* */ --void __log(enum log_level level, const char *format, ...) -- __attribute__((format(printf, 2, 3))); -+void log_init(enum log_level level, const char *path); - - /* */ --enum log_level log_get_level(void); -+void log_fini(void); - - /* */ - void log_set_level(enum log_level level); -Index: ssiapi.1.0.1/src/Makefile.am -=================================================================== ---- ssiapi.1.0.1.orig/src/Makefile.am -+++ ssiapi.1.0.1/src/Makefile.am -@@ -7,7 +7,8 @@ lib_LTLIBRARIES = libssi.la - libssi_la_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/include \ -- -I$(top_srcdir)/lib -+ -I$(top_srcdir)/lib \ -+ -fno-builtin-log - - libssi_la_LDFLAGS = \ - $(SGUTILS_LDFLAGS) \ -Index: ssiapi.1.0.1/lib/efi/Makefile.am -=================================================================== ---- ssiapi.1.0.1.orig/lib/efi/Makefile.am -+++ ssiapi.1.0.1/lib/efi/Makefile.am -@@ -5,3 +5,4 @@ noinst_LTLIBRARIES = libefi.la - libefi_la_SOURCES = \ - efi.cpp \ - efi.h -+libefi_la_CPPFLAGS = -fno-builtin-log diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch new file mode 100644 index 0000000000..390faeb77b --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch @@ -0,0 +1,56 @@ +From 01a75b23382fd042673d1f00fce708ba6c67d05a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 30 Aug 2019 13:12:54 -0700 +Subject: [PATCH] Use stangard int types + +__unitn_* are internal to GNU libc lets use portable types + +Fixes +error: unknown type name '__uint8_t' + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + lib/engine/end_device.cpp | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/lib/engine/end_device.cpp b/lib/engine/end_device.cpp +index 5a66de9..da078bf 100644 +--- a/lib/engine/end_device.cpp ++++ b/lib/engine/end_device.cpp +@@ -36,6 +36,7 @@ + #include <sys/ioctl.h> + #include <fcntl.h> + #include <linux/hdreg.h> ++#include <stdint.h> + #include <unistd.h> + #include <linux/fs.h> + #include <climits> +@@ -90,20 +91,20 @@ using boost::shared_ptr; + + struct AtaCommand + { +- __uint8_t command; +- __uint8_t obsolete1; +- __uint8_t obsolete2; +- __uint8_t transportDependent; ++ uint8_t command; ++ uint8_t obsolete1; ++ uint8_t obsolete2; ++ uint8_t transportDependent; + }; + + struct AtaIdentifyCall + { + AtaCommand command; +- __uint16_t data[256]; ++ uint16_t data[256]; + }; + + namespace { +- __uint16_t swap(__uint16_t value) ++ uint16_t swap(uint16_t value) + { + return (value >> 8) | (value << 8); + } diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch new file mode 100644 index 0000000000..aabbc04e57 --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch @@ -0,0 +1,1411 @@ +From ef90544f8df369781a6ef094330c9cfa9f0ee1e4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Aug 2019 14:09:11 -0700 +Subject: [PATCH 2/4] boost: Backport clang support + +backport headers from boost 1.59 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + lib/boost/config/compiler/clang.hpp | 272 +++++++++ + lib/boost/config/stdlib/libcpp.hpp | 80 +++ + lib/boost/cstdint.hpp | 542 ++++++++++++++++++ + .../detail/sp_counted_base_clang.hpp | 140 +++++ + 4 files changed, 1034 insertions(+) + create mode 100644 lib/boost/config/compiler/clang.hpp + create mode 100644 lib/boost/config/stdlib/libcpp.hpp + create mode 100644 lib/boost/cstdint.hpp + create mode 100644 lib/boost/smart_ptr/detail/sp_counted_base_clang.hpp + +--- /dev/null ++++ b/lib/boost/config/compiler/clang.hpp +@@ -0,0 +1,272 @@ ++ ++// (C) Copyright Douglas Gregor 2010 ++// ++// Use, modification and distribution are subject to the ++// Boost Software License, Version 1.0. (See accompanying file ++// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ++ ++// See http://www.boost.org for most recent version. ++ ++// Clang compiler setup. ++ ++#define BOOST_HAS_PRAGMA_ONCE ++ ++// Detecting `-fms-extension` compiler flag assuming that _MSC_VER defined when that flag is used. ++#if defined (_MSC_VER) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4)) ++# define BOOST_HAS_PRAGMA_DETECT_MISMATCH ++#endif ++ ++// When compiling with clang before __has_extension was defined, ++// even if one writes 'defined(__has_extension) && __has_extension(xxx)', ++// clang reports a compiler error. So the only workaround found is: ++ ++#ifndef __has_extension ++#define __has_extension __has_feature ++#endif ++ ++#if !__has_feature(cxx_exceptions) && !defined(BOOST_NO_EXCEPTIONS) ++# define BOOST_NO_EXCEPTIONS ++#endif ++ ++#if !__has_feature(cxx_rtti) && !defined(BOOST_NO_RTTI) ++# define BOOST_NO_RTTI ++#endif ++ ++#if !__has_feature(cxx_rtti) && !defined(BOOST_NO_TYPEID) ++# define BOOST_NO_TYPEID ++#endif ++ ++#if defined(__int64) && !defined(__GNUC__) ++# define BOOST_HAS_MS_INT64 ++#endif ++ ++#define BOOST_HAS_NRVO ++ ++// Branch prediction hints ++#if defined(__has_builtin) ++#if __has_builtin(__builtin_expect) ++#define BOOST_LIKELY(x) __builtin_expect(x, 1) ++#define BOOST_UNLIKELY(x) __builtin_expect(x, 0) ++#endif ++#endif ++ ++// Clang supports "long long" in all compilation modes. ++#define BOOST_HAS_LONG_LONG ++ ++// ++// We disable this if the compiler is really nvcc as it ++// doesn't actually support __int128 as of CUDA_VERSION=5000 ++// even though it defines __SIZEOF_INT128__. ++// See https://svn.boost.org/trac/boost/ticket/10418 ++// Only re-enable this for nvcc if you're absolutely sure ++// of the circumstances under which it's supported: ++// ++#if defined(__SIZEOF_INT128__) && !defined(__CUDACC__) ++# define BOOST_HAS_INT128 ++#endif ++ ++ ++// ++// Dynamic shared object (DSO) and dynamic-link library (DLL) support ++// ++#if !defined(_WIN32) && !defined(__WIN32__) && !defined(WIN32) ++# define BOOST_SYMBOL_EXPORT __attribute__((__visibility__("default"))) ++# define BOOST_SYMBOL_IMPORT ++# define BOOST_SYMBOL_VISIBLE __attribute__((__visibility__("default"))) ++#endif ++ ++// ++// The BOOST_FALLTHROUGH macro can be used to annotate implicit fall-through ++// between switch labels. ++// ++#if __cplusplus >= 201103L && defined(__has_warning) ++# if __has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough") ++# define BOOST_FALLTHROUGH [[clang::fallthrough]] ++# endif ++#endif ++ ++#if !__has_feature(cxx_auto_type) ++# define BOOST_NO_CXX11_AUTO_DECLARATIONS ++# define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS ++#endif ++ ++// ++// Currently clang on Windows using VC++ RTL does not support C++11's char16_t or char32_t ++// ++#if defined(_MSC_VER) || !(defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L) ++# define BOOST_NO_CXX11_CHAR16_T ++# define BOOST_NO_CXX11_CHAR32_T ++#endif ++ ++#if !__has_feature(cxx_constexpr) ++# define BOOST_NO_CXX11_CONSTEXPR ++#endif ++ ++#if !__has_feature(cxx_decltype) ++# define BOOST_NO_CXX11_DECLTYPE ++#endif ++ ++#if !__has_feature(cxx_decltype_incomplete_return_types) ++# define BOOST_NO_CXX11_DECLTYPE_N3276 ++#endif ++ ++#if !__has_feature(cxx_defaulted_functions) ++# define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS ++#endif ++ ++#if !__has_feature(cxx_deleted_functions) ++# define BOOST_NO_CXX11_DELETED_FUNCTIONS ++#endif ++ ++#if !__has_feature(cxx_explicit_conversions) ++# define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS ++#endif ++ ++#if !__has_feature(cxx_default_function_template_args) ++# define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS ++#endif ++ ++#if !__has_feature(cxx_generalized_initializers) ++# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST ++#endif ++ ++#if !__has_feature(cxx_lambdas) ++# define BOOST_NO_CXX11_LAMBDAS ++#endif ++ ++#if !__has_feature(cxx_local_type_template_args) ++# define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS ++#endif ++ ++#if !__has_feature(cxx_noexcept) ++# define BOOST_NO_CXX11_NOEXCEPT ++#endif ++ ++#if !__has_feature(cxx_nullptr) ++# define BOOST_NO_CXX11_NULLPTR ++#endif ++ ++#if !__has_feature(cxx_range_for) ++# define BOOST_NO_CXX11_RANGE_BASED_FOR ++#endif ++ ++#if !__has_feature(cxx_raw_string_literals) ++# define BOOST_NO_CXX11_RAW_LITERALS ++#endif ++ ++#if !__has_feature(cxx_reference_qualified_functions) ++# define BOOST_NO_CXX11_REF_QUALIFIERS ++#endif ++ ++#if !__has_feature(cxx_generalized_initializers) ++# define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX ++#endif ++ ++#if !__has_feature(cxx_rvalue_references) ++# define BOOST_NO_CXX11_RVALUE_REFERENCES ++#endif ++ ++#if !__has_feature(cxx_strong_enums) ++# define BOOST_NO_CXX11_SCOPED_ENUMS ++#endif ++ ++#if !__has_feature(cxx_static_assert) ++# define BOOST_NO_CXX11_STATIC_ASSERT ++#endif ++ ++#if !__has_feature(cxx_alias_templates) ++# define BOOST_NO_CXX11_TEMPLATE_ALIASES ++#endif ++ ++#if !__has_feature(cxx_unicode_literals) ++# define BOOST_NO_CXX11_UNICODE_LITERALS ++#endif ++ ++#if !__has_feature(cxx_variadic_templates) ++# define BOOST_NO_CXX11_VARIADIC_TEMPLATES ++#endif ++ ++#if !__has_feature(cxx_user_literals) ++# define BOOST_NO_CXX11_USER_DEFINED_LITERALS ++#endif ++ ++#if !__has_feature(cxx_alignas) ++# define BOOST_NO_CXX11_ALIGNAS ++#endif ++ ++#if !__has_feature(cxx_trailing_return) ++# define BOOST_NO_CXX11_TRAILING_RESULT_TYPES ++#endif ++ ++#if !__has_feature(cxx_inline_namespaces) ++# define BOOST_NO_CXX11_INLINE_NAMESPACES ++#endif ++ ++#if !__has_feature(cxx_override_control) ++# define BOOST_NO_CXX11_FINAL ++#endif ++ ++#if !(__has_feature(__cxx_binary_literals__) || __has_extension(__cxx_binary_literals__)) ++# define BOOST_NO_CXX14_BINARY_LITERALS ++#endif ++ ++#if !__has_feature(__cxx_decltype_auto__) ++# define BOOST_NO_CXX14_DECLTYPE_AUTO ++#endif ++ ++#if !__has_feature(__cxx_aggregate_nsdmi__) ++# define BOOST_NO_CXX14_AGGREGATE_NSDMI ++#endif ++ ++#if !__has_feature(__cxx_init_captures__) ++# define BOOST_NO_CXX14_INITIALIZED_LAMBDA_CAPTURES ++#endif ++ ++#if !__has_feature(__cxx_generic_lambdas__) ++# define BOOST_NO_CXX14_GENERIC_LAMBDAS ++#endif ++ ++// clang < 3.5 has a defect with dependent type, like following. ++// ++// template <class T> ++// constexpr typename enable_if<pred<T> >::type foo(T &) ++// { } // error: no return statement in constexpr function ++// ++// This issue also affects C++11 mode, but C++11 constexpr requires return stmt. ++// Therefore we don't care such case. ++// ++// Note that we can't check Clang version directly as the numbering system changes depending who's ++// creating the Clang release (see https://github.com/boostorg/config/pull/39#issuecomment-59927873) ++// so instead verify that we have a feature that was introduced at the same time as working C++14 ++// constexpr (generic lambda's in this case): ++// ++#if !__has_feature(__cxx_generic_lambdas__) || !__has_feature(__cxx_relaxed_constexpr__) ++# define BOOST_NO_CXX14_CONSTEXPR ++#endif ++ ++#if !__has_feature(__cxx_return_type_deduction__) ++# define BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION ++#endif ++ ++#if !__has_feature(__cxx_variable_templates__) ++# define BOOST_NO_CXX14_VARIABLE_TEMPLATES ++#endif ++ ++#if __cplusplus < 201400 ++// All versions with __cplusplus above this value seem to support this: ++# define BOOST_NO_CXX14_DIGIT_SEPARATORS ++#endif ++ ++ ++// Unused attribute: ++#if defined(__GNUC__) && (__GNUC__ >= 4) ++# define BOOST_ATTRIBUTE_UNUSED __attribute__((unused)) ++#endif ++ ++#ifndef BOOST_COMPILER ++# define BOOST_COMPILER "Clang version " __clang_version__ ++#endif ++ ++// Macro used to identify the Clang compiler. ++#define BOOST_CLANG 1 ++ +--- /dev/null ++++ b/lib/boost/config/stdlib/libcpp.hpp +@@ -0,0 +1,80 @@ ++// (C) Copyright Christopher Jefferson 2011. ++// Use, modification and distribution are subject to the ++// Boost Software License, Version 1.0. (See accompanying file ++// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ++ ++// See http://www.boost.org for most recent version. ++ ++// config for libc++ ++// Might need more in here later. ++ ++#if !defined(_LIBCPP_VERSION) ++# include <ciso646> ++# if !defined(_LIBCPP_VERSION) ++# error "This is not libc++!" ++# endif ++#endif ++ ++#define BOOST_STDLIB "libc++ version " BOOST_STRINGIZE(_LIBCPP_VERSION) ++ ++#define BOOST_HAS_THREADS ++ ++#ifdef _LIBCPP_HAS_NO_VARIADICS ++# define BOOST_NO_CXX11_HDR_TUPLE ++#endif ++ ++// BOOST_NO_CXX11_ALLOCATOR should imply no support for the C++11 ++// allocator model. The C++11 allocator model requires a conforming ++// std::allocator_traits which is only possible with C++11 template ++// aliases since members rebind_alloc and rebind_traits require it. ++#if defined(_LIBCPP_HAS_NO_TEMPLATE_ALIASES) ++# define BOOST_NO_CXX11_ALLOCATOR ++#endif ++ ++#if __cplusplus < 201103 ++# define BOOST_NO_CXX11_HDR_ARRAY ++# define BOOST_NO_CXX11_HDR_CODECVT ++# define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE ++# define BOOST_NO_CXX11_HDR_FORWARD_LIST ++# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST ++# define BOOST_NO_CXX11_HDR_MUTEX ++# define BOOST_NO_CXX11_HDR_RANDOM ++# define BOOST_NO_CXX11_HDR_RATIO ++# define BOOST_NO_CXX11_HDR_REGEX ++# define BOOST_NO_CXX11_HDR_SYSTEM_ERROR ++# define BOOST_NO_CXX11_HDR_THREAD ++# define BOOST_NO_CXX11_HDR_TUPLE ++# define BOOST_NO_CXX11_HDR_TYPEINDEX ++# define BOOST_NO_CXX11_HDR_UNORDERED_MAP ++# define BOOST_NO_CXX11_HDR_UNORDERED_SET ++# define BOOST_NO_CXX11_NUMERIC_LIMITS ++# define BOOST_NO_CXX11_ALLOCATOR ++# define BOOST_NO_CXX11_SMART_PTR ++# define BOOST_NO_CXX11_HDR_FUNCTIONAL ++# define BOOST_NO_CXX11_STD_ALIGN ++# define BOOST_NO_CXX11_ADDRESSOF ++#endif ++ ++// ++// These appear to be unusable/incomplete so far: ++// ++# define BOOST_NO_CXX11_HDR_CHRONO ++# define BOOST_NO_CXX11_HDR_FUTURE ++# define BOOST_NO_CXX11_HDR_TYPE_TRAITS ++# define BOOST_NO_CXX11_ATOMIC_SMART_PTR ++# define BOOST_NO_CXX11_HDR_ATOMIC ++ ++// libc++ uses a non-standard messages_base ++#define BOOST_NO_STD_MESSAGES ++ ++#if defined(__has_include) ++#if !__has_include(<shared_mutex>) ++# define BOOST_NO_CXX14_HDR_SHARED_MUTEX ++#elif __cplusplus <= 201103 ++# define BOOST_NO_CXX14_HDR_SHARED_MUTEX ++#endif ++#elif __cplusplus < 201402 ++# define BOOST_NO_CXX14_HDR_SHARED_MUTEX ++#endif ++ ++// --- end --- +--- /dev/null ++++ b/lib/boost/cstdint.hpp +@@ -0,0 +1,542 @@ ++// boost cstdint.hpp header file ------------------------------------------// ++ ++// (C) Copyright Beman Dawes 1999. ++// (C) Copyright Jens Mauer 2001 ++// (C) Copyright John Maddock 2001 ++// Distributed under the Boost ++// Software License, Version 1.0. (See accompanying file ++// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ++ ++// See http://www.boost.org/libs/integer for documentation. ++ ++// Revision History ++// 31 Oct 01 use BOOST_HAS_LONG_LONG to check for "long long" (Jens M.) ++// 16 Apr 01 check LONGLONG_MAX when looking for "long long" (Jens Maurer) ++// 23 Jan 01 prefer "long" over "int" for int32_t and intmax_t (Jens Maurer) ++// 12 Nov 00 Merged <boost/stdint.h> (Jens Maurer) ++// 23 Sep 00 Added INTXX_C macro support (John Maddock). ++// 22 Sep 00 Better 64-bit support (John Maddock) ++// 29 Jun 00 Reimplement to avoid including stdint.h within namespace boost ++// 8 Aug 99 Initial version (Beman Dawes) ++ ++ ++#ifndef BOOST_CSTDINT_HPP ++#define BOOST_CSTDINT_HPP ++ ++// ++// Since we always define the INT#_C macros as per C++0x, ++// define __STDC_CONSTANT_MACROS so that <stdint.h> does the right ++// thing if possible, and so that the user knows that the macros ++// are actually defined as per C99. ++// ++#ifndef __STDC_CONSTANT_MACROS ++# define __STDC_CONSTANT_MACROS ++#endif ++ ++#include <boost/config.hpp> ++ ++// ++// Note that GLIBC is a bit inconsistent about whether int64_t is defined or not ++// depending upon what headers happen to have been included first... ++// so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG. ++// See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990 ++// ++#if defined(BOOST_HAS_STDINT_H) \ ++ && (!defined(__GLIBC__) \ ++ || defined(__GLIBC_HAVE_LONG_LONG) \ ++ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17))))) ++ ++// The following #include is an implementation artifact; not part of interface. ++# ifdef __hpux ++// HP-UX has a vaguely nice <stdint.h> in a non-standard location ++# include <inttypes.h> ++# ifdef __STDC_32_MODE__ ++ // this is triggered with GCC, because it defines __cplusplus < 199707L ++# define BOOST_NO_INT64_T ++# endif ++# elif defined(__FreeBSD__) || defined(__IBMCPP__) || defined(_AIX) ++# include <inttypes.h> ++# else ++# include <stdint.h> ++ ++// There is a bug in Cygwin two _C macros ++# if defined(__STDC_CONSTANT_MACROS) && defined(__CYGWIN__) ++# undef INTMAX_C ++# undef UINTMAX_C ++# define INTMAX_C(c) c##LL ++# define UINTMAX_C(c) c##ULL ++# endif ++ ++# endif ++ ++#ifdef __QNX__ ++ ++// QNX (Dinkumware stdlib) defines these as non-standard names. ++// Reflect to the standard names. ++ ++typedef ::intleast8_t int_least8_t; ++typedef ::intfast8_t int_fast8_t; ++typedef ::uintleast8_t uint_least8_t; ++typedef ::uintfast8_t uint_fast8_t; ++ ++typedef ::intleast16_t int_least16_t; ++typedef ::intfast16_t int_fast16_t; ++typedef ::uintleast16_t uint_least16_t; ++typedef ::uintfast16_t uint_fast16_t; ++ ++typedef ::intleast32_t int_least32_t; ++typedef ::intfast32_t int_fast32_t; ++typedef ::uintleast32_t uint_least32_t; ++typedef ::uintfast32_t uint_fast32_t; ++ ++# ifndef BOOST_NO_INT64_T ++ ++typedef ::intleast64_t int_least64_t; ++typedef ::intfast64_t int_fast64_t; ++typedef ::uintleast64_t uint_least64_t; ++typedef ::uintfast64_t uint_fast64_t; ++ ++# endif ++ ++#endif ++ ++namespace boost ++{ ++ ++ using ::int8_t; ++ using ::int_least8_t; ++ using ::int_fast8_t; ++ using ::uint8_t; ++ using ::uint_least8_t; ++ using ::uint_fast8_t; ++ ++ using ::int16_t; ++ using ::int_least16_t; ++ using ::int_fast16_t; ++ using ::uint16_t; ++ using ::uint_least16_t; ++ using ::uint_fast16_t; ++ ++ using ::int32_t; ++ using ::int_least32_t; ++ using ::int_fast32_t; ++ using ::uint32_t; ++ using ::uint_least32_t; ++ using ::uint_fast32_t; ++ ++# ifndef BOOST_NO_INT64_T ++ ++ using ::int64_t; ++ using ::int_least64_t; ++ using ::int_fast64_t; ++ using ::uint64_t; ++ using ::uint_least64_t; ++ using ::uint_fast64_t; ++ ++# endif ++ ++ using ::intmax_t; ++ using ::uintmax_t; ++ ++} // namespace boost ++ ++#elif defined(__FreeBSD__) && (__FreeBSD__ <= 4) || defined(__osf__) || defined(__VMS) || defined(__SOLARIS9__) || defined(__NetBSD__) ++// FreeBSD and Tru64 have an <inttypes.h> that contains much of what we need. ++# include <inttypes.h> ++ ++namespace boost { ++ ++ using ::int8_t; ++ typedef int8_t int_least8_t; ++ typedef int8_t int_fast8_t; ++ using ::uint8_t; ++ typedef uint8_t uint_least8_t; ++ typedef uint8_t uint_fast8_t; ++ ++ using ::int16_t; ++ typedef int16_t int_least16_t; ++ typedef int16_t int_fast16_t; ++ using ::uint16_t; ++ typedef uint16_t uint_least16_t; ++ typedef uint16_t uint_fast16_t; ++ ++ using ::int32_t; ++ typedef int32_t int_least32_t; ++ typedef int32_t int_fast32_t; ++ using ::uint32_t; ++ typedef uint32_t uint_least32_t; ++ typedef uint32_t uint_fast32_t; ++ ++# ifndef BOOST_NO_INT64_T ++ ++ using ::int64_t; ++ typedef int64_t int_least64_t; ++ typedef int64_t int_fast64_t; ++ using ::uint64_t; ++ typedef uint64_t uint_least64_t; ++ typedef uint64_t uint_fast64_t; ++ ++ typedef int64_t intmax_t; ++ typedef uint64_t uintmax_t; ++ ++# else ++ ++ typedef int32_t intmax_t; ++ typedef uint32_t uintmax_t; ++ ++# endif ++ ++} // namespace boost ++ ++#else // BOOST_HAS_STDINT_H ++ ++# include <boost/limits.hpp> // implementation artifact; not part of interface ++# include <limits.h> // needed for limits macros ++ ++ ++namespace boost ++{ ++ ++// These are fairly safe guesses for some 16-bit, and most 32-bit and 64-bit ++// platforms. For other systems, they will have to be hand tailored. ++// ++// Because the fast types are assumed to be the same as the undecorated types, ++// it may be possible to hand tailor a more efficient implementation. Such ++// an optimization may be illusionary; on the Intel x86-family 386 on, for ++// example, byte arithmetic and load/stores are as fast as "int" sized ones. ++ ++// 8-bit types ------------------------------------------------------------// ++ ++# if UCHAR_MAX == 0xff ++ typedef signed char int8_t; ++ typedef signed char int_least8_t; ++ typedef signed char int_fast8_t; ++ typedef unsigned char uint8_t; ++ typedef unsigned char uint_least8_t; ++ typedef unsigned char uint_fast8_t; ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++ ++// 16-bit types -----------------------------------------------------------// ++ ++# if USHRT_MAX == 0xffff ++# if defined(__crayx1) ++ // The Cray X1 has a 16-bit short, however it is not recommend ++ // for use in performance critical code. ++ typedef short int16_t; ++ typedef short int_least16_t; ++ typedef int int_fast16_t; ++ typedef unsigned short uint16_t; ++ typedef unsigned short uint_least16_t; ++ typedef unsigned int uint_fast16_t; ++# else ++ typedef short int16_t; ++ typedef short int_least16_t; ++ typedef short int_fast16_t; ++ typedef unsigned short uint16_t; ++ typedef unsigned short uint_least16_t; ++ typedef unsigned short uint_fast16_t; ++# endif ++# elif (USHRT_MAX == 0xffffffff) && defined(__MTA__) ++ // On MTA / XMT short is 32 bits unless the -short16 compiler flag is specified ++ // MTA / XMT does support the following non-standard integer types ++ typedef __short16 int16_t; ++ typedef __short16 int_least16_t; ++ typedef __short16 int_fast16_t; ++ typedef unsigned __short16 uint16_t; ++ typedef unsigned __short16 uint_least16_t; ++ typedef unsigned __short16 uint_fast16_t; ++# elif (USHRT_MAX == 0xffffffff) && defined(CRAY) ++ // no 16-bit types on Cray: ++ typedef short int_least16_t; ++ typedef short int_fast16_t; ++ typedef unsigned short uint_least16_t; ++ typedef unsigned short uint_fast16_t; ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++ ++// 32-bit types -----------------------------------------------------------// ++ ++# if UINT_MAX == 0xffffffff ++ typedef int int32_t; ++ typedef int int_least32_t; ++ typedef int int_fast32_t; ++ typedef unsigned int uint32_t; ++ typedef unsigned int uint_least32_t; ++ typedef unsigned int uint_fast32_t; ++# elif (USHRT_MAX == 0xffffffff) ++ typedef short int32_t; ++ typedef short int_least32_t; ++ typedef short int_fast32_t; ++ typedef unsigned short uint32_t; ++ typedef unsigned short uint_least32_t; ++ typedef unsigned short uint_fast32_t; ++# elif ULONG_MAX == 0xffffffff ++ typedef long int32_t; ++ typedef long int_least32_t; ++ typedef long int_fast32_t; ++ typedef unsigned long uint32_t; ++ typedef unsigned long uint_least32_t; ++ typedef unsigned long uint_fast32_t; ++# elif (UINT_MAX == 0xffffffffffffffff) && defined(__MTA__) ++ // Integers are 64 bits on the MTA / XMT ++ typedef __int32 int32_t; ++ typedef __int32 int_least32_t; ++ typedef __int32 int_fast32_t; ++ typedef unsigned __int32 uint32_t; ++ typedef unsigned __int32 uint_least32_t; ++ typedef unsigned __int32 uint_fast32_t; ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++ ++// 64-bit types + intmax_t and uintmax_t ----------------------------------// ++ ++# if defined(BOOST_HAS_LONG_LONG) && \ ++ !defined(BOOST_MSVC) && !defined(__BORLANDC__) && \ ++ (!defined(__GLIBCPP__) || defined(_GLIBCPP_USE_LONG_LONG)) && \ ++ (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX)) ++# if defined(__hpux) ++ // HP-UX's value of ULONG_LONG_MAX is unusable in preprocessor expressions ++# elif (defined(ULLONG_MAX) && ULLONG_MAX == 18446744073709551615ULL) || (defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 18446744073709551615ULL) || (defined(ULONGLONG_MAX) && ULONGLONG_MAX == 18446744073709551615ULL) ++ // 2**64 - 1 ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++ ++ typedef ::boost::long_long_type intmax_t; ++ typedef ::boost::ulong_long_type uintmax_t; ++ typedef ::boost::long_long_type int64_t; ++ typedef ::boost::long_long_type int_least64_t; ++ typedef ::boost::long_long_type int_fast64_t; ++ typedef ::boost::ulong_long_type uint64_t; ++ typedef ::boost::ulong_long_type uint_least64_t; ++ typedef ::boost::ulong_long_type uint_fast64_t; ++ ++# elif ULONG_MAX != 0xffffffff ++ ++# if ULONG_MAX == 18446744073709551615 // 2**64 - 1 ++ typedef long intmax_t; ++ typedef unsigned long uintmax_t; ++ typedef long int64_t; ++ typedef long int_least64_t; ++ typedef long int_fast64_t; ++ typedef unsigned long uint64_t; ++ typedef unsigned long uint_least64_t; ++ typedef unsigned long uint_fast64_t; ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++# elif defined(__GNUC__) && defined(BOOST_HAS_LONG_LONG) ++ __extension__ typedef long long intmax_t; ++ __extension__ typedef unsigned long long uintmax_t; ++ __extension__ typedef long long int64_t; ++ __extension__ typedef long long int_least64_t; ++ __extension__ typedef long long int_fast64_t; ++ __extension__ typedef unsigned long long uint64_t; ++ __extension__ typedef unsigned long long uint_least64_t; ++ __extension__ typedef unsigned long long uint_fast64_t; ++# elif defined(BOOST_HAS_MS_INT64) ++ // ++ // we have Borland/Intel/Microsoft __int64: ++ // ++ typedef __int64 intmax_t; ++ typedef unsigned __int64 uintmax_t; ++ typedef __int64 int64_t; ++ typedef __int64 int_least64_t; ++ typedef __int64 int_fast64_t; ++ typedef unsigned __int64 uint64_t; ++ typedef unsigned __int64 uint_least64_t; ++ typedef unsigned __int64 uint_fast64_t; ++# else // assume no 64-bit integers ++# define BOOST_NO_INT64_T ++ typedef int32_t intmax_t; ++ typedef uint32_t uintmax_t; ++# endif ++ ++} // namespace boost ++ ++ ++#endif // BOOST_HAS_STDINT_H ++ ++// intptr_t/uintptr_t are defined separately because they are optional and not universally available ++#if defined(BOOST_WINDOWS) && !defined(_WIN32_WCE) && !defined(BOOST_HAS_STDINT_H) ++// Older MSVC don't have stdint.h and have intptr_t/uintptr_t defined in stddef.h ++#include <stddef.h> ++#endif ++ ++// PGI seems to not support intptr_t/uintptr_t properly. BOOST_HAS_STDINT_H is not defined for this compiler by Boost.Config. ++#if !defined(__PGIC__) ++ ++#if (defined(BOOST_WINDOWS) && !defined(_WIN32_WCE)) \ ++ || (defined(_XOPEN_UNIX) && (_XOPEN_UNIX+0 > 0) && !defined(__UCLIBC__)) \ ++ || defined(__CYGWIN__) \ ++ || defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ ++ || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(sun) ++ ++namespace boost { ++ using ::intptr_t; ++ using ::uintptr_t; ++} ++#define BOOST_HAS_INTPTR_T ++ ++// Clang pretends to be GCC, so it'll match this condition ++#elif defined(__GNUC__) && defined(__INTPTR_TYPE__) && defined(__UINTPTR_TYPE__) ++ ++namespace boost { ++ typedef __INTPTR_TYPE__ intptr_t; ++ typedef __UINTPTR_TYPE__ uintptr_t; ++} ++#define BOOST_HAS_INTPTR_T ++ ++#endif ++ ++#endif // !defined(__PGIC__) ++ ++#endif // BOOST_CSTDINT_HPP ++ ++ ++/**************************************************** ++ ++Macro definition section: ++ ++Added 23rd September 2000 (John Maddock). ++Modified 11th September 2001 to be excluded when ++BOOST_HAS_STDINT_H is defined (John Maddock). ++Modified 11th Dec 2009 to always define the ++INT#_C macros if they're not already defined (John Maddock). ++ ++******************************************************/ ++ ++#if !defined(BOOST__STDC_CONSTANT_MACROS_DEFINED) && \ ++ (!defined(INT8_C) || !defined(INT16_C) || !defined(INT32_C) || !defined(INT64_C)) ++// ++// For the following code we get several warnings along the lines of: ++// ++// boost/cstdint.hpp:428:35: error: use of C99 long long integer constant ++// ++// So we declare this a system header to suppress these warnings. ++// ++#if defined(__GNUC__) && (__GNUC__ >= 4) ++#pragma GCC system_header ++#endif ++ ++#include <limits.h> ++# define BOOST__STDC_CONSTANT_MACROS_DEFINED ++# if defined(BOOST_HAS_MS_INT64) ++// ++// Borland/Intel/Microsoft compilers have width specific suffixes: ++// ++#ifndef INT8_C ++# define INT8_C(value) value##i8 ++#endif ++#ifndef INT16_C ++# define INT16_C(value) value##i16 ++#endif ++#ifndef INT32_C ++# define INT32_C(value) value##i32 ++#endif ++#ifndef INT64_C ++# define INT64_C(value) value##i64 ++#endif ++# ifdef __BORLANDC__ ++ // Borland bug: appending ui8 makes the type a signed char ++# define UINT8_C(value) static_cast<unsigned char>(value##u) ++# else ++# define UINT8_C(value) value##ui8 ++# endif ++#ifndef UINT16_C ++# define UINT16_C(value) value##ui16 ++#endif ++#ifndef UINT32_C ++# define UINT32_C(value) value##ui32 ++#endif ++#ifndef UINT64_C ++# define UINT64_C(value) value##ui64 ++#endif ++#ifndef INTMAX_C ++# define INTMAX_C(value) value##i64 ++# define UINTMAX_C(value) value##ui64 ++#endif ++ ++# else ++// do it the old fashioned way: ++ ++// 8-bit types ------------------------------------------------------------// ++ ++# if (UCHAR_MAX == 0xff) && !defined(INT8_C) ++# define INT8_C(value) static_cast<boost::int8_t>(value) ++# define UINT8_C(value) static_cast<boost::uint8_t>(value##u) ++# endif ++ ++// 16-bit types -----------------------------------------------------------// ++ ++# if (USHRT_MAX == 0xffff) && !defined(INT16_C) ++# define INT16_C(value) static_cast<boost::int16_t>(value) ++# define UINT16_C(value) static_cast<boost::uint16_t>(value##u) ++# endif ++ ++// 32-bit types -----------------------------------------------------------// ++#ifndef INT32_C ++# if (UINT_MAX == 0xffffffff) ++# define INT32_C(value) value ++# define UINT32_C(value) value##u ++# elif ULONG_MAX == 0xffffffff ++# define INT32_C(value) value##L ++# define UINT32_C(value) value##uL ++# endif ++#endif ++ ++// 64-bit types + intmax_t and uintmax_t ----------------------------------// ++#ifndef INT64_C ++# if defined(BOOST_HAS_LONG_LONG) && \ ++ (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX) || defined(_ULLONG_MAX) || defined(_LLONG_MAX)) ++ ++# if defined(__hpux) ++ // HP-UX's value of ULONG_LONG_MAX is unusable in preprocessor expressions ++# define INT64_C(value) value##LL ++# define UINT64_C(value) value##uLL ++# elif (defined(ULLONG_MAX) && ULLONG_MAX == 18446744073709551615ULL) || \ ++ (defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 18446744073709551615ULL) || \ ++ (defined(ULONGLONG_MAX) && ULONGLONG_MAX == 18446744073709551615ULL) || \ ++ (defined(_ULLONG_MAX) && _ULLONG_MAX == 18446744073709551615ULL) || \ ++ (defined(_LLONG_MAX) && _LLONG_MAX == 9223372036854775807LL) ++ ++# define INT64_C(value) value##LL ++# define UINT64_C(value) value##uLL ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++# elif ULONG_MAX != 0xffffffff ++ ++# if ULONG_MAX == 18446744073709551615U // 2**64 - 1 ++# define INT64_C(value) value##L ++# define UINT64_C(value) value##uL ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++# elif defined(BOOST_HAS_LONG_LONG) ++ // Usual macros not defined, work things out for ourselves: ++# if(~0uLL == 18446744073709551615ULL) ++# define INT64_C(value) value##LL ++# define UINT64_C(value) value##uLL ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++ ++# ifdef BOOST_NO_INT64_T ++# define INTMAX_C(value) INT32_C(value) ++# define UINTMAX_C(value) UINT32_C(value) ++# else ++# define INTMAX_C(value) INT64_C(value) ++# define UINTMAX_C(value) UINT64_C(value) ++# endif ++#endif ++# endif // Borland/Microsoft specific width suffixes ++ ++#endif // INT#_C macros. +--- /dev/null ++++ b/lib/boost/smart_ptr/detail/sp_counted_base_clang.hpp +@@ -0,0 +1,140 @@ ++#ifndef BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_CLANG_HPP_INCLUDED ++#define BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_CLANG_HPP_INCLUDED ++ ++// MS compatible compilers support #pragma once ++ ++#if defined(_MSC_VER) && (_MSC_VER >= 1020) ++# pragma once ++#endif ++ ++// detail/sp_counted_base_clang.hpp - __c11 clang intrinsics ++// ++// Copyright (c) 2007, 2013, 2015 Peter Dimov ++// ++// Distributed under the Boost Software License, Version 1.0. ++// See accompanying file LICENSE_1_0.txt or copy at ++// http://www.boost.org/LICENSE_1_0.txt ++ ++#include <boost/detail/sp_typeinfo.hpp> ++#include <boost/cstdint.hpp> ++ ++namespace boost ++{ ++ ++namespace detail ++{ ++ ++typedef _Atomic( boost::int_least32_t ) atomic_int_least32_t; ++ ++inline void atomic_increment( atomic_int_least32_t * pw ) ++{ ++ __c11_atomic_fetch_add( pw, 1, __ATOMIC_RELAXED ); ++} ++ ++inline boost::int_least32_t atomic_decrement( atomic_int_least32_t * pw ) ++{ ++ return __c11_atomic_fetch_sub( pw, 1, __ATOMIC_ACQ_REL ); ++} ++ ++inline boost::int_least32_t atomic_conditional_increment( atomic_int_least32_t * pw ) ++{ ++ // long r = *pw; ++ // if( r != 0 ) ++*pw; ++ // return r; ++ ++ boost::int_least32_t r = __c11_atomic_load( pw, __ATOMIC_RELAXED ); ++ ++ for( ;; ) ++ { ++ if( r == 0 ) ++ { ++ return r; ++ } ++ ++ if( __c11_atomic_compare_exchange_weak( pw, &r, r + 1, __ATOMIC_RELAXED, __ATOMIC_RELAXED ) ) ++ { ++ return r; ++ } ++ } ++} ++ ++class sp_counted_base ++{ ++private: ++ ++ sp_counted_base( sp_counted_base const & ); ++ sp_counted_base & operator= ( sp_counted_base const & ); ++ ++ atomic_int_least32_t use_count_; // #shared ++ atomic_int_least32_t weak_count_; // #weak + (#shared != 0) ++ ++public: ++ ++ sp_counted_base() ++ { ++ __c11_atomic_init( &use_count_, 1 ); ++ __c11_atomic_init( &weak_count_, 1 ); ++ } ++ ++ virtual ~sp_counted_base() // nothrow ++ { ++ } ++ ++ // dispose() is called when use_count_ drops to zero, to release ++ // the resources managed by *this. ++ ++ virtual void dispose() = 0; // nothrow ++ ++ // destroy() is called when weak_count_ drops to zero. ++ ++ virtual void destroy() // nothrow ++ { ++ delete this; ++ } ++ ++ virtual void * get_deleter( sp_typeinfo const & ti ) = 0; ++ virtual void * get_untyped_deleter() = 0; ++ ++ void add_ref_copy() ++ { ++ atomic_increment( &use_count_ ); ++ } ++ ++ bool add_ref_lock() // true on success ++ { ++ return atomic_conditional_increment( &use_count_ ) != 0; ++ } ++ ++ void release() // nothrow ++ { ++ if( atomic_decrement( &use_count_ ) == 1 ) ++ { ++ dispose(); ++ weak_release(); ++ } ++ } ++ ++ void weak_add_ref() // nothrow ++ { ++ atomic_increment( &weak_count_ ); ++ } ++ ++ void weak_release() // nothrow ++ { ++ if( atomic_decrement( &weak_count_ ) == 1 ) ++ { ++ destroy(); ++ } ++ } ++ ++ long use_count() const // nothrow ++ { ++ return __c11_atomic_load( const_cast< atomic_int_least32_t* >( &use_count_ ), __ATOMIC_ACQUIRE ); ++ } ++}; ++ ++} // namespace detail ++ ++} // namespace boost ++ ++#endif // #ifndef BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_CLANG_HPP_INCLUDED +--- /dev/null ++++ b/lib/boost/smart_ptr/detail/sp_counted_base_sync.hpp +@@ -0,0 +1,156 @@ ++#ifndef BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_SYNC_HPP_INCLUDED ++#define BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_SYNC_HPP_INCLUDED ++ ++// MS compatible compilers support #pragma once ++ ++#if defined(_MSC_VER) && (_MSC_VER >= 1020) ++# pragma once ++#endif ++ ++// detail/sp_counted_base_sync.hpp - g++ 4.1+ __sync intrinsics ++// ++// Copyright (c) 2007 Peter Dimov ++// ++// Distributed under the Boost Software License, Version 1.0. ++// See accompanying file LICENSE_1_0.txt or copy at ++// http://www.boost.org/LICENSE_1_0.txt ++ ++#include <boost/detail/sp_typeinfo.hpp> ++#include <limits.h> ++ ++#if defined( __ia64__ ) && defined( __INTEL_COMPILER ) ++# include <ia64intrin.h> ++#endif ++ ++namespace boost ++{ ++ ++namespace detail ++{ ++ ++#if INT_MAX >= 2147483647 ++ ++typedef int sp_int32_t; ++ ++#else ++ ++typedef long sp_int32_t; ++ ++#endif ++ ++inline void atomic_increment( sp_int32_t * pw ) ++{ ++ __sync_fetch_and_add( pw, 1 ); ++} ++ ++inline sp_int32_t atomic_decrement( sp_int32_t * pw ) ++{ ++ return __sync_fetch_and_add( pw, -1 ); ++} ++ ++inline sp_int32_t atomic_conditional_increment( sp_int32_t * pw ) ++{ ++ // long r = *pw; ++ // if( r != 0 ) ++*pw; ++ // return r; ++ ++ sp_int32_t r = *pw; ++ ++ for( ;; ) ++ { ++ if( r == 0 ) ++ { ++ return r; ++ } ++ ++ sp_int32_t r2 = __sync_val_compare_and_swap( pw, r, r + 1 ); ++ ++ if( r2 == r ) ++ { ++ return r; ++ } ++ else ++ { ++ r = r2; ++ } ++ } ++} ++ ++class sp_counted_base ++{ ++private: ++ ++ sp_counted_base( sp_counted_base const & ); ++ sp_counted_base & operator= ( sp_counted_base const & ); ++ ++ sp_int32_t use_count_; // #shared ++ sp_int32_t weak_count_; // #weak + (#shared != 0) ++ ++public: ++ ++ sp_counted_base(): use_count_( 1 ), weak_count_( 1 ) ++ { ++ } ++ ++ virtual ~sp_counted_base() // nothrow ++ { ++ } ++ ++ // dispose() is called when use_count_ drops to zero, to release ++ // the resources managed by *this. ++ ++ virtual void dispose() = 0; // nothrow ++ ++ // destroy() is called when weak_count_ drops to zero. ++ ++ virtual void destroy() // nothrow ++ { ++ delete this; ++ } ++ ++ virtual void * get_deleter( sp_typeinfo const & ti ) = 0; ++ virtual void * get_untyped_deleter() = 0; ++ ++ void add_ref_copy() ++ { ++ atomic_increment( &use_count_ ); ++ } ++ ++ bool add_ref_lock() // true on success ++ { ++ return atomic_conditional_increment( &use_count_ ) != 0; ++ } ++ ++ void release() // nothrow ++ { ++ if( atomic_decrement( &use_count_ ) == 1 ) ++ { ++ dispose(); ++ weak_release(); ++ } ++ } ++ ++ void weak_add_ref() // nothrow ++ { ++ atomic_increment( &weak_count_ ); ++ } ++ ++ void weak_release() // nothrow ++ { ++ if( atomic_decrement( &weak_count_ ) == 1 ) ++ { ++ destroy(); ++ } ++ } ++ ++ long use_count() const // nothrow ++ { ++ return const_cast< sp_int32_t const volatile & >( use_count_ ); ++ } ++}; ++ ++} // namespace detail ++ ++} // namespace boost ++ ++#endif // #ifndef BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_SYNC_HPP_INCLUDED +--- /dev/null ++++ b/lib/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp +@@ -0,0 +1,182 @@ ++#ifndef BOOST_DETAIL_SP_COUNTED_BASE_GCC_MIPS_HPP_INCLUDED ++#define BOOST_DETAIL_SP_COUNTED_BASE_GCC_MIPS_HPP_INCLUDED ++ ++// MS compatible compilers support #pragma once ++ ++#if defined(_MSC_VER) && (_MSC_VER >= 1020) ++# pragma once ++#endif ++ ++// ++// detail/sp_counted_base_gcc_mips.hpp - g++ on MIPS ++// ++// Copyright (c) 2009, Spirent Communications, Inc. ++// ++// Distributed under the Boost Software License, Version 1.0. (See ++// accompanying file LICENSE_1_0.txt or copy at ++// http://www.boost.org/LICENSE_1_0.txt) ++// ++// ++// Lock-free algorithm by Alexander Terekhov ++// ++ ++#include <boost/detail/sp_typeinfo.hpp> ++ ++namespace boost ++{ ++ ++namespace detail ++{ ++ ++inline void atomic_increment( int * pw ) ++{ ++ // ++*pw; ++ ++ int tmp; ++ ++ __asm__ __volatile__ ++ ( ++ "0:\n\t" ++ ".set push\n\t" ++ ".set mips2\n\t" ++ "ll %0, %1\n\t" ++ "addiu %0, 1\n\t" ++ "sc %0, %1\n\t" ++ ".set pop\n\t" ++ "beqz %0, 0b": ++ "=&r"( tmp ), "=m"( *pw ): ++ "m"( *pw ) ++ ); ++} ++ ++inline int atomic_decrement( int * pw ) ++{ ++ // return --*pw; ++ ++ int rv, tmp; ++ ++ __asm__ __volatile__ ++ ( ++ "0:\n\t" ++ ".set push\n\t" ++ ".set mips2\n\t" ++ "ll %1, %2\n\t" ++ "addiu %0, %1, -1\n\t" ++ "sc %0, %2\n\t" ++ ".set pop\n\t" ++ "beqz %0, 0b\n\t" ++ "addiu %0, %1, -1": ++ "=&r"( rv ), "=&r"( tmp ), "=m"( *pw ): ++ "m"( *pw ): ++ "memory" ++ ); ++ ++ return rv; ++} ++ ++inline int atomic_conditional_increment( int * pw ) ++{ ++ // if( *pw != 0 ) ++*pw; ++ // return *pw; ++ ++ int rv, tmp; ++ ++ __asm__ __volatile__ ++ ( ++ "0:\n\t" ++ ".set push\n\t" ++ ".set mips2\n\t" ++ "ll %0, %2\n\t" ++ "beqz %0, 1f\n\t" ++ "addiu %1, %0, 1\n\t" ++ "sc %1, %2\n\t" ++ ".set pop\n\t" ++ "beqz %1, 0b\n\t" ++ "addiu %0, %0, 1\n\t" ++ "1:": ++ "=&r"( rv ), "=&r"( tmp ), "=m"( *pw ): ++ "m"( *pw ): ++ "memory" ++ ); ++ ++ return rv; ++} ++ ++class sp_counted_base ++{ ++private: ++ ++ sp_counted_base( sp_counted_base const & ); ++ sp_counted_base & operator= ( sp_counted_base const & ); ++ ++ int use_count_; // #shared ++ int weak_count_; // #weak + (#shared != 0) ++ ++public: ++ ++ sp_counted_base(): use_count_( 1 ), weak_count_( 1 ) ++ { ++ } ++ ++ virtual ~sp_counted_base() // nothrow ++ { ++ } ++ ++ // dispose() is called when use_count_ drops to zero, to release ++ // the resources managed by *this. ++ ++ virtual void dispose() = 0; // nothrow ++ ++ // destroy() is called when weak_count_ drops to zero. ++ ++ virtual void destroy() // nothrow ++ { ++ delete this; ++ } ++ ++ virtual void * get_deleter( sp_typeinfo const & ti ) = 0; ++ virtual void * get_untyped_deleter() = 0; ++ ++ void add_ref_copy() ++ { ++ atomic_increment( &use_count_ ); ++ } ++ ++ bool add_ref_lock() // true on success ++ { ++ return atomic_conditional_increment( &use_count_ ) != 0; ++ } ++ ++ void release() // nothrow ++ { ++ if( atomic_decrement( &use_count_ ) == 0 ) ++ { ++ dispose(); ++ weak_release(); ++ } ++ } ++ ++ void weak_add_ref() // nothrow ++ { ++ atomic_increment( &weak_count_ ); ++ } ++ ++ void weak_release() // nothrow ++ { ++ if( atomic_decrement( &weak_count_ ) == 0 ) ++ { ++ destroy(); ++ } ++ } ++ ++ long use_count() const // nothrow ++ { ++ return static_cast<int const volatile &>( use_count_ ); ++ } ++}; ++ ++} // namespace detail ++ ++} // namespace boost ++ ++#endif // #ifndef BOOST_DETAIL_SP_COUNTED_BASE_GCC_MIPS_HPP_INCLUDED diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch deleted file mode 100644 index 98cd40c84c..0000000000 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 781288d6307002cce70ddafb6efb200b7f60294d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 16 Jun 2017 22:12:43 -0700 -Subject: [PATCH 3/6] Replace canonicalize_file_name with realpath() API - -Fixed build on musl where canonicalize_file_name is not implemented - -filesystem.cpp:46:15: error: 'canonicalize_file_name' was not declared in this scope - char *p = canonicalize_file_name(path); - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/engine/filesystem.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/engine/filesystem.cpp b/lib/engine/filesystem.cpp -index b99257e..6064837 100644 ---- a/lib/engine/filesystem.cpp -+++ b/lib/engine/filesystem.cpp -@@ -43,7 +43,7 @@ void CanonicalPath::__canonicalize_path_name(const char *path) - if (path == 0) { - throw E_NULL_POINTER; - } -- char *p = canonicalize_file_name(path); -+ char *p = realpath(path, NULL); - assign(p); - if (p) { - free(p); --- -2.13.1 - diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch new file mode 100644 index 0000000000..e5e257b49a --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch @@ -0,0 +1,49 @@ +From 24e0f55c07080a59907c190a315e279f7b2355e5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Aug 2019 14:25:02 -0700 +Subject: [PATCH 3/4] engine: Define discover(const String &path) in base class + +this fixes the confusion that compiler may have when inheriting two +different classes where each of them defines discover() virtual function +but with different signatures + +Remove ununsed orom_vmd + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + lib/engine/storage_object.h | 3 +++ + lib/engine/vmd_raid_info.h | 2 -- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/engine/storage_object.h b/lib/engine/storage_object.h +index f1feb62..9c1d3d8 100644 +--- a/lib/engine/storage_object.h ++++ b/lib/engine/storage_object.h +@@ -123,6 +123,9 @@ public: + virtual void discover() { + throw E_INVALID_OPERATION; + } ++ virtual void discover(const String &path) { ++ throw E_INVALID_OPERATION; ++ } + virtual void addToSession(const boost::shared_ptr<Session>& pSession) = 0; + }; + +diff --git a/lib/engine/vmd_raid_info.h b/lib/engine/vmd_raid_info.h +index 2bea839..cc6ffbe 100644 +--- a/lib/engine/vmd_raid_info.h ++++ b/lib/engine/vmd_raid_info.h +@@ -53,8 +53,6 @@ public: + return SSI_ControllerTypeVMD; + } + +-private: +- struct orom_info orom_vmd; + }; + + #endif /* __VMD_RAID_INFO_H__INCLUDED__ */ +-- +2.23.0 + diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch new file mode 100644 index 0000000000..d70be51ee6 --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch @@ -0,0 +1,45 @@ +From c817db76bb63b872fe2069e3c2449ac18affe8c1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 30 Aug 2019 13:17:38 -0700 +Subject: [PATCH] replace canonicalize_file_name with realpath + +Use 'realpath()' (BSD, POSIX) instead of +'canonicalize_file_name()' (GNU extension). + +Fixes +error: use of undeclared identifier 'canonicalize_file_name' + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + lib/engine/filesystem.cpp | 2 +- + tools/ssieventmonitor.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/engine/filesystem.cpp b/lib/engine/filesystem.cpp +index bf5a776..194ab8a 100644 +--- a/lib/engine/filesystem.cpp ++++ b/lib/engine/filesystem.cpp +@@ -54,7 +54,7 @@ void CanonicalPath::__canonicalize_path_name(const char *path) + if (path == NULL) { + throw E_NULL_POINTER; + } +- char *p = canonicalize_file_name(path); ++ char *p = realpath(path, (char *)0); + assign(p); + if (p) { + free(p); +diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp +index 80791fd..3eed877 100644 +--- a/tools/ssieventmonitor.cpp ++++ b/tools/ssieventmonitor.cpp +@@ -120,7 +120,7 @@ static int _exec_ssimsg(void) + int status; + switch (pid) { + case 0: { +- cp = canonicalize_file_name("/proc/self/exe"); ++ cp = realpath("/proc/self/exe", (char *)0); + if (cp) { + strcpy_s(buffer, sizeof(buffer), cp); + free(cp); diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch new file mode 100644 index 0000000000..56e3c658a4 --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch @@ -0,0 +1,35 @@ +From 98fad8128d0f3b65619827ee5d65f7767b080c4c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Aug 2019 14:35:16 -0700 +Subject: [PATCH 4/4] Do not override flags coming from build environment + +e.g. we need some optimization level turned on when security flags are enabled +without this change, the build would fail + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 34e41ea..9bd0fe3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,9 +16,9 @@ AM_INIT_AUTOMAKE(ssi, ${VERSION}) + AM_CONFIG_HEADER(config.h) + + dnl Set the language we use +-CPPFLAGS="-g3 -gdwarf-2 -Wall -Werror -fvisibility=hidden -D_GNU_SOURCE -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" +-CFLAGS="-std=gnu99 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" +-CXXFLAGS="-std=gnu++98 -fvisibility-inlines-hidden -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" ++#CPPFLAGS="-g3 -gdwarf-2 -Wall -Werror -fvisibility=hidden -D_GNU_SOURCE -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" ++#CFLAGS="-std=gnu99 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" ++#CXXFLAGS="-std=gnu++98 -fvisibility-inlines-hidden -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" + + dnl Automake 1.11 - silent build rules + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +-- +2.23.0 + diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch deleted file mode 100644 index 7dce0da40b..0000000000 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 04e8b99d8195a0e39982ecd27802421610633724 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 16 Jun 2017 22:18:31 -0700 -Subject: [PATCH 4/6] engine: Fix indentation and missing semi-colon - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/engine/mdadm_config.cpp | 5 +++-- - lib/engine/unique_id_manager.cpp | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/lib/engine/mdadm_config.cpp b/lib/engine/mdadm_config.cpp -index 1914ddc..e40c2c7 100644 ---- a/lib/engine/mdadm_config.cpp -+++ b/lib/engine/mdadm_config.cpp -@@ -118,9 +118,10 @@ void check_configuration() - attr >> config; - configOk = correct_config(config); - } catch (Exception ex) { -- if (ex != E_NOT_FOUND) -+ if (ex != E_NOT_FOUND) { - dlog("Warning: mdadm config file cannot be read, new one will be written"); - backup = false; -+ } - } - - if (configOk && monitor_running()) { -@@ -134,7 +135,7 @@ void check_configuration() - dlog("Warning: failed to update mdadm.conf"); - } - if (restart_monitor() == 0) -- dlog("Monitor restarted successfully") -+ dlog("Monitor restarted successfully"); - else - dlog("Error starting Monitor"); - } -diff --git a/lib/engine/unique_id_manager.cpp b/lib/engine/unique_id_manager.cpp -index 99c153c..87d6ddc 100644 ---- a/lib/engine/unique_id_manager.cpp -+++ b/lib/engine/unique_id_manager.cpp -@@ -185,7 +185,7 @@ void UniqueIdManager::refresh() - keyFile >> keyList; - keyList += "\n"; - } catch (...) { -- dlog("ssi.keys file missing") -+ dlog("ssi.keys file missing"); - /* no file? that's ok */ - } - /* process the list to update IdCaches */ --- -2.13.1 - diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch new file mode 100644 index 0000000000..005a35e5a4 --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch @@ -0,0 +1,27 @@ +From e90101128dfe75b9b1a0575a0179d211f677e6ad Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 30 Aug 2019 13:19:50 -0700 +Subject: [PATCH] include limits.h + +Fixes +error: use of undeclared identifier 'PATH_MAX' + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + tools/ssieventmonitor.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp +index 3eed877..0d11975 100644 +--- a/tools/ssieventmonitor.cpp ++++ b/tools/ssieventmonitor.cpp +@@ -34,6 +34,7 @@ + #include <unistd.h> + #include <dirent.h> + #include <errno.h> ++#include <limits.h> + #include <sys/fcntl.h> + #include <sys/select.h> + #include <sys/wait.h> diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch new file mode 100644 index 0000000000..6dd7fc735e --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch @@ -0,0 +1,230 @@ +From 3ec4eaf1688e413e8b5cb433148a3bc6e7987606 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Aug 2019 15:10:03 -0700 +Subject: [PATCH] enable out of source tree builds + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + lib/efi/Makefile.am | 2 +- + lib/engine/Makefile.am | 2 +- + lib/orom/Makefile.am | 2 +- + lib/safeclib/Makefile.am | 2 +- + src/Makefile.am | 16 ++++++++-------- + tools/Makefile.am | 10 +++++----- + ut/Makefile.am | 36 ++++++++++++++++++------------------ + 7 files changed, 35 insertions(+), 35 deletions(-) + +--- a/lib/efi/Makefile.am ++++ b/lib/efi/Makefile.am +@@ -7,6 +7,6 @@ libefi_la_SOURCES = \ + efi.h + + libefi_la_CPPFLAGS = \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib +--- a/lib/engine/Makefile.am ++++ b/lib/engine/Makefile.am +@@ -123,6 +123,7 @@ libengine_la_SOURCES = \ + volume.h + + libengine_la_CPPFLAGS = \ ++ -I$(top_builddir) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib +--- a/lib/orom/Makefile.am ++++ b/lib/orom/Makefile.am +@@ -7,6 +7,6 @@ liborom_la_SOURCES = \ + orom.h + + liborom_la_CPPFLAGS = \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib +--- a/lib/safeclib/Makefile.am ++++ b/lib/safeclib/Makefile.am +@@ -37,7 +37,7 @@ libsafec_la_SOURCES = \ + strtok_s.c + + libsafec_la_CPPFLAGS = \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib \ + -Wno-unused-variable +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = nostdinc + lib_LTLIBRARIES = libssi.la + + libssi_la_CPPFLAGS = \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib \ + -DBOOST_NO_USER_CONFIG +@@ -46,10 +46,10 @@ libssi_la_SOURCES = + templates.h \ + volume.cpp + +-libssi_la_LIBADD = \ +- ../lib/efi/libefi.la \ +- ../lib/log/liblog.la \ +- ../lib/orom/liborom.la \ +- ../lib/mpb/libmpb.la \ +- ../lib/engine/libengine.la \ +- ../lib/safeclib/libsafec.la ++libssi_la_LIBADD = \ ++ $(top_builddir)/lib/efi/libefi.la \ ++ $(top_builddir)/lib/log/liblog.la \ ++ $(top_builddir)/lib/orom/liborom.la \ ++ $(top_builddir)/lib/mpb/libmpb.la \ ++ $(top_builddir)/lib/engine/libengine.la \ ++ $(top_builddir)/lib/safeclib/libsafec.la +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -6,17 +6,18 @@ ssimsg_SOURCES = + ssimsg.cpp + + ssimsg_CPPFLAGS = \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib + +-ssieventmonitor_SOURCES = \ ++ssieventmonitor_SOURCES = \ + ssieventmonitor.cpp + +-ssieventmonitor_CPPFLAGS = \ ++ssieventmonitor_CPPFLAGS = \ ++ -I$(top_builddir) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib + + ssieventmonitor_LDADD = \ +- $(top_srcdir)/lib/safeclib/libsafec.la ++ $(top_builddir)/lib/safeclib/libsafec.la +--- a/ut/Makefile.am ++++ b/ut/Makefile.am +@@ -8,81 +8,81 @@ ut_events_SOURCES = \ + ut_events.cpp + + ut_events_CPPFLAGS = \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_events_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_volume_SOURCES = \ + ut_volume.cpp + + ut_volume_CPPFLAGS = \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_volume_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_session_SOURCES = \ + ut_session.cpp + + ut_session_CPPFLAGS = \ +- -g3 -I$(top_srcdir) \ ++ -g3 -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_session_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_info_SOURCES = \ + ut_info.cpp + + ut_info_CPPFLAGS = \ +- -g3 -I$(top_srcdir) \ ++ -g3 -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_info_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_markasspare_SOURCES = \ + ut_markasspare.cpp + + ut_markasspare_CPPFLAGS = \ +- -g3 -I$(top_srcdir) \ ++ -g3 -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_markasspare_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_migration_SOURCES = \ + ut_migration.cpp + + ut_migration_CPPFLAGS = \ +- -g3 -I$(top_srcdir) \ ++ -g3 -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_migration_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_phy_SOURCES = \ + ut_phy.cpp + + ut_phy_CPPFLAGS = \ +- -g3 -I$(top_srcdir) \ ++ -g3 -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_phy_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_initialize_volume_SOURCES = \ + ut_initialize_volume.cpp + + ut_initialize_volume_CPPFLAGS = \ +- -g3 -I$(top_srcdir) \ ++ -g3 -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_initialize_volume_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_filesystem_SOURCES = \ + ut_filesystem.cpp \ +@@ -92,7 +92,7 @@ ut_filesystem_SOURCES = \ + + ut_filesystem_CPPFLAGS = \ + -iquote $(top_srcdir)/lib/engine \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_string_SOURCES = \ +@@ -103,6 +103,6 @@ ut_string_SOURCES = \ + + ut_string_CPPFLAGS = \ + -iquote $(top_srcdir)/lib/engine \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include + diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch deleted file mode 100644 index 6f4dbf18e0..0000000000 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a2e3a2e332c406ea3c56a8d74b61978107df68e6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 16 Jun 2017 22:23:08 -0700 -Subject: [PATCH 5/6] engine: Define SENTINEL - -Fix warnings with gcc7 -test.cpp:12: warning: missing sentinel in function call - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/engine/utils.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/engine/utils.cpp b/lib/engine/utils.cpp -index 44579a1..8812a8c 100644 ---- a/lib/engine/utils.cpp -+++ b/lib/engine/utils.cpp -@@ -35,7 +35,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - #include "filesystem.h" - #include "utils.h" - #include "log/log.h" -- -+#define SENTINEL (const char *)0 - /** - * @brief capture shell output as binary data - * -@@ -139,7 +139,7 @@ int shell(const String &s) - * Before switching into new executable close all non standard - * file handlers.*/ - close_parent_fds(); -- execl("/bin/sh", "sh", "-c", cmd.get(), NULL); -+ execl("/bin/sh", "sh", "-c", cmd.get(), SENTINEL); - /* If we're here then execl failed*/ - exit(-1); - break; --- -2.13.1 - diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch deleted file mode 100644 index a7b70e3f49..0000000000 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From df1d56d6b6a6b15d0137619eb8a4b623de6c9633 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 16 Jun 2017 22:28:59 -0700 -Subject: [PATCH 6/6] tools: Add missing includes and use realpath() instead of - canonicalize_file_name - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tools/ssieventmonitor.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp -index 0553386..f04b8f0 100644 ---- a/tools/ssieventmonitor.cpp -+++ b/tools/ssieventmonitor.cpp -@@ -18,7 +18,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - #include <unistd.h> - #include <dirent.h> - #include <errno.h> --#include <sys/fcntl.h> -+#include <limits.h> -+#include <fcntl.h> -+#include <libgen.h> - #include <sys/select.h> - #include <sys/wait.h> - #include <sys/inotify.h> -@@ -99,7 +101,7 @@ static int _exec_ssimsg(void) - int status; - switch (pid) { - case 0: { -- cp = canonicalize_file_name("/proc/self/exe"); -+ cp = realpath("/proc/self/exe", NULL); - if (cp) { - strcpy(buffer, cp); - free(cp); --- -2.13.1 - diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/configure-cflags.patch b/meta-oe/recipes-support/ssiapi/ssiapi/configure-cflags.patch deleted file mode 100644 index d45be590c7..0000000000 --- a/meta-oe/recipes-support/ssiapi/ssiapi/configure-cflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -Do not override flags thereby respect the flags coming from environment, -e.g. we need some optimization level turned on when security flags are enabled -without this change, the build would fail - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: ssiapi.1.0.1/configure.ac -=================================================================== ---- ssiapi.1.0.1.orig/configure.ac -+++ ssiapi.1.0.1/configure.ac -@@ -15,11 +15,6 @@ AC_SUBST(VERSION) - AM_INIT_AUTOMAKE(ssi, ${VERSION}) - AM_CONFIG_HEADER(config.h) - --dnl Set the language we use --CPPFLAGS="-g3 -gdwarf-2 -Wall -Werror -D_GNU_SOURCE" --CFLAGS="-std=gnu99" --CXXFLAGS="-std=gnu++98" -- - dnl Automake 1.11 - silent build rules - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - diff --git a/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb b/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb deleted file mode 100644 index 5eb4696b57..0000000000 --- a/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Intel RSTe with Linux OS SSI API Library" - -DESCRIPTION = "Intel Rapid Storage Technology enterprise with Linux OS* Standard Storage Interface API Library. \ -The library allows user to manage storage devices including creating and managing Raid arrays on systems with Intel chipset." - -HOMEPAGE = "http://irstessi.sourceforge.net/" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=0413ff365e0bd733c4869a6797551c6f" - -DEPENDS += "sg3-utils" - -SRC_URI = "http://sourceforge.net/projects/irstessi/files/${BPN}.${PV}.tgz \ - file://0001-Use-pragma-once-unconditionally.patch \ - file://0002-Convert-macros-into-functions.patch \ - file://0003-Replace-canonicalize_file_name-with-realpath-API.patch \ - file://0004-engine-Fix-indentation-and-missing-semi-colon.patch \ - file://0005-engine-Define-SENTINEL.patch \ - file://0006-tools-Add-missing-includes-and-use-realpath-instead-.patch \ - file://configure-cflags.patch \ - file://0001-ssieventmonitor-ordered-comparison-between-pointers-.patch \ - " -SRC_URI[md5sum] = "02f16d7cbd30d28034093212906591f5" -SRC_URI[sha256sum] = "e10d283b0f211afb8ebd0bde87c097769613d30a052cdf164753e35e803264c7" - -S ="${WORKDIR}/${BPN}.${PV}" - -inherit autotools-brokensep -CXXFLAGS="-std=gnu++98 -D_GNU_SOURCE" - -do_configure_prepend(){ - ./autogen.sh -} - -RDEPENDS_${PN} += "mdadm" diff --git a/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb b/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb new file mode 100644 index 0000000000..bf9de31f84 --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "Intel RSTe with Linux OS SSI API Library" + +DESCRIPTION = "Intel Rapid Storage Technology enterprise with Linux OS* Standard Storage Interface API Library. \ +The library allows user to manage storage devices including creating and managing Raid arrays on systems with Intel chipset." + +HOMEPAGE = "http://irstessi.sourceforge.net/" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=9d701a2fbb56039fd64afb2262008ddb" + +DEPENDS += "sg3-utils" + +SRC_URI = "http://sourceforge.net/projects/irstessi/files/${BPN}.${PV}.tgz \ + file://0001-log-Avoid-shadowing-functions-from-std-lib.patch \ + file://0002-boost-Backport-clang-support.patch \ + file://0003-engine-Define-discover-const-String-path-in-base-cla.patch \ + file://0004-Do-not-override-flags-coming-from-build-environment.patch \ + file://0005-enable-out-of-source-tree-builds.patch \ + file://0001-Don-t-use-__GNUC_PREREQ.patch \ + file://0002-Use-stangard-int-types.patch \ + file://0003-replace-canonicalize_file_name-with-realpath.patch \ + file://0004-include-limits.h.patch \ + file://0001-Include-libgen.h.patch \ + " +SRC_URI[md5sum] = "d06c9b426437a7697d77266e9835b520" +SRC_URI[sha256sum] = "59daab29363d6e9f07c524029c4239653cfbbee6b0e57fd75df62499728dad8a" + +S ="${WORKDIR}/${BPN}.${PV}" + +inherit autotools + +CXXFLAGS += "-std=gnu++14" + +do_configure:prepend(){ + ${S}/autogen.sh +} + +RDEPENDS:${PN} += "mdadm" + +COMPATIBLE_HOST:powerpc = 'null' +COMPATIBLE_HOST:powerpc64le = 'null' diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch deleted file mode 100644 index e988efded6..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 685645a20e39cf2ab7db8d1f5e3666a4228abca8 Mon Sep 17 00:00:00 2001 -From: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> -Date: Wed, 8 Jul 2015 09:44:57 +0300 -Subject: [PATCH 1/1] dpkg start-stop-daemon: Accept SIG prefixed signal names - ---- - utils/start-stop-daemon.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c -index 6aebe9b..e805082 100644 ---- a/utils/start-stop-daemon.c -+++ b/utils/start-stop-daemon.c -@@ -18,6 +18,9 @@ - * and Andreas Schuldei <andreas@schuldei.org> - * - * Changes by Ian Jackson: added --retry (and associated rearrangements). -+ * -+ * Changes by Haris Okanovic <haris.okanovic@ni.com> to support 'SIG' -+ * prefixed signal names placed in public domain as well. - */ - - #include <config.h> -@@ -661,6 +664,12 @@ parse_signal(const char *sig_str, int *sig_num) - if (parse_unsigned(sig_str, 10, sig_num) == 0) - return 0; - -+ /* Skip over optional "SIG" prefix */ -+ if (strncmp(sig_str, "SIG", 3) == 0) { -+ warning("Using deprecated signal name %s. Drop the 'SIG' prefix.\n", sig_str); -+ sig_str += 3; -+ } -+ - for (i = 0; i < array_count(siglist); i++) { - if (strcmp(sig_str, siglist[i].name) == 0) { - *sig_num = siglist[i].signal; --- -2.1.4 - diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb deleted file mode 100644 index cc2727b758..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Debian's start-stop-daemon utility extracted from the dpkg \ -package" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://utils/start-stop-daemon.c;endline=21;md5=8fbd0497a7d0b01e99820bffcb58e9ad" -# start-stop-daemon is usually shipped by dpkg -DEPENDS = "ncurses" -RCONFLICTS_${PN} = "dpkg" - -SRC_URI = " \ - ${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz \ - file://0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch \ -" - -SRC_URI[md5sum] = "e48fcfdb2162e77d72c2a83432d537ca" -SRC_URI[sha256sum] = "07019d38ae98fb107c79dbb3690cfadff877f153b8c4970e3a30d2e59aa66baa" - -inherit autotools gettext pkgconfig - -S = "${WORKDIR}/dpkg-${PV}" - -EXTRA_OECONF = " \ - --without-bz2 \ - --without-selinux \ -" - -do_install_append () { - # remove everything that is not related to start-stop-daemon, since there - # is no explicit rule for only installing ssd - find ${D} -type f -not -name "*start-stop-daemon*" -exec rm {} \; - find ${D} -depth -type d -empty -exec rmdir {} \; - - # support for buggy init.d scripts that refer to an alternative - # explicit path to start-stop-daemon - if [ "${base_sbindir}" != "${sbindir}" ]; then - mkdir -p ${D}${base_sbindir} - ln -sf ${sbindir}/start-stop-daemon ${D}${base_sbindir}/start-stop-daemon - fi -} diff --git a/meta-oe/recipes-support/stm32flash/stm32flash_0.7.bb b/meta-oe/recipes-support/stm32flash/stm32flash_0.7.bb new file mode 100644 index 0000000000..0998aa6778 --- /dev/null +++ b/meta-oe/recipes-support/stm32flash/stm32flash_0.7.bb @@ -0,0 +1,13 @@ +SUMMARY = "Open source flash program for STM32 using the ST serial bootloader" +HOMEPAGE = "https://sourceforge.net/projects/stm32flash/" +BUGTRACKER = "https://sourceforge.net/p/stm32flash/tickets/" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" + +do_install() { + oe_runmake install DESTDIR=${D} PREFIX=${prefix} +} + +SRC_URI[sha256sum] = "c4c9cd8bec79da63b111d15713ef5cc2cd947deca411d35d6e3065e227dc414a" diff --git a/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb new file mode 100644 index 0000000000..17f54dcf4c --- /dev/null +++ b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "Easy to use CLI and C library for communicating with Microsemi's Switchtec management interface" +HOMEPAGE = "https://github.com/Microsemi/switchtec-user" +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3d6b07c89629cff2990d2e8e1f4c2382" + +DEPENDS = "ncurses openssl" + +SRCREV = "e7c351c6c722336b3c79b79cd002c7c2986eefb0" +SRC_URI = "git://github.com/Microsemi/switchtec-user.git;protocol=https;branch=master" +SRC_URI[sha256sum] = "a715e46d8498418dbb8a2519318ba0714ee148151d7e4a7fa5e27770a2f6888f" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig + +EXTRA_OEMAKE = "DESTDIR='${D}' PREFIX='${prefix}' LDCONFIG='true' LIBDIR='${D}${libdir}'" + +do_install () { + oe_runmake install +} diff --git a/meta-oe/recipes-support/synergy/synergy_git.bb b/meta-oe/recipes-support/synergy/synergy_git.bb index 68f0387ba9..fb767942fe 100644 --- a/meta-oe/recipes-support/synergy/synergy_git.bb +++ b/meta-oe/recipes-support/synergy/synergy_git.bb @@ -1,35 +1,24 @@ SUMMARY = "Synergy - control multiple computers with one keyboard and mouse" HOMEPAGE = "http://synergy-project.org" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d2ba51ca68e055566aade24662f9eb41" +LIC_FILES_CHKSUM = "file://LICENSE;md5=54c1fc8d8bb6776ae501acfb1585e9d6" LICENSE = "GPL-2.0-with-OpenSSL-exception" SECTION = "x11/utils" DEPENDS = "virtual/libx11 libxtst libxinerama curl openssl" -do_unpack_extra[depends] = "unzip-native:do_populate_sysroot" # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "git://github.com/symless/synergy.git;protocol=http" +SRC_URI = "git://github.com/symless/synergy-core;protocol=https;nobranch=1" -# Version 1.8.8-stable -SRCREV ?= "c30301e23424db1125664da17deb8c3aa6aec52d" -PV = "1.8.8+${SRCPV}" +# Version 1.10.1-stable +SRCREV ?= "1b4c076127687aceac931d269e898beaac1cad9f" +PV = "1.10.1+git" S = "${WORKDIR}/git" -inherit cmake distro_features_check - -do_unpack_extra() { - cd ${S}/ext - for file in *.zip; do - fname="${file##*/}" - unzip $file -d ${fname%.*} - done -} -addtask unpack_extra after do_unpack before do_patch - -do_install() { - install -d ${D}/usr/bin - install -m 0755 ${S}/bin/synergy* ${D}/usr/bin/ -} +inherit cmake features_check + +EXTRA_OECMAKE += "-DSYNERGY_BUILD_LEGACY_GUI=OFF" + +FILES:${PN} += "${datadir}/icons/hicolor" diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-Fix-buildpaths-warning.patch b/meta-oe/recipes-support/syslog-ng/files/0001-Fix-buildpaths-warning.patch new file mode 100644 index 0000000000..c7bb4a64d9 --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/0001-Fix-buildpaths-warning.patch @@ -0,0 +1,55 @@ +From d85a7a3ae2bb9f5267b2af43784633ae8f011f21 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 13 Mar 2023 09:50:15 +0800 +Subject: [PATCH] Fix buildpaths warning + +Fix buildpath warning: +WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/include/syslog-ng/syslog-ng-config-64.h in package syslog-ng-dev contains reference to TMPDIR [buildpaths] +WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/bin/syslog-ng-update-virtualenv in package syslog-ng contains reference to TMPDIR +File /usr/bin/pdbtool in package syslog-ng contains reference to TMPDIR [buildpaths] +WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/lib/syslog-ng/libdbparser.so in package syslog-ng-libs contains reference to TMPDIR [buildpaths] + +* SYSLOG_NG_PATH_TOPSRC_DIR is /yocto/build/tmp/work/core2-64-poky-linux/syslog-ng/4.0.1-r0, + which is used to get xsd dir in build SYSLOG_NG_PATH_TOPSRC_DIR/doc/xsd, + which is not suitable for target, set it to "/source" for fixing this buildpath warning + +* SYSTEM_PYTHON is /yocto/build/tmp/hosttools/python3, set to python3 + for target. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 2 +- + scripts/syslog-ng-update-virtualenv.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 79a1502..1ad6508 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1930,7 +1930,7 @@ AC_DEFINE_UNQUOTED(PYTHON_SYSCONF_MODULE_DIR, "$python_sysconf_moduledir", [Pyth + AC_DEFINE_UNQUOTED(PATH_LOGGENPLUGINDIR, "$loggenplugindir", [loggenplugin installation directory]) + AC_DEFINE_UNQUOTED(MODULE_PATH, "$module_path", [module search path]) + AC_DEFINE_UNQUOTED(JAVA_MODULE_PATH, "$java_module_path", [java module search path]) +-AC_DEFINE_UNQUOTED(PATH_TOPSRC_DIR, "$abs_topsrcdir", [self-defined top_srcdir path]) ++AC_DEFINE_UNQUOTED(PATH_TOPSRC_DIR, "/source", [self-defined top_srcdir path]) + AC_DEFINE_UNQUOTED(PACKAGE_NAME, "$PACKAGE_NAME", [package name]) + + +diff --git a/scripts/syslog-ng-update-virtualenv.in b/scripts/syslog-ng-update-virtualenv.in +index ed85baf..b1a9e34 100755 +--- a/scripts/syslog-ng-update-virtualenv.in ++++ b/scripts/syslog-ng-update-virtualenv.in +@@ -62,7 +62,7 @@ done + set -e + + REQUIREMENTS_FILE=${python_moduledir}/requirements.txt +-SYSTEM_PYTHON=@PYTHON@ ++SYSTEM_PYTHON=python3 + VENV_PYTHON=${python_venvdir}/bin/python + + if [ "$display_prompt" -ne 0 ]; then +-- +2.25.1 + diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch b/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch new file mode 100644 index 0000000000..f21ad5d70f --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch @@ -0,0 +1,40 @@ +From 896d77dd949b52d6ea5798e5a038ba97d6b802be Mon Sep 17 00:00:00 2001 +From: Peter Marko <peter.marko@siemens.com> +Date: Thu, 4 Apr 2024 15:44:18 +0200 +Subject: [PATCH] macros: guard ipv6 code with SYSLOG_NG_ENABLE_IPV6 + +With ipv6 disabled, there are linking errors currently. +This fixes it by not using the symbols when IPv6 is disabled. + +Solves #4810 with my config options +https://github.com/openembedded/meta-openembedded/blob/2487e65ee3842b6ae0c7a2628985be6189ed9ebf/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb + +Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/4880] + +Signed-off-by: Peter Marko <peter.marko@siemens.com> +--- + lib/template/macros.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/template/macros.c b/lib/template/macros.c +index 54142706c..fcb83637f 100644 +--- a/lib/template/macros.c ++++ b/lib/template/macros.c +@@ -277,12 +277,14 @@ _get_originating_ip_protocol(const LogMessage *msg) + return 0; + if (g_sockaddr_inet_check(msg->saddr)) + return 4; ++#if SYSLOG_NG_ENABLE_IPV6 + if (g_sockaddr_inet6_check(msg->saddr)) + { + if (g_sockaddr_inet6_is_v4_mapped(msg->saddr)) + return 4; + return 6; + } ++#endif + return 0; + } + +-- +2.30.2 + diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-plugin.c-workaround-powerpc64le-segfaults-error.patch b/meta-oe/recipes-support/syslog-ng/files/0001-plugin.c-workaround-powerpc64le-segfaults-error.patch new file mode 100644 index 0000000000..343e6fdade --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/0001-plugin.c-workaround-powerpc64le-segfaults-error.patch @@ -0,0 +1,46 @@ +From 616446afab61ab98b28c81605e2efd4a689f37d1 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Fri, 20 Jan 2023 14:59:14 +0800 +Subject: [PATCH] plugin.c: workaround powerpc64le segfaults error + +syslog-ng segfaults on powerpc64le, workaround this error. +See https://github.com/syslog-ng/syslog-ng/issues/4285 and +https://sourceware.org/bugzilla/show_bug.cgi?id=30062 for more details. +This patch should be dropped once the above issues are fixed. + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + lib/plugin.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/lib/plugin.c b/lib/plugin.c +index fbbfb92..3a03617 100644 +--- a/lib/plugin.c ++++ b/lib/plugin.c +@@ -528,10 +528,7 @@ plugin_discover_candidate_modules(PluginContext *context) + } + } + g_free(module_name); +- if (mod) +- g_module_close(mod); +- else +- mod = NULL; ++ mod = NULL; + } + } + g_dir_close(dir); +@@ -663,8 +660,7 @@ plugin_list_modules(FILE *out, gboolean verbose) + first = FALSE; + } + g_free(module_name); +- if (mod) +- g_module_close(mod); ++ mod = NULL; + } + } + g_dir_close(dir); +-- +2.17.1 + diff --git a/meta-oe/recipes-support/syslog-ng/files/Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch b/meta-oe/recipes-support/syslog-ng/files/Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch deleted file mode 100644 index 2ac9c0be0f..0000000000 --- a/meta-oe/recipes-support/syslog-ng/files/Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix the memory leak problem when HAVE_ENVIRON is defined - -Upstream-Status: Pending - -Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> ---- ---- a/lib/gprocess.c -+++ b/lib/gprocess.c -@@ -1421,6 +1421,18 @@ - void - g_process_finish(void) - { -+#ifdef HAVE_ENVIRON -+ int i = 0; -+ -+ while (environ[i]) { -+ g_free(environ[i]); -+ ++i; -+ } -+ if (environ) -+ g_free(environ); -+ if (process_opts.argv_orig) -+ free(process_opts.argv_orig); -+#endif - g_process_remove_pidfile(); - } - diff --git a/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch b/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch deleted file mode 100644 index cc8d11044a..0000000000 --- a/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch +++ /dev/null @@ -1,50 +0,0 @@ -configure.ac: add option --enable-thread-tls to manage thread ssl support - -Add option --enable-thread-tls to manage the including of thread -local storage, so we could explicitly disable it. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - configure.ac | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 474e094..cedca54 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -120,6 +120,9 @@ AC_ARG_ENABLE(memtrace, - AC_ARG_ENABLE(ssl, - [ --enable-ssl Enable SSL support.],,enable_ssl="auto") - -+AC_ARG_ENABLE(thread-tls, -+ [ --enable-thread-tls Enable Thread Transport Layer Security support.],,enable_thread_tls="no") -+ - AC_ARG_ENABLE(dynamic-linking, - [ --enable-dynamic-linking Link everything dynamically.],,enable_dynamic_linking="auto") - -@@ -381,12 +384,14 @@ dnl *************************************************************************** - dnl Is the __thread keyword available? - dnl *************************************************************************** - --AC_LINK_IFELSE([AC_LANG_PROGRAM( --[[#include <pthread.h> --__thread int a; --]], --[a=0;])], --[ac_cv_have_tls=yes; AC_DEFINE_UNQUOTED(HAVE_THREAD_KEYWORD, 1, "Whether Transport Layer Security is supported by the system")]) -+if test "x$enable_thread_tls" != "xno"; then -+ AC_LINK_IFELSE([AC_LANG_PROGRAM( -+ [[#include <pthread.h> -+ __thread int a; -+ ]], -+ [a=0;])], -+ [ac_cv_have_tls=yes; AC_DEFINE_UNQUOTED(HAVE_THREAD_KEYWORD, 1, "Whether Transport Layer Security is supported by the system")]) -+fi - - dnl *************************************************************************** - dnl How to do static linking? --- -1.9.1 - diff --git a/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch b/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch deleted file mode 100644 index 755803c213..0000000000 --- a/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch +++ /dev/null @@ -1,66 +0,0 @@ -Subject: [PATCH] add libnet enable option - -Upstream-Status: Pending - -This would avoid a implicit auto-detecting result. - -Signed-off-by: Ming Liu <ming.liu@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - configure.ac | 27 +++++++++++++++++---------- - 1 files changed, 17 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b1e18b4..8e13025 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -73,6 +73,9 @@ AC_CONFIG_HEADERS(config.h) - dnl *************************************************************************** - dnl Arguments - -+AC_ARG_ENABLE(libnet, -+ [ --enable-libnet Enable libnet support.],, enable_libnet="no") -+ - AC_ARG_WITH(libnet, - [ --with-libnet=path use path to libnet-config script], - , -@@ -768,22 +771,26 @@ dnl *************************************************************************** - dnl libnet headers/libraries - dnl *************************************************************************** - AC_MSG_CHECKING(for LIBNET) --if test "x$with_libnet" = "x"; then -- LIBNET_CONFIG="`which libnet-config`" --else -- LIBNET_CONFIG="$with_libnet/libnet-config" --fi -+if test "x$enable_libnet" = xyes; then -+ if test "x$with_libnet" = "x"; then -+ LIBNET_CONFIG="`which libnet-config`" -+ else -+ LIBNET_CONFIG="$with_libnet/libnet-config" -+ fi -+ -+ if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then -+ LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" -+ LIBNET_LIBS="`$LIBNET_CONFIG --libs`" -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_ERROR([Could not find libnet, and libnet support was explicitly enabled.]) -+ fi - --if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then -- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" -- LIBNET_LIBS="`$LIBNET_CONFIG --libs`" -- AC_MSG_RESULT(yes) - else - LIBNET_LIBS= - AC_MSG_RESULT(no) - fi - -- - if test "x$enable_spoof_source" = "xauto"; then - AC_MSG_CHECKING(whether to enable spoof source support) - if test "x$LIBNET_LIBS" != "x"; then --- -1.7.1 - diff --git a/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch b/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch deleted file mode 100644 index faf967247f..0000000000 --- a/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch +++ /dev/null @@ -1,28 +0,0 @@ -syslog-ng: fix wrong ownership issue - -Upstream-Status: Pending - -The ownership of build user is preserved for some target files, fixed it by -adding --no-same-owner option to tar when extracting files. - -Signed-off-by: Ming Liu <ming.liu@windriver.com> ---- - scl/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/scl/Makefile.am b/scl/Makefile.am -index 57fad5d..2a29ca5 100644 ---- a/scl/Makefile.am -+++ b/scl/Makefile.am -@@ -14,7 +14,7 @@ scl-install-data-local: - fi; \ - done - $(mkinstalldirs) $(DESTDIR)/$(scldir) -- (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf -) -+ (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf - --no-same-owner) - chmod -R u+rwX $(DESTDIR)/$(scldir) - - scl-uninstall-local: --- -1.7.1 - diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng-tmp.conf b/meta-oe/recipes-support/syslog-ng/files/syslog-ng-tmp.conf new file mode 100644 index 0000000000..32a7953211 --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng-tmp.conf @@ -0,0 +1 @@ +d /var/run/syslog-ng 0755 root root diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd new file mode 100644 index 0000000000..851bf252b7 --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd @@ -0,0 +1,160 @@ +@version: 3.36 +# +# Syslog-ng configuration file, compatible with default Debian syslogd +# installation. Originally written by anonymous (I can't find his name) +# Revised, and rewrited by me (SZALAY Attila <sasa@debian.org>) +# +# Move to 3.19 +# Only change is to add dns_cache(no) to options to suppress initialization warning. +# +# Joe Slater <joe.slater@windriver.com> + +# First, set some global options. +options { chain_hostnames(off); flush_lines(0); use_dns(no); dns_cache(no); use_fqdn(no); + owner("root"); group("adm"); perm(0640); stats_freq(0); + bad_hostname("^gconfd$"); +}; + +######################## +# Sources +######################## +# This is the default behavior of sysklogd package +# Logs may come from unix stream, but not from another machine. +# +source s_src { systemd_journal(); internal(); + file("/proc/kmsg" program_override("kernel")); +}; + +# If you wish to get logs from remote machine you should uncomment +# this and comment the above source line. +# +#source s_net { tcp(ip(127.0.0.1) port(1000) authentication(required) encrypt(allow)); }; + +######################## +# Destinations +######################## +# First some standard logfile +# +destination d_auth { file("/var/log/auth.log"); }; +destination d_cron { file("/var/log/cron.log"); }; +destination d_daemon { file("/var/log/daemon.log"); }; +destination d_kern { file("/var/log/kern.log"); }; +destination d_lpr { file("/var/log/lpr.log"); }; +destination d_mail { file("/var/log/mail.log"); }; +destination d_syslog { file("/var/log/syslog"); }; +destination d_user { file("/var/log/user.log"); }; +destination d_uucp { file("/var/log/uucp.log"); }; + +# This files are the log come from the mail subsystem. +# +destination d_mailinfo { file("/var/log/mail/mail.info"); }; +destination d_mailwarn { file("/var/log/mail/mail.warn"); }; +destination d_mailerr { file("/var/log/mail/mail.err"); }; + +# Logging for INN news system +# +destination d_newscrit { file("/var/log/news/news.crit"); }; +destination d_newserr { file("/var/log/news/news.err"); }; +destination d_newsnotice { file("/var/log/news/news.notice"); }; + +# Some 'catch-all' logfiles. +# +destination d_debug { file("/var/log/debug"); }; +destination d_error { file("/var/log/error"); }; +destination d_messages { file("/var/log/messages"); }; + +# The root's console. +# +destination d_console { usertty("root"); }; + +# Virtual console. +# +destination d_console_all { file("/dev/tty10"); }; + +# The named pipe /dev/xconsole is for the nsole' utility. To use it, +# you must invoke nsole' with the -file' option: +# +# $ xconsole -file /dev/xconsole [...] +# +destination d_xconsole { pipe("/dev/xconsole"); }; + +# Send the messages to an other host +# +#destination d_net { tcp("127.0.0.1" port(1000) authentication(on) encrypt(on) log_fifo_size(1000)); }; + +# Debian only +destination d_ppp { file("/var/log/ppp.log"); }; + +######################## +# Filters +######################## +# Here's come the filter options. With this rules, we can set which +# message go where. + +filter f_dbg { level(debug); }; +filter f_info { level(info); }; +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_err { level(err); }; +filter f_crit { level(crit .. emerg); }; + +filter f_debug { level(debug) and not facility(auth, authpriv, news, mail); }; +filter f_error { level(err .. emerg) ; }; +filter f_messages { level(info,notice,warn) and + not facility(auth,authpriv,cron,daemon,mail,news); }; + +filter f_auth { facility(auth, authpriv) and not filter(f_debug); }; +filter f_cron { facility(cron) and not filter(f_debug); }; +filter f_daemon { facility(daemon) and not filter(f_debug); }; +filter f_kern { facility(kern) and not filter(f_debug); }; +filter f_lpr { facility(lpr) and not filter(f_debug); }; +filter f_local { facility(local0, local1, local3, local4, local5, + local6, local7) and not filter(f_debug); }; +filter f_mail { facility(mail) and not filter(f_debug); }; +filter f_news { facility(news) and not filter(f_debug); }; +filter f_syslog3 { not facility(auth, authpriv, mail) and not filter(f_debug); }; +filter f_user { facility(user) and not filter(f_debug); }; +filter f_uucp { facility(uucp) and not filter(f_debug); }; + +filter f_cnews { level(notice, err, crit) and facility(news); }; +filter f_cother { level(debug, info, notice, warn) or facility(daemon, mail); }; + +filter f_ppp { facility(local2) and not filter(f_debug); }; +filter f_console { level(warn .. emerg); }; + +######################## +# Log paths +######################## +log { source(s_src); filter(f_auth); destination(d_auth); }; +log { source(s_src); filter(f_cron); destination(d_cron); }; +log { source(s_src); filter(f_daemon); destination(d_daemon); }; +log { source(s_src); filter(f_kern); destination(d_kern); }; +log { source(s_src); filter(f_lpr); destination(d_lpr); }; +log { source(s_src); filter(f_syslog3); destination(d_syslog); }; +log { source(s_src); filter(f_user); destination(d_user); }; +log { source(s_src); filter(f_uucp); destination(d_uucp); }; + +log { source(s_src); filter(f_mail); destination(d_mail); }; +#log { source(s_src); filter(f_mail); filter(f_info); destination(d_mailinfo); }; +#log { source(s_src); filter(f_mail); filter(f_warn); destination(d_mailwarn); }; +#log { source(s_src); filter(f_mail); filter(f_err); destination(d_mailerr); }; + +log { source(s_src); filter(f_news); filter(f_crit); destination(d_newscrit); }; +log { source(s_src); filter(f_news); filter(f_err); destination(d_newserr); }; +log { source(s_src); filter(f_news); filter(f_notice); destination(d_newsnotice); }; +#log { source(s_src); filter(f_cnews); destination(d_console_all); }; +#log { source(s_src); filter(f_cother); destination(d_console_all); }; + +#log { source(s_src); filter(f_ppp); destination(d_ppp); }; + +log { source(s_src); filter(f_debug); destination(d_debug); }; +log { source(s_src); filter(f_error); destination(d_error); }; +log { source(s_src); filter(f_messages); destination(d_messages); }; + +log { source(s_src); filter(f_console); destination(d_console_all); + destination(d_xconsole); }; +log { source(s_src); filter(f_crit); destination(d_console); }; + +# All messages send to a remote site +# +#log { source(s_src); destination(d_net); }; diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit index 0c6f543551..70afd0da84 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit @@ -1,11 +1,16 @@ -@version: 3.8 +@version: 3.36 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) # Revised, and rewrited by me (SZALAY Attila <sasa@debian.org>) +# +# Move to 3.19 +# Only change is to add dns_cache(no) to options to suppress initialization warning. +# +# Joe Slater <joe.slater@windriver.com> # First, set some global options. -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); +options { chain_hostnames(off); flush_lines(0); use_dns(no); dns_cache(no); use_fqdn(no); owner("root"); group("adm"); perm(0640); stats_freq(0); bad_hostname("^gconfd$"); }; diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch index 6b30c20c15..c80e91244f 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch @@ -1,31 +1,46 @@ -From 0be9c08dd3f825e92fa02d4a08d8aff743109e61 Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Wed, 17 Jun 2015 14:46:30 +0900 -Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start +Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start successfully,so modify it. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> +Updated-by: Andrej Valek <andrej.valek@siemens.com> + +Update for 3.24.1 +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- - contrib/systemd/syslog-ng.service | 5 ++--- - 1 file changed, 2 insertion(+), 3 deletions(-) + contrib/systemd/syslog-ng@.service | 4 ++-- + contrib/systemd/syslog-ng@default | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/contrib/systemd/syslog-ng.service b/contrib/systemd/syslog-ng.service -index fc16f8d..8e09deb 100644 ---- a/contrib/systemd/syslog-ng.service -+++ b/contrib/systemd/syslog-ng.service -@@ -4,8 +4,8 @@ Description=System Logger Daemon - - [Service] +diff --git a/contrib/systemd/syslog-ng@.service b/contrib/systemd/syslog-ng@.service +index a28640e..93aec94 100644 +--- a/contrib/systemd/syslog-ng@.service ++++ b/contrib/systemd/syslog-ng@.service +@@ -7,8 +7,8 @@ Conflicts=emergency.service emergency.target Type=notify --ExecStart=/usr/sbin/syslog-ng -F $SYSLOGNG_OPTS + EnvironmentFile=-/etc/default/syslog-ng@%i + EnvironmentFile=-/etc/sysconfig/syslog-ng@%i +-ExecStart=/usr/sbin/syslog-ng -F $OTHER_OPTIONS --cfgfile $CONFIG_FILE --control $CONTROL_FILE --persist-file $PERSIST_FILE --pidfile $PID_FILE -ExecReload=/bin/kill -HUP $MAINPID -+ExecStart=@SBINDIR@/syslog-ng -F $SYSLOGNG_OPTS -p @LOCALSTATEDIR@/run/syslogd.pid ++ExecStart=@SBINDIR@/syslog-ng -F $OTHER_OPTIONS --cfgfile $CONFIG_FILE --control $CONTROL_FILE --persist-file $PERSIST_FILE --pidfile $PID_FILE +ExecReload=@BASEBINDIR@/kill -HUP $MAINPID - EnvironmentFile=-/etc/default/syslog-ng - EnvironmentFile=-/etc/sysconfig/syslog-ng StandardOutput=journal + StandardError=journal + Restart=on-failure +diff --git a/contrib/systemd/syslog-ng@default b/contrib/systemd/syslog-ng@default +index 0ccc2b9..7f08c0e 100644 +--- a/contrib/systemd/syslog-ng@default ++++ b/contrib/systemd/syslog-ng@default +@@ -1,5 +1,5 @@ + CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf +-PERSIST_FILE=/var/lib/syslog-ng/syslog-ng.persist +-CONTROL_FILE=/var/run/syslog-ng.ctl +-PID_FILE=/var/run/syslog-ng.pid ++PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist ++CONTROL_FILE=@LOCALSTATEDIR@/run/syslog-ng/syslog-ng.ctl ++PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid + OTHER_OPTIONS="--enable-core" -- -1.8.4.2 +2.7.4 diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc deleted file mode 100644 index f1bf9b06f6..0000000000 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ /dev/null @@ -1,114 +0,0 @@ -SUMMARY = "Alternative system logger daemon" -DESCRIPTION = "syslog-ng, as the name shows, is a syslogd replacement, \ -but with new functionality for the new generation. The original syslogd \ -allows messages only to be sorted based on priority/facility pairs; \ -syslog-ng adds the possibility to filter based on message contents using \ -regular expressions. The new configuration scheme is intuitive and powerful. \ -Forwarding logs over TCP and remembering all forwarding hops makes it \ -ideal for firewalled environments. \ -" -HOMEPAGE = "http://www.balabit.com/network-security/syslog-ng/opensource-logging-system" - -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=24c0c5cb2c83d9f2ab725481e4df5240" - -# util-linux added to get libuuid -DEPENDS = "libpcre flex eventlog glib-2.0 openssl util-linux" - -SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ - file://syslog-ng.conf \ - file://initscript \ - file://volatiles.03_syslog-ng \ - file://configure.ac-add-option-enable-thread-tls-to-manage-.patch \ -" - -inherit autotools gettext systemd pkgconfig update-rc.d - -EXTRA_OECONF = " \ - --enable-dynamic-linking \ - --disable-sub-streams \ - --disable-pacct \ - --localstatedir=${localstatedir}/lib/${BPN} \ - --sysconfdir=${sysconfdir}/${BPN} \ - --with-module-dir=${libdir}/${BPN} \ - --with-sysroot=${STAGING_DIR_HOST} \ - --without-mongoc --disable-mongodb \ - --with-librabbitmq-client=no \ - --disable-python \ - --disable-java --disable-java-modules \ - --with-pidfile-dir=${localstatedir}/run/${BPN} \ - ${CONFIG_TLS} \ -" - -CONFIG_TLS = "--enable-thread-tls" -CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" - -PACKAGECONFIG ??= " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \ -" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," -PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd," -PACKAGECONFIG[linux-caps] = "--enable-linux-caps,--disable-linux-caps,libcap," -PACKAGECONFIG[dbi] = "--enable-sql,--disable-sql,libdbi," -PACKAGECONFIG[libnet] = "--enable-libnet --with-libnet=${STAGING_BINDIR_CROSS},--disable-libnet,libnet," -PACKAGECONFIG[http] = "--enable-http,--disable-http,curl," -PACKAGECONFIG[smtp] = "--enable-smtp --with-libesmtp=${STAGING_LIBDIR},--disable-smtp,libesmtp," -PACKAGECONFIG[json] = "--enable-json,--disable-json,json-c," -PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wrappers," -PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," -PACKAGECONFIG[native] = "--enable-native,--disable-native,," - -do_configure_prepend() { - olddir=$(pwd) - cd ${AUTOTOOLS_SCRIPT_PATH} - - ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} -I ${S}/m4 ${ACLOCALEXTRAPATH} || die "extra autoreconf execution failed." - - cd $olddir -} - -do_install_prepend() { - sed -i -e 's,@SBINDIR@,${sbindir},g' ${S}/contrib/systemd/*.service - sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${S}/contrib/systemd/*.service - sed -i -e 's,@BASEBINDIR@,${base_bindir},g' ${S}/contrib/systemd/*.service -} - -do_install_append() { - install -d ${D}/${sysconfdir}/${BPN} - install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${BPN}/${BPN}.conf - install -d ${D}/${sysconfdir}/init.d - install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog - install -d ${D}/${sysconfdir}/default/volatiles/ - install -m 755 ${WORKDIR}/volatiles.03_syslog-ng ${D}/${sysconfdir}/default/volatiles/03_syslog-ng - install -d ${D}/${localstatedir}/lib/${BPN} - # Remove /var/run as it is created on startup - rm -rf ${D}${localstatedir}/run -} - -FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools" -RDEPENDS_${PN} += "gawk" - -# This overcomes the syslog-ng rdepends on syslog-ng-dev QA Error -PACKAGES =+ "${PN}-libs ${PN}-libs-dev ${PN}-libs-dbg" -FILES_${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" -FILES_${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" -FILES_${PN}-libs-dbg = "${libdir}/${BPN}/.debug" -FILES_${PN}-staticdev += "${libdir}/${BPN}/libtest/*.a" -INSANE_SKIP_${PN}-libs = "dev-so" -RDEPENDS_${PN} += "${PN}-libs" - -CONFFILES_${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf" - -# syslog initscript is handled explicitly because order of -# update-rc.d and update-alternatives is important -RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" - -RCONFLICTS_${PN} = "busybox-syslog sysklogd rsyslog" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${BPN}.service" - -INITSCRIPT_NAME = "syslog" -INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 90 0 1 6 ." diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.8.1.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.8.1.bb deleted file mode 100644 index 91a0e46999..0000000000 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.8.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require syslog-ng.inc - -SRC_URI += " \ - file://fix-config-libnet.patch \ - file://fix-invalid-ownership.patch \ - file://Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch \ - file://syslog-ng.service-the-syslog-ng-service.patch \ -" - -SRC_URI[md5sum] = "acf14563cf5ce435db8db35486ce66af" -SRC_URI[sha256sum] = "84b081f6e5f98cbc52052e342bcfdc5de5fe0ebe9f5ec32fe9eaec5759224cc5" diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb new file mode 100644 index 0000000000..ab4a8d1825 --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb @@ -0,0 +1,157 @@ +SUMMARY = "Alternative system logger daemon" +DESCRIPTION = "syslog-ng, as the name shows, is a syslogd replacement, \ +but with new functionality for the new generation. The original syslogd \ +allows messages only to be sorted based on priority/facility pairs; \ +syslog-ng adds the possibility to filter based on message contents using \ +regular expressions. The new configuration scheme is intuitive and powerful. \ +Forwarding logs over TCP and remembering all forwarding hops makes it \ +ideal for firewalled environments. \ +" +HOMEPAGE = "http://www.balabit.com/network-security/syslog-ng/opensource-logging-system" + +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=924958cefc9f7de3e0b818832b8a1cec" + +# util-linux added to get libuuid +DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl" + +SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ + file://syslog-ng.conf.systemd \ + file://syslog-ng.conf.sysvinit \ + file://initscript \ + file://volatiles.03_syslog-ng \ + file://syslog-ng-tmp.conf \ + file://syslog-ng.service-the-syslog-ng-service.patch \ + file://0001-Fix-buildpaths-warning.patch \ + file://0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch \ +" +SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" + +SRC_URI[sha256sum] = "b69e3360dfb96a754a4e1cbead4daef37128b1152a23572356db4ab64a475d4f" + +UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" + +CVE_STATUS[CVE-2022-38725] = "cpe-incorrect: cve-check wrongly matches cpe:2.3:a:oneidentity:syslog-ng:*:*:*:*:premium:*:*:* < 7.0.32" + +inherit autotools gettext systemd pkgconfig update-rc.d multilib_header + +EXTRA_OECONF = " \ + --enable-dynamic-linking \ + --disable-sub-streams \ + --disable-pacct \ + --localstatedir=${localstatedir}/lib/${BPN} \ + --sysconfdir=${sysconfdir}/${BPN} \ + --with-module-dir=${libdir}/${BPN} \ + --with-sysroot=${STAGING_DIR_HOST} \ + --without-mongoc --disable-mongodb \ + --with-librabbitmq-client=no \ + --disable-python \ + --disable-java --disable-java-modules \ + --with-pidfile-dir=${localstatedir}/run/${BPN} \ +" + +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \ +" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," +PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd," +PACKAGECONFIG[linux-caps] = "--enable-linux-caps,--disable-linux-caps,libcap," +PACKAGECONFIG[dbi] = "--enable-sql,--disable-sql,libdbi," +PACKAGECONFIG[spoof-source] = "--enable-spoof-source --with-libnet=${STAGING_BINDIR_CROSS},--disable-spoof-source,libnet," +PACKAGECONFIG[http] = "--enable-http,--disable-http,curl," +PACKAGECONFIG[smtp] = "--enable-smtp --with-libesmtp=${STAGING_LIBDIR},--disable-smtp,libesmtp," +PACKAGECONFIG[json] = "--enable-json,--disable-json,json-c," +PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wrappers," +PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," +PACKAGECONFIG[native] = "--enable-native,--disable-native,," + +do_configure:prepend() { + olddir=$(pwd) + cd ${AUTOTOOLS_SCRIPT_PATH} + + ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} -I ${S}/m4 ${ACLOCALEXTRAPATH} || die "extra autoreconf execution failed." + + cd $olddir +} + +do_install:append() { + install -d ${D}${sysconfdir}/${BPN} + install -d ${D}${sysconfdir}/init.d + install -m 755 ${UNPACKDIR}/initscript ${D}${sysconfdir}/init.d/syslog + + install -d ${D}${sysconfdir}/default/volatiles/ + install -m 644 ${UNPACKDIR}/volatiles.03_syslog-ng ${D}${sysconfdir}/default/volatiles/03_syslog-ng + install -d ${D}${sysconfdir}/tmpfiles.d/ + install -m 644 ${UNPACKDIR}/syslog-ng-tmp.conf ${D}${sysconfdir}/tmpfiles.d/syslog-ng.conf + + install -d ${D}${localstatedir}/lib/${BPN} + # Remove /var/run as it is created on startup + rm -rf ${D}${localstatedir}/run + + # it causes install conflict when multilib enabled + # since python support is disabled, not deliver it + rm -f ${D}${bindir}/syslog-ng-update-virtualenv + + # support for systemd + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -m 644 ${UNPACKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf + + install -d ${D}${systemd_unitdir}/system/ + install -m 644 ${S}/contrib/systemd/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service + install -m 644 ${S}/contrib/systemd/${BPN}@default ${D}${sysconfdir}/default/${BPN}@default + + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default + sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default + sed -i -e 's,@BASEBINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default + + install -d ${D}${systemd_unitdir}/system/multi-user.target.wants + ln -sf ../${BPN}@.service ${D}${systemd_unitdir}/system/multi-user.target.wants/${BPN}@default.service + else + install -m 644 ${UNPACKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf + fi + + oe_multilib_header syslog-ng/syslog-ng-config.h +} + +FILES:${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools ${systemd_unitdir}/system/multi-user.target.wants/*" +RDEPENDS:${PN} += "gawk ${@bb.utils.contains('PACKAGECONFIG','json','${PN}-jconf','',d)}" + +FILES:${PN}-jconf += " \ +${datadir}/${BPN}/include/scl/cim \ +${datadir}/${BPN}/include/scl/elasticsearch \ +${datadir}/${BPN}/include/scl/ewmm \ +${datadir}/${BPN}/include/scl/graylog2 \ +${datadir}/${BPN}/include/scl/loggly \ +${datadir}/${BPN}/include/scl/logmatic \ +" + +# This overcomes the syslog-ng rdepends on syslog-ng-dev QA Error +PACKAGES =+ "${PN}-jconf ${PN}-libs ${PN}-libs-dev" +RPROVIDES:${PN}-dbg += "${PN}-libs-dbg" +FILES:${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" +FILES:${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" +FILES:${PN}-staticdev += "${libdir}/${BPN}/libtest/*.a" +FILES:${PN} += "${systemd_unitdir}/system/*.service" +INSANE_SKIP:${PN}-libs = "dev-so" +RDEPENDS:${PN} += "${PN}-libs" + +CONFFILES:${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf" + +RCONFLICTS:${PN} = "busybox-syslog sysklogd rsyslog" +RCONFLICTS:${PN}-libs = "busybox-syslog sysklogd rsyslog" + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "${BPN}@.service" + +INITSCRIPT_NAME = "syslog" +INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 90 0 1 6 ." + +# Fails only with 32bit MACHINEs +# http://errors.yoctoproject.org/Errors/Details/766956/ +# syslog-ng-4.6.0/modules/secure-logging/slog.c:937:63: error: passing argument 4 of 'g_io_channel_write_chars' from incompatible pointer type [-Wincompatible-pointer-types] +# syslog-ng-4.6.0/modules/secure-logging/slog.c:955:99: error: passing argument 5 of 'cmac' from incompatible pointer type [-Wincompatible-pointer-types] +# syslog-ng-4.6.0/modules/secure-logging/slog.c:959:74: error: passing argument 4 of 'g_io_channel_write_chars' from incompatible pointer type [-Wincompatible-pointer-types] +# syslog-ng-4.6.0/modules/secure-logging/slog.c:975:107: error: passing argument 4 of 'g_io_channel_write_chars' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb b/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb index 26b4412f52..db4c395c56 100644 --- a/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb +++ b/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb @@ -1,12 +1,12 @@ DESCRIPTION = "a graphical user interface that allows the user to \ change the default keyboard of the system" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://fedorahosted.org/releases/s/y/${BPN}/${BP}.tar.bz2" SRC_URI[md5sum] = "c267db0ee7a2131ba418399dc17f9e72" SRC_URI[sha256sum] = "218c883e4e2bfcc82bfe07e785707b5c2ece28df772f2155fd044b9bb1614284" -inherit python-dir gettext +inherit python3-dir gettext DEPENDS += "intltool-native gettext-native" EXTRA_OEMAKE = " \ @@ -17,11 +17,11 @@ do_install() { oe_runmake 'DESTDIR=${D}' install } -do_install_append_class-native() { +do_install:append:class-native() { rm -rf ${D}/usr } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/python${PYTHON_BASEVERSION}/* \ ${datadir}/* \ " diff --git a/meta-oe/recipes-support/tbb/tbb.bb b/meta-oe/recipes-support/tbb/tbb.bb deleted file mode 100644 index bad9481f7d..0000000000 --- a/meta-oe/recipes-support/tbb/tbb.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "Parallelism library for C++ - runtime files \ - TBB is a library that helps you leverage multi-core processor \ - performance without having to be a threading expert. It represents a \ - higher-level, task-based parallelism that abstracts platform details \ - and threading mechanism for performance and scalability." -HOMEPAGE = "http://threadingbuildingblocks.org/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -PRDATE = "20170412" -BRANCH = "tbb_2017" -SRCREV = "a2cfdfe946933cbe38bffe1d8086ae36f06691a3" -PV = "${PRDATE}+${SRCPV}" -SRC_URI = "git://github.com/01org/tbb;branch=${BRANCH} \ - file://cross-compile.patch \ - file://0001-mallinfo-is-glibc-specific-API-mark-it-so.patch \ - file://tbb.pc \ -" - -S = "${WORKDIR}/git" - -COMPILER ?= "gcc" -COMPILER_toolchain-clang = "clang" - -do_compile() { - oe_runmake compiler=${COMPILER} arch=${HOST_ARCH} runtime=cc4 -} - -do_install() { - install -d ${D}${includedir} ${D}${libdir}/pkgconfig - rm ${S}/include/tbb/index.html -f - cp -R --no-dereference --preserve=mode,links -v ${S}/include/tbb ${D}${includedir} - install -m 0755 ${B}/build/linux_*_release/lib*.so* ${D}${libdir} - install -m 0644 ${WORKDIR}/tbb.pc ${D}${libdir}/pkgconfig -} - -# fails with thumb enabled: -# | arm-oe-linux-gnueabi-g++ -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a9 -mcpu=cortex-a9 -D__ARM__ -D__LINUX_ARM_ARCH__=7 -funwind-tables -mvectorize-with-neon-quad -rdynamic --sysroot=/OE/sysroots/m14tv -c -MMD -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD -fPIC -D__TBB_BUILD=1 -Wall -Wno-parentheses -Wno-non-virtual-dtor -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I../../src -I../../src/rml/include -I../../include ../../src/tbb/concurrent_queue.cpp -# | {standard input}: Assembler messages: -# | {standard input}:250: Error: thumb conditional instruction should be in IT block -- `strexeq r2,r3,[r4]' -# ... -# | make[1]: *** [concurrent_queue.o] Error 1 -ARM_INSTRUCTION_SET = "arm" -SECURITY_CFLAGS_append = " -fPIC" - diff --git a/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch b/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch deleted file mode 100644 index 7e66945fa2..0000000000 --- a/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6b2b136caa68912d77ffe26143cd3da768b9ef80 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 3 Jun 2017 08:39:37 -0700 -Subject: [PATCH] mallinfo() is glibc specific API mark it so - -Helps compiling with musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/tbbmalloc/proxy.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/tbbmalloc/proxy.cpp b/src/tbbmalloc/proxy.cpp -index 5ef279d..06c4872 100644 ---- a/src/tbbmalloc/proxy.cpp -+++ b/src/tbbmalloc/proxy.cpp -@@ -185,6 +185,7 @@ int mallopt(int /*param*/, int /*value*/) __THROW - return 1; - } - -+#ifdef __GLIBC__ - struct mallinfo mallinfo() __THROW - { - struct mallinfo m; -@@ -192,6 +193,7 @@ struct mallinfo mallinfo() __THROW - - return m; - } -+#endif - - #if __ANDROID__ - // Android doesn't have malloc_usable_size, provide it to be compatible --- -2.13.0 - diff --git a/meta-oe/recipes-support/tbb/tbb/cross-compile.patch b/meta-oe/recipes-support/tbb/tbb/cross-compile.patch deleted file mode 100644 index d54b307ee9..0000000000 --- a/meta-oe/recipes-support/tbb/tbb/cross-compile.patch +++ /dev/null @@ -1,39 +0,0 @@ -Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - -Upstream-Status: unsuitable ---- - build/linux.gcc.inc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -Index: tbb2017_20170118oss/build/linux.gcc.inc -=================================================================== ---- tbb2017_20170118oss.orig/build/linux.gcc.inc -+++ tbb2017_20170118oss/build/linux.gcc.inc -@@ -32,8 +32,9 @@ DYLIB_KEY = -shared - EXPORT_KEY = -Wl,--version-script, - LIBDL = -ldl - --CPLUS = g++ --CONLY = gcc -+CPLUS = $(CXX) -+CONLY = $(CC) -+CPLUS_FLAGS = $(CXXFLAGS) - LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) - LIBS += -lpthread -lrt - LINK_FLAGS = -Wl,-rpath-link=. -rdynamic -Index: tbb2017_20170118oss/build/linux.clang.inc -=================================================================== ---- tbb2017_20170118oss.orig/build/linux.clang.inc -+++ tbb2017_20170118oss/build/linux.clang.inc -@@ -31,8 +31,9 @@ DYLIB_KEY = -shared - EXPORT_KEY = -Wl,--version-script, - LIBDL = -ldl - --CPLUS = clang++ --CONLY = clang -+CPLUS = $(CXX) -+CONLY = $(CC) -+CPLUS_FLAGS = $(CXXFLAGS) - LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) - LIBS += -lpthread -lrt - LINK_FLAGS = -Wl,-rpath-link=. -rdynamic diff --git a/meta-oe/recipes-support/tbb/tbb/tbb.pc b/meta-oe/recipes-support/tbb/tbb/tbb.pc deleted file mode 100644 index 644b64fbf4..0000000000 --- a/meta-oe/recipes-support/tbb/tbb/tbb.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Threading Building Blocks -Description: Intel's parallelism library for C++ -URL: http://www.threadingbuildingblocks.org/ -Version: 3.0+r018 -Libs: -L${libdir} -ltbb -Cflags: -I${includedir} diff --git a/meta-oe/recipes-support/tbb/tbb_2021.13.0.bb b/meta-oe/recipes-support/tbb/tbb_2021.13.0.bb new file mode 100644 index 0000000000..e2b7543c0f --- /dev/null +++ b/meta-oe/recipes-support/tbb/tbb_2021.13.0.bb @@ -0,0 +1,63 @@ +DESCRIPTION = "Parallelism library for C++ - runtime files \ + TBB is a library that helps you leverage multi-core processor \ + performance without having to be a threading expert. It represents a \ + higher-level, task-based parallelism that abstracts platform details \ + and threading mechanism for performance and scalability." +HOMEPAGE = "https://software.intel.com/en-us/tbb" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327" + +DEPENDS:append:libc-musl = " libucontext" +DEPENDS:append:class-target = " hwloc" + +PE = "1" + +BRANCH = "onetbb_2021" +SRCREV = "1c4c93fc5398c4a1acb3492c02db4699f3048dea" +SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ + " + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +# test build fails, error: 'mallinfo mallinfo()' is deprecated +EXTRA_OECMAKE += " \ + -DTBB_TEST=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DTBB_STRICT=OFF \ + " + +# Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi) +# tmp-glibc/work/riscv64-oe-linux/tbb/1_2021.7.0-r0/recipe-sysroot-native/usr/bin/riscv64-oe-linux/riscv64-oe-linux-ld: /tmp/lto-llvm-264bc2.o: can't link soft-float modules with double-float modules +# tmp-glibc/work/riscv64-oe-linux/tbb/1_2021.7.0-r0/recipe-sysroot-native/usr/bin/riscv64-oe-linux/riscv64-oe-linux-ld: failed to merge target specific data of file /tmp/lto-llvm-264bc2.o +EXTRA_OECMAKE:append:riscv32:toolchain-clang = " -DTBB_ENABLE_IPO=OFF " +EXTRA_OECMAKE:append:riscv64:toolchain-clang = " -DTBB_ENABLE_IPO=OFF " + +# fails with thumb enabled: +# | arm-oe-linux-gnueabi-g++ -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a9 -mcpu=cortex-a9 -D__ARM__ -D__LINUX_ARM_ARCH__=7 -funwind-tables -mvectorize-with-neon-quad -rdynamic --sysroot=/OE/sysroots/m14tv -c -MMD -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD -fPIC -D__TBB_BUILD=1 -Wall -Wno-parentheses -Wno-non-virtual-dtor -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I../../src -I../../src/rml/include -I../../include ../../src/tbb/concurrent_queue.cpp +# | {standard input}: Assembler messages: +# | {standard input}:250: Error: thumb conditional instruction should be in IT block -- `strexeq r2,r3,[r4]' +# ... +# | make[1]: *** [concurrent_queue.o] Error 1 +ARM_INSTRUCTION_SET = "arm" + +ASNEEDED = "" + +LDFLAGS:append:mips = " -latomic" +LDFLAGS:append:mipsel = " -latomic" +LDFLAGS:append:riscv32:toolchain-clang = " -latomic" + +LDFLAGS:append:libc-musl = " -lucontext" + +# The latest version of oneTBB does not support PPC +COMPATIBLE_MACHINE:powerpc = "(!.*ppc).*" + + +do_install:append:class-target() { + # fix for qa check buildpaths + sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/cmake/TBB/TBBTargets.cmake +} + + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch b/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch deleted file mode 100644 index b4cdda1327..0000000000 --- a/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e8be402e20cbdfbd8192a171ac9904d9362103bf Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 31 Aug 2016 01:35:40 -0400 -Subject: [PATCH] do not strip pdata_tools at do_install - -It caused QA Issue: --------------- -|ERROR: QA Issue: File '/usr/sbin/pdata_tools' from thin-provisioning-tools -was already stripped, this will prevent future debugging! [already-stripped] --------------- - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 4264191..ac22042 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -189,7 +189,6 @@ distclean: clean - install: bin/pdata_tools - $(INSTALL_DIR) $(BINDIR) - $(INSTALL_PROGRAM) bin/pdata_tools $(BINDIR) -- $(STRIP) $(BINDIR)/pdata_tools - ln -s -f pdata_tools $(BINDIR)/cache_check - ln -s -f pdata_tools $(BINDIR)/cache_dump - ln -s -f pdata_tools $(BINDIR)/cache_metadata_size --- -2.8.1 - diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc new file mode 100644 index 0000000000..c5c059dd1a --- /dev/null +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc @@ -0,0 +1,216 @@ +# Autogenerated with 'bitbake -c update_crates thin-provisioning-tools' + +# from Cargo.lock +SRC_URI += " \ + crate://crates.io/adler/1.0.2 \ + crate://crates.io/aho-corasick/1.1.3 \ + crate://crates.io/anstyle/1.0.7 \ + crate://crates.io/anyhow/1.0.86 \ + crate://crates.io/atty/0.2.14 \ + crate://crates.io/autocfg/1.3.0 \ + crate://crates.io/base64/0.22.1 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/bitflags/2.6.0 \ + crate://crates.io/bytemuck/1.16.1 \ + crate://crates.io/byteorder/1.5.0 \ + crate://crates.io/cassowary/0.3.0 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/clap/4.5.9 \ + crate://crates.io/clap_builder/4.5.9 \ + crate://crates.io/clap_lex/0.7.1 \ + crate://crates.io/console/0.15.8 \ + crate://crates.io/crc32c/0.6.8 \ + crate://crates.io/crc32fast/1.4.2 \ + crate://crates.io/data-encoding/2.6.0 \ + crate://crates.io/downcast/0.11.0 \ + crate://crates.io/duct/0.13.7 \ + crate://crates.io/encode_unicode/0.3.6 \ + crate://crates.io/env_logger/0.8.4 \ + crate://crates.io/errno/0.3.9 \ + crate://crates.io/exitcode/1.1.2 \ + crate://crates.io/fastrand/2.1.0 \ + crate://crates.io/fixedbitset/0.4.2 \ + crate://crates.io/flate2/1.0.30 \ + crate://crates.io/fragile/2.0.0 \ + crate://crates.io/getrandom/0.2.15 \ + crate://crates.io/hermit-abi/0.1.19 \ + crate://crates.io/hermit-abi/0.3.9 \ + crate://crates.io/indicatif/0.17.8 \ + crate://crates.io/instant/0.1.13 \ + crate://crates.io/iovec/0.1.4 \ + crate://crates.io/lazy_static/1.5.0 \ + crate://crates.io/libc/0.2.155 \ + crate://crates.io/linux-raw-sys/0.4.14 \ + crate://crates.io/log/0.4.22 \ + crate://crates.io/memchr/2.7.4 \ + crate://crates.io/minimal-lexical/0.2.1 \ + crate://crates.io/miniz_oxide/0.7.4 \ + crate://crates.io/mockall/0.12.1 \ + crate://crates.io/mockall_derive/0.12.1 \ + crate://crates.io/nom/7.1.3 \ + crate://crates.io/num-derive/0.4.2 \ + crate://crates.io/num-traits/0.2.19 \ + crate://crates.io/num_cpus/1.16.0 \ + crate://crates.io/number_prefix/0.4.0 \ + crate://crates.io/numtoa/0.1.0 \ + crate://crates.io/once_cell/1.19.0 \ + crate://crates.io/os_pipe/1.2.0 \ + crate://crates.io/portable-atomic/1.6.0 \ + crate://crates.io/ppv-lite86/0.2.17 \ + crate://crates.io/predicates/3.1.0 \ + crate://crates.io/predicates-core/1.0.6 \ + crate://crates.io/predicates-tree/1.0.9 \ + crate://crates.io/proc-macro2/1.0.86 \ + crate://crates.io/quick-xml/0.36.0 \ + crate://crates.io/quickcheck/1.0.3 \ + crate://crates.io/quickcheck_macros/1.0.0 \ + crate://crates.io/quote/1.0.36 \ + crate://crates.io/rand/0.8.5 \ + crate://crates.io/rand_chacha/0.3.1 \ + crate://crates.io/rand_core/0.6.4 \ + crate://crates.io/rangemap/1.5.1 \ + crate://crates.io/redox_syscall/0.2.16 \ + crate://crates.io/redox_termios/0.1.3 \ + crate://crates.io/regex/1.10.5 \ + crate://crates.io/regex-automata/0.4.7 \ + crate://crates.io/regex-syntax/0.8.4 \ + crate://crates.io/roaring/0.10.6 \ + crate://crates.io/rustc_version/0.4.0 \ + crate://crates.io/rustix/0.38.34 \ + crate://crates.io/safemem/0.3.3 \ + crate://crates.io/semver/1.0.23 \ + crate://crates.io/shared_child/1.0.0 \ + crate://crates.io/strsim/0.11.1 \ + crate://crates.io/syn/1.0.109 \ + crate://crates.io/syn/2.0.70 \ + crate://crates.io/tempfile/3.10.1 \ + crate://crates.io/termion/1.5.6 \ + crate://crates.io/termtree/0.4.1 \ + crate://crates.io/thiserror/1.0.61 \ + crate://crates.io/thiserror-impl/1.0.61 \ + crate://crates.io/threadpool/1.8.1 \ + crate://crates.io/tui/0.19.0 \ + crate://crates.io/unicode-ident/1.0.12 \ + crate://crates.io/unicode-segmentation/1.11.0 \ + crate://crates.io/unicode-width/0.1.13 \ + crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ + crate://crates.io/winapi/0.3.9 \ + crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/windows-sys/0.52.0 \ + crate://crates.io/windows-targets/0.52.6 \ + crate://crates.io/windows_aarch64_gnullvm/0.52.6 \ + crate://crates.io/windows_aarch64_msvc/0.52.6 \ + crate://crates.io/windows_i686_gnu/0.52.6 \ + crate://crates.io/windows_i686_gnullvm/0.52.6 \ + crate://crates.io/windows_i686_msvc/0.52.6 \ + crate://crates.io/windows_x86_64_gnu/0.52.6 \ + crate://crates.io/windows_x86_64_gnullvm/0.52.6 \ + crate://crates.io/windows_x86_64_msvc/0.52.6 \ +" + +SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +SRC_URI[anstyle-1.0.7.sha256sum] = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +SRC_URI[anyhow-1.0.86.sha256sum] = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +SRC_URI[base64-0.22.1.sha256sum] = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +SRC_URI[bitflags-2.6.0.sha256sum] = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +SRC_URI[bytemuck-1.16.1.sha256sum] = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +SRC_URI[cassowary-0.3.0.sha256sum] = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" +SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +SRC_URI[clap-4.5.9.sha256sum] = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +SRC_URI[clap_builder-4.5.9.sha256sum] = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +SRC_URI[clap_lex-0.7.1.sha256sum] = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" +SRC_URI[console-0.15.8.sha256sum] = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +SRC_URI[crc32c-0.6.8.sha256sum] = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47" +SRC_URI[crc32fast-1.4.2.sha256sum] = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +SRC_URI[data-encoding-2.6.0.sha256sum] = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +SRC_URI[downcast-0.11.0.sha256sum] = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" +SRC_URI[duct-0.13.7.sha256sum] = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" +SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +SRC_URI[env_logger-0.8.4.sha256sum] = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +SRC_URI[errno-0.3.9.sha256sum] = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +SRC_URI[exitcode-1.1.2.sha256sum] = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193" +SRC_URI[fastrand-2.1.0.sha256sum] = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +SRC_URI[fixedbitset-0.4.2.sha256sum] = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +SRC_URI[flate2-1.0.30.sha256sum] = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +SRC_URI[fragile-2.0.0.sha256sum] = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" +SRC_URI[getrandom-0.2.15.sha256sum] = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +SRC_URI[hermit-abi-0.3.9.sha256sum] = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +SRC_URI[indicatif-0.17.8.sha256sum] = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +SRC_URI[instant-0.1.13.sha256sum] = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +SRC_URI[iovec-0.1.4.sha256sum] = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +SRC_URI[linux-raw-sys-0.4.14.sha256sum] = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +SRC_URI[log-0.4.22.sha256sum] = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +SRC_URI[miniz_oxide-0.7.4.sha256sum] = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +SRC_URI[mockall-0.12.1.sha256sum] = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +SRC_URI[mockall_derive-0.12.1.sha256sum] = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +SRC_URI[num-derive-0.4.2.sha256sum] = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" +SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +SRC_URI[os_pipe-1.2.0.sha256sum] = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" +SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +SRC_URI[predicates-3.1.0.sha256sum] = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +SRC_URI[predicates-core-1.0.6.sha256sum] = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" +SRC_URI[predicates-tree-1.0.9.sha256sum] = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +SRC_URI[quick-xml-0.36.0.sha256sum] = "4091e032efecb09d7b1f711f487b85ab925632a842627e3200fb088382cde32c" +SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +SRC_URI[quickcheck_macros-1.0.0.sha256sum] = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" +SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +SRC_URI[rangemap-1.5.1.sha256sum] = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" +SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +SRC_URI[redox_termios-0.1.3.sha256sum] = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" +SRC_URI[regex-1.10.5.sha256sum] = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +SRC_URI[regex-automata-0.4.7.sha256sum] = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +SRC_URI[regex-syntax-0.8.4.sha256sum] = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +SRC_URI[roaring-0.10.6.sha256sum] = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1" +SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +SRC_URI[rustix-0.38.34.sha256sum] = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +SRC_URI[safemem-0.3.3.sha256sum] = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +SRC_URI[semver-1.0.23.sha256sum] = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +SRC_URI[shared_child-1.0.0.sha256sum] = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +SRC_URI[syn-2.0.70.sha256sum] = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" +SRC_URI[tempfile-3.10.1.sha256sum] = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +SRC_URI[termion-1.5.6.sha256sum] = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" +SRC_URI[termtree-0.4.1.sha256sum] = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +SRC_URI[thiserror-1.0.61.sha256sum] = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +SRC_URI[thiserror-impl-1.0.61.sha256sum] = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +SRC_URI[threadpool-1.8.1.sha256sum] = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +SRC_URI[tui-0.19.0.sha256sum] = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" +SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +SRC_URI[unicode-segmentation-1.11.0.sha256sum] = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +SRC_URI[unicode-width-0.1.13.sha256sum] = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc new file mode 100644 index 0000000000..ceea67c364 --- /dev/null +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc @@ -0,0 +1,6 @@ +SRC_URI += "\ + git://github.com/jthornber/rio;protocol=https;nobranch=1;name=rio;destsuffix=rio;type=git-dependency \ +" + +SRCREV_FORMAT .= "_rio" +SRCREV_rio = "2979a720f671e836302c01546f9cc9f7988610c8" diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.6.3.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.6.3.bb deleted file mode 100755 index c9d6690d71..0000000000 --- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.6.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Tools of dm-thin device-mapper" -DESCRIPTION = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target." -HOMEPAGE = "https://github.com/jthornber/thin-provisioning-tools" -LICENSE = "GPLv3" -SECTION = "devel" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -S = "${WORKDIR}/git" - -SRC_URI = "git://github.com/jthornber/thin-provisioning-tools \ - file://0001-do-not-strip-pdata_tools-at-do_install.patch \ -" - -SRCREV = "49bfc12e9c7956c1ac134b24afbe1a6a602ce7d5" - -DEPENDS += "expat libaio boost" - -inherit autotools-brokensep diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.13.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.13.bb new file mode 100644 index 0000000000..1d3c797244 --- /dev/null +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.13.bb @@ -0,0 +1,52 @@ +SUMMARY = "Tools of dm-thin device-mapper" +DESCRIPTION = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target." +HOMEPAGE = "https://github.com/jthornber/thin-provisioning-tools" +LICENSE = "GPL-3.0-only" +SECTION = "devel" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +S = "${WORKDIR}/git" + +SRC_URI = " \ + git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ + " + +SRCREV = "116c05345bed5fe727992c3458311606d5443ff6" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +inherit cargo cargo-update-recipe-crates + +require ${BPN}-crates.inc +require ${BPN}-git-crates.inc + +do_install:append() { + install -d ${D}${sbindir} + mv ${D}${bindir}/pdata_tools ${D}${sbindir}/pdata_tools + rmdir --ignore-fail-on-non-empty ${D}${bindir} + + for tool in cache_check \ + cache_dump \ + cache_metadata_size \ + cache_repair \ + cache_restore \ + cache_writeback \ + thin_check \ + thin_delta \ + thin_dump \ + thin_ls \ + thin_metadata_size \ + thin_metadata_pack \ + thin_metadata_unpack \ + thin_repair \ + thin_restore \ + thin_rmap \ + thin_shrink \ + thin_trim \ + era_check \ + era_dump \ + era_invalidate \ + era_repair \ + era_restore; do + ln -sf pdata_tools ${D}${sbindir}/$tool + done +} diff --git a/meta-oe/recipes-support/tio/tio_2.7.bb b/meta-oe/recipes-support/tio/tio_2.7.bb new file mode 100644 index 0000000000..59c772b5d0 --- /dev/null +++ b/meta-oe/recipes-support/tio/tio_2.7.bb @@ -0,0 +1,19 @@ +SUMMARY = "tio - a simple serial device I/O tool" +DESCRIPTION = "tio is a simple serial device tool which features a \ + straightforward command-line and configuration file interface to easily \ + connect to serial TTY devices for basic I/O operations." + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0e1a95b7892d3015ecd6d0016f601f2c" + +SRC_URI = "git://github.com/tio/tio;protocol=https;branch=master" +SRCREV = "1c32555c2a4f26b60f94757656825fc6684d6892" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +DEPENDS += " libinih" +RDEPENDS:${PN} += " libinih" + +FILES:${PN} += " /usr/share/bash-completion/completions/tio " diff --git a/meta-oe/recipes-support/tokyocabinet/tokyocabinet/0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch b/meta-oe/recipes-support/tokyocabinet/tokyocabinet/0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch new file mode 100644 index 0000000000..001fa9dd75 --- /dev/null +++ b/meta-oe/recipes-support/tokyocabinet/tokyocabinet/0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch @@ -0,0 +1,58 @@ +From e192da006dd9b0ecbbef540a3e86b65ff88e89e2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 13:28:29 -0700 +Subject: [PATCH] configure: Fix check functions for AC_CHECK_LIB test + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.in | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/configure.in b/configure.in +index 5b24947..0542490 100644 +--- a/configure.in ++++ b/configure.in +@@ -247,30 +247,30 @@ test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS" + AC_C_BIGENDIAN(MYCPPFLAGS="$MYCPPFLAGS -D_MYBIGEND") + + # Underlying libraries +-AC_CHECK_LIB(c, main) +-AC_CHECK_LIB(m, main) ++AC_CHECK_LIB(c, printf) ++AC_CHECK_LIB(m, pow) + if test "$enable_pthread" != "no" + then +- AC_CHECK_LIB(pthread, main) +- AC_CHECK_LIB(rt, main) ++ AC_CHECK_LIB(pthread, pthread_create) ++ AC_CHECK_LIB(rt, clock_gettime) + fi + if test "$enable_zlib" != "no" + then +- AC_CHECK_LIB(z, main) ++ AC_CHECK_LIB(z, inflate) + fi + if test "$enable_bzip" != "no" + then +- AC_CHECK_LIB(bz2, main) ++ AC_CHECK_LIB(bz2, BZ2_bzCompressInit) + fi + if test "$enable_exlzma" = "yes" + then +- AC_CHECK_LIB(lzma, main) ++ AC_CHECK_LIB(lzma, lzma_easy_buffer_encode) + fi + if test "$enable_exlzo" = "yes" + then +- AC_CHECK_LIB(lzo2, main) ++ AC_CHECK_LIB(lzo2, lzo1x_1_compress) + fi +-AC_CHECK_LIB(tokyocabinet, main, AC_MSG_WARN([old version of Tokyo Cabinet was detected])) ++AC_CHECK_LIB(tokyocabinet, tcbdbopen, AC_MSG_WARN([old version of Tokyo Cabinet was detected])) + + # Necessary headers + AC_CHECK_HEADER(stdlib.h, true, AC_MSG_ERROR([stdlib.h is required])) +-- +2.37.3 + diff --git a/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb b/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb index 9f75cf047d..ae00ff4e55 100644 --- a/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb +++ b/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb @@ -12,11 +12,12 @@ Records are organized in hash table, B+ tree, or fixed-length array." HOMEPAGE = "http://fallabs.com/tokyocabinet/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" SRC_URI = "http://fallabs.com/tokyocabinet/${BP}.tar.gz \ file://remove-hard-coded-include-and-lib-paths.patch \ + file://0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch \ " SRC_URI[md5sum] = "fd03df6965f8f56dd5b8518ca43b4f5e" diff --git a/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb b/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb deleted file mode 100644 index 4a1b4ce670..0000000000 --- a/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "TOMOYO Linux tools" -DESCRIPTION = "TOMOYO Linux is a Mandatory Access Control (MAC) implementation \ -for Linux that can be used to increase the security of a system, while also \ -being useful purely as a system analysis tool." -HOMEPAGE = "http://tomoyo.sourceforge.jp/" -SECTION = "System Environment/Kernel" - -SRC_URI = "http://jaist.dl.sourceforge.jp/tomoyo/53357/${BP}-20140601.tar.gz" -SRC_URI[md5sum] = "888869b793127f00d6439a3246598b83" -SRC_URI[sha256sum] = "118ef6ba1fbf7c0b83018c3a0d4d5485dfb9b5b7f647f37ce9f63841a3133c2a" - -S = "${WORKDIR}/${BPN}" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING.tomoyo;md5=751419260aa954499f7abaabaa882bbe" - -FILES_${PN} += "${libdir}/tomoyo" -FILES_${PN}-dbg += "${libdir}/tomoyo/.debug" - -DEPENDS = "linux-libc-headers ncurses" - -EXTRA_OEMAKE = "-e USRLIBDIR=${libdir}" - -do_compile () { - oe_runmake 'CC=${CC}' -} - -do_install() { - oe_runmake install INSTALLDIR=${D} -} diff --git a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb deleted file mode 100644 index aa031fef87..0000000000 --- a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "A very small and simple terminal emulator" -SECTION = "x11/applications" -DEPENDS = "vte9" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://main.c;start_line=5;end_line=16;md5=9ae4bf20caf291afa94530026bd15229" - -# 0.2 version -SRCREV = "8586d617aed19fc75f5ae1e07270752c1b2f9a30" -SRC_URI = "git://github.com/OSSystems/toscoterm.git" - -S = "${WORKDIR}/git" - -inherit gitpkgv pkgconfig - -do_compile() { - oe_runmake \ - CC="${CC}" \ - CFLAGS="`pkg-config --cflags vte`${CFLAGS}" \ - LDFLAGS="`pkg-config --libs vte` ${LDFLAGS}" -} - -do_install() { - oe_runmake PREFIX="${prefix}" DESTDIR="${D}" install -} - -RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-ibm437" diff --git a/meta-oe/recipes-support/tree/tree_1.7.0.bb b/meta-oe/recipes-support/tree/tree_2.1.3.bb index 2e8ebdb4d9..79e0d5e10b 100644 --- a/meta-oe/recipes-support/tree/tree_1.7.0.bb +++ b/meta-oe/recipes-support/tree/tree_2.1.3.bb @@ -1,12 +1,11 @@ SUMMARY = "A recursive directory listing command" -HOMEPAGE = "http://mama.indstate.edu/users/ice/tree/" +HOMEPAGE = "https://oldmanprogrammer.net/source.php?dir=projects/tree" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" -SRC_URI = "ftp://mama.indstate.edu/linux/${BPN}/${BP}.tgz" -SRC_URI[md5sum] = "abe3e03e469c542d8e157cdd93f4d8a6" -SRC_URI[sha256sum] = "6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12" +SRC_URI = "https://oldmanprogrammer.net/tar/tree/${BP}.tgz" +SRC_URI[sha256sum] = "c24c9bfbbb3bd31a43b16898f74fd338cfcf348e914de81438ddfcf052076ff4" # tree's default CFLAGS for Linux CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" diff --git a/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb b/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb new file mode 100644 index 0000000000..3e164cc26f --- /dev/null +++ b/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb @@ -0,0 +1,8 @@ +SUMMARY = "uchardet is an encoding detector library" +LICENSE = "MPL-1.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ecda54f6f525388d71d6b3cd92f7474" + +inherit cmake + +SRC_URI = "https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.8.tar.xz" +SRC_URI[sha256sum] = "e97a60cfc00a1c147a674b097bb1422abd9fa78a2d9ce3f3fdcc2e78a34ac5f0" diff --git a/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch b/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch deleted file mode 100644 index 3cc040075f..0000000000 --- a/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 32278297170ffb49116b5789e4a0588b99d02bd0 Mon Sep 17 00:00:00 2001 -From: Amarnath Valluri <amarnath.valluri@intel.com> -Date: Thu, 9 Feb 2017 11:02:53 +0200 -Subject: [PATCH] Make udev rules directory configurable. - -udev rules directory can be configurable via undevrulesdir variable. And use -libdir, sbindir for installing librares and binaries. - -Upstream-Status: Inappropriate[Embedded specific] - -Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> ---- - configure.ac | 14 +++----------- - data/Makefile.am | 1 - - src/probers/Makefile.am | 2 +- - tools/Makefile.am | 2 +- - 4 files changed, 5 insertions(+), 14 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8c4e4c2..a143397 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -227,15 +227,8 @@ if test "x$GCC" = "xyes"; then - LDFLAGS="-Wl,--as-needed $LDFLAGS" - fi - --if test "$prefix" = "/usr" -o "$prefix" = "/usr/local" ; then -- slashlibdir=/lib -- slashsbindir=/sbin --else -- slashlibdir=$prefix/lib -- slashsbindir=$prefix/sbin --fi --AC_SUBST(slashlibdir) --AC_SUBST(slashsbindir) -+udevrulesdir=/lib/udev/udev.d -+AC_SUBST(udevrulesdir) - - # ************* - # Remote Access -@@ -299,8 +292,7 @@ echo " - sysconfdir: ${sysconfdir} - localstatedir: ${localstatedir} - docdir: ${docdir} -- slashlibdir: ${slashlibdir} -- slashsbindir: ${slashsbindir} -+ udevrulesdir: ${udevrulesdir} - systemdsystemunitdir: ${systemdsystemunitdir} - - compiler: ${CC} -diff --git a/data/Makefile.am b/data/Makefile.am -index 411ea0f..4834960 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -34,7 +34,6 @@ $(systemdservice_DATA): $(systemdservice_in_files) Makefile - @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@ - endif - --udevrulesdir = $(slashlibdir)/udev/rules.d - udevrules_DATA = 80-udisks.rules - - pkgconfigdir = $(datadir)/pkgconfig -diff --git a/src/probers/Makefile.am b/src/probers/Makefile.am -index 01c693b..6a0361a 100644 ---- a/src/probers/Makefile.am -+++ b/src/probers/Makefile.am -@@ -20,7 +20,7 @@ INCLUDES = \ - # TODO: ideally move most of this to udev and/or util-linux - # - --udevhelperdir = $(slashlibdir)/udev -+udevhelperdir = $(libdir)/udev - udevhelper_PROGRAMS = udisks-part-id \ - udisks-probe-sas-expander \ - $(NULL) -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 18325f7..0aaec11 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -54,7 +54,7 @@ udisks_LDADD = \ - $(DBUS_GLIB_LIBS) \ - $(POLKIT_DBUS_LIBS) - --slashsbin_PROGRAMS = umount.udisks -+sbin_PROGRAMS = umount.udisks - - umount_udisks_SOURCES = umount-udisks.c - umount_udisks_LDADD = $(DBUS_GLIB_LIBS) $(POLKIT_DBUS_LIBS) --- -2.7.4 - diff --git a/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch b/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch deleted file mode 100644 index 520655a213..0000000000 --- a/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9829152b12a8924d2e091a00133ed1a3a7ba75c0 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Fri, 29 May 2015 21:09:39 -0400 -Subject: [PATCH] fix build with newer glibc versions - -https://bugs.freedesktop.org/show_bug.cgi?id=90778 - -Upstream-Status: Applied [1] - -[1] http://cgit.freedesktop.org/udisks/commit/?h=udisks1&id=9829152b12a8924d2e091a00133ed1a3a7ba75c0 ---- - src/helpers/job-drive-detach.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c -index eeafcab..d122a1f 100644 ---- a/src/helpers/job-drive-detach.c -+++ b/src/helpers/job-drive-detach.c -@@ -18,6 +18,7 @@ - * - */ - -+#include <sys/stat.h> - #include <stdio.h> - #include <string.h> - #include <errno.h> --- -2.1.0 - diff --git a/meta-oe/recipes-support/udisks/udisks/optional-depends.patch b/meta-oe/recipes-support/udisks/udisks/optional-depends.patch deleted file mode 100644 index 6131701928..0000000000 --- a/meta-oe/recipes-support/udisks/udisks/optional-depends.patch +++ /dev/null @@ -1,484 +0,0 @@ -From 1b70b7a798eeeec554ab5aa9fcfff96a22e91774 Mon Sep 17 00:00:00 2001 -From: Gustavo Sverzut Barbieri <barbieri@profusion.mobi> -Date: Thu, 26 May 2011 17:30:04 -0300 -Subject: [PATCH] Allow disabling atasmart, lvm2 and devicemapper support. - -https://bugs.freedesktop.org/show_bug.cgi?id=37647 - -diff --git a/configure.ac b/configure.ac -index 62cc35d..b664135 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -155,13 +155,33 @@ PKG_CHECK_MODULES(POLKIT_GOBJECT_1, [polkit-gobject-1 >= 0.97]) - AC_SUBST(POLKIT_GOBJECT_1_CFLAGS) - AC_SUBST(POLKIT_GOBJECT_1_LIBS) - --PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8]) --AC_SUBST(LIBPARTED_CFLAGS) --AC_SUBST(LIBPARTED_LIBS) -- --PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02]) --AC_SUBST(DEVMAPPER_CFLAGS) --AC_SUBST(DEVMAPPER_LIBS) -+have_parted=no -+AC_ARG_ENABLE(parted, AS_HELP_STRING([--disable-parted], [disable disk partitioning])) -+if test "x$enable_parted" != "xno"; then -+ PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8], -+ [AC_DEFINE(USE_PARTED, 1, [Define if parted should be used]) have_parted=yes], -+ have_parted=no) -+ AC_SUBST(LIBPARTED_CFLAGS) -+ AC_SUBST(LIBPARTED_LIBS) -+ if test "x$have_parted" = xno -a "x$enable_parted" = xyes; then -+ AC_MSG_ERROR([parted support requested but libraries not found]) -+ fi -+fi -+AM_CONDITIONAL(HAVE_PARTED, [test "$have_parted" = "yes"]) -+ -+have_devmapper=no -+AC_ARG_ENABLE(devmapper, AS_HELP_STRING([--disable-devmapper], [disable device mapper support])) -+if test "x$enable_devmapper" != "xno"; then -+ PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02], -+ [AC_DEFINE(HAVE_DEVMAPPER, 1, [Define if device mapper is available]) have_devmapper=yes], -+ have_devmapper=no) -+ AC_SUBST(DEVMAPPER_CFLAGS) -+ AC_SUBST(DEVMAPPER_LIBS) -+ if test "x$have_devmapper" = xno -a "x$enable_devmapper" = xyes; then -+ AC_MSG_ERROR([devmapper support requested but libraries not found]) -+ fi -+fi -+AM_CONDITIONAL(HAVE_DEVMAPPER, [test "$have_devmapper" = "yes"]) - - have_lvm2=no - AC_ARG_ENABLE(lvm2, AS_HELP_STRING([--disable-lvm2], [disable LVM2 support])) -@@ -185,9 +205,19 @@ if test "x$enable_dmmp" != "xno"; then - fi - AM_CONDITIONAL(HAVE_DMMP, [test "$have_dmmp" = "yes"]) - --PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14]) --AC_SUBST(LIBATASMART_CFLAGS) --AC_SUBST(LIBATASMART_LIBS) -+have_libatasmart=no -+AC_ARG_ENABLE(libatasmart, AS_HELP_STRING([--disable-libatasmart], [disable libatasmart support])) -+if test "x$enable_libatasmart" != "xno"; then -+ PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14], -+ [AC_DEFINE(HAVE_LIBATASMART, 1, [Define if libatasmart is available]) have_libatasmart=yes], -+ have_libatasmart=no) -+ AC_SUBST(LIBATASMART_CFLAGS) -+ AC_SUBST(LIBATASMART_LIBS) -+ if test "x$have_libatasmart" = xno -a "x$enable_libatasmart" = xyes; then -+ AC_MSG_ERROR([libatasmart support requested but libraries not found]) -+ fi -+fi -+AM_CONDITIONAL(HAVE_LIBATASMART, [test "$have_libatasmart" = "yes"]) - - PKG_CHECK_MODULES(LIBUDEV, [libudev >= 143]) - AC_SUBST(LIBUDEV_CFLAGS) -@@ -267,9 +297,12 @@ echo " - cppflags: ${CPPFLAGS} - xsltproc: ${XSLTPROC} - -+ Parted support: ${have_parted} -+ Device Mapper support: ${have_devmapper} - LVM2 support: ${have_lvm2} - dm-multipath: ${have_dmmp} - Remote Access: ${remote_access} -+ libatasmart support: ${have_libatasmart} - - Maintainer mode: ${USE_MAINTAINER_MODE} - Profiling: ${enable_profiling} -diff --git a/src/adapter-private.h b/src/adapter-private.h -index 3409e21..ef584e3 100644 ---- a/src/adapter-private.h -+++ b/src/adapter-private.h -@@ -23,7 +23,6 @@ - - #include <dbus/dbus-glib.h> - #include <gudev/gudev.h> --#include <atasmart.h> - - #include "types.h" - -diff --git a/src/adapter.c b/src/adapter.c -index b85a0ef..802420b 100644 ---- a/src/adapter.c -+++ b/src/adapter.c -@@ -30,7 +30,6 @@ - #include <dbus/dbus-glib.h> - #include <dbus/dbus-glib-lowlevel.h> - #include <gudev/gudev.h> --#include <atasmart.h> - - #include "daemon.h" - #include "adapter.h" -diff --git a/src/daemon.c b/src/daemon.c -index 6072502..d043cb0 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -1745,6 +1745,7 @@ mdstat_changed_event (GIOChannel *channel, - return TRUE; - } - -+#ifdef HAVE_LIBATASMART - static gboolean - refresh_ata_smart_data (Daemon *daemon) - { -@@ -1773,6 +1774,7 @@ refresh_ata_smart_data (Daemon *daemon) - - return FALSE; - } -+#endif - - static gboolean - register_disks_daemon (Daemon *daemon) -@@ -1984,12 +1986,14 @@ daemon_new (void) - mount_file_clean_stale (l); - g_list_free (l); - -+#ifdef HAVE_LIBATASMART - /* set up timer for refreshing ATA SMART data - we don't want to refresh immediately because - * when adding a device we also do this... - */ - daemon->priv->ata_smart_refresh_timer_id = g_timeout_add_seconds (ATA_SMART_REFRESH_INTERVAL_SECONDS, - (GSourceFunc) refresh_ata_smart_data, - daemon); -+#endif - - PROFILE ("daemon_new(): end"); - return daemon; -diff --git a/src/device-private.c b/src/device-private.c -index 22a0d35..fb96525 100644 ---- a/src/device-private.c -+++ b/src/device-private.c -@@ -1378,7 +1378,7 @@ device_set_drive_ata_smart_time_collected (Device *device, - - void - device_set_drive_ata_smart_status (Device *device, -- SkSmartOverall value) -+ guint value) - { - if (G_UNLIKELY (device->priv->drive_ata_smart_status != value)) - { -diff --git a/src/device-private.h b/src/device-private.h -index a6db7f2..71473a6 100644 ---- a/src/device-private.h -+++ b/src/device-private.h -@@ -23,7 +23,6 @@ - - #include <dbus/dbus-glib.h> - #include <gudev/gudev.h> --#include <atasmart.h> - - #include "types.h" - -@@ -224,7 +223,7 @@ struct DevicePrivate - - gboolean drive_ata_smart_is_available; - guint64 drive_ata_smart_time_collected; -- SkSmartOverall drive_ata_smart_status; -+ guint drive_ata_smart_status; - void *drive_ata_smart_blob; - gsize drive_ata_smart_blob_size; - -@@ -391,7 +390,7 @@ void device_set_holders_objpath (Device *device, GStrv value); - - void device_set_drive_ata_smart_is_available (Device *device, gboolean value); - void device_set_drive_ata_smart_time_collected (Device *device, guint64 value); --void device_set_drive_ata_smart_status (Device *device, SkSmartOverall value); -+void device_set_drive_ata_smart_status (Device *device, guint value); - void device_set_drive_ata_smart_blob_steal (Device *device, gchar *blob, gsize blob_size); - - G_END_DECLS -diff --git a/src/device.c b/src/device.c -index 6a34940..7a5a4a9 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -50,7 +50,9 @@ - #include <dbus/dbus-glib.h> - #include <dbus/dbus-glib-lowlevel.h> - #include <gudev/gudev.h> -+#ifdef HAVE_LIBATASMART - #include <atasmart.h> -+#endif - - #include "daemon.h" - #include "device.h" -@@ -659,10 +661,14 @@ get_property (GObject *object, - case PROP_DRIVE_ATA_SMART_STATUS: - { - const gchar *status; -- if (device->priv->drive_ata_smart_status == (SkSmartOverall) - 1) -+#ifdef HAVE_LIBATASMART -+ if (device->priv->drive_ata_smart_status == (guint) - 1) - status = ""; - else - status = sk_smart_overall_to_string (device->priv->drive_ata_smart_status); -+#else -+ status = ""; -+#endif - g_value_set_string (value, status); - } - break; -@@ -5114,6 +5120,7 @@ device_new (Daemon *daemon, - goto out; - } - -+#ifdef HAVE_LIBATASMART - /* if just added, update the smart data if applicable */ - if (device->priv->drive_ata_smart_is_available) - { -@@ -5121,6 +5128,7 @@ device_new (Daemon *daemon, - gchar *ata_smart_refresh_data_options[] = { NULL }; - device_drive_ata_smart_refresh_data (device, ata_smart_refresh_data_options, NULL); - } -+#endif - - PROFILE ("device_new(native_path=%s): end", native_path); - out: -@@ -9794,16 +9802,18 @@ drive_ata_smart_refresh_data_completed_cb (DBusGMethodInvocation *context, - const char *stdout, - gpointer user_data) - { -+#ifdef HAVE_LIBATASMART - gint rc; -- SkDisk *d; -+ SkDisk *d = NULL; -+ SkSmartOverall overall; - gchar *blob; - gsize blob_size; - time_t time_collected; -- SkSmartOverall overall; -+#endif - - PROFILE ("drive_ata_smart_refresh_data_completed_cb(device=%s) start", device->priv->native_path); - -- d = NULL; -+#ifdef HAVE_LIBATASMART - blob = NULL; - - if (job_was_cancelled || stdout == NULL) -@@ -9907,6 +9917,11 @@ drive_ata_smart_refresh_data_completed_cb (DBusGMethodInvocation *context, - g_free (blob); - if (d != NULL) - sk_disk_free (d); -+ -+#else -+ throw_error (context, ERROR_FAILED, "libatasmart support disabled"); -+#endif -+ - PROFILE ("drive_ata_smart_refresh_data_completed_cb(device=%s) end", device->priv->native_path); - } - -diff --git a/src/expander-private.h b/src/expander-private.h -index ef4f440..98a8300 100644 ---- a/src/expander-private.h -+++ b/src/expander-private.h -@@ -23,7 +23,6 @@ - - #include <dbus/dbus-glib.h> - #include <gudev/gudev.h> --#include <atasmart.h> - - #include "types.h" - -diff --git a/src/expander.c b/src/expander.c -index 734ec0a..e799f13 100644 ---- a/src/expander.c -+++ b/src/expander.c -@@ -34,7 +34,6 @@ - #include <dbus/dbus-glib.h> - #include <dbus/dbus-glib-lowlevel.h> - #include <gudev/gudev.h> --#include <atasmart.h> - #include <stdlib.h> - - #include "daemon.h" -diff --git a/src/helpers/Makefile.am b/src/helpers/Makefile.am -index 4b863c0..d3ec4e9 100644 ---- a/src/helpers/Makefile.am -+++ b/src/helpers/Makefile.am -@@ -19,15 +19,9 @@ INCLUDES = \ - - libexec_PROGRAMS = \ - udisks-helper-mkfs \ -- udisks-helper-delete-partition \ -- udisks-helper-create-partition \ -- udisks-helper-modify-partition \ -- udisks-helper-create-partition-table \ - udisks-helper-change-filesystem-label \ - udisks-helper-linux-md-remove-component \ - udisks-helper-fstab-mounter \ -- udisks-helper-ata-smart-collect \ -- udisks-helper-ata-smart-selftest \ - udisks-helper-drive-detach \ - udisks-helper-drive-poll \ - udisks-helper-linux-md-check \ -@@ -48,6 +42,13 @@ udisks_helper_mkfs_SOURCES = job-shared.h job-mkfs.c - udisks_helper_mkfs_CPPFLAGS = $(AM_CPPFLAGS) - udisks_helper_mkfs_LDADD = $(GLIB_LIBS) - -+if HAVE_PARTED -+libexec_PROGRAMS += \ -+ udisks-helper-delete-partition \ -+ udisks-helper-create-partition \ -+ udisks-helper-modify-partition \ -+ udisks-helper-create-partition-table -+ - udisks_helper_delete_partition_SOURCES = job-shared.h job-delete-partition.c - udisks_helper_delete_partition_CPPFLAGS = $(AM_CPPFLAGS) - udisks_helper_delete_partition_LDADD = $(GLIB_LIBS) libpartutil.la -@@ -63,11 +64,17 @@ udisks_helper_modify_partition_LDADD = $(GLIB_LIBS) libpartutil.la - udisks_helper_create_partition_table_SOURCES = job-shared.h job-create-partition-table.c - udisks_helper_create_partition_table_CPPFLAGS = $(AM_CPPFLAGS) - udisks_helper_create_partition_table_LDADD = $(GLIB_LIBS) libpartutil.la -+endif - - udisks_helper_change_filesystem_label_SOURCES = job-shared.h job-change-filesystem-label.c - udisks_helper_change_filesystem_label_CPPFLAGS = $(AM_CPPFLAGS) - udisks_helper_change_filesystem_label_LDADD = $(GLIB_LIBS) - -+if HAVE_LIBATASMART -+libexec_PROGRAMS += \ -+ udisks-helper-ata-smart-collect \ -+ udisks-helper-ata-smart-selftest -+ - udisks_helper_ata_smart_selftest_SOURCES = job-shared.h job-ata-smart-selftest.c - udisks_helper_ata_smart_selftest_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS) $(GLIB_CFLAGS) - udisks_helper_ata_smart_selftest_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS) -@@ -75,6 +82,7 @@ udisks_helper_ata_smart_selftest_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS) - udisks_helper_ata_smart_collect_SOURCES = job-ata-smart-collect.c - udisks_helper_ata_smart_collect_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS) $(GLIB_CFLAGS) - udisks_helper_ata_smart_collect_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS) -+endif - - udisks_helper_linux_md_remove_component_SOURCES = job-shared.h job-linux-md-remove-component.c - udisks_helper_linux_md_remove_component_CPPFLAGS = $(AM_CPPFLAGS) -diff --git a/src/helpers/partutil.c b/src/helpers/partutil.c -index 72a8fe3..8893a39 100644 ---- a/src/helpers/partutil.c -+++ b/src/helpers/partutil.c -@@ -62,7 +62,6 @@ DEBUG (const gchar *format, - # include <config.h> - #endif - --#define USE_PARTED - #ifdef USE_PARTED - #include <parted/parted.h> - #endif -@@ -928,6 +927,7 @@ part_table_parse_apple (int fd, - return p; - } - -+#ifdef USE_PARTED - static PartitionTable * - part_table_load_from_disk_from_file (char *device_file) - { -@@ -948,6 +948,7 @@ part_table_load_from_disk_from_file (char *device_file) - out: - return ret; - } -+#endif - - PartitionTable * - part_table_load_from_disk (int fd) -diff --git a/src/port-private.h b/src/port-private.h -index cc48376..a91532f 100644 ---- a/src/port-private.h -+++ b/src/port-private.h -@@ -23,7 +23,6 @@ - - #include <dbus/dbus-glib.h> - #include <gudev/gudev.h> --#include <atasmart.h> - - #include "types.h" - -diff --git a/src/probers/Makefile.am b/src/probers/Makefile.am -index 06bb566..01c693b 100644 ---- a/src/probers/Makefile.am -+++ b/src/probers/Makefile.am -@@ -22,8 +22,6 @@ INCLUDES = \ - - udevhelperdir = $(slashlibdir)/udev - udevhelper_PROGRAMS = udisks-part-id \ -- udisks-dm-export \ -- udisks-probe-ata-smart \ - udisks-probe-sas-expander \ - $(NULL) - -@@ -35,17 +33,23 @@ udisks_part_id_SOURCES = part-id.c - udisks_part_id_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS) - udisks_part_id_LDADD = $(GLIB_LIBS) $(LIBUDEV_LIBS) $(top_builddir)/src/helpers/libpartutil.la - -+if HAVE_DEVMAPPER -+udevhelper_PROGRAMS += udisks-dm-export - udisks_dm_export_SOURCES = udisks-dm-export.c - udisks_dm_export_CPPFLAGS = $(AM_CPPFLAGS) $(DEVMAPPER_CFLAGS) $(GLIB_CFLAGS) - udisks_dm_export_LDADD = $(DEVMAPPER_LIBS) $(GLIB_LIBS) -+endif - - udisks_lvm_pv_export_SOURCES = udisks-lvm-pv-export.c - udisks_lvm_pv_export_CPPFLAGS = $(AM_CPPFLAGS) $(DEVMAPPER_CFLAGS) $(LVM2_CFLAGS) $(GLIB_CFLAGS) - udisks_lvm_pv_export_LDADD = $(DEVMAPPER_LIBS) $(LVM2_LIBS) $(GLIB_LIBS) - -+if HAVE_LIBATASMART -+udevhelper_PROGRAMS += udisks-probe-ata-smart - udisks_probe_ata_smart_SOURCES = udisks-probe-ata-smart.c - udisks_probe_ata_smart_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS) - udisks_probe_ata_smart_LDADD = $(LIBATASMART_LIBS) -+endif - - udisks_probe_sas_expander_SOURCES = udisks-probe-sas-expander.c - udisks_probe_sas_expander_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) -diff --git a/tools/udisks.c b/tools/udisks.c -index 6fbd6a6..e0c4fbb 100644 ---- a/tools/udisks.c -+++ b/tools/udisks.c -@@ -43,7 +43,9 @@ - #include <dbus/dbus-glib.h> - #include <dbus/dbus-glib-lowlevel.h> - -+#ifdef HAVE_LIBATASMART - #include <atasmart.h> -+#endif - - #include "udisks-daemon-glue.h" - #include "udisks-device-glue.h" -@@ -979,6 +981,7 @@ end_highlight (void) - g_print ("\x1B[0m"); - } - -+#ifdef HAVE_LIBATASMART - static const gchar * - ata_smart_status_to_desc (const gchar *status, - gboolean *out_highlight) -@@ -1159,6 +1162,7 @@ print_ata_smart_attr (SkDisk *d, - g_free (threshold_str); - g_free (pretty); - } -+#endif - - static void - do_show_info (const char *object_path) -@@ -1440,7 +1444,7 @@ do_show_info (const char *object_path) - g_print (" if speed: %" G_GINT64_FORMAT " bits/s\n", props->drive_connection_speed); - - /* ------------------------------------------------------------------------------------------------- */ -- -+#ifdef HAVE_LIBATASMART - if (!props->drive_ata_smart_is_available) - { - g_print (" ATA SMART: not available\n"); -@@ -1493,7 +1497,9 @@ do_show_info (const char *object_path) - } - - } -- -+#else -+ g_print (" ATA SMART: not supported\n"); -+#endif - /* ------------------------------------------------------------------------------------------------- */ - - } --- -1.7.5.rc3 - diff --git a/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch b/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch deleted file mode 100644 index d5e84d34df..0000000000 --- a/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7d61ad048856ee239870b917d6933e3ad63f0789 Mon Sep 17 00:00:00 2001 -From: David King <amigadave@amigadave.com> -Date: Thu, 2 Jul 2015 13:49:22 +0100 -Subject: [PATCH] Fix systemd service file - -udisks-daemon is installed to $(libexecdir), not $(prefix)/lib/udisks. - -https://bugzilla.redhat.com/show_bug.cgi?id=1238664 -https://bugs.freedesktop.org/show_bug.cgi?id=91191 - -Taken-From: [1] -[1] http://pkgs.fedoraproject.org/cgit/udisks.git/tree/udisks-1.0.5-fix-service-file.patch - -Upstream-Status: Pending ---- - data/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/Makefile.am b/data/Makefile.am -index 411ea0f..08af5f4 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -31,7 +31,7 @@ systemdservicedir = $(systemdsystemunitdir) - systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) - - $(systemdservice_DATA): $(systemdservice_in_files) Makefile -- @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@ -+ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - endif - - udevrulesdir = $(slashlibdir)/udev/rules.d --- -2.4.5 diff --git a/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch b/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch new file mode 100644 index 0000000000..727c5a32fc --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch @@ -0,0 +1,47 @@ +From b1b58f122a3e05b5689358fdd3203ba110cca567 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Sun, 24 Sep 2023 22:20:42 +0200 +Subject: [PATCH] Reproducibility fix + +This fixes: +WARNING: udisks2-2.10.1-r0 do_package_qa: QA Issue: File /usr/lib/udisks2/modules/libudisks2_btrfs.so in package udisks2 contains reference to TMPDIR +File /usr/lib/udisks2/modules/libudisks2_lvm2.so in package udisks2 contains reference to TMPDIR +File /usr/libexec/udisks2/udisksd in package udisks2 contains reference to TMPDIR [buildpaths] + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + modules/lvm2/Makefile.am | 2 +- + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/lvm2/Makefile.am b/modules/lvm2/Makefile.am +index 67b8aa6b3..e4ae462e7 100644 +--- a/modules/lvm2/Makefile.am ++++ b/modules/lvm2/Makefile.am +@@ -16,7 +16,7 @@ CPPFLAGS = \ + -DLVM_HELPER_DIR=\""$(prefix)/lib/udisks2/"\" \ + -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ + -DUDISKS_COMPILATION \ +- -DBUILD_DIR=\"$(abs_top_builddir)/\" \ ++ -DBUILD_DIR=\"/usr/src/\" \ + $(POLKIT_GOBJECT_1_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ +diff --git a/src/Makefile.am b/src/Makefile.am +index 5a174d1ab..0da3a497b 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -20,7 +20,7 @@ CPPFLAGS = \ + -DUDISKS_MODULE_DIR=\"$(libdir)/udisks2/modules\" \ + -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ + -DUDISKS_COMPILATION \ +- -DBUILD_DIR=\"$(abs_top_builddir)/\" \ ++ -DBUILD_DIR=\"/usr/src/\" \ + $(POLKIT_GOBJECT_1_CFLAGS) \ + $(GUDEV_CFLAGS) \ + $(GLIB_CFLAGS) \ +-- +2.42.0 + diff --git a/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch b/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch deleted file mode 100644 index 98e6c75f24..0000000000 --- a/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch +++ /dev/null @@ -1,26 +0,0 @@ -musl does not define __GNUC_PREREQ therefore check for C library being glibc -if not then define the macro - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: udisks-2.1.7/udisks/udisksclient.c -=================================================================== ---- udisks-2.1.7.orig/udisks/udisksclient.c -+++ udisks-2.1.7/udisks/udisksclient.c -@@ -27,8 +27,15 @@ - #include "udisksobjectinfo.h" - - /* For __GNUC_PREREQ usage below */ --#ifdef __GNUC__ -+#ifdef __GLIBC__ - # include <features.h> -+#else -+#if defined(__GNUC__) -+#define __GNUC_PREREQ(__maj, __min) \ -+ (__GNUC__ > (__maj) || __GNUC__ == (__maj) && __GNUC_MINOR__ >= (__min)) -+#else -+#define __GNUC_PREREQ(__maj, __min) 0 -+#endif - #endif - - /** diff --git a/meta-oe/recipes-support/udisks/udisks2_2.1.8.bb b/meta-oe/recipes-support/udisks/udisks2_2.1.8.bb deleted file mode 100644 index a3efc5160d..0000000000 --- a/meta-oe/recipes-support/udisks/udisks2_2.1.8.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "udisks provides dbus interfaces for disks and storage devices" -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" - -DEPENDS = "acl libatasmart polkit libgudev dbus-glib glib-2.0 intltool-native gnome-common-native libxslt-native" -DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -RDEPENDS_${PN} = "acl" - -SRC_URI = "http://udisks.freedesktop.org/releases/udisks-${PV}.tar.bz2 \ - file://non-gnu-libc.patch \ -" -SRC_URI[md5sum] = "501d11c243bd8c6c00650474cd2afaab" -SRC_URI[sha256sum] = "da416914812a77e5f4d82b81deb8c25799fd3228d27d52f7bf89a501b1857dda" - -CVE_PRODUCT = "udisks" - -inherit autotools systemd gtk-doc gobject-introspection - -S = "${WORKDIR}/udisks-${PV}" - -EXTRA_OECONF = "--disable-man --disable-gtk-doc" - -FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \ - ${datadir}/dbus-1/ \ - ${datadir}/polkit-1 \ - ${nonarch_base_libdir}/udev/* \ - ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ -" - -PACKAGES =+ "${PN}-libs" - -FILES_${PN} += "${datadir}/bash-completion" -FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" - -FILES_${PN}-dbg += "${exec_prefix}${nonarch_base_libdir}/udisks2/.debug" - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb b/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb new file mode 100644 index 0000000000..cb1cbe670d --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb @@ -0,0 +1,63 @@ +SUMMARY = "udisks provides dbus interfaces for disks and storage devices" +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" + +DEPENDS = " \ + glib-2.0-native \ + libxslt-native \ + acl \ + libatasmart \ + polkit \ + libgudev \ + glib-2.0 \ + dbus-glib \ + libblockdev \ +" +DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +RDEPENDS:${PN} = "acl" + +SRC_URI = " \ + git://github.com/storaged-project/udisks.git;branch=2.10.x-branch;protocol=https \ + file://0001-Makefile.am-Dont-include-buildpath.patch \ +" +SRCREV = "18c9faf089e306ad6f3f51f5cb887a6b9aa08350" +S = "${WORKDIR}/git" + +CVE_PRODUCT = "udisks" + +inherit autotools-brokensep systemd gtk-doc gobject-introspection gettext features_check + +REQUIRED_DISTRO_FEATURES = "polkit" + +EXTRA_OECONF = "--disable-man --disable-gtk-doc" + +do_configure:prepend() { + # | configure.ac:656: error: required file 'build-aux/config.rpath' not found + mkdir -p ${S}/build-aux + touch ${S}/build-aux/config.rpath +} + +PACKAGECONFIG ?= "" + +PACKAGECONFIG[lvm2] = "--enable-lvm2,--disable-lvm2,lvm2" +PACKAGECONFIG[btrfs] = "--enable-btrfs,--disable-btrfs,,btrfs-tools" +PACKAGECONFIG[lsm] = "--enable-lsm,--disable-lsm,libstoragemgmt" + +FILES:${PN} += " \ + ${datadir}/dbus-1/ \ + ${datadir}/polkit-1 \ + ${datadir}/bash-completion \ + ${datadir}/zsh \ + ${libdir}/polkit-1/extensions/*.so \ + ${nonarch_base_libdir}/udev/* \ + ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ + ${systemd_system_unitdir} \ +" + +PACKAGES =+ "${PN}-libs" +FILES:${PN}-libs = "${libdir}/lib*${SOLIBS}" +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" + +SYSTEMD_SERVICE:${PN} = "${BPN}.service" +SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb deleted file mode 100644 index e33266001e..0000000000 --- a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "A storage daemon that implements well-defined D-Bus interfaces that can be used to query and manipulate storage devices." -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273" - -DEPENDS = "libatasmart sg3-utils polkit libgudev dbus-glib glib-2.0 intltool-native \ - dbus-glib-native \ -" -# optional dependencies: device-mapper parted - -DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - dbus-glib-native \ -" - -SRC_URI = " \ - http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \ - file://optional-depends.patch \ - file://0001-fix-build-with-newer-glibc-versions.patch \ - file://udisks-1.0.5-fix-service-file.patch \ - file://0001-Make-udev-rules-directory-configurable.patch \ -" - -SRC_URI[udisks.md5sum] = "70d48dcfe523a74cd7c7fbbc2847fcdd" -SRC_URI[udisks.sha256sum] = "f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71" - -inherit autotools-brokensep systemd gtk-doc - -PACKAGECONFIG ??= "libdevmapper" -PACKAGECONFIG[libdevmapper] = "--enable-devmapper,--disable-devmapper,libdevmapper" -PACKAGECONFIG[parted] = "--enable-parted,--disable-parted,parted" - -EXTRA_OECONF = "--disable-man-pages --libdir=${base_libdir} --sbindir=${base_sbindir}" -EXTRA_OEMAKE = "udevrulesdir=${nonarch_base_libdir}/udev/rules.d/" - -FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \ - ${datadir}/dbus-1/ \ - ${datadir}/polkit-1 \ - ${nonarch_base_libdir}/udev/* \ -" - -FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "udisks.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-oe/recipes-support/uhubctl/uhubctl_2.6.0.bb b/meta-oe/recipes-support/uhubctl/uhubctl_2.6.0.bb new file mode 100644 index 0000000000..1a1d4ec33c --- /dev/null +++ b/meta-oe/recipes-support/uhubctl/uhubctl_2.6.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "USB hub per-port power control" +HOMEPAGE = "https://github.com/mvp/uhubctl" +BUGTRACKER = "https://github.com/mvp/uhubctl/issues" +DEPENDS = "libusb1" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRCREV = "352f5878e999c0a9d5a453b34110479b2056d7e7" +SRC_URI = "git://github.com/mvp/${BPN};branch=master;protocol=https" +S = "${WORKDIR}/git" + +# uhubctl gets its program version from "git describe". As we use the source +# archive do reduce download size replace the call with our hardcoded version. +do_configure:append() { + sed -i "s/^\(GIT_VERSION :=\).*$/\1 ${PV}/g" ${S}/Makefile +} + +do_install () { + oe_runmake install DESTDIR=${D} +} diff --git a/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch b/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch deleted file mode 100644 index 4b12494361..0000000000 --- a/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 24fd52cc45f7b5ff45afe072f5fbe66485df8c8e Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@suse.de> -Date: Wed, 29 Oct 2014 14:18:28 +0100 -Subject: [PATCH] Add support for aarch64 - -* include/private/gcconfig.h: Add support for aarch64. ---- - sigscheme/libgcroots/include/private/gcconfig.h | 37 +++++++++++++++++++++++++ - 1 file changed, 37 insertions(+) - -diff --git a/sigscheme/libgcroots/include/private/gcconfig.h b/sigscheme/libgcroots/include/private/gcconfig.h -index 4d42b03..0f13db6 100644 ---- a/sigscheme/libgcroots/include/private/gcconfig.h -+++ b/sigscheme/libgcroots/include/private/gcconfig.h -@@ -62,6 +62,13 @@ - # endif - - /* Determine the machine type: */ -+# if defined(__aarch64__) -+# define AARCH64 -+# if !defined(LINUX) -+# define NOSYS -+# define mach_type_known -+# endif -+# endif - # if defined(__arm__) || defined(__thumb__) - # define ARM32 - # if !defined(LINUX) && !defined(NETBSD) -@@ -231,6 +238,10 @@ - # define IA64 - # define mach_type_known - # endif -+# if defined(LINUX) && defined(__aarch64__) -+# define AARCH64 -+# define mach_type_known -+# endif - # if defined(LINUX) && defined(__arm__) - # define ARM32 - # define mach_type_known -@@ -504,6 +515,7 @@ - /* running Amdahl UTS4 */ - /* S390 ==> 390-like machine */ - /* running LINUX */ -+ /* AARCH64 ==> ARM AArch64 */ - /* ARM32 ==> Intel StrongARM */ - /* IA64 ==> Intel IPF */ - /* (e.g. Itanium) */ -@@ -1724,6 +1736,31 @@ - # endif - # endif - -+# ifdef AARCH64 -+# define CPP_WORDSZ 64 -+# define MACH_TYPE "AARCH64" -+# define ALIGNMENT 8 -+# ifndef HBLKSIZE -+# define HBLKSIZE 4096 -+# endif -+# ifdef LINUX -+# define OS_TYPE "LINUX" -+# define LINUX_STACKBOTTOM -+# define DYNAMIC_LOADING -+ extern int __data_start[]; -+# define DATASTART ((ptr_t)__data_start) -+ extern char _end[]; -+# define DATAEND ((ptr_t)(&_end)) -+# endif -+# ifdef NOSYS -+ /* __data_start is usually defined in the target linker script. */ -+ extern int __data_start[]; -+# define DATASTART ((ptr_t)__data_start) -+ extern void *__stack_base__; -+# define STACKBOTTOM ((ptr_t)__stack_base__) -+# endif -+# endif -+ - # ifdef ARM32 - # define CPP_WORDSZ 32 - # define MACH_TYPE "ARM32" --- -2.13.2 - diff --git a/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch b/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch deleted file mode 100644 index df82b07aac..0000000000 --- a/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2918196ba782dfa4401bdca917ad4de1910505e0 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Fri, 21 Aug 2015 15:58:42 +0900 -Subject: [PATCH] fix bug for cross compile - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9be879c..9249bfd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1208,8 +1208,8 @@ AC_HELP_STRING([--with-libedit[=DIR], Enable libedit support - if test "x$use_libedit" != "xno"; then - saved_CPPFLAGS=$CPPFLAGS - saved_LDFLAGS=$LDFLAGS -- CPPFLAGS="${CPPFLAGS} -I$libedit_path/include" -- LDFLAGS="${LDFLAGS} -L$libedit_path/lib" -+ CPPFLAGS="${CPPFLAGS} " -+ LDFLAGS="${LDFLAGS} " - AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", - [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", - AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...") --- -1.8.4.2 - diff --git a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch index 8569bf39ef..0e2fb687b6 100644 --- a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch +++ b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch @@ -1,11 +1,21 @@ ---- uim-1.1.0/scm/Makefile.am~ 2006-06-09 10:46:12.000000000 +0900 -+++ uim-1.1.0/scm/Makefile.am 2006-06-19 23:00:15.620000000 +0900 -@@ -58,7 +58,7 @@ - module_names += "scim" +From d61495d3fb039842b82df44184c67eb3c1256136 Mon Sep 17 00:00:00 2001 +From: Bian Naimeng <biannm@cn.fujitsu.com> +Date: Fri, 26 Jun 2015 12:57:48 +0900 + +--- +Upstream-Status: Pending + + scm/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/scm/Makefile.am ++++ b/scm/Makefile.am +@@ -115,7 +115,7 @@ if EXPAT + module_names += "yahoo-jp" endif -UIM_MODULE_MANAGER = $(top_builddir)/uim/uim-module-manager +UIM_MODULE_MANAGER = uim-module-manager UIM_MODULE_MANAGER_ENV = \ + LIBUIM_SYSTEM_SCM_FILES=$(abs_top_srcdir)/sigscheme/lib \ LIBUIM_SCM_FILES=$(abs_srcdir) \ - LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs diff --git a/meta-oe/recipes-support/uim/uim_1.8.6.bb b/meta-oe/recipes-support/uim/uim_1.8.9.bb index 271718e5e4..9d2068c6d6 100644 --- a/meta-oe/recipes-support/uim/uim_1.8.6.bb +++ b/meta-oe/recipes-support/uim/uim_1.8.9.bb @@ -1,30 +1,38 @@ DESCRIPTION = "A multilingual user input method library" HOMEPAGE = "http://uim.freedesktop.org/" -LICENSE = "BSD-3-Clause & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=32463fd29aa303fb2360faeeae17256b" +LICENSE = "BSD-3-Clause & LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=ab2826b41ca0ff4030d38cc39791d1c8" SECTION = "inputmethods" -SRC_URI = "http://uim.googlecode.com/files/uim-${PV}.tar.bz2" - -SRC_URI_append_class-target = " file://uim-module-manager.patch \ - file://0001-fix-bug-for-cross-compile.patch \ - file://0001-Add-support-for-aarch64.patch \ +SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2" +SRC_URI:append:class-target = "\ + file://uim-module-manager.patch \ " -SRC_URI[md5sum] = "ecea4c597bab1fd4ba98ea84edcece59" -SRC_URI[sha256sum] = "7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f" +SRC_URI[sha256sum] = "dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4" + +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" -DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool" -DEPENDS_append_class-target = " intltool-native gtk+ gtk+3 uim-native takao-fonts" +DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool libedit" +DEPENDS:append:class-target = " intltool-native gtk+ gtk+3 uim-native" -RDEPENDS_uim = "libuim0 libedit" -RDEPENDS_uim-anthy = "takao-fonts anthy libanthy0 glibc-utils glibc-gconv-euc-jp" +RDEPENDS:uim = "libuim0 libedit" +RDEPENDS:uim-anthy = "anthy libanthy0" +RDEPENDS:uim-anthy:append:libc-glibc = " glibc-utils glibc-gconv-euc-jp" LEAD_SONAME = "libuim.so.1" -inherit autotools pkgconfig gettext qemu gtk-immodules-cache +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" + +inherit features_check autotools pkgconfig gettext qemu gtk-immodules-cache + +REQUIRED_DISTRO_FEATURES = "x11" + GTKIMMODULES_PACKAGES = "uim-gtk2.0 uim-gtk3" EXTRA_OECONF += "--disable-emacs \ + --with-libedit=${STAGING_EXECPREFIXDIR} \ --without-scim \ --without-m17nlib \ --without-prime \ @@ -33,79 +41,85 @@ EXTRA_OECONF += "--disable-emacs \ --without-eb \ " -CONFIGUREOPTS_remove_class-target = "--disable-silent-rules" +CONFIGUREOPTS:remove:class-target = "--disable-silent-rules" + +# https://github.com/uim/uim/issues/44 +PARALLEL_MAKE = "" #Because m4 file's find maxdepth=2, so copy the m4 files of the deep depth. -do_configure_prepend () { +do_configure:prepend () { + rm -rf ${S}/m4.generated/lt*.m4 ${S}/m4.generated/libtool.m4 + rm -rf ${S}/sigscheme/libgcroots/m4/lt*.m4 ${S}/sigscheme/libgcroots/m4/libtool.m4 + rm -rf ${S}/sigscheme/m4/lt*.m4 ${S}/sigscheme/m4/libtool.m4 cp ${S}/sigscheme/m4/* ${S}/m4/ } -do_install_append() { +do_install:append() { rm -rf ${D}/${datadir}/applications } PACKAGES =+ "uim-xim uim-utils uim-skk uim-gtk2.0 uim-gtk3 uim-fep uim-anthy uim-common libuim0 libuim-dev" -FILES_${PN} = "${bindir}/uim-help \ +FILES:${PN} = "${bindir}/uim-help \ ${libdir}/uim/plugin/libuim-* \ ${libdir}/libuim-scm* \ ${libdir}/libgcroots* \ ${libdir}/uim/plugin/libuim-* \ " -FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ +FILES:libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ ${libdir}/libuim-custom.so.* \ ${datadir}/locale/ja/LC_MESSAGES/uim.mo \ ${datadir}/locale/fr/LC_MESSAGES/uim.mo \ ${datadir}/locale/ko/LC_MESSAGES/uim.mo \ ${libdir}/libuim.so.* \ " -FILES_libuim-dev = "${libdir}/libuim*.a \ +FILES:libuim-dev = "${libdir}/libuim*.a \ ${libdir}/libuim*.la \ ${libdir}/libuim*.so \ ${includedir}/uim \ ${libdir}/pkgconfig/uim.pc \ " -FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \ +FILES:uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \ ${datadir}/uim/anthy*.scm \ " -FILES_${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" -FILES_${PN}-dev += "${libdir}/uim/plugin/*.la" +FILES:${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" +FILES:${PN}-dev += "${libdir}/uim/plugin/*.la" -FILES_uim-utils = "${bindir}/uim-sh \ +FILES:uim-utils = "${bindir}/uim-sh \ ${bindir}/uim-module-manager \ ${libexecdir}/uim-helper-server \ " -FILES_uim-xim = "${bindir}/uim-xim \ +FILES:uim-xim = "${bindir}/uim-xim \ ${libexecdir}/uim-candwin-*gtk \ ${libexecdir}/uim-candwin-*gtk3 \ ${datadir}/man/man1/uim-xim.1 \ ${sysconfdir}/X11/xinit/xinput.d/uim* \ " -FILES_uim-common = "${datadir}/uim/pixmaps/*.png \ +FILES:uim-common = "${datadir}/uim/pixmaps/*.png \ ${datadir}/uim \ " -FILES_uim-fep = "${bindir}/uim-fep*" +FILES:uim-fep = "${bindir}/uim-fep*" -FILES_uim-gtk2.0 = "${libdir}/gtk-2.0 \ +FILES:uim-gtk2.0 = "${libdir}/gtk-2.0 \ ${bindir}/uim-toolbar-gtk \ ${bindir}/uim-toolbar-gtk-systray \ ${bindir}/uim-*-gtk \ ${bindir}/uim-input-pad-ja \ ${libdir}/uim/uim-*-gtk \ " -FILES_uim-gtk3 = "${libdir}/gtk-3.0 \ +FILES:uim-gtk3 = "${libdir}/gtk-3.0 \ ${bindir}/uim-toolbar-gtk3 \ ${bindir}/uim-toolbar-gtk3-systray \ ${bindir}/uim-*-gtk3 \ ${libdir}/uim/uim-*-gtk3 \ " -FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ +FILES:uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ ${datadir}/uim/skk*.scm \ " PACKAGE_WRITE_DEPS += "qemu-native" -pkg_postinst_uim-anthy() { +pkg_postinst:uim-anthy() { if test -n "$D"; then ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register anthy --path $D${datadir}/uim else @@ -113,7 +127,7 @@ pkg_postinst_uim-anthy() { fi } -pkg_prerm_uim-anthy() { +pkg_prerm:uim-anthy() { if test -n "$D"; then ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister anthy else @@ -121,7 +135,7 @@ pkg_prerm_uim-anthy() { fi } -pkg_postinst_uim-skk() { +pkg_postinst:uim-skk() { if test -n "$D"; then ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register skk --path $D${datadir}/uim else @@ -129,7 +143,7 @@ pkg_postinst_uim-skk() { fi } -pkg_postrm_uim-skk() { +pkg_postrm:uim-skk() { if test -n "$D"; then ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister skk else diff --git a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb new file mode 100644 index 0000000000..026d4ffe02 --- /dev/null +++ b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Unicode Character Database" +HOMEPAGE = "https://unicode.org/ucd/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/license.txt;md5=4b11b5cbb0a24df9f4e7db63db98f22f" + +SRC_URI = " \ + https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd;downloadfilename=unicode-ucd-${PV}.zip \ + https://www.unicode.org/license.txt;name=ucd-license \ +" +SRC_URI[ucd.sha256sum] = "033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600" +SRC_URI[ucd-license.sha256sum] = "f7830d126f59d83842565d3dddedc79db4ca978ed52aee0ebcc040ea76a85519" + +inherit allarch + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + +do_configure[noexec] = "1" + +do_install() { + install -d ${D}${datadir}/unicode + cp -rf ${UNPACKDIR}/ucd ${D}${datadir}/unicode +} + +FILES:${PN} = "${datadir}/unicode/ucd" diff --git a/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch b/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch new file mode 100644 index 0000000000..c763a9feb6 --- /dev/null +++ b/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch @@ -0,0 +1,54 @@ +From e886222c70d4b251f0785f670477b7aee938e5af Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Wed, 21 Feb 2024 13:55:41 +0800 +Subject: [PATCH] exe/Makefile.am: add CROSS_LAUNCHER to run odbc_config + +In case of cross compilation, the odbc_config cannot run, the error message +would be like below: + + /bin/bash: line 1: ../exe/odbc_config: cannot execute binary file: Exec format error + +Add CROSS_LAUNCHER to allow the possibility of running odbc_config correctly in +case of cross compilation. + +For example, here's a possible value for it (Yocto project environment, aarch64 target). + export CROSS_LAUNCHER="PSEUDO_UNLOAD=1 qemu-aarch64 -r 5.15 \ + -L /PATH/TO/unixodbc/2.3.11/recipe-sysroot \ + -E LD_LIBRARY_PATH=/PATH/TO/unixodbc/2.3.11/recipe-sysroot//usr/lib:/PATH/TO/unixodbc/2.3.11/recipe-sysroot//usr/lib " + +Other projects can use the launcher they like to allow correct generation of +the odbc.pc file in cross compilation environment. + +Upstream-Status: Submitted [Personal Email, nick.gorham@easysoft.com] + +As said in the official website, https://www.unixodbc.org/, the way to report bug and send +out patch is via personal email. So there's a public link above. + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + exe/Makefile.am | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/exe/Makefile.am b/exe/Makefile.am +index 03f3d5a..5f33cf2 100644 +--- a/exe/Makefile.am ++++ b/exe/Makefile.am +@@ -59,11 +59,13 @@ slencheck_SOURCES = slencheck.c + dltest_DEPENDENCIES = $(LTDLDEPS) + dltest_LDADD = $(LIBLTDL) + ++CROSS_LAUNCHER ?= "" ++ + all-am: +- @sed "s![@]ODBC_ULEN[@]!`$(top_builddir)/exe/odbc_config$(EXEEXT) --ulen`!" \ ++ @sed "s![@]ODBC_ULEN[@]!`$(CROSS_LAUNCHER)$(top_builddir)/exe/odbc_config$(EXEEXT) --ulen`!" \ + $(top_builddir)/DriverManager/odbc.pc > $(top_builddir)/exe/odbc.pc.tmp + @mv -f $(top_builddir)/exe/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc +- @sed "s![@]ODBC_CFLAGS[@]!`$(top_builddir)/exe/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \ ++ @sed "s![@]ODBC_CFLAGS[@]!`$(CROSS_LAUNCHER)$(top_builddir)/exe/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \ + $(top_builddir)/DriverManager/odbc.pc > $(top_builddir)/exe/odbc.pc.tmp + @mv -f $(top_builddir)/exe/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc + +-- +2.34.1 + diff --git a/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch b/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch new file mode 100644 index 0000000000..6884465452 --- /dev/null +++ b/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch @@ -0,0 +1,53 @@ +From 76beb0938ef14276123996bfd99df23b0c7f0982 Mon Sep 17 00:00:00 2001 +From: Soumya Sambu <soumya.sambu@windriver.com> +Date: Fri, 7 Jun 2024 11:10:46 +0000 +Subject: [PATCH] PostgreSQL driver: Fix incompatible pointer-to-integer types + +These result in out-of-bounds stack writes on 64-bit architectures +(caller has 4 bytes, callee writes 8 bytes), and seem to have gone +unnoticed on little-endian architectures (although big-endian +architectures must be broken). + +This change is required to avoid a build failure with GCC 14. + +CVE: CVE-2024-1013 + +Upstream-Status: Backport [https://github.com/lurcher/unixODBC/commit/45f501e1be2db6b017cc242c79bfb9de32b332a1] + +Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> +--- + Drivers/Postgre7.1/info.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Drivers/Postgre7.1/info.c b/Drivers/Postgre7.1/info.c +index 63ac91f..2216ecd 100644 +--- a/Drivers/Postgre7.1/info.c ++++ b/Drivers/Postgre7.1/info.c +@@ -1779,14 +1779,14 @@ char *table_name; + char index_name[MAX_INFO_STRING]; + short fields_vector[8]; + char isunique[10], isclustered[10]; +-SDWORD index_name_len, fields_vector_len; ++SQLLEN index_name_len, fields_vector_len; + TupleNode *row; + int i; + HSTMT hcol_stmt; + StatementClass *col_stmt, *indx_stmt; + char column_name[MAX_INFO_STRING], relhasrules[MAX_INFO_STRING]; + char **column_names = 0; +-Int4 column_name_len; ++SQLLEN column_name_len; + int total_columns = 0; + char error = TRUE; + ConnInfo *ci; +@@ -2136,7 +2136,7 @@ HSTMT htbl_stmt; + StatementClass *tbl_stmt; + char tables_query[STD_STATEMENT_LEN]; + char attname[MAX_INFO_STRING]; +-SDWORD attname_len; ++SQLLEN attname_len; + char pktab[MAX_TABLE_LEN + 1]; + Int2 result_cols; + +-- +2.40.0 diff --git a/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch b/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch index 69d26adca9..2499cff72d 100644 --- a/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch +++ b/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch @@ -13,22 +13,22 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 2 files changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am -index e881cca..1321802 100644 +index 4628401..e8989bf 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -5,7 +5,6 @@ SUBDIRS = \ +@@ -11,7 +11,6 @@ SUBDIRS = \ log \ lst \ ini \ -- libltdl \ +- libltdl \ odbcinst \ DriverManager \ exe \ diff --git a/configure.ac b/configure.ac -index 218502f..d50b7af 100644 +index e4bcdaf..58aa5c5 100644 --- a/configure.ac +++ b/configure.ac -@@ -136,9 +136,7 @@ dnl AC_CONFIG_MACRO_DIR([libltdl/m4]) +@@ -144,9 +144,7 @@ dnl AC_CONFIG_MACRO_DIR([libltdl/m4]) dnl LT_CONFIG_LTDL_DIR([libltdl]) dnl LTDL_INIT @@ -39,5 +39,5 @@ index 218502f..d50b7af 100644 dnl Substitute INCLTDL and LIBLTDL in the Makefiles AC_SUBST(LTDLINCL) -- -2.8.1 +2.12.3 diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb new file mode 100644 index 0000000000..0927f5c904 --- /dev/null +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb @@ -0,0 +1,50 @@ +SUMMARY = "An Open Source ODBC sub-system" +DESCRIPTION = "unixODBC is an Open Source ODBC sub-system and an ODBC SDK \ +for Linux, Mac OSX, and UNIX." + +HOMEPAGE = "http://www.unixodbc.org/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d7b37bf80a3df5a65b355433ae36d206" + +DEPENDS = "libtool readline" + +SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ + file://do-not-use-libltdl-source-directory.patch \ + file://0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch \ + file://CVE-2024-1013.patch \ +" +SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec" + +UPSTREAM_CHECK_URI = "https://www.unixodbc.org/download.html" +UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" + +inherit autotools-brokensep multilib_header qemu + +S = "${WORKDIR}/unixODBC-${PV}" + +EXTRA_OEMAKE += "LIBS=-lltdl" +EXTRA_OECONF += "--enable-utf8ini" +DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else ''}" +QEMU_WRAPPER = "${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" + +do_configure:prepend() { + # old m4 files will cause libtool version don't match + rm -rf m4/* + rm -fr libltdl +} + +do_compile:prepend() { + if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then + export CROSS_LAUNCHER="${QEMU_WRAPPER} " + fi +} + +do_install:prepend() { + if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then + export CROSS_LAUNCHER="${QEMU_WRAPPER} " + fi +} + +do_install:append() { + oe_multilib_header unixodbc.h unixODBC/unixodbc_conf.h +} diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb deleted file mode 100644 index 6f57f375e8..0000000000 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "An Open Source ODBC sub-system" -DESCRIPTION = "unixODBC is an Open Source ODBC sub-system and an ODBC SDK \ -for Linux, Mac OSX, and UNIX." - -HOMEPAGE = "http://www.unixodbc.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7b37bf80a3df5a65b355433ae36d206" - -DEPENDS = "libtool mysql5" - -SRC_URI = "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-${PV}.tar.gz \ - file://do-not-use-libltdl-source-directory.patch \ -" -SRC_URI[md5sum] = "bd25d261ca1808c947cb687e2034be81" -SRC_URI[sha256sum] = "2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39" - -inherit autotools-brokensep - -S = "${WORKDIR}/unixODBC-${PV}" - -EXTRA_OEMAKE += "LIBS=-lltdl" - -do_configure_prepend() { - # old m4 files will cause libtool version don't match - rm -rf m4/* - rm -fr libltdl -} diff --git a/meta-oe/recipes-support/upower/upower_0.99.17.bb b/meta-oe/recipes-support/upower/upower_0.99.17.bb new file mode 100644 index 0000000000..0572cc801b --- /dev/null +++ b/meta-oe/recipes-support/upower/upower_0.99.17.bb @@ -0,0 +1,44 @@ +SUMMARY = "UPower is an abstraction for enumerating power devices" +DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics." +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" + +DEPENDS = " \ + intltool-native \ + libusb1 \ + libgudev \ + glib-2.0 \ + dbus-glib \ +" + +SRC_URI = "git://gitlab.freedesktop.org/upower/upower.git;protocol=https;branch=master" +SRCREV = "c889154ec8e3e2239db9260d48b2e198d72ba002" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "UPOWER_(?P<pver>\d+(\_\d+)+)" + +GIR_MESON_ENABLE_FLAG = "enabled" +GIR_MESON_DISABLE_FLAG = "disabled" +GTKDOC_MESON_OPTION = "gtk-doc" + +inherit meson pkgconfig gtk-doc gettext gobject-introspection systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[idevice] = "-Didevice=enabled,-Didevice=disabled,libimobiledevice libplist" +PACKAGECONFIG[systemd] = "-Dsystemdsystemunitdir=${systemd_system_unitdir},-Dsystemdsystemunitdir=no -Dudevrulesdir=${base_libdir}/udev/rules.d,systemd" + +EXTRA_OEMESON = " \ + -Dos_backend=linux \ + -Dman=false \ +" + +SYSTEMD_SERVICE:${PN} = "upower.service" +# don't start on boot by default - dbus does that on demand +SYSTEMD_AUTO_ENABLE = "disable" + +RDEPENDS:${PN} += "dbus" +RRECOMMENDS:${PN} += "pm-utils" +FILES:${PN} += " \ + ${datadir}/dbus-1/ \ + ${base_libdir}/udev/* \ +" diff --git a/meta-oe/recipes-support/upower/upower_0.99.5.bb b/meta-oe/recipes-support/upower/upower_0.99.5.bb deleted file mode 100644 index 9314534d7c..0000000000 --- a/meta-oe/recipes-support/upower/upower_0.99.5.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics. " -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" - -DEPENDS = "intltool-native libusb1 libgudev glib-2.0 dbus-glib polkit" - -SRC_URI = "http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "ec57b4b7bf0af568f9a7a5603c921d97" -SRC_URI[sha256sum] = "78605664d027c788f6ab63c50950be6e86c6ba5d030c4cf35a6664337d87f3b2" - -inherit autotools pkgconfig gettext gobject-introspection systemd - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" -PACKAGECONFIG[systemd] = "--with-systemdutildir=${systemd_unitdir} --with-systemdsystemunitdir=${systemd_system_unitdir}, \ - --without-systemdutildir --without-systemdsystemunitdir,systemd" - -EXTRA_OECONF = " --with-backend=linux" - -SYSTEMD_SERVICE_${PN} = "upower.service" -# don't start on boot by default - dbus does that on demand -SYSTEMD_AUTO_ENABLE = "disable" - -do_configure_prepend() { - sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am - sed -i -e 's: doc : :g' ${S}/Makefile.am -} - -RDEPENDS_${PN} += "dbus" -RRECOMMENDS_${PN} += "pm-utils" -FILES_${PN} += "${datadir}/dbus-1/ \ - ${datadir}/polkit-1/ \ - ${base_libdir}/udev/* \ -" - -FILES_${PN}-dbg += "${base_libdir}/udev/.debug" - - - diff --git a/meta-oe/recipes-support/uriparser/uriparser_0.9.8.bb b/meta-oe/recipes-support/uriparser/uriparser_0.9.8.bb new file mode 100644 index 0000000000..3d76190d39 --- /dev/null +++ b/meta-oe/recipes-support/uriparser/uriparser_0.9.8.bb @@ -0,0 +1,16 @@ +SUMMARY = "RFC 3986 compliant URI parsing library" +HOMEPAGE = "https://uriparser.github.io" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=fcc5a53146c2401f4b4f6a3bdf3f0168" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${BP}/${BP}.tar.gz" +SRC_URI[sha256sum] = "4cd0e4f93b477272fabceeb0202f269169fe6ec3044e10fac6acbcdf354bb080" + +inherit cmake github-releases + +UPSTREAM_CHECK_REGEX = "releases/tag/${BPN}-(?P<pver>\d+(\.\d+)+)" + +EXTRA_OECMAKE += "-DURIPARSER_BUILD_DOCS:BOOL=OFF -DURIPARSER_BUILD_TESTS:BOOL=OFF" + +BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb deleted file mode 100644 index eeed5e275d..0000000000 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Data files for usbmodeswitch" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit allarch - -DEPENDS += "tcl-native" - -SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" -SRC_URI[md5sum] = "0cc107cd0c4c83df0d9400c999e21dfd" -SRC_URI[sha256sum] = "e2dcfd9d28928d8d8f03381571a23442b3c50d48d343bc40a1a07d01662738d1" - -do_install() { - oe_runmake install DESTDIR=${D} -} - -RDEPENDS_${PN} = "usb-modeswitch (>= 2.4.0)" -FILES_${PN} += "${base_libdir}/udev/rules.d/ \ - ${datadir}/usb_modeswitch" diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb new file mode 100644 index 0000000000..351fe44d70 --- /dev/null +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb @@ -0,0 +1,19 @@ +SUMMARY = "Data files for usbmodeswitch" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit allarch + +DEPENDS += "tcl-native" + +SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" +SRC_URI[md5sum] = "e8fce7eb949cbe16c61fb71bade4cc17" +SRC_URI[sha256sum] = "3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9" + +do_install() { + oe_runmake install DESTDIR=${D} RULESDIR=${D}/${nonarch_base_libdir}/udev/rules.d +} + +RDEPENDS:${PN} = "usb-modeswitch (>= 2.4.0)" +FILES:${PN} += "${nonarch_base_libdir}/udev/rules.d/ \ + ${datadir}/usb_modeswitch" diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.5.0.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.5.0.bb deleted file mode 100644 index ac0df8bab4..0000000000 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.5.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "A mode switching tool for controlling 'flip flop' (multiple device) USB gear" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "libusb1" - -SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" -SRC_URI[md5sum] = "38ad5c9d70e06227a00361bdc2b1e568" -SRC_URI[sha256sum] = "31c0be280d49a99ec3dc0be3325bef320d9c04b50714ef0ce1e36a614d687633" - -inherit pkgconfig systemd - -SYSTEMD_SERVICE_${PN} = "usb_modeswitch@.service" - -EXTRA_OEMAKE = "TCL=${bindir}/tclsh" - -FILES_${PN} = "${bindir} ${sysconfdir} ${nonarch_base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch" -RDEPENDS_${PN} = "tcl" -RRECOMMENDS_${PN} = "usb-modeswitch-data" - -do_install() { - oe_runmake DESTDIR=${D} install - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${S}/usb_modeswitch@.service ${D}/${systemd_unitdir}/system - fi -} diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb new file mode 100644 index 0000000000..cd3840feab --- /dev/null +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb @@ -0,0 +1,31 @@ +SUMMARY = "A mode switching tool for controlling 'flip flop' (multiple device) USB gear" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=091556bd6d0154cd4c2d17a1bfc7380a" + +DEPENDS = "libusb1" + +SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" +SRC_URI[sha256sum] = "5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34" + +inherit pkgconfig systemd + +SYSTEMD_SERVICE:${PN} = "usb_modeswitch@.service" + +EXTRA_OEMAKE = "TCL=${bindir}/tclsh" + +FILES:${PN} = " \ + ${bindir} \ + ${sysconfdir} \ + ${nonarch_base_libdir}/udev/usb_modeswitch \ + ${sbindir} ${localstatedir}/lib/usb_modeswitch \ +" +RDEPENDS:${PN} = "tcl" +RRECOMMENDS:${PN} = "usb-modeswitch-data" + +do_install() { + oe_runmake DESTDIR=${D} UDEVDIR=${D}/${nonarch_base_libdir}/udev install + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}/${systemd_unitdir}/system + install -m 644 ${S}/usb_modeswitch@.service ${D}/${systemd_unitdir}/system + fi +} diff --git a/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb b/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb new file mode 100644 index 0000000000..b0dd72fb25 --- /dev/null +++ b/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb @@ -0,0 +1,18 @@ +SUMMARY = "usb device database." +HOMEPAGE = "https://github.com/usbids/usbids" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" + +SRC_URI = "git://github.com/usbids/usbids.git;branch=master;protocol=https" + +SRCREV = "7963233faf69eb9c80ffca8dfc1f31940f75999f" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${datadir} + install -m0644 ${S}/usb.ids ${D}${datadir} +} + +FILES:${PN} = "${datadir}" diff --git a/meta-oe/recipes-support/usbpath/usbpath/configure.patch b/meta-oe/recipes-support/usbpath/usbpath/configure.patch deleted file mode 100644 index 271e6a53ad..0000000000 --- a/meta-oe/recipes-support/usbpath/usbpath/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: usbpath/configure.ac -=================================================================== ---- usbpath.orig/configure.ac 2014-07-17 20:40:26.000000000 +0000 -+++ usbpath/configure.ac 2014-07-18 07:01:40.933474420 +0000 -@@ -1,5 +1,5 @@ - AC_INIT([usbpath],[0.1]) --AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -+AM_INIT_AUTOMAKE([foreign]) - - AC_PROG_CC - AC_PROG_RANLIB diff --git a/meta-oe/recipes-support/usbpath/usbpath_svn.bb b/meta-oe/recipes-support/usbpath/usbpath_svn.bb deleted file mode 100644 index 6c9cd049fe..0000000000 --- a/meta-oe/recipes-support/usbpath/usbpath_svn.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Convert the physical locations of a USB device to/from its number" -AUTHOR = "Werner Almesberger <werner@openmoko.org>" -SECTION = "console/utils" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://usbpath.c;endline=20;md5=0aa8c7d2af9110c78a99fbf9a504dc3f" -DEPENDS = "virtual/libusb0" -DEPENDS_class-native = "virtual/libusb0-native" - -BBCLASSEXTEND = "native" - -SRCREV = "3172" -PV = "0.0+svnr${SRCPV}" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=usbpath;protocol=http \ - file://configure.patch" - -S = "${WORKDIR}/usbpath" - -inherit autotools pkgconfig - -RDEPENDS_${PN} += "perl" diff --git a/meta-oe/recipes-support/uthash/uthash/run-ptest b/meta-oe/recipes-support/uthash/uthash/run-ptest new file mode 100755 index 0000000000..14071a649e --- /dev/null +++ b/meta-oe/recipes-support/uthash/uthash/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh + +cd tests +for i in test*[0-9] ; do + if ./${i} | cmp -s "${i}.ans" - ; then + echo "PASS: ${i}" + else + echo "FAIL: ${i}" + fi +done diff --git a/meta-oe/recipes-support/uthash/uthash_1.9.7.bb b/meta-oe/recipes-support/uthash/uthash_1.9.7.bb deleted file mode 100644 index 82a9f2a6a3..0000000000 --- a/meta-oe/recipes-support/uthash/uthash_1.9.7.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Hash table for C structures" -SECTION = "base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=564f9c44927f6247dc810bf557e2b240" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2" - -SRC_URI[md5sum] = "1f14bbee7ee73ed0ceb3549f8cf378b4" -SRC_URI[sha256sum] = "956f5c99798349c413275fe4c9ff128d72e280655dadbe4365f8e9fbda91393f" - -do_install () { - install -dm755 ${D}${includedir} - install -m 0644 ${S}/src/*.h ${D}${includedir} -} - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/uthash/uthash_2.3.0.bb b/meta-oe/recipes-support/uthash/uthash_2.3.0.bb new file mode 100644 index 0000000000..ef15613586 --- /dev/null +++ b/meta-oe/recipes-support/uthash/uthash_2.3.0.bb @@ -0,0 +1,46 @@ +SUMMARY = "Hash table and linked list for C structures" +DESCRIPTION = " uthash-dev provides a hash table implementation using C preprocessor macros.\n\ + This package also includes:\n\ + * utlist.h provides linked list macros for C structures\n\ + * utarray.h implements dynamic arrays using macros\n\ + * utstring.h implements a basic dynamic string\n\ +" +HOMEPAGE = "https://troydhanson.github.io/uthash/" +SECTION = "base" +LICENSE = "BSD-1-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=736712b5904dd42f8678df7172bc5f2b" +SRCREV = "e493aa90a2833b4655927598f169c31cfcdf7861" + +SRC_URI = "\ + git://github.com/troydhanson/${BPN}.git;branch=master;protocol=https \ + file://run-ptest \ +" + +S = "${WORKDIR}/git" + +inherit ptest + +do_compile[noexec] = "1" + +do_compile_ptest() { + oe_runmake -C tests tests_only TEST_TARGET= +} + +do_install () { + install -dm755 ${D}${includedir} + install -m0644 src/*.h ${D}${includedir} +} + +do_install_ptest() { + install -dm755 ${D}${PTEST_PATH}/tests + install -m0755 tests/test*[0-9] ${D}${PTEST_PATH}/tests + install -m0644 tests/test*[0-9].ans ${D}${PTEST_PATH}/tests + install -m0644 tests/test*[0-9].dat ${D}${PTEST_PATH}/tests +} + +# The main package is empty and non-existent, so -dev +# should not depend on it... +RDEPENDS:${PN}-dev = "" +RDEPENDS:${PN}-ptest:remove = "${PN}" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 0000000000..7cfd470430 --- /dev/null +++ b/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,79 @@ +From 60987a1df8eb8c9196222375574dcd7bc0ad2daa Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Nov 2019 20:23:27 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/evemu-impl.h | 5 +++++ + src/evemu.c | 20 ++++++++++++-------- + 2 files changed, 17 insertions(+), 8 deletions(-) + +diff --git a/src/evemu-impl.h b/src/evemu-impl.h +index acf2976..c08d861 100644 +--- a/src/evemu-impl.h ++++ b/src/evemu-impl.h +@@ -21,6 +21,11 @@ + #include <evemu.h> + #include <linux/uinput.h> + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #define EVPLAY_NBITS KEY_CNT + #define EVPLAY_NBYTES ((EVPLAY_NBITS + 7) / 8) + +diff --git a/src/evemu.c b/src/evemu.c +index 21187af..7489449 100644 +--- a/src/evemu.c ++++ b/src/evemu.c +@@ -363,7 +363,7 @@ int evemu_read(struct evemu_device *dev, FILE *fp) + int evemu_write_event(FILE *fp, const struct input_event *ev) + { + return fprintf(fp, "E: %lu.%06u %04x %04x %d\n", +- ev->time.tv_sec, (unsigned)ev->time.tv_usec, ++ ev->input_event_sec, (unsigned)ev->input_event_usec, + ev->type, ev->code, ev->value); + } + +@@ -391,8 +391,8 @@ int evemu_read_event(FILE *fp, struct input_event *ev) + int value; + int ret = fscanf(fp, "E: %lu.%06u %04x %04x %d\n", + &sec, &usec, &type, &code, &value); +- ev->time.tv_sec = sec; +- ev->time.tv_usec = usec; ++ ev->input_event_sec = sec; ++ ev->input_event_usec = usec; + ev->type = type; + ev->code = code; + ev->value = value; +@@ -410,13 +411,16 @@ int evemu_read_event_realtime(FILE *fp, struct input_event *ev, + return ret; + + if (evtime) { +- if (!evtime->tv_sec) +- *evtime = ev->time; +- usec = 1000000L * (ev->time.tv_sec - evtime->tv_sec); +- usec += ev->time.tv_usec - evtime->tv_usec; ++ if (!evtime->tv_sec) { ++ evtime->tv_sec = ev->input_event_sec; ++ evtime->tv_usec = ev->input_event_usec; ++ } ++ usec = (ev->input_event_sec - evtime->tv_sec) * 1000000L; ++ usec += ev->input_event_usec - evtime->tv_usec; + if (usec > 500) { + usleep(usec); +- *evtime = ev->time; ++ evtime->tv_sec = ev->input_event_sec; ++ evtime->tv_usec = ev->input_event_usec; + } + } + diff --git a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb index 1dd5a86d50..bd69dbb11c 100644 --- a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb @@ -2,16 +2,18 @@ SUMMARY = "Kernel evdev device emulation" DESCRIPTION = "The evemu library and tools are used to describe devices, record data, create devices and replay data from kernel evdev devices. " HOMEPAGE = "http://bitmath.org/code/evemu/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" inherit autotools -SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http" +SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http;branch=master \ + file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ + " SRCREV = "9752b50e922572e4cd214ac45ed95e4ee410fe24" -PV = "1.0.5+git${SRCPV}" +PV = "1.0.6+git" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-support/utouch/utouch-frame/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-support/utouch/utouch-frame/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 0000000000..d405d43f14 --- /dev/null +++ b/meta-oe/recipes-support/utouch/utouch-frame/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,41 @@ +From 895b6996e232700fb2a428838feaef418cc64b70 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Nov 2019 22:52:13 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/frame-mtdev.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/frame-mtdev.c b/src/frame-mtdev.c +index c0f15d8..42ad380 100644 +--- a/src/frame-mtdev.c ++++ b/src/frame-mtdev.c +@@ -25,6 +25,11 @@ + #include <errno.h> + #include <math.h> + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + static int is_pointer(const struct evemu_device *dev) + { + return evemu_has_event(dev, EV_REL, REL_X) || +@@ -200,7 +205,7 @@ static int handle_abs_event(utouch_frame_handle fh, + static utouch_frame_time_t get_evtime_ms(const struct input_event *syn) + { + static const utouch_frame_time_t ms = 1000; +- return syn->time.tv_usec / ms + syn->time.tv_sec * ms; ++ return syn->input_event_usec / ms + syn->input_event_sec * ms; + } + + const struct utouch_frame * diff --git a/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch b/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch index f3c8eeb418..f0860fcd90 100644 --- a/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch +++ b/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch @@ -9,6 +9,8 @@ error: field has incomplete Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tools/utouch-frame-test-mtdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/utouch/files/remove-man-page-creation.patch b/meta-oe/recipes-support/utouch/utouch-frame/remove-man-page-creation.patch index 8706d91234..8706d91234 100644 --- a/meta-oe/recipes-support/utouch/files/remove-man-page-creation.patch +++ b/meta-oe/recipes-support/utouch/utouch-frame/remove-man-page-creation.patch diff --git a/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-oe/recipes-support/utouch/utouch-frame_git.bb index 39d46af8e9..ddd27a7e30 100644 --- a/meta-oe/recipes-support/utouch/utouch-frame_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-frame_git.bb @@ -2,19 +2,20 @@ SUMMARY = "Touch Frame Library" DESCRIPTION = "The frame library and tools are used to handle touch frames, i.e., collections of tracked contacts. Bindings for mtdev and XI2.1." HOMEPAGE = "http://bitmath.org/code/frame/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" DEPENDS += "mtdev utouch-evemu" inherit autotools pkgconfig -SRC_URI = "git://bitmath.org/git/frame.git;protocol=http \ +SRC_URI = "git://bitmath.org/git/frame.git;protocol=http;branch=master \ file://remove-man-page-creation.patch \ file://0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch \ + file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ " SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc" -PV = "1.1.2+git${SRCPV}" +PV = "1.1.2+git" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/utouch/utouch-mtview_git.bb b/meta-oe/recipes-support/utouch/utouch-mtview_git.bb index 8cb180dc8b..d964d7f263 100644 --- a/meta-oe/recipes-support/utouch/utouch-mtview_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-mtview_git.bb @@ -2,18 +2,18 @@ SUMMARY = "Multitouch viewer" DESCRIPTION = "mtview is a small X application that shows a graphical view of your MT-enabled hardware. It uses mtdev." HOMEPAGE = "http://bitmath.org/code/mtview/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4c61b8950dc1aab4d2aa7c2ae6b1cfb3" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "git://bitmath.org/git/mtview.git;protocol=http" +SRC_URI = "git://bitmath.org/git/mtview.git;protocol=http;branch=master" SRCREV = "ad437c38dc111cf3990a03abf14efe1b5d89604b" DEPENDS += "mtdev utouch-frame utouch-evemu libx11" -PV = "1.1.7+git${SRCPV}" +PV = "1.1.7+git" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils index 495601f08f..5982e2d08c 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils @@ -13,7 +13,7 @@ INCLUDES = -I. -I../vboxsf -I../vboxsf/include MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \ -DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST_R0 -CFLAGS = ${INCLUDES} ${MOD_DEFS} +CFLAGS = ${INCLUDES} ${MOD_DEFS} ${EXTRA_CFLAGS} LDFLAGS = SRCS = mount.vboxsf.c \ diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb deleted file mode 100644 index fdefe03172..0000000000 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "VirtualBox Linux Guest Drivers" -SECTION = "core" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" - -DEPENDS = "virtual/kernel" - -inherit module kernel-module-split - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" - -VBOX_NAME = "VirtualBox-${PV}" - -SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ - file://Makefile.utils \ -" -SRC_URI[md5sum] = "d3aec8190c649d7e0d92ba374779dfe3" -SRC_URI[sha256sum] = "b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9" - -S = "${WORKDIR}/vbox_module" - -export BUILD_TARGET_ARCH="${ARCH}" -export BUILD_TARGET_ARCH_x86-64="amd64" -export KERN_DIR="${STAGING_KERNEL_DIR}" - -addtask export_sources before do_patch after do_unpack - -do_export_sources() { - mkdir -p "${S}" - ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules ${T}/vbox_modules.tar.gz - tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz - - # add a mount utility to use shared folder from VBox Addition Source Code - mkdir -p "${S}/utils" - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils - install ${S}/../Makefile.utils ${S}/utils/Makefile - -} - -# compile and install mount utility -do_compile_append() { - oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils - if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then - echo "ERROR: One of vbox*.ko modules wasn't built" - exit 1 - fi -} - -module_do_install() { - MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc - install -d $MODULE_DIR - install -m 644 vboxguest.ko $MODULE_DIR - install -m 644 vboxsf.ko $MODULE_DIR - install -m 644 vboxvideo.ko $MODULE_DIR -} - -do_install_append() { - install -d ${D}${base_sbindir} - install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} -} - -PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" -RRECOMMENDS_${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" - -FILES_${PN} = "${base_sbindir}" - -# autoload if installed -KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.20.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.20.bb new file mode 100644 index 0000000000..444b86a1b2 --- /dev/null +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.20.bb @@ -0,0 +1,91 @@ +SUMMARY = "VirtualBox Linux Guest Drivers" +SECTION = "core" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${VBOX_NAME}/COPYING;md5=217590d3a513571b94632edf5fa1169a" + +DEPENDS = "virtual/kernel" + +inherit module kernel-module-split + +COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" + +VBOX_NAME = "VirtualBox-${PV}" + +SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ + file://Makefile.utils \ +" + +SRC_URI[sha256sum] = "5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02" + +S ?= "${WORKDIR}/vbox_module" +S:task-patch = "${WORKDIR}/${VBOX_NAME}" + +export VBOX_KBUILD_TARGET_ARCH="${ARCH}" +export VBOX_KBUILD_TARGET_ARCH:x86-64="amd64" + +EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1 CC='${CC} ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} -fdebug-prefix-map=${STAGING_KERNEL_BUILDDIR}=${KERNEL_SRC_PATH}'" + +# otherwise 5.2.22 builds just vboxguest +MAKE_TARGETS = "all" + +addtask export_sources after do_patch before do_configure +do_export_sources[depends] += "virtual/kernel:do_shared_workdir" + +do_export_sources() { + mkdir -p "${S}" + ${UNPACKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz + tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz + + # add a mount utility to use shared folder from VBox Addition Source Code + mkdir -p "${S}/utils" + install ${UNPACKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils + install ${UNPACKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils + install ${UNPACKDIR}/Makefile.utils ${S}/utils/Makefile + + # some kernel versions have issues with stdarg.h and compatibility with + # the sysroot and libc-headers/uapi. If we include the file directly from + # the kernel source (STAGING_KERNEL_DIR) we get conflicting types on many + # structures, due to kernel .h files being found before libc .h files. + # if we grab just this one file from the source, and put it into our + # file structure, everything holds together + mkdir -p ${S}/vboxsf/include/linux + install ${STAGING_KERNEL_DIR}/include/linux/stdarg.h ${S}/vboxsf/include/linux +} + +do_configure:prepend() { + # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. + # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in <version>/build, or the variable KERN_VER must be set. Stop. + mkdir -p ${WORKDIR}/${KERNEL_VERSION} + ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build +} + +# compile and install mount utility +do_compile() { + oe_runmake all + oe_runmake 'LD=${CC}' 'EXTRA_CFLAGS=-I${STAGING_KERNEL_BUILDDIR}/include/' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils + if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then + echo "ERROR: One of vbox*.ko modules wasn't built" + exit 1 + fi +} + +module_do_install() { + MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc + install -d $MODULE_DIR + install -m 644 vboxguest.ko $MODULE_DIR + install -m 644 vboxsf.ko $MODULE_DIR + install -m 644 vboxvideo.ko $MODULE_DIR +} + +do_install:append() { + install -d ${D}${base_sbindir} + install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} +} + +PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" +RRECOMMENDS:${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" + +FILES:${PN} = "${base_sbindir}" + +# autoload if installed +KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" diff --git a/meta-oe/recipes-support/vim/files/CVE-2017-17087.patch b/meta-oe/recipes-support/vim/files/CVE-2017-17087.patch deleted file mode 100644 index 937b9ba317..0000000000 --- a/meta-oe/recipes-support/vim/files/CVE-2017-17087.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 9c11f80339372b7aa2f43153d574f2b5abb79708 Mon Sep 17 00:00:00 2001 -From: Li Zhou <li.zhou@windriver.com> -Date: Sun, 17 Dec 2017 23:09:35 -0800 -Subject: [PATCH] vim: patch 8.0.1263: others can read the swap file if a user - is careless - -Problem: Others can read the swap file if a user is careless with his - primary group. -Solution: If the group permission allows for reading but the world - permissions doesn't, make sure the group is right. - -Upstream-Status: Backport -CVE: CVE-2017-17087 -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - src/fileio.c | 24 +++++++++++++++++++++++- - src/version.c | 2 ++ - 2 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/src/fileio.c b/src/fileio.c -index f54fb8465..2c7740af9 100644 ---- a/src/fileio.c -+++ b/src/fileio.c -@@ -716,7 +716,29 @@ readfile( - /* Set swap file protection bits after creating it. */ - if (swap_mode > 0 && curbuf->b_ml.ml_mfp != NULL - && curbuf->b_ml.ml_mfp->mf_fname != NULL) -- (void)mch_setperm(curbuf->b_ml.ml_mfp->mf_fname, (long)swap_mode); -+ { -+ char_u *swap_fname = curbuf->b_ml.ml_mfp->mf_fname; -+ -+ /* -+ * If the group-read bit is set but not the world-read bit, then -+ * the group must be equal to the group of the original file. If -+ * we can't make that happen then reset the group-read bit. This -+ * avoids making the swap file readable to more users when the -+ * primary group of the user is too permissive. -+ */ -+ if ((swap_mode & 044) == 040) -+ { -+ stat_T swap_st; -+ -+ if (mch_stat((char *)swap_fname, &swap_st) >= 0 -+ && st.st_gid != swap_st.st_gid -+ && fchown(curbuf->b_ml.ml_mfp->mf_fd, -1, st.st_gid) -+ == -1) -+ swap_mode &= 0600; -+ } -+ -+ (void)mch_setperm(swap_fname, (long)swap_mode); -+ } - #endif - } - -diff --git a/src/version.c b/src/version.c -index a5cb078f0..5c0df475f 100644 ---- a/src/version.c -+++ b/src/version.c -@@ -770,6 +770,8 @@ static char *(features[]) = - static int included_patches[] = - { /* Add new patch number below this line */ - /**/ -+ 1263, -+/**/ - 983, - /**/ - 982, --- -2.11.0 - diff --git a/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch b/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch deleted file mode 100644 index 65e5f58c61..0000000000 --- a/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status: pending - -Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny. - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> -================================================ -diff --git a/src/configure.ac b/src/configure.ac -index fb965e5..d734064 100644 ---- a/src/configure.ac -+++ b/src/configure.ac -@@ -2511,7 +2511,7 @@ AC_CHECK_HEADERS(stdarg.h stdint.h stdlib.h string.h \ - sys/systeminfo.h locale.h sys/stream.h termios.h \ - libc.h sys/statfs.h poll.h sys/poll.h pwd.h \ - utime.h sys/param.h libintl.h libgen.h \ -- util/debug.h util/msg18n.h frame.h sys/acl.h \ -+ util/debug.h util/msg18n.h frame.h \ - sys/access.h sys/sysinfo.h wchar.h wctype.h) - - dnl sys/ptem.h depends on sys/stream.h on Solaris -@@ -3112,6 +3112,7 @@ AC_ARG_ENABLE(acl, - , [enable_acl="yes"]) - if test "$enable_acl" = "yes"; then - AC_MSG_RESULT(no) -+AC_CHECK_HEADERS(sys/acl.h) - AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"], - AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl" - AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),) diff --git a/meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch b/meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch deleted file mode 100644 index 6c620f9f27..0000000000 --- a/meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch +++ /dev/null @@ -1,38 +0,0 @@ -vim: add knob whether elf.h are checked - -Previously, it still was checked when there was no elf library in sysroots directory. -Add knob to decide whether elf.h are checked or not. - -Upstream-status: Pending - -Signed-off-by: Chong Lu <Chong.Lu@windriver.com> ---- - src/configure.ac | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/configure.ac b/src/configure.ac -index d734064..f504fa6 100644 ---- a/src/configure.ac -+++ b/src/configure.ac -@@ -2483,11 +2483,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [int x __attribute__((unused));], - AC_MSG_RESULT(no)) - - dnl Checks for header files. -+AC_MSG_CHECKING(whether or not to look for elf.h) -+AC_ARG_ENABLE(elf-check, -+ [ --enable-elf-check If elfutils, check for elf.h [default=no]], -+ , enable_elf_check="no") -+AC_MSG_RESULT($enable_elf_check) -+if test "x$enable_elf_check" != "xno"; then - AC_CHECK_HEADER(elf.h, HAS_ELF=1) - dnl AC_CHECK_HEADER(dwarf.h, SVR4=1) - if test "$HAS_ELF" = 1; then - AC_CHECK_LIB(elf, main) - fi -+fi - - AC_HEADER_DIRENT - --- -1.7.9.5 - diff --git a/meta-oe/recipes-support/vim/vim-tiny_8.0.0983.bb b/meta-oe/recipes-support/vim/vim-tiny_8.0.0983.bb deleted file mode 100644 index bb8f2b7eae..0000000000 --- a/meta-oe/recipes-support/vim/vim-tiny_8.0.0983.bb +++ /dev/null @@ -1,13 +0,0 @@ -require vim_${PV}.bb - -SUMMARY += " (with tiny features)" - -PACKAGECONFIG += "tiny" - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${S}/vim ${D}/${bindir}/vim.tiny -} - -ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_TARGET = "${bindir}/vim.tiny" diff --git a/meta-oe/recipes-support/vim/vim_8.0.0983.bb b/meta-oe/recipes-support/vim/vim_8.0.0983.bb deleted file mode 100644 index 44c868c74a..0000000000 --- a/meta-oe/recipes-support/vim/vim_8.0.0983.bb +++ /dev/null @@ -1,114 +0,0 @@ -SUMMARY = "Vi IMproved - enhanced vi editor" -SECTION = "console/utils" -DEPENDS = "ncurses gettext-native" -# vimdiff doesn't like busybox diff -RSUGGESTS_${PN} = "diffutils" -LICENSE = "vim" -LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;md5=eea32ac1424bba14096736a494ae9045" - -SRC_URI = "git://github.com/vim/vim.git \ - file://disable_acl_header_check.patch;patchdir=.. \ - file://vim-add-knob-whether-elf.h-are-checked.patch;patchdir=.. \ - file://CVE-2017-17087.patch;patchdir=.. \ -" -SRCREV = "3f9a1ff141412e9e85f7dff47d02946cb9be9228" - -S = "${WORKDIR}/git/src" - -VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}" - -inherit autotools-brokensep update-alternatives - -CLEANBROKEN = "1" - -# vim configure.in contains functions which got 'dropped' by autotools.bbclass -do_configure () { - rm -f auto/* - touch auto/config.mk - aclocal - autoconf - oe_runconf - touch auto/configure - touch auto/config.mk auto/config.h -} - -#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny -PACKAGECONFIG ??= "" -PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}" - -PACKAGECONFIG[gtkgui] = "--enable-gtk2-test --enable-gui=gtk2,--enable-gui=no,gtk+," -PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," -PACKAGECONFIG[x11] = "--with-x,--without-x,xt," -PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,," -PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux," -PACKAGECONFIG[elfutils] = "--enable-elf-check,,elfutils," - -EXTRA_OECONF = " \ - --disable-gpm \ - --disable-gtktest \ - --disable-xim \ - --disable-netbeans \ - --with-tlib=ncurses \ - ac_cv_small_wchar_t=no \ - vim_cv_getcwd_broken=no \ - vim_cv_memmove_handles_overlap=yes \ - vim_cv_stat_ignores_slash=no \ - vim_cv_terminfo=yes \ - vim_cv_tgent=non-zero \ - vim_cv_toupper_broken=no \ - vim_cv_tty_group=world \ - STRIP=/bin/true \ -" - -do_install() { - autotools_do_install - - # Work around file-rdeps picking up csh, awk, perl or python as a dep - chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/vim132 - chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/mve.awk - chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.pl - chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py - - # Install example vimrc from runtime files - install -m 0644 ../runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc - - # we use --with-features=big as default - mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN} -} - -PARALLEL_MAKEINST = "" - -PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-tools" -FILES_${PN}-syntax = "${datadir}/${BPN}/${VIMDIR}/syntax" -FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc" -FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor" -FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc" -FILES_${PN}-data = "${datadir}/${BPN}" -FILES_${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools" -FILES_${PN}-common = " \ - ${datadir}/${BPN}/${VIMDIR}/*.vim \ - ${datadir}/${BPN}/${VIMDIR}/autoload \ - ${datadir}/${BPN}/${VIMDIR}/colors \ - ${datadir}/${BPN}/${VIMDIR}/compiler \ - ${datadir}/${BPN}/${VIMDIR}/ftplugin \ - ${datadir}/${BPN}/${VIMDIR}/indent \ - ${datadir}/${BPN}/${VIMDIR}/keymap \ - ${datadir}/${BPN}/${VIMDIR}/lang \ - ${datadir}/${BPN}/${VIMDIR}/macros \ - ${datadir}/${BPN}/${VIMDIR}/plugin \ - ${datadir}/${BPN}/${VIMDIR}/print \ - ${datadir}/${BPN}/${VIMDIR}/spell \ - ${datadir}/icons \ -" - -RDEPENDS_${BPN} = "ncurses-terminfo-base" -# Recommend that runtime data is installed along with vim -RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common" - -ALTERNATIVE_${PN} = "vi vim" -ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}" -ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi" -ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim" -ALTERNATIVE_PRIORITY = "100" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch new file mode 100644 index 0000000000..06030c047c --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch @@ -0,0 +1,29 @@ +From e68e87c14243b1c8707c56883a53e841310974a1 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 27 Oct 2015 16:02:19 +0200 +Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained + from pkg-config with PKG_CONFIG_SYSROOT_DIR + +See discussion at https://bugs.webkit.org/show_bug.cgi?id=232933 for +reasons why this is not approproiate for upstream submission. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Source/cmake/FindGI.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake +index fdc56b21..d42eca52 100644 +--- a/Source/cmake/FindGI.cmake ++++ b/Source/cmake/FindGI.cmake +@@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND) + endif () + endif () + ++set(_GI_SCANNER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_SCANNER_EXE}") ++set(_GI_COMPILER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_COMPILER_EXE}") ++ + find_program(GI_SCANNER_EXE NAMES ${_GI_SCANNER_EXE} g-ir-scanner) + find_program(GI_COMPILER_EXE NAMES ${_GI_COMPILER_EXE} g-ir-compiler) + diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-issues-with-latest-Clang.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-issues-with-latest-Clang.patch new file mode 100644 index 0000000000..6ef9835c2c --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-issues-with-latest-Clang.patch @@ -0,0 +1,237 @@ +From 257ed304fb3e71d412568dcbed7129c145812fdf Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 2 Sep 2024 21:38:12 -0700 +Subject: [PATCH] Fix build issues with latest Clang + https://bugs.webkit.org/show_bug.cgi?id=276198 rdar://130933637 + +Reviewed by Yusuke Suzuki. + +The use of the template keyword to reference template members without a template argument list was deprecated in the C++ standard. +e.g. `foo.template bar()` nows needs to be `foo.template bar<>()`. I ran into a different issue with `std::reference_wrapper` that +blocked me from going any further, which AFAICT is a bug on the Clang side. + +This also fixes a few other warnings that popped up while building with the new Clang denoted inline + +* Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp: +(JSC::FTL::DFG::LowerDFGToB3::compileCompareStrictEq): Clang didn't like the implicit static_cast<int32_t>(UINT32_MAX) so make it explicit with a static_assert no data was lost. +* Source/JavaScriptCore/jit/AssemblyHelpers.cpp: +(JSC::AssemblyHelpers::emitNonNullDecodeZeroExtendedStructureID): Clang didn't like the implicit static_cast<int32_t>(UINT32_MAX) so make it explicit with a static_assert no data was lost. +* Source/JavaScriptCore/llint/InPlaceInterpreter.cpp: +* Source/JavaScriptCore/llint/LLIntData.h: +(JSC::LLInt::getCodeFunctionPtr): +(JSC::LLInt::getWide16CodeFunctionPtr): +(JSC::LLInt::getWide32CodeFunctionPtr): +* Source/JavaScriptCore/parser/Nodes.h: Missing definition of ModuleScopeData added include. +* Source/JavaScriptCore/runtime/JSCast.h: +(JSC::JSCastingHelpers::inherits): +(JSC::jsDynamicCast): +* Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/crypto/bio/connect.c: +(conn_callback_ctrl): Had a warning about an incompatible function type. Seems like this is intentional suppressed the warning. +* Source/WTF/wtf/cf/TypeCastsCF.h: Had a warning about extra namespace qualification. I just moved it out of the namespace. That said, it feels like this warning shouldn't apply to macro expansions... +* Source/WebCore/PAL/ThirdParty/libavif/ThirdParty/dav1d/src/decode.c: +(decode_b): Had a warning about different types on the middle/right of a ternary expression. I just pushed the comparison inside the ternary. + +Canonical link: https://commits.webkit.org/280700@main + +Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/62b6e2db547e#diff-136d848d7c1b400da9b486916b67592b54e5abf7c66ac247697a93ae2fb743a9] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp | 6 ++++-- + Source/JavaScriptCore/jit/AssemblyHelpers.cpp | 6 ++++-- + .../JavaScriptCore/llint/InPlaceInterpreter.cpp | 16 ++++++++-------- + Source/JavaScriptCore/llint/LLIntData.h | 12 ++++++------ + Source/JavaScriptCore/llint/LLIntThunks.cpp | 2 +- + Source/JavaScriptCore/parser/Nodes.h | 4 ++-- + Source/JavaScriptCore/runtime/JSCast.h | 4 ++-- + 7 files changed, 27 insertions(+), 23 deletions(-) + +--- a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp ++++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp +@@ -22930,8 +22930,10 @@ IGNORE_CLANG_WARNINGS_END + return m_out.shl(m_out.zeroExtPtr(structureID), m_out.constIntPtr(StructureID::encodeShiftAmount)); + #else + LValue maskedStructureID = structureID; +- if constexpr (structureHeapAddressSize < 4 * GB) +- maskedStructureID = m_out.bitAnd(structureID, m_out.constInt32(StructureID::structureIDMask)); ++ if constexpr (structureHeapAddressSize < 4 * GB) { ++ static_assert(static_cast<uint32_t>(StructureID::structureIDMask) == StructureID::structureIDMask); ++ maskedStructureID = m_out.bitAnd(structureID, m_out.constInt32(static_cast<uint32_t>(StructureID::structureIDMask))); ++ } + return m_out.bitOr(m_out.constIntPtr(startOfStructureHeap()), m_out.zeroExtPtr(maskedStructureID)); + #endif + } +--- a/Source/JavaScriptCore/jit/AssemblyHelpers.cpp ++++ b/Source/JavaScriptCore/jit/AssemblyHelpers.cpp +@@ -677,8 +677,10 @@ void AssemblyHelpers::emitNonNullDecodeZ + if constexpr (structureHeapAddressSize >= 4 * GB) { + ASSERT(structureHeapAddressSize == 4 * GB); + move(source, dest); +- } else +- and32(TrustedImm32(StructureID::structureIDMask), source, dest); ++ } else { ++ static_assert(static_cast<uint32_t>(StructureID::structureIDMask) == StructureID::structureIDMask); ++ and32(TrustedImm32(static_cast<uint32_t>(StructureID::structureIDMask)), source, dest); ++ } + or64(TrustedImm64(startOfStructureHeap()), dest); + #else // not CPU(ADDRESS64) + move(source, dest); +--- a/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp +@@ -43,8 +43,8 @@ namespace JSC { namespace IPInt { + do { \ + void* base = reinterpret_cast<void*>(ipint_unreachable_validate); \ + void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \ +- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \ +- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \ ++ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \ ++ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \ + RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \ + } while (false); + +@@ -52,8 +52,8 @@ do { \ + do { \ + void* base = reinterpret_cast<void*>(ipint_i32_trunc_sat_f32_s_validate); \ + void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \ +- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \ +- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \ ++ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \ ++ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \ + RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \ + } while (false); + +@@ -61,8 +61,8 @@ do { \ + do { \ + void* base = reinterpret_cast<void*>(ipint_simd_v128_load_mem_validate); \ + void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \ +- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \ +- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \ ++ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \ ++ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \ + RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \ + } while (false); + +@@ -70,8 +70,8 @@ do { \ + do { \ + void* base = reinterpret_cast<void*>(ipint_memory_atomic_notify_validate); \ + void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \ +- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \ +- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \ ++ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \ ++ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \ + RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \ + } while (false); + +--- a/Source/JavaScriptCore/llint/LLIntData.h ++++ b/Source/JavaScriptCore/llint/LLIntData.h +@@ -217,7 +217,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionP + #if COMPILER(MSVC) + return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).taggedPtr()); + #else +- return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr()); ++ return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr<>()); + #endif + } + +@@ -227,7 +227,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFun + #if COMPILER(MSVC) + return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).taggedPtr()); + #else +- return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr()); ++ return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr<>()); + #endif + } + +@@ -237,7 +237,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFun + #if COMPILER(MSVC) + return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).taggedPtr()); + #else +- return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr()); ++ return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr<>()); + #endif + } + #else // not ENABLE(JIT) +@@ -361,7 +361,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionP + #if COMPILER(MSVC) + return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).taggedPtr()); + #else +- return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr()); ++ return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr<>()); + #endif + } + +@@ -371,7 +371,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFun + #if COMPILER(MSVC) + return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).taggedPtr()); + #else +- return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr()); ++ return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr<>()); + #endif + } + +@@ -381,7 +381,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFun + #if COMPILER(MSVC) + return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).taggedPtr()); + #else +- return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr()); ++ return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr<>()); + #endif + } + #else // not ENABLE(JIT) +--- a/Source/JavaScriptCore/llint/LLIntThunks.cpp ++++ b/Source/JavaScriptCore/llint/LLIntThunks.cpp +@@ -227,7 +227,7 @@ ALWAYS_INLINE void* untaggedPtr(void* pt + #if COMPILER(MSVC) + return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).untaggedPtr(); + #else +- return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); ++ return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); + #endif + } + +--- a/Source/JavaScriptCore/parser/Nodes.h ++++ b/Source/JavaScriptCore/parser/Nodes.h +@@ -1,7 +1,7 @@ + /* + * Copyright (C) 1999-2000 Harri Porten (porten@kde.org) + * Copyright (C) 2001 Peter Kelly (pmk@post.com) +- * Copyright (C) 2003-2019 Apple Inc. All rights reserved. ++ * Copyright (C) 2003-2024 Apple Inc. All rights reserved. + * Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca) + * Copyright (C) 2007 Maks Orlovich + * Copyright (C) 2007 Eric Seidel <eric@webkit.org> +@@ -29,6 +29,7 @@ + #include "ImplementationVisibility.h" + #include "JITCode.h" + #include "Label.h" ++#include "ModuleScopeData.h" + #include "ParserArena.h" + #include "ParserModes.h" + #include "ParserTokens.h" +@@ -49,7 +50,6 @@ namespace JSC { + class FunctionMetadataNode; + class FunctionParameters; + class ModuleAnalyzer; +- class ModuleScopeData; + class PropertyListNode; + class ReadModifyResolveNode; + class RegisterID; +--- a/Source/JavaScriptCore/runtime/JSCast.h ++++ b/Source/JavaScriptCore/runtime/JSCast.h +@@ -236,7 +236,7 @@ template<typename Target, typename From> + bool inherits(From* from) + { + using Dispatcher = InheritsTraits<Target>; +- return Dispatcher::template inherits(from); ++ return Dispatcher::template inherits<>(from); + } + + } // namespace JSCastingHelpers +@@ -245,7 +245,7 @@ template<typename To, typename From> + To jsDynamicCast(From* from) + { + using Dispatcher = JSCastingHelpers::InheritsTraits<typename std::remove_cv<typename std::remove_pointer<To>::type>::type>; +- if (LIKELY(Dispatcher::template inherits(from))) ++ if (LIKELY(Dispatcher::template inherits<>(from))) + return static_cast<To>(from); + return nullptr; + } diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch new file mode 100644 index 0000000000..e6a43c2fff --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch @@ -0,0 +1,35 @@ +From fb81a5de7798eb7f68e0de1c281671553e1aa19d Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <mcatanzaro@redhat.com> +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?= + =?UTF-8?q?=E2=80=98t6=E2=80=99=20was=20not=20declared=20in=20this=20scope?= + =?UTF-8?q?=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 75cecbbd..b1020ea4 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch new file mode 100644 index 0000000000..b2e40a88c8 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch @@ -0,0 +1,65 @@ +From 1523e00a2a76e285262c8aa3721b5d99f3f2d612 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt <thomas.devoogdt@barco.com> +Date: Mon, 16 Jan 2023 17:03:30 +0100 +Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix + + !ENABLE(WEBASSEMBLY_B3JIT) + +https://bugs.webkit.org/show_bug.cgi?id=250681 + +Reviewed by NOBODY (OOPS!). + +WasmTypeDefinition.h isn't included if not ENABLE(WEBASSEMBLY_B3JIT). +Also, toB3Type and simdScalarType are not defined if it is included. + +Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com> + +Upstream-Status: Inappropriate [https://bugs.launchpad.net/ubuntu/+source/webkit2gtk/+bug/2008798] +--- + Source/JavaScriptCore/b3/B3Validate.cpp | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/Source/JavaScriptCore/b3/B3Validate.cpp b/Source/JavaScriptCore/b3/B3Validate.cpp +index eaaa3749..1d089783 100644 +--- a/Source/JavaScriptCore/b3/B3Validate.cpp ++++ b/Source/JavaScriptCore/b3/B3Validate.cpp +@@ -47,6 +47,12 @@ + #include <wtf/StringPrintStream.h> + #include <wtf/text/CString.h> + ++#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_B3JIT) ++#define simdScalarTypeToB3Type(type) toB3Type(Wasm::simdScalarType(type)) ++#else ++#define simdScalarTypeToB3Type(type) B3::Type() ++#endif ++ + namespace JSC { namespace B3 { + + namespace { +@@ -454,7 +460,7 @@ public: + case VectorExtractLane: + VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); + VALIDATE(value->numChildren() == 1, ("At ", *value)); +- VALIDATE(value->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); ++ VALIDATE(value->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); + VALIDATE(value->child(0)->type() == V128, ("At ", *value)); + break; + case VectorReplaceLane: +@@ -462,7 +468,7 @@ public: + VALIDATE(value->numChildren() == 2, ("At ", *value)); + VALIDATE(value->type() == V128, ("At ", *value)); + VALIDATE(value->child(0)->type() == V128, ("At ", *value)); +- VALIDATE(value->child(1)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); ++ VALIDATE(value->child(1)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); + break; + case VectorDupElement: + VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); +@@ -484,7 +490,7 @@ public: + VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); + VALIDATE(value->numChildren() == 1, ("At ", *value)); + VALIDATE(value->type() == V128, ("At ", *value)); +- VALIDATE(value->child(0)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); ++ VALIDATE(value->child(0)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); + break; + + case VectorPopcnt: diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch new file mode 100644 index 0000000000..37bc6538c3 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch @@ -0,0 +1,30 @@ +From c50f2277509f2e6f087cda2eaf323eaf569aad8d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Sep 2023 12:42:06 -0700 +Subject: [PATCH] clang/arm: Do not use MUST_TAIL_CALL + +This causes clang-17 to crash see [1] +this code is new in webkit 2.42[2] thats why we do not see the crash in older webkit + +[1] https://github.com/llvm/llvm-project/issues/67767 +[2] https://github.com/WebKit/WebKit/commit/4d816460b765acd8aef90ab474615850b91ecc35 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/WTF/wtf/Compiler.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h +index 449ca502..daac29d7 100644 +--- a/Source/WTF/wtf/Compiler.h ++++ b/Source/WTF/wtf/Compiler.h +@@ -321,7 +321,7 @@ + /* MUST_TAIL_CALL */ + + #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute) +-#if __has_cpp_attribute(clang::musttail) ++#if __has_cpp_attribute(clang::musttail) && !defined(__arm__) + #define MUST_TAIL_CALL [[clang::musttail]] + #endif + #endif diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/reproducibility.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/reproducibility.patch new file mode 100644 index 0000000000..0a5720c99e --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/reproducibility.patch @@ -0,0 +1,30 @@ +From 7336dfd02c20ec9b2a984e1e42d17201af55c8f5 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Thu, 27 Jul 2023 22:09:06 +0200 +Subject: [PATCH] webkitgtk3: add recipe + +Injection a year based on the current date isn't reproducible. Hack this +to a specific year for now for reproducibilty and to avoid autobuilder failures. + +The correct fix would be to use SOURCE_DATE_EPOCH from the environment and +then this could be submitted upstream, sadly my ruby isn't up to that. + +Upstream-Status: Pending [could be reworked] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +--- + Source/JavaScriptCore/generator/GeneratedFile.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/generator/GeneratedFile.rb b/Source/JavaScriptCore/generator/GeneratedFile.rb +index 6ed2b6e4..86a28286 100644 +--- a/Source/JavaScriptCore/generator/GeneratedFile.rb ++++ b/Source/JavaScriptCore/generator/GeneratedFile.rb +@@ -25,7 +25,7 @@ require 'date' + require 'digest' + + $LICENSE = <<-EOF +-Copyright (C) #{Date.today.year} Apple Inc. All rights reserved. ++Copyright (C) 2021 Apple Inc. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb new file mode 100644 index 0000000000..9493d86422 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb @@ -0,0 +1,189 @@ +SUMMARY = "WebKit web rendering engine for the GTK+ platform" +HOMEPAGE = "https://www.webkitgtk.org/" +BUGTRACKER = "https://bugs.webkit.org/" + +LICENSE = "BSD-2-Clause & LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ + file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ + file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ + file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ + " + +SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ + file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ + file://reproducibility.patch \ + file://no-musttail-arm.patch \ + file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \ + file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ + file://0001-Fix-build-issues-with-latest-Clang.patch \ + " +SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54" + +inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen + +S = "${WORKDIR}/webkitgtk-${PV}" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" + +CVE_PRODUCT = "webkitgtk webkitgtk\+" + +DEPENDS += " \ + ruby-native \ + gperf-native \ + unifdef-native \ + cairo \ + harfbuzz \ + jpeg \ + atk \ + libwebp \ + gtk+3 \ + libxslt \ + libtasn1 \ + libnotify \ + gstreamer1.0 \ + gstreamer1.0-plugins-base \ + glib-2.0-native \ + gettext-native \ + " + +PACKAGECONFIG_SOUP ?= "soup3" +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ + enchant \ + libsecret \ + ${PACKAGECONFIG_SOUP} \ + " + +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" +PACKAGECONFIG[angle] = "-DUSE_ANGLE_WEBGL=ON,-DUSE_ANGLE_WEBGL=OFF" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" +PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" +PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" +PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" +PACKAGECONFIG[jpegxl] = " -DUSE_JPEGXL=ON,-DUSE_JPEGXL=OFF,libjxl" +PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/egl" +PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/egl" +PACKAGECONFIG[opengl-or-es] = "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF" +PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" +PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" +PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" +PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" +PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" +PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," +PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" +PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3" +PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" +PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" +PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif" +PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad" +PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette" +PACKAGECONFIG[webrtc] = "-DENABLE_WEB_RTC=ON,-DENABLE_WEB_RTC=OFF" +PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON -DBWRAP_EXECUTABLE=${bindir}/bwrap -DDBUS_PROXY_EXECUTABLE=${bindir}/xdg-dbus-proxy,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,,bubblewrap xdg-dbus-proxy" +PACKAGECONFIG[backtrace] = "-DUSE_LIBBACKTRACE=ON,-DUSE_LIBBACKTRACE=OFF,libbacktrace" + +EXTRA_OECMAKE = " \ + -DPORT=GTK \ + -DUSE_GTK4=OFF \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ + ${@bb.utils.contains('GIDOCGEN_ENABLED', 'True', '-DENABLE_DOCUMENTATION=ON', '-DENABLE_DOCUMENTATION=OFF', d)} \ + -DENABLE_MINIBROWSER=ON \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \ + " +# Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the +# debug symbols (4.3GB to 700M at time of writing) +DEBUG_FLAGS:append = "${@oe.utils.vartrue('DEBUG_BUILD', '', ' -g1', d)}" + +# Javascript JIT is not supported on ARC +EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " +# By default 25-bit "medium" calls are used on ARC +# which is not enough for binaries larger than 32 MiB +CFLAGS:append:arc = " -mlong-calls" +CXXFLAGS:append:arc = " -mlong-calls" + +# Needed for non-mesa graphics stacks when x11 is disabled +CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" + +# Javascript JIT is not supported on powerpc +EXTRA_OECMAKE:append:powerpc = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:powerpc64 = " -DENABLE_JIT=OFF " + +# ARM JIT code does not build on ARMv4/5/6 anymore +EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " + +# And for armv7* don't enable it for softfp, because after: +# https://github.com/WebKit/WebKit/commit/a2ec4ef1997d6fafa6ffc607bffb54e76168a918 +# https://bugs.webkit.org/show_bug.cgi?id=242172 +# softfp armv7* fails because WEBASSEMBLY is left enabled by default and JIT gets +# explicitly disabled causing: +# http://errors.yoctoproject.org/Errors/Details/734587/ +# PR was sent upstream, but the end result is the same both JIT and WEBASSEMBLY disabled +# https://github.com/WebKit/WebKit/pull/17447 +EXTRA_OECMAKE:append:armv7a = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" +EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" +EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" + +EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " + +# JIT and gold linker does not work on RISCV +EXTRA_OECMAKE:append:riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" +EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF" + +# JIT not supported on MIPS either +EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " + +# JIT not supported on X32 +# An attempt was made to upstream JIT support for x32 in +# https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as +# unresolved due to limited X32 adoption. +EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " + +SECURITY_CFLAGS:remove:aarch64 = "-fpie" +SECURITY_CFLAGS:append:aarch64 = " -fPIE" + +FILES:${PN} += "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so" + +RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" + +# http://errors.yoctoproject.org/Errors/Details/20370/ +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" + +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 +# https://bugs.webkit.org/show_bug.cgi?id=159880 +# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. +# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). +ARM_INSTRUCTION_SET:armv7a = "thumb" +ARM_INSTRUCTION_SET:armv7r = "thumb" +ARM_INSTRUCTION_SET:armv7ve = "thumb" + +# ANGLE requires SSE support as of webkit 2.40.x on 32 bit x86 +COMPATIBLE_HOST:x86 = "${@bb.utils.contains_any('TUNE_FEATURES', 'core2 corei7', '.*', 'null', d)}" + +# introspection inside qemu-arm hangs forever on musl/arm builds +# therefore disable GI_DATA +GI_DATA_ENABLED:libc-musl:armv7a = "False" +GI_DATA_ENABLED:libc-musl:armv7ve = "False" + +do_install:append() { + mv ${D}${bindir}/WebKitWebDriver ${D}${bindir}/WebKitWebDriver3 +} + +PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" +src_package_preprocess () { + # Trim build paths from comments in generated sources to ensure reproducibility + sed -i -e "s,${WORKDIR},,g" \ + ${B}/JavaScriptCore/DerivedSources/*.h \ + ${B}/JavaScriptCore/DerivedSources/yarr/*.h \ + ${B}/JavaScriptCore/PrivateHeaders/JavaScriptCore/*.h \ + ${B}/WebCore/DerivedSources/*.cpp \ + ${B}/WebKitGTK/DerivedSources/webkit/*.cpp +} + diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-Correct-clang-compiler-flags.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-Correct-clang-compiler-flags.patch new file mode 100644 index 0000000000..7a99daf6b2 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-Correct-clang-compiler-flags.patch @@ -0,0 +1,32 @@ +From 5ccaff351297bca0e254bbfd66e3f03fef9d9c75 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 10 Jan 2020 21:54:39 -0800 +Subject: [PATCH] Correct clang compiler flags + +Fix misplaced quotes, this was leading to spurious ; in compiler cmdline +Remove demanding libc++, clang can link with both libc++ and libstdc++ +and platforms have their own defaults, user can demand non defaults via +adding it to cmake flags + +Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/859] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d13117..c17354a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -154,7 +154,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + endif() + set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto) + set (WEBSOCKETPP_BOOST_LIBS system thread) +- set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here? ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + if (NOT APPLE) + add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these? + endif () +-- +2.24.1 + diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-cmake-Use-GNUInstallDirs.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-cmake-Use-GNUInstallDirs.patch new file mode 100644 index 0000000000..0ef2e12375 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-cmake-Use-GNUInstallDirs.patch @@ -0,0 +1,35 @@ +From 771d79eeb0ac5079482a4b3a131bbda744793e7d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 19 Dec 2019 20:07:11 -0800 +Subject: [PATCH] cmake: Use GNUInstallDirs + +Helps install cmakefiles in right libdir + +Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/854] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2786aba..080be3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,11 +39,13 @@ endif() + + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + ++include(GNUInstallDirs) ++ + set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") + if (WIN32 AND NOT CYGWIN) + set (DEF_INSTALL_CMAKE_DIR cmake) + else () +- set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp) ++ set (DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/websocketpp) + endif () + set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") + +-- +2.24.1 + diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch new file mode 100644 index 0000000000..12613f8b19 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch @@ -0,0 +1,508 @@ +From 05d1189ffce562560da90056d96fe2084d84654a Mon Sep 17 00:00:00 2001 +From: "Laszlo Boszormenyi (GCS)" <gcs@debian.org> +Date: Mon, 14 Feb 2022 14:13:13 +0100 +Subject: [PATCH] SCons 4.2.0 no longer has env_cpp11.has_key() Check env_cpp11 + as an array. + +This fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003022 +--- +Upstream-Status: Pending + + examples/broadcast_server/SConscript | 2 +- + examples/debug_client/SConscript | 2 +- + examples/debug_server/SConscript | 2 +- + examples/dev/SConscript | 2 +- + examples/echo_client/SConscript | 2 +- + examples/echo_server/SConscript | 2 +- + examples/echo_server_both/SConscript | 2 +- + examples/echo_server_tls/SConscript | 2 +- + examples/external_io_service/SConscript | 2 +- + examples/iostream_server/SConscript | 2 +- + examples/print_client/SConscript | 2 +- + examples/print_client_tls/SConscript | 2 +- + examples/print_server/SConscript | 2 +- + examples/scratch_client/SConscript | 2 +- + examples/scratch_server/SConscript | 2 +- + examples/sip_client/SConscript | 2 +- + examples/subprotocol_server/SConscript | 2 +- + examples/telemetry_client/SConscript | 2 +- + examples/telemetry_server/SConscript | 2 +- + examples/testee_client/SConscript | 2 +- + examples/testee_server/SConscript | 2 +- + examples/utility_client/SConscript | 4 ++-- + test/connection/SConscript | 2 +- + test/endpoint/SConscript | 2 +- + test/extension/SConscript | 2 +- + test/http/SConscript | 2 +- + test/logger/SConscript | 2 +- + test/message_buffer/SConscript | 2 +- + test/processors/SConscript | 2 +- + test/random/SConscript | 2 +- + test/roles/SConscript | 2 +- + test/transport/SConscript | 2 +- + test/transport/asio/SConscript | 2 +- + test/transport/iostream/SConscript | 2 +- + test/utility/SConscript | 2 +- + 35 files changed, 36 insertions(+), 36 deletions(-) + +diff --git a/examples/broadcast_server/SConscript b/examples/broadcast_server/SConscript +index 5786f570d..06c55c147 100644 +--- a/examples/broadcast_server/SConscript ++++ b/examples/broadcast_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('broadcast_server', ["broadcast_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/debug_client/SConscript b/examples/debug_client/SConscript +index 781db8371..b92b14653 100644 +--- a/examples/debug_client/SConscript ++++ b/examples/debug_client/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('debug_client', ["debug_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/debug_server/SConscript b/examples/debug_server/SConscript +index 4d02261c6..7e24b07c8 100644 +--- a/examples/debug_server/SConscript ++++ b/examples/debug_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('debug_server', ["debug_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/dev/SConscript b/examples/dev/SConscript +index 34ddac2d5..31062fee9 100644 +--- a/examples/dev/SConscript ++++ b/examples/dev/SConscript +@@ -11,7 +11,7 @@ env_cpp11 = env_cpp11.Clone () + + prgs = [] + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system','timer','chrono'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('main', ["main.cpp"], LIBS = BOOST_LIBS_CPP11) + +diff --git a/examples/echo_client/SConscript b/examples/echo_client/SConscript +index 0e4110822..2adf1166d 100644 +--- a/examples/echo_client/SConscript ++++ b/examples/echo_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + prgs += env_cpp11.Program('echo_client', ["echo_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/echo_server/SConscript b/examples/echo_server/SConscript +index a2978852e..a48724155 100644 +--- a/examples/echo_server/SConscript ++++ b/examples/echo_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('echo_server', ["echo_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/echo_server_both/SConscript b/examples/echo_server_both/SConscript +index d1ecf202f..32f4c8c55 100644 +--- a/examples/echo_server_both/SConscript ++++ b/examples/echo_server_both/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('echo_server_both', ["echo_server_both.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/echo_server_tls/SConscript b/examples/echo_server_tls/SConscript +index e24cc4ce8..688bf7c14 100644 +--- a/examples/echo_server_tls/SConscript ++++ b/examples/echo_server_tls/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('echo_server_tls', ["echo_server_tls.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/external_io_service/SConscript b/examples/external_io_service/SConscript +index beb7c1c42..0abf3e175 100644 +--- a/examples/external_io_service/SConscript ++++ b/examples/external_io_service/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('external_io_service', ["external_io_service.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/iostream_server/SConscript b/examples/iostream_server/SConscript +index dc90834cf..304142082 100644 +--- a/examples/iostream_server/SConscript ++++ b/examples/iostream_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('iostream_server', ["iostream_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/print_client/SConscript b/examples/print_client/SConscript +index 8da4ce5b2..79fdea0fd 100644 +--- a/examples/print_client/SConscript ++++ b/examples/print_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('print_client', ["print_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/print_client_tls/SConscript b/examples/print_client_tls/SConscript +index 01b011473..e57b9d691 100644 +--- a/examples/print_client_tls/SConscript ++++ b/examples/print_client_tls/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('print_client_tls', ["print_client_tls.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/print_server/SConscript b/examples/print_server/SConscript +index 4f0e492be..454dcf01b 100644 +--- a/examples/print_server/SConscript ++++ b/examples/print_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('print_server', ["print_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/scratch_client/SConscript b/examples/scratch_client/SConscript +index 6e7b2ef07..4be98f437 100644 +--- a/examples/scratch_client/SConscript ++++ b/examples/scratch_client/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('scratch_client', ["scratch_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/scratch_server/SConscript b/examples/scratch_server/SConscript +index bf90f7433..cc495ba5c 100644 +--- a/examples/scratch_server/SConscript ++++ b/examples/scratch_server/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + ['z'] + prgs += env_cpp11.Program('scratch_server', ["scratch_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/sip_client/SConscript b/examples/sip_client/SConscript +index fafe7b4ff..e2afefe73 100644 +--- a/examples/sip_client/SConscript ++++ b/examples/sip_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('sip_client', ["sip_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/subprotocol_server/SConscript b/examples/subprotocol_server/SConscript +index e97535ca5..299af43c5 100644 +--- a/examples/subprotocol_server/SConscript ++++ b/examples/subprotocol_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('subprotocol_server', ["subprotocol_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/telemetry_client/SConscript b/examples/telemetry_client/SConscript +index 62396a5e3..ac0e6daba 100644 +--- a/examples/telemetry_client/SConscript ++++ b/examples/telemetry_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('telemetry_client', ["telemetry_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/telemetry_server/SConscript b/examples/telemetry_server/SConscript +index 1b8ff2295..c620f38a4 100644 +--- a/examples/telemetry_server/SConscript ++++ b/examples/telemetry_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('telemetry_server', ["telemetry_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/testee_client/SConscript b/examples/testee_client/SConscript +index 64f0ef1f3..6154bb966 100644 +--- a/examples/testee_client/SConscript ++++ b/examples/testee_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + prgs += env_cpp11.Program('testee_client', ["testee_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/testee_server/SConscript b/examples/testee_server/SConscript +index 3c75f4ff2..ca8ffb7d7 100644 +--- a/examples/testee_server/SConscript ++++ b/examples/testee_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + prgs += env_cpp11.Program('testee_server', ["testee_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/utility_client/SConscript b/examples/utility_client/SConscript +index 6e6cd8c9d..f6d673a43 100644 +--- a/examples/utility_client/SConscript ++++ b/examples/utility_client/SConscript +@@ -13,11 +13,11 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS) + else: + ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] + prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS) + +-Return('prgs') +\ No newline at end of file ++Return('prgs') +diff --git a/test/connection/SConscript b/test/connection/SConscript +index 4ed7a4e69..b79876bf1 100644 +--- a/test/connection/SConscript ++++ b/test/connection/SConscript +@@ -16,7 +16,7 @@ objs = env.Object('connection_boost.o', ["connection.cpp"], LIBS = BOOST_LIBS) + objs = env.Object('connection_tu2_boost.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_connection_boost', ["connection_boost.o","connection_tu2_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('connection_stl.o', ["connection.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('connection_tu2_stl.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/endpoint/SConscript b/test/endpoint/SConscript +index 5cb3ede91..74912865e 100644 +--- a/test/endpoint/SConscript ++++ b/test/endpoint/SConscript +@@ -16,7 +16,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + + objs = env.Object('endpoint_boost.o', ["endpoint.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_endpoint_boost', ["endpoint_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + objs += env_cpp11.Object('endpoint_stl.o', ["endpoint.cpp"], LIBS = BOOST_LIBS_CPP11) + prgs += env_cpp11.Program('test_endpoint_stl', ["endpoint_stl.o"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/extension/SConscript b/test/extension/SConscript +index d8b425fda..0cb813856 100644 +--- a/test/extension/SConscript ++++ b/test/extension/SConscript +@@ -17,7 +17,7 @@ objs += env.Object('permessage_deflate_boost.o', ["permessage_deflate.cpp"], LIB + prgs = env.Program('test_extension_boost', ["extension_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_permessage_deflate_boost', ["permessage_deflate_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + objs += env_cpp11.Object('extension_stl.o', ["extension.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('permessage_deflate_stl.o', ["permessage_deflate.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/http/SConscript b/test/http/SConscript +index 0a24a8774..422998e24 100644 +--- a/test/http/SConscript ++++ b/test/http/SConscript +@@ -15,7 +15,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework'],env) + [platform_libs] + objs = env.Object('parser_boost.o', ["parser.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_http_boost', ["parser_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('parser_stl.o', ["parser.cpp"], LIBS = BOOST_LIBS_CPP11) + prgs += env_cpp11.Program('test_http_stl', ["parser_stl.o"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/logger/SConscript b/test/logger/SConscript +index 81d607601..0ccbbc5df 100644 +--- a/test/logger/SConscript ++++ b/test/logger/SConscript +@@ -15,7 +15,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + objs = env.Object('logger_basic_boost.o', ["basic.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('logger_basic_boost', ["logger_basic_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('logger_basic_stl.o', ["basic.cpp"], LIBS = BOOST_LIBS_CPP11) + prgs += env_cpp11.Program('logger_basic_stl', ["logger_basic_stl.o"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/message_buffer/SConscript b/test/message_buffer/SConscript +index 2ef6d71f3..89785cb3e 100644 +--- a/test/message_buffer/SConscript ++++ b/test/message_buffer/SConscript +@@ -17,7 +17,7 @@ objs += env.Object('alloc_boost.o', ["alloc.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_message_boost', ["message_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_alloc_boost', ["alloc_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('message_stl.o', ["message.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('alloc_stl.o', ["alloc.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/processors/SConscript b/test/processors/SConscript +index 406a7edc9..1b40d0b1d 100644 +--- a/test/processors/SConscript ++++ b/test/processors/SConscript +@@ -26,7 +26,7 @@ prgs += env.Program('test_hybi07_boost', ["test_hybi07_boost.o"], LIBS = BOOST_L + prgs += env.Program('test_hybi00_boost', ["test_hybi00_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_extension_permessage_compress_boost', ["test_extension_permessage_compress_boost.o"], LIBS = BOOST_LIBS + ['z']) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + # no C++11 features are used in processor so there are no C++11 versions of + # these tests. +diff --git a/test/random/SConscript b/test/random/SConscript +index 3cadc9e97..4a11b0ce5 100644 +--- a/test/random/SConscript ++++ b/test/random/SConscript +@@ -17,7 +17,7 @@ objs += env.Object('random_device_boost.o', ["random_device.cpp"], LIBS = BOOST_ + prgs = env.Program('test_random_none_boost', ["random_none_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_random_device_boost', ["random_device_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('random_none_stl.o', ["none.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('random_device_stl.o', ["random_device.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/roles/SConscript b/test/roles/SConscript +index e86107ece..17b3be105 100644 +--- a/test/roles/SConscript ++++ b/test/roles/SConscript +@@ -17,7 +17,7 @@ objs += env.Object('server_boost.o', ["server.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_client_boost', ["client_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_server_boost', ["server_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('client_stl.o', ["client.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('server_stl.o', ["server.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/transport/SConscript b/test/transport/SConscript +index 71b31b6c5..aa9b719ec 100644 +--- a/test/transport/SConscript ++++ b/test/transport/SConscript +@@ -16,7 +16,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','random','chrono + objs = env.Object('boost_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_boost_integration', ["boost_integration.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + objs += env_cpp11.Object('stl_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS_CPP11) + prgs += env_cpp11.Program('test_stl_integration', ["stl_integration.o"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/transport/asio/SConscript b/test/transport/asio/SConscript +index f8185e57e..518d362b1 100644 +--- a/test/transport/asio/SConscript ++++ b/test/transport/asio/SConscript +@@ -20,7 +20,7 @@ prgs = env.Program('test_base_boost', ["base_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_timers_boost', ["timers_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_security_boost', ["security_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + objs += env_cpp11.Object('base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('timers_stl.o', ["timers.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/transport/iostream/SConscript b/test/transport/iostream/SConscript +index 9e74c2f15..dcaf9f2d9 100644 +--- a/test/transport/iostream/SConscript ++++ b/test/transport/iostream/SConscript +@@ -19,7 +19,7 @@ prgs = env.Program('test_iostream_base_boost', ["iostream_base_boost.o"], LIBS = + prgs += env.Program('test_iostream_connection_boost', ["iostream_connection_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_iostream_endpoint_boost', ["iostream_endpoint_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('iostream_base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('iostream_connection_stl.o', ["connection.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/utility/SConscript b/test/utility/SConscript +index 80e9ef6c8..6f19aa52a 100644 +--- a/test/utility/SConscript ++++ b/test/utility/SConscript +@@ -24,7 +24,7 @@ prgs += env.Program('test_close_boost', ["close_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_sha1_boost', ["sha1_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_error_boost', ["error_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('utilities_stl.o', ["utilities.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('uri_stl.o', ["uri.cpp"], LIBS = BOOST_LIBS_CPP11) diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch new file mode 100644 index 0000000000..68cb645b40 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch @@ -0,0 +1,25 @@ +From 3590d77bb9753fbbf076028e2395182ced6466ba Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Wed, 8 Jan 2020 17:59:48 +0100 +Subject: [PATCH] Fix cmake find boost with version >= 1.71 + +For some reasons "system;thread;random;unit_test_framework" was seen as a single module, because of the quotes. +--- +Upstream-Status: Pending + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d13117b..9a46bc10 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -217,7 +217,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + set (Boost_USE_MULTITHREADED TRUE) + set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these! + +- find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}") ++ find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS}) + + if (Boost_FOUND) + # Boost is a project wide global dependency. diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch new file mode 100644 index 0000000000..401a614dc1 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch @@ -0,0 +1,134 @@ +From 931a55347a322f38eb82d5f387b2924e6c7a1746 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Thu, 9 Jan 2020 10:07:20 +0100 +Subject: [PATCH] Update SConstruct with new Python3 syntax: - new raise + keyword syntax - has_key deprecated method is now removed - commands + deprecated library is replaced by subprocess - print function fixes + +This should fix FTBFS against new scons 3.1.2 +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=947584 +--- +Upstream-Status: Pending + + SConstruct | 45 +++++++++++++++++++++++---------------------- + 1 file changed, 23 insertions(+), 22 deletions(-) + +diff --git a/SConstruct b/SConstruct +index ae3df10b..9d1c8914 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1,18 +1,19 @@ +-import os, sys, commands ++import os, sys ++from subprocess import check_output + env = Environment(ENV = os.environ) + + # figure out a better way to configure this +-if os.environ.has_key('CXX'): ++if 'CXX' in os.environ: + env['CXX'] = os.environ['CXX'] + +-if os.environ.has_key('DEBUG'): ++if 'DEBUG' in os.environ: + env['DEBUG'] = os.environ['DEBUG'] + +-if os.environ.has_key('CXXFLAGS'): ++if 'CXXFLAGS' in os.environ: + #env['CXXFLAGS'] = os.environ['CXXFLAGS'] + env.Append(CXXFLAGS = os.environ['CXXFLAGS']) + +-if os.environ.has_key('LINKFLAGS'): ++if 'LINKFLAGS' in os.environ: + #env['LDFLAGS'] = os.environ['LDFLAGS'] + env.Append(LINKFLAGS = os.environ['LINKFLAGS']) + +@@ -22,24 +23,24 @@ if os.environ.has_key('LINKFLAGS'): + ## or set BOOST_INCLUDES and BOOST_LIBS if Boost comes with your OS distro e.g. and + ## needs BOOST_INCLUDES=/usr/include/boost and BOOST_LIBS=/usr/lib like Ubuntu. + ## +-if os.environ.has_key('BOOSTROOT'): ++if 'BOOSTROOT' in os.environ: + os.environ['BOOST_ROOT'] = os.environ['BOOSTROOT'] + +-if os.environ.has_key('BOOST_ROOT'): ++if 'BOOST_ROOT' in os.environ: + env['BOOST_INCLUDES'] = os.environ['BOOST_ROOT'] + env['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT'], 'stage', 'lib') +-elif os.environ.has_key('BOOST_INCLUDES') and os.environ.has_key('BOOST_LIBS'): ++elif 'BOOST_INCLUDES' in os.environ and 'BOOST_LIBS' in os.environ: + env['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES'] + env['BOOST_LIBS'] = os.environ['BOOST_LIBS'] + else: +- raise SCons.Errors.UserError, "Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS was set!" ++ raise SCons.Errors.UserError("Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS were set!") + + ## Custom OpenSSL +-if os.environ.has_key('OPENSSL_PATH'): ++if 'OPENSSL_PATH' in os.environ: + env.Append(CPPPATH = os.path.join(os.environ['OPENSSL_PATH'], 'include')) + env.Append(LIBPATH = os.environ['OPENSSL_PATH']) + +-if os.environ.has_key('WSPP_ENABLE_CPP11'): ++if 'WSPP_ENABLE_CPP11' in os.environ: + env['WSPP_ENABLE_CPP11'] = True + else: + env['WSPP_ENABLE_CPP11'] = False +@@ -76,7 +77,7 @@ if env['PLATFORM'].startswith('win'): + env['CCFLAGS'] = '%s /EHsc /GR /GS- /MD /nologo %s %s' % (warn_flags, arch_flags, opt_flags) + env['LINKFLAGS'] = '/INCREMENTAL:NO /MANIFEST /NOLOGO /OPT:REF /OPT:ICF /MACHINE:X86' + elif env['PLATFORM'] == 'posix': +- if env.has_key('DEBUG'): ++ if 'DEBUG' in env: + env.Append(CCFLAGS = ['-g', '-O0']) + else: + env.Append(CPPDEFINES = ['NDEBUG']) +@@ -84,9 +85,9 @@ elif env['PLATFORM'] == 'posix': + env.Append(CCFLAGS = ['-Wall']) + #env['LINKFLAGS'] = '' + elif env['PLATFORM'] == 'darwin': +- if not os.environ.has_key('CXX'): ++ if not 'CXX' in os.environ: + env['CXX'] = "clang++" +- if env.has_key('DEBUG'): ++ if 'DEBUG' in env: + env.Append(CCFLAGS = ['-g', '-O0']) + else: + env.Append(CPPDEFINES = ['NDEBUG']) +@@ -157,29 +158,29 @@ env_cpp11 = env.Clone () + + if env_cpp11['CXX'].startswith('g++'): + # TODO: check g++ version +- GCC_VERSION = commands.getoutput(env_cpp11['CXX'] + ' -dumpversion') ++ GCC_VERSION = check_output([env_cpp11['CXX'], '-dumpversion']) + +- if GCC_VERSION > "4.4.0": +- print "C++11 build environment partially enabled" ++ if GCC_VERSION.decode('utf-8') > "4.4.0": ++ print("C++11 build environment partially enabled") + env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x'],TOOLSET = ['g++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_']) + else: +- print "C++11 build environment is not supported on this version of G++" ++ print("C++11 build environment is not supported on this version of G++") + elif env_cpp11['CXX'].startswith('clang++'): +- print "C++11 build environment enabled" ++ print("C++11 build environment enabled") + env.Append(CXXFLANGS = ['-stdlib=libc++'],LINKFLAGS=['-stdlib=libc++']) + env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x','-stdlib=libc++'],LINKFLAGS = ['-stdlib=libc++'],TOOLSET = ['clang++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_']) + + # look for optional second boostroot compiled with clang's libc++ STL library + # this prevents warnings/errors when linking code built with two different + # incompatible STL libraries. +- if os.environ.has_key('BOOST_ROOT_CPP11'): ++ if 'BOOST_ROOT_CPP11' in os.environ: + env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_ROOT_CPP11'] + env_cpp11['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT_CPP11'], 'stage', 'lib') +- elif os.environ.has_key('BOOST_INCLUDES_CPP11') and os.environ.has_key('BOOST_LIBS_CPP11'): ++ elif 'BOOST_INCLUDES_CPP11' in os.environ and 'BOOST_LIBS_CPP11' in os.environ: + env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES_CPP11'] + env_cpp11['BOOST_LIBS'] = os.environ['BOOST_LIBS_CPP11'] + else: +- print "C++11 build environment disabled" ++ print("C++11 build environment disabled") + + # if the build system is known to allow the isystem modifier for library include + # values then use it for the boost libraries. Otherwise just add them to the diff --git a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb new file mode 100644 index 0000000000..f437accc50 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb @@ -0,0 +1,39 @@ +SUMMARY = "C++/Boost Asio based websocket client/server library." +SECTION = "libs/network" +HOMEPAGE = "https://github.com/zaphoyd/websocketpp" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=4d168d763c111f4ffc62249870e4e0ea" + +DEPENDS = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'openssl boost zlib', '', d)} " + +SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https;branch=master \ + file://0001-cmake-Use-GNUInstallDirs.patch \ + file://855.patch \ + file://857.patch \ + file://0001-Correct-clang-compiler-flags.patch \ + file://1024.patch \ + " + +EXTRA_OECMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '-DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON', '', d)} " + +# this is an header only library, do not depend on the main package +RDEPENDS:${PN}-dev = "" + +# to add this package to an SDK, since it isn't a reverse-dependency of anything, just use something like this: +# TOOLCHAIN_TARGET_TASK:append = " websocketpp-dev" + +# tag 0.8.2 +SRCREV= "56123c87598f8b1dd471be83ca841ceae07f95ba" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGES =+ "${PN}-examples" + +FILES:${PN}-examples = "${docdir}" + +do_install:append() { + install -d ${D}${docdir}/${BPN} + cp -R ${S}/examples ${D}${docdir}/${BPN} +} diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch b/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch deleted file mode 100644 index 90eff5bb0f..0000000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0378cbb323c662a565f7f3de2dee3d8a646e7bd1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 09:32:42 -0700 -Subject: [PATCH 1/2] makefile: Pass CFLAGS to compile - -Set CC if not already set - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - host/tools/wmiconfig/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/host/tools/wmiconfig/Makefile b/host/tools/wmiconfig/Makefile -index c6738c5..3253a7e 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,4 @@ --CC :=$(ATH_CROSS_COMPILE_TYPE)gcc -+CC ?= $(ATH_CROSS_COMPILE_TYPE)gcc - - all: -- $(CC) -Wall -DUSER_KEYS -g $(LDFLAGS) -I../../include -I../../../include -I../../wlan/include -I../../os/linux/include wmiconfig.c -o wmiconfig -+ $(CC) -Wall -DUSER_KEYS -g $(CFLAGS) $(LDFLAGS) -I../../include -I../../../include -I../../wlan/include -I../../os/linux/include wmiconfig.c -o wmiconfig --- -2.13.2 - diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch b/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch deleted file mode 100644 index f67f784c1f..0000000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch +++ /dev/null @@ -1,656 +0,0 @@ -From 909ebdde4ee2233d65de8fa01fde8e9a3bec12b7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 09:33:26 -0700 -Subject: [PATCH 2/2] fix err() API to have format string - -Fixes errors with hardening flags - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - host/tools/wmiconfig/wmiconfig.c | 148 +++++++++++++++++++-------------------- - 1 file changed, 74 insertions(+), 74 deletions(-) - -diff --git a/host/tools/wmiconfig/wmiconfig.c b/host/tools/wmiconfig/wmiconfig.c -index 21c9dcd..a6ec481 100644 ---- a/wmiconfig.c -+++ b/wmiconfig.c -@@ -483,7 +483,7 @@ main (int argc, char **argv) - strcpy(ifname, ethIf); - s = socket(AF_INET, SOCK_DGRAM, 0); - if (s < 0) { -- err(1, "socket"); -+ err(1, "%s", "socket"); - } - - while (1) { -@@ -1506,28 +1506,28 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)filterCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETBSSFILTER, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_POWER_MODE: - ifr.ifr_data = (void *)pwrCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETPWR, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_PM_PARAMS: - ifr.ifr_data = (void *)pmParamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_PMPARAMS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_IBSS_PM_CAPS: - ifr.ifr_data = (void *)adhocPmCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_IBSS_PM_CAPS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_ERROR_DETECTION: -@@ -1535,7 +1535,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_HB_CHALLENGE_RESP: -@@ -1543,7 +1543,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - #ifdef USER_KEYS -@@ -1554,7 +1554,7 @@ main (int argc, char **argv) - - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - - break; -@@ -1575,7 +1575,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)sParamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETSCAN, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_VERSION: -@@ -1586,7 +1586,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)revinfo; - if (ioctl(s, AR6000_IOCTL_WMI_GETREV, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("Host Rev = 0x%x(%u.%u.%u.%u), Target Rev = 0x%x(%u.%u.%u.%u)\n", - revinfo->host_ver, -@@ -1606,14 +1606,14 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)listenCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETLISTENINT, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BMISS_TIME: - ifr.ifr_data = (void *)bmissCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_BMISS_TIME, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_RSSI_THRESHOLDS: -@@ -1621,14 +1621,14 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_SNR_THRESHOLDS: - ifr.ifr_data = (void *)snrThresholdParam; - if (ioctl(s, AR6000_IOCTL_WMI_SET_SNRTHRESHOLD, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_CLR_RSSISNR: -@@ -1636,7 +1636,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_LQ_THRESHOLDS: -@@ -1644,7 +1644,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_CHANNEL: -@@ -1693,18 +1693,18 @@ main (int argc, char **argv) - - if (ioctl(s, AR6000_IOCTL_WMI_SET_CHANNELPARAMS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_SSID: - if (index > MAX_PROBED_SSID_INDEX) { - printf("num option for ssid command too large\n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - break; - } - if (strlen((char *)ssid) > sizeof (ssidCmd->ssid)) { - printf("ssid name too large\n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - break; - } - ssidCmd->entryIndex = index; -@@ -1722,7 +1722,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)ssidCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_PROBEDSSID, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BADAP: -@@ -1735,7 +1735,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)badApCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_BADAP, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_CREATE_QOS: -@@ -1794,7 +1794,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)crePStreamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_CREATE_QOS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_TARGET_STATS: -@@ -1807,7 +1807,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)&tgtStatsCmd; - if (ioctl(s, AR6000_IOCTL_WMI_GET_TARGET_STATS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printTargetStats(&(tgtStatsCmd.targetStats)); - break; -@@ -1815,7 +1815,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)pBitMask; - if (ioctl(s, AR6000_IOCTL_WMI_SET_ERROR_REPORT_BITMASK, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DELETE_QOS: -@@ -1824,7 +1824,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)delPStreamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_DELETE_QOS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_QOS_QUEUE: -@@ -1840,7 +1840,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)getQosQueueCmd; - if (ioctl(s, AR6000_IOCTL_WMI_GET_QOS_QUEUE, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - - printf("Active TSIDs \n"); -@@ -1855,7 +1855,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)ieInfo; - if (ioctl(s, AR6000_IOCTL_WMI_SET_ASSOC_INFO, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_AC_PARAMS: -@@ -1871,14 +1871,14 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)acParamsCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_ACCESS_PARAMS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_DISC_TIMEOUT: - ifr.ifr_data = (void *)discCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_DISC_TIMEOUT, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_ADHOC_BSSID: -@@ -1887,7 +1887,7 @@ main (int argc, char **argv) - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { - printf("fail to set adhoc bssid \n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_OPT_MODE: -@@ -1895,7 +1895,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_OPT_SEND_FRAME: -@@ -1903,7 +1903,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BEACON_INT: -@@ -1911,7 +1911,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_VOICE_PKT_SIZE: -@@ -1919,7 +1919,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_MAX_SP: -@@ -1927,7 +1927,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_ROAM_TBL: -@@ -1935,7 +1935,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_ROAM_CTRL: -@@ -1943,7 +1943,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_POWERSAVE_TIMERS: -@@ -1951,7 +1951,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_POWER_MODE: -@@ -1959,7 +1959,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("Power mode is %s\n", - (getPowerMode->powerMode == MAX_PERF_POWER) ? "maxperf" : "rec"); -@@ -1969,7 +1969,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_ROAM_DATA: -@@ -1977,7 +1977,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BT_STATUS: -@@ -1985,7 +1985,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BT_PARAMS: -@@ -1993,7 +1993,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_RETRYLIMITS: -@@ -2001,14 +2001,14 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_START_SCAN: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_STARTSCAN; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_FIX_RATES: -@@ -2031,14 +2031,14 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_FIX_RATES: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GETFIXRATES; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } else { - int i; - printf("Fix rate set index:"); -@@ -2057,7 +2057,7 @@ main (int argc, char **argv) - index--; - setAuthMode->mode = atoi(argv[index]); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_REASSOC_MODE: -@@ -2067,42 +2067,42 @@ main (int argc, char **argv) - index--; - setReassocMode->mode = atoi(argv[index]); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_LPREAMBLE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_LPREAMBLE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_RTS: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_RTS; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_WMM: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_WMM; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_TXOP: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_TXOP; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case DIAG_READ: - ((int *)buf)[0] = AR6000_XIOCTL_DIAG_READ; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("diagdata: 0x%x\n", *diagdata); - break; -@@ -2110,7 +2110,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_DIAG_WRITE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_RD: -@@ -2118,7 +2118,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - else - { -@@ -2139,14 +2139,14 @@ main (int argc, char **argv) - index--; - setKeepAlive->keepaliveInterval = atoi(argv[index]); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_KEEPALIVE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_KEEPALIVE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("Keepalive interval is %d secs and AP is %s\n", - getKeepAlive->keepaliveInterval, (getKeepAlive->configured ? -@@ -2156,63 +2156,63 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_APPIE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_MGMT_FRM_RX_FILTER: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_MGMT_FRM_RX_FILTER; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DBGLOG_CFG_MODULE: - ((int *)buf)[0] = AR6000_XIOCTL_DBGLOG_CFG_MODULE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DBGLOG_GET_DEBUG_LOGS: - ((int *)buf)[0] = AR6000_XIOCTL_DBGLOG_GET_DEBUG_LOGS; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_HOST_SLEEP_MODE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_HOST_SLEEP_MODE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_WOW_MODE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_WOW_MODE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_ADD_WOW_PATTERN: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_ADD_WOW_PATTERN; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DEL_WOW_PATTERN: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_DEL_WOW_PATTERN; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_WOW_LIST: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_WOW_LIST; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case DIAG_DUMP_CHIP_MEM: -@@ -2225,7 +2225,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_DIAG_READ; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("0x%04x:0x%04x\n", *diagaddr, *diagdata); - } -@@ -2237,21 +2237,21 @@ main (int argc, char **argv) - index = optind - 1; - *connectCtrlFlags = strtoul(argv[index], NULL, 0); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case DUMP_HTC_CREDITS: - ((int *)buf)[0] = AR6000_XIOCTL_DUMP_HTC_CREDIT_STATE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_AKMP_INFO: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_AKMP_PARAMS; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_PMKID_LIST: -@@ -2259,7 +2259,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_PMKID_LIST; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - } else { - printf("No PMKIDs entered\n"); -@@ -2269,7 +2269,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_PMKID_LIST; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BSS_PMKID_INFO: -@@ -2277,7 +2277,7 @@ main (int argc, char **argv) - iwr.u.data.length = sizeof(*pi_cmd); - if (ioctl(s, IEEE80211_IOCTL_ADDPMKID, &iwr) < 0) { - printf("ADDPMKID IOCTL Error\n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - default: --- -2.13.2 - diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb b/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb deleted file mode 100644 index c66572b1c1..0000000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Atheros 6K Wifi configuration utility" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://wmiconfig.c;endline=19;md5=4394a56bca1c5b2446c9f8e406c82911" -SECTION = "console/network" -SRCREV = "5394" -PV = "0.0.0+svnr${SRCPV}" -PR = "r2" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=AR6kSDK.build_sw.18;protocol=http \ - file://0001-makefile-Pass-CFLAGS-to-compile.patch \ - file://0002-fix-err-API-to-have-format-string.patch \ - " -S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig" - -CLEANBROKEN = "1" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - install -d ${D}${bindir} - install -m 0755 wmiconfig ${D}${bindir} -} - diff --git a/meta-oe/recipes-support/xdelta/xdelta3_3.0.11.bb b/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb index 9669d9bbb6..6b35d71a55 100644 --- a/meta-oe/recipes-support/xdelta/xdelta3_3.0.11.bb +++ b/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb @@ -4,15 +4,17 @@ DESCRIPTION = "Open-source binary diff, differential compression tools, \ HOMEPAGE = "http://xdelta.org/" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SRC_URI = "https://github.com/jmacd/xdelta-devel/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ - " -SRC_URI[md5sum] = "445d8be2ac512113d5ca601ae8359626" -SRC_URI[sha256sum] = "0ccc9751ceaa4d90d6b06938a4deddb481816f5d9284bd07d2e728609cb300aa" + +SRC_URI = "git://github.com/jmacd/xdelta.git;branch=release3_1_apl;protocol=https" +SRCREV = "4b4aed71a959fe11852e45242bb6524be85d3709" +S = "${WORKDIR}/git/xdelta3" inherit autotools # Optional secondary compression PACKAGECONFIG ??= "" PACKAGECONFIG[lzma] = "--with-liblzma,--without-liblzma,xz" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb new file mode 100644 index 0000000000..fa63196da2 --- /dev/null +++ b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb @@ -0,0 +1,19 @@ +SUMMARY = "xdg-dbus-proxy is a filtering proxy for D-Bus connections" +HOMEPAGE = "https://github.com/flatpak/xdg-dbus-proxy" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + glib-2.0 \ + libxslt-native \ + docbook-xsl-stylesheets-native \ +" + +inherit meson pkgconfig + +SRC_URI = "git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" +SRCREV = "1c1989e56f94b9eb3b7567f8a6e8a0aa16cba496" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-meson.build-add-a-hack-for-crosscompile.patch b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-meson.build-add-a-hack-for-crosscompile.patch new file mode 100644 index 0000000000..3410a88310 --- /dev/null +++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-meson.build-add-a-hack-for-crosscompile.patch @@ -0,0 +1,28 @@ +From 7abb3840ac2870fcfc174fbbd81c4209c838e1a9 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Mon, 18 Sep 2023 22:22:17 +0200 +Subject: [PATCH] meson.build: add a hack for cross-compiling + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Inappropriate [cross-compile specific] +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 760613a..d339d26 100644 +--- a/meson.build ++++ b/meson.build +@@ -168,7 +168,7 @@ pkgconfig.generate( + 'prefix': get_option('prefix'), + 'datarootdir': dataroot_dir, + 'datadir': '${prefix}/@0@'.format(get_option('datadir')), +- 'interfaces_dir': '${datadir}/dbus-1/interfaces/', ++ 'interfaces_dir': '${pc_sysrootdir}${datadir}/dbus-1/interfaces/', + }, + ) + +-- +2.41.0 + diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb new file mode 100644 index 0000000000..87e8f1f5e9 --- /dev/null +++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb @@ -0,0 +1,49 @@ +SUMMARY = "A portal frontend service for Flatpak and possibly other desktop containment frameworks." +HOMEPAGE = "https://github.com/flatpak/xdg-desktop-portal" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +REQUIRED_DISTRO_FEATURES = "polkit" + +DEPENDS = " \ + json-glib \ + glib-2.0 \ + glib-2.0-native \ + flatpak \ + libportal \ + geoclue \ + pipewire \ + fuse3 \ + xmlto-native \ +" + +PORTAL_BACKENDS ?= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gtk+3', 'xdg-desktop-portal-gtk', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gtk4', 'xdg-desktop-portal-gtk', '', d)} \ +" + +RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS} fuse3-utils" + +inherit meson pkgconfig python3native features_check + +SRC_URI = " \ + git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=xdg-desktop-portal-1.18 \ + file://0001-meson.build-add-a-hack-for-crosscompile.patch \ +" + +S = "${WORKDIR}/git" +SRCREV = "11c8a96b147aeae70e3f770313f93b367d53fedd" + +FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1" + +EXTRA_OEMESON += " \ + --cross-file=${WORKDIR}/meson-${PN}.cross \ + -Ddbus-service-dir=${datadir}/dbus-1/services \ +" + +do_write_config:append() { + cat >${WORKDIR}/meson-${PN}.cross <<EOF +[binaries] +bwrap = '${bindir}/bwrap' +EOF +} diff --git a/meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch b/meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch deleted file mode 100644 index b2b0e49988..0000000000 --- a/meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 41093d9634bfeddcaec866745d8d4022f4c6f8c1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Sun, 19 Feb 2017 21:01:39 +0100 -Subject: [PATCH] explicitly disable man generation --disable-documentation is - not enough -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index c01c54f..dcdf7a2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,6 @@ - NULL = - --SUBDIRS=po man -+SUBDIRS=po - - INCLUDES = \ - -I$(top_srcdir) \ --- -2.9.3 - diff --git a/meta-oe/recipes-support/xdg-user-dirs/files/xdg-user-dirs.desktop b/meta-oe/recipes-support/xdg-user-dirs/files/xdg-user-dirs.desktop deleted file mode 100644 index a9a22d3be7..0000000000 --- a/meta-oe/recipes-support/xdg-user-dirs/files/xdg-user-dirs.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=User folders update -Exec=xdg-user-dirs-update -StartupNotify=false -NoDisplay=true -X-GNOME-Autostart-Phase=Initialization -X-KDE-autostart-phase=1 - diff --git a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb deleted file mode 100644 index c05675976d..0000000000 --- a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "xdg-user-dirs is a tool to help manage user directories like the desktop folder and the music folder" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI = " \ - http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.gz \ - file://0001-explicitly-disable-man-generation-disable-documentat.patch \ - file://xdg-user-dirs.desktop \ -" -SRC_URI[md5sum] = "f5aaf5686ad7d8809a664bfb4566a54d" -SRC_URI[sha256sum] = "20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786" - -inherit autotools gettext - -EXTRA_OECONF = "--disable-documentation" - -do_install_append () { - install -d ${D}${sysconfdir}/xdg/autostart - install -m 644 ${WORKDIR}/xdg-user-dirs.desktop ${D}${sysconfdir}/xdg/autostart -} - -CONFFILES_${PN} += " \ - ${sysconfdir}/xdg/user-dirs.conf \ - ${sysconfdir}/xdg/user-dirs.defaults \ -" diff --git a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.18.bb b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.18.bb new file mode 100644 index 0000000000..84fc9e2f18 --- /dev/null +++ b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.18.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "xdg-user-dirs is a tool to help manage user directories like the desktop folder and the music folder" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.gz" +SRC_URI[sha256sum] = "ec6f06d7495cdba37a732039f9b5e1578bcb296576fde0da40edb2f52220df3c" + +inherit autotools gettext + +EXTRA_OECONF = "--disable-documentation" + +CONFFILES:${PN} += " \ + ${sysconfdir}/xdg/user-dirs.conf \ + ${sysconfdir}/xdg/user-dirs.defaults \ +" diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch new file mode 100644 index 0000000000..697a8ee355 --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch @@ -0,0 +1,49 @@ +From 1d7c01467e6f510b5636c73757f302a4bd277a3c Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Tue, 4 Feb 2020 23:39:49 -0800 +Subject: [PATCH] nss/nspr: fix for multilib + +Upstream-Status: Pending + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7f137c0..e15f5bc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -958,24 +958,24 @@ fi + dnl Priority 1: User specifies the path to installation + if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then + AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) +- if test -f "$with_nspr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSPR_LIB_MARKER" ; then +- NSPR_INCLUDE_PATH="$with_nspr/include" +- NSPR_LIB_PATH="$with_nspr/lib" ++ if test -f "$with_nspr/${includedir}/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/${libdir}/$NSPR_LIB_MARKER" ; then ++ NSPR_INCLUDE_PATH="$with_nspr/${includedir}" ++ NSPR_LIB_PATH="$with_nspr/${libdir}" + NSPR_FOUND="yes" + AC_MSG_RESULT([yes]) + else +- AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?]) ++ AC_MSG_ERROR([not found: "$with_nspr/${includedir}/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER" files don't exist), typo?]) + fi + fi + if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then + AC_MSG_CHECKING(for nss library installation in "$with_nss" folder) +- if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then +- NSS_INCLUDE_PATH="$with_nss/include" +- NSS_LIB_PATH="$with_nss/lib" ++ if test -f "$with_nss/${includedir}/$NSS_INCLUDE_MARKER" -a -f "$with_nss/${libdir}/$NSS_LIB_MARKER" ; then ++ NSS_INCLUDE_PATH="$with_nss/${includedir}" ++ NSS_LIB_PATH="$with_nss/${libdir}" + NSS_FOUND="yes" + AC_MSG_RESULT([yes]) + else +- AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?]) ++ AC_MSG_ERROR([not found: "$with_nss/${includedir}/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER" files don't exist), typo?]) + fi + fi + diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch new file mode 100644 index 0000000000..61c56ffc8b --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch @@ -0,0 +1,27 @@ +From b43fa6bf612ee59db57573b39e357b6ca96d48b6 Mon Sep 17 00:00:00 2001 +From: Yulong Pei <Yulong.pei@windriver.com> +Date: Wed, 21 Jul 2010 22:33:43 +0800 +Subject: [PATCH] change finding path of nss and nspr + +Upstream-Status: Pending + +Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8add879..7f137c0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -933,7 +933,7 @@ NSS_PACKAGE=mozilla-nss + NSPR_INCLUDE_MARKER="nspr/nspr.h" + NSPR_LIB_MARKER="libnspr4$shrext" + NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" +-NSS_INCLUDE_MARKER="nss/nss.h" ++NSS_INCLUDE_MARKER="nss3/nss.h" + NSS_LIB_MARKER="libnss3$shrext" + NSS_LIBS_LIST="-lnss3 -lsmime3 -lnssutil3" + diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch new file mode 100644 index 0000000000..7b07628e5f --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch @@ -0,0 +1,31 @@ +From c16d384fb64cf53351e150fb9e9b99cc6ba970b2 Mon Sep 17 00:00:00 2001 +From: Anatol Belski <anbelski@linux.microsoft.com> +Date: Thu, 14 Jan 2021 17:36:23 +0000 +Subject: [PATCH] xmlsec1: Fix configure QA error caused by host lookup path + +ERROR: mc:my-sdk:xmlsec1-1.2.30-r0 do_configure: QA Issue: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. + +It will eventually arise after the configure QA as the configure script should only look at the staging sysroot dir, not at the host. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com> + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3d23683..baf27b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -286,8 +286,8 @@ fi + dnl ========================================================================== + dnl Common installation locations + dnl ========================================================================== +-COMMON_INCLUDE_DIR="/usr/include /usr/local/include" +-COMMON_LIB_DIR="/usr/lib /usr/lib64 /usr/local/lib" ++COMMON_INCLUDE_DIR="${STAGING_INCDIR}" ++COMMON_LIB_DIR="${STAGING_LIBDIR}" + case $host in + i*86-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/i386-linux-gnu" ;; + x86_64-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/x86_64-linux-gnu" ;; diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch new file mode 100644 index 0000000000..73c6ddb027 --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch @@ -0,0 +1,26 @@ +From 1b9701faf22f5a17a81a2a2732794d9627499fcb Mon Sep 17 00:00:00 2001 +From: Yulong Pei <Yulong.pei@windriver.com> +Date: Thu, 21 Jan 2010 14:11:20 +0800 +Subject: [PATCH] force to use our own libtool + +Upstream-Status: Inappropriate [ OE specific ] + +Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> + +--- + ltmain.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 1dea62a..bfb9784 100755 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -7225,7 +7225,7 @@ func_mode_link () + dir=$func_resolve_sysroot_result + # We need an absolute path. + case $dir in +- [\\/]* | [A-Za-z]:[\\/]*) ;; ++ =* | [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` + test -z "$absdir" && \ diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch new file mode 100644 index 0000000000..26ebce343d --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch @@ -0,0 +1,42 @@ +From 83a1381e1d6bd1b5ec3df6f7c4bc1f4fe4f860b6 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Thu, 15 Jun 2017 14:44:01 +0800 +Subject: [PATCH] xmlsec1: add new recipe + +This enables the building of the examples directory +and it's installed as ptest. + +Upstream-Status: Inappropriate [ OE ptest specific ] + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + examples/Makefile | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/examples/Makefile b/examples/Makefile +index 02480c2..cbc2661 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -8,9 +8,17 @@ PROGRAMS = \ + decrypt1 decrypt2 decrypt3 \ + xmldsigverify + ++ifndef CC + CC = gcc +-CFLAGS += -g $(shell xmlsec1-config --cflags) -DUNIX_SOCKETS -Wall -Wextra +-LDLIBS += -g $(shell xmlsec1-config --libs) ++endif ++ ++CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra ++LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) ++ ++DESTDIR = /usr/share/xmlsec1 ++install-ptest: ++ if [ ! -d $(DESTDIR) ]; then mkdir -p $(DESTDIR); fi ++ cp * $(DESTDIR) + + all: $(PROGRAMS) + +-- +2.25.1 + diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest b/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest new file mode 100755 index 0000000000..afd8c69853 --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest @@ -0,0 +1,85 @@ +#!/bin/sh + +check_return() { + if [ $? == 0 ]; then + echo -e "PASS: $1\n" + else + echo -e "FAIL: $1\n" + fi +} + +echo "---------------------------------------------------" +echo "Signing a template file..." +./sign1 sign1-tmpl.xml rsakey.pem > sign1-res.xml +./verify1 sign1-res.xml rsapub.pem +check_return sign-tmpl + +echo "---------------------------------------------------" +echo "Signing a dynamicaly created template..." +./sign2 sign2-doc.xml rsakey.pem > sign2-res.xml +./verify1 sign2-res.xml rsapub.pem +check_return sign-dynamic-templ + +echo "---------------------------------------------------" +echo "Signing with X509 certificate..." +./sign3 sign3-doc.xml rsakey.pem rsacert.pem > sign3-res.xml +./verify3 sign3-res.xml ca2cert.pem cacert.pem +check_return sign-x509 + +echo "---------------------------------------------------" +echo "Verifying a signature with a single key..." +./verify1 sign1-res.xml rsapub.pem +./verify1 sign2-res.xml rsapub.pem +check_return verify-single-key + +echo "---------------------------------------------------" +echo "Verifying a signature with keys manager..." +./verify2 sign1-res.xml rsakey.pem +./verify2 sign2-res.xml rsakey.pem +check_return verify-keys-manager + +echo "---------------------------------------------------" +echo "Verifying a signature with X509 certificates..." +./verify3 sign3-res.xml ca2cert.pem cacert.pem +check_return verify-x509 + +echo "---------------------------------------------------" +echo "Verifying a signature with additional restrictions..." +./verify4 verify4-res.xml ca2cert.pem cacert.pem +check_return verify-res + +echo "---------------------------------------------------" +echo "Encrypting data with a template file..." +./encrypt1 encrypt1-tmpl.xml deskey.bin > encrypt1-res.xml +./decrypt1 encrypt1-res.xml deskey.bin +check_return encrypt-tmpl + +echo "---------------------------------------------------" +echo "Encrypting data with a dynamicaly created template..." +./encrypt2 encrypt2-doc.xml deskey.bin > encrypt2-res.xml +./decrypt1 encrypt2-res.xml deskey.bin +check_return encrypt-dynamic-tmpl + +echo "---------------------------------------------------" +echo "Encrypting data with a session key..." +./encrypt3 encrypt3-doc.xml rsakey.pem > encrypt3-res.xml +./decrypt3 encrypt3-res.xml +check_return encrypt-session-key + +echo "---------------------------------------------------" +echo "Decrypting data with a single key..." +./decrypt1 encrypt1-res.xml deskey.bin +./decrypt1 encrypt2-res.xml deskey.bin +check_return encrypt-single-key + +echo "---------------------------------------------------" +echo "Decrypting data with keys manager..." +./decrypt2 encrypt1-res.xml deskey.bin +./decrypt2 encrypt2-res.xml deskey.bin +check_return encrypt-keys-manager + +echo "---------------------------------------------------" +echo "Writing a custom keys manager..." +./decrypt3 encrypt1-res.xml +./decrypt3 encrypt2-res.xml +check_return write-keys-manager diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch new file mode 100644 index 0000000000..9e6a6a840f --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch @@ -0,0 +1,32 @@ +From 0c38c6864e7ba8f53a657d87894f24374a6a4932 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Tue, 30 Dec 2014 11:18:17 +0800 +Subject: [PATCH] examples: allow build in separate dir + +Upstream-Status: Inappropriate [ OE specific ] + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + examples/Makefile | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/examples/Makefile b/examples/Makefile +index cbc2661..e882b61 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -12,8 +12,10 @@ ifndef CC + CC = gcc + endif + +-CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra +-LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) ++top_srcdir = .. ++top_builddir = .. ++CFLAGS += -I$(top_srcdir)/include -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra ++LDLIBS += -L$(top_builddir)/src/.libs -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --libs xmlsec1 ) + + DESTDIR = /usr/share/xmlsec1 + install-ptest: +-- +2.25.1 + diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb new file mode 100644 index 0000000000..994adef3af --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb @@ -0,0 +1,67 @@ +SUMMARY = "XML Security Library is a C library based on LibXML2" +DESCRIPTION = "\ + XML Security Library is a C library based on \ + LibXML2 and OpenSSL. The library was created with a goal to support major \ + XML security standards "XML Digital Signature" and "XML Encryption". \ + " +HOMEPAGE = "http://www.aleksey.com/xmlsec/" +DEPENDS = "libtool libxml2 libxslt zlib" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0" + +SECTION = "libs" + +SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ + file://fix-ltmain.sh.patch \ + file://change-finding-path-of-nss.patch \ + file://makefile-ptest.patch \ + file://xmlsec1-examples-allow-build-in-separate-dir.patch \ + file://0001-nss-nspr-fix-for-multilib.patch \ + file://run-ptest \ + file://ensure-search-path-non-host.patch \ + " + +SRC_URI[sha256sum] = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917" + +inherit autotools-brokensep ptest pkgconfig + +#CFLAGS += "-I${STAGING_INCDIR}/nss3" +#CPPFLAGS += "-I${STAGING_INCDIR}/nss3" + +PACKAGECONFIG ??= "gnutls libgcrypt nss openssl des" +PACKAGECONFIG[gnutls] = ",,gnutls" +PACKAGECONFIG[libgcrypt] = ",,libgcrypt" +PACKAGECONFIG[nss] = "--with-nss=${STAGING_DIR_HOST} --with-nspr=${STAGING_DIR_HOST},--with-nss=no --with-nspr=no,nss nspr" +PACKAGECONFIG[openssl] = ",,openssl" +PACKAGECONFIG[des] = ",--disable-des,," + +# these can be dynamically loaded with xmlSecCryptoDLLoadLibrary() +FILES_SOLIBSDEV = "${libdir}/libxmlsec1.so" +FILES:${PN} += "${libdir}/libxmlsec1-*.so" +INSANE_SKIP:${PN} = "dev-so" + +FILES:${PN}-dev += "${libdir}/xmlsec1Conf.sh" +FILES:${PN}-dbg += "${PTEST_PATH}/.debug/*" + +RDEPENDS:${PN}-ptest += "${PN}-dev" +INSANE_SKIP:${PN}-ptest += "dev-deps" + +PTEST_EXTRA_ARGS = "top_srcdir=${S} top_builddir=${B}" + +do_compile_ptest () { + oe_runmake -C ${S}/examples ${PTEST_EXTRA_ARGS} all +} + +do_install:append() { + for i in ${bindir}/xmlsec1-config ${libdir}/xmlsec1Conf.sh \ + ${libdir}/pkgconfig/xmlsec1-openssl.pc; do + sed -i -e "s@${RECIPE_SYSROOT}@@g" ${D}$i + done +} + +do_install_ptest () { + oe_runmake -C ${S}/examples DESTDIR=${D}${PTEST_PATH} ${PTEST_EXTRA_ARGS} install-ptest +} + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch new file mode 100644 index 0000000000..2a766dbb87 --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch @@ -0,0 +1,33 @@ +From 64cb138aaaafc87c8462885d502c9323be86a003 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 14:50:08 -0800 +Subject: [PATCH] Fix hash_key_put() signature + +Fixes + +../xmlstarlet-1.6.1/src/xml_elem.c:271:27: error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] + xmlHashScan(uniq, hash_key_put, &lines); + ^~~~~~~~~~~~ + +Upstream-Status: Submitted [https://sourceforge.net/p/xmlstar/code/merge-requests/6/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/xml_elem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xml_elem.c b/src/xml_elem.c +index 024e62a..a73038a 100644 +--- a/src/xml_elem.c ++++ b/src/xml_elem.c +@@ -186,7 +186,7 @@ typedef struct { + * put @name into @data->array[@data->offset] + */ + static void +-hash_key_put(void *payload, void *data, xmlChar *name) ++hash_key_put(void *payload, void *data, const xmlChar *name) + { + ArrayDest *dest = data; + dest->array[dest->offset++] = name; +-- +2.39.1 + diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch new file mode 100644 index 0000000000..a9d98db69c --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch @@ -0,0 +1,45 @@ +From f7a5ebc3a673b246a64c9a664df304c1520a3951 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 7 Mar 2024 12:35:17 -0800 +Subject: [PATCH] Make xmlError struct constant + +In libxml2 commit v2.12.0~14 the API changed so that +xmlGetLastError() returns pointer to a constant xmlError struct. +Reflect this change in our code. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/xml.c | 2 +- + src/xmlstar.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/xml.c b/src/xml.c +index cf47cc2..e6f19c1 100644 +--- a/src/xml.c ++++ b/src/xml.c +@@ -104,7 +104,7 @@ void reportGenericError(void* ctx, const char * msg, ...) { + /* by default all errors are reported */ + static ErrorInfo errorInfo = { NULL, NULL, VERBOSE, CONTINUE }; + +-void reportError(void *ptr, xmlErrorPtr error) ++void reportError(void *ptr, const xmlError *error) + { + ErrorInfo *errorInfo = (ErrorInfo*) ptr; + assert(errorInfo); +diff --git a/src/xmlstar.h b/src/xmlstar.h +index 3e1eed3..7e41ac4 100644 +--- a/src/xmlstar.h ++++ b/src/xmlstar.h +@@ -32,7 +32,7 @@ typedef struct _errorInfo { + ErrorStop stop; + } ErrorInfo; + +-void reportError(void *ptr, xmlErrorPtr error); ++void reportError(void *ptr, const xmlError* error); + void suppressErrors(void); + + typedef struct _gOptions { +-- +2.44.0 + diff --git a/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch b/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch index e55f4f3b13..7e13110a3b 100644 --- a/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch +++ b/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + configure.ac: don't use xml-config if --with-libxml-prefix is specified to configure Same behavior for xslt-config. diff --git a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb index e3d52e616a..61eeaaa095 100644 --- a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb +++ b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb @@ -14,8 +14,9 @@ DEPENDS = "libxml2 libxslt" SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \ file://configure.ac.patch \ - file://0001-usage2c.awk-fix-wrong-basename-regexp.patch" -SRC_URI[md5sum] = "f3c5dfa3b1a2ee06cd57c255cc8b70a0" + file://0001-usage2c.awk-fix-wrong-basename-regexp.patch \ + file://0001-Make-xmlError-struct-constant.patch \ + file://0001-Fix-hash_key_put-signature.patch" SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" inherit autotools @@ -24,3 +25,8 @@ inherit autotools EXTRA_OECONF="--disable-build-docs \ --with-libxml-prefix=${STAGING_LIBDIR}/.. \ --with-libxslt-prefix=${STAGING_LIBDIR}/.." + +# http://errors.yoctoproject.org/Errors/Details/157121/ +# /bin/bash: src/usage.c: No such file or directory +# Makefile:2121: recipe for target 'src/usage.c' failed +PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb deleted file mode 100644 index 20cf45f06d..0000000000 --- a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Xorg drivers for xrdp." - -LICENSE = "X11" -LIC_FILES_CHKSUM = "file://COPYING;md5=a2523660329fdca3d954c0a87390e007 \ -" - -inherit autotools pkgconfig - -DEPENDS = "virtual/libx11 xserver-xorg xrdp nasm-native" - -SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git \ - " - -SRCREV = "c122544f184d4031bbae1ad80fbab554c34a9427" - -PV = "0.2.5+git${SRCPV}" - -S = "${WORKDIR}/git" - -FILES_${PN} += "${libdir}/xorg/modules/*" - -INSANE_SKIP_${PN} += "xorg-driver-abi" diff --git a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb new file mode 100644 index 0000000000..9650d43695 --- /dev/null +++ b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb @@ -0,0 +1,23 @@ +SUMMARY = "Xorg drivers for xrdp." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=a2523660329fdca3d954c0a87390e007" + +inherit autotools pkgconfig + +DEPENDS = "virtual/libx11 xserver-xorg xrdp nasm-native" + +inherit features_check +REQUIRED_DISTRO_FEATURES = "x11 pam" + +SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git;branch=v0.9;protocol=https" + +SRCREV = "d463bad9639c910fadc2f30dac473c7688b11cfc" + +PV = "0.9.19" + +S = "${WORKDIR}/git" + +FILES:${PN} += "${libdir}/xorg/modules/*" + +INSANE_SKIP:${PN} += "xorg-driver-abi" diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch index 5e7fca02a5..05803266cb 100644 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Added req_distinguished_name in /etc/xrdp/openssl.conf, Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + keygen/openssl.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch deleted file mode 100644 index 4c93647f67..0000000000 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch +++ /dev/null @@ -1,148 +0,0 @@ -Subject: [PATCH] Fix CVE-2017-16927 - -sesman: scpv0, accept variable length data fields - -Upstream-Status: Backport - ---- - sesman/libscp/libscp_v0.c | 32 +++++++++++++++++++++++++------- - 1 file changed, 25 insertions(+), 7 deletions(-) - -diff --git a/sesman/libscp/libscp_v0.c b/sesman/libscp/libscp_v0.c -index 5a0c8bf..5693407 100644 ---- a/sesman/libscp/libscp_v0.c -+++ b/sesman/libscp/libscp_v0.c -@@ -161,7 +161,7 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - struct SCP_SESSION *session = 0; - tui16 sz; - tui32 code = 0; -- char buf[257]; -+ char *buf = 0; - - if (!skipVchk) - { -@@ -226,27 +226,31 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - /* reading username */ - in_uint16_be(c->in_s, sz); -- buf[sz] = '\0'; -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); -- -+ buf[sz] = '\0'; - if (0 != scp_session_set_username(session, buf)) - { - scp_session_destroy(session); - log_message(LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting username", __LINE__); -+ g_free(buf); - return SCP_SERVER_STATE_INTERNAL_ERR; - } -+ g_free(buf); - - /* reading password */ - in_uint16_be(c->in_s, sz); -- buf[sz] = '\0'; -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); -- -+ buf[sz] = '\0'; - if (0 != scp_session_set_password(session, buf)) - { - scp_session_destroy(session); - log_message(LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting password", __LINE__); -+ g_free(buf); - return SCP_SERVER_STATE_INTERNAL_ERR; - } -+ g_free(buf); - - /* width */ - in_uint16_be(c->in_s, sz); -@@ -272,9 +276,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - if (sz > 0) - { -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); - buf[sz] = '\0'; - scp_session_set_domain(session, buf); -+ g_free(buf); - } - } - -@@ -285,9 +291,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - if (sz > 0) - { -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); - buf[sz] = '\0'; - scp_session_set_program(session, buf); -+ g_free(buf); - } - } - -@@ -298,9 +306,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - if (sz > 0) - { -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); - buf[sz] = '\0'; - scp_session_set_directory(session, buf); -+ g_free(buf); - } - } - -@@ -311,9 +321,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - if (sz > 0) - { -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); - buf[sz] = '\0'; - scp_session_set_client_ip(session, buf); -+ g_free(buf); - } - } - } -@@ -332,29 +344,35 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - scp_session_set_type(session, SCP_GW_AUTHENTICATION); - /* reading username */ - in_uint16_be(c->in_s, sz); -- buf[sz] = '\0'; -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); -+ buf[sz] = '\0'; - - /* g_writeln("Received user name: %s",buf); */ - if (0 != scp_session_set_username(session, buf)) - { - scp_session_destroy(session); - /* until syslog merge log_message(s_log, LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting username", __LINE__);*/ -+ g_free(buf); - return SCP_SERVER_STATE_INTERNAL_ERR; - } -+ g_free(buf); - - /* reading password */ - in_uint16_be(c->in_s, sz); -- buf[sz] = '\0'; -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); -+ buf[sz] = '\0'; - - /* g_writeln("Received password: %s",buf); */ - if (0 != scp_session_set_password(session, buf)) - { - scp_session_destroy(session); - /* until syslog merge log_message(s_log, LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting password", __LINE__); */ -+ g_free(buf); - return SCP_SERVER_STATE_INTERNAL_ERR; - } -+ g_free(buf); - } - else - { --- -2.7.4 - diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch deleted file mode 100644 index deaadde8c7..0000000000 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch +++ /dev/null @@ -1,75 +0,0 @@ -From a9c460f158d68c1b3de6a31ce853de5379977695 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Thu, 30 Nov 2017 11:10:04 +0900 -Subject: [PATCH] Fix sesman.ini and xrdp.ini - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - sesman/sesman.ini | 20 ++++++-------------- - xrdp/xrdp.ini | 10 ---------- - 2 files changed, 6 insertions(+), 24 deletions(-) - -diff --git a/sesman/sesman.ini b/sesman/sesman.ini -index 8225ee4..c09189e 100644 ---- a/sesman/sesman.ini -+++ b/sesman/sesman.ini -@@ -54,12 +54,14 @@ LogLevel=DEBUG - EnableSyslog=1 - SyslogLevel=DEBUG - --[X11rdp] --param=X11rdp --param=-bs -+[Xorg] -+param=Xorg -+param=-config -+param=xrdp/xorg.conf -+param=-noreset - param=-nolisten - param=tcp --param=-uds -+ - - [Xvnc] - param=Xvnc -@@ -70,16 +72,6 @@ param=-localhost - param=-dpi - param=96 - --[Xorg] --param=Xorg --param=-config --param=xrdp/xorg.conf --param=-noreset --param=-nolisten --param=tcp --param=-logfile --param=.xorgxrdp.%s.log -- - [Chansrv] - ; drive redirection, defaults to xrdp_client if not set - FuseMountName=thinclient_drives -diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini -index cb6d7c3..9f63a69 100644 ---- a/xrdp/xrdp.ini -+++ b/xrdp/xrdp.ini -@@ -157,16 +157,6 @@ ip=127.0.0.1 - port=-1 - code=20 - --[X11rdp] --name=X11rdp --lib=libxup.so --username=ask --password=ask --ip=127.0.0.1 --port=-1 --xserverbpp=24 --code=10 -- - [Xvnc] - name=Xvnc - lib=libvnc.so --- -1.8.4.2 - diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch index 82b2790856..e8b4ffa6bf 100644 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch @@ -5,6 +5,8 @@ Fix the compile error: Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + xrdp/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch new file mode 100644 index 0000000000..ea3eb11f0a --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch @@ -0,0 +1,27 @@ +From 5958db649855bfb2ada7c0ed22a00f839b9a1161 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 12 Mar 2021 21:40:35 -0800 +Subject: [PATCH] arch: Define NO_NEED_ALIGN on ppc64 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + common/arch.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/arch.h b/common/arch.h +index 617feb5e..6edb39db 100644 +--- a/common/arch.h ++++ b/common/arch.h +@@ -85,7 +85,7 @@ typedef int bool_t; + #define NEED_ALIGN + #elif defined(__x86__) || defined(__x86_64__) || \ + defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \ +- defined(__i386__) || defined(__aarch64__) || \ ++ defined(__i386__) || defined(__aarch64__) || defined(__powerpc64__) || \ + defined(__PPC__) || defined(__LITTLE_ENDIAN__) || \ + defined(__s390__) || defined (__s390x__) || \ + defined(__riscv) +-- +2.31.1 + diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch new file mode 100644 index 0000000000..77a394d556 --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch @@ -0,0 +1,31 @@ +From 492f74dbea1d9a15fbc3e870e78ab52e7fc5583b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 20:19:32 -0700 +Subject: [PATCH] mark count with unused attribute + +This may throw a warning when devel logs are disabled +Fixed +../../../xrdp-0.9.19/sesman/chansrv/chansrv.c:198:9: error: variable 'count' set but not used [-Werror,-Wunused-but-set-variable] int count; ^ 1 error generated. + +Upstream-Status: Submitted [https://github.com/neutrinolabs/xrdp/pull/2353] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sesman/chansrv/chansrv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c +index 4452d998..b818bff3 100644 +--- a/sesman/chansrv/chansrv.c ++++ b/sesman/chansrv/chansrv.c +@@ -195,7 +195,7 @@ check_timeout(void) + struct timeout_obj *tobj; + struct timeout_obj *last_tobj; + struct timeout_obj *temp_tobj; +- int count; ++ int count __attribute__((unused)); + tui32 now; + + LOG_DEVEL(LOG_LEVEL_DEBUG, "check_timeout:"); +-- +2.37.3 + diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb index ccc8e359a7..7c85697d4f 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb @@ -4,81 +4,78 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=72cfbe4e7bd33a0a1de9630c91195c21 \ " -inherit distro_features_check autotools pkgconfig useradd systemd +inherit features_check autotools pkgconfig useradd systemd -DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native" +DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native imlib2 pixman libsm" -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 pam" -SRC_URI = "git://github.com/neutrinolabs/xrdp.git \ +SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ file://xrdp.sysconfig \ - file://0001-Fix-sesman.ini-and-xrdp.ini.patch \ file://0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch \ file://0001-Fix-the-compile-error.patch \ - file://0001-Fix-of-CVE-2017-16927.patch \ + file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ + file://0001-mark-count-with-unused-attribute.patch \ " -SRCREV = "c295dd61b882e8b56677cf12791f43634f9190b5" +SRC_URI[sha256sum] = "94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0" -PV = "0.9.4+git${SRCPV}" +UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" -S = "${WORKDIR}/git" +CFLAGS += " -Wno-deprecated-declarations" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[fuse] = " --enable-fuse, --disable-fuse, fuse" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system xrdp" -USERADD_PARAM_${PN} = "--system --home /var/run/xrdp -g xrdp \ +GROUPADD_PARAM:${PN} = "--system xrdp" +USERADD_PARAM:${PN} = "--system --home /var/run/xrdp -g xrdp \ --no-create-home --shell /bin/false xrdp" -FILES_${PN} += "${datadir}/dbus-1/services/*.service \ +FILES:${PN} += "${datadir}/dbus-1/services/*.service \ ${datadir}/dbus-1/accessibility-services/*.service " -FILES_${PN}-dev += "${libdir}/xrdp/libcommon.so \ +FILES:${PN}-dev += "${libdir}/xrdp/libcommon.so \ ${libdir}/xrdp/libxrdp.so \ ${libdir}/xrdp/libscp.so \ ${libdir}/xrdp/libxrdpapi.so " -#EXTRA_OECONF = "--disable-rfxcodec --disable-painter" +EXTRA_OECONF = "--enable-pam-config=suse --enable-fuse \ + --enable-pixman --enable-painter --enable-vsock \ + --enable-ipv6 --with-imlib2 --with-socketdir=${localstatedir}/run/${PN}" -do_configure_prepend() { +do_configure:prepend() { cd ${S} ./bootstrap cd - } -do_compile_prepend() { +do_compile:prepend() { sed -i 's/(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am/(MAKE) $(AM_MAKEFLAGS) install-exec-am/g' ${S}/keygen/Makefile.in + echo "" > ${B}/xrdp_configure_options.h } +do_install:append() { -do_install_append() { - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/xrdp - install -d ${D}${sysconfdir}/xrdp/pam.d - install -d ${D}${sysconfdir}/sysconfig/xrdp - # deal with systemd unit files install -d ${D}${systemd_unitdir}/system install -m 0644 ${S}/instfiles/xrdp.service.in ${D}${systemd_unitdir}/system/xrdp.service - install -m 0644 ${S}/instfiles/xrdp-sesman.service.in ${D}${systemd_unitdir}/system/xrdp-sesman.service + install -m 0644 ${S}/instfiles/xrdp-sesman.service.in ${D}${systemd_unitdir}/system/xrdp-sesman.service sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service sed -i -e 's,@sysconfdir@,${sysconfdir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service sed -i -e 's,@sbindir@,${sbindir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service + install -d ${D}${sysconfdir}/sysconfig/xrdp install -m 0644 ${S}/instfiles/*.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/instfiles/pam.d/xrdp-sesman.debian ${D}${sysconfdir}/xrdp/pam.d/xrdp-sesman - install -m 0644 ${S}/sesman/sesman.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/sesman/startwm.sh ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/xrdp/xrdp.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/xrdp/xrdp_keyboard.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/instfiles/xrdp.sh ${D}${sysconfdir}/xrdp/ install -m 0644 ${S}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ - install -m 0644 ${WORKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ + install -m 0644 ${UNPACKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ chown xrdp:xrdp ${D}${sysconfdir}/xrdp } -SYSTEMD_SERVICE_${PN} = "xrdp.service xrdp-sesman.service" +SYSTEMD_SERVICE:${PN} = "xrdp.service xrdp-sesman.service" -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { if test -z "$D" then if test -x ${bindir}/xrdp-keygen @@ -92,6 +89,6 @@ pkg_postinst_${PN}() { -out ${sysconfdir}/xrdp/cert.pem \ -config ${sysconfdir}/xrdp/openssl.conf >/dev/null 2>&1 chmod 400 ${sysconfdir}/xrdp/key.pem - fi + fi fi } diff --git a/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb b/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb new file mode 100644 index 0000000000..76aea6f41a --- /dev/null +++ b/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb @@ -0,0 +1,41 @@ +SUMMARY = "X.Org X cvt" +HOMEPAGE = "https://linux.die.net/man/1/cvt" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" + +DEPENDS += "pixman-native xorgproto-native libxrandr-native" + +XORG_PN = "xorg-server" + +SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "8cf8bd1f33e3736bc8dd279b20a32399" +SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" + +S = "${WORKDIR}/${XORG_PN}-${PV}" +B = "${WORKDIR}/build" + +inherit pkgconfig native + +do_configure[noexec] = "1" + +do_compile() { + cd ${S} + for header in `find -name '*.h'`; do + path=`dirname $header` + if ! echo "$incpaths" | grep -q "$path" ; then + incpaths="$incpaths -I$path" + fi + done + CFLAGS="${CFLAGS} -DXORG_VERSION_CURRENT=1 $incpaths `pkg-config --cflags pixman-1`" + LDFLAGS="${LDFLAGS} -lm `pkg-config --libs pixman-1`" + ${CC} $CFLAGS -o ${B}/cvt \ + ${S}/hw/xfree86/utils/cvt/cvt.c \ + ${S}/hw/xfree86/modes/xf86cvt.c \ + ${S}/os/xprintf.c \ + $LDFLAGS +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${B}/cvt ${D}${bindir} +} diff --git a/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb new file mode 100644 index 0000000000..44ac0687a7 --- /dev/null +++ b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "yaml-cpp parser and emitter library" +DESCRIPTION = "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec." +HOMEPAGE = "https://github.com/jbeder/yaml-cpp" +SECTION = "devel" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6a8aaf0595c2efc1a9c2e0913e9c1a2c" + +# yaml-cpp releases are stored as archive files in github. +# download the exact revision of release +SRC_URI = "git://github.com/jbeder/yaml-cpp.git;branch=master;protocol=https" +SRCREV = "f7320141120f720aecc4c32be25586e7da9eb978" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DYAML_CPP_BUILD_TESTS=OFF -DYAML_BUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TOOLS=OFF" diff --git a/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch b/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch deleted file mode 100644 index 04239bacdb..0000000000 --- a/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 224507bc4b6e58f7a6e445bfebfb59d6b8d78bd6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 2 Dec 2016 17:38:51 -0800 -Subject: [PATCH] make relies GNU extentions - -We get errors like -`%'-style pattern rules are a GNU make extension - -Disable this warning, since we use gmake with OE -anyway - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 56d3dd0..9f85fd7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3,7 +3,7 @@ AC_PREREQ([2.61]) - AC_INIT([zbar], [0.10], [spadix@users.sourceforge.net]) - AC_CONFIG_AUX_DIR(config) - AC_CONFIG_MACRO_DIR(config) --AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2]) -+AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-portability foreign subdir-objects std-options dist-bzip2]) - AC_CONFIG_HEADERS([include/config.h]) - AC_CONFIG_SRCDIR(zbar/scanner.c) - LT_PREREQ([2.2]) --- -2.10.2 - diff --git a/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch b/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch new file mode 100644 index 0000000000..3d8c07f02b --- /dev/null +++ b/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch @@ -0,0 +1,37 @@ +From 9c67f377477a07495a712f478eabfa8d33164c45 Mon Sep 17 00:00:00 2001 +From: Daniel Gomez <dagmcr@gmail.com> +Date: Sun, 17 Jan 2021 23:32:51 +0100 +Subject: [PATCH 1/2] qt: Create subdir in Makefile + +Create builddir/qt subdir when --with-qt5 is enabled. + +Fixes the following error: + +moc -Iqt -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtWidgets +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtGui +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtCore +-I../git/include ../git/include/zbar/QZBar.h -o qt/moc_QZBar.cpp +moc: Cannot create qt/moc_QZBar.cpp +make: *** [Makefile:2459: qt/moc_QZBar.cpp] Error 1 + +Signed-off-by: Daniel Gomez <dagmcr@gmail.com> +--- +Upstream-Status: Pending + + qt/Makefile.am.inc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/qt/Makefile.am.inc b/qt/Makefile.am.inc +index b099c2b..c98fbeb 100644 +--- a/qt/Makefile.am.inc ++++ b/qt/Makefile.am.inc +@@ -15,4 +15,5 @@ qt/moc_%.cpp: qt/%.h + $(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@ + + qt/moc_%.cpp: include/zbar/%.h ++ @$(mkdir_p) qt 2>/dev/null + $(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@ +-- +2.29.2 + diff --git a/meta-oe/recipes-support/zbar/zbar/0001-undefine-__va_arg_pack.patch b/meta-oe/recipes-support/zbar/zbar/0001-undefine-__va_arg_pack.patch deleted file mode 100644 index f7d8ba1e96..0000000000 --- a/meta-oe/recipes-support/zbar/zbar/0001-undefine-__va_arg_pack.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f842872244219d9881fbec77054702412b1e16f8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 2 Dec 2016 16:41:27 -0800 -Subject: [PATCH] undefine __va_arg_pack - -dprintf() is also a libc function. This fixes -the compile errors - -/usr/include/bits/stdio2.h:140:1: error: expected identifier or '(' before '{' token -| { - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - zbar/debug.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/zbar/debug.h b/zbar/debug.h -index 482ca8d..68948f6 100644 ---- a/zbar/debug.h -+++ b/zbar/debug.h -@@ -23,6 +23,7 @@ - - /* varargs variations on compile time debug spew */ - -+#undef __va_arg_pack - #ifndef DEBUG_LEVEL - - # ifdef __GNUC__ -@@ -36,15 +37,14 @@ - #else - - # include <stdio.h> -- - # ifdef __GNUC__ --# define dprintf(level, args...) \ -+# define dprintf(level, format, args...) \ - if((level) <= DEBUG_LEVEL) \ -- fprintf(stderr, args) -+ fprintf(stderr, format, args) - # else --# define dprintf(level, ...) \ -+# define dprintf(level, format, ...) \ - if((level) <= DEBUG_LEVEL) \ -- fprintf(stderr, __VA_ARGS__) -+ fprintf(stderr, format, __VA_ARGS__) - # endif - - #endif /* DEBUG_LEVEL */ --- -2.10.2 - diff --git a/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch b/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch new file mode 100644 index 0000000000..9030ed88f2 --- /dev/null +++ b/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch @@ -0,0 +1,42 @@ +From fe751929ccc8fd75e350ed6db9d28d04bd31fc79 Mon Sep 17 00:00:00 2001 +From: Daniel Gomez <dagmcr@gmail.com> +Date: Sun, 17 Jan 2021 23:33:19 +0100 +Subject: [PATCH 2/2] zbarcam: Create subdir in Makefile + +Create builddir/zbarcam when --with-qt5 is enabled. + +Fixes the following error: + +moc -i -Izbarcam -DQT_WIDGETS_LIB -DQT_X11EXTRAS_LIB -DQT_GUI_LIB +-DQT_CORE_LIB +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtWidgets +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtX11Extras +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtGui +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtCore +-I../git/include ../git/zbarcam/zbarcam-qt.cpp -o +zbarcam/moc_zbarcam_qt.h +moc: Cannot create zbarcam/moc_zbarcam_qt.h +make: *** [Makefile:2438: zbarcam/moc_zbarcam_qt.h] Error 1 + +Signed-off-by: Daniel Gomez <dagmcr@gmail.com> +--- +Upstream-Status: Pending + + zbarcam/Makefile.am.inc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/zbarcam/Makefile.am.inc b/zbarcam/Makefile.am.inc +index b6de82c..e90c50c 100644 +--- a/zbarcam/Makefile.am.inc ++++ b/zbarcam/Makefile.am.inc +@@ -28,6 +28,7 @@ DISTCLEANFILES += $(nodist_zbarcam_zbarcam_qt_SOURCES) zbarcam/moc_zbarcam_qt.h + + + zbarcam/moc_zbarcam_qt.h: zbarcam/zbarcam-qt.cpp ++ @$(mkdir_p) zbarcam 2>/dev/null + $(MOC) -i $(zbarcam_zbarcam_qt_CPPFLAGS) $< -o $@ + endif + +-- +2.29.2 + diff --git a/meta-oe/recipes-support/zbar/zbar_0.10.bb b/meta-oe/recipes-support/zbar/zbar_0.10.bb deleted file mode 100644 index 6b6e501114..0000000000 --- a/meta-oe/recipes-support/zbar/zbar_0.10.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESRIPTION = "2D barcode scanner toolkit." -SECTION = "graphics" -LICENSE = "LGPL-2.1" - -DEPENDS = "pkgconfig intltool-native libpng jpeg" - -LIC_FILES_CHKSUM = "file://COPYING;md5=42bafded1b380c6fefbeb6c5cd5448d9" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.bz2 \ - file://0001-undefine-__va_arg_pack.patch \ - file://0001-make-relies-GNU-extentions.patch \ -" - -SRC_URI[md5sum] = "0fd61eb590ac1bab62a77913c8b086a5" -SRC_URI[sha256sum] = "234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6" - -inherit autotools pkgconfig - -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" - -PACKAGECONFIG[x11] = "--with-x,-without-x,libxcb libx11 libsm libxau libxext libxv libice libxdmcp" - -EXTRA_OECONF = " --without-imagemagick --without-qt --without-python --disable-video --without-gtk" - -do_install_append() { - #remove usr/bin if empty - rmdir ${D}${bindir} -} diff --git a/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-oe/recipes-support/zbar/zbar_git.bb new file mode 100644 index 0000000000..975779cd18 --- /dev/null +++ b/meta-oe/recipes-support/zbar/zbar_git.bb @@ -0,0 +1,58 @@ +HOMEPAGE = "https://github.com/mchehab/zbar" +SUMMARY = "A bar code library" +DESRIPTION = "ZBar is an open source software suite for reading bar codes \ +from various sources, such as video streams, image files and raw \ +intensity sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128, \ +Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code" +SECTION = "graphics" + +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5e9ee833a2118adc7d8b5ea38e5b1cef" + +SRC_URI = "git://github.com/mchehab/zbar.git;branch=master;protocol=https \ + file://0001-qt-Create-subdir-in-Makefile.patch \ + file://0002-zbarcam-Create-subdir-in-Makefile.patch \ +" +SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37" + +S = "${WORKDIR}/git" +PV = "0.23.1+git" + +DEPENDS += "xmlto-native" + +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ +" + +PACKAGECONFIG ??= "video" + +inherit autotools pkgconfig gettext \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gtk3', 'gobject-introspection', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} + +PACKAGECONFIG[x11] = "--with-x, --without-x, libxv" +PACKAGECONFIG[video] = "--enable-video, --disable-video, v4l-utils libv4l" +PACKAGECONFIG[jpeg] = "--with-jpeg, --without-jpeg, jpeg" +PACKAGECONFIG[python3] = "--with-python=auto, --without-python, python3" +PACKAGECONFIG[gtk3] = "--with-gtk=gtk3, --without-gtk, gtk+3" +PACKAGECONFIG[qt5] = "--with-qt5, --without-qt5, qtbase qtbase-native qtx11extras qtsvg, qtbase" +PACKAGECONFIG[imagemagick] = "--with-imagemagick, --without-imagemagick, imagemagick" + +FILES:${PN} += "${bindir} \ + ${@bb.utils.contains('DEPENDS', 'python3-native', '${libdir}', '', d)} \ +" + +CPPFLAGS:append = "\ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '\ + -I${STAGING_INCDIR}/QtX11Extras \ + -I${STAGING_INCDIR}/dbus-1.0 \ + -I${STAGING_LIBDIR}/dbus-1.0/include \ + ', '', d)} \ +" + +TARGET_CXXFLAGS:append = " -fPIC" + +do_configure:prepend() { + install -m 755 ${STAGING_DATADIR_NATIVE}/gettext/ABOUT-NLS ${S}/ +} diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.4.0.bb b/meta-oe/recipes-support/zchunk/zchunk_1.4.0.bb new file mode 100644 index 0000000000..0c8a9c7a5f --- /dev/null +++ b/meta-oe/recipes-support/zchunk/zchunk_1.4.0.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "A file format designed for highly efficient deltas while maintaining good compression" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242" + +SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main" + +SRCREV = "4dd91d31157ede4a1b092721d944ae2fdd161cd9" +S = "${WORKDIR}/git" + +DEPENDS = "zstd" +DEPENDS:append:libc-musl = " argp-standalone" + +inherit meson pkgconfig lib_package + +PACKAGECONFIG ??= "openssl zckdl" + +# zckdl gets packaged into zchunk-bin +PACKAGECONFIG[zckdl] = "-Dwith-curl=enabled,-Dwith-curl=disabled,curl" +# Use OpenSSL primitives for SHA +PACKAGECONFIG[openssl] = "-Dwith-openssl=enabled,-Dwith-openssl=disabled,openssl" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/zile/zile_2.4.14.bb b/meta-oe/recipes-support/zile/zile_2.4.15.bb index 515cf41365..e86b3f82d2 100644 --- a/meta-oe/recipes-support/zile/zile_2.4.14.bb +++ b/meta-oe/recipes-support/zile/zile_2.4.15.bb @@ -2,24 +2,24 @@ SUMMARY = "Zile is lossy Emacs" HOMEPAGE = "http://zile.sourceforge.net/" DEPENDS = "ncurses bdwgc" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -SRC_URI = "http://ftp.gnu.org/gnu/zile/${BP}.tar.gz \ +SRC_URI = "${GNU_MIRROR}/zile/${BP}.tar.gz \ file://remove-help2man.patch \ " -SRC_URI[md5sum] = "c7d7eec93231c6878f255978d9747a73" -SRC_URI[sha256sum] = "7a78742795ca32480f2bab697fd5e328618d9997d6f417cf1b14e9da9af26b74" +SRC_URI[md5sum] = "05efa90dfee1821ca018b0b2ef8f50a8" +SRC_URI[sha256sum] = "39c300a34f78c37ba67793cf74685935a15568e14237a3a66fda8fcf40e3035e" inherit autotools pkgconfig -do_install_append() { +do_install:append() { rm -rf ${D}${libdir}/charset.alias rmdir --ignore-fail-on-non-empty ${D}${libdir} || true } PACKAGECONFIG ??= "" -PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" +PACKAGECONFIG:append = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," |