diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
23 files changed, 206 insertions, 62 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/0001-scripts-Do-not-check-for-files-on-build-host.patch b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/0001-scripts-Do-not-check-for-files-on-build-host.patch new file mode 100644 index 0000000000..6d9e94cb8a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/0001-scripts-Do-not-check-for-files-on-build-host.patch @@ -0,0 +1,52 @@ +From 8a8305c78143438e2bd497d55188a0da3442db08 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 27 Apr 2022 09:11:38 -0700 +Subject: [PATCH] scripts: Do not check for files on build host + +This will result in varied behaviour depending upon what kind of host is +used to build it. We dont want that. Instead check for these files and +dirs in staging area and create these markers in recipe via a +do_install_prepend to aide install piece a bit here ( systemd vs +sysvinit ) etc. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + client/scripts/Makefile.am | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/client/scripts/Makefile.am b/client/scripts/Makefile.am +index 2a53203d84..62a0defa93 100644 +--- a/client/scripts/Makefile.am ++++ b/client/scripts/Makefile.am +@@ -2,21 +2,21 @@ + + install-exec-hook: + chmod +x boinc-client +- if [ -d /etc/init.d ] ; then \ ++ if [ -d $(DESTDIR)/etc/init.d ] ; then \ + $(INSTALL) -d $(DESTDIR)$(sysconfdir)/init.d ; \ + $(INSTALL) -b boinc-client $(DESTDIR)$(sysconfdir)/init.d/boinc-client ; \ + fi +- if [ -d /usr/lib/systemd/system ] ; then \ ++ if [ -d $(DESTDIR)/usr/lib/systemd/system ] ; then \ + $(INSTALL) -d $(DESTDIR)/usr/lib/systemd/system/ ; \ + $(INSTALL_DATA) boinc-client.service $(DESTDIR)/usr/lib/systemd/system/boinc-client.service ; \ +- elif [ -d /lib/systemd/system ] ; then \ ++ elif [ -d $(DESTDIR)/lib/systemd/system ] ; then \ + $(INSTALL) -d $(DESTDIR)/lib/systemd/system/ ; \ + $(INSTALL_DATA) boinc-client.service $(DESTDIR)/lib/systemd/system/boinc-client.service ; \ + fi +- if [ -d /etc/sysconfig ] ; then \ ++ if [ -d $(DESTDIR)/etc/sysconfig ] ; then \ + $(INSTALL) -d $(DESTDIR)$(sysconfdir)/sysconfig ; \ + $(INSTALL_DATA) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/sysconfig/boinc-client ; \ +- elif [ -d /etc/default ] ; then \ ++ elif [ -d $(DESTDIR)/etc/default ] ; then \ + $(INSTALL) -d $(DESTDIR)$(sysconfdir)/default ; \ + $(INSTALL_DATA) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/default/boinc-client ; \ + else \ +-- +2.36.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb index 5e991d3099..8f85a508e7 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb @@ -35,6 +35,7 @@ SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ file://boinc-AM_CONDITIONAL.patch \ file://gtk-configure.patch \ file://4563.patch \ + file://0001-scripts-Do-not-check-for-files-on-build-host.patch \ " inherit gettext autotools pkgconfig features_check systemd @@ -75,16 +76,14 @@ do_compile:prepend () { sed -i -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${B}/libtool } -do_install:append() { - 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 - rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd/system \ - ${D}${nonarch_libdir}/systemd \ - ${D}${nonarch_libdir} +do_install:prepend() { + # help script install a bit to do right thing for OE + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + mkdir -p ${D}${systemd_system_unitdir} + else + mkdir -p ${D}${sysconfdir}/init.d fi + mkdir -p ${D}${sysconfdir}/default } SYSTEMD_SERVICE:${PN} = "boinc-client.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch new file mode 100644 index 0000000000..7b40b7a67e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch @@ -0,0 +1,45 @@ +From dd2d42a7f877d292f86e421dd9651f4b7c2abf18 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 19 Apr 2022 14:57:58 -0700 +Subject: [PATCH] cmake: Link with libatomic on rv32/rv64 + +Use of <atomic> needs to link in libatomic on riscv +Fixes + +undefined reference to `__atomic_exchange_1' + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/lib/CMakeLists.txt | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt +index 3293376..65018be 100644 +--- a/src/lib/CMakeLists.txt ++++ b/src/lib/CMakeLists.txt +@@ -37,6 +37,12 @@ else() + set(SOCKET_LIBRARY socket) + endif() + ++if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv32") ++ set(ATOMIC_LIBRARY atomic) ++else() ++ set(ATOMIC_LIBRARY "") ++endif() ++ + if(HAVE_FUNC_PTHREAD_SETNAME_NP) + add_definitions(-DDLT_USE_PTHREAD_SETNAME_NP) + message(STATUS "Using pthread_setname_np API to set thread name") +@@ -44,7 +50,7 @@ else() + message(STATUS "pthread_setname_np API not available on this platform") + endif() + +-target_link_libraries(dlt ${RT_LIBRARY} ${SOCKET_LIBRARY} Threads::Threads) ++target_link_libraries(dlt ${RT_LIBRARY} ${SOCKET_LIBRARY} ${ATOMIC_LIBRARY} Threads::Threads) + + target_include_directories(dlt + PUBLIC +-- +2.36.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb index 014c773584..2cea50dfb0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb @@ -17,6 +17,7 @@ DEPENDS = "zlib gzip-native json-c" SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https;branch=master \ file://0002-Don-t-execute-processes-as-a-specific-user.patch \ file://0004-Modify-systemd-config-directory.patch \ + file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ " SRCREV = "0138c00811c86eab4ff6bff3c6528163885ade19" @@ -24,6 +25,8 @@ PV .= "+2.18.9git${SRCPV}" S = "${WORKDIR}/git" +LDFLAGS:append:riscv64 = " -latomic" + PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-console ', '', d)} \ udp-connection dlt-system dlt-filetransfer " # dlt-dbus diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch new file mode 100644 index 0000000000..bf4cda08f0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch @@ -0,0 +1,28 @@ +From 5571f949fa2048b79c197b5b10a11ecb1891cbe9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 23 Apr 2022 08:24:34 -0700 +Subject: [PATCH] Control sytemd unit install location with SYSTEM_DIR + +This helps building when usrmerge is on + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -323,7 +323,11 @@ if(FLB_BINARY) + "${PROJECT_SOURCE_DIR}/init/systemd.in" + ${FLB_SYSTEMD_SCRIPT} + ) +- install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system) ++ if(SYSTEMD_DIR) ++ install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION ${SYSTEMD_DIR}) ++ else() ++ install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system) ++ endif() + install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR}) + elseif(FLB_UPSTART) + set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf") 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 index a185789992..d3822fc8da 100644 --- 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 @@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.kheem@gmail.com> # 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) ++ if(FLB_SYSTEMD) set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service") configure_file( "${PROJECT_SOURCE_DIR}/init/systemd.in" @@ -21,7 +21,7 @@ Signed-off-by: Khem Raj <raj.kheem@gmail.com> 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) ++ elseif(FLB_UPSTART) set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf") configure_file( "${PROJECT_SOURCE_DIR}/init/upstart.in" 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 index 670d596cad..b231cc2878 100644 --- 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 @@ -18,6 +18,7 @@ SRC_URI = "http://fluentbit.io/releases/1.3/fluent-bit-${PV}.tar.gz \ file://0001-ppc-Fix-signature-for-co_create-API.patch \ file://0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch \ file://0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch \ + file://0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch \ " SRC_URI[md5sum] = "6eae6dfd0a874e5dd270c36e9c68f747" SRC_URI[sha256sum] = "e037c76c89269c8dc4027a08e442fefd2751b0f1e0f9c38f9a4b12d781a9c789" @@ -47,7 +48,8 @@ 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)}" +# Enable systemd iff systemd is in DISTRO_FEATURES +EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On -DSYSTEMD_DIR=${systemd_system_unitdir}','-DFLB_SYSTEMD=Off',d)}" EXTRA_OECMAKE:append:riscv64 = " -DFLB_DEPS='atomic'" EXTRA_OECMAKE:append:riscv32 = " -DFLB_DEPS='atomic'" diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb index 7343a08c7d..fe5e5c067d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb @@ -7,7 +7,7 @@ LICENSE = "gnuplot" LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f" DEPENDS = "${BPN}-native virtual/libx11 gd readline" -inherit autotools features_check +inherit autotools features_check pkgconfig # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb b/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb index e996593135..d2b23b41b4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "git://github.com/pixel/hexedit.git;branch=master;protocol=https \ " -SRCREV = "baf45a289360a39a05253949fb9d1b50e4668d8a" +SRCREV = "eab92dcaa34b66bc5182772afc9fda4ac8a27597" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.9.0.bb b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.9.6.bb index dac025de7c..2112b62769 100644 --- a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.9.6.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4a26952467ef79a7efca4a9cf52d417b" SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.lz \ file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \ " -SRC_URI[sha256sum] = "c76a8c9965a1edde4f2446b47ee17c8564e0e20f3d8474465f6d4c54d1125ac4" +SRC_URI[sha256sum] = "f8f453fc1f0009e3e7f113fd128638770894d004a3b60202922e2c7347c30607" UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" @@ -23,7 +23,7 @@ DEPENDS = "asciidoc-native fontconfig fribidi gdk-pixbuf imlib2 libxft libxpm li libxinerama libice libsm libx11 libxext libxrender libxcomposite libxdamage \ libxfixes" DEPENDS:append = " qemu-native" -RDEPENDS:${PN} = "perl fribidi" +RDEPENDS:${PN} = "perl fribidi imlib2 imlib2-loaders" do_compile:prepend:class-target() { diff --git a/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch new file mode 100644 index 0000000000..bbfed0fd82 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch @@ -0,0 +1,37 @@ +From 25f54c3359a0fa34890030662e9b02e0a9745f4f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Apr 2022 20:57:38 -0700 +Subject: [PATCH] utils: Use name of the first prerequisite in rule + +Use $< instead of $^ because the latter will specify both pre-requisite +inputattach.c serio-ids.h files on same compiler cmdline and clang does +not like that and errors out like below + +clang-14: error: cannot specify -o when generating multiple output files + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + utils/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/utils/Makefile b/utils/Makefile +index 1fc51ab..a7434a9 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -46,10 +46,10 @@ endif + evdev-joystick: evdev-joystick.c + + inputattach: inputattach.c serio-ids.h +- $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $^ $(LDFLAGS) $(SYSTEMDFLAGS) -lm -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $< $(LDFLAGS) $(SYSTEMDFLAGS) -lm -o $@ + + ffcfstress: ffcfstress.c bitmaskros.h +- $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $^ $(LDFLAGS) -lm -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $< $(LDFLAGS) -lm -o $@ + + ffmvforce.o: ffmvforce.c + $(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@ `$(PKG_CONFIG) --cflags sdl2` +-- +2.35.2 + diff --git a/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb index b706f634ed..5716817e95 100644 --- a/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb @@ -12,13 +12,14 @@ DEPENDS = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/linuxconsole/linuxconsoletools-${PV}.tar.bz2 \ + file://0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch \ file://51-these-are-not-joysticks-rm.rules \ file://60-joystick.rules \ file://inputattachctl \ file://inputattach.service \ " -SRC_URI[sha256sum] = "95d112f06393806116341d593bda002c8bc44119c1538407623268fed90d8c34" +SRC_URI[sha256sum] = "bd4d4b7e37da02fc67e47ddf20b6f1243c0a7af7b02b918d5e72138ea8727547" S = "${WORKDIR}/linuxconsoletools-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.5.3.bb b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.6.bb index b2fb7718e2..8cb88157db 100644 --- a/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.5.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.6.bb @@ -8,12 +8,11 @@ the package on many systems.\ SECTION = "devel" HOMEPAGE = "http://www.logwatch.org/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ad199c8aca74e70f296f731ad9a1521c" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ba882fa9b4b6b217a51780be3f4db9c8" RDEPENDS:${PN} = "perl" SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BP}/${BP}.tar.gz" -SRC_URI[md5sum] = "8bcf3edc5a4687c8aad1b9c01e2be54b" -SRC_URI[sha256sum] = "1b2b96879dec01cd02754fe00f8989b11ff16158c3dc7c4aff0faa4b1d34974b" +SRC_URI[sha256sum] = "689f3c68b99ef7af7d3c7007c3ff0a55d5674bdbf9c01f69a9f187726d6d4baf" do_install() { install -m 0755 -d ${D}${sysconfdir}/logwatch/scripts diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb index dd02ed94cb..9b990ecdf3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb @@ -16,13 +16,15 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ file://0001-rewrite-cargo-host-linker-in-python3.patch \ " -SRC_URI[sha256sum] = "e722829db490f9332712a81c35996541737bbfb05232d47190fee779c4fcb327" +SRC_URI[sha256sum] = "d483a853cbf5c7f93621093432e3dc0b7ed847f2a5318b964828d19f9f087f3a" S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" inherit pkgconfig perlnative python3native rust -DEPENDS += "zlib cargo-native python3" +DEPENDS += "zlib cargo-native python3 icu" +DEPENDS:remove:mipsarch = "icu" +DEPENDS:remove:powerpc:toolchain-clang = "icu" B = "${WORKDIR}/build" @@ -39,8 +41,10 @@ export AS = "${CC}" export RUSTFLAGS JIT ?= "" - JIT:mipsarch = "--disable-jit" +ICU ?= "--with-system-icu" +ICU:mipsarch = "" +ICU:powerpc:toolchain-clang = "" do_configure() { cd ${B} @@ -51,8 +55,9 @@ do_configure() { --prefix=${prefix} \ --libdir=${libdir} \ --disable-jemalloc \ - ${JIT} - + --disable-strip \ + ${JIT} \ + ${ICU} } do_install() { diff --git a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.7.1.bb index af0a3c2bd2..7fc5d4218f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb +++ b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.7.1.bb @@ -15,7 +15,7 @@ DEPENDS = "curl libxml2 openssl libpam" inherit features_check REQUIRED_DISTRO_FEATURES = "pam" -SRCREV = "d8eba6cb6682b59d84ca1da67a523520b879ade6" +SRCREV = "6cdf3bee50388d8e5f70850322a4df57fd685a5e" SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=master;protocol=https \ file://libssl-is-required-if-eventint-supported.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.6.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2022.2.bb index cf149aef9d..24a7513188 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2022.2.bb @@ -21,7 +21,7 @@ SRC_URI = " \ gitsm://github.com/ostreedev/ostree;branch=main;protocol=https \ file://run-ptest \ " -SRCREV = "f1155c8d283c3c85d74d5e1050b0dcf8198f750a" +SRCREV = "fbc6d21c2f71099fbab44cbdd74222b91f61c667" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" 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 deleted file mode 100644 index 0a93411533..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb/0001-include-stdexcept-for-std-invalid_argument.patch +++ /dev/null @@ -1,25 +0,0 @@ -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.1.bb index 6985590068..d5137f80af 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.1.bb @@ -10,10 +10,8 @@ DEPENDS = "libpam openldap" inherit features_check REQUIRED_DISTRO_FEATURES = "pam" -SRCREV = "84d7b260f1ae6857ae36e014c9a5968e8aa1cbe8" -SRC_URI = "git://github.com/rmbreak/pam_ldapdb;branch=master;protocol=https \ - file://0001-include-stdexcept-for-std-invalid_argument.patch \ -" +SRCREV = "3e026863cad1fd45c760ee1bc93ef4f0606cc852" +SRC_URI = "git://github.com/rmbreak/pam_ldapdb;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb index f7cf4a03ff..7065529326 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb @@ -2,7 +2,7 @@ SUMMARY = "pam-ssh-agent-auth" DESCRIPTION = "A PAM module which permits authentication via ssh-agent." HOMEPAGE = "http://sourceforge.net/projects/pamsshagentauth/" SECTION = "libs" -LICENSE = "OpenSSL & BSD" +LICENSE = "OpenSSL & BSD-2-Clause & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.OpenSSL;md5=8ab01146141ded59b75f8ba7811ed05a \ file://OPENSSH_LICENSE;md5=7ae09218173be1643c998a4b71027f9b \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.1.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.5.bb index f0ae229414..b4e0d17b37 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.5.bb @@ -3,8 +3,8 @@ HOMEPAGE="https://github.com/taocpp/PEGTL" LICENSE="MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5b6701671289d12b7ffa69138832c006" -SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=main" -SRCREV = "6d03c8decc22b4ddd51115e2170e0e82413c7104" +SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=3.x" +SRCREV = "eeba7fa1180655bd683be620cc31be35607442ca" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0-rc1.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0-rc3.bb index 1a95771548..e977d67f6b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0-rc1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0-rc3.bb @@ -19,7 +19,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ " -SRC_URI[sha256sum] = "9bd57d3c9ebba9dbbd6cd14b0c263ce151b0044fb6620b556449c2d82e06ef3d" +SRC_URI[sha256sum] = "66b2ecc2e4b53c62940589434ea8af3a85546df131001680ed294028cd84ecdc" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.23.bb b/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb index 4dbb99b3d5..bc514b577a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.23.bb +++ b/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=87266591c81260f10221f1f38872d023" SRC_URI = "https://ftp.sdaoden.eu/${BP}.tar.xz \ file://make-errors.patch" -SRC_URI[sha256sum] = "2c717b22f4cd8719b82b6618640da6031382d2bf8eb51283bca2c6266957bca8" +SRC_URI[sha256sum] = "2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c" DEPENDS = "coreutils-native" diff --git a/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb b/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb index 66620ea5ff..d3f2bd678d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "e7b997e75decb06a650c42c35cd63d0c94c34e39cf133c723337b0eeab inherit autotools update-rc.d # mdadm Makefile has CC set to gcc, hence override CC to ${CC} -EXTRA_OEMAKE += "CC='${CC}'" +EXTRA_OEMAKE += "CC='${CC}' sbindir=${base_sbindir}" do_configure:append() { |