diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
58 files changed, 719 insertions, 567 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch index ab8042f723..7c3b0325dd 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch @@ -1,21 +1,28 @@ -Add configure check for gtk2+ and objc++ +From 7957756a3dd16498cf7a75e1fb6675a33bc7f3dc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 3 Nov 2016 01:20:33 -0700 +Subject: [PATCH] Add configure check for gtk2+ and objc++ Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: boinc-client_release-7.6-7.6.33/configure.ac -=================================================================== ---- boinc-client_release-7.6-7.6.33.orig/configure.ac -+++ boinc-client_release-7.6-7.6.33/configure.ac -@@ -64,6 +64,7 @@ m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCX +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index d81d795de4..7beeb34ae2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -63,6 +63,7 @@ m4_pattern_allow([AC_PROG_OBJCXX]) + m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCXX],) dnl ------ - AC_PROG_F77 AC_PROG_CPP +AC_PROG_OBJCXX AC_PROG_MAKE_SET SAH_LINKS AC_LANG_PUSH(C) -@@ -1081,6 +1082,8 @@ AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test +@@ -1068,6 +1069,8 @@ AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test "x${enable_server}" = xyes || test "x${ AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch index 4ae8d580d7..e060b1a40c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch @@ -1,13 +1,20 @@ -Check for gtk2+ only when manager is enabled +From d53e9617fb6446780478bb13907efd111f241cd1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 3 Nov 2016 01:20:33 -0700 +Subject: [PATCH] Check for gtk2+ only when manager is enabled Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: boinc-client_release-7.6-7.6.33/configure.ac -=================================================================== ---- boinc-client_release-7.6-7.6.33.orig/configure.ac -+++ boinc-client_release-7.6-7.6.33/configure.ac -@@ -1033,6 +1033,11 @@ else +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7beeb34ae2..35234c2762 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1018,6 +1018,11 @@ else AM_CONDITIONAL([GUI_GTK], false) fi @@ -19,7 +26,7 @@ Index: boinc-client_release-7.6-7.6.33/configure.ac dnl ---------- libNotify -------------------------------------------------- if test "${enable_manager}" = yes ; then PKG_CHECK_MODULES(LIBNOTIFY, [libnotify]) -@@ -1082,7 +1087,6 @@ AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test +@@ -1069,7 +1074,6 @@ AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test "x${enable_server}" = xyes || test "x${ AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch index 0b057eabc8..ad4493f0b6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch @@ -1,13 +1,22 @@ +From 4f2dd929618f149087249f3c90cc056d5080b1e4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 3 Nov 2016 01:20:33 -0700 +Subject: [PATCH] boinc: Add recipe for boinc-client + Do not add prefix/lib to library search path let sysroot take care of that Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Inappropriate[Cross-compile specific] -Index: boinc-client_release-7.6-7.6.33/m4/ax_check_gl.m4 -=================================================================== ---- boinc-client_release-7.6-7.6.33.orig/m4/ax_check_gl.m4 -+++ boinc-client_release-7.6-7.6.33/m4/ax_check_gl.m4 +--- + m4/ax_check_gl.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/ax_check_gl.m4 b/m4/ax_check_gl.m4 +index e26ce5b930..1e60c9266a 100644 +--- a/m4/ax_check_gl.m4 ++++ b/m4/ax_check_gl.m4 @@ -58,7 +58,7 @@ else else ax_try_lib="${ax_lib}" diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb index d472d3269e..1b0af5549a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb @@ -29,7 +29,7 @@ DEPENDS = "curl \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \ nettle \ " -SRCREV = "bd12338dbd29083daa5a4b022592ca31ff68cd98" +SRCREV = "a432e1ccbf864f99c7b29a1645de38056915f944" BRANCH = "client_release/7/${PV}" SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ file://boinc-AM_CONDITIONAL.patch \ @@ -74,11 +74,14 @@ do_compile_prepend () { sed -i -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${B}/${TARGET_SYS}-libtool } do_install_append() { - if [ -e ${D}${libdir}/systemd/system/boinc-client.service ]; then - install -D -m 0644 \ - ${D}${libdir}/systemd/system/boinc-client.service \ + if [ -e ${D}${nonarch_libdir}/systemd/system/boinc-client.service ]; then + install -d ${D}${systemd_system_unitdir} + mv \ + ${D}${nonarch_libdir}/systemd/system/boinc-client.service \ ${D}${systemd_system_unitdir}/boinc-client.service - rm -rf ${D}${libdir}/systemd + rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd/system \ + ${D}${nonarch_libdir}/systemd \ + ${D}${nonarch_libdir} fi } diff --git a/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb b/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb index b4d4773ee0..e4e454bda3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb +++ b/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb @@ -12,3 +12,9 @@ SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541" S = "${WORKDIR}/git" inherit cmake lib_package + +do_install_append () { + for lib in $(ls ${D}${libdir}/*-static.a); do + mv -v "${lib}" "$(echo ${lib} | sed s/-static//)" + done +} diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch index b2a149b0f4..fa029da2b8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch +++ b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch @@ -9,19 +9,14 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> swig/python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt -index 128798b..391cef7 100644 --- a/swig/python/CMakeLists.txt +++ b/swig/python/CMakeLists.txt -@@ -49,7 +49,7 @@ ADD_DEFINITIONS(-DCMPI_PLATFORM_LINUX_GENERIC_GNU -DCMPI_VERSION=200) +@@ -49,7 +49,7 @@ ADD_DEFINITIONS(-DCMPI_PLATFORM_LINUX_GE SET( NAME pyCmpiProvider ) ADD_LIBRARY( ${NAME} SHARED ${SWIG_OUTPUT}) #TARGET_LINK_LIBRARIES( ${NAME} ${PYTHON_LIBRARIES} ) -TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION} ) -+TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}m ) ++TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}${PYTHON_ABI} ) TARGET_LINK_LIBRARIES( ${NAME} pthread ) TARGET_LINK_LIBRARIES( ${NAME} dl ) TARGET_LINK_LIBRARIES( ${NAME} util ) --- -2.8.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb index 251c5d0f5a..6c71d534be 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb @@ -22,7 +22,9 @@ S = "${WORKDIR}/git" inherit cmake python3native EXTRA_OECMAKE = "-DLIB='${baselib}' \ - -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION}" + -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \ + -DPYTHON_ABI=${PYTHON_ABI} \ + " # With Ninja it fails with: # ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$) diff --git a/meta-openembedded/meta-oe/recipes-extended/enscript/enscript/0001-Fix-builds-with-recent-gettext.patch b/meta-openembedded/meta-oe/recipes-extended/enscript/enscript/0001-Fix-builds-with-recent-gettext.patch new file mode 100644 index 0000000000..ecfafce1a7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/enscript/enscript/0001-Fix-builds-with-recent-gettext.patch @@ -0,0 +1,24 @@ +From 771cd2a12db8b8c9a558f1a04958df8ed614f2e0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 20 Dec 2019 14:06:50 +0100 +Subject: [PATCH] Fix builds 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 dedabd6..8833ac9 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,7 +22,7 @@ + # along with Enscript. If not, see <http://www.gnu.org/licenses/>. + # + +-SUBDIRS = intl compat afm afmlib lib scripts src po states docs w32 ++SUBDIRS = compat afm afmlib lib scripts src po states docs w32 + + EXTRA_DIST = README.ESCAPES README.DOS ascii.txt \ + asciifise.txt asciidkno.txt 88591.txt 88592.txt 88593.txt 88594.txt \ diff --git a/meta-openembedded/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb b/meta-openembedded/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb index 2b6d14e6c1..82791f5794 100644 --- a/meta-openembedded/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb @@ -12,7 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://enscript-autoconf.patch \ -" + file://0001-Fix-builds-with-recent-gettext.patch \ + " inherit autotools gettext diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/builtin-nan.patch b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/builtin-nan.patch new file mode 100644 index 0000000000..8ffc3be3ef --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/builtin-nan.patch @@ -0,0 +1,27 @@ +help complier to use intrinsics, clang in few cases e.g. aarch64 can not +and then requires linking with libm, its the only function needed from libm then +its good to avoid needing it. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/include/fluent-bit/stream_processor/flb_sp_timeseries.h ++++ b/include/fluent-bit/stream_processor/flb_sp_timeseries.h +@@ -207,7 +207,7 @@ void cb_forecast_calc(struct timeseries + result = b0 + b1 * (val->f64 + *forecast->latest_x); + break; + default: +- result = nan(""); ++ result = __builtin_nan(""); + break; + } + +@@ -283,7 +283,7 @@ void cb_forecast_r_calc(struct timeserie + result = ((val->i64 - b0) / b1) - *forecast->latest_x; + break; + default: +- result = nan(""); ++ result = __builtin_nan(""); + break; + } + diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch new file mode 100644 index 0000000000..a185789992 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch @@ -0,0 +1,38 @@ +Define CMake variables to indicate init system for target +incase of cross compile, detecting systemd support based on +host directory structure is not right thing to do + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.kheem@gmail.com> + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -317,7 +317,7 @@ if(FLB_BINARY) + install(TARGETS fluent-bit-bin RUNTIME DESTINATION ${FLB_INSTALL_BINDIR}) + + # Detect init system, install upstart, systemd or init.d script +- if(IS_DIRECTORY /lib/systemd/system) ++ if(IS_DIRECTORY /lib/systemd/system OR FLB_SYSTEMD) + set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service") + configure_file( + "${PROJECT_SOURCE_DIR}/init/systemd.in" +@@ -325,7 +325,7 @@ if(FLB_BINARY) + ) + install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system) + install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR}) +- elseif(IS_DIRECTORY /usr/share/upstart) ++ elseif(IS_DIRECTORY /usr/share/upstart OR FLB_UPSTART) + set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf") + configure_file( + "${PROJECT_SOURCE_DIR}/init/upstart.in" +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,6 +70,8 @@ option(FLB_RECORD_ACCESSOR "Enable re + option(FLB_SYSTEM_STRPTIME "Use strptime in system libc" Yes) + option(FLB_STATIC_CONF "Build binary using static configuration") + option(FLB_STREAM_PROCESSOR "Enable Stream Processor" Yes) ++option(FLB_SYSTEMD "Enable systemd init system" No) ++option(FLB_UPSTART "Enable upstart init system" No) + option(FLB_CORO_STACK_SIZE "Set coroutine stack size") + + # Metrics: Experimental Feature, disabled by default on 0.12 series diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch index abaf92c052..67b3397a6f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch @@ -3,16 +3,14 @@ Add --with-jemalloc-prefix=je_ so it compiles on musl Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: fluent-bit-0.12.1/CMakeLists.txt -=================================================================== ---- fluent-bit-0.12.1.orig/CMakeLists.txt -+++ fluent-bit-0.12.1/CMakeLists.txt -@@ -325,7 +325,7 @@ if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME} +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -523,7 +523,7 @@ if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME} # Link to Jemalloc as an external dependency ExternalProject_Add(jemalloc - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc -- CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR> -+ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure --with-jemalloc-prefix=je_ ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR> + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc-5.2.1 +- CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc-5.2.1/configure ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR> ++ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc-5.2.1/configure ${AUTOCONF_HOST_OPT} --with-jemalloc-prefix=je_ --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR> CFLAGS=-std=gnu99\ -Wall\ -pipe\ -g3\ -O3\ -funroll-loops - BUILD_COMMAND ${MAKE} + BUILD_COMMAND $(MAKE) INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/ diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb deleted file mode 100644 index e50aa71a9f..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Fast data collector for Embedded Linux" -HOMEPAGE = "http://fluentbit.io" -BUGTRACKER = "https://github.com/fluent/fluent-bit/issues" - -SRC_URI = "http://fluentbit.io/releases/0.12/fluent-bit-${PV}.tar.gz \ - file://jemalloc.patch \ - " -SRC_URI[md5sum] = "7c8708312ac9122faacf9e2a4751eb34" -SRC_URI[sha256sum] = "23a81087edf0e2c6f2d49411c6a82308afc5224f67bbaa45729c057af62e9241" - -S = "${WORKDIR}/fluent-bit-${PV}" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" - -DEPENDS = "zlib" -INSANE_SKIP_${PN}-dev += "dev-elf" - -inherit cmake systemd - -EXTRA_OECMAKE = "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -DFLB_TD=1" - -# With Ninja it fails with: -# ninja: error: build.ninja:134: bad $-escape (literal $ must be written as $$) -OECMAKE_GENERATOR = "Unix Makefiles" - -SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" - -TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb new file mode 100644 index 0000000000..aad1499b94 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb @@ -0,0 +1,55 @@ +SUMMARY = "Fast Log processor and Forwarder" +DESCRIPTION = "Fluent Bit is a data collector, processor and \ +forwarder for Linux. It supports several input sources and \ +backends (destinations) for your data. \ +" + +HOMEPAGE = "http://fluentbit.io" +BUGTRACKER = "https://github.com/fluent/fluent-bit/issues" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" +SECTION = "net" + +SRC_URI = "http://fluentbit.io/releases/1.3/fluent-bit-${PV}.tar.gz \ + file://jemalloc.patch \ + file://cross-build-init-system-detection.patch \ + file://builtin-nan.patch \ + " +SRC_URI[md5sum] = "6eae6dfd0a874e5dd270c36e9c68f747" +SRC_URI[sha256sum] = "e037c76c89269c8dc4027a08e442fefd2751b0f1e0f9c38f9a4b12d781a9c789" + +S = "${WORKDIR}/fluent-bit-${PV}" +DEPENDS = "zlib bison-native flex-native" +DEPENDS_append_libc-musl = " fts " + +INSANE_SKIP_${PN}-dev += "dev-elf" + +# Use CMake 'Unix Makefiles' generator +OECMAKE_GENERATOR ?= "Unix Makefiles" + +# Fluent Bit build options +# ======================== + +# Host related setup +EXTRA_OECMAKE += "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -DFLB_TD=1" + +# Disable LuaJIT and filter_lua support +EXTRA_OECMAKE += "-DFLB_LUAJIT=Off -DFLB_FILTER_LUA=Off " + +# Disable Library and examples +EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off -DFLB_EXAMPLES=Off " + +EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On','',d)}" + +# Kafka Output plugin (disabled by default): note that when +# enabling Kafka output plugin, the backend library librdkafka +# requires 'openssl' as a dependency. +# +# DEPENDS += "openssl " +# EXTRA_OECMAKE += "-DFLB_OUT_KAFKA=On " + +inherit cmake systemd features_check + +SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" +TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb index 898627bc17..926d8851d2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb @@ -22,8 +22,8 @@ SRC_URI_append_class-target = " \ file://0004-Add-configure-option-to-find-qt5-native-tools.patch \ " -SRC_URI[archive.md5sum] = "60aedd08998160593199459dea8467fe" -SRC_URI[archive.sha256sum] = "a416d22f02bdf3873ef82c5eb7f8e94146795811ef808e12b035ada88ef7b1a1" +SRC_URI[archive.md5sum] = "2df8767c7399bee57a96296d46b4d5fb" +SRC_URI[archive.sha256sum] = "60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37" SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132" diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.8.bb index e5b9bc9476..403956efa1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.8.bb @@ -5,8 +5,8 @@ HOMEPAGE = "http://www.issihosts.com/haveged/index.html" LICENSE = "GPLv3" LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -# v1.9.6 -SRCREV = "1470a82a7f79110c79beea1ca5f2d3b0fd1a4668" +# v1.9.8 +SRCREV = "8cd0266472aff59821718c4410e80f28978310f9" SRC_URI = "git://github.com/jirka-h/haveged.git \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch b/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch index fef2bc7541..1af5d26ac0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch +++ b/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch @@ -11,22 +11,18 @@ Signed-off-by: Andrea Galbusera <gizero@gmail.com> Makefile | 5 ----- 1 file changed, 5 deletions(-) -diff --git a/Makefile b/Makefile -index 8b0f0c2..66a4317 100644 --- a/Makefile +++ b/Makefile -@@ -34,11 +34,6 @@ define REDIS_TEST_CONFIG +@@ -35,12 +35,6 @@ define REDIS_TEST_CONFIG endef export REDIS_TEST_CONFIG -# Fallback to gcc when $CC is not in $PATH. --CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') +-CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') +-CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') -OPTIMIZATION?=-O3 -WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings --DEBUG?= -g -ggdb - REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH) - REAL_LDFLAGS=$(LDFLAGS) $(ARCH) +-DEBUG_FLAGS?= -g -ggdb + REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) + REAL_LDFLAGS=$(LDFLAGS) --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb index fae30d771d..29f8de8d2f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb @@ -5,14 +5,15 @@ SECTION = "libs" DEPENDS = "redis" LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" -SRC_URI = "git://github.com/redis/hiredis;protocol=git;rev=f58dd249d6ed47a7e835463c3b04722972281dbb \ +SRCREV = "685030652cd98c5414ce554ff5b356dfe8437870" +SRC_URI = "git://github.com/redis/hiredis;protocol=git \ file://0001-Makefile-remove-hardcoding-of-CC.patch" S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig -EXTRA_OEMAKE = "PREFIX=${prefix}" +EXTRA_OEMAKE = "PREFIX=${prefix} LIBRARY_PATH=${baselib}" # By default INSTALL variable in Makefile is equal to 'cp -a', which preserves # ownership and causes host-user-contamination QA issue. diff --git a/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-Fix-builds-with-recent-gettext.patch b/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-Fix-builds-with-recent-gettext.patch new file mode 100644 index 0000000000..e48dfb33c0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-Fix-builds-with-recent-gettext.patch @@ -0,0 +1,24 @@ +From 3349812de0598ca7722e0b7c7b7e5d48bd79bea9 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 20 Dec 2019 14:01:18 +0100 +Subject: [PATCH] Fix builds 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 548fea7..cf01c5e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in + AUTOMAKE_OPTIONS = no-texinfo.tex + +-SUBDIRS = intl src doc po man ++SUBDIRS = src doc po man + + BUILT_SOURCES = + diff --git a/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.12.bb b/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.12.bb index f2891df50d..f8d63d43ce 100644 --- a/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.12.bb @@ -14,7 +14,8 @@ DEPENDS = "virtual/gettext" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-src-indent.c-correct-the-check-for-locale.h.patch \ file://0001-Makefile.am-remove-regression-dir.patch \ -" + file://0001-Fix-builds-with-recent-gettext.patch \ + " SRC_URI[md5sum] = "4764b6ac98f6654a35da117b8e5e8e14" SRC_URI[sha256sum] = "e77d68c0211515459b8812118d606812e300097cfac0b4e9fb3472664263bb8b" diff --git a/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch index 8505ea34c8..f6a7956db2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch +++ b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch @@ -1,17 +1,17 @@ -From 67d808b8739817c122bed8ba1a8308d01cb5ad0b Mon Sep 17 00:00:00 2001 +From a20feee4963bc38975fbaf44bbe85a31825f59db Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 6 Apr 2019 17:28:28 -0700 -Subject: [PATCH] Fix parallel build (fix port-internal make dependencies) on - many cores +Subject: [PATCH 1/3] Fix parallel build (fix port-internal make dependencies) + on many cores -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/lcdproc/lcdproc/pull/142] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- server/drivers/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am -index 0c23a9b..6777047 100644 +index e08f2b2d..4fd2e3f1 100644 --- a/server/drivers/Makefile.am +++ b/server/drivers/Makefile.am @@ -47,11 +47,11 @@ CwLnx_LDADD = libLCD.a libbignum.a @@ -29,5 +29,5 @@ index 0c23a9b..6777047 100644 imon_LDADD = libLCD.a libbignum.a imonlcd_LDADD = libLCD.a -- -2.21.0 +2.24.1 diff --git a/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch new file mode 100644 index 0000000000..eb866bf10a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch @@ -0,0 +1,41 @@ +From d447a05ee560ba5894d2ed4cd93d0475c2f3c08e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Dec 2019 17:39:32 -0800 +Subject: [PATCH 2/3] Include <limits.h> for PATH_MAX definition + +musl libc exposes the missing include + +Upstream-Status: Submitted [https://github.com/lcdproc/lcdproc/pull/142] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + server/drivers/hidraw_lib.c | 1 + + server/drivers/linux_input.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/server/drivers/hidraw_lib.c b/server/drivers/hidraw_lib.c +index 49b03f20..3b51f279 100644 +--- a/server/drivers/hidraw_lib.c ++++ b/server/drivers/hidraw_lib.c +@@ -8,6 +8,7 @@ + #include <dirent.h> + #include <errno.h> + #include <fcntl.h> ++#include <limits.h> + #include <stdlib.h> + #include <string.h> + #include <sys/ioctl.h> +diff --git a/server/drivers/linux_input.c b/server/drivers/linux_input.c +index 5b914d4c..6fcfc591 100644 +--- a/server/drivers/linux_input.c ++++ b/server/drivers/linux_input.c +@@ -5,6 +5,7 @@ + + #include <dirent.h> + #include <errno.h> ++#include <limits.h> + #include <stdint.h> + #include <stdio.h> + #include <stdlib.h> +-- +2.24.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch new file mode 100644 index 0000000000..e39e9bda14 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch @@ -0,0 +1,35 @@ +From 7fd144f101fa5c9316d3468ed26f55629afe1305 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Dec 2019 17:55:54 -0800 +Subject: [PATCH 3/3] Fix non x86 platforms on musl + +Musl only specifies in/outb for x86/x86. Use the fallback path in case +musl is used. + +This should fail compilation during the linking stage but for some reason +does not. Will do if -Werror=implicit-function-declaration is specified. + +Original here: https://github.com/openwrt/packages/blob/master/utils/lcdproc/patches/110-in-outb.patch +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + server/drivers/port.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/server/drivers/port.h b/server/drivers/port.h +index c584cd4e..bde235b3 100644 +--- a/server/drivers/port.h ++++ b/server/drivers/port.h +@@ -94,7 +94,7 @@ static inline int port_deny_multiple(unsigned short port, unsigned short count); + /* ---------------------------- Linux ------------------------------------ */ + /* Use ioperm, inb and outb in <sys/io.h> (Linux) */ + /* And iopl for higher addresses of PCI LPT cards */ +-#if defined HAVE_IOPERM ++#if defined(__GLIBC__) || (defined(__x86__) || defined(__x86_64__)) + + /* Glibc2 and Glibc1 */ + # ifdef HAVE_SYS_IO_H +-- +2.24.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb index 7ddc55f5e7..275b984e47 100644 --- a/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb @@ -7,22 +7,25 @@ LICENSE = "GPLv2+" DEPENDS = "ncurses lirc" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ - file://README.md;beginline=107;md5=5c927ce1742d6d5cddc45b7ad6230f75" + file://README.md;beginline=107;md5=5db392f043253a2d64b1737068ce6b58" -BASEPV = "0.5.9" -PV = "${BASEPV}+git${SRCPV}" -SRCREV = "e08546c13a4157ed98cd4a8e9086e7acd66f93c0" +PV = "0.5.9+git${SRCPV}" +SRCREV = "3a3d622d9bb74c44fa67bc20573751a207514134" SRC_URI = "git://github.com/lcdproc/lcdproc \ file://0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch \ + file://0002-Include-limits.h-for-PATH_MAX-definition.patch \ + file://0003-Fix-non-x86-platforms-on-musl.patch \ " S = "${WORKDIR}/git" inherit autotools pkgconfig update-rc.d -LCD_DRIVERS ?= "all,!irman,!svga" -LCD_DRIVERS_append_aarch64 = ",!serialVFD" -LCD_DRIVERS_append_arm = ",!serialVFD" +LCD_DRIVERS ?= "all,!irman,!svga${SERIALVFD}" +SERIALVFD ?= "" +SERIALVFD_libc-musl = ",!serialVFD" +SERIALVFD_libc-musl_x86 = "" +SERIALVFD_libc-musl_x86-64 = "" LCD_DEFAULT_DRIVER ?= "curses" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.23.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.23.bb index 761619d9af..3f4eec274f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.23.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.23.bb @@ -17,7 +17,7 @@ SRC_URI = " \ S = "${WORKDIR}/git" -FILES_${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.7/site-packages" +FILES_${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages" PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath nvdimm" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" diff --git a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch new file mode 100644 index 0000000000..3ecbfce250 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch @@ -0,0 +1,42 @@ +From 95d4df3b713925e2c4894a2e4d50b06df861d9ef Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Dec 2019 23:37:40 -0800 +Subject: [PATCH] CheckPlatformSupport.cmake: Do not hardcode lib path + +Using CMAKE_INSTALL_LIBDIR ensures that we can build for multilib env + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/libcec/cmake/CheckPlatformSupport.cmake | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake +index 2d7102f..55e78f8 100644 +--- a/src/libcec/cmake/CheckPlatformSupport.cmake ++++ b/src/libcec/cmake/CheckPlatformSupport.cmake +@@ -224,16 +224,16 @@ else() + + if (${PYTHON_MAJOR_VERSION} EQUAL 2) + install(TARGETS ${SWIG_MODULE_cec_REAL_NAME} +- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}/cec) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}/cec) + install(FILES ${CMAKE_BINARY_DIR}/src/libcec/cec.py +- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}) ++ DESTINATION l${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}) + install(FILES ${CMAKE_SOURCE_DIR}/src/libcec/cmake/__init__.py +- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/cec) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/cec) + else() + install(TARGETS ${SWIG_MODULE_cec_REAL_NAME} +- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}) + install(FILES ${CMAKE_BINARY_DIR}/src/libcec/cec.py +- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}) + endif() + endif() + endif() +-- +2.24.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb index eaf6b9b437..8d5a82455b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb @@ -13,7 +13,8 @@ PV = "4.0.4" SRCREV = "3bbd4321618503d14008387a72fabb6743878831" SRC_URI = "git://github.com/Pulse-Eight/libcec.git \ -" + file://0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch \ + " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.0.0.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb index 43c1fd5cab..48dec47a81 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb @@ -8,7 +8,7 @@ DEPENDS = "libxml2 glib-2.0 swig python" inherit autotools pkgconfig pythonnative -SRCREV = "62ec804736435fa34e37e66e228e17e2aacee1d7" +SRCREV = "3df02d4d0e9008771e8622fdc10de8333b3f0d85" SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus/0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch b/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus/0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch new file mode 100644 index 0000000000..321b41289d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus/0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch @@ -0,0 +1,37 @@ +From 066c49158a71ea77598c9e1ae16bba63d6ac6bb5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 19 Dec 2019 23:41:35 -0800 +Subject: [PATCH] cmake: Use GNUInstallDirs instead of hardcoding lib path + +Upstream-Status: Submitted [https://github.com/Jacajack/liblightmodbus/pull/12] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ce6cc88..bee83aa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -242,14 +242,14 @@ if ( DEFINED AVR ) + ) + endif( ) + +- ++include(GNUInstallDirs) + #Installation + install( + TARGETS lightmodbus +- ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/" + ) + + #Install headers + install( + DIRECTORY "${CMAKE_SOURCE_DIR}/include/" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/" FILES_MATCHING PATTERN "*.h" +-) +\ No newline at end of file ++) +-- +2.24.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb index 1e35f08c0f..7fc5997983 100644 --- a/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" inherit cmake pkgconfig -SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https" +SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https \ + file://0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch \ + " SRCREV = "59d2b405f95701e5b04326589786dbb43ce49e81" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb b/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb index b205186e0b..82503a168b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb @@ -22,9 +22,13 @@ S = "${WORKDIR}/git" # WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: error: conftest.ld: SECTIONS seen after other input files; try -T/--script # WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: internal error in write_sections, at ../../gold/reloc.cc:791 # collect2: error: ld returned 1 exit status -EXTRA_OECONF_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' --enable-nosection-fallback', '', d)}" +NOSECTION_FALLBACK = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-nosection-fallback', '', d)}" +NOSECTION_FALLBACK_toolchain-clang_mips64 = "--enable-nosection-fallback" + +EXTRA_OECONF += "${NOSECTION_FALLBACK}" CFLAGS += "-pthread -D_REENTRANT" + do_configure_prepend() { ( cd ${S} ${S}/autogen.sh ) diff --git a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb index 4ede3c8c6b..c61d7c99dc 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb @@ -17,6 +17,11 @@ SRC_URI[sha256sum] = "5bf1906aff9ffc3eeacf32567270f4d819055d8386d98b9c8c05519012 # Perl5 is for tests only EXTRA_OECONF = "--without-perl5 --with-mnttab=/proc/mounts" +# use with caution - default properties are configured to trace +PACKAGECONFIG ??= "" +PACKAGECONFIG[log4cplus] = "--with-log4cplus,--without-log4cplus,log4cplus" +PACKAGECONFIG[logging] = "--enable-logging,--disable-logging," + inherit autotools pkgconfig FILES_statgrab = "${bindir}/statgrab" diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb index 41a79daf4c..f52bcca735 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb @@ -56,7 +56,7 @@ EXTRA_OECONF = " \ " # Without this, JS_Init() will fail for mips64. -EXTRA_OECONF_append_mips64 = " --with-intl-api=build" +EXTRA_OECONF_append_mipsarch = " --with-intl-api=build" EXTRA_OECONF_append_mipsarch = " --disable-ion" EXTRA_OECONF_append_riscv64 = " --disable-ion" diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch deleted file mode 100644 index d94b3ded9b..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 114fe5067b58a2434b44855eee48f865186fe0fa Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Tue, 5 Nov 2019 22:26:23 +0000 -Subject: [PATCH] build: create tests directory for split builds - -When `--disable-dependency-tracking` is in effect with separate build -directory, the tests directory isn't created as a result of the -dependency generation, which leads to a build race for the tests -directory being created and failures: - - Making all in . - make[2]: Entering directory 'TOPDIR/build/tmp/work/riscv64-yoe-linux-musl/ostree/2019.5-r0/build' - (echo '[Test]' > tests/test-local-pull-depth.sh.test.tmp; \ - echo 'Type=session' >> tests/test-local-pull-depth.sh.test.tmp; \ - echo 'Exec=env G_TEST_SRCDIR=/usr/libexec/installed-tests/libostree G_TEST_BUILDDIR=/usr/libexec/installed-tests/libostree /usr/libexec/installed-tests/libostree/test-local-pull-depth.sh' >> tests/test-local-pull-depth.sh.test.tmp; \ - mv tests/test-local-pull-depth.sh.test.tmp tests/test-local-pull-depth.sh.test) - /bin/sh: tests/test-local-pull-depth.sh.test.tmp: No such file or directory - /bin/sh: line 1: tests/test-local-pull-depth.sh.test.tmp: No such file or directory - /bin/sh: line 2: tests/test-local-pull-depth.sh.test.tmp: No such file or directory - mv: cannot stat 'tests/test-local-pull-depth.sh.test.tmp': No such file or directory - make[2]: *** [Makefile:9282: tests/test-local-pull-depth.sh.test] Error 1 - -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Upstream-Status: Pending ---- - buildutil/glib-tap.mk | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/buildutil/glib-tap.mk b/buildutil/glib-tap.mk -index 34b8f21ea26a..9a944a0acc88 100644 ---- a/buildutil/glib-tap.mk -+++ b/buildutil/glib-tap.mk -@@ -116,6 +116,7 @@ installed_testcases = $(test_programs) $(installed_test_programs) \ - installed_test_meta_DATA = $(installed_testcases:=.test) - - %.test: %$(EXEEXT) Makefile -+ @$(MKDIR_P) $(dir $@) - $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ - echo 'Type=session' >> $@.tmp; \ - echo 'Exec=env G_TEST_SRCDIR=$(installed_testdir) G_TEST_BUILDDIR=$(installed_testdir) $(installed_testdir)/$(notdir $<)' >> $@.tmp; \ --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch deleted file mode 100644 index d8c044cb92..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5a4f2ddb0a6c656b425a3caa41f5af766ed5f44b Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Mon, 9 Sep 2019 14:19:18 +0100 -Subject: [PATCH] macros: Add TEMP_FAILURE_RETRY for musl - -TEMP_FAILURE_RETRY is glibc specific, add a definition for musl. - -See https://github.com/ostreedev/ostree/issues/731 - -Signed-off-by: Leon Woestenberg <leon@sidebranch.com> -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libglnx/commit/15c06468804014fc49f6f340132930703f919b19] ---- - glnx-macros.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/libglnx.glnx-macros.h b/libglnx/glnx-macros.h -index 6d8aca93f8a3..700fc75ceed0 100644 ---- a/libglnx.glnx-macros.h -+++ b/libglnx/glnx-macros.h -@@ -31,6 +31,16 @@ G_BEGIN_DECLS - /* All of these are for C only. */ - #ifndef __GI_SCANNER__ - -+/* fixes builds against musl, taken from glibc unistd.h */ -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ - /* Taken from https://github.com/systemd/systemd/src/basic/string-util.h - * at revision v228-666-gcf6c8c4 - */ --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch deleted file mode 100644 index fdb733ebe4..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch +++ /dev/null @@ -1,51 +0,0 @@ -From fb519f0361565cad0d340095263a1e8866ec4f89 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Thu, 31 Oct 2019 11:30:00 +0000 -Subject: [PATCH 1/3] tests: Handle EPIPE failures when head terminates - -When using musl, it appears that the default is line buffered output, so -when `head -1` reads from a pipe we have to handle the source end of the -pipe getting EPIPE. - -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Upstream-Status: Accepted [v2019.6] ---- - tests/pull-test.sh | 2 +- - tests/test-pull-mirrorlist.sh | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/pull-test.sh b/tests/pull-test.sh -index 0a97a1195582..2cfd8e02f790 100644 ---- a/tests/pull-test.sh -+++ b/tests/pull-test.sh -@@ -177,7 +177,7 @@ if ! skip_one_without_user_xattrs; then - ${CMD_PREFIX} ostree --repo=cacherepo pull-local ostree-srv/gnomerepo main - rev=$(ostree --repo=cacherepo rev-parse main) - ${CMD_PREFIX} ostree --repo=cacherepo ls -R -C main > ls.txt -- regfile_hash=$(grep -E -e '^-0' ls.txt | head -1 | awk '{ print $5 }') -+ regfile_hash=$((grep -E -e '^-0' ls.txt || true) | head -1 | awk '{ print $5 }') - ${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false corruptrepo $(cat httpd-address)/ostree/corruptrepo - # Make this a loop so in the future we can add more object types like commit etc. - for object in ${regfile_hash}.file; do -diff --git a/tests/test-pull-mirrorlist.sh b/tests/test-pull-mirrorlist.sh -index 4e44852d3971..85ff66e99f8e 100755 ---- a/tests/test-pull-mirrorlist.sh -+++ b/tests/test-pull-mirrorlist.sh -@@ -47,12 +47,12 @@ setup_mirror content_mirror3 - - # Let's delete a file from 1 so that it falls back on 2 - cd ${test_tmpdir}/content_mirror1/ostree/gnomerepo --filez=$(find objects/ -name '*.filez' | head -n 1) -+filez=$((find objects/ -name '*.filez' || true) | head -n 1) - rm ${filez} - - # Let's delete a file from 1 and 2 so that it falls back on 3 - cd ${test_tmpdir}/content_mirror1/ostree/gnomerepo --filez=$(find objects/ -name '*.filez' | head -n 1) -+filez=$((find objects/ -name '*.filez' || true) | head -n 1) - rm ${filez} - cd ${test_tmpdir}/content_mirror2/ostree/gnomerepo - rm ${filez} --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch deleted file mode 100644 index dcafb09957..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4d17cd917fe4fb67d2f9e4881b6693ac7289f423 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Wed, 30 Oct 2019 07:55:41 +0000 -Subject: [PATCH 1/4] tests/core: Fallback to en_US.UTF-8 locale - -A number of tests expect explicit left/right single quotes in their -messages, which will never happen in the C locale. Change so we pick a -likely UTF-8 locale, or fail if we can't find one. - -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Upstream-Status: Accepted [v2019.6] ---- - tests/libtest-core.sh | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh -index f6f94288fc61..bc191332c916 100644 ---- a/tests/libtest-core.sh -+++ b/tests/libtest-core.sh -@@ -35,15 +35,11 @@ assert_not_reached () { - } - - # Some tests look for specific English strings. Use a UTF-8 version --# of the C (POSIX) locale if we have one, or fall back to POSIX -+# of the C (POSIX) locale if we have one, or fall back to en_US.UTF-8 - # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) --if locale -a | grep '^C.UTF-8$' >/dev/null; then -- export LC_ALL=C.UTF-8 --elif locale -a | grep '^C.utf8$' >/dev/null; then -- export LC_ALL=C.utf8 --else -- export LC_ALL=C --fi -+export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true) -+if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi -+ - # A GNU extension, used whenever LC_ALL is not C - unset LANGUAGE - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch deleted file mode 100644 index 5ab9c8f6d7..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3d48021fb0892721fab8359b49470e521aaed493 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Thu, 31 Oct 2019 11:28:07 +0000 -Subject: [PATCH 2/3] tests/core: Assume C.UTF-8 if locale isn't found - -When building with musl there's no locale command, also its default -locale is C.UTF-8, so just get C.UTF-8 if we can't find locale. - -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Upstream-Status: Accepted [v2019.6] ---- - tests/libtest-core.sh | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh -index bc191332c916..46aafab03cc8 100644 ---- a/tests/libtest-core.sh -+++ b/tests/libtest-core.sh -@@ -37,9 +37,15 @@ assert_not_reached () { - # Some tests look for specific English strings. Use a UTF-8 version - # of the C (POSIX) locale if we have one, or fall back to en_US.UTF-8 - # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) --export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true) --if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi -- -+# -+# If we can't find the locale command assume we have support for C.UTF-8 -+# (e.g. musl based systems) -+if type -p locale >/dev/null; then -+ export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true) -+ if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi -+else -+ export LC_ALL=C.UTF-8 -+fi - # A GNU extension, used whenever LC_ALL is not C - unset LANGUAGE - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch deleted file mode 100644 index 834617c12d..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch +++ /dev/null @@ -1,52 +0,0 @@ -From abf1a7392b2fa1945286a39a35190d74fe141e52 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Thu, 31 Oct 2019 17:09:36 +0000 -Subject: [PATCH 3/3] tests: Avoid musl failure with `cp -a` - -When copying the tree, using musl and GNU coreutils, something gets confused -when setting the ownership of symlinks and the copy fails with: - - cp: failed to preserve ownership for osdata-devel/bin: Not supported - -Rework using tar to avoid the problem. - -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Upstream-Status: Accepted [v2019.6] ---- - tests/libtest.sh | 4 +++- - tests/test-admin-gpg.sh | 4 +++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/tests/libtest.sh b/tests/libtest.sh -index ba00073a10a7..3f5fd931bc1e 100755 ---- a/tests/libtest.sh -+++ b/tests/libtest.sh -@@ -440,7 +440,9 @@ EOF - ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string version=1.0.10 -b testos/buildmaster/x86_64-runtime -s "Build" - - cd ${test_tmpdir} -- cp -a osdata osdata-devel -+ rm -rf osdata-devel -+ mkdir osdata-devel -+ tar -C osdata -cf - . | tar -C osdata-devel -xf - - cd osdata-devel - mkdir -p usr/include - echo "a development header" > usr/include/foo.h -diff --git a/tests/test-admin-gpg.sh b/tests/test-admin-gpg.sh -index 1f50c8a9a508..dc776743776c 100755 ---- a/tests/test-admin-gpg.sh -+++ b/tests/test-admin-gpg.sh -@@ -90,7 +90,9 @@ EOF - ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string version=1.0.10 -b testos/buildmaster/x86_64-runtime -s "Build" --gpg-sign=$keyid --gpg-homedir=${test_tmpdir}/gpghome - - cd ${test_tmpdir} -- cp -a osdata osdata-devel -+ rm -rf osdata-devel -+ mkdir osdata-devel -+ tar -C osdata -cf - . | tar -C osdata-devel -xf - - cd osdata-devel - mkdir -p usr/include - echo "a development header" > usr/include/foo.h --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.5.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.6.bb index b3b34a15e6..bcf511b902 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.6.bb @@ -24,24 +24,20 @@ PREMIRRORS = "" SRC_URI = " \ gitsm://github.com/ostreedev/ostree \ - file://0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch \ file://run-ptest \ - file://0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch \ - file://0001-tests-Handle-EPIPE-failures-when-head-terminates.patch \ - file://0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch \ - file://0003-tests-Avoid-musl-failure-with-cp-a.patch \ - file://0001-build-create-tests-directory-for-split-builds.patch \ " -SRCREV = "980ca07b03b3aa7e0012729dd6c84b0878775d93" +SRCREV = "43706202f7de2ce0c829a46caab350ae1656f6ad" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" S = "${WORKDIR}/git" -inherit autotools bash-completion gobject-introspection gtk-doc pkgconfig ptest-gnome systemd +inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconfig ptest-gnome systemd # Package configuration - match ostree defaults, but without rofiles-fuse # otherwise we introduce a dependendency on meta-filesystems +# +# If running with ptest, both soup (for trivial-httpd) and xattr are required PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ @@ -52,16 +48,19 @@ PACKAGECONFIG ??= " \ # soup or curl - https://github.com/ostreedev/ostree/issues/1897 PACKAGECONFIG_class-native ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ + builtin-grub2-mkconfig \ soup \ " PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" +PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" +PACKAGECONFIG[gjs] = "ac_cv_path_GJS=${bindir}/gjs" PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls" PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive" PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux" -PACKAGECONFIG[man] = "--enable-man, --disable-man, libxslt-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[manpages] = "--enable-man, --disable-man, libxslt-native docbook-xsl-stylesheets-native" PACKAGECONFIG[mkinitcpio] = "--with-mkinitcpio, --without-mkinitcpio" PACKAGECONFIG[no-http2] = "--disable-http2, --enable-http2" PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl" @@ -84,7 +83,6 @@ EXTRA_OEMAKE = " \ " EXTRA_OECONF_class-native = " \ - --with-builtin-grub2-mkconfig \ --enable-wrpseudo-compat \ --disable-otmpfile \ " @@ -106,7 +104,7 @@ do_install_append_class-native() { create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" } -PACKAGES += " \ +PACKAGE_BEFORE_PN = " \ ${PN}-dracut \ ${PN}-grub \ ${PN}-mkinitcpio \ @@ -114,20 +112,11 @@ PACKAGES += " \ ${PN}-trivial-httpd \ " -FILES_${PN} = " \ - ${bindir}/ostree \ - ${bindir}/rofiles-fuse \ - ${datadir}/${BPN} \ - ${datadir}/gir-1.0 \ - ${libdir}/${BPN}/ostree-remount \ - ${libdir}/girepository-1.0 \ - ${libdir}/lib*${SOLIBS} \ - ${libdir}/tmpfiles.d/ostree-tmpfiles.conf \ - ${sysconfdir}/ostree/remotes.d \ - ${systemd_unitdir}/system-generators/ostree-system-generator \ - ${systemd_unitdir}/system/ostree-finalize-staged.path \ - ${systemd_unitdir}/system/ostree-finalize-staged.service \ - ${systemd_unitdir}/system/ostree-remount.service \ +FILES_${PN} += " \ + ${nonarch_libdir}/${BPN} \ + ${nonarch_libdir}/tmpfiles.d \ + ${systemd_unitdir}/system \ + ${systemd_unitdir}/system-generators \ " FILES_${PN}-dracut = " \ ${sysconfdir}/dracut.conf.d \ @@ -142,7 +131,7 @@ FILES_${PN}-mkinitcpio = " \ ${libdir}/initcpio \ " FILES_${PN}-switchroot = " \ - ${libdir}/ostree/ostree-prepare-root \ + ${nonarch_libdir}/${BPN}/ostree-prepare-root \ ${systemd_unitdir}/system/ostree-prepare-root.service \ " FILES_${PN}-trivial-httpd = " \ @@ -168,8 +157,10 @@ RDEPENDS_${PN}-ptest += " \ grep \ python3-core \ python3-multiprocessing \ - python3-pyyaml \ + tar \ ${PN}-trivial-httpd \ + ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'python3-pyyaml', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \ " RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us" @@ -180,13 +171,3 @@ SYSTEMD_SERVICE_${PN} = "ostree-remount.service ostree-finalize-staged.path" SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" BBCLASSEXTEND = "native" - -python __anonymous() { - if not bb.data.inherits_class('native', d) and bb.utils.contains('PTEST_ENABLED', '1', 'True', 'False', d): - if not bb.utils.contains_any('BBFILE_COLLECTIONS', 'meta-python', 'True', 'False', d): - raise bb.parse.SkipRecipe('ptest requires meta-python to be present.') - elif not bb.utils.contains_any('PACKAGECONFIG', 'soup curl', 'True', 'False', d): - raise bb.parse.SkipRecipe('ptest requires soup enabled in PACKAGECONFIG.') - elif not oe.utils.any_distro_features(d, "xattr"): - raise bb.parse.SkipRecipe('ptest requires xattr enabled in DISTRO_FEATURES.') -} diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb/0001-include-stdexcept-for-std-invalid_argument.patch b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb/0001-include-stdexcept-for-std-invalid_argument.patch new file mode 100644 index 0000000000..0a93411533 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb/0001-include-stdexcept-for-std-invalid_argument.patch @@ -0,0 +1,25 @@ +From 3e97c9004f4ec58ca3696ee6298f91e6eeb76e04 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 23 Dec 2019 14:46:25 -0800 +Subject: [PATCH] include <stdexcept> for std::invalid_argument + +Upstream-Status: Submitted [https://github.com/rmbreak/pam_ldapdb/pull/11] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pam_ldapdb.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pam_ldapdb.cpp b/pam_ldapdb.cpp +index 9baf1e6..be5d85c 100644 +--- a/pam_ldapdb.cpp ++++ b/pam_ldapdb.cpp +@@ -1,5 +1,6 @@ + #include <map> + #include <string> ++#include <stdexcept> + #include <utility> + #include <syslog.h> + #include <pwd.h> +-- +2.24.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb index 6864cc3174..626b22fe48 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb @@ -11,7 +11,9 @@ inherit features_check REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "84d7b260f1ae6857ae36e014c9a5968e8aa1cbe8" -SRC_URI = "git://github.com/rmbreak/pam_ldapdb" +SRC_URI = "git://github.com/rmbreak/pam_ldapdb \ + file://0001-include-stdexcept-for-std-invalid_argument.patch \ +" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch new file mode 100644 index 0000000000..4675687c3f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch @@ -0,0 +1,27 @@ +From 7f7f710c8821b7254baeaf945ca3ca263b9845e2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 21 Dec 2019 11:17:50 -0800 +Subject: [PATCH] Mark extern definition of SDS_NOINIT in sds.h + +This helps avoiding multiple definition of this variable, its also +defined globally in sds.c + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/sds.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sds.h b/src/sds.h +index 1bdb60d..adcc12c 100644 +--- a/src/sds.h ++++ b/src/sds.h +@@ -34,7 +34,7 @@ + #define __SDS_H + + #define SDS_MAX_PREALLOC (1024*1024) +-const char *SDS_NOINIT; ++extern const char *SDS_NOINIT; + + #include <sys/types.h> + #include <stdarg.h> diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/Fixed-stack-trace-generation-on-aarch64.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/Fixed-stack-trace-generation-on-aarch64.patch deleted file mode 100644 index 82ca307391..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/Fixed-stack-trace-generation-on-aarch64.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c8ca71d40bc51e255457cd4374dd45ec9ebf8ae1 Mon Sep 17 00:00:00 2001 -From: Jun He <jun.he@arm.com> -Date: Mon, 3 Jul 2017 07:18:32 +0000 -Subject: [PATCH] Fixed stack trace generation on aarch64 - -Change-Id: I9801239c98cb7362ed07e8b9ec2ba7e45749dba7 -Signed-off-by: Jun He <jun.he@arm.com> - -* fixes also this error when building with -Werror=return-type: - debug.c:698:1: error: no return statement in function returning non-void [-Werror=return-type] - -Upstream-Status: Backport [https://github.com/antirez/redis/commit/c8ca71d40bc51e255457cd4374dd45ec9ebf8ae1] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/Makefile | 2 +- - src/debug.c | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 24e960593eb..a1ff4258a9d 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -40,7 +40,7 @@ - endif - - # To get ARM stack traces if Redis crashes we need a special C flag. --ifneq (,$(findstring armv,$(uname_M))) -+ifneq (,$(filter aarch64 armv,$(uname_M))) - CFLAGS+=-funwind-tables - endif - -diff --git a/src/debug.c b/src/debug.c -index a4caa49f285..c976d0ed919 100644 ---- a/src/debug.c -+++ b/src/debug.c -@@ -691,6 +691,8 @@ - return (void*) uc->uc_mcontext.sc_ip; - #elif defined(__arm__) /* Linux ARM */ - return (void*) uc->uc_mcontext.arm_pc; -+ #elif defined(__aarch64__) /* Linux AArch64 */ -+ return (void*) uc->uc_mcontext.pc; - #endif - #else - return NULL; diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch new file mode 100644 index 0000000000..9a40d832f1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch @@ -0,0 +1,19 @@ +Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER + +Fixes +| zmalloc.c:87:37: error: 'PTHREAD_MUTEX_DEFAULT' undeclared here (not in a function) +| 87 | pthread_mutex_t used_memory_mutex = PTHREAD_MUTEX_INITIALIZER; +| | ^~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/zmalloc.c ++++ b/src/zmalloc.c +@@ -28,6 +28,7 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + ++#define _GNU_SOURCE + #include <stdio.h> + #include <stdlib.h> + #include <stdint.h> diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/remove-atomics.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/remove-atomics.patch deleted file mode 100644 index 23b2f2aaf0..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/remove-atomics.patch +++ /dev/null @@ -1,72 +0,0 @@ -From c486455e0691f9915018b9d8b133200a6c61a3c5 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Thu, 24 May 2018 09:58:42 -0700 -Subject: [PATCH] Remove atomics - -Based on this patch: -https://github.com/patrikx3/lede-redis/blob/master/redis/patches/010-redis.patch - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> ---- - deps/jemalloc/src/pages.c | 22 +--------------------- - src/atomicvar.h | 4 ++-- - 2 files changed, 3 insertions(+), 23 deletions(-) - -diff --git a/deps/jemalloc/src/pages.c b/deps/jemalloc/src/pages.c -index 83a167f6..8e82c78d 100644 ---- a/deps/jemalloc/src/pages.c -+++ b/deps/jemalloc/src/pages.c -@@ -147,27 +147,7 @@ pages_purge(void *addr, size_t size) - { - bool unzeroed; - --#ifdef _WIN32 -- VirtualAlloc(addr, size, MEM_RESET, PAGE_READWRITE); -- unzeroed = true; --#elif defined(JEMALLOC_HAVE_MADVISE) --# ifdef JEMALLOC_PURGE_MADVISE_DONTNEED --# define JEMALLOC_MADV_PURGE MADV_DONTNEED --# define JEMALLOC_MADV_ZEROS true --# elif defined(JEMALLOC_PURGE_MADVISE_FREE) --# define JEMALLOC_MADV_PURGE MADV_FREE --# define JEMALLOC_MADV_ZEROS false --# else --# error "No madvise(2) flag defined for purging unused dirty pages." --# endif -- int err = madvise(addr, size, JEMALLOC_MADV_PURGE); -- unzeroed = (!JEMALLOC_MADV_ZEROS || err != 0); --# undef JEMALLOC_MADV_PURGE --# undef JEMALLOC_MADV_ZEROS --#else -- /* Last resort no-op. */ -- unzeroed = true; --#endif -+ unzeroed = false; - return (unzeroed); - } - -diff --git a/src/atomicvar.h b/src/atomicvar.h -index 84a5bbc5..f9b563c2 100644 ---- a/src/atomicvar.h -+++ b/src/atomicvar.h -@@ -68,7 +68,7 @@ - * is reported. */ - // #define __ATOMIC_VAR_FORCE_SYNC_MACROS - --#if !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__ATOMIC_RELAXED) && !defined(__sun) && (!defined(__clang__) || !defined(__APPLE__) || __apple_build_version__ > 4210057) -+#if defined(CONFIG_EDAC_ATOMIC_SCRUB) && !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__ATOMIC_RELAXED) && !defined(__sun) && (!defined(__clang__) || !defined(__APPLE__) || __apple_build_version__ > 4210057) - /* Implementation using __atomic macros. */ - - #define atomicIncr(var,count) __atomic_add_fetch(&var,(count),__ATOMIC_RELAXED) -@@ -82,7 +82,7 @@ - #define atomicSet(var,value) __atomic_store_n(&var,value,__ATOMIC_RELAXED) - #define REDIS_ATOMIC_API "atomic-builtin" - --#elif defined(HAVE_ATOMIC) -+#elif defined(CONFIG_EDAC_ATOMIC_SCRUB) && defined(HAVE_ATOMIC) - /* Implementation using __sync macros. */ - - #define atomicIncr(var,count) __sync_add_and_fetch(&var,(count)) --- -2.17.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_5.0.7.bb index 7dc6f97115..b91575552d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_5.0.7.bb @@ -7,26 +7,27 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3c01b49fed4df1a79843688fa3f7b9d6" DEPENDS = "readline lua ncurses" SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ + file://redis.conf \ + file://init-redis-server \ + file://redis.service \ file://hiredis-use-default-CC-if-it-is-set.patch \ file://lua-update-Makefile-to-use-environment-build-setting.patch \ file://oe-use-libc-malloc.patch \ - file://Fixed-stack-trace-generation-on-aarch64.patch \ file://0001-src-Do-not-reset-FINAL_LIBS.patch \ - file://redis.conf \ - file://init-redis-server \ - file://redis.service \ -" + file://0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch \ + file://GNU_SOURCE.patch \ + " -SRC_URI_append_mips = " file://remove-atomics.patch" -SRC_URI_append_arm = " file://remove-atomics.patch" -SRC_URI_append_powerpc = " file://remove-atomics.patch" - -SRC_URI[md5sum] = "96ae20ffd68b9daee24b702b754d89f3" -SRC_URI[sha256sum] = "1e1e18420a86cfb285933123b04a82e1ebda20bfb0a289472745a087587e93a7" +SRC_URI[md5sum] = "612ec43075a888bc8b8a7dd8ccb2e0f7" +SRC_URI[sha256sum] = "61db74eabf6801f057fd24b590232f2f337d422280fd19486eca03be87d3a82b" inherit autotools-brokensep update-rc.d systemd useradd FINAL_LIBS_x86_toolchain-clang = "-latomic" +FINAL_LIBS_mips = "-latomic" +FINAL_LIBS_arm = "-latomic" +FINAL_LIBS_powerpc = "-latomic" + export FINAL_LIBS USERADD_PACKAGES = "${PN}" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb index 8287d2b7fe..02ac03eae3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb @@ -29,8 +29,8 @@ SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "6d4d94359d083f449f089b8dbb93c423" -SRC_URI[sha256sum] = "0219ee692f31a39743acb62aaf4196b644ce94edf386df4605fd6a11a4fe0c93" +SRC_URI[md5sum] = "154e33feb587216f2955050a8301104c" +SRC_URI[sha256sum] = "e1f4776b1c62ad7220f4d624a89a96b0c3d4738006899356eaaef0f1f91ee104" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" @@ -40,6 +40,7 @@ inherit autotools pkgconfig systemd update-rc.d ptest EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes" EXTRA_OECONF += "--enable-imfile-tests" EXTRA_OECONF_remove_mipsarch = "ap_cv_atomic_builtins=yes" +EXTRA_OECONF_remove_powerpc = "ap_cv_atomic_builtins=yes" # first line is default yes in configure PACKAGECONFIG ??= " \ @@ -162,12 +163,26 @@ RDEPENDS_${PN} += "logrotate" # for rsyslog-ptest VALGRIND = "valgrind" -VALGRIND_mips = "" -VALGRIND_mips64 = "" -VALGRIND_mips64n32 = "" -VALGRIND_arm = "" -VALGRIND_aarch64 = "" + +# valgrind supports armv7 and above +VALGRIND_armv4 = '' +VALGRIND_armv5 = '' +VALGRIND_armv6 = '' + +# X32 isn't supported by valgrind at this time +VALGRIND_linux-gnux32 = '' +VALGRIND_linux-muslx32 = '' + +# Disable for some MIPS variants +VALGRIND_mipsarchr6 = '' +VALGRIND_linux-gnun32 = '' + +# Disable for powerpc64 with musl +VALGRIND_libc-musl_powerpc64 = '' + +# RISC-V support for valgrind is not there yet VALGRIND_riscv64 = "" + RDEPENDS_${PN}-ptest += "\ make diffutils gzip bash gawk coreutils procps \ libgcc python-core python-io \ diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb index bf7eaf4111..ffd46da0af 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb @@ -9,13 +9,16 @@ HOMEPAGE = "https://pagure.io/sanlock" SECTION = "utils" LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" +LIC_FILES_CHKSUM = "file://../README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" + +PV .= "+git${SRCPV}" SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ - file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ + file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch;patchdir=../ \ " -SRCREV = "7afe0e66f5c7f24894896fad20ffa6f39733d80f" -S = "${WORKDIR}/git" +SRCREV = "cff348800722f7dadf030ffe7494c2df714996e3" + +S = "${WORKDIR}/git/python" DEPENDS = "libaio util-linux" @@ -24,15 +27,13 @@ inherit distutils3 useradd do_configure[noexec] = "1" do_compile_prepend () { - oe_runmake -C wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}" - oe_runmake -C src CMD_LDFLAGS="${LDFLAGS}" LIB_ENTIRE_LDFLAGS="${LDFLAGS}" LIB_CLIENT_LDFLAGS="${LDFLAGS}" - cd ${S}/python + oe_runmake -C ${S}/../wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}" + oe_runmake -C ${S}/../src CMD_LDFLAGS="${LDFLAGS}" LIB_ENTIRE_LDFLAGS="${LDFLAGS}" LIB_CLIENT_LDFLAGS="${LDFLAGS}" } do_install_prepend () { - oe_runmake -C wdmd DESTDIR=${D} LIBDIR=${libdir} install - oe_runmake -C src DESTDIR=${D} LIBDIR=${libdir} install - cd ${S}/python + oe_runmake -C ${S}/../wdmd DESTDIR=${D} LIBDIR=${libdir} install + oe_runmake -C ${S}/../src DESTDIR=${D} LIBDIR=${libdir} install } SANLOCKGROUP ?= "sanlock" diff --git a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrok_0.5.1.bb b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb index 8152ca7ca3..35e59d6d7d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrok_0.5.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb @@ -10,6 +10,8 @@ PACKAGECONFIG[serialport] = "--with-libserialport,--without-libserialport,libser PACKAGECONFIG[ftdi] = "--with-libftdi,--without-libftdi,libftdi" PACKAGECONFIG[usb] = "--with-libusb,--without-libusb,libusb" PACKAGECONFIG[cxx] = "--enable-cxx,--disable-cxx,glibmm doxygen-native" +PACKAGECONFIG[bluez5] = "--with-libbluez,--without-libbluez,bluez5" +PACKAGECONFIG[hidapi] = "--with-libhidapi,--without-libhidapi,hidapi" PACKAGECONFIG ??= "serialport ftdi usb" @@ -17,7 +19,7 @@ inherit autotools pkgconfig SRC_URI = "http://sigrok.org/download/source/libsigrok/libsigrok-${PV}.tar.gz" -SRC_URI[md5sum] = "a3de9e52a660e51d27a6aca025d204a7" -SRC_URI[sha256sum] = "e40fde7af98d29e922e9d3cbe0a6c0569889153fc31e47b8b1afe4d846292b9c" +SRC_URI[md5sum] = "e258d471b6d5eaa58daf927a0dc3ba67" +SRC_URI[sha256sum] = "4d341f90b6220d3e8cb251dacf726c41165285612248f2c52d15df4590a1ce3c" FILES_${PN} += "${datadir}/*" diff --git a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.2.bb b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb index b8e1e4705d..f9c1d1a3a5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb @@ -10,5 +10,5 @@ inherit autotools pkgconfig SRC_URI = "http://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-${PV}.tar.gz" -SRC_URI[md5sum] = "b9033bc7e68bc17fffffd4fdd793f5a1" -SRC_URI[sha256sum] = "e08d9e797c54eccf3144da631b6e5f1498ac531e51520428df537a1da82583f0" +SRC_URI[md5sum] = "7ba4ed4ef1f06ae96979751e096c2821" +SRC_URI[sha256sum] = "c50814aa6743cd8c4e88c84a0cdd8889d883c3be122289be90c63d7d67883fc0" diff --git a/meta-openembedded/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb index d31bcd282f..2293f142b3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb @@ -13,6 +13,7 @@ PACKAGECONFIG ??= "decode" inherit autotools pkgconfig SRC_URI = "http://sigrok.org/download/source/sigrok-cli/sigrok-cli-${PV}.tar.gz" +SRC_URI[md5sum] = "3f45ce664bad529d8b3f78a61b017d75" +SRC_URI[sha256sum] = "f52413429f47d457c333db0fd068416ab7a3f9e35ca76de8624dc5ac6fb07797" -SRC_URI[md5sum] = "77cb745e2fa239c7bd1ea81e2d67ede9" -SRC_URI[sha256sum] = "5669d968c2de3dfc6adfda76e83789b6ba76368407c832438cef5e7099a65e1c" +FILES_${PN} += "${datadir}/icons/hicolor" diff --git a/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.0.bb b/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.1.bb index d984566547..b401272d24 100644 --- a/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.1.bb @@ -22,8 +22,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'libcap-ng selinux', d) PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng" PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" -SRC_URI[md5sum] = "b2a80e4789af23d67dfe1e88a997abbf" -SRC_URI[sha256sum] = "e5e1ac2786bc87fdbd6f92d0ee751b799fbb3e1a09c0a6a379f9eb64b3e8f61c" +SRC_URI[md5sum] = "430cd5f64caa4524018b536e5ecd9c29" +SRC_URI[sha256sum] = "3f734d2c99deb1e4af62b25d944c6252de70ca64d766c4c7294545a2e659b846" inherit autotools update-rc.d systemd diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-cmake-Disable-Wno-misleading-indentation-with-clang-.patch b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-cmake-Disable-Wno-misleading-indentation-with-clang-.patch new file mode 100644 index 0000000000..68b73bc2cc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-cmake-Disable-Wno-misleading-indentation-with-clang-.patch @@ -0,0 +1,33 @@ +From d41e2bef1c39dcbc4896b1dd7ab168da530672b5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 30 Dec 2019 13:33:39 -0800 +Subject: [PATCH] cmake: Disable -Wno-misleading-indentation with clang-10 onwards + +clang also introduced this warning now + +Upstream-Status: Submitted [https://github.com/eclipse/upm/pull/693] + +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 069e4902..47c7f4c3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -99,6 +99,11 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_ + list (APPEND C_CXX_WARNING_FLAGS -Wno-misleading-indentation) + endif () + ++# clang-10 added -Wmisleading-indentation as well, skipp it too ++if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "9") ++ list (APPEND C_CXX_WARNING_FLAGS -Wno-misleading-indentation) ++endif () ++ + # Warnings as errors? + if (WERROR) + list (APPEND C_CXX_WARNING_FLAGS -Werror) +-- +2.24.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-initialize-local-variables-before-use.patch b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-initialize-local-variables-before-use.patch new file mode 100644 index 0000000000..f9fae1641d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-initialize-local-variables-before-use.patch @@ -0,0 +1,57 @@ +From cce8be3966b602cf7e20d559e50fcf493b9b42cc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 23 Dec 2019 18:13:21 -0800 +Subject: [PATCH] initialize local variables before use + +fixes +error: 'ctrl_reg2_data' may be used uninitialized in this function [-Werror=maybe-uninitialized] + +Upstream-Status: Submitted [https://github.com/eclipse/upm/pull/693] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/kxtj3/kxtj3.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/kxtj3/kxtj3.c b/src/kxtj3/kxtj3.c +index a6f3c4f8..050ae585 100755 +--- a/src/kxtj3/kxtj3.c ++++ b/src/kxtj3/kxtj3.c +@@ -715,7 +715,7 @@ upm_result_t kxtj3_sensor_software_reset(const kxtj3_context dev) + if (kxtj3_set_bit_on(dev, KXTJ3_CTRL_REG2, KXTJ3_CTRL_REG2_SRST) != UPM_SUCCESS) + return UPM_ERROR_OPERATION_FAILED; + +- uint8_t ctrl_reg2_data; ++ uint8_t ctrl_reg2_data = 0; + kxtj3_read_register(dev, KXTJ3_CTRL_REG2, &ctrl_reg2_data); + + uint8_t srst_counter = 0; +@@ -824,7 +824,7 @@ upm_result_t kxtj3_enable_interrupt_pin(const kxtj3_context dev, KXTJ3_INTERRUPT + KXTJ3_INTERRUPT_RESPONSE_T response_type) + { + assert(dev != NULL); +- uint8_t int_reg_value; ++ uint8_t int_reg_value = 0; + kxtj3_read_register(dev, KXTJ3_INT_CTRL_REG1, &int_reg_value); + + if (polarity) +@@ -865,7 +865,7 @@ upm_result_t kxtj3_set_interrupt_response(const kxtj3_context dev, KXTJ3_INTERRU + bool kxtj3_get_interrupt_status(const kxtj3_context dev) + { + assert(dev != NULL); +- uint8_t status_reg_value; ++ uint8_t status_reg_value = 0; + kxtj3_read_register(dev, KXTJ3_STATUS_REG, &status_reg_value); + if (!(status_reg_value & KXTJ3_STATUS_REG_INT)) + return false; +@@ -955,7 +955,7 @@ kxtj3_wakeup_axes kxtj3_get_wakeup_axis_and_direction(kxtj3_context dev) + { + assert(dev != NULL); + +- uint8_t int_source2_value; ++ uint8_t int_source2_value = 0; + kxtj3_read_register(dev, KXTJ3_INT_SOURCE2, &int_source2_value); + + kxtj3_wakeup_axes wakeup_axis; +-- +2.24.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb index dbe97370d5..6db8f88252 100644 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb @@ -13,6 +13,8 @@ PV = "2.0.0+git${SRCPV}" SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \ file://0001-Use-stdint-types.patch \ + file://0001-initialize-local-variables-before-use.patch \ + file://0001-cmake-Disable-Wno-misleading-indentation-with-clang-.patch \ " SRC_URI_append_toolchain-clang_x86 = " file://0001-nmea_gps-Link-with-latomic.patch " diff --git a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb index 3103748e40..e036f714ba 100644 --- a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb @@ -28,9 +28,10 @@ DEPENDS += " \ " PACKAGECONFIG ??= "python3" -PACKAGECONFIG[python] = "--with-python,--without-python,python,python" PACKAGECONFIG[python3] = "--with-python3,--without-python3,python3,python3" +EXTRA_OECONF = "--without-python" + RDEPENDS_python3-${BPN} += "${PN}" PACKAGES += "python3-${BPN}" diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb new file mode 100644 index 0000000000..eb201f4139 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb @@ -0,0 +1,35 @@ +SUMMARY = "Zstandard - Fast real-time compression algorithm" +DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \ +real-time compression scenarios at zlib-level and better compression ratios. \ +It's backed by a very fast entropy stage, provided by Huff0 and FSE library." +HOMEPAGE = "http://www.zstd.net/" +SECTION = "console/utils" + +LICENSE = "BSD-3-Clause & GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ + file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" + +SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1" + +SRCREV = "10f0e6993f9d2f682da6d04aa2385b7d53cbb4ee" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" +PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" +PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib" + +# See programs/README.md for how to use this +ZSTD_LEGACY_SUPPORT ??= "4" + +do_compile () { + oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} +} + +do_install () { + oe_runmake install 'DESTDIR=${D}' +} + +BBCLASSEXTEND = "native nativesdk" |