summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-extended
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2022-05-09 23:27:38 +0300
committerPatrick Williams <patrick@stwcx.xyz>2022-05-09 23:28:22 +0300
commit322e9fc9c6aafb1be6757915ca920b5170642aa7 (patch)
tree860b5f806d45e9fbdece0eee9efabd5b000b64b9 /meta-openembedded/meta-oe/recipes-extended
parente22d42c0b6ed325dcf25896e58673f23556171dd (diff)
downloadopenbmc-322e9fc9c6aafb1be6757915ca920b5170642aa7.tar.xz
subtree updates
poky: 27de52e402..d84c73d1ef: Alexander Kanavin (2): glib: upgrade 2.72.0 -> 2.72.1 libxml2: update patch status Carlos Rafael Giani (2): gstreamer1.0-plugins-good: Fix libsoup dependency gstreamer1.0: Minor documentation addition Chen Qi (2): cases/buildepoxy.py: fix typo go.bbclass: disable the use of the default configuration file Davide Gardenal (1): create-spdx: delete virtual/kernel dependency to fix FreeRTOS build Dmitry Baryshkov (2): linux-firmware: correct license for ar3k firmware arch-armv8-2a.inc: fix a typo in TUNEVALID variable Henning Schild (1): wic: do not use PARTLABEL for msdos partition tables Khem Raj (7): seatd: Disable overflow warning as error on ppc64/musl musl: Fix build when usrmerge distro feature is enabled gcompat: Fix build when usrmerge distro feature is enabled libc-glibc: Use libxcrypt to provide virtual/crypt qemu.bbclass: Extend ppc/ppc64 extra options busybox: Use base_bindir instead of hardcoding /bin path util-linux: Create u-a symlink for findfs utility Naveen Saini (1): gstreamer1.0-plugins-bad: drop patch Nicolas Dechesne (1): sanity: skip make 4.2.1 warning for debian Paul Gortmaker (1): install/devshell: Introduce git intercept script due to fakeroot issues Peter Kjellerstedt (2): terminal.py: Restore error output from Terminal devshell.bbclass: Allow devshell & pydevshell to use the network Pgowda (1): glibc: ptest: Fix glibc-tests package issue Rahul Kumar (1): neard: Switch SRC_URI to git repo Richard Purdie (2): base: Drop git intercept staging: Ensure we filter out ourselves Ross Burton (5): e2fsprogs: fix CVE-2022-1304 python3: ignore CVE-2015-20107 cve_check: skip remote patches that haven't been fetched when searching for CVE tags subversion: upgrade to 1.14.2 bitbake.conf: mark all directories as safe for git to read Russ Dill (2): package.bbclass: Prevent perform_packagecopy from removing /sysroot-only kernel-yocto.bbclass: Fixup do_kernel_configcheck usage of KMETA wangmy (1): apt: upgrade 2.4.4 -> 2.4.5 meta-openembedded: bb2b5b31a8..5357c7a40e: Carlos Rafael Giani (1): pipewire: Upgrade to version 0.3.50 Khem Raj (23): crash: Fix build for mips target tcsh: Do not install symlinks into /bin with usrmerge arno-iptables-firewall: Do not use bitbake variable inside S fluentbit: Fix build with usrmerge distro feature tomoyo-tools: Define SBINDIR tomoyo-tools: Drop md5sum dietsplash: specify install rootdir linux-atm: Add knob to root prefix ufw: Fix build with usrmerge distro feature klibc: Recognise --dyld-prefix clang option mozjs: Use vendored icu on ppc/clang boinc-client: Do not overwrite same file when using usrmerge pam-ssh-agent-auth: Use specific versions of BSD licenses fwupd: Enable build with musl lirc: install systemd units only when using systemd distro feature fluentbit: Disable systemd support when systemd distro feature is disabled gtksourceview5: Allow wayland or x11 gtkmm3: Allow wayland or x11 in distro features gparted: Allow wayland or x11 distro features lirc: Delete systemd unit files on non systemd distros atkmm: Allow build with wayland pangomm: Allow building with wayland boinc-client: Make script install not depend on host install paths Mingli Yu (2): crash: Upgrade to 8.0.0 makedumpfile: Upgrade to 1.7.1 Robert Yang (1): libldb: Fix installed-vs-shipped and rebuild error Willy Tu (1): absil-cpp: Update SRC_URI to to the latest google internal sync wangmy (11): evince: upgrade 42.1 -> 42.2 gspell: upgrade 1.9.1 -> 1.10.0 gtksourceview5: upgrade 5.4.0 -> 5.4.1 libadwaita: upgrade 1.1.0 -> 1.1.1 nautilus: upgrade 42.0 -> 42.1.1 htpdate: upgrade 1.3.3 -> 1.3.4 hexedit: upgrade 1.5 -> 1.6 lsscsi: upgrade 0.31 -> 0.32 libencode-perl: upgrade 3.16 -> 3.17 libextutils-cppguess-perl: upgrade 0.23 -> 0.26 libtest-harness-perl: upgrade 3.42 -> 3.44 Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I5475712642467a1ecb4d9cf2c93510a40eb7bf24
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/0001-scripts-Do-not-check-for-files-on-build-host.patch52
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb17
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch28
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch4
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb4
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb (renamed from meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb)2
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb2
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb2
8 files changed, 97 insertions, 14 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/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/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/mozjs/mozjs-91_91.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb
index af9256860c..9b990ecdf3 100644
--- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb
@@ -24,6 +24,7 @@ inherit pkgconfig perlnative python3native rust
DEPENDS += "zlib cargo-native python3 icu"
DEPENDS:remove:mipsarch = "icu"
+DEPENDS:remove:powerpc:toolchain-clang = "icu"
B = "${WORKDIR}/build"
@@ -43,6 +44,7 @@ JIT ?= ""
JIT:mipsarch = "--disable-jit"
ICU ?= "--with-system-icu"
ICU:mipsarch = ""
+ICU:powerpc:toolchain-clang = ""
do_configure() {
cd ${B}
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 \
"