diff options
Diffstat (limited to 'meta-openembedded/meta-oe')
605 files changed, 8334 insertions, 3780 deletions
diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb index c85293aa5c..52dab107b5 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb @@ -5,7 +5,7 @@ SECTION = "x11/wm" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" DEPENDS = " \ - gnome-menus3 \ + gnome-menus \ glib-2.0 \ " PV = "0.3" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.3.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.3.bb index 004c04e007..df577b1b73 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.3.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.3.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit setuptools3 -SRC_URI = "git://github.com/sivel/speedtest-cli.git" +SRC_URI = "git://github.com/sivel/speedtest-cli.git;branch=master;protocol=https" SRCREV = "42e96b13dda2afabbcec2622612d13495a415caa" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb index 065243ccfe..f55247d9ed 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb @@ -21,7 +21,7 @@ SRCREV_inih = "4b10c654051a86556dfdb634c891b6c3224c4109" SRCREV_FORMAT = "rwmem_inih" SRC_URI = " \ - git://github.com/tomba/rwmem.git;protocol=https;name=rwmem \ + git://github.com/tomba/rwmem.git;protocol=https;name=rwmem;branch=master \ git://github.com/benhoyt/inih.git;protocol=https;name=inih;nobranch=1;destsuffix=git/ext/inih \ " diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb index 1ca7b6084c..f3070c5d2a 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb @@ -29,7 +29,7 @@ SYSTEMD_SERVICE:${PN}-exec = "irexec.service" SYSTEMD_AUTO_ENABLE:lirc = "enable" SYSTEMD_AUTO_ENABLE:lirc-exec = "enable" -inherit autotools pkgconfig systemd python3native distutils-common-base +inherit autotools pkgconfig systemd python3native setuptools3-base PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd" PACKAGECONFIG[x11] = "--with-x,--with-x=no,libx11," diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index eff014a4cb..1215344d97 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -14,7 +14,7 @@ inherit scons dos2unix siteinfo python3native systemd useradd PV = "4.4.7" #v4.4.7 SRCREV = "abb6b9c2bf675e9e2aeaecba05f0f8359d99e203" -SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4 \ +SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ file://0001-Use-long-long-instead-of-int64_t.patch \ file://0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch \ @@ -43,7 +43,6 @@ SRC_URI:append:toolchain-clang = "\ file://0001-asio-Dont-use-experimental-with-clang.patch \ " - S = "${WORKDIR}/git" COMPATIBLE_HOST ?= '(x86_64|i.86|powerpc64|arm|aarch64).*-linux' @@ -83,46 +82,50 @@ EXTRA_OESCONS = "PREFIX=${prefix} \ --separate-debug \ ${PACKAGECONFIG_CONFARGS}" - USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --no-create-home --home-dir /var/run/${BPN} --shell /bin/false --user-group ${BPN}" - scons_do_compile() { - ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} ${EXTRA_OESCONS} install-core || \ + ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} ${EXTRA_OESCONS} install-core || die "scons build execution failed." } scons_do_install() { - # install binaries - install -d ${D}${bindir} - for i in mongod mongos mongo - do - if [ -f ${B}/build/opt/mongo/${i} ] - then - install -m 0755 ${B}/build/opt/mongo/${i} ${D}${bindir}/${i} - else - bbnote "${i} does not exist" - fi - done - - # install config - install -d ${D}${sysconfdir} - install -m 0644 ${S}/debian/mongod.conf ${D}${sysconfdir}/ - - # install systemd service - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${S}/debian/mongod.service ${D}${systemd_system_unitdir} - - # install mongo data folder - install -m 755 -d ${D}${localstatedir}/lib/${BPN} - chown ${PN}:${PN} ${D}${localstatedir}/lib/${BPN} - - # Log files - install -m 755 -d ${D}${localstatedir}/log/${BPN} - chown ${PN}:${PN} ${D}${localstatedir}/log/${BPN} + # install binaries + install -d ${D}${bindir} + for i in mongod mongos mongo; do + if [ -f ${B}/build/opt/mongo/$i ]; then + install -m 0755 ${B}/build/opt/mongo/$i ${D}${bindir} + else + bbnote "$i does not exist" + fi + done + + # install config + install -d ${D}${sysconfdir} + install -m 0644 ${S}/debian/mongod.conf ${D}${sysconfdir} + + # install systemd service + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${S}/debian/mongod.service ${D}${systemd_system_unitdir} + + # install mongo data folder + install -m 755 -d ${D}${localstatedir}/lib/${BPN} + chown ${PN}:${PN} ${D}${localstatedir}/lib/${BPN} + + # Create /var/log/mongodb in runtime. + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then + install -d ${D}${nonarch_libdir}/tmpfiles.d + echo "d ${localstatedir}/log/${BPN} 0755 ${BPN} ${BPN} -" > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf + fi + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ]; then + install -d ${D}${sysconfdir}/default/volatiles + echo "d ${BPN} ${BPN} 0755 ${localstatedir}/log/${BPN} none" > ${D}${sysconfdir}/default/volatiles/99_${BPN} + fi } CONFFILES:${PN} = "${sysconfdir}/mongod.conf" SYSTEMD_SERVICE:${PN} = "mongod.service" + +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.5.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.5.bb index 6ccefd22e5..4b1853cc80 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.5.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.5.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f" DEPENDS = "protobuf-native" -SRC_URI = "git://github.com/nanopb/nanopb.git" +SRC_URI = "git://github.com/nanopb/nanopb.git;branch=master;protocol=https" SRCREV = "c9124132a604047d0ef97a09c0e99cd9bed2c818" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb index 4442793097..5257ee3477 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ PV = "0.5.9+git${SRCPV}" SRCREV = "3a3d622d9bb74c44fa67bc20573751a207514134" -SRC_URI = "git://github.com/lcdproc/lcdproc \ +SRC_URI = "git://github.com/lcdproc/lcdproc;branch=master;protocol=https \ 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 \ diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0001-rust.configure-Skip-all-target-manipulations.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0001-rust.configure-Skip-all-target-manipulations.patch new file mode 100644 index 0000000000..453174e514 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0001-rust.configure-Skip-all-target-manipulations.patch @@ -0,0 +1,66 @@ +From b75661fbddd00ba9a43680c35b8c08aad8807d6b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 31 Oct 2021 16:49:55 +0100 +Subject: [PATCH] rust.configure: Skip all target manipulations +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Mozjs/rust targets are different from OE-rust targets. Use targets reported +as is. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + build/moz.configure/rust.configure | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +index e5122d6..9f3cc91 100644 +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -81,9 +81,6 @@ def unwrap_rustup(prog, name): + + return unwrap + +-rustc = unwrap_rustup(rustc, 'rustc') +-cargo = unwrap_rustup(cargo, 'cargo') +- + + set_config('CARGO', cargo) + set_config('RUSTC', rustc) +@@ -239,6 +236,7 @@ def rust_triple_alias(host_or_target, host_or_target_c_compiler): + @imports(_from='textwrap', _import='dedent') + def rust_target(rustc, host_or_target, compiler_info, + rust_supported_targets, arm_target): ++ return host_or_target.alias + # Rust's --target options are similar to, but not exactly the same + # as, the autoconf-derived targets we use. An example would be that + # Rust uses distinct target triples for targetting the GNU C++ ABI +@@ -401,22 +399,10 @@ def rust_triple_alias(host_or_target, host_or_target_c_compiler): + + return rust_target + +- + rust_target_triple = rust_triple_alias(target, c_compiler) + rust_host_triple = rust_triple_alias(host, host_c_compiler) + + +-@depends(host, rust_host_triple, rustc_info.host) +-def validate_rust_host_triple(host, rust_host, rustc_host): +- if rust_host != rustc_host: +- if host.alias == rust_host: +- configure_host = host.alias +- else: +- configure_host = '{}/{}'.format(host.alias, rust_host) +- die("The rust compiler host ({}) is not suitable for the configure host ({})." +- .format(rustc_host, configure_host)) +- +- + set_config('RUST_TARGET', rust_target_triple) + set_config('RUST_HOST_TARGET', rust_host_triple) + +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0002-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0002-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch new file mode 100644 index 0000000000..21ad82ede1 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0002-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch @@ -0,0 +1,33 @@ +From e5b95b3918588e2930c9af7ba304c57e871b2d55 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Thu, 7 Oct 2021 12:44:18 +0200 +Subject: [PATCH] build: do not use autoconf's config.sub to 'canonicalize' + names + +The outcome is that processed names no longer match our custom rust +target definitions, and the build fails. + +Upstream-Status: Inappropriate [oespecific] + +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + build/moz.configure/init.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index b887153..0a6a33c 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -808,7 +808,7 @@ def help_host_target(help, host, target): + def config_sub(shell, triplet): + config_sub = os.path.join(os.path.dirname(__file__), '..', + 'autoconf', 'config.sub') +- return check_cmd_output(shell, config_sub, triplet).strip() ++ return triplet + + + @depends('--host', shell) +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0003-Do-not-check-binaries-after-build.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0003-Do-not-check-binaries-after-build.patch new file mode 100644 index 0000000000..a0f37f597b --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0003-Do-not-check-binaries-after-build.patch @@ -0,0 +1,55 @@ +From 1a47eac590f57c765033c7797b0759dc314f2128 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 1 Nov 2021 22:52:57 +0100 +Subject: [PATCH] Do not check binaries after build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* It buys us a dependency hard to fulfill in different layer setups +* Mozjs-91 does not perform these checks when setting --enable-project=js. Here + for old configuration style --enable-project changes nothing and build wants + to check binaries created. + +So omit checks by not searching for llvm_objdump and making check_binary.py a +stub to prevent errors by using unset LLVM_OBJDUMP. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + moz.configure | 7 ------- + python/mozbuild/mozbuild/action/check_binary.py | 2 +- + 2 files changed, 1 insertion(+), 8 deletions(-) + +diff --git a/moz.configure b/moz.configure +index 9b0e784..41e3e4d 100755 +--- a/moz.configure ++++ b/moz.configure +@@ -648,13 +648,6 @@ def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths): + return (llvm_objdump,) + + +-llvm_objdump = check_prog('LLVM_OBJDUMP', llvm_objdump, what='llvm-objdump', +- when='--enable-compile-environment', +- paths=toolchain_search_path) +- +-add_old_configure_assignment('LLVM_OBJDUMP', llvm_objdump) +- +- + js_option('--enable-dtrace', help='Build with dtrace support') + + dtrace = check_header('sys/sdt.h', when='--enable-dtrace', +diff --git a/python/mozbuild/mozbuild/action/check_binary.py b/python/mozbuild/mozbuild/action/check_binary.py +index 57ccfa6..bd2c167 100644 +--- a/python/mozbuild/mozbuild/action/check_binary.py ++++ b/python/mozbuild/mozbuild/action/check_binary.py +@@ -366,4 +366,4 @@ def main(args): + + + if __name__ == '__main__': +- sys.exit(main(sys.argv[1:])) ++ sys.exit(0) +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0004-Cargo.toml-do-not-abort-on-panic.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0004-Cargo.toml-do-not-abort-on-panic.patch new file mode 100644 index 0000000000..665eace665 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0004-Cargo.toml-do-not-abort-on-panic.patch @@ -0,0 +1,33 @@ +From 9e37248870b2b955293754933c789ca00bca06ef Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Fri, 1 Oct 2021 13:00:24 +0200 +Subject: [PATCH] Cargo.toml: do not abort on panic + +OE's rust is configured to unwind, and this setting clashes with it/ + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + Cargo.toml | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 897daad41b..505454263e 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -56,13 +56,11 @@ opt-level = 1 + rpath = false + lto = false + debug-assertions = true +-panic = "abort" + + [profile.release] + opt-level = 2 + rpath = false + debug-assertions = false +-panic = "abort" + + [patch.crates-io] + libudev-sys = { path = "dom/webauthn/libudev-sys" } diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0005-Fixup-compatibility-of-mozbuild-with-Python-3.10.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0005-Fixup-compatibility-of-mozbuild-with-Python-3.10.patch new file mode 100644 index 0000000000..d069d00afa --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0005-Fixup-compatibility-of-mozbuild-with-Python-3.10.patch @@ -0,0 +1,304 @@ +From a88d0c8e27b48344942187c2611bb121bde9332d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> +Date: Tue, 13 Jul 2021 11:46:20 +0200 +Subject: [PATCH] Fixup compatibility of mozbuild with Python 3.10 + +Stolen from [1] + +[1] https://src.fedoraproject.org/rpms/mozjs78/raw/rawhide/f/Fixup-compatibility-of-mozbuild-with-Python-3.10.patch + +Upstream-Status: Pending + +--- + python/mach/mach/config.py | 4 ++-- + python/mach/mach/decorators.py | 2 +- + python/mozbuild/mozbuild/backend/configenvironment.py | 3 ++- + python/mozbuild/mozbuild/makeutil.py | 2 +- + python/mozbuild/mozbuild/util.py | 2 +- + testing/marionette/client/marionette_driver/wait.py | 2 +- + testing/mozbase/manifestparser/manifestparser/filters.py | 3 ++- + testing/mozbase/versioninfo.py | 2 +- + testing/web-platform/tests/tools/manifest/vcs.py | 2 +- + .../web-platform/tests/tools/third_party/h2/h2/settings.py | 2 +- + .../tests/tools/third_party/html5lib/html5lib/_trie/_base.py | 2 +- + .../tools/third_party/html5lib/html5lib/treebuilders/dom.py | 2 +- + .../tests/tools/third_party/hyper/hyper/common/headers.py | 2 +- + .../tests/tools/third_party/hyper/hyper/h2/settings.py | 2 +- + .../tests/tools/third_party/hyper/hyper/http11/connection.py | 4 ++-- + .../third_party/hyper/hyper/packages/hyperframe/flags.py | 2 +- + .../tests/tools/third_party/hyperframe/hyperframe/flags.py | 2 +- + testing/web-platform/tests/tools/wptserve/wptserve/config.py | 3 ++- + testing/web-platform/tests/webdriver/tests/support/sync.py | 2 +- + 19 files changed, 24 insertions(+), 21 deletions(-) + +diff --git a/python/mach/mach/config.py b/python/mach/mach/config.py +index 7210eca82..edb4d2e93 100644 +--- a/python/mach/mach/config.py ++++ b/python/mach/mach/config.py +@@ -144,7 +144,7 @@ def reraise_attribute_error(func): + return _ + + +-class ConfigSettings(collections.Mapping): ++class ConfigSettings(collections.abc.Mapping): + """Interface for configuration settings. + + This is the main interface to the configuration. +@@ -190,7 +190,7 @@ class ConfigSettings(collections.Mapping): + will result in exceptions being raised. + """ + +- class ConfigSection(collections.MutableMapping, object): ++ class ConfigSection(collections.abc.MutableMapping, object): + """Represents an individual config section.""" + def __init__(self, config, name, settings): + object.__setattr__(self, '_config', config) +diff --git a/python/mach/mach/decorators.py b/python/mach/mach/decorators.py +index 27f7f34a6..5f63271a3 100644 +--- a/python/mach/mach/decorators.py ++++ b/python/mach/mach/decorators.py +@@ -140,7 +140,7 @@ def CommandProvider(cls): + 'Conditions argument must take a list ' + \ + 'of functions. Found %s instead.' + +- if not isinstance(command.conditions, collections.Iterable): ++ if not isinstance(command.conditions, collections.abc.Iterable): + msg = msg % (command.name, type(command.conditions)) + raise MachError(msg) + +diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py +index 20d1a9fa6..8747958bd 100644 +--- a/python/mozbuild/mozbuild/backend/configenvironment.py ++++ b/python/mozbuild/mozbuild/backend/configenvironment.py +@@ -9,7 +9,8 @@ import six + import sys + import json + +-from collections import Iterable, OrderedDict ++from collections import OrderedDict ++from collections.abc import Iterable + from types import ModuleType + + import mozpack.path as mozpath +diff --git a/python/mozbuild/mozbuild/makeutil.py b/python/mozbuild/mozbuild/makeutil.py +index 4da1a3b26..4ce56848c 100644 +--- a/python/mozbuild/mozbuild/makeutil.py ++++ b/python/mozbuild/mozbuild/makeutil.py +@@ -7,7 +7,7 @@ from __future__ import absolute_import, print_function, unicode_literals + import os + import re + import six +-from collections import Iterable ++from collections.abc import Iterable + + + class Makefile(object): +diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py +index 044cf645c..98ed3ef52 100644 +--- a/python/mozbuild/mozbuild/util.py ++++ b/python/mozbuild/mozbuild/util.py +@@ -782,7 +782,7 @@ class HierarchicalStringList(object): + self._strings = StrictOrderingOnAppendList() + self._children = {} + +- class StringListAdaptor(collections.Sequence): ++ class StringListAdaptor(collections.abc.Sequence): + def __init__(self, hsl): + self._hsl = hsl + +diff --git a/testing/marionette/client/marionette_driver/wait.py b/testing/marionette/client/marionette_driver/wait.py +index eeaa1e23d..c147f463f 100644 +--- a/testing/marionette/client/marionette_driver/wait.py ++++ b/testing/marionette/client/marionette_driver/wait.py +@@ -82,7 +82,7 @@ class Wait(object): + + exceptions = [] + if ignored_exceptions is not None: +- if isinstance(ignored_exceptions, collections.Iterable): ++ if isinstance(ignored_exceptions, collections.abc.Iterable): + exceptions.extend(iter(ignored_exceptions)) + else: + exceptions.append(ignored_exceptions) +diff --git a/testing/mozbase/manifestparser/manifestparser/filters.py b/testing/mozbase/manifestparser/manifestparser/filters.py +index 287ee033b..b1d608003 100644 +--- a/testing/mozbase/manifestparser/manifestparser/filters.py ++++ b/testing/mozbase/manifestparser/manifestparser/filters.py +@@ -12,7 +12,8 @@ from __future__ import absolute_import + + import itertools + import os +-from collections import defaultdict, MutableSequence ++from collections import defaultdict ++from collections.abc import MutableSequence + + import six + from six import string_types +diff --git a/testing/mozbase/versioninfo.py b/testing/mozbase/versioninfo.py +index 91d1a0473..8c1680069 100755 +--- a/testing/mozbase/versioninfo.py ++++ b/testing/mozbase/versioninfo.py +@@ -11,7 +11,7 @@ from commit messages. + + from __future__ import absolute_import, print_function + +-from collections import Iterable ++from collections.abc import Iterable + from distutils.version import StrictVersion + import argparse + import os +diff --git a/testing/web-platform/tests/tools/manifest/vcs.py b/testing/web-platform/tests/tools/manifest/vcs.py +index 7c0feeb81..05ee19c7c 100644 +--- a/testing/web-platform/tests/tools/manifest/vcs.py ++++ b/testing/web-platform/tests/tools/manifest/vcs.py +@@ -3,7 +3,7 @@ import json + import os + import stat + from collections import deque +-from collections import MutableMapping ++from collections.abc import MutableMapping + + from six import with_metaclass, PY2 + +diff --git a/testing/web-platform/tests/tools/third_party/h2/h2/settings.py b/testing/web-platform/tests/tools/third_party/h2/h2/settings.py +index 3da720329..e097630e9 100644 +--- a/testing/web-platform/tests/tools/third_party/h2/h2/settings.py ++++ b/testing/web-platform/tests/tools/third_party/h2/h2/settings.py +@@ -88,7 +88,7 @@ class ChangedSetting: + ) + + +-class Settings(collections.MutableMapping): ++class Settings(collections.abc.MutableMapping): + """ + An object that encapsulates HTTP/2 settings state. + +diff --git a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py +index a1158bbbf..a9295a2ba 100644 +--- a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py ++++ b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py +@@ -1,6 +1,6 @@ + from __future__ import absolute_import, division, unicode_literals + +-from collections import Mapping ++from collections.abc import Mapping + + + class Trie(Mapping): +diff --git a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py +index dcfac220b..818a33433 100644 +--- a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py ++++ b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py +@@ -1,7 +1,7 @@ + from __future__ import absolute_import, division, unicode_literals + + +-from collections import MutableMapping ++from collections.abc import MutableMapping + from xml.dom import minidom, Node + import weakref + +diff --git a/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py +index 655a591ac..6454f550a 100644 +--- a/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py ++++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py +@@ -10,7 +10,7 @@ import collections + from hyper.common.util import to_bytestring, to_bytestring_tuple + + +-class HTTPHeaderMap(collections.MutableMapping): ++class HTTPHeaderMap(collections.abc.MutableMapping): + """ + A structure that contains HTTP headers. + +diff --git a/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py +index fedc5e3c4..040afea92 100755 +--- a/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py ++++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py +@@ -151,7 +151,7 @@ class ChangedSetting: + ) + + +-class Settings(collections.MutableMapping): ++class Settings(collections.abc.MutableMapping): + """ + An object that encapsulates HTTP/2 settings state. + +diff --git a/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py +index 61361c358..a214311d2 100644 +--- a/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py ++++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py +@@ -10,7 +10,7 @@ import os + import socket + import base64 + +-from collections import Iterable, Mapping ++from collections.abc import Iterable, Mapping + + import collections + from hyperframe.frame import SettingsFrame +@@ -295,7 +295,7 @@ class HTTP11Connection(object): + return + + # Iterables that set a specific content length. +- elif isinstance(body, collections.Iterable): ++ elif isinstance(body, collections.abc.Iterable): + for item in body: + try: + self._sock.send(item) +diff --git a/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py +index e8f630056..8f2ea689b 100644 +--- a/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py ++++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py +@@ -11,7 +11,7 @@ import collections + Flag = collections.namedtuple("Flag", ["name", "bit"]) + + +-class Flags(collections.MutableSet): ++class Flags(collections.abc.MutableSet): + """ + A simple MutableSet implementation that will only accept known flags as elements. + +diff --git a/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py b/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py +index 05b35017e..14c352e10 100644 +--- a/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py ++++ b/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py +@@ -11,7 +11,7 @@ import collections + Flag = collections.namedtuple("Flag", ["name", "bit"]) + + +-class Flags(collections.MutableSet): ++class Flags(collections.abc.MutableSet): + """ + A simple MutableSet implementation that will only accept known flags as + elements. +diff --git a/testing/web-platform/tests/tools/wptserve/wptserve/config.py b/testing/web-platform/tests/tools/wptserve/wptserve/config.py +index 7766565fe..3c1c36d6f 100644 +--- a/testing/web-platform/tests/tools/wptserve/wptserve/config.py ++++ b/testing/web-platform/tests/tools/wptserve/wptserve/config.py +@@ -2,7 +2,8 @@ import copy + import logging + import os + +-from collections import defaultdict, Mapping ++from collections import defaultdict ++from collections.abc import Mapping + from six import integer_types, iteritems, itervalues, string_types + + from . import sslutils +diff --git a/testing/web-platform/tests/webdriver/tests/support/sync.py b/testing/web-platform/tests/webdriver/tests/support/sync.py +index 3fc77131c..8e8f6b819 100644 +--- a/testing/web-platform/tests/webdriver/tests/support/sync.py ++++ b/testing/web-platform/tests/webdriver/tests/support/sync.py +@@ -81,7 +81,7 @@ class Poll(object): + + exceptions = [] + if ignored_exceptions is not None: +- if isinstance(ignored_exceptions, collections.Iterable): ++ if isinstance(ignored_exceptions, collections.abc.Iterable): + exceptions.extend(iter(ignored_exceptions)) + else: + exceptions.append(ignored_exceptions) +-- +2.31.1 + + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0004-use-asm-sgidefs.h.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0006-use-asm-sgidefs.h.patch index b56f0b95b5..b56f0b95b5 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0004-use-asm-sgidefs.h.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0006-use-asm-sgidefs.h.patch diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/fix-musl-build.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0007-fix-musl-build.patch index c0834af589..c0834af589 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/fix-musl-build.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0007-fix-musl-build.patch diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch new file mode 100644 index 0000000000..70177d003d --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch @@ -0,0 +1,52 @@ +Add RISCV32/64 support + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + build/moz.configure/init.configure | 6 ++++++ + python/mozbuild/mozbuild/configure/constants.py | 2 ++ + 2 files changed, 8 insertions(+) + +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 0a6a33c..eeee87e 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -755,6 +755,12 @@ def split_triplet(triplet, allow_msvc=False): + elif cpu.startswith('aarch64'): + canonical_cpu = 'aarch64' + endianness = 'little' ++ elif cpu in ("riscv32", "riscv32gc"): ++ canonical_cpu = "riscv32" ++ endianness = "little" ++ elif cpu in ("riscv64", "riscv64gc"): ++ canonical_cpu = "riscv64" ++ endianness = "little" + elif cpu == 'sh4': + canonical_cpu = 'sh4' + endianness = 'little' +diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py +index 7542dcd..de25be2 100644 +--- a/python/mozbuild/mozbuild/configure/constants.py ++++ b/python/mozbuild/mozbuild/configure/constants.py +@@ -50,6 +50,8 @@ CPU_bitness = { + 'mips64': 64, + 'ppc': 32, + 'ppc64': 64, ++ 'riscv32': 32, ++ 'riscv64': 64, + 's390': 32, + 's390x': 64, + 'sh4': 32, +@@ -82,6 +84,8 @@ CPU_preprocessor_checks = OrderedDict(( + ('s390', '__s390__'), + ('ppc64', '__powerpc64__'), + ('ppc', '__powerpc__'), ++ ('riscv32', '__riscv && __SIZEOF_POINTER__ == 4'), ++ ('riscv64', '__riscv && __SIZEOF_POINTER__ == 8'), + ('Alpha', '__alpha__'), + ('hppa', '__hppa__'), + ('sparc64', '__sparc__ && __arch64__'), +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0009-riscv-Disable-atomic-operations.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0009-riscv-Disable-atomic-operations.patch new file mode 100644 index 0000000000..ba50e10c6e --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0009-riscv-Disable-atomic-operations.patch @@ -0,0 +1,52 @@ +From 64ad80e6d95871f17be4cd01da15581f41ac0b2b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 27 May 2019 21:10:34 -0700 +Subject: [PATCH] riscv: Disable atomic operations + +This was ported from what was used with mozjs-60 which was +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Inappropriate[old-version] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + js/src/jit/AtomicOperations.h | 3 ++- + js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h | 8 ++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/js/src/jit/AtomicOperations.h b/js/src/jit/AtomicOperations.h +index 0486cba..cf6b91c 100644 +--- a/js/src/jit/AtomicOperations.h ++++ b/js/src/jit/AtomicOperations.h +@@ -391,7 +391,8 @@ inline bool AtomicOperations::isLockfreeJS(int32_t size) { + #elif defined(__ppc__) || defined(__PPC__) || defined(__sparc__) || \ + defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ + defined(__PPC64LE__) || defined(__alpha__) || defined(__hppa__) || \ +- defined(__sh__) || defined(__s390__) || defined(__s390x__) ++ defined(__sh__) || defined(__s390__) || defined(__s390x__) || \ ++ defined(__riscv) + # include "jit/shared/AtomicOperations-feeling-lucky.h" + #else + # error "No AtomicOperations support provided for this platform" +diff --git a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h +index f002cd4..14bb5f9 100644 +--- a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h ++++ b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h +@@ -77,6 +77,14 @@ + # endif + #endif + ++#ifdef __riscv ++# ifdef __riscv_xlen == 64 ++# define HAS_64BIT_ATOMICS ++# define HAS_64BIT_LOCKFREE ++# endif ++#endif ++ ++ + // The default implementation tactic for gcc/clang is to use the newer __atomic + // intrinsics added for use in C++11 <atomic>. Where that isn't available, we + // use GCC's older __sync functions instead. +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0010-riscv-Set-march-correctly.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0010-riscv-Set-march-correctly.patch new file mode 100644 index 0000000000..befede172e --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0010-riscv-Set-march-correctly.patch @@ -0,0 +1,60 @@ +From c3c2d1c69859c5e567005f0c3fa07a0dbe31e4a3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Fri, 29 Oct 2021 21:18:26 +0200 +Subject: [PATCH] riscv: Set march correctly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Stolen from leftover patch in oe-core [1] + +[1] https://github.com/openembedded/openembedded-core/blob/c884878f6c833b18a3a95b193f5de68df5bcea48/meta/recipes-devtools/rust/files/rv64gc.patch + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + third_party/rust/cc/src/lib.rs | 14 ++++++++++---- + third_party/rust/cc/.cargo-checksum.json | 2 +- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/third_party/rust/cc/src/lib.rs b/third_party/rust/cc/src/lib.rs +index 621d31d..6f72e13 100644 +--- a/third_party/rust/cc/src/lib.rs ++++ b/third_party/rust/cc/src/lib.rs +@@ -1587,14 +1587,20 @@ impl Build { + let mut parts = target.split('-'); + if let Some(arch) = parts.next() { + let arch = &arch[5..]; +- cmd.args.push(("-march=rv".to_owned() + arch).into()); +- // ABI is always soft-float right now, update this when this is no longer the +- // case: +- if arch.starts_with("64") { ++ if target.contains("linux") && arch.starts_with("64") { ++ cmd.args.push(("-march=rv64gc").into()); ++ cmd.args.push("-mabi=lp64d".into()); ++ } else if target.contains("linux") && arch.starts_with("32") { ++ cmd.args.push(("-march=rv32gc").into()); ++ cmd.args.push("-mabi=ilp32d".into()); ++ } else if arch.starts_with("64") { ++ cmd.args.push(("-march=rv".to_owned() + arch).into()); + cmd.args.push("-mabi=lp64".into()); + } else { ++ cmd.args.push(("-march=rv".to_owned() + arch).into()); + cmd.args.push("-mabi=ilp32".into()); + } ++ cmd.args.push("-mcmodel=medany".into()); + } + } + } +diff --git a/third_party/rust/cc/.cargo-checksum.json b/third_party/rust/cc/.cargo-checksum.json +index 417fde7..70e5d02 100644 +--- a/third_party/rust/cc/.cargo-checksum.json ++++ b/third_party/rust/cc/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.lock":"3aff5f8b0a7f4d72852b11b0526f0002e6bf55f19f1ebd6470d7f97fbd540e60","Cargo.toml":"6ab10d9b6a9c6f0909074e6698c90c6b6a7223661ec2e83174d2593117cbe7f2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"7184fbdf375a057e673257348f6d7584c0dd11b66318d98f3647f69eb610b097","src/bin/gcc-shim.rs":"b77907875029494b6288841c3aed2e4939ed40708c7f597fca5c9e2570490ca6","src/com.rs":"bcdaf1c28b71e6ef889c6b08d1ce9d7c0761344a677f523bc4c3cd297957f804","src/lib.rs":"4753929dbb7b676c19d7cfa06d0a47e37003554b80c536cbf2b892d591ef61c2","src/registry.rs":"3cc1b5a50879fa751572878ae1d0afbfc960c11665258492754b2c8bccb0ff5d","src/setup_config.rs":"7014103587d3382eac599cb76f016e2609b8140970861b2237982d1db24af265","src/winapi.rs":"ea8b7edbb9ff87957254f465c2334e714c5d6b3b19a8d757c48ea7ca0881c50c","src/windows_registry.rs":"388e79dcf3e84078ae0b086c6cdee9cf9eb7e3ffafdcbf3e2df26163661f5856","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"71620b178583b6e6e5e0d4cac14e2cef6afc62fb6841e0c72ed1784543abf8ac","tests/test.rs":"1605640c9b94a77f48fc92e1dc0485bdf1960da5626e2e00279e4703691656bc"},"package":"aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"} +\ No newline at end of file ++{"files":{"Cargo.lock":"3aff5f8b0a7f4d72852b11b0526f0002e6bf55f19f1ebd6470d7f97fbd540e60","Cargo.toml":"6ab10d9b6a9c6f0909074e6698c90c6b6a7223661ec2e83174d2593117cbe7f2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"7184fbdf375a057e673257348f6d7584c0dd11b66318d98f3647f69eb610b097","src/bin/gcc-shim.rs":"b77907875029494b6288841c3aed2e4939ed40708c7f597fca5c9e2570490ca6","src/com.rs":"bcdaf1c28b71e6ef889c6b08d1ce9d7c0761344a677f523bc4c3cd297957f804","src/lib.rs":"feab2b4cc51fcfb041f83a1a689960c3c9abfbaa9580ba186244a880586ba29a","src/registry.rs":"3cc1b5a50879fa751572878ae1d0afbfc960c11665258492754b2c8bccb0ff5d","src/setup_config.rs":"7014103587d3382eac599cb76f016e2609b8140970861b2237982d1db24af265","src/winapi.rs":"ea8b7edbb9ff87957254f465c2334e714c5d6b3b19a8d757c48ea7ca0881c50c","src/windows_registry.rs":"388e79dcf3e84078ae0b086c6cdee9cf9eb7e3ffafdcbf3e2df26163661f5856","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"71620b178583b6e6e5e0d4cac14e2cef6afc62fb6841e0c72ed1784543abf8ac","tests/test.rs":"1605640c9b94a77f48fc92e1dc0485bdf1960da5626e2e00279e4703691656bc"},"package":"aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"} +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0011-replace-include-by-code-to-fix-arm-build.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0011-replace-include-by-code-to-fix-arm-build.patch new file mode 100644 index 0000000000..adca9c7213 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0011-replace-include-by-code-to-fix-arm-build.patch @@ -0,0 +1,43 @@ +From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001 +From: Mike Hommey <mh@glandium.org> +Date: Sat, 1 Jun 2019 09:06:01 +0900 +Subject: [PATCH] Bug 1526653 - Include struct definitions for user_vfp and + user_vfp_exc. + +* We need this to fix arm builds +* Stolen from [1] + +[1] https://salsa.debian.org/mozilla-team/firefox/commit/fd6847c9416f9eebde636e21d794d25d1be8791d + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + +Upstream-Status: Pending +--- + js/src/wasm/WasmSignalHandlers.cpp | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp +index 636537f8478..383c380f04c 100644 +--- a/js/src/wasm/WasmSignalHandlers.cpp ++++ b/js/src/wasm/WasmSignalHandlers.cpp +@@ -248,7 +248,16 @@ using mozilla::DebugOnly; + #endif + + #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS +-# include <sys/user.h> ++struct user_vfp { ++ unsigned long long fpregs[32]; ++ unsigned long fpscr; ++}; ++ ++struct user_vfp_exc { ++ unsigned long fpexc; ++ unsigned long fpinst; ++ unsigned long fpinst2; ++}; + #endif + + #if defined(ANDROID) +-- +GitLab + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0012-Add-SharedArrayRawBufferRefs-to-public-API.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0012-Add-SharedArrayRawBufferRefs-to-public-API.patch new file mode 100644 index 0000000000..ca37ca72ce --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0012-Add-SharedArrayRawBufferRefs-to-public-API.patch @@ -0,0 +1,35 @@ +From ccdd47cee610cb33fa5f67f856a68f5e411c79d5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 31 Oct 2021 18:32:39 +0100 +Subject: [PATCH] Add SharedArrayRawBufferRefs to public API +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Stolen from [1] + +[1] https://src.fedoraproject.org/rpms/mozjs78/blob/rawhide/f/FixSharedArray.diff + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + js/public/StructuredClone.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/public/StructuredClone.h b/js/public/StructuredClone.h +index cb3cd5b..06da4dd 100644 +--- a/js/public/StructuredClone.h ++++ b/js/public/StructuredClone.h +@@ -381,7 +381,7 @@ enum OwnTransferablePolicy { + namespace js { + class SharedArrayRawBuffer; + +-class SharedArrayRawBufferRefs { ++class JS_PUBLIC_API SharedArrayRawBufferRefs { + public: + SharedArrayRawBufferRefs() = default; + SharedArrayRawBufferRefs(SharedArrayRawBufferRefs&& other) = default; +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0013-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0013-util.configure-fix-one-occasionally-reproduced-confi.patch new file mode 100644 index 0000000000..e943cf1ba1 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0013-util.configure-fix-one-occasionally-reproduced-confi.patch @@ -0,0 +1,50 @@ +From 430fd956b91c6208f166753578234c2f5db6352f Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 11 Nov 2021 21:17:38 +0800 +Subject: [PATCH] util.configure: fix one occasionally reproduced configure + failure + +error: +| checking whether the C++ compiler supports -Wno-range-loop-analysis... +| DEBUG: Creating /tmp/conftest.jr1qrcw3.cpp with content: +| DEBUG: | int +| DEBUG: | main(void) +| DEBUG: | { +| DEBUG: | +| DEBUG: | ; +| DEBUG: | return 0; +| DEBUG: | } +| DEBUG: Executing: aarch64-wrs-linux-g++ -mcpu=cortex-a53 -march=armv8-a+crc -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mozjs/91.1.0-r0/recipe-sysroot /tmp/conftest.jr1qrcw3.cpp -Werror -Wrange-loop-analysis -c +| DEBUG: The command returned non-zero exit status 1. +| DEBUG: Its error output was: +... +| File "/mozjs/91.1.0-r0/firefox-91.1.0/build/moz.configure/util.configure", line 239, in try_invoke_compiler +| os.remove(path) +| FileNotFoundError: [Errno 2] No such file or directory: '/tmp/conftest.jr1qrcw3.cpp' + +It should be another process that deleted this file by using +"rm -rf conftest*" inappropriately + +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + build/moz.configure/util.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure +index 7ee1a498ad..511e257ad9 100644 +--- a/build/moz.configure/util.configure ++++ b/build/moz.configure/util.configure +@@ -217,7 +217,7 @@ def try_invoke_compiler(compiler, language, source, flags=None, onerror=None): + 'C++': '.cpp', + }[language] + +- fd, path = mkstemp(prefix='conftest.', suffix=suffix, text=True) ++ fd, path = mkstemp(prefix='try_invoke_compiler_conftest.', suffix=suffix, text=True) + try: + source = source.encode('ascii', 'replace') + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0014-rewrite-cargo-host-linker-in-python3.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0014-rewrite-cargo-host-linker-in-python3.patch new file mode 100644 index 0000000000..7b938179c3 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0014-rewrite-cargo-host-linker-in-python3.patch @@ -0,0 +1,56 @@ +From 9eceb43dd676afe2f675bd65ab369ba4d14f6537 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 18 Nov 2021 07:16:39 +0000 +Subject: [PATCH] Rewrite cargo-host-linker in python3 + +Mozjs compile failed with this failure: +/bin/sh: /lib64/libc.so.6: version `GLIBC_2.33' not found (required by /build/tmp-glibc/work/corei7-64-wrs-linux/mozjs/91.1.0-r0/recipe-sysroot-native/usr/lib/libtinfo.so.5) + +Root Cause: +cargo-host-linker has /bin/sh as it's interpreter, but cargo run the cmd +with LD_LIBRARY_PATH set to recipe-sysroot-native. The host /bin/sh links +libtinfo.so.5 under recipe-sysroot-native, which needs higher libc. But +host libc is older libc. So the incompatible problem occurred. + +Solution: +rewrite cargo-host-linker in python3 + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + build/cargo-host-linker | 24 +++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/build/cargo-host-linker b/build/cargo-host-linker +index cbd0472bf7..ccd8bffec1 100755 +--- a/build/cargo-host-linker ++++ b/build/cargo-host-linker +@@ -1,3 +1,21 @@ +-#!/bin/sh +-# See comment in cargo-linker. +-eval ${MOZ_CARGO_WRAP_HOST_LD} ${MOZ_CARGO_WRAP_HOST_LDFLAGS} '"$@"' ++#!/usr/bin/env python3 ++ ++import os,sys ++ ++if os.environ['MOZ_CARGO_WRAP_HOST_LD'].strip(): ++ binary=os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0] ++else: ++ sys.exit(0) ++ ++if os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS'].strip(): ++ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] ++ else: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] ++else: ++ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + sys.argv[1:] ++ else: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + sys.argv[1:] ++ ++os.execvp(binary, args) +-- +2.33.1 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb new file mode 100644 index 0000000000..3700d88c24 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb @@ -0,0 +1,144 @@ +SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" +HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" + +SRC_URI = " \ + https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \ + file://0001-rust.configure-Skip-all-target-manipulations.patch \ + file://0002-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \ + file://0003-Do-not-check-binaries-after-build.patch \ + file://0004-Cargo.toml-do-not-abort-on-panic.patch \ + file://0005-Fixup-compatibility-of-mozbuild-with-Python-3.10.patch \ + file://0006-use-asm-sgidefs.h.patch \ + file://0007-fix-musl-build.patch \ + file://0008-riscv.patch \ + file://0009-riscv-Disable-atomic-operations.patch \ + file://0010-riscv-Set-march-correctly.patch \ + file://0011-replace-include-by-code-to-fix-arm-build.patch \ + file://0012-Add-SharedArrayRawBufferRefs-to-public-API.patch \ + file://0013-util.configure-fix-one-occasionally-reproduced-confi.patch \ + file://0014-rewrite-cargo-host-linker-in-python3.patch \ +" + +SRC_URI[sha256sum] = "a4438d84d95171a6d4fea9c9f02c2edbf0475a9c614d968ebe2eedc25a672151" +S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" + +DEPENDS = " \ + autoconf-2.13-native \ + icu-native \ + cargo-native \ + zlib \ + python3-six \ + python3-six-native \ +" + +inherit autotools pkgconfig rust python3native siteinfo + +JIT ?= "" +JIT:mipsarch = "--disable-jit" + +EXTRA_OECONF = " \ + --target=${TARGET_SYS} \ + --host=${BUILD_SYS} \ + --prefix=${prefix} \ + --libdir=${libdir} \ + --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} \ + --without-system-icu \ + --disable-tests --disable-strip --disable-optimize \ + --disable-jemalloc \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \ + ${JIT} \ +" +# Note: Python with mozilla build is a mess: E.g: python-six: to get an error +# free configure we need: +# * python3-six-native in DEPENDS +# * python3-six in DEPENDS +# * path to python-six shipped by mozilla in PYTHONPATH +prepare_python_and_rust() { + if [ ! -f ${B}/PYTHONPATH ]; then + oldpath=`pwd` + cd ${S} + # Add mozjs python-modules necessary + PYTHONPATH="${S}/build:${S}/config" + PYTHONPATH="$PYTHONPATH:${S}/third_party/python/distro:${S}/third_party/python/jsmin" + PYTHONPATH="$PYTHONPATH:${S}/third_party/python/pytoml:${S}/third_party/python/six" + PYTHONPATH="$PYTHONPATH:${S}/third_party/python/pyyaml/lib3:${S}/third_party/python/which" + for sub_dir in python testing/mozbase; do + for module_dir in `ls $sub_dir -1`;do + [ $module_dir = "virtualenv" ] && continue + if [ -d "${S}/$sub_dir/$module_dir" ];then + PYTHONPATH="$PYTHONPATH:${S}/$sub_dir/$module_dir" + fi + done + done + # looks odd but it's huge and we want to see what's in there + echo "$PYTHONPATH" > ${B}/PYTHONPATH + cd "$oldpath" + fi + + export PYTHONPATH=`cat ${B}/PYTHONPATH` + + export RUST_TARGET_PATH="${RUST_TARGET_PATH}" + export RUST_TARGET="${TARGET_SYS}" + export RUSTFLAGS="${RUSTFLAGS}" +} + +export HOST_CC = "${BUILD_CC}" +export HOST_CXX = "${BUILD_CXX}" +export HOST_CFLAGS = "${BUILD_CFLAGS}" +export HOST_CPPFLAGS = "${BUILD_CPPFLAGS}" +export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}" +# otherwise we are asked for yasm... +export AS = "${CC}" + +CPPFLAGS:append:mips:toolchain-clang = " -fpie" +CPPFLAGS:append:mipsel:toolchain-clang = " -fpie" + +do_configure() { + prepare_python_and_rust + + cd ${S}/js/src + autoconf213 --macrodir=${STAGING_DATADIR_NATIVE}/autoconf213 old-configure.in > old-configure + + cd ${B} + # * use of /tmp can causes problems on heavily loaded hosts + # * with mozjs-78 we get without: + # | Path specified in LOCAL_INCLUDES (..) resolves to the topsrcdir or topobjdir (<tmpdir>/oe-core-glibc/work/cortexa72-mortsgna-linux/mozjs-78/78.15.0-r0/firefox-78.15.0/js/src), which is not allowed + mkdir -p "${B}/lcl_tmp" + TMPDIR="${B}/lcl_tmp" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ${S}/js/src/configure ${EXTRA_OECONF} + + # inspired by what fedora [1] does: for big endian rebuild icu dat + # this avoids gjs qemu crash on mips at gir creation + # [1] https://src.fedoraproject.org/rpms/mozjs78/blob/rawhide/f/mozjs78.spec + if [ ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} = "big" -a ! -e ${S}/config/external/icu/data/icudt67b.dat ]; then + echo "Do big endian icu dat-convert..." + icupkg -tb ${S}/config/external/icu/data/icudt67l.dat ${S}/config/external/icu/data/icudt67b.dat + rm -f ${S}/config/external/icu/data/icudt*l.dat + fi +} + +do_compile:prepend() { + prepare_python_and_rust +} + +do_install:prepend() { + prepare_python_and_rust +} + +do_install:append() { + # tidy up installation + chmod -x ${D}${libdir}/pkgconfig/*.pc + sed -i 's:\x24{includedir}/mozjs-78/js/RequiredDefines.h:js/RequiredDefines.h:g' ${D}${libdir}/pkgconfig/*.pc + + rm -f ${D}${libdir}/libjs_static.ajs +} + +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" + +DISABLE_STATIC = "" + +PACKAGES =+ "lib${BPN}" +FILES:lib${BPN} += "${libdir}/lib*" diff --git a/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb b/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb index a57aaf08a8..1d3daa1443 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/tristanpenman/valijson" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=015106c62262b2383f6c72063f0998f2" -SRC_URI = "git://github.com/tristanpenman/valijson.git" +SRC_URI = "git://github.com/tristanpenman/valijson.git;branch=master;protocol=https" SRCREV = "2dfc7499a31b84edef71189f4247919268ebc74e" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb index a68dfa1d01..464d82f4c8 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://git.infradead.org/users/mchehab/rasdaemon.git" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc" -SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master \ +SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master;protocol=https \ file://0001-Fix-system-header-includes.patch \ file://rasdaemon.service \ file://init" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb index f8f817e40b..7969af6c37 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb @@ -9,7 +9,7 @@ SRCREV = "ad7e646700d14b81413297bda02fb7fe96613c3f" PV = "1.0+git${SRCPV}" -SRC_URI = "git://github.com/ssvb/cpuburn-arm.git \ +SRC_URI = "git://github.com/ssvb/cpuburn-arm.git;branch=master;protocol=https \ file://0001-cpuburn-a8.S-Remove-.func-.endfunc.patch \ file://0002-burn.S-Add.patch \ file://0003-burn.S-Remove-.func-.endfunc.patch \ diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.28.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.29.bb index 6e4b648d26..54e2f332b1 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.28.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.29.bb @@ -22,8 +22,8 @@ PACKAGECONFIG_NUMA:armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -SRCREV = "d83ac9d3d30d5f5dc6d0e425e4ba945a772839f6" -SRC_URI = "git://git.kernel.dk/fio.git \ +SRCREV = "9b46661c289d01dbfe5182189a7abea9ce2f9e04" +SRC_URI = "git://git.kernel.dk/fio.git;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 5e99e9e4ef..2a8ce54c83 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -11,14 +11,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ DEPENDS = "libpng jpeg udev" DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-native wayland-protocols', '', d)}" -PV = "2021.02+${SRCPV}" +PV = "2021.12" SRC_URI = " \ - git://github.com/glmark2/glmark2.git;protocol=https \ + git://github.com/glmark2/glmark2.git;protocol=https;branch=master \ file://0001-fix-dispmanx-build.patch \ file://0002-run-dispmanx-fullscreen.patch \ " -SRCREV = "4b2bbe803576d48f08367aa5441740f9319c21e7" +SRCREV = "0858b450cd88c84a15b99dda9698d44e7f7e8c70" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb index be75837beb..47bf4d5015 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb @@ -11,7 +11,7 @@ AUTHOR = "ESNET <info@es.net>, Lawrence Berkeley National Laboratory <websupport LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b7fb682e9941a49f1214dcd7441410d7" -SRC_URI = "git://github.com/esnet/iperf.git \ +SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \ file://0002-Remove-pg-from-profile_CFLAGS.patch \ file://0001-configure.ac-check-for-CPP-prog.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb index f16bd99d5d..17bbb9b6ce 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9a825c63897c53f487ef900598c31527" SRCREV = "b6b2ce5f9f87a09b14499cb00c600c601f022634" PV = "20110206+git${SRCPV}" -SRC_URI = "git://git.musl-libc.org/libc-bench \ +SRC_URI = "git://git.musl-libc.org/libc-bench;branch=master \ file://0001-build-Do-not-override-ldflags-from-environment.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index cfdf420650..be131cd261 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -12,7 +12,7 @@ PE = "1" SRCREV = "6b126a4d7da9490fa40fe7e1b962edcb939feddc" SRC_URI = " \ - git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \ + git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https;branch=master \ file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ file://libhugetlbfs-avoid-search-host-library-path-for-cros.patch \ file://tests-Makefile-install-static-4G-edge-testcases.patch \ diff --git a/meta-openembedded/meta-oe/recipes-benchmark/linpack/linpack/0001-linpack-Define-DP-only-when-SP-is-not-defined.patch b/meta-openembedded/meta-oe/recipes-benchmark/linpack/linpack/0001-linpack-Define-DP-only-when-SP-is-not-defined.patch new file mode 100644 index 0000000000..4eb18e38ca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/linpack/linpack/0001-linpack-Define-DP-only-when-SP-is-not-defined.patch @@ -0,0 +1,32 @@ +From f092d4be22acd09e791187b8e9bff6d312721ce4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 10 Nov 2021 11:36:31 -0800 +Subject: [PATCH] linpack: Define DP only when SP is not defined + +This helps compiling two versions ( SP/FP ) of the benchmark just by +passing -DSP on compile cmdline + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + linpacknew.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/linpacknew.c b/linpacknew.c +index 17b2824..c656082 100644 +--- a/linpacknew.c ++++ b/linpacknew.c +@@ -28,7 +28,9 @@ + #include <time.h> + #include <float.h> + ++#ifndef SP + #define DP ++#endif + + #ifdef SP + #define ZERO 0.0 +-- +2.33.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb index aed95cdaa4..603004ddd5 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb @@ -4,17 +4,21 @@ SUMMARY = "LINPACK is a software library for performing numerical linear algebra LICENSE = "PD" LIC_FILES_CHKSUM ="file://${WORKDIR}/linpacknew.c;beginline=1;endline=23;md5=aa025e3bc44190c71e4c5e3b084fed87" -SRC_URI = "http://www.netlib.org/benchmark/linpackc.new;downloadfilename=linpacknew.c" +SRC_URI = "http://www.netlib.org/benchmark/linpackc.new;downloadfilename=linpacknew.c \ + file://0001-linpack-Define-DP-only-when-SP-is-not-defined.patch \ + " SRC_URI[md5sum] = "1c5d0b6a31264685d2e651c920e3cdf4" SRC_URI[sha256sum] = "a63f2ec86512959f1fd926bfafb85905b2d7b7402942ffae3af374d48745e97e" S = "${WORKDIR}" do_compile () { - ${CC} ${CFLAGS} ${LDFLAGS} -o linpack linpacknew.c -lm + ${CC} ${CFLAGS} ${LDFLAGS} -DDP -o linpack_dp linpacknew.c -lm + ${CC} ${CFLAGS} ${LDFLAGS} -DSP -o linpack_sp linpacknew.c -lm } do_install () { - install -Dm 0755 linpack ${D}${bindir}/linpack + install -Dm 0755 linpack_dp ${D}${bindir}/linpack_dp + install -Dm 0755 linpack_sp ${D}${bindir}/linpack_sp } diff --git a/meta-openembedded/meta-oe/recipes-benchmark/mbw/mbw_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/mbw/mbw_git.bb index 5ed726d9b7..3738036a88 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/mbw/mbw_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/mbw/mbw_git.bb @@ -4,7 +4,7 @@ SECTION = "console/tests" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://mbw.spec;beginline=1;endline=10;md5=bbb77813272134a5c461f71abe945bef" -SRC_URI = "git://github.com/raas/${BPN}.git" +SRC_URI = "git://github.com/raas/${BPN}.git;branch=master;protocol=https" SRCREV = "2a15026ff65160127204881263464b1740a57198" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb index a2966e99dd..d30ea5a01b 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ea9d559f985fb4834317d8ed6b9e58" SRCREV = "fb72e5e5f0879231f38e0e826a98a6ca2d1ca38e" -SRC_URI = "git://github.com/stressapptest/stressapptest \ +SRC_URI = "git://github.com/stressapptest/stressapptest;branch=master;protocol=https \ file://libcplusplus-compat.patch \ file://read_sysfs_for_cachesize.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb index 0607da834b..025aacf251 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://main.c;endline=22;md5=879b9bbb60851454885b5fa47eb6b34 PV = "0.4.9+git${SRCPV}" SRCREV = "a2cf6d7e382e3aea1eb39173174d9fa28cad15f3" -SRC_URI = "git://github.com/ssvb/tinymembench.git \ +SRC_URI = "git://github.com/ssvb/tinymembench.git;branch=master;protocol=https \ file://0001-asm-Delete-.func-.endfunc-directives.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb b/meta-openembedded/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb index 45203f029b..2edb7c396b 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb @@ -9,7 +9,7 @@ SECTION = "console/utils" DEPENDS = "" SRCREV = "61ed2f28b294b1ebeb767df8cb5fcd391709c8e2" -SRC_URI = "git://gitlab.com/pibox/con2fbmap.git;protocol=https" +SRC_URI = "git://gitlab.com/pibox/con2fbmap.git;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb b/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb index d61a871cd9..ff41459968 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRCREV = "a2f0c39d5f21596bb9f5223e895c0ff210b265d0" # SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/cpufreq/cpufrequtils.git -SRC_URI = "git://github.com/emagii/cpufrequtils.git \ +SRC_URI = "git://github.com/emagii/cpufrequtils.git;branch=master;protocol=https \ file://0001-dont-unset-cflags.patch \ " @@ -22,7 +22,7 @@ S = "${WORKDIR}/git" TARGET_CC_ARCH += "${LDFLAGS}" -EXTRA_OEMAKE = "V=1 CROSS=${TARGET_PREFIX} LIBTOOL='${HOST_SYS}-libtool --tag cc' STRIPCMD=echo 'CP=cp'" +EXTRA_OEMAKE = "V=1 CROSS=${TARGET_PREFIX} STRIPCMD=echo 'CP=cp'" do_compile() { oe_runmake diff --git a/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb index 914718c009..5d616496fb 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb @@ -11,7 +11,7 @@ PV = "0.18+git${SRCPV}" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/grondo/edac-utils \ +SRC_URI = "git://github.com/grondo/edac-utils;branch=master;protocol=https \ file://make-init-script-be-able-to-automatically-load-EDAC-.patch \ file://add-restart-to-initscript.patch \ file://edac.service \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb b/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb index 186bc19308..e8b491a435 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb @@ -7,7 +7,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE-APACHE;md5=7b486c2338d225a1405d979ed2c15ce8 \ file://COPYING;md5=daa868b8e1ae17d03228a1145b4060da" -SRC_URI = "git://github.com/teg/firmwared.git \ +SRC_URI = "git://github.com/teg/firmwared.git;branch=master;protocol=https \ file://firmwared.service" PV = "0+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch new file mode 100644 index 0000000000..ac345f2752 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch @@ -0,0 +1,53 @@ +Change the efi-cc argument to take an array, so that we can pass compiler flags +such as --sysroot. + +In the long term changing the fwupd-efi build to use the standard Meson +CC/LD/etc would be the preferred fix. + +Upstream-Status: Inappropriate [better fix in progress] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/efi/generate_sbat.py b/efi/generate_sbat.py +index e42b365..4831a48 100755 +--- a/efi/generate_sbat.py ++++ b/efi/generate_sbat.py +@@ -7,6 +7,7 @@ + # + # pylint: disable=missing-docstring, invalid-name + ++import shlex + import subprocess + import sys + import argparse +@@ -19,7 +20,7 @@ def _generate_sbat(args): + FWUPD_URL = "https://github.com/fwupd/fwupd" + + subprocess.run( +- [args.cc, "-x", "c", "-c", "-o", args.outfile, "/dev/null"], check=True ++ shlex.split(args.cc) + ["-x", "c", "-c", "-o", args.outfile, "/dev/null"], check=True + ) + + # not specified +diff --git a/efi/meson.build b/efi/meson.build +index 68ea4aa..dcf0d43 100644 +--- a/efi/meson.build ++++ b/efi/meson.build +@@ -184,7 +184,7 @@ o_file5 = custom_target('fwup-sbat.o', + command : [ + join_paths(meson.current_source_dir(), 'generate_sbat.py'), + '@OUTPUT@', +- '--cc', efi_cc, ++ '--cc', ' '.join(efi_cc), + '--objcopy', efi_objcopy, + '--project-name', meson.project_name(), + '--project-version', meson.project_version(), +diff --git a/meson_options.txt b/meson_options.txt +index d869cd2..17ef7fb 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,4 +1,4 @@ +-option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules') ++option('efi-cc', type : 'array', value : ['gcc'], description : 'the compiler to use for EFI modules') + option('efi-ld', type : 'string', value : 'ld', description : 'the linker to use for EFI modules') + option('efi-objcopy', type : 'string', value : 'objcopy', description : 'the objcopy utility to use for EFI modules') + option('efi-libdir', type : 'string', description : 'path to the EFI lib directory') diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.1.bb b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.1.bb new file mode 100644 index 0000000000..2165b42293 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.1.bb @@ -0,0 +1,34 @@ +SUMMARY = "EFI executable for fwupd" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \ + file://cc.patch" +SRCREV = "fee1b8f6473cb403b8ae7a56961ba0557e3f3efa" +S = "${WORKDIR}/git" + +DEPENDS = "gnu-efi" + +COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" + +inherit meson + +# These should be configured as needed +SBAT_DISTRO_ID ?= "${DISTRO}" +SBAT_DISTRO_SUMMARY ?= "${DISTRO_NAME}" +SBAT_DISTRO_URL ?= "" + +EXTRA_OEMESON += "-Defi-cc="${@meson_array('CC', d)}" \ + -Defi-ld='${HOST_PREFIX}ld' \ + -Defi-objcopy='${OBJCOPY}' \ + -Defi-includedir=${STAGING_INCDIR}/efi \ + -Defi-libdir=${STAGING_LIBDIR} \ + -Defi_sbat_distro_id='${SBAT_DISTRO_ID}' \ + -Defi_sbat_distro_summary='${SBAT_DISTRO_SUMMARY}' \ + -Defi_sbat_distro_url='${SBAT_DISTRO_URL}' \ + -Defi_sbat_distro_pkgname='${PN}' \ + -Defi_sbat_distro_version='${PV}'\ + " + +# The compile assumes GCC at present +TOOLCHAIN = "gcc" diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd/run-ptest b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd/run-ptest new file mode 100755 index 0000000000..dbc0fc32a2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd/run-ptest @@ -0,0 +1,6 @@ +#! /bin/sh + +# Don't run all of the fwupd tests, as fwupd/fwupdmgr.test needs a custom +# /etc/fwupd/daemon.conf with DisabledPlugins unset. + +gnome-desktop-testing-runner fwupd/fwupd.test diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.3.bb b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.3.bb new file mode 100644 index 0000000000..b02e8caa27 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.3.bb @@ -0,0 +1,121 @@ +SUMMARY = "A simple daemon to allow session software to update firmware" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "glib-2.0 libxmlb json-glib sqlite3 libjcat gcab vala-native" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://run-ptest" +SRC_URI[sha256sum] = "109dacc16ed0db71eb08b852e96b070b8c2c53516a3071b9d0683acd8ecd42d9" + +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" + +# Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages + +GIDOCGEN_MESON_OPTION = 'docs' +GIDOCGEN_MESON_ENABLE_FLAG = 'docgen' +GIDOCGEN_MESON_DISABLE_FLAG = 'none' + +PACKAGECONFIG ??= "curl gnutls gudev gusb \ + ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth polkit', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'plugin_uefi_capsule plugin_uefi_pk', '', d)} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests plugin_dummy', '', d)} \ + hsi \ + plugin_acpi_phat \ + plugin_amt \ + plugin_bcm57xx \ + plugin_emmc \ + plugin_ep963x \ + plugin_fastboot \ + plugin_flashrom \ + plugin_intel_spi \ + plugin_logitech_bulkcontroller \ + plugin_modem_manager \ + plugin_msr \ + plugin_nitrokey \ + plugin_nvme \ + plugin_parade_lspcon \ + plugin_pixart_rf \ + plugin_platform_integrity \ + plugin_realtek_mst \ + plugin_redfish \ + plugin_synaptics_mst \ + plugin_synaptics_rmi \ + plugin_thunderbolt \ + plugin_upower \ + sqlite" + +PACKAGECONFIG[bluetooth] = "-Dbluez=true,-Dbluez=false" +PACKAGECONFIG[compat-cli] = "-Dcompat_cli=true,-Dcompat_cli=false" +PACKAGECONFIG[consolekit] = "-Dconsolekit=true,-Dconsolekit=false,consolekit" +PACKAGECONFIG[curl] = "-Dcurl=true,-Dcurl=false,curl" +PACKAGECONFIG[firmware-packager] = "-Dfirmware-packager=true,-Dfirmware-packager=false" +PACKAGECONFIG[fish-completion] = "-Dfish_completion=true,-Dfish_completion=false" +PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" +PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" +PACKAGECONFIG[gusb] = "-Dgusb=true,-Dgusb=false,libgusb" +PACKAGECONFIG[hsi] = "-Dhsi=true,-Dhsi=false" +PACKAGECONFIG[libarchive] = "-Dlibarchive=true,-Dlibarchive=false,libarchive" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" +PACKAGECONFIG[metainfo] = "-Dmetainfo=true,-Dmetainfo=false" +PACKAGECONFIG[offline] = "-Doffline=true,-Doffline=false" +PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit" +PACKAGECONFIG[sqlite] = "-Dsqlite=true,-Dsqlite=false,sqlite3" +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gcab-native" + + +# TODO plugins-all meta-option that expands to all plugin_*? +PACKAGECONFIG[plugin_acpi_phat] = "-Dplugin_acpi_phat=true,-Dplugin_acpi_phat=false" +PACKAGECONFIG[plugin_amt] = "-Dplugin_amt=true,-Dplugin_amt=false" +PACKAGECONFIG[plugin_bcm57xx] = "-Dplugin_bcm57xx=true,-Dplugin_bcm57xx=false" +PACKAGECONFIG[plugin_cfu] = "-Dplugin_cfu=true,-Dplugin_cfu=false" +PACKAGECONFIG[plugin_dell] = "-Dplugin_dell=true,-Dplugin_dell=false,libsmbios" +PACKAGECONFIG[plugin_dummy] = "-Dplugin_dummy=true,-Dplugin_dummy=false" +PACKAGECONFIG[plugin_emmc] = "-Dplugin_emmc=true,-Dplugin_emmc=false" +PACKAGECONFIG[plugin_ep963x] = "-Dplugin_ep963x=true,-Dplugin_ep963x=false" +PACKAGECONFIG[plugin_fastboot] = "-Dplugin_fastboot=true,-Dplugin_fastboot=false" +PACKAGECONFIG[plugin_flashrom] = "-Dplugin_flashrom=true,-Dplugin_flashrom=false,flashrom" +PACKAGECONFIG[plugin_intel_spi] = "-Dplugin_intel_spi=true -Dlzma=true,-Dplugin_intel_spi=false -Dlzma=false,xz" +PACKAGECONFIG[plugin_logitech_bulkcontroller] = "-Dplugin_logitech_bulkcontroller=true,-Dplugin_logitech_bulkcontroller=false,protobuf-c-native protobuf-c" +PACKAGECONFIG[plugin_modem_manager] = "-Dplugin_modem_manager=true,-Dplugin_modem_manager=false,libqmi modemmanager" +PACKAGECONFIG[plugin_msr] = "-Dplugin_msr=true,-Dplugin_msr=false,cpuid" +PACKAGECONFIG[plugin_nitrokey] = "-Dplugin_nitrokey=true,-Dplugin_nitrokey=false" +PACKAGECONFIG[plugin_nvme] = "-Dplugin_nvme=true,-Dplugin_nvme=false" +PACKAGECONFIG[plugin_parade_lspcon] = "-Dplugin_parade_lspcon=true,-Dplugin_parade_lspcon=false" +PACKAGECONFIG[plugin_pixart_rf] = "-Dplugin_pixart_rf=true,-Dplugin_pixart_rf=false" +PACKAGECONFIG[plugin_platform_integrity] = "-Dplugin_platform_integrity=true,-Dplugin_platform_integrity=false" +PACKAGECONFIG[plugin_powerd] = "-Dplugin_powerd=true,-Dplugin_powerd=false" +PACKAGECONFIG[plugin_realtek_mst] = "-Dplugin_realtek_mst=true,-Dplugin_realtek_mst=false" +PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=true,-Dplugin_redfish=false" +PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=true,-Dplugin_synaptics_mst=false" +PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=true,-Dplugin_synaptics_rmi=false" +PACKAGECONFIG[plugin_thunderbolt] = "-Dplugin_thunderbolt=true,-Dplugin_thunderbolt=false" +PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=true,-Dplugin_tpm=false,tpm2-tss" +# Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported +PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=true -Dplugin_uefi_capsule_splash=false,-Dplugin_uefi_capsule=false,efivar fwupd-efi" +PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=true,-Dplugin_uefi_pk=false" +PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=true,-Dplugin_upower=false" + +# Always disable these plugins on non-x86 platforms as they don't compile or are useless +DISABLE_NON_X86 = "plugin_amt plugin_intel_spi plugin_msr plugin_thunderbolt" +DISABLE_NON_X86:x86 = "" +DISABLE_NON_X86:x86-64 = "" +PACKAGECONFIG:remove = "${DISABLE_NON_X86}" + +FILES:${PN} += "${libdir}/fwupd-plugins-* \ + ${systemd_unitdir} \ + ${datadir}/fish \ + ${datadir}/metainfo \ + ${datadir}/icons \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ + ${nonarch_libdir}/modules-load.d" + +FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \ + ${datadir}/installed-tests/" +RDEPENDS:${PN}-ptest += "gnome-desktop-testing" diff --git a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb index 66da1826fc..f1c859dda2 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb @@ -16,7 +16,7 @@ inherit autotools systemd SYSTEMD_SERVICE:${PN} = "ledmon.service" # 0.93 -SRC_URI = "git://github.com/intel/ledmon;branch=master \ +SRC_URI = "git://github.com/intel/ledmon;branch=master;protocol=https \ file://0002-include-sys-select.h-and-sys-types.h.patch \ file://0001-Don-t-build-with-Werror-to-fix-compile-error.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index b6ae3cddcb..55e303f0d5 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -10,7 +10,7 @@ DEPENDS = " \ virtual/libiconv \ " -SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https \ +SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https;branch=master \ file://fancontrol.init \ file://sensord.init \ file://0001-Change-PIDFile-path-from-var-run-to-run.patch \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb index e1a98db4e2..7f087da7ce 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" DEPENDS = "util-linux" PV .= "+git${SRCPV}" -SRC_URI = "git://github.com/linux-nvme/nvme-cli.git" +SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" SRCREV = "f0e9569df9289d6ee55ba2c23615cc7c73a9b088" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb index c355dadf0b..ce78fdeb19 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb @@ -1,19 +1,21 @@ SUMMARY = "GNU All Mobile Managment Utilities" SECTION = "console/network" -DEPENDS = "cmake-native virtual/libiconv libdbi mysql5 glib-2.0 udev libgudev unixodbc" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf" -HOMEPAGE = "http://www.gammu.org/" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +HOMEPAGE = "https://wammu.eu/" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${PV}/${BP}.tar.bz2 \ +SRC_URI = "https://dl.cihar.com/${BPN}/releases/${BP}.tar.xz \ file://gammurc \ file://gammu-smsdrc \ " -SRC_URI[md5sum] = "8ea16c6b3cc48097a8e62311fe0e25b9" -SRC_URI[sha256sum] = "de67caa102aa4c8fbed5300e5a0262e40411c4cc79f4379a8d34eed797968fc3" +SRC_URI[sha256sum] = "d8f152314d7e4d3d643610d742845e0a016ce97c234ad4b1151574e1b09651ee" + +UPSTREAM_CHECK_URI = "https://dl.cihar.com/${BPN}/releases" + +DEPENDS = "cmake-native virtual/libiconv libdbi mysql5 glib-2.0 udev libgudev unixodbc" -inherit distutils3 cmake gettext +inherit cmake gettext do_install:append() { # these files seem to only be used by symbian and trigger QA warnings @@ -35,12 +37,11 @@ EXTRA_OECMAKE = " \ -DWITH_BLUETOOTH=OFF \ -DWITH_NOKIA_SUPPORT=OFF \ -DWITH_IRDA=OFF \ - -DWITH_PYTHON=OFF \ -DWITH_MySQL=ON \ -DWITH_Postgres=OFF \ " -PACKAGES =+ "${PN}-smsd libgammu libgsmsd python-${PN}" +PACKAGES =+ "${PN}-smsd libgammu libgsmsd" FILES:${PN} = "${bindir}/gammu ${bindir}/jadmaker ${sysconfdir}/bash_completion.d/gammu \ ${bindir}/gammu-detect ${sysconfdir}/gammurc" @@ -48,10 +49,9 @@ CONFFILES:${PN} = "${sysconfdir}/gammurc" FILES:${PN}-smsd = "${bindir}/gammu-smsd* ${sysconfdir}/gammu-smsdrc" CONFFILES:${PN}-smsd = "${sysconfdir}/gammu-smsdrc" FILES:${PN}-dev += "${bindir}/gammu-config ${libdir}/*.so" -FILES:${PN}-dbg += "${bindir}/.debug ${libdir}/.debug ${PYTHON_SITEPACKAGES_DIR}/gammu/.debug" +FILES:${PN}-dbg += "${bindir}/.debug ${libdir}/.debug" FILES:libgammu = "${libdir}/libGammu.so.*" FILES:libgsmsd = "${libdir}/libgsmsd.so.*" -FILES:python-${PN} = "${PYTHON_SITEPACKAGES_DIR}/gammu/*.??" RDEPENDS:${PN} += "bash" RDEPENDS:${PN}-dev += "bash" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gammu/python3-gammu/0001-setup.py-StrictVersion-packaging.version.patch b/meta-openembedded/meta-oe/recipes-connectivity/gammu/python3-gammu/0001-setup.py-StrictVersion-packaging.version.patch new file mode 100644 index 0000000000..23fe4441dc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/gammu/python3-gammu/0001-setup.py-StrictVersion-packaging.version.patch @@ -0,0 +1,49 @@ +From 96e8f0b2d13e890d9ffff8673f18dcc94290efb2 Mon Sep 17 00:00:00 2001 +From: Tim Orling <tim.orling@konsulko.com> +Date: Thu, 13 Jan 2022 20:06:33 -0600 +Subject: [PATCH] setup.py: StrictVersion -> packaging.version.* + +distutils is deprecated in Python 3.10 and will be removed in Python +3.12 [1] + +The recommended replacement for distutils.version is to use +packaging.version + +StrictVersion can be replaced by packaging.version.Version and helpers +like packaging.version.parse() + +[1] https://www.python.org/dev/peps/pep-0632/ +[2] https://packaging.pypa.io/en/latest/version.html + +Upstream-Status: Submitted [https://github.com/gammu/python-gammu/pull/67] + +Signed-off-by: Tim Orling <tim.orling@konsulko.com> +--- + setup.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index a458181..bffb09d 100755 +--- a/setup.py ++++ b/setup.py +@@ -30,7 +30,7 @@ import os + import platform + import subprocess + import sys +-from distutils.version import StrictVersion ++from packaging.version import parse, Version + + from setuptools import Extension, setup + +@@ -112,9 +112,9 @@ class GammuConfig: + with open(self.config_path(self.path)) as handle: + for line in handle: + if line.startswith("#define GAMMU_VERSION "): +- version = line.split('"')[1] ++ version = parse(line.split('"')[1]) + +- if version is None or StrictVersion(version) < StrictVersion(GAMMU_REQUIRED): ++ if version is None or version < parse(GAMMU_REQUIRED): + print("Too old Gammu version, please upgrade!") + sys.exit(100) + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb new file mode 100644 index 0000000000..1fdb76eeb4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb @@ -0,0 +1,21 @@ +SUMMARY = "Gammu bindings for Python" +DESCRIPTION ="Python bindings for the Gammu library." +HOMEPAGE = "https://wammu.eu/python-gammu/" +BUGRACKER = "https://github.com/gammu/python-gammu/issues" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +PYPI_PACKAGE = "python-gammu" + +inherit pypi setuptools3 pkgconfig + +SRC_URI += "file://0001-setup.py-StrictVersion-packaging.version.patch" +SRC_URI[sha256sum] = "49fc70f01bc192c43ff3ec815e082df5261ea4c8d36a695e977734c4eb4df868" + +S = "${WORKDIR}/python-gammu-${PV}" + +DEPENDS += "gammu python3-packaging-native" + +RDEPENDS:${PN} += "python3-asyncio python3-core python3-threading" + +RRECOMMENDS:${PN} += "gammu" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb index ea4f4d5468..3fe4c9404c 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb @@ -9,7 +9,7 @@ DEPENDS += "glib-2.0-native" PV = "0.2+git${SRCPV}" -SRC_URI = "git://github.com/labapart/gattlib.git \ +SRC_URI = "git://github.com/labapart/gattlib.git;branch=master;protocol=https \ file://dbus-avoid-strange-chars-from-the-build-dir.patch \ " @@ -23,6 +23,7 @@ PACKAGECONFIG[examples] = "-DGATTLIB_BUILD_EXAMPLES=ON,-DGATTLIB_BUILD_EXAMPLES= # Set this to force use of DBus API if Bluez version is older than 5.42 PACKAGECONFIG[force-dbus] = "-DGATTLIB_FORCE_DBUS=TRUE,-DGATTLIB_FORCE_DBUS=FALSE" +EXTRA_OECMAKE += "-DGATTLIB_PYTHON_INTERFACE=OFF" EXTRA_OECMAKE += "-DGATTLIB_BUILD_DOCS=OFF" inherit pkgconfig cmake diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.3.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.3.1.bb index 6d10bfcfd9..876cf1375d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.3.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ SRCREV = "c500d8705c517f96e591c060105a789f053d2b7a" -SRC_URI = "git://github.com/cminyard/gensio;protocol=https" +SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch deleted file mode 100644 index a9f2393532..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 36c74f974eba6f276ed4dd04c2077e6f23ebec37 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 17 Oct 2021 16:09:03 -0700 -Subject: [PATCH] netconfig: Use s6_addr instead of __in6_u.__u6_addr8 - -Building fails with: - -../iwd-1.18/src/netconfig.c: In function 'netconfig_ipv6_to_string': -../iwd-1.18/src/netconfig.c:188:25: error: 'struct in6_addr' has no member named '__in6_u'; did you mean '__in6_union'? - 188 | memcpy(in6_addr.__in6_u.__u6_addr8, addr, 16); - | ^~~~~~~ - | __in6_union - -Can be fixed by changing &this_ip.__in6_u.__u6_addr8[0] with &this_ip.s6_addr[0]. -For references: in6_addr is declared in /usr/include/linux/in6.h - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/netconfig.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/netconfig.c b/src/netconfig.c -index c748630..ab51c3d 100644 ---- a/src/netconfig.c -+++ b/src/netconfig.c -@@ -185,7 +185,7 @@ static inline char *netconfig_ipv6_to_string(const uint8_t *addr) - struct in6_addr in6_addr; - char *addr_str = l_malloc(INET6_ADDRSTRLEN); - -- memcpy(in6_addr.__in6_u.__u6_addr8, addr, 16); -+ memcpy(in6_addr.s6_addr, addr, 16); - - if (L_WARN_ON(unlikely(!inet_ntop(AF_INET6, &in6_addr, addr_str, - INET6_ADDRSTRLEN)))) { --- -2.33.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.18.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.21.bb index 4136de84fa..834c1d897f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.18.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.21.bb @@ -7,9 +7,8 @@ DEPENDS = "ell" SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ - file://0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch \ - " -SRC_URI[sha256sum] = "0225ab81579f027e0fcbf255517f432fcf355d14f3645c36813c71a441dfab55" + " +SRC_URI[sha256sum] = "bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb index bcedd6297e..4d873d4d90 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb @@ -9,7 +9,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/" DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt" SRCREV = "15f8652126664e3a4b980e5d1c039b9053ce8566" -SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https" +SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https;branch=master" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.26.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.26.2.bb index d6b812c2ab..5cd2a7e074 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.26.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.26.2.bb @@ -12,4 +12,4 @@ DEPENDS = "glib-2.0 glib-2.0-native libgudev" inherit autotools pkgconfig bash-completion gobject-introspection SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf" +SRC_URI[sha256sum] = "10c77bf5b5eb8c92ba80e9b519923ad9b898362bc8e1928e2bc9a17eeba649af" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb index 0d35465c8c..06fd0f769a 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://libndp.org/" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://github.com/jpirko/libndp \ +SRC_URI = "git://github.com/jpirko/libndp;branch=master;protocol=https \ " # tag for v1.8 SRCREV = "009ce9cd9b950ffa1f4f94c9436027b936850d0c" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb index 83326cb548..1c3419c6d9 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "zlib libsigc++-2.0 openssl cppunit" -SRC_URI = "git://github.com/rakshasa/libtorrent \ +SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https \ file://don-t-run-code-while-configuring-package.patch \ " SRCREV = "756f70010779927dc0691e1e722ed433d5d295e1" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb index a97c94e5c3..5aaa55c7af 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ inherit gnomebase gettext systemd vala gobject-introspection bash-completion -DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" +DEPENDS = "glib-2.0 libgudev libxslt-native" SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" SRC_URI[sha256sum] = "21fdfaf94171261ad9d99771894f5ade4bc39ef3d1ff1d421054d14713e97880" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.9.bb index 01c961f8a9..a8541f0d0b 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.8.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.9.bb @@ -11,9 +11,9 @@ LIC_FILES_CHKSUM = " \ file://about.html;md5=e5662cbb5f8fd5c9faac526e4077898e \ " -SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http" +SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http;branch=master;protocol=https" -SRCREV = "317fb008e1541838d1c29076d2bc5c3e4b6c4f53" +SRCREV = "3b7ae6348bc917d42c04efa962e4868c09bbde9f" DEPENDS = "openssl" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb new file mode 100644 index 0000000000..b5a6ac29c3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Paho MQTT - C++ libraries for the MQTT and MQTT-SN protocols" +DESCRIPTION = "Client implementation of open and standard messaging protocols for Machine-to-Machine (M2M) and Internet of Things (IoT)." +HOMEPAGE = "http://www.eclipse.org/paho/" +SECTION = "console/network" +LICENSE = "EPL-1.0 | EDL-1.0" + +LIC_FILES_CHKSUM = " \ + file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ + file://epl-v10;md5=659c8e92a40b6df1d9e3dccf5ae45a08 \ + file://notice.html;md5=a00d6f9ab542be7babc2d8b80d5d2a4c \ + file://about.html;md5=dcde438d73cf42393da9d40fabc0c9bc \ +" + +SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=http;branch=master;protocol=https" + +SRCREV = "33921c8b68b351828650c36816e7ecf936764379" + +DEPENDS = "openssl paho-mqtt-c" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += "-DPAHO_WITH_SSL=ON" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb index 29474f17dd..304171c88c 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/alanxz/rabbitmq-c" LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=6b7424f9db80cfb11fdd5c980b583f53" LICENSE = "MIT" -SRC_URI = "git://github.com/alanxz/rabbitmq-c.git" +SRC_URI = "git://github.com/alanxz/rabbitmq-c.git;branch=master;protocol=https" # v0.11.0-master SRCREV = "a64c08c68aff34d49a2ac152f04988cd921084f9" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb index 86d3be1689..0f3b5e2971 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses" -SRC_URI = "git://github.com/rakshasa/rtorrent \ +SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https \ file://don-t-run-code-while-configuring-package.patch \ " # v0.9.8 diff --git a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb index 43b000e7df..e81ec741a1 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb @@ -8,7 +8,7 @@ DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" RDEPENDS:${PN}-web = "${PN}" SRC_URI = " \ - gitsm://github.com/transmission/transmission \ + gitsm://github.com/transmission/transmission;branch=master;protocol=https \ file://transmission-daemon \ " diff --git a/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb index a3d66f4881..a74b157929 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb @@ -11,7 +11,7 @@ inherit autotools pkgconfig gitpkgv systemd PKGV = "${GITPKGVTAG}" SRCREV = "79c8b38d1488a6b07e1e68f39d8caec3f1a45622" -SRC_URI = "git://github.com/libimobiledevice/usbmuxd;protocol=https" +SRC_URI = "git://github.com/libimobiledevice/usbmuxd;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb index 5827e7ad9e..490f8324b4 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb @@ -9,7 +9,7 @@ SECTION = "test" S = "${WORKDIR}/git" SRCREV = "2da947374c8324f88a0e2155aeba4cf75464b0d8" -SRC_URI = "git://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT.git \ +SRC_URI = "git://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT.git;branch=master;protocol=https \ file://0001-Use-toolchain-from-environment-variables.patch \ file://0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch \ file://0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb index d234d01850..dfb0b14e3e 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb @@ -7,7 +7,7 @@ DEPENDS = "zeromq" SRCREV = "dd663fafd830466d34cba278c2cfd0f92eb67614" PV = "4.8.1" -SRC_URI = "git://github.com/zeromq/cppzmq.git;branch=master" +SRC_URI = "git://github.com/zeromq/cppzmq.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb deleted file mode 100644 index ed3bdbfe00..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "D-Bus wrapper in C++ for dbus" -HOMEPAGE = "https://dbus-cxx.github.io/" -SECTION = "base" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" - -FILEEXTRAPATHS:prepend = "${THISDIR}/files" -SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master" -SRC_URI += "file://fix_build_musl.patch" -SRCREV = "ea7f8e361d11dc7d41d9ae2c4128aed2cdadd84e" - -DEPENDS = "\ - dbus \ - libsigc++-2.0 \ -" - -RDEPENDS:${PN} = "\ - dbus \ - libsigc++-2.0 \ -" - -S = "${WORKDIR}/git" - -inherit pkgconfig cmake - -OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb new file mode 100644 index 0000000000..1524f096f8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "D-Bus wrapper in C++ for dbus" +HOMEPAGE = "https://dbus-cxx.github.io/" +BUGTRACKER = "https://github.com/libsigcplusplus/libsigcplusplus/issues" +SECTION = "base" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" + +SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https \ + file://0001-Include-typeinfo-for-typeid.patch \ +" +SRC_URI:append:libc-musl = "file://fix_build_musl.patch" +SRCREV = "73532d6a5faae9c721c2cc9535b8ef32d4d18264" + +DEPENDS = "\ + dbus \ + libsigc++-3 \ +" + +RDEPENDS:${PN} = "\ + dbus \ + libsigc++-3 \ +" + +S = "${WORKDIR}/git" + +inherit pkgconfig cmake + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch new file mode 100644 index 0000000000..9117877403 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch @@ -0,0 +1,29 @@ +From e262b6e7cc6271d71405f10c4817b9b3b2b95f05 Mon Sep 17 00:00:00 2001 +From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> +Date: Mon, 13 Dec 2021 02:00:48 +0100 +Subject: [PATCH] Include typeinfo for typeid() + +Otherwise fails with: + error: must '#include <typeinfo>' before using 'typeid' + +Upstream-Status: Submitted +[https://github.com/dbus-cxx/dbus-cxx/pull/83] +--- + dbus-cxx/demangle.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dbus-cxx/demangle.h b/dbus-cxx/demangle.h +index b71bcb9..9a4e99b 100644 +--- a/dbus-cxx/demangle.h ++++ b/dbus-cxx/demangle.h +@@ -21,6 +21,7 @@ + #define DBUSCXX_DEMANGLE_H + + #include <string> ++#include <typeinfo> + #include <dbus-cxx/dbus-cxx-config.h> + + #if DBUS_CXX_HAS_CXXABI_H +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch index 3d912e0b01..e55d987e43 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch +++ b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch @@ -1,26 +1,12 @@ -diff --git a/dbus-cxx/timeout.cpp b/dbus-cxx/timeout.cpp -index 16e9f7e..aa0b99f 100644 ---- a/dbus-cxx/timeout.cpp -+++ b/dbus-cxx/timeout.cpp -@@ -132,7 +132,7 @@ namespace DBus - return m_cobj; - } - -- void Timeout::timer_callback_proxy( sigval_t sv ) { -+ void Timeout::timer_callback_proxy( union sigval sv ) { - SIMPLELOGGER_DEBUG( "dbus.Timeout","Timeout::timer_callback_proxy" ); - Timeout* t; - t = ( Timeout* ) sv.sival_ptr; -diff --git a/dbus-cxx/timeout.h b/dbus-cxx/timeout.h -index 1e469b5..5b69fbb 100644 ---- a/dbus-cxx/timeout.h -+++ b/dbus-cxx/timeout.h -@@ -83,7 +83,7 @@ namespace DBus - - std::mutex m_arming_mutex; - -- static void timer_callback_proxy( sigval_t sv ); -+ static void timer_callback_proxy( union sigval sv ); - - }; - +diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp +index e8a6060..7a76af6 100644 +--- a/dbus-cxx/sasl.cpp ++++ b/dbus-cxx/sasl.cpp +@@ -70,7 +70,7 @@ std::tuple<bool, bool, std::vector<uint8_t>> SASL::authenticate() { + bool success = false; + bool negotiatedFD = false; + std::vector<uint8_t> serverGUID; +- __uid_t uid = getuid(); ++ uid_t uid = getuid(); + std::string line; + std::smatch regex_match; diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch index 2c4ca057f2..1c2fc3813f 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch @@ -21,7 +21,7 @@ index 009e4fd..f3f0d80 100644 if (!dbus_conn) - return; -+ DBUS_HANDLER_RESULT_NOT_YET_HANDLED; ++ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; if (verbose) g_print ("New message from server: type='%d' path='%s' iface='%s'" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb index 42cd032c22..f40b48836a 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb @@ -6,7 +6,7 @@ SRCREV = "1226a0a1374628ff191f6d8a56000be5e53e7608" PV = "0.0.0+gitr${SRCPV}" PR = "r1.59" -SRC_URI = "git://github.com/alban/dbus-daemon-proxy \ +SRC_URI = "git://github.com/alban/dbus-daemon-proxy;branch=master;protocol=https \ file://0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc b/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc index 9a0f9ba928..948e18da4d 100644 --- a/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc +++ b/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc @@ -3,7 +3,7 @@ most recent (and only the most recent) output from a process" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=http" +SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=http;branch=master;protocol=https" SRCREV = "aee53e8dee862f35291242ba41b0ca88010f6c71" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.bb b/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.bb index f6e05955e3..b31bba6b6b 100644 --- a/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.bb +++ b/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.bb @@ -12,7 +12,7 @@ inherit pkgconfig cmake features_check PV .= "+git${SRCPV}" SRCREV = "781fbbadb0bccc749058177b1385c82da9ace880" -SRC_URI = "git://github.com/glfw/glfw.git" +SRC_URI = "git://github.com/glfw/glfw.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb b/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb index 70b48f731f..b8818c1f31 100644 --- a/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb @@ -11,7 +11,7 @@ PV = "1.8.0+git${SRCPV}" S = "${WORKDIR}/git" SRCREV = "f02ff51449240102c27a97173dc495e8e7789046" -SRC_URI = "git://github.com/nfc-tools/libnfc.git" +SRC_URI = "git://github.com/nfc-tools/libnfc.git;branch=master;protocol=https" CFLAGS:append:libc-musl = " -D_GNU_SOURCE" DEPENDS = "libusb" diff --git a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb index 7d01829789..b39784e241 100644 --- a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb @@ -6,7 +6,7 @@ DEPENDS = "readline" PV = "2.3.3+git${SRCPV}" -SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=http \ +SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=http;branch=master;protocol=https \ file://0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch \ " SRCREV = "28202692d0b441000f4ddb8f347f72d1355021aa" diff --git a/meta-openembedded/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb b/meta-openembedded/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb index 553003f7f7..163a74ebe3 100644 --- a/meta-openembedded/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Implementation of rpmatch(3) for musl libc." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=81a81bf31abecc50c20862fc8a716329" -SRC_URI = "gitsm://github.com/pullmoll/musl-rpmatch.git;protocol=https" +SRC_URI = "gitsm://github.com/pullmoll/musl-rpmatch.git;protocol=https;branch=master" PV = "1.0+git${SRCPV}" SRCREV = "46267b154987d3e1f25d3a75423faa62bb5ee342" diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v69.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v69.bb index c71b8b9691..b848ca63c5 100644 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v69.bb +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v69.bb @@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e66651809cac5da60c8b80e9e4e79e08" inherit autotools-brokensep pkgconfig bash-completion systemd SRCREV = "ea62d6d53bf6f806c4841e97a370201e18446860" -SRC_URI = "git://github.com/pmem/ndctl.git" +SRC_URI = "git://github.com/pmem/ndctl.git;branch=master;protocol=https" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>v\d+(\.\d+)*)" DEPENDS = "kmod udev json-c keyutils" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_2.3.0.bb b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_2.3.0.bb index d94e4c2f0a..1746e21dbf 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_2.3.0.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Open Source alternative to vendor specific OpenCL ICD loaders." LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=1238d5bccbb6bda30654e48dcc0a554b" -SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https" +SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https;branch=master" SRCREV = "59c098b6b1f97a339e3e5308499aee6538ecea40" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb index 4645dd133b..5a0776c266 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb @@ -1,7 +1,7 @@ SUMMARY = "OpenCL API C++ bindings" DESCRIPTION = "OpenCL API C++ bindings from Khronos" -SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https;branch=master" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb index 4a165001d4..f77bf46d24 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb @@ -7,7 +7,7 @@ SECTION = "base" S = "${WORKDIR}/git" # v2020.12.18 SRCREV = "c57ba81c460ee97b6b9d0b8d18faf5ba6883114b" -SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=master;protocol=https" do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb index 43680fe752..45b1ad5494 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb @@ -11,7 +11,7 @@ inherit pkgconfig cmake S = "${WORKDIR}/git" PV = "2020.12.18+git${SRCPV}" SRCREV = "1d5315c3ed30d026acb79a1aa53a276fc833ffa7" -SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=master;protocol=https" do_install () { install -d ${D}${bindir} diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 4e1ee86328..62ada76f93 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -98,6 +98,8 @@ RDEPENDS:packagegroup-meta-oe-bsp ="\ edac-utils \ firmwared \ flashrom \ + fwupd \ + fwupd-efi \ irda-utils \ lmsensors-config-cgi \ lmsensors-config-fancontrol \ @@ -112,12 +114,12 @@ RDEPENDS:packagegroup-meta-oe-bsp:append:x86 = " ledmon" RDEPENDS:packagegroup-meta-oe-bsp:append:x86-64 = " ledmon" RDEPENDS:packagegroup-meta-oe-bsp:remove:libc-musl = "ledmon" -RDEPENDS:packagegroup-meta-oe-bsp:remove:mipsarch = "efivar efibootmgr" -RDEPENDS:packagegroup-meta-oe-bsp:remove:powerpc = "efivar efibootmgr" -RDEPENDS:packagegroup-meta-oe-bsp:remove:powerpc64 = "efivar efibootmgr" -RDEPENDS:packagegroup-meta-oe-bsp:remove:powerpc64le = "efivar efibootmgr" -RDEPENDS:packagegroup-meta-oe-bsp:remove:riscv64 = "efivar efibootmgr" -RDEPENDS:packagegroup-meta-oe-bsp:remove:riscv32 = "efivar efibootmgr" +RDEPENDS:packagegroup-meta-oe-bsp:remove:mipsarch = "efivar efibootmgr fwupd fwupd-efi" +RDEPENDS:packagegroup-meta-oe-bsp:remove:powerpc = "efivar efibootmgr fwupd fwupd-efi" +RDEPENDS:packagegroup-meta-oe-bsp:remove:powerpc64 = "efivar efibootmgr fwupd fwupd-efi" +RDEPENDS:packagegroup-meta-oe-bsp:remove:powerpc64le = "efivar efibootmgr fwupd fwupd-efi" +RDEPENDS:packagegroup-meta-oe-bsp:remove:riscv64 = "efivar efibootmgr fwupd fwupd-efi" +RDEPENDS:packagegroup-meta-oe-bsp:remove:riscv32 = "efivar efibootmgr fwupd fwupd-efi" RDEPENDS:packagegroup-meta-oe-connectivity ="\ gammu \ @@ -147,6 +149,7 @@ RDEPENDS:packagegroup-meta-oe-connectivity ="\ obexftp \ packagegroup-tools-bluetooth \ paho-mqtt-c \ + paho-mqtt-cpp \ rabbitmq-c \ rfkill \ rtorrent \ @@ -184,6 +187,7 @@ RDEPENDS:packagegroup-meta-oe-core = "\ mm-common \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "ndctl", "", d)} \ opencl-icd-loader \ + pim435 \ proxy-libintl \ safec \ sdbus-c++-tools \ @@ -293,10 +297,12 @@ RDEPENDS:packagegroup-meta-oe-devtools ="\ protobuf \ pugixml \ python3-distutils-extra \ + python3-pycups \ rapidjson \ sip3 \ squashfs-tools-ng \ uftrace \ + unifex \ libxerces-c \ xerces-c-samples \ xmlrpc-c \ @@ -328,10 +334,12 @@ RDEPENDS:packagegroup-meta-oe-extended ="\ bitwise \ brotli \ byacc \ + cmatrix \ cmpi-bindings \ collectd \ ddrescue \ dialog \ + duktape \ enscript \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gnuplot", "", d)} \ dlt-daemon \ @@ -477,6 +485,7 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ gphoto2 \ imlib2 \ libgphoto2 \ + graphene \ graphviz \ gtkwave \ jasper \ @@ -627,6 +636,7 @@ RDEPENDS:packagegroup-meta-oe-kernel ="\ oprofile \ spidev-test \ trace-cmd \ + usbip-tools \ " RDEPENDS:packagegroup-meta-oe-kernel:append:x86 = " intel-speed-select ipmiutil pm-graph turbostat" RDEPENDS:packagegroup-meta-oe-kernel:append:x86-64 = " intel-speed-select ipmiutil kpatch pm-graph turbostat bpftool" @@ -691,6 +701,7 @@ RDEPENDS:packagegroup-meta-oe-navigation ="\ RDEPENDS:packagegroup-meta-oe-printing ="\ cups-filters \ + gutenprint \ qpdf \ " @@ -731,7 +742,7 @@ RDEPENDS:packagegroup-meta-oe-support ="\ dfu-util \ dhex \ digitemp \ - dstat \ + dool \ espeak \ evemu-tools \ exiv2 \ @@ -881,6 +892,7 @@ RDEPENDS:packagegroup-meta-oe-support ="\ system-config-keyboard \ tbb \ satyr \ + pcp \ pcsc-lite \ pcsc-tools \ sharutils \ @@ -933,6 +945,7 @@ RDEPENDS:packagegroup-meta-oe-support:remove:riscv64 = "gperftools uim" RDEPENDS:packagegroup-meta-oe-support:remove:riscv32 = "gperftools uim" RDEPENDS:packagegroup-meta-oe-support:remove:powerpc = "ssiapi tbb" RDEPENDS:packagegroup-meta-oe-support:remove:powerpc64le = "ssiapi" +RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl = "pcp" RDEPENDS:packagegroup-meta-oe-test ="\ bats \ diff --git a/meta-openembedded/meta-oe/recipes-core/pim435/pim435_git.bb b/meta-openembedded/meta-oe/recipes-core/pim435/pim435_git.bb new file mode 100644 index 0000000000..f73a0fd54e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/pim435/pim435_git.bb @@ -0,0 +1,22 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +HOMEPAGE = "https://booting.oniroproject.org/distro/components/pim435" +SUMMARY = "A userspace driver application for PIM435 written in C" +DESCRIPTION = "A userspace driver application for PIM435 (Pimoroni LED matrix) \ +written in C" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663" + +SRC_URI = "git://booting.oniroproject.org/distro/components/pim435;protocol=https;branch=main" +SRCREV = "ee07a83de4d0ecdf4b5de20a7e374d36a9a6f5d5" +S = "${WORKDIR}/git" + +DEPENDS = "i2c-tools" + +EXTRA_OEMAKE += "DESTDIR=${D}" + +do_install() { + oe_runmake install +} diff --git a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.1.bb b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.1.bb index fa30f7cf40..4b121599e0 100644 --- a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.1.bb +++ b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.1.bb @@ -9,7 +9,7 @@ inherit autotools pkgconfig S = "${WORKDIR}/git" # v08112019 SRCREV = "ad76c7b1dbd0403b0c9decf54164fcce271c590f" -SRC_URI = "git://github.com/rurban/safeclib.git \ +SRC_URI = "git://github.com/rurban/safeclib.git;branch=master;protocol=https \ " COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm|aarch64|mips).*-linux' diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Do-not-download-gtest-automatically.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Do-not-download-gtest-automatically.patch deleted file mode 100644 index 5bd3801f38..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Do-not-download-gtest-automatically.patch +++ /dev/null @@ -1,44 +0,0 @@ -From af91a20ee201f13e56f225df536a56e5d8d259e8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 27 May 2021 09:56:49 -0700 -Subject: [PATCH] Do not download gtest automatically - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tests/CMakeLists.txt | 9 +-------- - tests/googletest-download/CMakeLists.txt.in | 3 --- - 2 files changed, 1 insertion(+), 11 deletions(-) - ---- a/tests/googletest-download/CMakeLists.txt.in -+++ b/tests/googletest-download/CMakeLists.txt.in -@@ -7,10 +7,7 @@ project(googletest-download NONE) - include(ExternalProject) - - ExternalProject_Add(googletest -- GIT_REPOSITORY https://github.com/google/googletest.git -- GIT_TAG master -- GIT_SHALLOW 1 -- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" -+ SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/googletest-src" - BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" - UPDATE_COMMAND "" - CONFIGURE_COMMAND "" ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -6,9 +6,7 @@ include(FetchContent) - - message("Fetching googletest...") - FetchContent_Declare(googletest -- GIT_REPOSITORY https://github.com/google/googletest.git -- GIT_TAG master -- GIT_SHALLOW 1 -+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/googletest-src - UPDATE_COMMAND "") - - #FetchContent_MakeAvailable(googletest) # Not available in CMake 3.13 :-( Let's do it manually: -@@ -144,4 +142,4 @@ endif() - if(NOT CMAKE_CROSSCOMPILING) - add_test(NAME sdbus-c++-unit-tests COMMAND sdbus-c++-unit-tests) - add_test(NAME sdbus-c++-integration-tests COMMAND sdbus-c++-integration-tests) --endif() -+endif() diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-test-Check-for-googletest-on-system-first.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-test-Check-for-googletest-on-system-first.patch deleted file mode 100644 index 8a6aceac87..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-test-Check-for-googletest-on-system-first.patch +++ /dev/null @@ -1,41 +0,0 @@ -From dc5fa7a4b342ef80cda533cdb821841d8183287c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 23 May 2021 09:01:09 -0700 -Subject: [PATCH] test: Check for googletest on system first - -This ensures if googletest is instslled already then use that version -before downloading and building own copy - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tests/CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 97f7c1a..3dfdd1c 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -2,6 +2,10 @@ - # DOWNLOAD AND BUILD OF GOOGLETEST - #------------------------------- - -+find_package(GTest) -+ -+if(NOT GTest_FOUND) -+ - include(FetchContent) - - message("Fetching googletest...") -@@ -23,7 +27,7 @@ if(NOT googletest_POPULATED) - add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) - set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_BAK}) - endif() -- -+endif() - #------------------------------- - # SOURCE FILES CONFIGURATION - #------------------------------- --- -2.31.1 - diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/run-ptest b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.0.0/run-ptest index f6ade0c7e4..f6ade0c7e4 100755 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/run-ptest +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.0.0/run-ptest diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch deleted file mode 100644 index d3d339d56d..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1ebf1a1df17afd8b89f84b1928a89069035bf20b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 12 Dec 2020 16:15:57 -0800 -Subject: [PATCH] meson: Fix reallocarray check - -reallocarray() is defined in stdlib.h, so that would be right header to -check for its presense. - -Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/17951] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -501,7 +501,7 @@ foreach ident : [ - #include <sys/stat.h> - #include <unistd.h>'''], - ['explicit_bzero' , '''#include <string.h>'''], -- ['reallocarray', '''#include <malloc.h>'''], -+ ['reallocarray', '''#include <stdlib.h>'''], - ['set_mempolicy', '''#include <stdlib.h> - #include <unistd.h>'''], - ['get_mempolicy', '''#include <stdlib.h> diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0002-src-login-brightness.c-include-sys-wait.h.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0002-src-login-brightness.c-include-sys-wait.h.patch deleted file mode 100644 index dcae668dcb..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0002-src-login-brightness.c-include-sys-wait.h.patch +++ /dev/null @@ -1,25 +0,0 @@ -Include sys/wait.h - -Fixes: -src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'? - 158 | r = sd_event_add_child(w->manager->event, &w->child_event_source, w->child, WEXITED, on_brightness_writer_exit, w); - | ^~~~~~~ - -Upstream-Status: Pending - -Signed-off-by: Scott Murray <scott.murray@konsulko.com> ---- - src/login/logind-brightness.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c -index 8dfa97d7ae..bddd4a2727 100644 ---- a/src/login/logind-brightness.c -+++ b/src/login/logind-brightness.c -@@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - -+#include <sys/wait.h> - #include "bus-util.h" - #include "device-util.h" - #include "hash-funcs.h" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch deleted file mode 100644 index 2e39f7a2e1..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch +++ /dev/null @@ -1,63 +0,0 @@ -From a9421d55102fc84f77f7c21a2479fcd00652b896 Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Mon, 25 Feb 2019 13:55:12 +0800 -Subject: [PATCH 03/24] missing_type.h: add __compare_fn_t and comparison_fn_t - -Make it work with musl where comparison_fn_t and __compare_fn_t -is not provided. - -Upstream-Status: Inappropriate [musl specific] - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> -[Rebased for v242] -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> ---- - src/basic/missing_type.h | 9 +++++++++ - src/basic/sort-util.h | 1 + - src/journal/catalog.c | 1 + - 3 files changed, 11 insertions(+) - -diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index bf8a6caa1b..2134fe5095 100644 ---- a/src/basic/missing_type.h -+++ b/src/basic/missing_type.h -@@ -10,3 +10,12 @@ - #if !HAVE_CHAR16_T - #define char16_t uint16_t - #endif -+ -+#ifndef __GLIBC__ -+typedef int (*comparison_fn_t)(const void *, const void *); -+#endif -+ -+#ifndef __COMPAR_FN_T -+#define __COMPAR_FN_T -+typedef int (*__compar_fn_t)(const void *, const void *); -+#endif -diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h -index e029f86..7247d40 100644 ---- a/src/basic/sort-util.h -+++ b/src/basic/sort-util.h -@@ -4,6 +4,7 @@ - #include <stdlib.h> - - #include "macro.h" -+#include "missing.h" - - void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, - __compar_d_fn_t compar, void *arg); -diff --git a/src/journal/catalog.c b/src/journal/catalog.c -index 7beffc1e1a..4818a2e5cc 100644 ---- a/src/journal/catalog.c -+++ b/src/journal/catalog.c -@@ -29,6 +29,7 @@ - #include "string-util.h" - #include "strv.h" - #include "tmpfile-util.h" -+#include "missing.h" - - const char * const catalog_file_dirs[] = { - "/usr/local/lib/systemd/catalog/", --- -2.11.0 - diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0003-src-basic-copy.c-include-signal.h.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0003-src-basic-copy.c-include-signal.h.patch deleted file mode 100644 index 7ee0d48fa6..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0003-src-basic-copy.c-include-signal.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -Include signal.h - -Fixes several signal set related errors: -src/basic/copy.c:92:19: error: implicit declaration of function 'sigemptyset' [-Werror=implicit-function-declaration] -src/basic/copy.c:93:19: error: implicit declaration of function 'sigaddset' [-Werror=implicit-function-declaration] -src/basic/copy.c:93:34: error: 'SIGINT' undeclared (first use in this function) -src/basic/copy.c:95:13: error: implicit declaration of function 'sigtimedwait' [-Werror=implicit-function-declaration] - -Upstream-Status: Pending - -Signed-off-by: Scott Murray <scott.murray@konsulko.com> ---- - src/basic/copy.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/basic/copy.c b/src/basic/copy.c -index ca311e021e..3cf7fc1697 100644 ---- a/src/basic/copy.c -+++ b/src/basic/copy.c -@@ -12,6 +12,7 @@ - #include <sys/xattr.h> - #include <time.h> - #include <unistd.h> -+#include <signal.h> - - #include "alloc-util.h" - #include "btrfs-util.h" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0005-src-basic-missing.h-check-for-missing-strndupa.patch deleted file mode 100644 index adfc3b7861..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ /dev/null @@ -1,442 +0,0 @@ -From 399fd3eda3045636a70da438a0fd1406cc332ed1 Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Mon, 25 Feb 2019 14:18:21 +0800 -Subject: [PATCH 05/24] src/basic/missing.h: check for missing strndupa - -include missing.h for definition of strndupa - -Upstream-Status: Inappropriate [musl specific] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> -[Rebased for v242] -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> -[rebased for systemd 243] -Signed-off-by: Scott Murray <scott.murray@konsulko.com> ---- - meson.build | 1 + - src/backlight/backlight.c | 1 + - src/basic/env-util.c | 1 + - src/basic/missing_stdlib.h | 12 ++++++++++++ - src/basic/mkdir.c | 1 + - src/basic/parse-util.c | 1 + - src/basic/proc-cmdline.c | 1 + - src/basic/procfs-util.c | 1 + - src/basic/time-util.c | 1 + - src/core/dbus-cgroup.c | 1 + - src/core/dbus-util.c | 1 + - src/core/kmod-setup.c | 1 + - src/core/service.c | 1 + - src/journal/journalctl.c | 1 + - src/libsystemd/sd-bus/bus-message.c | 1 + - src/libsystemd/sd-bus/bus-objects.c | 1 + - src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + - src/locale/keymap-util.c | 1 + - src/login/pam_systemd.c | 1 + - src/network/generator/network-generator.c | 1 + - src/nspawn/nspawn-settings.c | 1 + - src/shared/dns-domain.c | 1 + - src/shared/journal-importer.c | 1 + - src/shared/logs-show.c | 1 + - src/shared/pager.c | 1 + - src/shared/path-lookup.c | 1 + - src/shared/uid-range.c | 1 + - src/socket-proxy/socket-proxyd.c | 1 + - src/test/test-hexdecoct.c | 1 + - src/udev/udev-builtin-path_id.c | 1 + - src/udev/udev-event.c | 1 + - src/udev/udev-rules.c | 1 + - 32 files changed, 43 insertions(+) - -diff --git a/meson.build b/meson.build -index 7f8c679411..81c061b768 100644 ---- a/meson.build -+++ b/meson.build -@@ -506,6 +506,7 @@ foreach ident : [ - #include <unistd.h>'''], - ['get_mempolicy', '''#include <stdlib.h> - #include <unistd.h>'''], -+ ['strndupa' , '''#include <string.h>'''], - ] - - have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') -diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c -index dfd6805398..c2b2ace6ec 100644 ---- a/src/backlight/backlight.c -+++ b/src/backlight/backlight.c -@@ -17,6 +17,7 @@ - #include "string-util.h" - #include "strv.h" - #include "util.h" -+#include "missing.h" - - static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { - const char *subsystem, *sysname, *value; -diff --git a/src/basic/env-util.c b/src/basic/env-util.c -index a6503cf2b6..ceef9a62c8 100644 ---- a/src/basic/env-util.c -+++ b/src/basic/env-util.c -@@ -16,6 +16,7 @@ - #include "string-util.h" - #include "strv.h" - #include "utf8.h" -+#include "missing.h" - - #define VALID_CHARS_ENV_NAME \ - DIGITS LETTERS \ -diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h -index 188a8d4406..1e16ec287a 100644 ---- a/src/basic/missing_stdlib.h -+++ b/src/basic/missing_stdlib.h -@@ -11,3 +11,15 @@ - # error "neither secure_getenv nor __secure_getenv are available" - # endif - #endif -+ -+/* string.h */ -+#if ! HAVE_STRNDUPA -+#define strndupa(s, n) \ -+ ({ \ -+ const char *__old = (s); \ -+ size_t __len = strnlen(__old, (n)); \ -+ char *__new = (char *)alloca(__len + 1); \ -+ __new[__len] = '\0'; \ -+ (char *)memcpy(__new, __old, __len); \ -+ }) -+#endif -diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c -index 6b82eab640..51c6b78615 100644 ---- a/src/basic/mkdir.c -+++ b/src/basic/mkdir.c -@@ -14,6 +14,7 @@ - #include "stat-util.h" - #include "stdio-util.h" - #include "user-util.h" -+#include "missing.h" - - int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) { - struct stat st; -diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c -index 115a1494a2..07a34bfd53 100644 ---- a/src/basic/parse-util.c -+++ b/src/basic/parse-util.c -@@ -20,6 +20,7 @@ - #include "process-util.h" - #include "stat-util.h" - #include "string-util.h" -+#include "missing.h" - - int parse_boolean(const char *v) { - if (!v) -diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c -index 09169cf963..f411ba897f 100644 ---- a/src/basic/proc-cmdline.c -+++ b/src/basic/proc-cmdline.c -@@ -15,6 +15,7 @@ - #include "string-util.h" - #include "util.h" - #include "virt.h" -+#include "missing.h" - - int proc_cmdline(char **ret) { - const char *e; -diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 7aaf95bfce..42ce53d5aa 100644 ---- a/src/basic/procfs-util.c -+++ b/src/basic/procfs-util.c -@@ -11,6 +11,7 @@ - #include "procfs-util.h" - #include "stdio-util.h" - #include "string-util.h" -+#include "missing.h" - - int procfs_tasks_get_limit(uint64_t *ret) { - _cleanup_free_ char *value = NULL; -diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 3018e81acb..4e2b3b66c1 100644 ---- a/src/basic/time-util.c -+++ b/src/basic/time-util.c -@@ -28,6 +28,7 @@ - #include "string-util.h" - #include "strv.h" - #include "time-util.h" -+#include "missing.h" - - static clockid_t map_clock_id(clockid_t c) { - -diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index 2f2313c599..c9937f9d62 100644 ---- a/src/core/dbus-cgroup.c -+++ b/src/core/dbus-cgroup.c -@@ -15,6 +15,7 @@ - #include "fileio.h" - #include "limits-util.h" - #include "path-util.h" -+#include "missing.h" - - static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy); - -diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c -index 7862beaacb..19f6968cfe 100644 ---- a/src/core/dbus-util.c -+++ b/src/core/dbus-util.c -@@ -7,6 +7,7 @@ - #include "unit-printf.h" - #include "user-util.h" - #include "unit.h" -+#include "missing.h" - - int bus_property_get_triggered_unit( - sd_bus *bus, -diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c -index a91cfebc67..a45961013f 100644 ---- a/src/core/kmod-setup.c -+++ b/src/core/kmod-setup.c -@@ -11,6 +11,7 @@ - #include "kmod-setup.h" - #include "macro.h" - #include "string-util.h" -+#include "missing.h" - - #if HAVE_KMOD - #include <libkmod.h> -diff --git a/src/core/service.c b/src/core/service.c -index 73b3c9c316..ef74f00a08 100644 ---- a/src/core/service.c -+++ b/src/core/service.c -@@ -43,6 +43,7 @@ - #include "unit.h" - #include "utf8.h" - #include "util.h" -+#include "missing.h" - - static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { - [SERVICE_DEAD] = UNIT_INACTIVE, -diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 6d6bb1cf63..6666349a35 100644 ---- a/src/journal/journalctl.c -+++ b/src/journal/journalctl.c -@@ -70,6 +70,7 @@ - #include "unit-name.h" - #include "user-util.h" - #include "varlink.h" -+#include "missing.h" - - #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) - -diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c -index eb029e4453..f31fe9d5a8 100644 ---- a/src/libsystemd/sd-bus/bus-message.c -+++ b/src/libsystemd/sd-bus/bus-message.c -@@ -21,6 +21,7 @@ - #include "strv.h" - #include "time-util.h" - #include "utf8.h" -+#include "missing.h" - - static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); - -diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c -index ae643cacc7..1b752271a5 100644 ---- a/src/libsystemd/sd-bus/bus-objects.c -+++ b/src/libsystemd/sd-bus/bus-objects.c -@@ -13,6 +13,7 @@ - #include "set.h" - #include "string-util.h" - #include "strv.h" -+#include "missing.h" - - static int node_vtable_get_userdata( - sd_bus *bus, -diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c -index 8de0a859ee..4fd0a2e692 100644 ---- a/src/libsystemd/sd-bus/test-bus-benchmark.c -+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c -@@ -14,6 +14,7 @@ - #include "missing_resource.h" - #include "time-util.h" - #include "util.h" -+#include "missing.h" - - #define MAX_SIZE (2*1024*1024) - -diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c -index f8c36c94f5..41f5606aea 100644 ---- a/src/locale/keymap-util.c -+++ b/src/locale/keymap-util.c -@@ -22,6 +22,7 @@ - #include "string-util.h" - #include "strv.h" - #include "tmpfile-util.h" -+#include "missing.h" - - static bool startswith_comma(const char *s, const char *prefix) { - s = startswith(s, prefix); -diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c -index 3f762cbbc3..005cfea658 100644 ---- a/src/login/pam_systemd.c -+++ b/src/login/pam_systemd.c -@@ -28,6 +28,7 @@ - #include "hostname-util.h" - #include "login-util.h" - #include "macro.h" -+#include "missing.h" - #include "parse-util.h" - #include "path-util.h" - #include "process-util.h" -diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c -index 0b5af33566..9c808cd014 100644 ---- a/src/network/generator/network-generator.c -+++ b/src/network/generator/network-generator.c -@@ -13,6 +13,7 @@ - #include "string-table.h" - #include "string-util.h" - #include "strv.h" -+#include "missing.h" - - /* - # .network -diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c -index 3a99736813..279fea4d88 100644 ---- a/src/nspawn/nspawn-settings.c -+++ b/src/nspawn/nspawn-settings.c -@@ -16,6 +16,7 @@ - #include "strv.h" - #include "user-util.h" - #include "util.h" -+#include "missing.h" - - Settings *settings_new(void) { - Settings *s; -diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c -index f62ad0a0f5..f1a27e158d 100644 ---- a/src/shared/dns-domain.c -+++ b/src/shared/dns-domain.c -@@ -24,6 +24,7 @@ - #include "string-util.h" - #include "strv.h" - #include "utf8.h" -+#include "missing.h" - - int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { - const char *n; -diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c -index 7c4fc7021d..a6ff2214df 100644 ---- a/src/shared/journal-importer.c -+++ b/src/shared/journal-importer.c -@@ -14,6 +14,7 @@ - #include "parse-util.h" - #include "string-util.h" - #include "unaligned.h" -+#include "missing.h" - - enum { - IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ -diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c -index b615c70dff..75b26e9c21 100644 ---- a/src/shared/logs-show.c -+++ b/src/shared/logs-show.c -@@ -39,6 +39,7 @@ - #include "time-util.h" - #include "utf8.h" - #include "util.h" -+#include "missing.h" - - /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ - #define PRINT_LINE_THRESHOLD 3 -diff --git a/src/shared/pager.c b/src/shared/pager.c -index 7c20b100b4..e4209d3a95 100644 ---- a/src/shared/pager.c -+++ b/src/shared/pager.c -@@ -25,6 +25,7 @@ - #include "strv.h" - #include "terminal-util.h" - #include "util.h" -+#include "missing.h" - - static pid_t pager_pid = 0; - -diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index 6bf0ff0316..f6c8009cd2 100644 ---- a/src/shared/path-lookup.c -+++ b/src/shared/path-lookup.c -@@ -20,6 +20,7 @@ - #include "tmpfile-util.h" - #include "user-util.h" - #include "util.h" -+#include "missing.h" - - int xdg_user_runtime_dir(char **ret, const char *suffix) { - const char *e; -diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c -index 7cb7d8a477..8b12b91084 100644 ---- a/src/shared/uid-range.c -+++ b/src/shared/uid-range.c -@@ -9,6 +9,7 @@ - #include "sort-util.h" - #include "uid-range.h" - #include "user-util.h" -+#include "missing.h" - - static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { - assert(range); -diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c -index abbbc9f2d6..6179b5851e 100644 ---- a/src/socket-proxy/socket-proxyd.c -+++ b/src/socket-proxy/socket-proxyd.c -@@ -28,6 +28,7 @@ - #include "socket-util.h" - #include "string-util.h" - #include "util.h" -+#include "missing.h" - - #define BUFFER_SIZE (256 * 1024) - -diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c -index 52217429b1..a05e7782f6 100644 ---- a/src/test/test-hexdecoct.c -+++ b/src/test/test-hexdecoct.c -@@ -6,6 +6,7 @@ - #include "hexdecoct.h" - #include "macro.h" - #include "string-util.h" -+#include "missing.h" - - static void test_hexchar(void) { - assert_se(hexchar(0xa) == 'a'); -diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index e8f1ce1354..8693cb02a4 100644 ---- a/src/udev/udev-builtin-path_id.c -+++ b/src/udev/udev-builtin-path_id.c -@@ -23,6 +23,7 @@ - #include "strv.h" - #include "sysexits.h" - #include "udev-builtin.h" -+#include "missing.h" - - _printf_(2,3) - static void path_prepend(char **path, const char *fmt, ...) { -diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c -index 8cfa2cdf23..b0670c77ec 100644 ---- a/src/udev/udev-event.c -+++ b/src/udev/udev-event.c -@@ -35,6 +35,7 @@ - #include "udev-util.h" - #include "udev-watch.h" - #include "user-util.h" -+#include "missing.h" - - typedef struct Spawn { - sd_device *device; -diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index 1642f10535..fe2aa75478 100644 ---- a/src/udev/udev-rules.c -+++ b/src/udev/udev-rules.c -@@ -28,6 +28,7 @@ - #include "udev-event.h" - #include "udev-rules.h" - #include "user-util.h" -+#include "missing.h" - - #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") - diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0006-Include-netinet-if_ether.h.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0006-Include-netinet-if_ether.h.patch deleted file mode 100644 index 6d73d715ce..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0006-Include-netinet-if_ether.h.patch +++ /dev/null @@ -1,227 +0,0 @@ -Include netinet/if_ether.h - -Fixes -/path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' - struct ethhdr { - ^~~~~~ - -and related arphdr, arpreq, and arpreq_old errors -/path/to/systemd/recipe-sysroot/usr/include/net/if_arp.h:22:8: error: redefinition of 'struct arphdr' - struct arphdr { - ^~~~~~ - -The latter requires removing some includes of net/if_arp.h to avoid -conflicting with netinet/if_ether.h. - -Upstream-Status: Inappropriate [musl specific] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> -[rebased for systemd 243] -Signed-off-by: Scott Murray <scott.murray@konsulko.com> - -Upstream-Status: Inappropriate [musl specific] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> -[rebased for systemd 243] -Signed-off-by: Scott Murray <scott.murray@konsulko.com> ---- - src/libsystemd-network/sd-dhcp6-client.c | 1 - - src/libsystemd/sd-netlink/netlink-types.c | 1 + - src/machine/machine-dbus.c | 1 + - src/network/netdev/macsec.c | 1 + - src/network/netdev/netdev.c | 1 + - src/network/networkd-brvlan.c | 1 + - src/network/networkd-dhcp-common.c | 1 + - src/network/networkd-dhcp4.c | 2 +- - src/network/networkd-dhcp6.c | 2 +- - src/network/networkd-link.c | 2 +- - src/network/networkd-network.c | 1 + - src/shared/ethtool-util.c | 1 + - src/shared/ethtool-util.h | 1 + - src/udev/net/link-config.c | 1 + - src/udev/udev-builtin-net_setup_link.c | 1 + - 15 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c -index d7a5349c70..68b41dfb6c 100644 ---- a/src/libsystemd-network/sd-dhcp6-client.c -+++ b/src/libsystemd-network/sd-dhcp6-client.c -@@ -6,7 +6,6 @@ - #include <errno.h> - #include <string.h> - #include <sys/ioctl.h> --#include <linux/if_arp.h> - #include <linux/if_infiniband.h> - - #include "sd-dhcp6-client.h" -diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c -index de9b8b21ab..f64f6500f7 100644 ---- a/src/libsystemd/sd-netlink/netlink-types.c -+++ b/src/libsystemd/sd-netlink/netlink-types.c -@@ -3,6 +3,7 @@ - #include <netinet/in.h> - #include <stdint.h> - #include <sys/socket.h> -+#include <netinet/if_ether.h> - #include <linux/can/vxcan.h> - #include <linux/netlink.h> - #include <linux/rtnetlink.h> -diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index 0d58b5eb8b..01093c1f62 100644 ---- a/src/machine/machine-dbus.c -+++ b/src/machine/machine-dbus.c -@@ -4,6 +4,7 @@ - #include <string.h> - #include <sys/mount.h> - #include <sys/wait.h> -+#include <netinet/if_ether.h> - - /* When we include libgen.h because we need dirname() we immediately - * undefine basename() since libgen.h defines it as a macro to the POSIX -diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c -index cf281e75a6..269dc618ff 100644 ---- a/src/network/netdev/macsec.c -+++ b/src/network/netdev/macsec.c -@@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - -+#include <netinet/if_ether.h> - #include <netinet/in.h> - #include <linux/if_ether.h> - #include <linux/if_macsec.h> -diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c -index 7735b455b7..ed4eda4a44 100644 ---- a/src/network/netdev/netdev.c -+++ b/src/network/netdev/netdev.c -@@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - -+#include <netinet/if_ether.h> - #include <net/if.h> - #include <netinet/in.h> - -diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c -index c3c5d535ac..ebea408c89 100644 ---- a/src/network/networkd-brvlan.c -+++ b/src/network/networkd-brvlan.c -@@ -4,6 +4,7 @@ - ***/ - - #include <netinet/in.h> -+#include <netinet/if_ether.h> - #include <linux/if_bridge.h> - #include <stdbool.h> - -diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c -index 626b975839..42fe92f320 100644 ---- a/src/network/networkd-dhcp-common.c -+++ b/src/network/networkd-dhcp-common.c -@@ -1,6 +1,7 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - - #include "networkd-dhcp-common.h" -+#include <netinet/if_ether.h> - #include "networkd-network.h" - #include "parse-util.h" - #include "string-table.h" -diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c -index 662770b50e..c6ab62a94d 100644 ---- a/src/network/networkd-dhcp4.c -+++ b/src/network/networkd-dhcp4.c -@@ -1,8 +1,8 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - -+#include <netinet/if_ether.h> - #include <netinet/in.h> - #include <linux/if.h> --#include <linux/if_arp.h> - - #include "alloc-util.h" - #include "hostname-util.h" -diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c -index 8ad736a82b..f41b4d834e 100644 ---- a/src/network/networkd-dhcp6.c -+++ b/src/network/networkd-dhcp6.c -@@ -3,9 +3,9 @@ - Copyright © 2014 Intel Corporation. All rights reserved. - ***/ - -+#include <netinet/if_ether.h> - #include <netinet/in.h> - #include <linux/if.h> --#include <linux/if_arp.h> - #include "sd-radv.h" - - #include "sd-dhcp6-client.h" -diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index f5bb78890a..f13a36b791 100644 ---- a/src/network/networkd-link.c -+++ b/src/network/networkd-link.c -@@ -1,8 +1,8 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - -+#include <netinet/if_ether.h> - #include <netinet/in.h> - #include <linux/if.h> --#include <linux/if_arp.h> - #include <unistd.h> - - #include "alloc-util.h" -diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c -index 2b8d0eb2fb..2f79ef25cd 100644 ---- a/src/network/networkd-network.c -+++ b/src/network/networkd-network.c -@@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - -+#include <netinet/if_ether.h> - #include <net/if.h> - #include <netinet/in.h> - #include <linux/netdevice.h> -diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c -index b0961df72e..53fcbbd84b 100644 ---- a/src/shared/ethtool-util.c -+++ b/src/shared/ethtool-util.c -@@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - -+#include <netinet/if_ether.h> - #include <net/if.h> - #include <sys/ioctl.h> - #include <linux/ethtool.h> -diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h -index 8b32b243f3..262b819976 100644 ---- a/src/shared/ethtool-util.h -+++ b/src/shared/ethtool-util.h -@@ -2,6 +2,7 @@ - #pragma once - - #include <macro.h> -+#include <netinet/if_ether.h> - #include <linux/ethtool.h> - - #include "conf-parser.h" -diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c -index d44af64d5e..fd052f1591 100644 ---- a/src/udev/net/link-config.c -+++ b/src/udev/net/link-config.c -@@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - -+#include <netinet/if_ether.h> - #include <linux/netdevice.h> - #include <netinet/ether.h> - -diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c -index ee3ca9fa38..9aa4e82874 100644 ---- a/src/udev/udev-builtin-net_setup_link.c -+++ b/src/udev/udev-builtin-net_setup_link.c -@@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - -+#include <netinet/if_ether.h> - #include "device-util.h" - #include "alloc-util.h" - #include "link-config.h" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch deleted file mode 100644 index ae449791f1..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -Date: Mon, 12 Apr 2021 14:03:32 +0200 -Subject: [PATCH] meson: do not fail if rsync is not installed with meson - 0.57.2 - -https://github.com/mesonbuild/meson/issues/8641 - -Our CI started to fail. Even if the change is reverted in meson, -we need a quick workaround here. - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - man/meson.build | 25 ++++++++++++++----------- - 1 file changed, 14 insertions(+), 11 deletions(-) - -diff --git a/man/meson.build b/man/meson.build -index 3cae8446cda..f9c4b83dc81 100644 ---- a/man/meson.build -+++ b/man/meson.build -@@ -184,17 +184,20 @@ html = custom_target( - depends : html_pages, - command : ['echo']) - --run_target( -- 'doc-sync', -- depends : man_pages + html_pages, -- command : ['rsync', '-rlv', -- '--delete-excluded', -- '--include=man', -- '--include=*.html', -- '--exclude=*', -- '--omit-dir-times', -- meson.current_build_dir(), -- get_option('www-target')]) -+rsync = find_program('rsync', required : false) -+if rsync.found() -+ run_target( -+ 'doc-sync', -+ depends : man_pages + html_pages, -+ command : [rsync, '-rlv', -+ '--delete-excluded', -+ '--include=man', -+ '--include=*.html', -+ '--exclude=*', -+ '--omit-dir-times', -+ meson.current_build_dir(), -+ get_option('www-target')]) -+endif - - ############################################################ - diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/static-libsystemd-pkgconfig.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/static-libsystemd-pkgconfig.patch deleted file mode 100644 index eb018bbcc4..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/static-libsystemd-pkgconfig.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: git/src/libsystemd/libsystemd.pc.in -=================================================================== ---- git.orig/src/libsystemd/libsystemd.pc.in -+++ git/src/libsystemd/libsystemd.pc.in -@@ -16,5 +16,5 @@ Name: systemd - Description: systemd Library - URL: @PROJECT_URL@ - Version: @PROJECT_VERSION@ --Libs: -L${libdir} -lsystemd -+Libs: -L${libdir} -lsystemd -lrt -lmount -lcap - Cflags: -I${includedir} diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-Adjust-for-musl-headers.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-Adjust-for-musl-headers.patch new file mode 100644 index 0000000000..2363679c98 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-Adjust-for-musl-headers.patch @@ -0,0 +1,453 @@ +From 4c2e932664ec67662f4a0306cca4a7cd82853bda Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 21 Jan 2022 22:19:37 -0800 +Subject: [PATCH] Adjust for musl headers + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/libsystemd-network/sd-dhcp6-client.c | 2 +- + src/network/netdev/bareudp.c | 2 +- + src/network/netdev/batadv.c | 2 +- + src/network/netdev/bond.c | 2 +- + src/network/netdev/bridge.c | 2 +- + src/network/netdev/dummy.c | 2 +- + src/network/netdev/geneve.c | 2 +- + src/network/netdev/ifb.c | 2 +- + src/network/netdev/ipoib.c | 2 +- + src/network/netdev/ipvlan.c | 2 +- + src/network/netdev/macsec.c | 2 +- + src/network/netdev/macvlan.c | 2 +- + src/network/netdev/netdev.c | 2 +- + src/network/netdev/netdevsim.c | 2 +- + src/network/netdev/nlmon.c | 2 +- + src/network/netdev/tunnel.c | 2 +- + src/network/netdev/vcan.c | 2 +- + src/network/netdev/veth.c | 2 +- + src/network/netdev/vlan.c | 2 +- + src/network/netdev/vrf.c | 2 +- + src/network/netdev/vxcan.c | 2 +- + src/network/netdev/vxlan.c | 2 +- + src/network/netdev/xfrm.c | 2 +- + src/network/networkd-bridge-mdb.c | 4 ++-- + src/network/networkd-dhcp-common.c | 3 ++- + src/network/networkd-dhcp-prefix-delegation.c | 4 ++-- + src/network/networkd-dhcp-server.c | 2 +- + src/network/networkd-dhcp4.c | 2 +- + src/network/networkd-link.c | 2 +- + src/network/networkd-route.c | 8 ++++---- + src/network/networkd-setlink.c | 2 +- + src/shared/linux/ethtool.h | 3 ++- + src/shared/netif-util.c | 2 +- + src/udev/udev-builtin-net_id.c | 2 +- + 34 files changed, 41 insertions(+), 39 deletions(-) + +--- a/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/libsystemd-network/sd-dhcp6-client.c +@@ -5,7 +5,7 @@ + + #include <errno.h> + #include <sys/ioctl.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + #include <linux/if_infiniband.h> + + #include "sd-dhcp6-client.h" +--- a/src/network/netdev/bareudp.c ++++ b/src/network/netdev/bareudp.c +@@ -2,7 +2,7 @@ + * Copyright © 2020 VMware, Inc. */ + + #include <netinet/in.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "bareudp.h" + #include "netlink-util.h" +--- a/src/network/netdev/batadv.c ++++ b/src/network/netdev/batadv.c +@@ -3,7 +3,7 @@ + #include <inttypes.h> + #include <netinet/in.h> + #include <linux/genetlink.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "batadv.h" + #include "fileio.h" +--- a/src/network/netdev/bond.c ++++ b/src/network/netdev/bond.c +@@ -1,7 +1,7 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + + #include <netinet/in.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "alloc-util.h" + #include "bond.h" +--- a/src/network/netdev/bridge.c ++++ b/src/network/netdev/bridge.c +@@ -2,7 +2,7 @@ + + #include <net/if.h> + #include <netinet/in.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + #include <linux/if_bridge.h> + + #include "bridge.h" +--- a/src/network/netdev/dummy.c ++++ b/src/network/netdev/dummy.c +@@ -1,6 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "dummy.h" + +--- a/src/network/netdev/geneve.c ++++ b/src/network/netdev/geneve.c +@@ -2,7 +2,7 @@ + + #include <net/if.h> + #include <netinet/in.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "alloc-util.h" + #include "conf-parser.h" +--- a/src/network/netdev/ifb.c ++++ b/src/network/netdev/ifb.c +@@ -1,7 +1,7 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright © 2019 VMware, Inc. */ + +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "ifb.h" + +--- a/src/network/netdev/ipoib.c ++++ b/src/network/netdev/ipoib.c +@@ -1,6 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + #include <linux/if_link.h> + + #include "ipoib.h" +--- a/src/network/netdev/ipvlan.c ++++ b/src/network/netdev/ipvlan.c +@@ -2,7 +2,7 @@ + + #include <net/if.h> + #include <netinet/in.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "conf-parser.h" + #include "ipvlan.h" +--- a/src/network/netdev/macsec.c ++++ b/src/network/netdev/macsec.c +@@ -1,7 +1,7 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + + #include <netinet/in.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + #include <linux/if_ether.h> + #include <linux/if_macsec.h> + #include <linux/genetlink.h> +--- a/src/network/netdev/macvlan.c ++++ b/src/network/netdev/macvlan.c +@@ -2,7 +2,7 @@ + + #include <net/if.h> + #include <netinet/in.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "conf-parser.h" + #include "macvlan.h" +--- a/src/network/netdev/netdev.c ++++ b/src/network/netdev/netdev.c +@@ -2,7 +2,7 @@ + + #include <net/if.h> + #include <netinet/in.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + #include <unistd.h> + + #include "alloc-util.h" +--- a/src/network/netdev/netdevsim.c ++++ b/src/network/netdev/netdevsim.c +@@ -1,6 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "netdevsim.h" + +--- a/src/network/netdev/nlmon.c ++++ b/src/network/netdev/nlmon.c +@@ -1,6 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "nlmon.h" + +--- a/src/network/netdev/tunnel.c ++++ b/src/network/netdev/tunnel.c +@@ -2,7 +2,7 @@ + + #include <netinet/in.h> + #include <linux/fou.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + #include <linux/if_tunnel.h> + #include <linux/ip.h> + #include <linux/ip6_tunnel.h> +--- a/src/network/netdev/vcan.c ++++ b/src/network/netdev/vcan.c +@@ -1,6 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "vcan.h" + +--- a/src/network/netdev/veth.c ++++ b/src/network/netdev/veth.c +@@ -3,7 +3,7 @@ + #include <errno.h> + #include <net/if.h> + #include <netinet/in.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + #include <linux/veth.h> + + #include "netlink-util.h" +--- a/src/network/netdev/vlan.c ++++ b/src/network/netdev/vlan.c +@@ -2,7 +2,7 @@ + + #include <errno.h> + #include <net/if.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + #include <linux/if_vlan.h> + + #include "parse-util.h" +--- a/src/network/netdev/vrf.c ++++ b/src/network/netdev/vrf.c +@@ -2,7 +2,7 @@ + + #include <net/if.h> + #include <netinet/in.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "vrf.h" + +--- a/src/network/netdev/vxcan.c ++++ b/src/network/netdev/vxcan.c +@@ -1,7 +1,7 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + + #include <linux/can/vxcan.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "vxcan.h" + +--- a/src/network/netdev/vxlan.c ++++ b/src/network/netdev/vxlan.c +@@ -2,7 +2,7 @@ + + #include <net/if.h> + #include <netinet/in.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "conf-parser.h" + #include "alloc-util.h" +--- a/src/network/netdev/xfrm.c ++++ b/src/network/netdev/xfrm.c +@@ -1,6 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "missing_network.h" + #include "xfrm.h" +--- a/src/network/networkd-bridge-mdb.c ++++ b/src/network/networkd-bridge-mdb.c +@@ -1,7 +1,5 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + +-#include <net/if.h> +-#include <linux/if_bridge.h> + + #include "netlink-util.h" + #include "networkd-bridge-mdb.h" +@@ -11,6 +9,8 @@ + #include "networkd-queue.h" + #include "string-util.h" + #include "vlan-util.h" ++#include <net/if.h> ++#include <linux/if_bridge.h> + + #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U + +--- a/src/network/networkd-dhcp-common.c ++++ b/src/network/networkd-dhcp-common.c +@@ -1,7 +1,8 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + + #include <netinet/in.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> ++#include <net/if.h> + + #include "bus-error.h" + #include "dhcp-identifier.h" +--- a/src/network/networkd-dhcp-prefix-delegation.c ++++ b/src/network/networkd-dhcp-prefix-delegation.c +@@ -1,7 +1,5 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + +-#include <linux/ipv6_route.h> +- + #include "sd-dhcp6-client.h" + + #include "hashmap.h" +@@ -21,6 +19,8 @@ + #include "strv.h" + #include "tunnel.h" + ++#include <linux/ipv6_route.h> ++ + bool link_dhcp_pd_is_enabled(Link *link) { + assert(link); + +--- a/src/network/networkd-dhcp-server.c ++++ b/src/network/networkd-dhcp-server.c +@@ -1,7 +1,7 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + + #include <netinet/in.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + #include <linux/if.h> + + #include "sd-dhcp-server.h" +--- a/src/network/networkd-dhcp4.c ++++ b/src/network/networkd-dhcp4.c +@@ -3,7 +3,7 @@ + #include <netinet/in.h> + #include <netinet/ip.h> + #include <linux/if.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "alloc-util.h" + #include "dhcp-client-internal.h" +--- a/src/network/networkd-link.c ++++ b/src/network/networkd-link.c +@@ -3,7 +3,7 @@ + #include <net/if.h> + #include <netinet/in.h> + #include <linux/if.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + #include <linux/if_link.h> + #include <linux/netdevice.h> + #include <sys/socket.h> +--- a/src/network/networkd-route.c ++++ b/src/network/networkd-route.c +@@ -1,9 +1,5 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + +-#include <linux/icmpv6.h> +-#include <linux/ipv6_route.h> +-#include <linux/nexthop.h> +- + #include "alloc-util.h" + #include "event-util.h" + #include "netlink-util.h" +@@ -21,6 +17,10 @@ + #include "vrf.h" + #include "wireguard.h" + ++#include <linux/icmpv6.h> ++#include <linux/ipv6_route.h> ++#include <linux/nexthop.h> ++ + int route_new(Route **ret) { + _cleanup_(route_freep) Route *route = NULL; + +--- a/src/network/networkd-setlink.c ++++ b/src/network/networkd-setlink.c +@@ -2,7 +2,7 @@ + + #include <netinet/in.h> + #include <linux/if.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + #include <linux/if_bridge.h> + + #include "missing_network.h" +--- a/src/shared/linux/ethtool.h ++++ b/src/shared/linux/ethtool.h +@@ -16,7 +16,8 @@ + + #include <linux/kernel.h> + #include <linux/types.h> +-#include <linux/if_ether.h> ++#include <netinet/if_ether.h> ++//#include <linux/if_ether.h> + + #ifndef __KERNEL__ + #include <limits.h> /* for INT_MAX */ +--- a/src/shared/netif-util.c ++++ b/src/shared/netif-util.c +@@ -1,6 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + + #include "arphrd-util.h" + #include "device-util.h" +--- a/src/udev/udev-builtin-net_id.c ++++ b/src/udev/udev-builtin-net_id.c +@@ -18,7 +18,7 @@ + #include <stdarg.h> + #include <unistd.h> + #include <linux/if.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + #include <linux/netdevice.h> + #include <linux/pci_regs.h> + +--- a/src/network/netdev/wireguard.c ++++ b/src/network/netdev/wireguard.c +@@ -6,7 +6,7 @@ + #include <sys/ioctl.h> + #include <net/if.h> + #include <netinet/in.h> +-#include <linux/if_arp.h> ++//#include <linux/if_arp.h> + #include <linux/ipv6_route.h> + + #include "sd-resolve.h" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-pass-correct-parameters-to-getdents64.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-pass-correct-parameters-to-getdents64.patch new file mode 100644 index 0000000000..03a29b5327 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-pass-correct-parameters-to-getdents64.patch @@ -0,0 +1,50 @@ +From fbc10748c7c59d82024a4d35146b8dfef8d52927 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 21 Jan 2022 15:15:11 -0800 +Subject: [PATCH 1/2] pass correct parameters to getdents64 + +Fixes +../git/src/basic/recurse-dir.c:57:40: error: incompatible pointer types passing 'uint8_t *' (aka 'unsigned char *') to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types] + n = getdents64(dir_fd, (uint8_t*) de->buffer + de->buffer_size, bs - de->buffer_size); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +../git/src/basic/stat-util.c:102:28: error: incompatible pointer types passing 'union (unnamed union at ../git/src/basic/stat-util.c:78:9) *' to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types] + n = getdents64(fd, &buffer, sizeof(buffer)); + ^~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/basic/recurse-dir.c | 2 +- + src/basic/stat-util.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c +index efa1797b7b..797285e3be 100644 +--- a/src/basic/recurse-dir.c ++++ b/src/basic/recurse-dir.c +@@ -54,7 +54,7 @@ int readdir_all(int dir_fd, + bs = MIN(MALLOC_SIZEOF_SAFE(de) - offsetof(DirectoryEntries, buffer), (size_t) SSIZE_MAX); + assert(bs > de->buffer_size); + +- n = getdents64(dir_fd, (uint8_t*) de->buffer + de->buffer_size, bs - de->buffer_size); ++ n = getdents64(dir_fd, de->buffer + de->buffer_size, bs - de->buffer_size); + if (n < 0) + return -errno; + if (n == 0) +diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c +index efac7b002e..9e1fe7f5a0 100644 +--- a/src/basic/stat-util.c ++++ b/src/basic/stat-util.c +@@ -99,7 +99,7 @@ int dir_is_empty_at(int dir_fd, const char *path) { + return fd; + } + +- n = getdents64(fd, &buffer, sizeof(buffer)); ++ n = getdents64(fd, (struct dirent *)&buffer, sizeof(buffer)); + if (n < 0) + return -errno; + +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0002-Add-sys-stat.h-for-S_IFDIR.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0002-Add-sys-stat.h-for-S_IFDIR.patch new file mode 100644 index 0000000000..7dfa1a0df2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0002-Add-sys-stat.h-for-S_IFDIR.patch @@ -0,0 +1,29 @@ +From d16f7b37c917b91e951b9313e2c8264c72ed93e5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 21 Jan 2022 15:17:37 -0800 +Subject: [PATCH 2/2] Add sys/stat.h for S_IFDIR + +../git/src/shared/mkdir-label.c:13:61: error: use of undeclared identifier 'S_IFDIR' + r = mac_selinux_create_file_prepare_at(dirfd, path, S_IFDIR); + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/shared/mkdir-label.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/shared/mkdir-label.c b/src/shared/mkdir-label.c +index d36a6466d7..63b764cd83 100644 +--- a/src/shared/mkdir-label.c ++++ b/src/shared/mkdir-label.c +@@ -4,6 +4,7 @@ + #include "selinux-util.h" + #include "smack-util.h" + #include "user-util.h" ++#include <sys/stat.h> + + int mkdirat_label(int dirfd, const char *path, mode_t mode) { + int r; +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0002-don-t-use-glibc-specific-qsort_r.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0002-don-t-use-glibc-specific-qsort_r.patch index c6213ab88e..5027682df2 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0002-don-t-use-glibc-specific-qsort_r.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0002-don-t-use-glibc-specific-qsort_r.patch @@ -1,7 +1,7 @@ -From 1eb84534dea05d41afed1d898cba212ad7d310dd Mon Sep 17 00:00:00 2001 +From 5d730902f47498a2866b46875352f6810a01d67c Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 13:41:41 +0800 -Subject: [PATCH 02/24] don't use glibc-specific qsort_r +Subject: [PATCH] don't use glibc-specific qsort_r Upstream-Status: Inappropriate [musl specific] @@ -10,22 +10,22 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> [Rebased for v242] Signed-off-by: Andrej Valek <andrej.valek@siemens.com> +[Rebased for v247] +Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> + --- - src/basic/sort-util.h | 14 -------------- - src/libsystemd/sd-hwdb/hwdb-util.c | 19 ++++++++++++++----- - src/shared/format-table.c | 36 ++++++++++++++++++++++++------------ + src/basic/sort-util.h | 14 -------------- + src/shared/format-table.c | 36 ++++++++++++++++++++++++------------ + src/shared/hwdb-util.c | 19 ++++++++++++++----- 3 files changed, 38 insertions(+), 31 deletions(-) -diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h -index e029f8646e..27d68b341c 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h -@@ -54,17 +54,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn - int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \ - qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ +@@ -61,18 +61,4 @@ static inline void _qsort_safe(void *bas + _qsort_safe((p), (n), sizeof((p)[0]), (comparison_fn_t) _func_); \ }) -- --static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *userdata) { + +-static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, comparison_userdata_fn_t compar, void *userdata) { - if (nmemb <= 1) - return; - @@ -36,57 +36,13 @@ index e029f8646e..27d68b341c 100644 -#define typesafe_qsort_r(p, n, func, userdata) \ - ({ \ - int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \ -- qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ +- qsort_r_safe((p), (n), sizeof((p)[0]), (comparison_userdata_fn_t) _func_, userdata); \ - }) -diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c -index c83575c7c8..72f8f3a050 100644 ---- a/src/libsystemd/sd-hwdb/hwdb-util.c -+++ b/src/libsystemd/sd-hwdb/hwdb-util.c -@@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) { - - DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); - --static int trie_values_cmp(const struct trie_value_entry *a, const struct trie_value_entry *b, struct trie *trie) { -- return strcmp(trie->strings->buf + a->key_off, -- trie->strings->buf + b->key_off); -+static struct trie *trie_node_add_value_trie; -+static int trie_values_cmp(const void *v1, const void *v2) { -+ const struct trie_value_entry *a = v1; -+ const struct trie_value_entry *b = v2; -+ -+ return strcmp(trie_node_add_value_trie->strings->buf + a->key_off, -+ trie_node_add_value_trie->strings->buf + b->key_off); - } - - static int trie_node_add_value(struct trie *trie, struct trie_node *node, -@@ -158,7 +162,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, - .value_off = v, - }; - -- val = typesafe_bsearch_r(&search, node->values, node->values_count, trie_values_cmp, trie); -+ trie_node_add_value_trie = trie; -+ val = bsearch(&search, node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); -+ trie_node_add_value_trie = NULL; -+ - if (val) { - /* At this point we have 2 identical properties on the same match-string. - * Since we process files in order, we just replace the previous value. */ -@@ -184,7 +191,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, - .line_number = line_number, - }; - node->values_count++; -- typesafe_qsort_r(node->values, node->values_count, trie_values_cmp, trie); -+ trie_node_add_value_trie = trie; -+ qsort(node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); -+ trie_node_add_value_trie = NULL; - return 0; - } - -diff --git a/src/shared/format-table.c b/src/shared/format-table.c -index a5c0a99b08..d595cbe372 100644 +- + int cmp_int(const int *a, const int *b); --- a/src/shared/format-table.c +++ b/src/shared/format-table.c -@@ -850,31 +850,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t +@@ -1324,30 +1324,32 @@ static int cell_data_compare(TableData * return CMP(index_a, index_b); } @@ -94,7 +50,6 @@ index a5c0a99b08..d595cbe372 100644 +static Table *user_table; +static int table_data_compare(const void *x, const void *y) { + const size_t *a = x, *b=y; - size_t i; int r; - assert(t); @@ -114,8 +69,8 @@ index a5c0a99b08..d595cbe372 100644 return 1; /* Order other lines by the sorting map */ -- for (i = 0; i < t->n_sort_map; i++) { -+ for (i = 0; i < user_table->n_sort_map; i++) { +- for (size_t i = 0; i < t->n_sort_map; i++) { ++ for (size_t i = 0; i < user_table->n_sort_map; i++) { TableData *d, *dd; - d = t->data[*a + t->sort_map[i]]; @@ -130,8 +85,8 @@ index a5c0a99b08..d595cbe372 100644 } /* Order identical lines by the order there were originally added in */ -@@ -1107,7 +1109,12 @@ int table_print(Table *t, FILE *f) { - for (i = 0; i < n_rows; i++) +@@ -2009,7 +2011,12 @@ int table_print(Table *t, FILE *f) { + for (size_t i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; - typesafe_qsort_r(sorted, n_rows, table_data_compare, t); @@ -144,8 +99,8 @@ index a5c0a99b08..d595cbe372 100644 } if (t->display_map) -@@ -1534,7 +1541,12 @@ int table_to_json(Table *t, JsonVariant **ret) { - for (i = 0; i < n_rows; i++) +@@ -2647,7 +2654,12 @@ int table_to_json(Table *t, JsonVariant + for (size_t i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; - typesafe_qsort_r(sorted, n_rows, table_data_compare, t); @@ -158,6 +113,45 @@ index a5c0a99b08..d595cbe372 100644 } if (t->display_map) --- -2.11.0 - +--- a/src/shared/hwdb-util.c ++++ b/src/shared/hwdb-util.c +@@ -127,9 +127,13 @@ static struct trie* trie_free(struct tri + + DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); + +-static int trie_values_cmp(const struct trie_value_entry *a, const struct trie_value_entry *b, struct trie *trie) { +- return strcmp(trie->strings->buf + a->key_off, +- trie->strings->buf + b->key_off); ++static struct trie *trie_node_add_value_trie; ++static int trie_values_cmp(const void *v1, const void *v2) { ++ const struct trie_value_entry *a = v1; ++ const struct trie_value_entry *b = v2; ++ ++ return strcmp(trie_node_add_value_trie->strings->buf + a->key_off, ++ trie_node_add_value_trie->strings->buf + b->key_off); + } + + static int trie_node_add_value(struct trie *trie, struct trie_node *node, +@@ -157,7 +161,10 @@ static int trie_node_add_value(struct tr + .value_off = v, + }; + +- val = typesafe_bsearch_r(&search, node->values, node->values_count, trie_values_cmp, trie); ++ trie_node_add_value_trie = trie; ++ val = bsearch(&search, node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); ++ trie_node_add_value_trie = NULL; ++ + if (val) { + /* At this point we have 2 identical properties on the same match-string. + * Since we process files in order, we just replace the previous value. */ +@@ -183,7 +190,9 @@ static int trie_node_add_value(struct tr + .line_number = line_number, + }; + node->values_count++; +- typesafe_qsort_r(node->values, node->values_count, trie_values_cmp, trie); ++ trie_node_add_value_trie = trie; ++ qsort(node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); ++ trie_node_add_value_trie = NULL; + return 0; + } + diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch new file mode 100644 index 0000000000..f3edc7d82b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch @@ -0,0 +1,68 @@ +From 3b42a888685aee1776a12cff84a5fe0063378483 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Mon, 25 Feb 2019 13:55:12 +0800 +Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t + +Make it work with musl where comparison_fn_t and __compare_fn_t +is not provided. + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +[Rebased for v244] +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +[Rebased for v242] +Signed-off-by: Andrej Valek <andrej.valek@siemens.com> + +--- + src/basic/missing_type.h | 9 +++++++++ + src/basic/sort-util.h | 1 + + src/core/kmod-setup.c | 1 + + src/libsystemd/sd-journal/catalog.c | 1 + + 4 files changed, 12 insertions(+) + +--- a/src/basic/missing_type.h ++++ b/src/basic/missing_type.h +@@ -10,3 +10,12 @@ + #if !HAVE_CHAR16_T + #define char16_t uint16_t + #endif ++ ++#ifndef __GLIBC__ ++typedef int (*comparison_fn_t)(const void *, const void *); ++#endif ++ ++#ifndef __COMPAR_FN_T ++#define __COMPAR_FN_T ++typedef int (*__compar_fn_t)(const void *, const void *); ++#endif +--- a/src/basic/sort-util.h ++++ b/src/basic/sort-util.h +@@ -4,6 +4,7 @@ + #include <stdlib.h> + + #include "macro.h" ++#include "missing_type.h" + + /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the + * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -10,6 +10,7 @@ + #include "macro.h" + #include "recurse-dir.h" + #include "string-util.h" ++#include "missing_type.h" + + #if HAVE_KMOD + #include "module-util.h" +--- a/src/libsystemd/sd-journal/catalog.c ++++ b/src/libsystemd/sd-journal/catalog.c +@@ -28,6 +28,7 @@ + #include "string-util.h" + #include "strv.h" + #include "tmpfile-util.h" ++#include "missing_type.h" + + const char * const catalog_file_dirs[] = { + "/usr/local/lib/systemd/catalog/", diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0004-add-fallback-parse_printf_format-implementation.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0004-add-fallback-parse_printf_format-implementation.patch index a2aad40ac2..d93f630752 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0004-add-fallback-parse_printf_format-implementation.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0004-add-fallback-parse_printf_format-implementation.patch @@ -1,7 +1,7 @@ -From 7bcf3b166694090497a0acd2c5299e4e04fcc9b6 Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Mon, 25 Feb 2019 14:04:21 +0800 -Subject: [PATCH 04/24] add fallback parse_printf_format implementation +From 3e0df2c22bfd37bc62bf09a01ec498e40d3599de Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Sat, 22 May 2021 20:26:24 +0200 +Subject: [PATCH] add fallback parse_printf_format implementation Upstream-Status: Inappropriate [musl specific] @@ -10,22 +10,21 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> [rebased for systemd 243] Signed-off-by: Scott Murray <scott.murray@konsulko.com> + --- - meson.build | 1 + - src/basic/meson.build | 5 + - src/basic/parse-printf-format.c | 273 ++++++++++++++++++++++++++++++++++++++++ - src/basic/parse-printf-format.h | 57 +++++++++ - src/basic/stdio-util.h | 2 +- - src/journal/journal-send.c | 2 +- + meson.build | 1 + + src/basic/meson.build | 5 + + src/basic/parse-printf-format.c | 273 +++++++++++++++++++++++ + src/basic/parse-printf-format.h | 57 +++++ + src/basic/stdio-util.h | 2 +- + src/libsystemd/sd-journal/journal-send.c | 2 +- 6 files changed, 338 insertions(+), 2 deletions(-) create mode 100644 src/basic/parse-printf-format.c create mode 100644 src/basic/parse-printf-format.h -diff --git a/meson.build b/meson.build -index 79b762faeb..7f8c679411 100644 --- a/meson.build +++ b/meson.build -@@ -613,6 +613,7 @@ endif +@@ -686,6 +686,7 @@ endif foreach header : ['crypt.h', 'linux/memfd.h', 'linux/vm_sockets.h', @@ -33,25 +32,20 @@ index 79b762faeb..7f8c679411 100644 'sys/auxv.h', 'valgrind/memcheck.h', 'valgrind/valgrind.h', -diff --git a/src/basic/meson.build b/src/basic/meson.build -index d6caf28f14..32c1acf349 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build -@@ -312,6 +312,11 @@ foreach item : [['af', af_list_txt, 'af', ''], - endforeach +@@ -335,6 +335,11 @@ endforeach basic_sources += generated_gperf_headers -+ + +if conf.get('HAVE_PRINTF_H') != 1 + basic_sources += [files('parse-printf-format.c')] +endif + - basic_gcrypt_sources = files( - 'gcrypt-util.c', - 'gcrypt-util.h') -diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c -new file mode 100644 -index 0000000000..49437e5445 ++ + ############################################################ + + arch_list = [ --- /dev/null +++ b/src/basic/parse-printf-format.c @@ -0,0 +1,273 @@ @@ -328,9 +322,6 @@ index 0000000000..49437e5445 + + return last; +} -diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h -new file mode 100644 -index 0000000000..47be7522d7 --- /dev/null +++ b/src/basic/parse-printf-format.h @@ -0,0 +1,57 @@ @@ -391,12 +382,10 @@ index 0000000000..47be7522d7 +size_t parse_printf_format(const char *fmt, size_t n, int *types); + +#endif /* HAVE_PRINTF_H */ -diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h -index c3b9448d4f..2937aa13b1 100644 --- a/src/basic/stdio-util.h +++ b/src/basic/stdio-util.h @@ -1,13 +1,13 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include <printf.h> @@ -408,20 +397,18 @@ index c3b9448d4f..2937aa13b1 100644 #include "memory-util.h" +#include "parse-printf-format.h" - #define snprintf_ok(buf, len, fmt, ...) \ - ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) -diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c -index 5ef11fa1a4..6384ab620c 100644 ---- a/src/journal/journal-send.c -+++ b/src/journal/journal-send.c + #define snprintf_ok(buf, len, fmt, ...) \ + ({ \ +--- a/src/libsystemd/sd-journal/journal-send.c ++++ b/src/libsystemd/sd-journal/journal-send.c @@ -2,7 +2,6 @@ #include <errno.h> #include <fcntl.h> -#include <printf.h> #include <stddef.h> - #include <sys/socket.h> #include <sys/un.h> + #include <unistd.h> @@ -21,6 +20,7 @@ #include "stdio-util.h" #include "string-util.h" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch new file mode 100644 index 0000000000..36545c2f60 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch @@ -0,0 +1,602 @@ +From cef23a651ea200e30e1e6ed2a2564505e3a42d46 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Mon, 25 Feb 2019 14:18:21 +0800 +Subject: [PATCH] src/basic/missing.h: check for missing strndupa + +include missing.h for definition of strndupa + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +[Rebased for v242] +Signed-off-by: Andrej Valek <andrej.valek@siemens.com> +[rebased for systemd 243] +Signed-off-by: Scott Murray <scott.murray@konsulko.com> +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +[rebased for systemd 244] +[Rebased for v247] +Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> + +--- + meson.build | 1 + + src/backlight/backlight.c | 1 + + src/basic/cgroup-util.c | 1 + + src/basic/env-util.c | 1 + + src/basic/log.c | 1 + + src/basic/missing_stdlib.h | 12 ++++++++++++ + src/basic/mkdir.c | 1 + + src/basic/mountpoint-util.c | 1 + + src/basic/parse-util.c | 1 + + src/basic/path-lookup.c | 1 + + src/basic/percent-util.c | 1 + + src/basic/proc-cmdline.c | 1 + + src/basic/procfs-util.c | 1 + + src/basic/time-util.c | 1 + + src/boot/bless-boot.c | 1 + + src/core/dbus-cgroup.c | 1 + + src/core/dbus-execute.c | 1 + + src/core/dbus-util.c | 1 + + src/core/execute.c | 1 + + src/core/kmod-setup.c | 1 + + src/core/service.c | 1 + + src/coredump/coredump-vacuum.c | 1 + + src/journal-remote/journal-remote-main.c | 1 + + src/journal/journalctl.c | 1 + + src/libsystemd/sd-bus/bus-message.c | 1 + + src/libsystemd/sd-bus/bus-objects.c | 1 + + src/libsystemd/sd-bus/bus-socket.c | 1 + + src/libsystemd/sd-bus/sd-bus.c | 1 + + src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + + src/libsystemd/sd-journal/sd-journal.c | 1 + + src/locale/keymap-util.c | 1 + + src/login/pam_systemd.c | 1 + + src/network/generator/network-generator.c | 1 + + src/nspawn/nspawn-settings.c | 1 + + src/nss-mymachines/nss-mymachines.c | 1 + + src/portable/portable.c | 1 + + src/resolve/resolvectl.c | 1 + + src/shared/bus-get-properties.c | 1 + + src/shared/bus-unit-procs.c | 1 + + src/shared/bus-unit-util.c | 1 + + src/shared/bus-util.c | 1 + + src/shared/dns-domain.c | 1 + + src/shared/journal-importer.c | 1 + + src/shared/logs-show.c | 1 + + src/shared/pager.c | 1 + + src/shared/uid-range.c | 1 + + src/socket-proxy/socket-proxyd.c | 1 + + src/test/test-hexdecoct.c | 1 + + src/udev/udev-builtin-path_id.c | 1 + + src/udev/udev-event.c | 1 + + src/udev/udev-rules.c | 1 + + 51 files changed, 62 insertions(+) + +--- a/meson.build ++++ b/meson.build +@@ -507,6 +507,7 @@ foreach ident : ['secure_getenv', '__sec + endforeach + + foreach ident : [ ++ ['strndupa' , '''#include <string.h>'''], + ['memfd_create', '''#include <sys/mman.h>'''], + ['gettid', '''#include <sys/types.h> + #include <unistd.h>'''], +--- a/src/backlight/backlight.c ++++ b/src/backlight/backlight.c +@@ -19,6 +19,7 @@ + #include "string-util.h" + #include "strv.h" + #include "util.h" ++#include "missing_stdlib.h" + + static int help(void) { + _cleanup_free_ char *link = NULL; +--- a/src/basic/cgroup-util.c ++++ b/src/basic/cgroup-util.c +@@ -37,6 +37,7 @@ + #include "unit-name.h" + #include "user-util.h" + #include "xattr-util.h" ++#include "missing_stdlib.h" + + static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { + _cleanup_free_ char *fs = NULL; +--- a/src/basic/env-util.c ++++ b/src/basic/env-util.c +@@ -19,6 +19,7 @@ + #include "string-util.h" + #include "strv.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + /* We follow bash for the character set. Different shells have different rules. */ + #define VALID_BASH_ENV_NAME_CHARS \ +--- a/src/basic/log.c ++++ b/src/basic/log.c +@@ -36,6 +36,7 @@ + #include "terminal-util.h" + #include "time-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + #define SNDBUF_SIZE (8*1024*1024) + +--- a/src/basic/missing_stdlib.h ++++ b/src/basic/missing_stdlib.h +@@ -11,3 +11,15 @@ + # error "neither secure_getenv nor __secure_getenv are available" + # endif + #endif ++ ++/* string.h */ ++#if ! HAVE_STRNDUPA ++#define strndupa(s, n) \ ++ ({ \ ++ const char *__old = (s); \ ++ size_t __len = strnlen(__old, (n)); \ ++ char *__new = (char *)alloca(__len + 1); \ ++ __new[__len] = '\0'; \ ++ (char *)memcpy(__new, __old, __len); \ ++ }) ++#endif +--- a/src/basic/mkdir.c ++++ b/src/basic/mkdir.c +@@ -15,6 +15,7 @@ + #include "stat-util.h" + #include "stdio-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + int mkdir_safe_internal( + const char *path, +--- a/src/basic/mountpoint-util.c ++++ b/src/basic/mountpoint-util.c +@@ -13,6 +13,7 @@ + #include "missing_stat.h" + #include "missing_syscall.h" + #include "mkdir.h" ++#include "missing_stdlib.h" + #include "mountpoint-util.h" + #include "nulstr-util.h" + #include "parse-util.h" +--- a/src/basic/parse-util.c ++++ b/src/basic/parse-util.c +@@ -18,6 +18,7 @@ + #include "stat-util.h" + #include "string-util.h" + #include "strv.h" ++#include "missing_stdlib.h" + + int parse_boolean(const char *v) { + if (!v) +--- a/src/basic/path-lookup.c ++++ b/src/basic/path-lookup.c +@@ -16,6 +16,7 @@ + #include "strv.h" + #include "tmpfile-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + int xdg_user_runtime_dir(char **ret, const char *suffix) { + const char *e; +--- a/src/basic/percent-util.c ++++ b/src/basic/percent-util.c +@@ -3,6 +3,7 @@ + #include "percent-util.h" + #include "string-util.h" + #include "parse-util.h" ++#include "missing_stdlib.h" + + static int parse_parts_value_whole(const char *p, const char *symbol) { + const char *pc, *n; +--- a/src/basic/proc-cmdline.c ++++ b/src/basic/proc-cmdline.c +@@ -15,6 +15,7 @@ + #include "string-util.h" + #include "util.h" + #include "virt.h" ++#include "missing_stdlib.h" + + int proc_cmdline(char **ret) { + const char *e; +--- a/src/basic/procfs-util.c ++++ b/src/basic/procfs-util.c +@@ -12,6 +12,7 @@ + #include "procfs-util.h" + #include "stdio-util.h" + #include "string-util.h" ++#include "missing_stdlib.h" + + int procfs_get_pid_max(uint64_t *ret) { + _cleanup_free_ char *value = NULL; +--- a/src/basic/time-util.c ++++ b/src/basic/time-util.c +@@ -26,6 +26,7 @@ + #include "string-util.h" + #include "strv.h" + #include "time-util.h" ++#include "missing_stdlib.h" + + static clockid_t map_clock_id(clockid_t c) { + +--- a/src/boot/bless-boot.c ++++ b/src/boot/bless-boot.c +@@ -19,6 +19,7 @@ + #include "util.h" + #include "verbs.h" + #include "virt.h" ++#include "missing_stdlib.h" + + static char **arg_path = NULL; + +--- a/src/core/dbus-execute.c ++++ b/src/core/dbus-execute.c +@@ -44,6 +44,7 @@ + #include "unit-printf.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); + static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); +--- a/src/core/dbus-util.c ++++ b/src/core/dbus-util.c +@@ -9,6 +9,7 @@ + #include "unit-printf.h" + #include "user-util.h" + #include "unit.h" ++#include "missing_stdlib.h" + + int bus_property_get_triggered_unit( + sd_bus *bus, +--- a/src/core/execute.c ++++ b/src/core/execute.c +@@ -102,6 +102,7 @@ + #include "unit-serialize.h" + #include "user-util.h" + #include "utmp-wtmp.h" ++#include "missing_stdlib.h" + + #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) + #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -11,6 +11,7 @@ + #include "recurse-dir.h" + #include "string-util.h" + #include "missing_type.h" ++#include "missing_stdlib.h" + + #if HAVE_KMOD + #include "module-util.h" +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -42,6 +42,7 @@ + #include "unit.h" + #include "utf8.h" + #include "util.h" ++#include "missing_stdlib.h" + + static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { + [SERVICE_DEAD] = UNIT_INACTIVE, +--- a/src/coredump/coredump-vacuum.c ++++ b/src/coredump/coredump-vacuum.c +@@ -16,6 +16,7 @@ + #include "string-util.h" + #include "time-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ + #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ +--- a/src/journal-remote/journal-remote-main.c ++++ b/src/journal-remote/journal-remote-main.c +@@ -24,6 +24,7 @@ + #include "stat-util.h" + #include "string-table.h" + #include "strv.h" ++#include "missing_stdlib.h" + + #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" + #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" +--- a/src/journal/journalctl.c ++++ b/src/journal/journalctl.c +@@ -73,6 +73,7 @@ + #include "unit-name.h" + #include "user-util.h" + #include "varlink.h" ++#include "missing_stdlib.h" + + #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) + #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ +--- a/src/libsystemd/sd-bus/bus-message.c ++++ b/src/libsystemd/sd-bus/bus-message.c +@@ -20,6 +20,7 @@ + #include "strv.h" + #include "time-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); + +--- a/src/libsystemd/sd-bus/bus-objects.c ++++ b/src/libsystemd/sd-bus/bus-objects.c +@@ -12,6 +12,7 @@ + #include "set.h" + #include "string-util.h" + #include "strv.h" ++#include "missing_stdlib.h" + + static int node_vtable_get_userdata( + sd_bus *bus, +--- a/src/libsystemd/sd-bus/bus-socket.c ++++ b/src/libsystemd/sd-bus/bus-socket.c +@@ -28,6 +28,7 @@ + #include "string-util.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + #define SNDBUF_SIZE (8*1024*1024) + +--- a/src/libsystemd/sd-bus/sd-bus.c ++++ b/src/libsystemd/sd-bus/sd-bus.c +@@ -43,6 +43,7 @@ + #include "string-util.h" + #include "strv.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + #define log_debug_bus_message(m) \ + do { \ +--- a/src/libsystemd/sd-bus/test-bus-benchmark.c ++++ b/src/libsystemd/sd-bus/test-bus-benchmark.c +@@ -14,6 +14,7 @@ + #include "string-util.h" + #include "time-util.h" + #include "util.h" ++#include "missing_stdlib.h" + + #define MAX_SIZE (2*1024*1024) + +--- a/src/libsystemd/sd-journal/sd-journal.c ++++ b/src/libsystemd/sd-journal/sd-journal.c +@@ -41,6 +41,7 @@ + #include "string-util.h" + #include "strv.h" + #include "syslog-util.h" ++#include "missing_stdlib.h" + + #define JOURNAL_FILES_MAX 7168 + +--- a/src/locale/keymap-util.c ++++ b/src/locale/keymap-util.c +@@ -24,6 +24,7 @@ + #include "string-util.h" + #include "strv.h" + #include "tmpfile-util.h" ++#include "missing_stdlib.h" + + static bool startswith_comma(const char *s, const char *prefix) { + s = startswith(s, prefix); +--- a/src/login/pam_systemd.c ++++ b/src/login/pam_systemd.c +@@ -31,6 +31,7 @@ + #include "locale-util.h" + #include "login-util.h" + #include "macro.h" ++#include "missing_stdlib.h" + #include "pam-util.h" + #include "parse-util.h" + #include "path-util.h" +--- a/src/network/generator/network-generator.c ++++ b/src/network/generator/network-generator.c +@@ -13,6 +13,7 @@ + #include "string-table.h" + #include "string-util.h" + #include "strv.h" ++#include "missing_stdlib.h" + + /* + # .network +--- a/src/nspawn/nspawn-settings.c ++++ b/src/nspawn/nspawn-settings.c +@@ -17,6 +17,7 @@ + #include "strv.h" + #include "user-util.h" + #include "util.h" ++#include "missing_stdlib.h" + + Settings *settings_new(void) { + Settings *s; +--- a/src/nss-mymachines/nss-mymachines.c ++++ b/src/nss-mymachines/nss-mymachines.c +@@ -21,6 +21,7 @@ + #include "nss-util.h" + #include "signal-util.h" + #include "string-util.h" ++#include "missing_stdlib.h" + + static void setup_logging_once(void) { + static pthread_once_t once = PTHREAD_ONCE_INIT; +--- a/src/portable/portable.c ++++ b/src/portable/portable.c +@@ -39,6 +39,7 @@ + #include "strv.h" + #include "tmpfile-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + /* Markers used in the first line of our 20-portable.conf unit file drop-in to determine, that a) the unit file was + * dropped there by the portable service logic and b) for which image it was dropped there. */ +--- a/src/resolve/resolvectl.c ++++ b/src/resolve/resolvectl.c +@@ -43,6 +43,7 @@ + #include "utf8.h" + #include "verb-log-control.h" + #include "verbs.h" ++#include "missing_stdlib.h" + + static int arg_family = AF_UNSPEC; + static int arg_ifindex = 0; +--- a/src/shared/bus-get-properties.c ++++ b/src/shared/bus-get-properties.c +@@ -4,6 +4,7 @@ + #include "rlimit-util.h" + #include "stdio-util.h" + #include "string-util.h" ++#include "missing_stdlib.h" + + int bus_property_get_bool( + sd_bus *bus, +--- a/src/shared/bus-unit-procs.c ++++ b/src/shared/bus-unit-procs.c +@@ -10,6 +10,7 @@ + #include "sort-util.h" + #include "string-util.h" + #include "terminal-util.h" ++#include "missing_stdlib.h" + + struct CGroupInfo { + char *cgroup_path; +--- a/src/shared/bus-unit-util.c ++++ b/src/shared/bus-unit-util.c +@@ -49,6 +49,7 @@ + #include "unit-def.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { + assert(message); +--- a/src/shared/bus-util.c ++++ b/src/shared/bus-util.c +@@ -21,6 +21,7 @@ + #include "path-util.h" + #include "socket-util.h" + #include "stdio-util.h" ++#include "missing_stdlib.h" + + static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { + sd_event *e = userdata; +--- a/src/shared/dns-domain.c ++++ b/src/shared/dns-domain.c +@@ -17,6 +17,7 @@ + #include "string-util.h" + #include "strv.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { + const char *n; +--- a/src/shared/journal-importer.c ++++ b/src/shared/journal-importer.c +@@ -15,6 +15,7 @@ + #include "parse-util.h" + #include "string-util.h" + #include "unaligned.h" ++#include "missing_stdlib.h" + + enum { + IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ +--- a/src/shared/logs-show.c ++++ b/src/shared/logs-show.c +@@ -42,6 +42,7 @@ + #include "utf8.h" + #include "util.h" + #include "web-util.h" ++#include "missing_stdlib.h" + + /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ + #define PRINT_LINE_THRESHOLD 3 +--- a/src/shared/pager.c ++++ b/src/shared/pager.c +@@ -26,6 +26,7 @@ + #include "strv.h" + #include "terminal-util.h" + #include "util.h" ++#include "missing_stdlib.h" + + static pid_t pager_pid = 0; + +--- a/src/shared/uid-range.c ++++ b/src/shared/uid-range.c +@@ -9,6 +9,7 @@ + #include "sort-util.h" + #include "uid-range.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { + assert(range); +--- a/src/socket-proxy/socket-proxyd.c ++++ b/src/socket-proxy/socket-proxyd.c +@@ -26,6 +26,7 @@ + #include "socket-util.h" + #include "string-util.h" + #include "util.h" ++#include "missing_stdlib.h" + + #define BUFFER_SIZE (256 * 1024) + +--- a/src/test/test-hexdecoct.c ++++ b/src/test/test-hexdecoct.c +@@ -7,6 +7,7 @@ + #include "macro.h" + #include "random-util.h" + #include "string-util.h" ++#include "missing_stdlib.h" + #include "tests.h" + + TEST(hexchar) { +--- a/src/udev/udev-builtin-path_id.c ++++ b/src/udev/udev-builtin-path_id.c +@@ -22,6 +22,7 @@ + #include "sysexits.h" + #include "udev-builtin.h" + #include "udev-util.h" ++#include "missing_stdlib.h" + + _printf_(2,3) + static void path_prepend(char **path, const char *fmt, ...) { +--- a/src/udev/udev-event.c ++++ b/src/udev/udev-event.c +@@ -35,6 +35,7 @@ + #include "udev-util.h" + #include "udev-watch.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + typedef struct Spawn { + sd_device *device; +--- a/src/udev/udev-rules.c ++++ b/src/udev/udev-rules.c +@@ -34,6 +34,7 @@ + #include "udev-util.h" + #include "user-util.h" + #include "virt.h" ++#include "missing_stdlib.h" + + #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") + +--- a/src/core/dbus-cgroup.c ++++ b/src/core/dbus-cgroup.c +@@ -21,6 +21,7 @@ + #include "parse-util.h" + #include "path-util.h" + #include "percent-util.h" ++#include "missing_stdlib.h" + #include "socket-util.h" + + BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); +--- a/src/fstab-generator/fstab-generator.c ++++ b/src/fstab-generator/fstab-generator.c +@@ -29,6 +29,7 @@ + #include "util.h" + #include "virt.h" + #include "volatile-util.h" ++#include "missing_stdlib.h" + + typedef enum MountPointFlags { + MOUNT_NOAUTO = 1 << 0, diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch index 34f7f5fb74..846c01bd4f 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch @@ -1,8 +1,7 @@ -From f8a239b182158ca0a537ba053cb0e6bad9c3a2fb Mon Sep 17 00:00:00 2001 +From fb068403b25002156435350165ea418a6338a313 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 14:56:21 +0800 -Subject: [PATCH 07/24] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not - defined +Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined If the standard library doesn't provide brace expansion users just won't get it. @@ -17,17 +16,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> [rebased for systemd 243] Signed-off-by: Scott Murray <scott.murray@konsulko.com> + --- src/basic/glob-util.c | 12 ++++++++++++ src/test/test-glob-util.c | 16 ++++++++++++++++ src/tmpfiles/tmpfiles.c | 10 ++++++++++ 3 files changed, 38 insertions(+) -diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c -index b335af8d97..2cdfc11f16 100644 --- a/src/basic/glob-util.c +++ b/src/basic/glob-util.c -@@ -14,6 +14,12 @@ +@@ -12,6 +12,12 @@ #include "path-util.h" #include "strv.h" @@ -40,7 +38,7 @@ index b335af8d97..2cdfc11f16 100644 static void closedir_wrapper(void* v) { (void) closedir(v); } -@@ -21,6 +27,7 @@ static void closedir_wrapper(void* v) { +@@ -19,6 +25,7 @@ static void closedir_wrapper(void* v) { int safe_glob(const char *path, int flags, glob_t *pglob) { int k; @@ -48,7 +46,7 @@ index b335af8d97..2cdfc11f16 100644 /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ assert(!(flags & GLOB_ALTDIRFUNC)); -@@ -34,9 +41,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { +@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flag pglob->gl_lstat = lstat; if (!pglob->gl_stat) pglob->gl_stat = stat; @@ -63,12 +61,10 @@ index b335af8d97..2cdfc11f16 100644 if (k == GLOB_NOMATCH) return -ENOENT; if (k == GLOB_NOSPACE) -diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c -index b4f41445fe..f0d474ed14 100644 --- a/src/test/test-glob-util.c +++ b/src/test/test-glob-util.c @@ -13,6 +13,12 @@ - #include "rm-rf.h" + #include "tests.h" #include "tmpfile-util.h" +/* Don't fail if the standard library @@ -77,10 +73,10 @@ index b4f41445fe..f0d474ed14 100644 +#define GLOB_BRACE 0 +#endif + - static void test_glob_exists(void) { + TEST(glob_exists) { char name[] = "/tmp/test-glob_exists.XXXXXX"; int fd = -1; -@@ -40,11 +46,13 @@ static void test_glob_no_dot(void) { +@@ -40,11 +46,13 @@ TEST(glob_no_dot) { const char *fn; _cleanup_globfree_ glob_t g = { @@ -94,7 +90,7 @@ index b4f41445fe..f0d474ed14 100644 }; int r; -@@ -52,11 +60,19 @@ static void test_glob_no_dot(void) { +@@ -52,11 +60,19 @@ TEST(glob_no_dot) { assert_se(mkdtemp(template)); fn = strjoina(template, "/*"); @@ -114,11 +110,9 @@ index b4f41445fe..f0d474ed14 100644 assert_se(r == GLOB_NOMATCH); (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); -diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 3c30612af1..14bc428085 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c -@@ -63,6 +63,12 @@ +@@ -67,6 +67,12 @@ #include "umask-util.h" #include "user-util.h" @@ -131,7 +125,7 @@ index 3c30612af1..14bc428085 100644 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create * properly owned directories beneath /tmp, /var/tmp, /run, which are -@@ -1853,7 +1859,9 @@ finish: +@@ -1961,7 +1967,9 @@ finish: static int glob_item(Item *i, action_t action) { _cleanup_globfree_ glob_t g = { @@ -141,7 +135,7 @@ index 3c30612af1..14bc428085 100644 }; int r = 0, k; char **fn; -@@ -1873,7 +1881,9 @@ static int glob_item(Item *i, action_t action) { +@@ -1981,7 +1989,9 @@ static int glob_item(Item *i, action_t a static int glob_item_recursively(Item *i, fdaction_t action) { _cleanup_globfree_ glob_t g = { diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0008-add-missing-FTW_-macros-for-musl.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0008-add-missing-FTW_-macros-for-musl.patch index d5f2349f2b..57e18a5808 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0008-add-missing-FTW_-macros-for-musl.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0008-add-missing-FTW_-macros-for-musl.patch @@ -1,7 +1,7 @@ -From 6cd17c753d2c0a90fc791f69bbc694cbc8556a4f Mon Sep 17 00:00:00 2001 +From 7ca9887f84adba065dc2e59b3de55ace2fc72ec0 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:00:06 +0800 -Subject: [PATCH 08/24] add missing FTW_ macros for musl +Subject: [PATCH] add missing FTW_ macros for musl This is to avoid build failures like below for musl. @@ -10,15 +10,15 @@ This is to avoid build failures like below for musl. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + --- src/basic/missing_type.h | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) + src/shared/mount-setup.c | 1 + + 2 files changed, 21 insertions(+) -diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index c487e65..23602eb 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h -@@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *); +@@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const voi #define __COMPAR_FN_T typedef int (*__compar_fn_t)(const void *, const void *); #endif @@ -42,6 +42,23 @@ index c487e65..23602eb 100644 +#ifndef FTW_SKIP_SIBLINGS +#define FTW_SKIP_SIBLINGS 3 +#endif --- -2.7.4 - +--- a/src/shared/mount-setup.c ++++ b/src/shared/mount-setup.c +@@ -32,6 +32,7 @@ + #include "strv.h" + #include "user-util.h" + #include "virt.h" ++#include "missing_type.h" + + typedef enum MountMode { + MNT_NONE = 0, +--- a/src/test/test-recurse-dir.c ++++ b/src/test/test-recurse-dir.c +@@ -6,6 +6,7 @@ + #include "recurse-dir.h" + #include "strv.h" + #include "tests.h" ++#include "missing_type.h" + + static char **list_nftw = NULL; + diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch index 8bacd0289d..0fc320420e 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch @@ -1,20 +1,21 @@ -From f1f4b4f9684fed185bfa8b9ed409cdf241657e99 Mon Sep 17 00:00:00 2001 +From c7453b716ae308b89cf4b2b231a36ddd38a49752 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:03:47 +0800 -Subject: [PATCH 10/24] fix missing of __register_atfork for non-glibc builds +Subject: [PATCH] fix missing of __register_atfork for non-glibc builds Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + --- src/basic/process-util.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index 78ce43b..aec2daf 100644 +index 461bbfe9a5..2d06f9f60a 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c -@@ -22,6 +22,9 @@ +@@ -18,6 +18,9 @@ #if HAVE_VALGRIND_VALGRIND_H #include <valgrind/valgrind.h> #endif @@ -24,7 +25,7 @@ index 78ce43b..aec2daf 100644 #include "alloc-util.h" #include "architecture.h" -@@ -1160,11 +1163,15 @@ void reset_cached_pid(void) { +@@ -1202,11 +1205,15 @@ void reset_cached_pid(void) { cached_pid = CACHED_PID_UNSET; } @@ -40,6 +41,3 @@ index 78ce43b..aec2daf 100644 pid_t getpid_cached(void) { static bool installed = false; --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0011-Use-uintmax_t-for-handling-rlim_t.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0010-Use-uintmax_t-for-handling-rlim_t.patch index d6eda9c038..029f413aa8 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0011-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0010-Use-uintmax_t-for-handling-rlim_t.patch @@ -1,7 +1,7 @@ -From e3f847bd0338d27aff3335b42661d8a4b66b965e Mon Sep 17 00:00:00 2001 +From 856010e268a6aca8e5f02502457afe289bd877f1 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:12:41 +0800 -Subject: [PATCH 11/24] Use uintmax_t for handling rlim_t +Subject: [PATCH] Use uintmax_t for handling rlim_t PRIu{32,64} is not right format to represent rlim_t type therefore use %ju and typecast the rlim_t variables to @@ -20,18 +20,17 @@ Upstream-Status: Denied [https://github.com/systemd/systemd/pull/7199] Signed-off-by: Khem Raj <raj.khem@gmail.com> [Rebased for v241] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + --- src/basic/format-util.h | 8 +------- - src/basic/rlimit-util.c | 10 +++++----- + src/basic/rlimit-util.c | 12 ++++++------ src/core/execute.c | 4 ++-- - 3 files changed, 8 insertions(+), 14 deletions(-) + 3 files changed, 9 insertions(+), 15 deletions(-) -diff --git a/src/basic/format-util.h b/src/basic/format-util.h -index dece5d3..dbb87bc 100644 --- a/src/basic/format-util.h +++ b/src/basic/format-util.h -@@ -42,13 +42,7 @@ - # define PRI_TIMEX "li" +@@ -34,13 +34,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32 + # error Unknown timex member size #endif -#if SIZEOF_RLIM_T == 8 @@ -45,29 +44,36 @@ index dece5d3..dbb87bc 100644 #if SIZEOF_DEV_T == 8 # define DEV_FMT "%" PRIu64 -diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c -index 74b3a02..b02c03c 100644 --- a/src/basic/rlimit-util.c +++ b/src/basic/rlimit-util.c -@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { +@@ -44,7 +44,7 @@ int setrlimit_closest(int resource, cons + fixed.rlim_max == highest.rlim_max) + return 0; + +- log_debug("Failed at setting rlimit " RLIM_FMT " for resource RLIMIT_%s. Will attempt setting value " RLIM_FMT " instead.", rlim->rlim_max, rlimit_to_string(resource), fixed.rlim_max); ++ log_debug("Failed at setting rlimit " RLIM_FMT " for resource RLIMIT_%s. Will attempt setting value " RLIM_FMT " instead.", (uintmax_t)rlim->rlim_max, rlimit_to_string(resource), (uintmax_t)fixed.rlim_max); + + return RET_NERRNO(setrlimit(resource, &fixed)); + } +@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *r if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) - s = strdup("infinity"); + r = free_and_strdup(&s, "infinity"); else if (rl->rlim_cur >= RLIM_INFINITY) -- (void) asprintf(&s, "infinity:" RLIM_FMT, rl->rlim_max); -+ (void) asprintf(&s, "infinity:" RLIM_FMT, (uintmax_t)rl->rlim_max); +- r = asprintf(&s, "infinity:" RLIM_FMT, rl->rlim_max); ++ r = asprintf(&s, "infinity:" RLIM_FMT, (uintmax_t)rl->rlim_max); else if (rl->rlim_max >= RLIM_INFINITY) -- (void) asprintf(&s, RLIM_FMT ":infinity", rl->rlim_cur); -+ (void) asprintf(&s, RLIM_FMT ":infinity", (uintmax_t)rl->rlim_cur); +- r = asprintf(&s, RLIM_FMT ":infinity", rl->rlim_cur); ++ r = asprintf(&s, RLIM_FMT ":infinity", (uintmax_t)rl->rlim_cur); else if (rl->rlim_cur == rl->rlim_max) -- (void) asprintf(&s, RLIM_FMT, rl->rlim_cur); -+ (void) asprintf(&s, RLIM_FMT, (uintmax_t)rl->rlim_cur); +- r = asprintf(&s, RLIM_FMT, rl->rlim_cur); ++ r = asprintf(&s, RLIM_FMT, (uintmax_t)rl->rlim_cur); else -- (void) asprintf(&s, RLIM_FMT ":" RLIM_FMT, rl->rlim_cur, rl->rlim_max); -+ (void) asprintf(&s, RLIM_FMT ":" RLIM_FMT, (uintmax_t)rl->rlim_cur, (uintmax_t)rl->rlim_max); - - if (!s) +- r = asprintf(&s, RLIM_FMT ":" RLIM_FMT, rl->rlim_cur, rl->rlim_max); ++ r = asprintf(&s, RLIM_FMT ":" RLIM_FMT, (uintmax_t)rl->rlim_cur, (uintmax_t)rl->rlim_max); + if (r < 0) return -ENOMEM; -@@ -404,7 +404,7 @@ int rlimit_nofile_safe(void) { + +@@ -403,7 +403,7 @@ int rlimit_nofile_safe(void) { rl.rlim_cur = FD_SETSIZE; if (setrlimit(RLIMIT_NOFILE, &rl) < 0) @@ -76,12 +82,10 @@ index 74b3a02..b02c03c 100644 return 1; } -diff --git a/src/core/execute.c b/src/core/execute.c -index a708231..e2b8748 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -4220,9 +4220,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { - for (i = 0; i < RLIM_NLIMITS; i++) +@@ -5639,9 +5639,9 @@ void exec_context_dump(const ExecContext + for (unsigned i = 0; i < RLIM_NLIMITS; i++) if (c->rlimit[i]) { fprintf(f, "%sLimit%s: " RLIM_FMT "\n", - prefix, rlimit_to_string(i), c->rlimit[i]->rlim_max); @@ -92,6 +96,3 @@ index a708231..e2b8748 100644 } if (c->ioprio_set) { --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch index 914589dbd3..327084bae9 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch @@ -1,22 +1,20 @@ -From d3d65d4036670cbd5129fe55c09ca391286ef4b3 Mon Sep 17 00:00:00 2001 +From ad395dda5db9b1ae156be121cfc8a38960de6c55 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Wed, 28 Feb 2018 21:25:22 -0800 -Subject: [PATCH 14/24] test-sizeof.c: Disable tests for missing typedefs in - musl +Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl Upstream-Status: Inappropriate [musl specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + --- src/test/test-sizeof.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index 35b0876..e78e7ca 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c -@@ -41,8 +41,10 @@ int main(void) { +@@ -55,8 +55,10 @@ int main(void) { info(unsigned); info(long unsigned); info(long long unsigned); @@ -24,10 +22,10 @@ index 35b0876..e78e7ca 100644 info(__syscall_ulong_t); info(__syscall_slong_t); +#endif + info(intmax_t); + info(uintmax_t); - info(float); - info(double); -@@ -60,7 +62,9 @@ int main(void) { +@@ -76,7 +78,9 @@ int main(void) { info(ssize_t); info(time_t); info(usec_t); @@ -37,6 +35,3 @@ index 35b0876..e78e7ca 100644 info(pid_t); info(uid_t); info(gid_t); --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index fd407f604d..0026a7b72a 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch @@ -1,7 +1,7 @@ -From 48c628f532f6025c2d1646b6819cd81eb789d7fb Mon Sep 17 00:00:00 2001 +From 5d4c6b2f4b88b69b31f967371d2a6136c65dc3fd Mon Sep 17 00:00:00 2001 From: Andre McCurdy <armccurdy@gmail.com> Date: Tue, 10 Oct 2017 14:33:30 -0700 -Subject: [PATCH 15/24] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() +Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to do and it's not portable (not supported by musl). See: @@ -25,20 +25,18 @@ just historical and not actually necessary or desired behaviour? Upstream-Status: Inappropriate [musl specific] Signed-off-by: Andre McCurdy <armccurdy@gmail.com> + --- - src/basic/fs-util.h | 22 +++++++++++++++++++++- + src/basic/fs-util.h | 23 +++++++++++++++++++++-- src/shared/base-filesystem.c | 6 +++--- - 2 files changed, 24 insertions(+), 4 deletions(-) + 2 files changed, 24 insertions(+), 5 deletions(-) -diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h -index 7ad030b..d4cb1e9 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h -@@ -32,7 +32,27 @@ int fchmod_opath(int fd, mode_t m); - +@@ -46,8 +46,27 @@ int futimens_opath(int fd, const struct int fd_warn_permissions(const char *path, int fd); + int stat_warn_permissions(const char *path, const struct stat *st); --#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW) +/* + Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to + do and it's not portable (not supported by musl). See: @@ -58,25 +56,24 @@ index 7ad030b..d4cb1e9 100644 + or why it needs to return success for broken symlinks. Maybe just historical + and not actually necessary or desired behaviour? +*/ -+ -+#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), 0) + #define laccess(path, mode) \ +- RET_NERRNO(faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW)) ++ RET_NERRNO(faccessat(AT_FDCWD, (path), (mode), 0)) int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); int touch(const char *path); -diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c -index 89d7a7d..34b4ad5 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c -@@ -53,7 +53,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -117,7 +117,7 @@ int base_filesystem_create(const char *r return log_error_errno(errno, "Failed to open root file system: %m"); - for (i = 0; i < ELEMENTSOF(table); i ++) { + for (size_t i = 0; i < ELEMENTSOF(table); i++) { - if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0) + if (faccessat(fd, table[i].dir, F_OK, 0) >= 0) continue; if (table[i].target) { -@@ -61,7 +61,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -125,7 +125,7 @@ int base_filesystem_create(const char *r /* check if one of the targets exists */ NULSTR_FOREACH(s, table[i].target) { @@ -85,7 +82,7 @@ index 89d7a7d..34b4ad5 100644 continue; /* check if a specific file exists at the target path */ -@@ -72,7 +72,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -136,7 +136,7 @@ int base_filesystem_create(const char *r if (!p) return log_oom(); @@ -94,6 +91,3 @@ index 89d7a7d..34b4ad5 100644 continue; } --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch index d5565698aa..612a535d3c 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -1,8 +1,7 @@ -From af76c973e41929360a6e021f2ff9a7fc1d7994e9 Mon Sep 17 00:00:00 2001 +From 1803ea271b93370fdcf7ec497277344f1e775429 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 27 May 2018 08:36:44 -0700 -Subject: [PATCH 16/24] Define glibc compatible basename() for non-glibc - systems +Subject: [PATCH] Define glibc compatible basename() for non-glibc systems Fixes builds with musl, even though systemd is adamant about using non-posix basename implementation, we have a way out @@ -10,25 +9,22 @@ using non-posix basename implementation, we have a way out Upstream-Status: Inappropriate [musl specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- - src/machine/machine-dbus.c | 4 ++++ - 1 file changed, 4 insertions(+) + src/machine/machine-dbus.c | 5 +++++ + 1 file changed, 5 insertions(+) -diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index 7a558df..eca7d4b 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c -@@ -11,6 +11,10 @@ +@@ -10,6 +10,11 @@ #include <libgen.h> #undef basename +#if !defined(__GLIBC__) ++#include <string.h> +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) +#endif + #include "alloc-util.h" #include "bus-common-errors.h" - #include "bus-internal.h" --- -2.7.4 - + #include "bus-get-properties.h" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index 24e24e8e5a..baf4903803 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch @@ -1,7 +1,7 @@ -From c7a4efb8bccb52e1714c151929c23e12bde59b82 Mon Sep 17 00:00:00 2001 +From 30b08f76ea7f5c324afedf97f0867b76dac9f128 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Wed, 4 Jul 2018 15:00:44 +0800 -Subject: [PATCH 17/24] Do not disable buffering when writing to oom_score_adj +Subject: [PATCH] Do not disable buffering when writing to oom_score_adj On musl, disabling buffering when writing to oom_score_adj will cause the following error. @@ -19,20 +19,19 @@ Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> [rebased for systemd 243] Signed-off-by: Scott Murray <scott.murray@konsulko.com> + --- src/basic/process-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index b1c08fcade..0a7a1f7d89 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c -@@ -1474,7 +1474,7 @@ int set_oom_score_adjust(int value) { - sprintf(t, "%i", value); +@@ -1489,7 +1489,7 @@ int set_oom_score_adjust(int value) { + xsprintf(t, "%i", value); return write_string_file("/proc/self/oom_score_adj", t, - WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER); + WRITE_STRING_FILE_VERIFY_ON_FAILURE); } - static const char *const ioprio_class_table[] = { + int get_oom_score_adjust(int *ret) { diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch index 5901772998..878914b307 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch @@ -1,7 +1,7 @@ -From fffb2810611b4a26f5c6c0958093b5b3b7d4cd99 Mon Sep 17 00:00:00 2001 +From 873202f63f9f117c6e5a98e444cc709057042979 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Tue, 10 Jul 2018 15:40:17 +0800 -Subject: [PATCH 18/24] distinguish XSI-compliant strerror_r from GNU-specifi +Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi strerror_r XSI-compliant strerror_r and GNU-specifi strerror_r are different. @@ -18,33 +18,15 @@ assigned to (char *) variable, resulting in segment fault. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + --- - src/journal/journal-send.c | 5 +++++ - src/libsystemd/sd-bus/bus-error.c | 5 +++++ + src/libsystemd/sd-bus/bus-error.c | 5 +++++ + src/libsystemd/sd-journal/journal-send.c | 5 +++++ 2 files changed, 10 insertions(+) -diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c -index 3fea912..4f1e592 100644 ---- a/src/journal/journal-send.c -+++ b/src/journal/journal-send.c -@@ -337,7 +337,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove - char* j; - - errno = 0; -+#ifndef __GLIBC__ -+ strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); -+ j = buffer + 8 + k; -+#else - j = strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); -+#endif - if (errno == 0) { - char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; - -diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index dc95237..bdda30f 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c -@@ -379,7 +379,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { +@@ -409,7 +409,12 @@ static void bus_error_strerror(sd_bus_er return; errno = 0; @@ -57,6 +39,18 @@ index dc95237..bdda30f 100644 if (errno == ERANGE || strlen(x) >= k - 1) { free(m); k *= 2; --- -2.7.4 - +--- a/src/libsystemd/sd-journal/journal-send.c ++++ b/src/libsystemd/sd-journal/journal-send.c +@@ -348,7 +348,12 @@ static int fill_iovec_perror_and_send(co + char* j; + + errno = 0; ++#ifndef __GLIBC__ ++ strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); ++ j = buffer + 8 + k; ++#else + j = strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); ++#endif + if (errno == 0) { + char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; + diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch index 35cc66ff66..e6507c5f89 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch @@ -1,7 +1,7 @@ -From 969ab9e68249fd383f4b513b1c9306bdac4ae9b2 Mon Sep 17 00:00:00 2001 +From e7441559266074e7a33e3c11ff5cdaf5ba9c0e24 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:18:00 +0800 -Subject: [PATCH 19/24] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP +Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP for currently unknown reasons they get exported to the shared libries even without being listed in the sym file @@ -11,15 +11,16 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> [Rebased for v241] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + --- src/libsystemd/sd-bus/bus-error.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index bdda30f..e21853c 100644 +index c49be29e46..90731bd7e7 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c -@@ -54,8 +54,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { +@@ -55,8 +55,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { }; /* GCC maps this magically to the beginning and end of the BUS_ERROR_MAP section */ @@ -30,6 +31,3 @@ index bdda30f..e21853c 100644 /* Additional maps registered with sd_bus_error_add_map() are in this * NULL terminated array */ --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0020-missing_type.h-add-__compar_d_fn_t-definition.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch index 753d5116ac..eeff693bc4 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0020-missing_type.h-add-__compar_d_fn_t-definition.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch @@ -1,7 +1,7 @@ -From 75c06e3e2a4760b36fffd95cdf5535b8ad73c481 Mon Sep 17 00:00:00 2001 +From 64f4d2eb976b9f23ce85b3655a876f7299eafd58 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:27:54 +0800 -Subject: [PATCH 20/24] missing_type.h: add __compar_d_fn_t definition +Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition Fix the following compile failure: src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'? @@ -9,12 +9,13 @@ src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + --- src/basic/missing_type.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index 7d7c1e4..85902ab 100644 +index 3df1084ef2..697aa7f58a 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -13,6 +13,7 @@ @@ -25,6 +26,3 @@ index 7d7c1e4..85902ab 100644 #endif #ifndef __COMPAR_FN_T --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0021-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch index cdddf83890..5ca5386289 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0021-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch @@ -1,7 +1,7 @@ -From 3fbf61d54b82fc9bf21d8039bfd89dc9efc5bbcd Mon Sep 17 00:00:00 2001 +From d95330f328c23c1cd6c51aeca43f081746cf2899 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:44:54 +0800 -Subject: [PATCH 21/24] avoid redefinition of prctl_mm_map structure +Subject: [PATCH] avoid redefinition of prctl_mm_map structure Fix the following compile failure: error: redefinition of 'struct prctl_mm_map' @@ -9,16 +9,17 @@ error: redefinition of 'struct prctl_mm_map' Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + --- src/basic/missing_prctl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h -index f80cd17..47e4893 100644 +index ab851306ba..5547cad875 100644 --- a/src/basic/missing_prctl.h +++ b/src/basic/missing_prctl.h @@ -1,7 +1,9 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#ifdef __GLIBC__ @@ -27,6 +28,3 @@ index f80cd17..47e4893 100644 /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ #ifndef PR_CAP_AMBIENT --- -2.11.0 - diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0019-Handle-missing-LOCK_EX.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0019-Handle-missing-LOCK_EX.patch new file mode 100644 index 0000000000..d51ac4265a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0019-Handle-missing-LOCK_EX.patch @@ -0,0 +1,24 @@ +From 2284f2f44b1b30f10b9196e0f5c6d0a2e0c1871f Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Fri, 7 Aug 2020 15:19:27 +0000 +Subject: [PATCH] Handle missing LOCK_EX + +Upstream-Status: Inappropriate [musl specific] +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> + +--- + src/partition/makefs.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/partition/makefs.c b/src/partition/makefs.c +index 7c94fbfedb..42f966722d 100644 +--- a/src/partition/makefs.c ++++ b/src/partition/makefs.c +@@ -6,6 +6,7 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> ++#include <sys/file.h> + + #include "alloc-util.h" + #include "blockdev-util.h" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch new file mode 100644 index 0000000000..1ba5c1292b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch @@ -0,0 +1,36 @@ +From a6a25e1ecae91f48a4f87bf0cc17eaaf0a919ffe Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Fri, 7 Aug 2020 15:20:17 +0000 +Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un * + +| ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c: In function 'cant_be_in_netns': +| ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:4893:25: error: passing argument 2 of 'connect' from incompatible pointer type [-Werror=incompatible-pointer-types] +| 4893 | if (connect(fd, &sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { +| | ^~~~~~ +| | | +| | struct sockaddr_un * +| In file included from ../../../../../../workspace/sources/systemd/src/systemd/sd-daemon.h:22, +| from ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:21: +| /home/ubuntu/poky/build/tmp/work/core2-64-poky-linux-musl/systemd/1_246-r0/recipe-sysroot/usr/include/sys/socket.h:384:19: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *' +| 384 | int connect (int, const struct sockaddr *, socklen_t); +| | ^~~~~~~~~~~~~~~~~~~~~~~ +| cc1: some warnings being treated as errors + +Upstream-Status: Inappropriate [musl specific] +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> + +--- + src/nspawn/nspawn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/nspawn/nspawn.c ++++ b/src/nspawn/nspawn.c +@@ -5389,7 +5389,7 @@ static int cant_be_in_netns(void) { + if (fd < 0) + return log_error_errno(errno, "Failed to allocate udev control socket: %m"); + +- if (connect(fd, &sa.sa, SOCKADDR_UN_LEN(sa.un)) < 0) { ++ if (connect(fd, (struct sockaddr *)&sa.sa, SOCKADDR_UN_LEN(sa.un)) < 0) { + + if (errno == ENOENT || ERRNO_IS_DISCONNECT(errno)) + return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0024-test-json.c-define-M_PIl.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0021-test-json.c-define-M_PIl.patch index 0e5629d37b..dfab8fbbdf 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0024-test-json.c-define-M_PIl.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0021-test-json.c-define-M_PIl.patch @@ -1,7 +1,7 @@ -From 902412c271e0c5d9cb93b10ec0fb5b119b393474 Mon Sep 17 00:00:00 2001 +From 47472da6e8900773c26da8fd26699367447d97a6 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 16:53:06 +0800 -Subject: [PATCH 24/24] test-json.c: define M_PIl +Subject: [PATCH] test-json.c: define M_PIl Fix the following compile failure: src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this function); did you mean 'M_PI'? @@ -9,15 +9,14 @@ src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this functi Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + --- src/test/test-json.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/src/test/test-json.c b/src/test/test-json.c -index 9b8a2a9..efc746c 100644 --- a/src/test/test-json.c +++ b/src/test/test-json.c -@@ -11,6 +11,10 @@ +@@ -14,6 +14,10 @@ #include "tests.h" #include "util.h" @@ -25,9 +24,6 @@ index 9b8a2a9..efc746c 100644 +#define M_PIl 3.141592653589793238462643383279502884L +#endif + - static void test_tokenizer(const char *data, ...) { + static void test_tokenizer_one(const char *data, ...) { unsigned line = 0, column = 0; void *state = NULL; --- -2.11.0 - diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-do-not-disable-buffer-in-writing-files.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-do-not-disable-buffer-in-writing-files.patch index 2f4daf8665..d389e1d9f9 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-do-not-disable-buffer-in-writing-files.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-do-not-disable-buffer-in-writing-files.patch @@ -1,4 +1,4 @@ -From 85e3c3046562ec24fc2f09ebfd08bf9f168091d5 Mon Sep 17 00:00:00 2001 +From 0f9422780a569c79a4b28e44c79c70b4a354bd92 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Fri, 1 Mar 2019 15:22:15 +0800 Subject: [PATCH] do not disable buffer in writing files @@ -18,40 +18,38 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Andrej Valek <andrej.valek@siemens.com> [rebased for systemd 243] Signed-off-by: Scott Murray <scott.murray@konsulko.com> + --- - src/basic/cgroup-util.c | 14 +++++++------- + src/basic/cgroup-util.c | 10 +++++----- src/basic/procfs-util.c | 4 ++-- - src/basic/smack-util.c | 2 +- + src/basic/sysctl-util.c | 2 +- src/basic/util.c | 2 +- src/binfmt/binfmt.c | 6 +++--- src/core/main.c | 4 ++-- src/core/smack-setup.c | 8 ++++---- src/hibernate-resume/hibernate-resume.c | 2 +- src/libsystemd/sd-device/sd-device.c | 2 +- - src/login/logind-dbus.c | 2 +- src/nspawn/nspawn-cgroup.c | 2 +- src/nspawn/nspawn.c | 6 +++--- - src/shared/sysctl-util.c | 2 +- - src/sleep/sleep.c | 10 +++++----- - src/udev/udevadm-trigger.c | 2 +- - src/udev/udevd.c | 2 +- + src/shared/cgroup-setup.c | 4 ++-- + src/shared/mount-util.c | 4 ++-- + src/shared/smack-util.c | 2 +- + src/sleep/sleep.c | 8 ++++---- src/vconsole/vconsole-setup.c | 2 +- - 17 files changed, 36 insertions(+), 36 deletions(-) + 16 files changed, 34 insertions(+), 34 deletions(-) -diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 7b5839ccd6..18f6e8ffc8 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -860,7 +860,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { - - xsprintf(c, PID_FMT "\n", pid); +@@ -390,7 +390,7 @@ int cg_kill_kernel_sigkill(const char *c + if (r < 0) + return r; -- r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(fs, c, 0); +- r = write_string_file(killfile, "1", WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(killfile, "1", 0); if (r < 0) return r; -@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -803,7 +803,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (isempty(sc)) { @@ -60,7 +58,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -821,7 +821,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (streq(sc, "0")) { @@ -69,7 +67,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -848,7 +848,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -78,7 +76,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -858,7 +858,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -87,7 +85,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri +@@ -1704,7 +1704,7 @@ int cg_set_attribute(const char *control if (r < 0) return r; @@ -96,20 +94,9 @@ index 7b5839ccd6..18f6e8ffc8 100644 } int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { -@@ -2697,7 +2697,7 @@ int cg_enable_everywhere( - return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); - } - -- r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_stream(f, s, 0); - if (r < 0) { - log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", - FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); -diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 42ce53d5aa..57512532a6 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c -@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { +@@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limi * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ @@ -125,24 +112,20 @@ index 42ce53d5aa..57512532a6 100644 if (r < 0) { uint64_t threads_max; -diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c -index 123d00e13e..e7ea78f349 100644 ---- a/src/basic/smack-util.c -+++ b/src/basic/smack-util.c -@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { - return 0; +--- a/src/basic/sysctl-util.c ++++ b/src/basic/sysctl-util.c +@@ -58,7 +58,7 @@ int sysctl_write(const char *property, c - p = procfs_file_alloca(pid, "attr/current"); -- r = write_string_file(p, label, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(p, label, 0); - if (r < 0) - return r; + log_debug("Setting '%s' to '%s'", p, value); -diff --git a/src/basic/util.c b/src/basic/util.c -index 93d610bc98..97dca64f73 100644 +- return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_SUPPRESS_REDUNDANT_VIRTUAL); ++ return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_SUPPRESS_REDUNDANT_VIRTUAL); + } + + int sysctl_writef(const char *property, const char *format, ...) { --- a/src/basic/util.c +++ b/src/basic/util.c -@@ -294,7 +294,7 @@ void disable_coredumps(void) { +@@ -168,7 +168,7 @@ void disable_coredumps(void) { if (detect_container() > 0) return; @@ -151,67 +134,61 @@ index 93d610bc98..97dca64f73 100644 if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } -diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c -index aa9d811f2e..8c7f2dae7a 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c -@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { - if (!fn) - return log_oom(); +@@ -29,7 +29,7 @@ static bool arg_unregister = false; + static int delete_rule(const char *rulename) { + const char *fn = strjoina("/proc/sys/fs/binfmt_misc/", rulename); - return write_string_file(fn, "-1", WRITE_STRING_FILE_DISABLE_BUFFER); + return write_string_file(fn, "-1", 0); } - static int apply_rule(const char *rule) { -@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) { - - (void) delete_rule(rule); + static int apply_rule(const char *filename, unsigned line, const char *rule) { +@@ -59,7 +59,7 @@ static int apply_rule(const char *filena + if (r >= 0) + log_debug("%s:%u: Rule '%s' deleted.", filename, line, rulename); - r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, 0); if (r < 0) - return log_error_errno(r, "Failed to add binary format: %m"); - -@@ -213,7 +213,7 @@ static int run(int argc, char *argv[]) { + return log_error_errno(r, "%s:%u: Failed to add binary format '%s': %m", + filename, line, rulename); +@@ -226,7 +226,7 @@ static int run(int argc, char *argv[]) { } /* Flush out all rules */ -- (void) write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER); -+ (void) write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0); - - STRV_FOREACH(f, files) { - k = apply_file(*f, true); -diff --git a/src/core/main.c b/src/core/main.c -index bcce7178a8..4199cedab9 100644 +- r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0); + if (r < 0) + log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m"); + else --- a/src/core/main.c +++ b/src/core/main.c -@@ -1285,7 +1285,7 @@ static int bump_unix_max_dgram_qlen(void) { +@@ -1466,7 +1466,7 @@ static int bump_unix_max_dgram_qlen(void if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; -- r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", WRITE_STRING_FILE_DISABLE_BUFFER, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); -+ r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", 0, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); +- r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", WRITE_STRING_FILE_DISABLE_BUFFER, ++ r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", 0, + "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, - "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); -@@ -1509,7 +1509,7 @@ static void initialize_core_pattern(bool skip_setup) { +@@ -1737,7 +1737,7 @@ static void initialize_core_pattern(bool if (getpid_cached() != 1) return; - r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, 0); if (r < 0) - log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); - } -diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c -index b95e6239d4..fdbdaaaccb 100644 + log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", + arg_early_core_pattern); --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c -@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { +@@ -320,17 +320,17 @@ int mac_smack_setup(bool *loaded_policy) } - #ifdef SMACK_RUN_LABEL + #if HAVE_SMACK_RUN_LABEL - r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, 0); if (r < 0) @@ -230,8 +207,6 @@ index b95e6239d4..fdbdaaaccb 100644 if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif -diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c -index 17e7cd1a00..87a7667716 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { @@ -243,37 +218,20 @@ index 17e7cd1a00..87a7667716 100644 if (r < 0) { log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; -diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c -index c4a7f2f3d3..bcac758284 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c -@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, +@@ -2108,7 +2108,7 @@ _public_ int sd_device_set_sysattr_value if (!value) return -ENOMEM; - r = write_string_file(path, value, WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_NOFOLLOW); + r = write_string_file(path, value, 0 | WRITE_STRING_FILE_NOFOLLOW); if (r < 0) { - if (r == -ELOOP) - return -EINVAL; -diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index 30b9a66334..cc1d577933 100644 ---- a/src/login/logind-dbus.c -+++ b/src/login/logind-dbus.c -@@ -1325,7 +1325,7 @@ static int trigger_device(Manager *m, sd_device *d) { - if (!t) - return -ENOMEM; - -- (void) write_string_file(t, "change", WRITE_STRING_FILE_DISABLE_BUFFER); -+ (void) write_string_file(t, "change", 0); - } - - return 0; -diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c -index 0462b46413..7c53d41483 100644 + /* On failure, clear cache entry, as we do not know how it fails. */ + device_remove_cached_sysattr_value(device, sysattr); --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c -@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { +@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); @@ -282,11 +240,9 @@ index 0462b46413..7c53d41483 100644 if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 2aec8041f0..841542f2f3 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2357,7 +2357,7 @@ static int reset_audit_loginuid(void) { +@@ -2757,7 +2757,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -295,66 +251,76 @@ index 2aec8041f0..841542f2f3 100644 if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -3566,13 +3566,13 @@ static int setup_uid_map(pid_t pid) { +@@ -4163,7 +4163,7 @@ static int setup_uid_map( + return log_oom(); xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); - xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); -- r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(uid_map, line, 0); +- r = write_string_file(uid_map, s, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(uid_map, s, 0); if (r < 0) return log_error_errno(r, "Failed to write UID map: %m"); - /* We always assign the same UID and GID ranges */ +@@ -4173,7 +4173,7 @@ static int setup_uid_map( + return log_oom(); + xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); -- r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(uid_map, line, 0); +- r = write_string_file(uid_map, s, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(uid_map, s, 0); if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); -diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c -index 93bdcf11bf..68cddb7a9f 100644 ---- a/src/shared/sysctl-util.c -+++ b/src/shared/sysctl-util.c -@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c - - log_debug("Setting '%s' to '%s'", p, value); +--- a/src/shared/cgroup-setup.c ++++ b/src/shared/cgroup-setup.c +@@ -345,7 +345,7 @@ int cg_attach(const char *controller, co -- return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); -+ return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); - } + xsprintf(c, PID_FMT "\n", pid); - int sysctl_read(const char *property, char **content) { -diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index b9fe96635d..f168d7f890 100644 ---- a/src/sleep/sleep.c -+++ b/src/sleep/sleep.c -@@ -54,7 +54,7 @@ static int write_hibernate_location_info(void) { +- r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(fs, c, 0); + if (r < 0) + return r; - /* if it's a swap partition, we just write the disk to /sys/power/resume */ - if (streq(type, "partition")) { -- r = write_string_file("/sys/power/resume", device, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/power/resume", device, 0); - if (r < 0) - return log_debug_errno(r, "Failed to write partition device to /sys/power/resume: %m"); +@@ -877,7 +877,7 @@ int cg_enable_everywhere( + return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); + } -@@ -98,14 +98,14 @@ static int write_hibernate_location_info(void) { +- r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_stream(f, s, 0); + if (r < 0) { + log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", + FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); +--- a/src/shared/smack-util.c ++++ b/src/shared/smack-util.c +@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const + return 0; - offset = fiemap->fm_extents[0].fe_physical / page_size(); - xsprintf(offset_str, "%" PRIu64, offset); -- r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/power/resume_offset", offset_str, 0); + p = procfs_file_alloca(pid, "attr/current"); +- r = write_string_file(p, label, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(p, label, 0); if (r < 0) - return log_debug_errno(r, "Failed to write offset '%s': %m", offset_str); + return r; - log_debug("Wrote calculated resume_offset value to /sys/power/resume_offset: %s", offset_str); +--- a/src/sleep/sleep.c ++++ b/src/sleep/sleep.c +@@ -46,7 +46,7 @@ static int write_hibernate_location_info + assert(hibernate_location->swap); - xsprintf(device_str, "%lx", (unsigned long)stb.st_dev); -- r = write_string_file("/sys/power/resume", device_str, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/power/resume", device_str, 0); + xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); +- r = write_string_file("/sys/power/resume", resume_str, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/sys/power/resume", resume_str, 0); if (r < 0) - return log_debug_errno(r, "Failed to write device '%s': %m", device_str); + return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", + hibernate_location->swap->device, resume_str); +@@ -73,7 +73,7 @@ static int write_hibernate_location_info + } -@@ -121,7 +121,7 @@ static int write_mode(char **modes) { + xsprintf(offset_str, "%" PRIu64, hibernate_location->offset); +- r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/sys/power/resume_offset", offset_str, 0); + if (r < 0) + return log_debug_errno(r, "Failed to write swap file offset to /sys/power/resume_offset for '%s': '%s': %m", + hibernate_location->swap->device, offset_str); +@@ -90,7 +90,7 @@ static int write_mode(char **modes) { STRV_FOREACH(mode, modes) { int k; @@ -363,7 +329,7 @@ index b9fe96635d..f168d7f890 100644 if (k >= 0) return 0; -@@ -140,7 +140,7 @@ static int write_state(FILE **f, char **states) { +@@ -112,7 +112,7 @@ static int write_state(FILE **f, char ** STRV_FOREACH(state, states) { int k; @@ -372,37 +338,9 @@ index b9fe96635d..f168d7f890 100644 if (k >= 0) return 0; log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); -diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c -index 77d95e513f..25ce4abfb1 100644 ---- a/src/udev/udevadm-trigger.c -+++ b/src/udev/udevadm-trigger.c -@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se - if (!filename) - return log_oom(); - -- r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(filename, action, 0); - if (r < 0) { - log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, - "Failed to write '%s' to '%s': %m", action, filename); -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index cb5123042a..ea309a9e7f 100644 ---- a/src/udev/udevd.c -+++ b/src/udev/udevd.c -@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { - - filename = strjoina(syspath, "/uevent"); - log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); -- r = write_string_file(filename, "change", WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(filename, "change", 0); - if (r < 0) - return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); - return 0; -diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c -index 75d052ae70..5a15c939d8 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c -@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { +@@ -108,7 +108,7 @@ static int toggle_utf8_vc(const char *na static int toggle_utf8_sysfs(bool utf8) { int r; @@ -411,3 +349,72 @@ index 75d052ae70..5a15c939d8 100644 if (r < 0) return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); +--- a/src/basic/namespace-util.c ++++ b/src/basic/namespace-util.c +@@ -202,12 +202,12 @@ int userns_acquire(const char *uid_map, + freeze(); + + xsprintf(path, "/proc/" PID_FMT "/uid_map", pid); +- r = write_string_file(path, uid_map, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(path, uid_map, 0); + if (r < 0) + return log_error_errno(r, "Failed to write UID map: %m"); + + xsprintf(path, "/proc/" PID_FMT "/gid_map", pid); +- r = write_string_file(path, gid_map, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(path, gid_map, 0); + if (r < 0) + return log_error_errno(r, "Failed to write GID map: %m"); + +--- a/src/core/cgroup.c ++++ b/src/core/cgroup.c +@@ -4140,7 +4140,7 @@ int unit_cgroup_freezer_action(Unit *u, + else + u->freezer_state = FREEZER_THAWING; + +- r = write_string_file(path, one_zero(action == FREEZER_FREEZE), WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(path, one_zero(action == FREEZER_FREEZE), 0); + if (r < 0) + return r; + +--- a/src/home/homework.c ++++ b/src/home/homework.c +@@ -284,7 +284,7 @@ static void drop_caches_now(void) { + * details. We write "2" into /proc/sys/vm/drop_caches to ensure dentries/inodes are flushed, but not + * more. */ + +- r = write_string_file("/proc/sys/vm/drop_caches", "2\n", WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/proc/sys/vm/drop_caches", "2\n", 0); + if (r < 0) + log_warning_errno(r, "Failed to drop caches, ignoring: %m"); + else +--- a/src/shared/binfmt-util.c ++++ b/src/shared/binfmt-util.c +@@ -26,7 +26,7 @@ int disable_binfmt(void) { + if (r < 0) + return log_warning_errno(r, "Failed to determine whether binfmt_misc is mounted: %m"); + +- r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0); + if (r < 0) + return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m"); + +--- a/src/shared/coredump-util.c ++++ b/src/shared/coredump-util.c +@@ -70,5 +70,5 @@ int set_coredump_filter(uint64_t value) + sprintf(t, "0x%"PRIx64, value); + + return write_string_file("/proc/self/coredump_filter", t, +- WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER); ++ WRITE_STRING_FILE_VERIFY_ON_FAILURE); + } +--- a/src/udev/udev-rules.c ++++ b/src/udev/udev-rules.c +@@ -2181,7 +2181,6 @@ static int udev_rule_apply_token_to_even + log_rule_debug(dev, rules, "ATTR '%s' writing '%s'", buf, value); + r = write_string_file(buf, value, + WRITE_STRING_FILE_VERIFY_ON_FAILURE | +- WRITE_STRING_FILE_DISABLE_BUFFER | + WRITE_STRING_FILE_AVOID_NEWLINE | + WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); + if (r < 0) diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0025-Handle-__cpu_mask-usage.patch index 0f75e8c12d..e001ed59e8 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0025-Handle-__cpu_mask-usage.patch @@ -1,4 +1,7 @@ -Handle __cpu_mask usage +From e4f9ef547fa342102db15188544daa18e71e9c66 Mon Sep 17 00:00:00 2001 +From: Scott Murray <scott.murray@konsulko.com> +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH] Handle __cpu_mask usage Fixes errors: @@ -15,13 +18,14 @@ add a typedef to cpu-set-util.h defining __cpu_mask appropriately. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Scott Murray <scott.murray@konsulko.com> + --- src/shared/cpu-set-util.h | 2 ++ src/test/test-sizeof.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h -index 27812dfd59..f698f9df83 100644 +index 3c63a58826..4c2d4347fc 100644 --- a/src/shared/cpu-set-util.h +++ b/src/shared/cpu-set-util.h @@ -6,6 +6,8 @@ @@ -34,17 +38,17 @@ index 27812dfd59..f698f9df83 100644 typedef struct CPUSet { cpu_set_t *set; diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index a710db5370..d1601ad929 100644 +index 4403c0aa52..e7e4ae112d 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -1,6 +1,5 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include <sched.h> #include <stdio.h> #include <string.h> - -@@ -8,6 +7,7 @@ + #include <sys/types.h> +@@ -10,6 +9,7 @@ #include <float.h> #include "time-util.h" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0026-Handle-missing-gshadow.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0026-Handle-missing-gshadow.patch new file mode 100644 index 0000000000..2d06ab84a2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0026-Handle-missing-gshadow.patch @@ -0,0 +1,165 @@ +From 66a926cf906260c2fb5ea851e55efe03edd444dc Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Tue, 10 Mar 2020 11:05:20 +0000 +Subject: [PATCH] Handle missing gshadow + +gshadow usage is now present in the userdb code. Mask all uses of it to +allow compilation on musl + +Upstream-Status: Inappropriate [musl specific] +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +[Rebased for v247] +Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> + +--- + src/shared/user-record-nss.c | 20 ++++++++++++++++++++ + src/shared/user-record-nss.h | 4 ++++ + src/shared/userdb.c | 7 ++++++- + 3 files changed, 30 insertions(+), 1 deletion(-) + +--- a/src/shared/user-record-nss.c ++++ b/src/shared/user-record-nss.c +@@ -331,8 +331,10 @@ int nss_group_to_group_record( + if (isempty(grp->gr_name)) + return -EINVAL; + ++#if ENABLE_GSHADOW + if (sgrp && !streq_ptr(sgrp->sg_namp, grp->gr_name)) + return -EINVAL; ++#endif + + g = group_record_new(); + if (!g) +@@ -348,6 +350,7 @@ int nss_group_to_group_record( + + g->gid = grp->gr_gid; + ++#if ENABLE_GSHADOW + if (sgrp) { + if (looks_like_hashed_password(utf8_only(sgrp->sg_passwd))) { + g->hashed_password = strv_new(sgrp->sg_passwd); +@@ -363,6 +366,7 @@ int nss_group_to_group_record( + if (r < 0) + return r; + } ++#endif + + r = json_build(&g->json, JSON_BUILD_OBJECT( + JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)), +@@ -388,6 +392,7 @@ int nss_sgrp_for_group(const struct grou + assert(ret_sgrp); + assert(ret_buffer); + ++#if ENABLE_GSHADOW + for (;;) { + _cleanup_free_ char *buf = NULL; + struct sgrp sgrp, *result; +@@ -416,6 +421,9 @@ int nss_sgrp_for_group(const struct grou + buflen *= 2; + buf = mfree(buf); + } ++#else ++ return -ESRCH; ++#endif + } + + int nss_group_record_by_name( +@@ -427,7 +435,9 @@ int nss_group_record_by_name( + struct group grp, *result; + bool incomplete = false; + size_t buflen = 4096; ++#if ENABLE_GSHADOW + struct sgrp sgrp, *sresult = NULL; ++#endif + int r; + + assert(name); +@@ -457,6 +467,7 @@ int nss_group_record_by_name( + buf = mfree(buf); + } + ++#if ENABLE_GSHADOW + if (with_shadow) { + r = nss_sgrp_for_group(result, &sgrp, &sbuf); + if (r < 0) { +@@ -468,6 +479,9 @@ int nss_group_record_by_name( + incomplete = true; + + r = nss_group_to_group_record(result, sresult, ret); ++#else ++ r = nss_group_to_group_record(result, NULL, ret); ++#endif + if (r < 0) + return r; + +@@ -484,7 +498,9 @@ int nss_group_record_by_gid( + struct group grp, *result; + bool incomplete = false; + size_t buflen = 4096; ++#if ENABLE_GSHADOW + struct sgrp sgrp, *sresult = NULL; ++#endif + int r; + + assert(ret); +@@ -512,6 +528,7 @@ int nss_group_record_by_gid( + buf = mfree(buf); + } + ++#if ENABLE_GSHADOW + if (with_shadow) { + r = nss_sgrp_for_group(result, &sgrp, &sbuf); + if (r < 0) { +@@ -523,6 +540,9 @@ int nss_group_record_by_gid( + incomplete = true; + + r = nss_group_to_group_record(result, sresult, ret); ++#else ++ r = nss_group_to_group_record(result, NULL, ret); ++#endif + if (r < 0) + return r; + +--- a/src/shared/user-record-nss.h ++++ b/src/shared/user-record-nss.h +@@ -2,7 +2,11 @@ + #pragma once + + #include <grp.h> ++#if ENABLE_GSHADOW + #include <gshadow.h> ++#else ++struct sgrp; ++#endif + #include <pwd.h> + #include <shadow.h> + +--- a/src/shared/userdb.c ++++ b/src/shared/userdb.c +@@ -1046,13 +1046,15 @@ int groupdb_iterator_get(UserDBIterator + if (gr) { + _cleanup_free_ char *buffer = NULL; + bool incomplete = false; ++#if ENABLE_GSHADOW + struct sgrp sgrp; +- ++#endif + if (streq_ptr(gr->gr_name, "root")) + iterator->synthesize_root = false; + if (gr->gr_gid == GID_NOBODY) + iterator->synthesize_nobody = false; + ++#if ENABLE_GSHADOW + if (!FLAGS_SET(iterator->flags, USERDB_SUPPRESS_SHADOW)) { + r = nss_sgrp_for_group(gr, &sgrp, &buffer); + if (r < 0) { +@@ -1065,6 +1067,9 @@ int groupdb_iterator_get(UserDBIterator + } + + r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret); ++#else ++ r = nss_group_to_group_record(gr, NULL, ret); ++#endif + if (r < 0) + return r; + diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch new file mode 100644 index 0000000000..700a04a264 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch @@ -0,0 +1,32 @@ +From 6f0dd2ba75b68036d7b4ebfe47ac5eaf44d26f06 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 12 Apr 2021 23:44:53 -0700 +Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl + +musl does not define _MIPS_SIM_ABI32, _MIPS_SIM_NABI32, _MIPS_SIM_ABI64 +unlike glibc where these are provided by libc headers, therefore define +them here in case they are undefined + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + src/basic/missing_syscall.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/src/basic/missing_syscall.h ++++ b/src/basic/missing_syscall.h +@@ -20,6 +20,12 @@ + #include <asm/sgidefs.h> + #endif + ++#ifndef _MIPS_SIM_ABI32 ++#define _MIPS_SIM_ABI32 1 ++#define _MIPS_SIM_NABI32 2 ++#define _MIPS_SIM_ABI64 3 ++#endif ++ + #include "macro.h" + #include "missing_keyctl.h" + #include "missing_stat.h" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/static-libsystemd-pkgconfig.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/static-libsystemd-pkgconfig.patch new file mode 100644 index 0000000000..1f0e911cfc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/static-libsystemd-pkgconfig.patch @@ -0,0 +1,9 @@ +--- a/src/libsystemd/libsystemd.pc.in ++++ b/src/libsystemd/libsystemd.pc.in +@@ -16,5 +16,5 @@ Name: systemd + Description: systemd Library + URL: {{PROJECT_URL}} + Version: {{PROJECT_VERSION}} +-Libs: -L${libdir} -lsystemd ++Libs: -L${libdir} -lsystemd -lrt -lmount -lcap + Cflags: -I${includedir} diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb index 6411677d98..8b89a98413 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb @@ -8,41 +8,44 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" inherit meson pkgconfig -DEPENDS += "gperf-native gettext-native util-linux libcap" +DEPENDS += "gperf-native gettext-native util-linux libcap util-linux python3-jinja2-native" -SRCREV = "efb536d0cbe2e58f80e501d19999928c75e08f6a" -SRCBRANCH = "v243-stable" -SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \ +SRCREV = "1b003bbc806198dbdd57b405d968f30565495e70" +SRCBRANCH = "v250-stable" +SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ file://static-libsystemd-pkgconfig.patch \ - file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \ " # patches needed by musl SRC_URI:append:libc-musl = " ${SRC_URI_MUSL}" + SRC_URI_MUSL = "\ file://0002-don-t-use-glibc-specific-qsort_r.patch \ file://0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch \ file://0004-add-fallback-parse_printf_format-implementation.patch \ file://0005-src-basic-missing.h-check-for-missing-strndupa.patch \ - file://0006-Include-netinet-if_ether.h.patch \ - file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch \ + file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \ file://0008-add-missing-FTW_-macros-for-musl.patch \ - file://0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ - file://0011-Use-uintmax_t-for-handling-rlim_t.patch \ - file://0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \ - file://0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ - file://0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ - file://0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ - file://0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ - file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ - file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \ - file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \ - file://0024-test-json.c-define-M_PIl.patch \ - file://0001-do-not-disable-buffer-in-writing-files.patch \ - file://0002-src-login-brightness.c-include-sys-wait.h.patch \ - file://0003-src-basic-copy.c-include-signal.h.patch \ - file://0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch \ - file://0001-meson-Fix-reallocarray-check.patch \ + file://0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ + file://0010-Use-uintmax_t-for-handling-rlim_t.patch \ + file://0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \ + file://0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ + file://0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ + file://0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ + file://0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ + file://0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ + file://0017-missing_type.h-add-__compar_d_fn_t-definition.patch \ + file://0018-avoid-redefinition-of-prctl_mm_map-structure.patch \ + file://0019-Handle-missing-LOCK_EX.patch \ + file://0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \ + file://0021-test-json.c-define-M_PIl.patch \ + file://0022-do-not-disable-buffer-in-writing-files.patch \ + file://0025-Handle-__cpu_mask-usage.patch \ + file://0026-Handle-missing-gshadow.patch \ + file://0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \ + file://0001-pass-correct-parameters-to-getdents64.patch \ + file://0002-Add-sys-stat.h-for-S_IFDIR.patch \ + file://0001-Adjust-for-musl-headers.patch \ " PACKAGECONFIG ??= "gshadow idn" @@ -50,6 +53,8 @@ PACKAGECONFIG:remove:libc-musl = " gshadow idn" PACKAGECONFIG[gshadow] = "-Dgshadow=true,-Dgshadow=false" PACKAGECONFIG[idn] = "-Didn=true,-Didn=false" +CFLAGS:append:libc-musl = " -D__UAPI_DEF_ETHHDR=0 " + EXTRA_OEMESON += "-Dstatic-libsystemd=pic" S = "${WORKDIR}/git" @@ -57,6 +62,7 @@ S = "${WORKDIR}/git" do_compile() { ninja -v ${PARALLEL_MAKE} version.h ninja -v ${PARALLEL_MAKE} libsystemd.a + ninja -v ${PARALLEL_MAKE} src/libsystemd/libsystemd.pc } do_install () { diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.3.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_1.1.0.bb index 3b87c22653..1064b85b37 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_1.1.0.bb @@ -8,7 +8,7 @@ inherit cmake DEPENDS += "expat" -SRCREV = "6e8e5aadb674cccea5bdd55141db5dad887fbacd" +SRCREV = "bca8e81037766a0454740c40307eea32831c101f" SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;subpath=tools" S = "${WORKDIR}/tools" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb index 12eae5c7d5..79373f8e03 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb @@ -12,18 +12,13 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'with-exte ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap" PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd" -PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${BPN}/tests,-DBUILD_TESTS=OFF" +PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${BPN}/tests,-DBUILD_TESTS=OFF,googletest gmock" DEPENDS += "expat" -SRCREV = "6e8e5aadb674cccea5bdd55141db5dad887fbacd" -SRCREV_gtest = "a3460d1aeeaa43fdf137a6adefef10ba0b59fe4b" -SRCREV_FORMAT = "default_gtest" +SRCREV = "65782bbf435d91e5eb6af9ddab110df406a824a9" -SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \ - git://github.com/google/googletest.git;protocol=https;branch=master;name=gtest;destsuffix=git/tests/googletest-src \ - file://0001-Do-not-download-gtest-automatically.patch \ -" +SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master" SRC_URI += "file://run-ptest" EXTRA_OECMAKE = "-DBUILD_CODE_GEN=ON \ diff --git a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.18.1.bb b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.18.2.bb index 62872ff852..c41667b453 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.18.1.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.18.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://license.txt;md5=a02e03c8fa2c5e7b9b3fcc1b9811fd3b" SECTION = "libs" SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz" -SRC_URI[sha256sum] = "f8c7b46222a857168a754a5cc329bb780504122b270018dda5304c98db28ae29" +SRC_URI[sha256sum] = "541a3b13f1b9d30f977c6c1ae4c7bfdfda763cda6e44de807369dce79f42307e" S = "${WORKDIR}/Botan-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.1.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb index 7f7c350a63..8f9f663a33 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb @@ -21,7 +21,7 @@ DEPENDS:append:libc-musl = " argp-standalone" LDFLAGS:append:libc-musl = " -largp" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[sha256sum] = "a356a727a83a464ade566e95239622a22dbe4e0f482b198fdb04ab0d3a5a9c5f" +SRC_URI[sha256sum] = "fc0df945188172264ec5bf1d0bda08264fadc8a3f856d47eba91f31fe354b507" inherit autotools gettext pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.4.bb b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.4.bb index e26820f780..b76ed2477f 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.4.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.4.bb @@ -10,7 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=bc974d217b525ea216a336adb73e1220" SRCREV = "9e082897d61a2449657651aa5a0931aca31428fd" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch deleted file mode 100644 index 9d9f63e34d..0000000000 --- a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 771dd6aa45dd0bbbb7d7c7a7b116e1b5666fbd7a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 15 Nov 2020 18:05:48 -0800 -Subject: [PATCH] Disable use of __NR_io_getevents when not defined - -Architectures like riscv32 do not define this syscall, therefore return -ENOSYS on such architectures - -Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/100] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/internal.h | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/lib/internal.h -+++ b/lib/internal.h -@@ -325,10 +325,17 @@ static inline int io_submit(aio_context_ - return syscall(__NR_io_submit, ctx, n, iocb); - } - --static inline int io_getevents(aio_context_t ctx, long min, long max, -- struct io_event *events, struct timespec *timeout) -+static inline int io_getevents(__attribute__((unused)) aio_context_t ctx, -+ __attribute__((unused)) long min, -+ __attribute__((unused)) long max, -+ __attribute__((unused)) struct io_event *events, -+ __attribute__((unused)) struct timespec *timeout) - { -+#ifdef __NR_io_getevents - return syscall(__NR_io_getevents, ctx, min, max, events, timeout); -+#else -+ return -ENOSYS; -+#endif - } - - /************************************************************ diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch new file mode 100644 index 0000000000..687eb359cf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch @@ -0,0 +1,81 @@ +From d54e532821d40f8094a49742831d32ec7e76caed Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 16 Dec 2021 15:18:21 -0800 +Subject: [PATCH] kcapi-kernel-if: Adjust for musl msghdr struct compatibility + +musl sticks to POSIX and defines msg_iovlen and msg_controllen as int +and socklen_t types respectively whereas glibc and kernel mark them as +size_t which is them assumed as such in the code here as well, Make the +needed conversions to get it going on musl/linux also see [1] for more +info + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=7168790763cdeb794df52be6e3b39fbb021c5a64 + +Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/131] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/kcapi-kernel-if.c | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + +diff --git a/lib/kcapi-kernel-if.c b/lib/kcapi-kernel-if.c +index 739841e..e5d15d4 100644 +--- a/lib/kcapi-kernel-if.c ++++ b/lib/kcapi-kernel-if.c +@@ -168,10 +168,14 @@ ssize_t _kcapi_common_send_meta(struct kcapi_handle *handle, + } + + msg.msg_control = buffer_p; +- msg.msg_controllen = bufferlen; + msg.msg_iov = iov; ++#ifdef __GLIBC__ + msg.msg_iovlen = iovlen; +- ++ msg.msg_controllen = bufferlen; ++#else ++ msg.msg_iovlen = (int)iovlen; ++ msg.msg_controllen = (socklen_t)bufferlen; ++#endif + /* encrypt/decrypt operation */ + header = CMSG_FIRSTHDR(&msg); + if (!header) { +@@ -193,7 +197,11 @@ ssize_t _kcapi_common_send_meta(struct kcapi_handle *handle, + } + header->cmsg_level = SOL_ALG; + header->cmsg_type = ALG_SET_IV; ++#ifdef __GLIBC__ + header->cmsg_len = iv_msg_size; ++#else ++ header->cmsg_len = (socklen_t)iv_msg_size; ++#endif + alg_iv = (void*)CMSG_DATA(header); + alg_iv->ivlen = tfm->info.ivsize; + memcpy(alg_iv->iv, handle->cipher.iv, tfm->info.ivsize); +@@ -244,8 +252,11 @@ ssize_t _kcapi_common_send_data(struct kcapi_handle *handle, + msg.msg_controllen = 0; + msg.msg_flags = 0; + msg.msg_iov = iov; ++#ifdef __GLIBC__ + msg.msg_iovlen = iovlen; +- ++#else ++ msg.msg_iovlen = (int)iovlen; ++#endif + ret = sendmsg(*_kcapi_get_opfd(handle), &msg, (int)flags); + if (ret < 0) + ret = -errno; +@@ -542,8 +553,11 @@ ssize_t _kcapi_common_recv_data(struct kcapi_handle *handle, + msg.msg_controllen = 0; + msg.msg_flags = 0; + msg.msg_iov = iov; ++#ifdef __GLIBC__ + msg.msg_iovlen = iovlen; +- ++#else ++ msg.msg_iovlen = (int)iovlen; ++#endif + ret = recvmsg(*_kcapi_get_opfd(handle), &msg, 0); + if (ret < 0) + ret = -errno; +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb index 49c0fd11e6..1bd587f0bc 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb @@ -1,15 +1,13 @@ SUMMARY = "Linux Kernel Crypto API User Space Interface Library" HOMEPAGE = "http://www.chronox.de/libkcapi.html" -LICENSE = "BSD | GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=c78be93ed8d1637f2a3f4a83ff9d5f54" - -DEPENDS = "libtool" +LICENSE = "BSD-3-Clause | GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=80c467906eb826339c7f09e61808ed23" S = "${WORKDIR}/git" -SRCREV = "d41284525ec8960e9a828979cfe269012b7df8db" -SRC_URI = "git://github.com/smuellerDD/libkcapi.git \ - file://0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch \ - " +SRCREV = "2936ecd060c299157ac880650ba2c9fd94d27bb1" +SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https \ + file://0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch \ + " inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper/0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper/0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch deleted file mode 100644 index f2baae9149..0000000000 --- a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper/0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5b9a8da964ee0b998955cd986000cfa27cfa698d Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <alon.barlev@gmail.com> -Date: Wed, 4 Aug 2021 19:02:34 +0300 -Subject: [PATCH] build: openssl: remove RSA_SSLV23_PADDING constant usage - -Due to openssl-3 compatibility, thanks to t0b3 - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - lib/pkcs11h-openssl.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/lib/pkcs11h-openssl.c b/lib/pkcs11h-openssl.c -index 9c9b2cd..85c8193 100644 ---- a/lib/pkcs11h-openssl.c -+++ b/lib/pkcs11h-openssl.c -@@ -474,9 +474,6 @@ __pkcs11h_openssl_rsa_dec ( - case RSA_PKCS1_OAEP_PADDING: - mech = CKM_RSA_PKCS_OAEP; - break; -- case RSA_SSLV23_PADDING: -- rv = CKR_MECHANISM_INVALID; -- break; - case RSA_NO_PADDING: - mech = CKM_RSA_X_509; - break; diff --git a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.28.bb index 944f49fc78..afad03c9a6 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.28.bb @@ -15,13 +15,11 @@ LIC_FILES_CHKSUM = " \ file://COPYING.GPL;md5=8a71d0475d08eee76d8b6d0c6dbec543 \ file://COPYING.BSD;md5=66b7a37c3c10483c1fd86007726104d7 \ " -SRC_URI = "git://github.com/OpenSC/${BPN}.git \ - file://0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch \ - " +SRC_URI = "git://github.com/OpenSC/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" # v1.27 -SRCREV = "564a582d600c7eec7b8e303a22b575fd52622174" +SRCREV = "a4b46d545c33459610d4b4ae85a43a76e03a8c5e" UPSTREAM_CHECK_GITTAGREGEX = "pkcs11-helper-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch new file mode 100644 index 0000000000..e31c7be1ec --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch @@ -0,0 +1,39 @@ +From 4ca405e9763fd0ba747ef00edd30648b66992fbb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 30 Nov 2021 15:14:39 -0800 +Subject: [PATCH] Use v2.1.2 xxhash to fix build with go 1.17 + +Fixes +| # github.com/cespare/xxhash +| asm: xxhash_amd64.s:120: when dynamic linking, R15 is clobbered by a global variable access and is used here: 000 +92 (/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/influxdb/1.8.10-r0/build/pkg/mod/github.com/cespare/xxhash@ +v1.1.0/xxhash_amd64.s:120) ADDQ R15, AX +| asm: assembly failed + +Upstream-Status: Backport [https://github.com/cespare/xxhash/commit/e7a6b52374f7e2abfb8abb27249d53a1997b09a7] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + go.mod | 3 ++- + go.sum | 2 ++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +--- a/go.mod ++++ b/go.mod +@@ -55,3 +55,5 @@ require ( + gonum.org/v1/gonum v0.6.0 // indirect + google.golang.org/grpc v1.26.0 + ) ++ ++replace github.com/cespare/xxhash => github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 +--- a/go.sum ++++ b/go.sum +@@ -188,6 +188,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dA + github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= + github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= + github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= ++github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 h1:hCQ0jTkNInQ7PpNeGlSV9s+QMi6nUyyMuz37Bg3TduE= ++github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= + github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= + github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= + github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= diff --git a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch index 6e87b9d91e..b8d355706c 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch @@ -12,20 +12,20 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/go.mod +++ b/go.mod -@@ -54,3 +54,5 @@ require ( - gonum.org/v1/gonum v0.6.0 // indirect +@@ -56,4 +56,5 @@ require ( google.golang.org/grpc v1.26.0 ) -+ + +replace github.com/pkg/term => github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627 + replace github.com/cespare/xxhash => github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 --- a/go.sum +++ b/go.sum -@@ -215,6 +215,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dA +@@ -188,6 +188,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dA github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627 h1:3/XXm86KqrOZEJvEmFlzl3NTFA99n5Pd/cSXl60LmuA= +github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627/go.mod h1:BYR4E+NOQrH+NhXE71KuBNmyR1lQ+yDvP+O3IIHO5bM= + github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 h1:hCQ0jTkNInQ7PpNeGlSV9s+QMi6nUyyMuz37Bg3TduE= + github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= - github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= - github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= diff --git a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.7.10.bb b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb index fa360b8d1d..50995c09b6 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.7.10.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb @@ -2,9 +2,7 @@ DESCRIPTION = "InfluxDB is a time series database designed to handle high write HOMEPAGE = "https://www.influxdata.com/products/influxdb-overview/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=ba8146ad9cc2a128209983265136e06a" - -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=f39a8d10930fb37bd59adabb3b9d0bd6" RDEPENDS:${PN} = "bash" RDEPENDS:${PN}-dev = "bash" @@ -17,16 +15,22 @@ GO_INSTALL = "\ " SRC_URI = "\ - git://${GO_IMPORT};protocol=https;branch=1.7;destsuffix=${BPN}-${PV}/src/${GO_IMPORT} \ + git://${GO_IMPORT};protocol=https;branch=1.8;destsuffix=${BPN}-${PV}/src/${GO_IMPORT} \ + file://0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch;patchdir=src/${GO_IMPORT} \ file://influxdb \ file://influxdb.conf \ " SRC_URI:append:mipsarch = " file://0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch;patchdir=src/${GO_IMPORT}" -SRCREV = "c958f436b2e538a88a7815aad721c7774a0b8f63" +SRCREV = "688e697c51fd5353725da078555adbeff0363d01" + +inherit go-mod pkgconfig systemd update-rc.d useradd -inherit go-mod systemd update-rc.d useradd +# Workaround for network access issue during compile step +# this needs to be fixed in the recipes buildsystem to move +# this such that it can be accomplished during do_fetch task +do_compile[network] = "1" USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" @@ -35,6 +39,7 @@ do_install:prepend() { rm ${B}/src/${GO_IMPORT}/build.py rm ${B}/src/${GO_IMPORT}/build.sh rm ${B}/src/${GO_IMPORT}/Dockerfile* + sed -i -e "s#usr/bin/sh#bin/sh#g" ${B}/src/${GO_IMPORT}/scripts/ci/run_perftest.sh } do_install:append() { diff --git a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb index b973c68b01..87750ec79d 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/google/leveldb" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d" -SRC_URI = "git://github.com/google/${BPN}.git \ +SRC_URI = "git://github.com/google/${BPN}.git;branch=master;protocol=https \ file://run-ptest" SRCREV = "78b39d68c15ba020c0d60a3906fb66dbf1697595" diff --git a/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb b/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb index fb1b18c181..b58a36c446 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb @@ -8,7 +8,7 @@ HOMEPAGE = "https://symas.com/lightning-memory-mapped-database/" LICENSE = "OLDAP-2.8" LIC_FILES_CHKSUM = "file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972" -SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1 \ +SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1;protocol=https \ file://run-ptest \ file://0001-Makefile-use-libprefix-instead-of-libdir.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 81a7859323..51e6ddbf71 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -20,6 +20,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://ssize_t.patch \ file://mm_malloc.patch \ file://sys_futex.patch \ + file://0001-MDEV-25785-Add-support-for-OpenSSL-3.0.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-25785-Add-support-for-OpenSSL-3.0.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-25785-Add-support-for-OpenSSL-3.0.patch new file mode 100644 index 0000000000..ab6811c0f5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-25785-Add-support-for-OpenSSL-3.0.patch @@ -0,0 +1,381 @@ +From 1b238e343506b43825092941d4cd294d9b866bef Mon Sep 17 00:00:00 2001 +From: Vladislav Vaintroub <wlad@mariadb.com> +Date: Mon, 8 Nov 2021 18:48:19 +0100 +Subject: [PATCH] MDEV-25785 Add support for OpenSSL 3.0 + +Summary of changes + +- MD_CTX_SIZE is increased + +- EVP_CIPHER_CTX_buf_noconst(ctx) does not work anymore, points + to nobody knows where. The assumption made previously was that + (since the function does not seem to be documented) + was that it points to the last partial source block. + Add own partial block buffer for NOPAD encryption instead + +- SECLEVEL in CipherString in openssl.cnf + had been downgraded to 0, from 1, to make TLSv1.0 and TLSv1.1 possible + (according to https://github.com/openssl/openssl/blob/openssl-3.0.0/NEWS.md + even though the manual for SSL_CTX_get_security_level claims that it + should not be necessary) + +- Workaround Ssl_cipher_list issue, it now returns TLSv1.3 ciphers, + in addition to what was set in --ssl-cipher + +- ctx_buf buffer now must be aligned to 16 bytes with openssl( + previously with WolfSSL only), ot crashes will happen + +- updated aes-t , to be better debuggable + using function, rather than a huge multiline macro + added test that does "nopad" encryption piece-wise, to test + replacement of EVP_CIPHER_CTX_buf_noconst + +Upstream-Status: Backport [https://github.com/MariaDB/server/commit/1b238e343506b43825092941d4cd294d9b866bef] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + cmake/ssl.cmake | 8 ++ + include/ssl_compat.h | 3 +- + mysql-test/lib/openssl.cnf | 2 +- + mysql-test/main/ssl_cipher.result | 6 +- + mysql-test/main/ssl_cipher.test | 2 +- + mysys_ssl/my_crypt.cc | 46 +++++++----- + unittest/mysys/aes-t.c | 121 ++++++++++++++++++++++-------- + 7 files changed, 133 insertions(+), 55 deletions(-) + +diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake +index 7c2488be8bd..1bd46bc0f39 100644 +--- a/cmake/ssl.cmake ++++ b/cmake/ssl.cmake +@@ -139,6 +139,13 @@ MACRO (MYSQL_CHECK_SSL) + SET(SSL_INTERNAL_INCLUDE_DIRS "") + SET(SSL_DEFINES "-DHAVE_OPENSSL") + ++ # Silence "deprecated in OpenSSL 3.0" ++ IF((NOT OPENSSL_VERSION) # 3.0 not determined by older cmake ++ OR NOT(OPENSSL_VERSION VERSION_LESS "3.0.0")) ++ SET(SSL_DEFINES "${SSL_DEFINES} -DOPENSSL_API_COMPAT=0x10100000L") ++ SET(CMAKE_REQUIRED_DEFINITIONS -DOPENSSL_API_COMPAT=0x10100000L) ++ ENDIF() ++ + SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) + SET(CMAKE_REQUIRED_LIBRARIES ${SSL_LIBRARIES}) + SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) +@@ -152,6 +159,7 @@ MACRO (MYSQL_CHECK_SSL) + HAVE_X509_check_host) + SET(CMAKE_REQUIRED_INCLUDES) + SET(CMAKE_REQUIRED_LIBRARIES) ++ SET(CMAKE_REQUIRED_DEFINITIONS) + ELSE() + IF(WITH_SSL STREQUAL "system") + MESSAGE(FATAL_ERROR "Cannot find appropriate system libraries for SSL. Use WITH_SSL=bundled to enable SSL support") +diff --git a/include/ssl_compat.h b/include/ssl_compat.h +index 9f4b6be8d95..affa9f2a448 100644 +--- a/include/ssl_compat.h ++++ b/include/ssl_compat.h +@@ -24,7 +24,7 @@ + #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) + #define ERR_remove_state(X) ERR_clear_error() + #define EVP_CIPHER_CTX_SIZE 176 +-#define EVP_MD_CTX_SIZE 48 ++#define EVP_MD_CTX_SIZE 72 + #undef EVP_MD_CTX_init + #define EVP_MD_CTX_init(X) do { memset((X), 0, EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0) + #undef EVP_CIPHER_CTX_init +@@ -74,7 +74,6 @@ + #endif + + #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) +-#define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf) + #define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt) + #define EVP_CIPHER_CTX_SIZE sizeof(EVP_CIPHER_CTX) + +diff --git a/mysql-test/lib/openssl.cnf b/mysql-test/lib/openssl.cnf +index b9ab37ac3a1..7cd6f748af2 100644 +--- a/mysql-test/lib/openssl.cnf ++++ b/mysql-test/lib/openssl.cnf +@@ -9,4 +9,4 @@ ssl_conf = ssl_section + system_default = system_default_section + + [system_default_section] +-CipherString = ALL:@SECLEVEL=1 ++CipherString = ALL:@SECLEVEL=0 +diff --git a/mysql-test/main/ssl_cipher.result b/mysql-test/main/ssl_cipher.result +index 930d384eda9..66d817b7b41 100644 +--- a/mysql-test/main/ssl_cipher.result ++++ b/mysql-test/main/ssl_cipher.result +@@ -61,8 +61,8 @@ connect ssl_con,localhost,root,,,,,SSL; + SHOW STATUS LIKE 'Ssl_cipher'; + Variable_name Value + Ssl_cipher AES128-SHA +-SHOW STATUS LIKE 'Ssl_cipher_list'; +-Variable_name Value +-Ssl_cipher_list AES128-SHA ++SELECT VARIABLE_VALUE like '%AES128-SHA%' FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher_list'; ++VARIABLE_VALUE like '%AES128-SHA%' ++1 + disconnect ssl_con; + connection default; +diff --git a/mysql-test/main/ssl_cipher.test b/mysql-test/main/ssl_cipher.test +index 36549d76d02..d4cdcffb276 100644 +--- a/mysql-test/main/ssl_cipher.test ++++ b/mysql-test/main/ssl_cipher.test +@@ -98,6 +98,6 @@ let $restart_parameters=--ssl-cipher=AES128-SHA; + source include/restart_mysqld.inc; + connect (ssl_con,localhost,root,,,,,SSL); + SHOW STATUS LIKE 'Ssl_cipher'; +-SHOW STATUS LIKE 'Ssl_cipher_list'; ++SELECT VARIABLE_VALUE like '%AES128-SHA%' FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher_list'; + disconnect ssl_con; + connection default; +diff --git a/mysys_ssl/my_crypt.cc b/mysys_ssl/my_crypt.cc +index e512eee9066..4d7ebc7bd27 100644 +--- a/mysys_ssl/my_crypt.cc ++++ b/mysys_ssl/my_crypt.cc +@@ -29,11 +29,7 @@ + #include <ssl_compat.h> + #include <cstdint> + +-#ifdef HAVE_WOLFSSL + #define CTX_ALIGN 16 +-#else +-#define CTX_ALIGN 0 +-#endif + + class MyCTX + { +@@ -100,8 +96,9 @@ class MyCTX_nopad : public MyCTX + { + public: + const uchar *key; +- uint klen, buf_len; ++ uint klen, source_tail_len; + uchar oiv[MY_AES_BLOCK_SIZE]; ++ uchar source_tail[MY_AES_BLOCK_SIZE]; + + MyCTX_nopad() : MyCTX() { } + ~MyCTX_nopad() { } +@@ -112,7 +109,7 @@ class MyCTX_nopad : public MyCTX + compile_time_assert(MY_AES_CTX_SIZE >= sizeof(MyCTX_nopad)); + this->key= key; + this->klen= klen; +- this->buf_len= 0; ++ this->source_tail_len= 0; + if (ivlen) + memcpy(oiv, iv, ivlen); + DBUG_ASSERT(ivlen == 0 || ivlen == sizeof(oiv)); +@@ -123,26 +120,41 @@ class MyCTX_nopad : public MyCTX + return res; + } + ++ /** Update last partial source block, stored in source_tail array. */ ++ void update_source_tail(const uchar* src, uint slen) ++ { ++ if (!slen) ++ return; ++ uint new_tail_len= (source_tail_len + slen) % MY_AES_BLOCK_SIZE; ++ if (new_tail_len) ++ { ++ if (slen + source_tail_len < MY_AES_BLOCK_SIZE) ++ { ++ memcpy(source_tail + source_tail_len, src, slen); ++ } ++ else ++ { ++ DBUG_ASSERT(slen > new_tail_len); ++ memcpy(source_tail, src + slen - new_tail_len, new_tail_len); ++ } ++ } ++ source_tail_len= new_tail_len; ++ } ++ + int update(const uchar *src, uint slen, uchar *dst, uint *dlen) + { +- buf_len+= slen; ++ update_source_tail(src, slen); + return MyCTX::update(src, slen, dst, dlen); + } + + int finish(uchar *dst, uint *dlen) + { +- buf_len %= MY_AES_BLOCK_SIZE; +- if (buf_len) ++ if (source_tail_len) + { +- uchar *buf= EVP_CIPHER_CTX_buf_noconst(ctx); + /* + Not much we can do, block ciphers cannot encrypt data that aren't + a multiple of the block length. At least not without padding. + Let's do something CTR-like for the last partial block. +- +- NOTE this assumes that there are only buf_len bytes in the buf. +- If OpenSSL will change that, we'll need to change the implementation +- of this class too. + */ + uchar mask[MY_AES_BLOCK_SIZE]; + uint mlen; +@@ -154,10 +166,10 @@ class MyCTX_nopad : public MyCTX + return rc; + DBUG_ASSERT(mlen == sizeof(mask)); + +- for (uint i=0; i < buf_len; i++) +- dst[i]= buf[i] ^ mask[i]; ++ for (uint i=0; i < source_tail_len; i++) ++ dst[i]= source_tail[i] ^ mask[i]; + } +- *dlen= buf_len; ++ *dlen= source_tail_len; + return MY_AES_OK; + } + }; +diff --git a/unittest/mysys/aes-t.c b/unittest/mysys/aes-t.c +index 34704e06749..cbec2760941 100644 +--- a/unittest/mysys/aes-t.c ++++ b/unittest/mysys/aes-t.c +@@ -21,27 +21,96 @@ + #include <string.h> + #include <ctype.h> + +-#define DO_TEST(mode, nopad, slen, fill, dlen, hash) \ +- SKIP_BLOCK_IF(mode == 0xDEADBEAF, nopad ? 4 : 5, #mode " not supported") \ +- { \ +- memset(src, fill, src_len= slen); \ +- ok(my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_ENCRYPT, \ +- src, src_len, dst, &dst_len, \ +- key, sizeof(key), iv, sizeof(iv)) == MY_AES_OK, \ +- "encrypt " #mode " %u %s", src_len, nopad ? "nopad" : "pad"); \ +- if (!nopad) \ +- ok (dst_len == my_aes_get_size(mode, src_len), "my_aes_get_size");\ +- my_md5(md5, (char*)dst, dst_len); \ +- ok(dst_len == dlen && memcmp(md5, hash, sizeof(md5)) == 0, "md5"); \ +- ok(my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_DECRYPT, \ +- dst, dst_len, ddst, &ddst_len, \ +- key, sizeof(key), iv, sizeof(iv)) == MY_AES_OK, \ +- "decrypt " #mode " %u", dst_len); \ +- ok(ddst_len == src_len && memcmp(src, ddst, src_len) == 0, "memcmp"); \ ++ ++/** Test streaming encryption, bytewise update.*/ ++static int aes_crypt_bytewise(enum my_aes_mode mode, int flags, const unsigned char *src, ++ unsigned int slen, unsigned char *dst, unsigned int *dlen, ++ const unsigned char *key, unsigned int klen, ++ const unsigned char *iv, unsigned int ivlen) ++{ ++ /* Allocate context on odd address on stack, in order to ++ catch misalignment errors.*/ ++ void *ctx= (char *)alloca(MY_AES_CTX_SIZE+1)+1; ++ ++ int res1, res2; ++ uint d1= 0, d2; ++ uint i; ++ ++ if ((res1= my_aes_crypt_init(ctx, mode, flags, key, klen, iv, ivlen))) ++ return res1; ++ for (i= 0; i < slen; i++) ++ { ++ uint tmp_d1=0; ++ res1= my_aes_crypt_update(ctx, src+i,1, dst, &tmp_d1); ++ if (res1) ++ return res1; ++ d1+= tmp_d1; ++ dst+= tmp_d1; ++ } ++ res2= my_aes_crypt_finish(ctx, dst, &d2); ++ *dlen= d1 + d2; ++ return res1 ? res1 : res2; ++} ++ ++ ++#ifndef HAVE_EncryptAes128Ctr ++const uint MY_AES_CTR=0xDEADBEAF; ++#endif ++#ifndef HAVE_EncryptAes128Gcm ++const uint MY_AES_GCM=0xDEADBEAF; ++#endif ++ ++#define MY_AES_UNSUPPORTED(x) (x == 0xDEADBEAF) ++ ++static void do_test(uint mode, const char *mode_str, int nopad, uint slen, ++ char fill, size_t dlen, const char *hash) ++{ ++ uchar key[16]= {1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6}; ++ uchar iv[16]= {2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7}; ++ uchar src[1000], dst[1100], dst2[1100], ddst[1000]; ++ uchar md5[MY_MD5_HASH_SIZE]; ++ uint src_len, dst_len, dst_len2, ddst_len; ++ int result; ++ ++ if (MY_AES_UNSUPPORTED(mode)) ++ { ++ skip(nopad?7:6, "%s not supported", mode_str); ++ return; ++ } ++ memset(src, fill, src_len= slen); ++ result= my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_ENCRYPT, src, src_len, ++ dst, &dst_len, key, sizeof(key), iv, sizeof(iv)); ++ ok(result == MY_AES_OK, "encrypt %s %u %s", mode_str, src_len, ++ nopad ? "nopad" : "pad"); ++ ++ if (nopad) ++ { ++ result= aes_crypt_bytewise(mode, nopad | ENCRYPTION_FLAG_ENCRYPT, src, ++ src_len, dst2, &dst_len2, key, sizeof(key), ++ iv, sizeof(iv)); ++ ok(result == MY_AES_OK, "encrypt bytewise %s %u", mode_str, src_len); ++ /* Compare with non-bytewise encryption result*/ ++ ok(dst_len == dst_len2 && memcmp(dst, dst2, dst_len) == 0, ++ "memcmp bytewise %s %u", mode_str, src_len); ++ } ++ else ++ { ++ int dst_len_real= my_aes_get_size(mode, src_len); ++ ok(dst_len_real= dst_len, "my_aes_get_size"); + } ++ my_md5(md5, (char *) dst, dst_len); ++ ok(dst_len == dlen, "md5 len"); ++ ok(memcmp(md5, hash, sizeof(md5)) == 0, "md5"); ++ result= my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_DECRYPT, ++ dst, dst_len, ddst, &ddst_len, key, sizeof(key), iv, ++ sizeof(iv)); ++ ++ ok(result == MY_AES_OK, "decrypt %s %u", mode_str, dst_len); ++ ok(ddst_len == src_len && memcmp(src, ddst, src_len) == 0, "memcmp"); ++} + +-#define DO_TEST_P(M,S,F,D,H) DO_TEST(M,0,S,F,D,H) +-#define DO_TEST_N(M,S,F,D,H) DO_TEST(M,ENCRYPTION_FLAG_NOPAD,S,F,D,H) ++#define DO_TEST_P(M, S, F, D, H) do_test(M, #M, 0, S, F, D, H) ++#define DO_TEST_N(M, S, F, D, H) do_test(M, #M, ENCRYPTION_FLAG_NOPAD, S, F, D, H) + + /* useful macro for debugging */ + #define PRINT_MD5() \ +@@ -53,25 +122,15 @@ + printf("\"\n"); \ + } while(0); + +-#ifndef HAVE_EncryptAes128Ctr +-const uint MY_AES_CTR=0xDEADBEAF; +-#endif +-#ifndef HAVE_EncryptAes128Gcm +-const uint MY_AES_GCM=0xDEADBEAF; +-#endif + + int + main(int argc __attribute__((unused)),char *argv[]) + { +- uchar key[16]= {1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6}; +- uchar iv[16]= {2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7}; +- uchar src[1000], dst[1100], ddst[1000]; +- uchar md5[MY_MD5_HASH_SIZE]; +- uint src_len, dst_len, ddst_len; + + MY_INIT(argv[0]); + +- plan(87); ++ plan(122); ++ + DO_TEST_P(MY_AES_ECB, 200, '.', 208, "\xd8\x73\x8e\x3a\xbc\x66\x99\x13\x7f\x90\x23\x52\xee\x97\x6f\x9a"); + DO_TEST_P(MY_AES_ECB, 128, '?', 144, "\x19\x58\x33\x85\x4c\xaa\x7f\x06\xd1\xb2\xec\xd7\xb7\x6a\xa9\x5b"); + DO_TEST_P(MY_AES_CBC, 159, '%', 160, "\x4b\x03\x18\x3d\xf1\xa7\xcd\xa1\x46\xb3\xc6\x8a\x92\xc0\x0f\xc9"); +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch index 0dc6ece6da..90b7419495 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch @@ -1,4 +1,4 @@ -From b06a228a5fd1589fc9bed654b3288b321fc21aa1 Mon Sep 17 00:00:00 2001 +From 780fd27ea6f7f2c446c46a7a5e26d94106c67efd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" <rjones@redhat.com> Date: Sun, 20 Nov 2016 15:04:52 +0000 Subject: [PATCH] Add support for RISC-V. @@ -9,9 +9,11 @@ extending the existing aarch64 macro works. src/include/storage/s_lock.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) +diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h +index dccbd29..ad60429 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h -@@ -316,11 +316,12 @@ tas(volatile slock_t *lock) +@@ -317,11 +317,12 @@ tas(volatile slock_t *lock) /* * On ARM and ARM64, we use __sync_lock_test_and_set(int *, int) if available. @@ -25,7 +27,7 @@ extending the existing aarch64 macro works. #ifdef HAVE_GCC__SYNC_INT32_TAS #define HAS_TEST_AND_SET -@@ -337,7 +338,7 @@ tas(volatile slock_t *lock) +@@ -338,7 +339,7 @@ tas(volatile slock_t *lock) #define S_UNLOCK(lock) __sync_lock_release(lock) #endif /* HAVE_GCC__SYNC_INT32_TAS */ @@ -33,4 +35,7 @@ extending the existing aarch64 macro works. +#endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ - /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ + /* +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch index e9bc6240de..02f4c9e513 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch @@ -1,4 +1,4 @@ -From 71fbee3888ee889a269eded5585ed7591bcbe9dd Mon Sep 17 00:00:00 2001 +From bbba8a5261a99e79c9cd4693ef56021014a9856b Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 28 Dec 2020 16:38:21 +0800 Subject: [PATCH] Improve reproducibility, @@ -22,9 +22,11 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> src/common/Makefile | 3 --- 1 file changed, 3 deletions(-) +diff --git a/src/common/Makefile b/src/common/Makefile +index 880722f..7a9b9d4 100644 --- a/src/common/Makefile +++ b/src/common/Makefile -@@ -31,9 +31,6 @@ include $(top_builddir)/src/Makefile.glo +@@ -31,9 +31,6 @@ include $(top_builddir)/src/Makefile.global # don't include subdirectory-path-dependent -I and -L switches STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS)) STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS)) @@ -34,3 +36,6 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\"" override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\"" +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch index db9769f82e..3d969cc7e7 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch @@ -1,7 +1,7 @@ -From eba2c940afcd83521f591ccf6b49eca06908ea8e Mon Sep 17 00:00:00 2001 +From 053e8fc51bd9688100ce284a9c7afab88656386f Mon Sep 17 00:00:00 2001 From: Yi Fan Yu <yifan.yu@windriver.com> Date: Fri, 5 Feb 2021 17:15:42 -0500 -Subject: [PATCH] configure.in: bypass autoconf 2.69 version check +Subject: [PATCH] configure.ac: bypass autoconf 2.69 version check for upgrade to autoconf 2.71 @@ -9,24 +9,24 @@ Upstream-Status: Inappropriate [disable feature] Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> --- - configure.in | 4 ---- + configure.ac | 4 ---- 1 file changed, 4 deletions(-) -diff --git a/configure.in b/configure.in -index fb14dcc..a2b4a4f 100644 ---- a/configure.in -+++ b/configure.in +diff --git a/configure.ac b/configure.ac +index 7170f26..daf85b9 100644 +--- a/configure.ac ++++ b/configure.ac @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [13.4], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [14.1], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not --recommended. You can remove the check from 'configure.in' but it is then +-recommended. You can remove the check from 'configure.ac' but it is then -your responsibility whether the result works or not.])]) - AC_COPYRIGHT([Copyright (c) 1996-2020, PostgreSQL Global Development Group]) + AC_COPYRIGHT([Copyright (c) 1996-2021, PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) -- -2.17.1 +2.34.1 diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch index ba2ee29f05..fa46912eef 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch @@ -1,7 +1,7 @@ -From 7e2af4de19be58bc9d551c41ce2750396d357f34 Mon Sep 17 00:00:00 2001 +From 56b830edecff1cac5f8a8a956e7a7eeef2aa7c17 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Tue, 27 Nov 2018 13:25:15 +0800 -Subject: [PATCH] PATCH] not check libperl under cross compiling +Subject: [PATCH] not check libperl under cross compiling Upstream-Status: Inappropriate [configuration] @@ -16,12 +16,14 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> update patch to version 11.1 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - configure.in | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/configure.in -+++ b/configure.in -@@ -2206,7 +2206,7 @@ Use --without-tcl to disable building PL +diff --git a/configure.ac b/configure.ac +index fba79ee..7170f26 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2261,7 +2261,7 @@ Use --without-tcl to disable building PL/Tcl.]) fi # check for <perl.h> @@ -30,3 +32,6 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $perl_includespec" AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])], +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc index e609ac33e5..257d27b112 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -19,11 +19,11 @@ DESCRIPTION = "\ " HOMEPAGE = "http://www.postgresql.com" LICENSE = "BSD-0-Clause" -DEPENDS = "libnsl2 zlib readline tzcode-native" +DEPENDS = "libnsl2 readline tzcode-native" ARM_INSTRUCTION_SET = "arm" -SRC_URI = "http://ftp.postgresql.org/pub/source/v${PV}/${BP}.tar.bz2 \ +SRC_URI = "https://ftp.postgresql.org/pub/source/v${PV}/${BP}.tar.bz2 \ file://postgresql.init \ file://postgresql-profile \ file://postgresql.pam \ @@ -43,7 +43,6 @@ CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6" SYSTEMD_SERVICE:${PN} = "postgresql.service" SYSTEMD_AUTO_ENABLE:${PN} = "disable" -DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-systemctl-native', '', d)}" pkg_postinst:${PN} () { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd sysvinit', 'true', 'false', d)}; then if [ -n "$D" ]; then @@ -53,23 +52,29 @@ pkg_postinst:${PN} () { fi } -enable_pam = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -PACKAGECONFIG ??= "${enable_pam} openssl python uuid libxml tcl nls libxml perl" -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl ac_cv_file__dev_urandom=yes,openssl," -PACKAGECONFIG[python] = "--with-python,--without-python,python3,python3" -PACKAGECONFIG[uuid] = "--with-uuid=e2fs,--without-uuid,util-linux," +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \ + openssl python uuid libxml tcl perl zlib \ +" PACKAGECONFIG[tcl] = "--with-tcl --with-tclconfig=${STAGING_BINDIR_CROSS},--without-tcl,tcl tcl-native," -PACKAGECONFIG[nls] = "--enable-nls,--disable-nls,," -PACKAGECONFIG[libxml] = "--with-libxml,--without-libxml,libxml2,libxml2" PACKAGECONFIG[perl] = "--with-perl,--without-perl,perl,perl" +PACKAGECONFIG[python] = "--with-python,--without-python,python3,python3" +PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" +PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd systemd-systemctl-native" +PACKAGECONFIG[uuid] = "--with-uuid=e2fs,--without-uuid,util-linux" +PACKAGECONFIG[libxml] = "--with-libxml,--without-libxml,libxml2,libxml2" +PACKAGECONFIG[libxslt] = "--with-libxslt,--without-libxslt,libxslt" +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" +PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4" +PACKAGECONFIG[openssl] = "--with-ssl=openssl,ac_cv_file__dev_urandom=yes,openssl" EXTRA_OECONF += "--enable-thread-safety --disable-rpath \ --datadir=${datadir}/${BPN} \ --sysconfdir=${sysconfdir}/${BPN} \ " EXTRA_OECONF:sh4 += "--disable-spinlocks" -EXTRA_OECONF:aarch64 += "--disable-spinlocks" DEBUG_OPTIMIZATION:remove:mips = " -Og" DEBUG_OPTIMIZATION:append:mips = " -O" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.4.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.1.bb index f63d23dbef..1112cc21d1 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.4.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.1.bb @@ -6,7 +6,7 @@ SRC_URI += "\ file://not-check-libperl.patch \ file://0001-Add-support-for-RISC-V.patch \ file://0001-Improve-reproducibility.patch \ - file://0001-configure.in-bypass-autoconf-2.69-version-check.patch \ + file://0001-configure.ac-bypass-autoconf-2.69-version-check.patch \ " -SRC_URI[sha256sum] = "ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd" +SRC_URI[sha256sum] = "4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f" diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb index 9b1fefc127..a5f6d8344a 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ SRCREV = "8608d75d85f8e1b3b64b73a4fb6d19baec61ba5c" SRCBRANCH = "6.20.fb" -SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \ file://0001-cmake-Add-check-for-atomic-support.patch \ file://0001-cmake-Use-exported-target-for-bz2.patch \ file://0001-folly-Use-SYS_futex-for-syscall.patch \ diff --git a/meta-openembedded/meta-oe/recipes-dbs/soci/soci/0001-Fix-build-when-SIGSTKSZ-is-no-longer-a-constant.patch b/meta-openembedded/meta-oe/recipes-dbs/soci/soci/0001-Fix-build-when-SIGSTKSZ-is-no-longer-a-constant.patch new file mode 100644 index 0000000000..8e32ebb0bf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/soci/soci/0001-Fix-build-when-SIGSTKSZ-is-no-longer-a-constant.patch @@ -0,0 +1,42 @@ +From fae154eb209e068586e1adb589de5d273fcf4b4f Mon Sep 17 00:00:00 2001 +From: Denis Arnaud <denis.arnaud_fedora@m4x.org> +Date: Tue, 18 May 2021 00:05:03 +0200 +Subject: [PATCH] Fix build when SIGSTKSZ is no longer a constant + +In the latest glibc versions SIGSTKSZ is not a constant any more, which +broke building the tests with it. + +Work around this by hard-coding a typical value for it. + +closes #886. + +Upstream-Status: Backport. +--- + tests/catch.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/catch.hpp b/tests/catch.hpp +index 014df2c5..85067813 100644 +--- a/tests/catch.hpp ++++ b/tests/catch.hpp +@@ -6489,7 +6489,7 @@ namespace Catch { + static bool isSet; + static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; + static stack_t oldSigStack; +- static char altStackMem[SIGSTKSZ]; ++ static char altStackMem[8192]; + + static void handleSignal( int sig ) { + std::string name = "<unknown signal>"; +@@ -6540,7 +6540,7 @@ namespace Catch { + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; + stack_t FatalConditionHandler::oldSigStack = {}; +- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; ++ char FatalConditionHandler::altStackMem[8192] = {}; + + } // namespace Catch + +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/soci/soci_3.2.3.bb b/meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.2.bb index c218b7151e..fb67e0c547 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/soci/soci_3.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.2.bb @@ -1,6 +1,3 @@ -# Copyright (C) 2015 Khem Raj <raj.khem@gmail.com> -# Released under the MIT license (see COPYING.MIT for the terms) - DESCRIPTION = "The C++ Database Access Library" HOMEPAGE = "http://soci.sourceforge.net" LICENSE = "BSL-1.0" @@ -8,12 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SECTION = "libs" DEPENDS = "boost" - SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.gz \ - file://soci_libdir.patch \ - " -SRC_URI[md5sum] = "acfbccf176cd20e06833a8037a2d3699" -SRC_URI[sha256sum] = "2c659db0f4f7b424bbcffe195c03c293a1dbf676189a27b077fb2aab4d53a610" + file://0001-Fix-build-when-SIGSTKSZ-is-no-longer-a-constant.patch" +SRC_URI[sha256sum] = "34da2d2320539463da8a5131253246fa2671e0438ab5fd1e5119edb428f558a5" TESTCONFIG = '-DSOCI_TEST_EMPTY_CONNSTR="dummy" -DSOCI_TEST_SQLITE3_CONNSTR="test.db" \ -DSOCI_TEST_POSTGRESQL_CONNSTR:STRING="dbname=soci_test" \ @@ -29,6 +23,7 @@ PACKAGECONFIG[postgresql] = "-DSOCI_POSTGRESQL=ON,-DSOCI_POSTGRESQL=OFF,postgres PACKAGECONFIG[odbc] = "-DSOCI_ODBC=ON,-DSOCI_ODBC=OFF,," PACKAGECONFIG[empty] = "-DSOCI_EMPTY=ON,-DSOCI_EMPTY=OFF,," PACKAGECONFIG[oracle] = "-DWITH_ORACLE=ON --with-oracle-include=${OINCDIR} --with-oracle-lib=${OLIBDIR},-DWITH_ORACLE=OFF,," +PACKAGECONFIG[firebird] = "-DWITH_FIREBIRD=ON,-DWITH_FIREBIRD=OFF,," PACKAGECONFIG[ptest] = "${TESTCONFIG},,," # enable your backend by default we enable 'empty' diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb index 23db1d6568..37d5d81238 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" PV = "20210324.2+git${SRCPV}" SRCREV = "278e0a071885a22dcd2fd1b5576cc44757299343" BRANCH = "lts_2021_03_24" -SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ +SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ file://0001-absl-always-use-asm-sgidefs.h.patch \ file://0002-Remove-maes-option-from-cross-compilation.patch \ file://abseil-ppc-fixes.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb b/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb index eb8e0318ee..d4d8d8eb45 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \ SRCREV = "d28a980802ad48568c87da02d630c8babfe163bb" PV .= "+10.0.1+git${SRCPV}" -SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git \ +SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb b/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb index 9f759100b8..14da3ca3f1 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb @@ -4,9 +4,9 @@ SECTION = "libs" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI = "git://github.com/CPPAlliance/url.git;branch=develop" +SRC_URI = "git://github.com/CPPAlliance/url.git;branch=develop;protocol=https" -SRCREV = "4f712ed69a04a344957d22efa5dc111b415b3aff" +SRCREV = "d740a92d38e3a8f4d5b2153f53b82f1c98e312ab" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index 1757c70194..fabf59d4b2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb @@ -28,11 +28,11 @@ SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac" SRCREV_lss = "fd00dbbd0c06a309c657d89e9430143b179ff6db" SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770" -SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main \ - git://github.com/google/googletest.git;destsuffix=git/src/testing/gtest;name=gtest \ - git://github.com/protocolbuffers/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf \ +SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=https \ + git://github.com/google/googletest.git;destsuffix=git/src/testing/gtest;name=gtest;branch=master;protocol=https \ + git://github.com/protocolbuffers/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf;branch=master;protocol=https \ git://chromium.googlesource.com/linux-syscall-support;protocol=https;branch=main;destsuffix=git/src/third_party/lss;name=lss \ - git://chromium.googlesource.com/external/gyp;protocol=https;destsuffix=git/src/tools/gyp;name=gyp \ + git://chromium.googlesource.com/external/gyp;protocol=https;destsuffix=git/src/tools/gyp;name=gyp;branch=master \ file://0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch \ file://0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch \ file://0001-Turn-off-sign-compare-for-musl-libc.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb index 2d78beea5b..774423192e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb @@ -5,7 +5,7 @@ SECTION = "console/tools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" -SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV} \ +SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https \ file://0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch;patchdir=../ \ " SRCREV = "57a4ca5af5a7f55b768a9d9d6655250bffb1257f" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb index 1a4e53d508..200f751669 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0" -SRC_URI = "git://github.com/DaveGamble/cJSON.git" +SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https" SRCREV = "d348621ca93571343a56862df7de4ff3bc9b5667" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.90.bb b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.92.bb index fa69aa1420..2b9f29969b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.90.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.92.bb @@ -6,8 +6,7 @@ LICENSE="GPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" SRC_URI = "https://github.com/AlDanial/cloc/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "e2364c2c9c9eda1d20890c19911c51fb" -SRC_URI[sha256sum] = "152502a61d4bae4a406a05a01bf52489b310ec03dbd8c645d0bb051fa4717ddb" +SRC_URI[sha256sum] = "73570f9da159fab13846038de7c3d8772554117c04117281dcbe6e5c7b988264" UPSTREAM_CHECK_URI = "https://github.com/AlDanial/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb b/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb index 3070d2937f..c414fd3146 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb @@ -10,7 +10,7 @@ SECTION = "base" PV = "0.5.1+git${SRCPV}" SRCREV = "f97d3da5c375ac2fc5a9173cdd36cb828915a2e1" LIC_FILES_CHKSUM = "file://LICENSE;md5=a0b24c1a8f9ad516a297d055b0294231" -SRC_URI = "git://github.com/concurrencykit/ck.git \ +SRC_URI = "git://github.com/concurrencykit/ck.git;branch=master;protocol=https \ file://cross.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20201006.bb b/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20211129.bb index 1b42590f42..d1f1250923 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20201006.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20211129.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz \ " -SRC_URI[sha256sum] = "13c53f16408341d11ed489b352f218ec4dbb5bedb796a9d059e924770a9c56a6" +SRC_URI[sha256sum] = "230772bb88c44732e68a42d2eff43bcff46d893bf4ea6e04151d4cb6e8c88e2f" COMPATIBLE_HOST = "(i.86|x86_64).*-linux" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210905.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20211114.0.bb index 3289436fa2..cde7c7a0ef 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210905.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20211114.0.bb @@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "ca81123303640582358ce7b8a4e466615950a1f7" -SRC_URI = "git://github.com/universal-ctags/ctags" +SRCREV = "a668cb155609d5a322963e1ed9a0c0147c8be597" +SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.124.bb b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.126.bb index 4fc59adfbe..38b015c401 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.124.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.126.bb @@ -11,8 +11,7 @@ SRC_URI = "\ file://0001-do-not-hardcode-the-full-path-of-dpkg.patch \ " -SRC_URI[md5sum] = "8a5e97f60236c3a63f715c056a5f0e29" -SRC_URI[sha256sum] = "7700e9864b29f166b26c54153ed8c275b46f4b9a60468bb607e019a64c16cd8f" +SRC_URI[sha256sum] = "bc48e1c500c33bed50bd00d201f338d3c92d6c0dcb1f202c3bc00ef01f96c618" S = "${WORKDIR}/debootstrap" diff --git a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index 60ca2ab282..5263aaef30 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -3,13 +3,13 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master " -SRCREV = "b0d80b7129f1d84cc563a4098d869e7420bcf4bc" +SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master;protocol=https" +SRCREV = "3ccf87915ceb70eac055a07eb80bc9105e916620" PV = "1.3" SRC_URI:append:class-target = " file://oe-remote.repo.sample" -inherit distutils3-base +inherit setuptools3-base S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch index 9d1a5a93d0..b6d007d8df 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch @@ -1,4 +1,4 @@ -From 7aeee92c752f8a4b2524ed6a41d60c1a3ca8bf2d Mon Sep 17 00:00:00 2001 +From daf686508f2ee4711d93e96e5b100e50bf161656 Mon Sep 17 00:00:00 2001 From: Leon Anavi <leon.anavi@konsulko.com> Date: Wed, 26 Aug 2020 10:52:10 +0300 Subject: [PATCH] doxygen: Fix Python issues for doxygen-native @@ -39,6 +39,7 @@ Upstream-Status: Inappropriate[oe specific] Co-Authored-By: Kai Kang <kai.kang@windriver.com> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> + --- CMakeLists.txt | 2 +- addon/doxywizard/CMakeLists.txt | 6 +++--- @@ -50,10 +51,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index f30b46b8..50f211c8 100644 +index 2455793..28f0d83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -101,7 +101,7 @@ else () +@@ -105,7 +105,7 @@ else () endif () find_program(DOT NAMES dot) @@ -63,10 +64,10 @@ index f30b46b8..50f211c8 100644 find_package(BISON REQUIRED) if (BISON_VERSION VERSION_LESS 2.7) diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt -index a6f65f8d..d163aa5b 100644 +index 63ac8e3..d37d1d0 100644 --- a/addon/doxywizard/CMakeLists.txt +++ b/addon/doxywizard/CMakeLists.txt -@@ -58,7 +58,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA +@@ -57,7 +57,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA # generate version.cpp add_custom_command( @@ -75,7 +76,7 @@ index a6f65f8d..d163aa5b 100644 DEPENDS ${PROJECT_SOURCE_DIR}/VERSION ${PROJECT_SOURCE_DIR}/src/version.py OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp ) -@@ -66,7 +66,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENER +@@ -65,7 +65,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENER # generate configdoc.cpp add_custom_command( @@ -84,7 +85,7 @@ index a6f65f8d..d163aa5b 100644 DEPENDS ${PROJECT_SOURCE_DIR}/src/configgen.py ${PROJECT_SOURCE_DIR}/src/config.xml OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp ) -@@ -75,7 +75,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN +@@ -74,7 +74,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN set(LEX_FILES config_doxyw) foreach(lex_file ${LEX_FILES}) add_custom_command( @@ -94,10 +95,10 @@ index a6f65f8d..d163aa5b 100644 OUTPUT ${GENERATED_SRC_WIZARD}/${lex_file}.l.h ) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index f2d177ed..22a4d602 100644 +index ec63ceb..49a2bda 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt -@@ -163,7 +163,7 @@ configure_file(${PROJECT_SOURCE_DIR}/doc/doxyindexer.1 ${PROJECT_BINARY_DIR +@@ -168,7 +168,7 @@ configure_file(${PROJECT_SOURCE_DIR}/doc/doxyindexer.1 ${PROJECT_BINARY_DIR # doc/language.doc (see tag Doxyfile:INPUT) add_custom_command( @@ -106,7 +107,7 @@ index f2d177ed..22a4d602 100644 DEPENDS ${PROJECT_SOURCE_DIR}/doc/maintainers.txt ${PROJECT_SOURCE_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py ${LANG_FILES} OUTPUT language.doc WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc -@@ -172,7 +172,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1) +@@ -177,7 +177,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1) # doc/config.doc (see tag Doxyfile:INPUT) add_custom_command( @@ -115,7 +116,7 @@ index f2d177ed..22a4d602 100644 DEPENDS ${TOP}/src/config.xml ${TOP}/src/configgen.py OUTPUT config.doc WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/ -@@ -223,7 +223,7 @@ add_custom_target(docs_chm +@@ -228,7 +228,7 @@ add_custom_target(docs_chm COMMAND ${CMAKE_COMMAND} -E echo " for file in files:" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py COMMAND ${CMAKE_COMMAND} -E echo " if file.endswith('.html') or file.endswith('.png') or file.endswith('.css') or file.endswith('.gif'):" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py COMMAND ${CMAKE_COMMAND} -E echo " print(os.path.join(root, file))" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py @@ -125,7 +126,7 @@ index f2d177ed..22a4d602 100644 COMMAND ${CMAKE_COMMAND} -E rename ${PROJECT_BINARY_DIR}/chm/index.chm ${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index 194b4271..248b8076 100644 +index 194b427..248b807 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -54,7 +54,7 @@ foreach (f_inp ${BASIC_EXAMPLES}) @@ -147,7 +148,7 @@ index 194b4271..248b8076 100644 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex ) diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt -index 0a239008..09849e2d 100644 +index 34cf4d8..f015afc 100644 --- a/libmscgen/CMakeLists.txt +++ b/libmscgen/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( @@ -160,10 +161,10 @@ index 0a239008..09849e2d 100644 OUTPUT ${GENERATED_SRC}/${lex_file}.l.h ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5004a957..68e803f2 100644 +index 0e0c5f7..c1d3ca5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -39,7 +39,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1) +@@ -40,7 +40,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1) # configvalues.h add_custom_command( @@ -172,7 +173,7 @@ index 5004a957..68e803f2 100644 DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py OUTPUT ${GENERATED_SRC}/configvalues.h ) -@@ -51,7 +51,7 @@ add_custom_target( +@@ -52,7 +52,7 @@ add_custom_target( # configvalues.cpp add_custom_command( @@ -181,7 +182,7 @@ index 5004a957..68e803f2 100644 DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py OUTPUT ${GENERATED_SRC}/configvalues.cpp ) -@@ -59,7 +59,7 @@ set_source_files_properties(${GENERATED_SRC}/configvalues.cpp PROPERTIES GENERAT +@@ -60,7 +60,7 @@ set_source_files_properties(${GENERATED_SRC}/configvalues.cpp PROPERTIES GENERAT # configoptions.cpp add_custom_command( @@ -190,7 +191,7 @@ index 5004a957..68e803f2 100644 DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py OUTPUT ${GENERATED_SRC}/configoptions.cpp ) -@@ -94,7 +94,7 @@ endif() +@@ -95,7 +95,7 @@ endif() # resources.cpp add_custom_command( COMMENT "Generating ${GENERATED_SRC}/resources.cpp" @@ -199,7 +200,7 @@ index 5004a957..68e803f2 100644 DEPENDS ${RESOURCES} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py OUTPUT ${GENERATED_SRC}/resources.cpp ) -@@ -124,7 +124,7 @@ foreach(lex_file ${LEX_FILES}) +@@ -126,7 +126,7 @@ foreach(lex_file ${LEX_FILES}) set(LEX_FILES_H ${LEX_FILES_H} " " ${GENERATED_SRC}/${lex_file}.l.h CACHE INTERNAL "Stores generated files") set(LEX_FILES_CPP ${LEX_FILES_CPP} " " ${GENERATED_SRC}/${lex_file}.cpp CACHE INTERNAL "Stores generated files") add_custom_command( @@ -209,7 +210,7 @@ index 5004a957..68e803f2 100644 OUTPUT ${GENERATED_SRC}/${lex_file}.l.h ) diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt -index fd6912e9..0af1865b 100644 +index fd6912e..0af1865 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -1,7 +1,7 @@ @@ -229,6 +230,3 @@ index fd6912e9..0af1865b 100644 + COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing ) endforeach() --- -2.27.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.2.bb b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb index fc5df4c71f..7070c1f2d6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb @@ -10,7 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \ file://0001-build-don-t-look-for-Iconv.patch \ " SRC_URI:append:class-native = " file://doxygen-native-only-check-python3.patch" -SRC_URI[sha256sum] = "060f254bcef48673cc7ccf542736b7455b67c110b30fdaa33512a5b09bbecee5" +SRC_URI[sha256sum] = "f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0" inherit cmake python3native diff --git a/meta-openembedded/meta-oe/recipes-devtools/exprtk/exprtk_git.bb b/meta-openembedded/meta-oe/recipes-devtools/exprtk/exprtk_git.bb index a50679ae4f..52975c8215 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/exprtk/exprtk_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/exprtk/exprtk_git.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRCREV = "281c2ccc65b8f91c012ea3725ebcef406378a225" -SRC_URI = "git://github.com/ArashPartow/exprtk.git" +SRC_URI = "git://github.com/ArashPartow/exprtk.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb index 957f059229..06bb971541 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb @@ -14,7 +14,7 @@ RDEPENDS:${PN}-dev += "${PN}-compiler" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV = "a9a295fecf3fbd5a4f571f53b01f63202a3e2113" -SRC_URI = "git://github.com/google/flatbuffers.git" +SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https" S = "${WORKDIR}/git" CVE_CHECK_WHITELIST += "CVE-2020-35864" diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.37.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb index 9a70537927..16dd71c16f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.37.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb @@ -32,7 +32,7 @@ SRC_URI = " \ https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ file://0001-Use-pkg-config-to-find-gpgme.patch \ " -SRC_URI[sha256sum] = "c98f9b1303f4ab9bed7587e749cd0b5594d9136a1bf8ba110900d46a17fa9cd8" +SRC_URI[sha256sum] = "1c578a7ebb390aa8882f195acd3d8da3ceb73925d291b28dec90cd3e5fd20586" do_configure:prepend() { rm -f ${S}/build/cache/glib-gettext.m4 diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.37.1.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.38.bb index f039a756f2..33d0870eb9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.37.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.38.bb @@ -12,7 +12,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "https://download.geany.org/${BP}.tar.bz2 \ file://0001-configure-Upgrade-to-a-modern-Gettext.patch \ " -SRC_URI[sha256sum] = "18c5756444c1d8bcd737c8ecfd4ef0b3607c924fc02560d4e8b78f6121531a18" +SRC_URI[sha256sum] = "abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546" FILES:${PN} += "${datadir}/icons" diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.41.0.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.41.1.bb index f961c533e0..8a9e762734 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.41.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.41.1.bb @@ -20,7 +20,7 @@ RDEPENDS:${PN}-dev:class_native += "${PN}-compiler" # RDEPENDS:${PN}-dev += "${PN}-compiler" S = "${WORKDIR}/git" -SRCREV_grpc = "fc662b7964384b701af5bd3ce6994d2180080eb4" +SRCREV_grpc = "635693ce624f3b3a89e5a764f0664958ef08b2b9" BRANCH = "v1.41.x" SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ file://0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.8.bb b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.8.bb index f16cced1a0..47d872a400 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.8.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.8.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" PV = "3.9.8+git${SRCPV}" -SRC_URI = "git://github.com/iipeace/${BPN}" +SRC_URI = "git://github.com/iipeace/${BPN};branch=master;protocol=https" SRCREV = "a502cd93b13235b7539557a91328de00b7c51bc3" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb index 5473eefe75..fad42e3994 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "zlib boost libunwind elfutils" -SRC_URI = "git://github.com/KDE/heaptrack.git;protocol=https \ +SRC_URI = "git://github.com/KDE/heaptrack.git;protocol=https;branch=master \ file://0001-libheaptrack-Replace-__pid_t-with-pid_t.patch \ file://0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch \ file://0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/0001-Fix-printd-formatting-strings.patch b/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/0001-Fix-printd-formatting-strings.patch deleted file mode 100644 index 5b9afd9616..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/0001-Fix-printd-formatting-strings.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 86b4d398dbb95e2437b70eba3b30e995ec9be505 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 31 Aug 2017 20:47:50 -0700 -Subject: [PATCH] Fix printd formatting strings - -Fixes -error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/ipfilter.c | 2 +- - src/othptab.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/ipfilter.c b/src/ipfilter.c -index eb17ec7..8c76e4c 100644 ---- a/src/ipfilter.c -+++ b/src/ipfilter.c -@@ -146,7 +146,7 @@ void gethostparams(struct hostparams *data, char *init_saddr, char *init_smask, - snprintf(msgstr, 60, - "Invalid protocol input at or near token \"%s\"", - bptr); -- tui_error(ANYKEY_MSG, msgstr); -+ tui_error(ANYKEY_MSG, "%s", msgstr); - doagain = 1; - } else - doagain = 0; -diff --git a/src/othptab.c b/src/othptab.c -index 142c9c2..fe395c2 100644 ---- a/src/othptab.c -+++ b/src/othptab.c -@@ -410,7 +410,7 @@ void printothpentry(struct othptable *table, struct othptabent *entry, - break; - } - -- sprintf(scratchpad, rarp_mac_addr); -+ sprintf(scratchpad, "%s", rarp_mac_addr); - strcat(msgstring, scratchpad); - wattrset(table->othpwin, ARPATTR); - break; -@@ -485,7 +485,7 @@ void printothpentry(struct othptable *table, struct othptabent *entry, - wattrset(table->othpwin, UNKNIPATTR); - protptr = getprotobynumber(entry->protocol); - if (protptr != NULL) { -- sprintf(protname, protptr->p_aliases[0]); -+ sprintf(protname, "%s", protptr->p_aliases[0]); - } else { - sprintf(protname, "IP protocol"); - unknown = 1; --- -2.14.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/0001-make-Make-CC-weak-assignment.patch b/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/0001-make-Make-CC-weak-assignment.patch new file mode 100644 index 0000000000..342c78f0f1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/0001-make-Make-CC-weak-assignment.patch @@ -0,0 +1,44 @@ +From 223de708552b1ab00ac1a119e82e13deed573036 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Oct 2021 10:22:38 -0700 +Subject: [PATCH] make: Make CC weak assignment + +This ensures that if environment overrrides it then its respected, this +helps cross-compiling cases + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Makefile ++++ b/Makefile +@@ -18,14 +18,14 @@ VERSION-FILE: FORCE + @$(SHELL_PATH) ./GEN-VERSION-FILE + -include VERSION-FILE + +-CFLAGS = -g -O2 -Wall -W -Werror=format-security +-LDFLAGS = ++CFLAGS += -g -O2 -Wall -W -Werror=format-security ++LDFLAGS ?= + IPTRAF_CFLAGS := -std=gnu99 -D_GNU_SOURCE + ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) $(IPTRAF_CFLAGS) + ALL_LDFLAGS = $(LDFLAGS) + STRIP ?= strip + +-prefix = $(HOME) ++prefix ?= $(HOME) + sbindir_relative = sbin + sbindir = $(prefix)/$(sbindir_relative) + mandir = $(prefix)/share/man +@@ -39,7 +39,7 @@ pathsep = : + + export prefix bindir sharedir sysconfdir gitwebdir localedir + +-CC = cc ++CC ?= cc + RM = rm -f + INSTALL = install + RPMBUILD = rpmbuild diff --git a/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/iptraf-ng-tmpfiles.conf b/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/iptraf-ng-tmpfiles.conf new file mode 100644 index 0000000000..ebb9d67800 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/iptraf-ng-tmpfiles.conf @@ -0,0 +1,3 @@ +d /run/iptraf-ng 0755 root root - +d /var/log/iptraf-ng 0755 root root - +d /var/lib/iptraf-ng 0755 root root - diff --git a/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch b/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch index 65b92dade2..8704310406 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch @@ -2,11 +2,9 @@ Use pkg-config to search for ncurses libraries Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: iptraf-ng-1.1.4/Makefile -=================================================================== ---- iptraf-ng-1.1.4.orig/Makefile -+++ iptraf-ng-1.1.4/Makefile -@@ -205,8 +205,8 @@ endif +--- a/Makefile ++++ b/Makefile +@@ -201,8 +201,8 @@ endif ifndef NCURSES_LDFLAGS ifdef NEEDS_NCURSES5 @@ -17,7 +15,7 @@ Index: iptraf-ng-1.1.4/Makefile ifndef NO_PANEL NCURSES_LDFLAGS += -lpanel endif -@@ -215,8 +215,8 @@ endif +@@ -211,8 +211,8 @@ endif ifndef NCURSES_LDFLAGS ifdef NEEDS_NCURSESW5 @@ -26,9 +24,9 @@ Index: iptraf-ng-1.1.4/Makefile + NCURSES_CFLAGS := $(shell p[k-config ncursesw --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null) ifndef NO_PANEL - NCURSES_LDFLAGS += -lpanel + NCURSES_LDFLAGS += -lpanelw endif -@@ -225,8 +225,8 @@ endif +@@ -221,8 +221,8 @@ endif ifndef NCURSES_LDFLAGS ifdef NEEDS_NCURSES6 @@ -39,7 +37,7 @@ Index: iptraf-ng-1.1.4/Makefile ifndef NO_PANEL NCURSES_LDFLAGS += -lpanel endif -@@ -235,8 +235,8 @@ endif +@@ -231,8 +231,8 @@ endif ifndef NCURSES_LDFLAGS ifdef NEEDS_NCURSESW6 @@ -48,34 +46,45 @@ Index: iptraf-ng-1.1.4/Makefile + NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null) ifndef NO_PANEL - NCURSES_LDFLAGS += -lpanel + NCURSES_LDFLAGS += -lpanelw endif -@@ -246,17 +246,17 @@ endif +@@ -241,27 +241,27 @@ endif + # try find ncuses by autodetect ifndef NCURSES_LDFLAGS - ifneq ($(shell ncursesw6-config --libs 2>/dev/null),) +- ifneq ($(shell ncursesw6-config --libs 2>/dev/null),) - NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null) - NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null) ++ ifneq ($(shell pkg-config ncursesw --libs 2>/dev/null),) ++ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null) ++ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null) + ifndef NO_PANEL + NCURSES_LDFLAGS += -lpanelw + endif - else ifneq ($(shell ncurses6-config --libs 2>/dev/null),) - NCURSES_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null) - NCURSES_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null) ++ else ifneq ($(shell pkg-config ncursesw --libs 2>/dev/null),) ++ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null) ++ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null) + ifndef NO_PANEL + NCURSES_LDFLAGS += -lpanel + endif - else ifneq ($(shell ncursesw5-config --libs 2>/dev/null),) - NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null) - NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null) ++ else ifneq ($(shell pkg-config ncursesw --libs 2>/dev/null),) ++ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null) ++ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null) + ifndef NO_PANEL + NCURSES_LDFLAGS += -lpanelw + endif - else ifneq ($(shell ncurses5-config --libs 2>/dev/null),) - NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null) - NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null) -+ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null) -+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null) -+ else ifneq ($(shell pkg-config ncurses --libs 2>/dev/null),) -+ NCURSES_CFLAGS := $(shell pkg-config ncurses --cflags 2>/dev/null) -+ NCURSES_LDFLAGS := $(shell pkg-config ncurses --libs 2>/dev/null) + else ifneq ($(shell pkg-config ncursesw --libs 2>/dev/null),) + NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null) -+ else ifneq ($(shell pkg-config ncurses --libs 2>/dev/null),) -+ NCURSES_CFLAGS := $(shell pkg-config ncurses --cflags 2>/dev/null) -+ NCURSES_LDFLAGS := $(shell pkg-config ncurses --libs 2>/dev/null) - endif - - ifneq ($(NCURSES_LDFLAGS),) + ifndef NO_PANEL + NCURSES_LDFLAGS += -lpanel + endif diff --git a/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.1.4.bb b/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb index 6b18953b30..27a0f4441d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.1.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb @@ -24,17 +24,28 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e2b3850593b899b1a17594ed4cc4c731" DEPENDS = "ncurses" -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/iptraf-ng/iptraf-ng-1.1.4.tar.gz/e0f8df3b7baf2b5106709abc4f8c029a/${BP}.tar.gz \ +SRC_URI = "https://src.fedoraproject.org/repo/pkgs/iptraf-ng/v${PV}.tar.gz/sha512/44d36fc92cdbf379f62cb63638663c3ee610225b9c28d60ee55e62e358f398a6b0db281129327b3472e45fb553ee3dd605af09c129f2233f8839ae3dbd799384/v${PV}.tar.gz \ + file://iptraf-ng-tmpfiles.conf \ file://ncurses-config.patch \ - file://0001-Fix-printd-formatting-strings.patch \ + file://0001-make-Make-CC-weak-assignment.patch \ " -SRC_URI[md5sum] = "e0f8df3b7baf2b5106709abc4f8c029a" -SRC_URI[sha256sum] = "16b9b05bf5d3725d86409b901696639ad46944d02de6def87b1ceae5310dd35c" +SRC_URI[sha256sum] = "9f5cef584065420dea1ba32c86126aede1fa9bd25b0f8362b0f9fd9754f00870" -inherit autotools-brokensep pkgconfig +inherit pkgconfig CFLAGS += "-D_GNU_SOURCE" +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install + install -D -m 0644 -p ${S}/iptraf-ng-logrotate.conf ${D}${sysconfdir}/logrotate.d/iptraf-ng + install -Dm 0644 ${WORKDIR}/iptraf-ng-tmpfiles.conf ${D}${libdir}/tmpfiles.d/iptraf-ng-tmpfiles.conf +} + +FILES:${PN} += "${libdir}/tmpfiles.d" PROVIDES = "iptraf" RPROVIDES:${PN} += "iptraf" RREPLACES:${PN} += "iptraf" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jemalloc/files/0001-test-Disable-optimization-with-clang-for-aligned_all.patch b/meta-openembedded/meta-oe/recipes-devtools/jemalloc/files/0001-test-Disable-optimization-with-clang-for-aligned_all.patch new file mode 100644 index 0000000000..570202e800 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/jemalloc/files/0001-test-Disable-optimization-with-clang-for-aligned_all.patch @@ -0,0 +1,33 @@ +From 3fe67deb9fcf0ae3c2ff31a9eccb6a0a9af33b9c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 14 Jan 2022 09:47:03 -0800 +Subject: [PATCH] test: Disable optimization with clang for aligned_alloc.c + +Clang crashes when using glibc 2.35, it works ok with older glibc or +musl, so its very specific problem. Its reported here + +https://github.com/llvm/llvm-project/issues/52765 + +Until it is fixed, workaround the build failure + +Upstream-Status: Inappropriate [Workaround] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/integration/aligned_alloc.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/integration/aligned_alloc.c b/test/integration/aligned_alloc.c +index 4375b172..6513bdd9 100644 +--- a/test/integration/aligned_alloc.c ++++ b/test/integration/aligned_alloc.c +@@ -1,5 +1,7 @@ + #include "test/jemalloc_test.h" + ++#pragma clang optimize off ++ + #define MAXALIGN (((size_t)1) << 23) + + /* +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb b/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb index 7cd06f1025..8618c8c6a7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb @@ -11,13 +11,16 @@ LICENSE = "BSD-2-Clause" SECTION = "libs" -LIC_FILES_CHKSUM = "file://README;md5=6900e4a158982e4c4715bf16aa54fa10" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea061f8731d5e6a5761dfad951ef5f5f" -SRC_URI = "git://github.com/jemalloc/jemalloc.git \ +SRC_URI = "git://github.com/jemalloc/jemalloc.git;branch=master;protocol=https \ file://0001-Makefile.in-make-sure-doc-generated-before-install.patch \ file://run-ptest \ " +# Workaround for https://github.com/llvm/llvm-project/issues/52765 +SRC_URI:append:libc-glibc:toolchain-clang = " file://0001-test-Disable-optimization-with-clang-for-aligned_all.patch " + SRCREV = "ea6b3e973b477b8061e0076bb257dbd7f3faa756" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.6.bb b/meta-openembedded/meta-oe/recipes-devtools/jq/jq_git.bb index bfaeed5fe2..d0c70da76f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.6.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jq/jq_git.bb @@ -6,15 +6,12 @@ HOMEPAGE = "https://stedolan.github.io/jq/" BUGTRACKER = "https://github.com/stedolan/jq/issues" SECTION = "utils" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=15d03e360fa7399f76d5a4359fc72cbf" +LIC_FILES_CHKSUM = "file://COPYING;md5=2814b59e00e7918c864fa3b6bbe049b4" -SRC_URI = "https://github.com/stedolan/${BPN}/releases/download/${BP}/${BP}.tar.gz" - -UPSTREAM_CHECK_URI = "https://github.com/stedolan/${BPN}/releases" -UPSTREAM_CHECK_REGEX = "jq\-(?P<pver>(\d+\.\d+))(?!_\d+).tar.gz" - -SRC_URI[md5sum] = "e68fbd6a992e36f1ac48c99bbf825d6b" -SRC_URI[sha256sum] = "5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72" +PV = "1.6+git${SRCPV}" +SRC_URI = "git://github.com/stedolan/jq;protocol=https;branch=master" +SRCREV = "a9f97e9e61a910a374a5d768244e8ad63f407d3e" +S = "${WORKDIR}/git" inherit autotools-brokensep diff --git a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb index 7f6c34eb3d..4a8de5f3b0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb @@ -2,7 +2,7 @@ SUMMARY = "JSON schema validator for JSON for Modern C++" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c441d022da1b1663c70181a32225d006" -SRC_URI = "git://github.com/pboettch/json-schema-validator" +SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=master;protocol=https" SRCREV = "27fc1d094503623dfe39365ba82581507524545c" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.4.bb b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb index a02ff4a4da..c54dc94666 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb @@ -9,12 +9,12 @@ HOMEPAGE = "https://github.com/open-source-parsers/jsoncpp" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926" PE = "1" -SRCREV = "9059f5cad030ba11d37818847443a53918c327b1" -SRC_URI = "git://github.com/open-source-parsers/jsoncpp" +SRCREV = "5defb4ed1a4293b8e2bf641e16b156fb9de498cc" +SRC_URI = "git://github.com/open-source-parsers/jsoncpp;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb index 586489b74b..43dc2e36a4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb @@ -9,7 +9,7 @@ SECTION = "libs" DEPENDS = "curl jsoncpp libmicrohttpd hiredis" -SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp \ +SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp;branch=master;protocol=https \ file://0001-Fix-build-with-libmicrohttpd.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.9.0.bb b/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.9.0.bb index 1664d637b7..a87dbf0481 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.9.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=930f8aa500a47c7dab0f8efb5a1c9a40" DEPENDS = "libgfortran" SRCREV = "6acc99d5f39130be7cec00fb835606042101a970" -SRC_URI = "git://github.com/Reference-LAPACK/lapack.git;protocol=https" +SRC_URI = "git://github.com/Reference-LAPACK/lapack.git;protocol=https;branch=master" S = "${WORKDIR}/git" EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=ON " diff --git a/meta-openembedded/meta-oe/recipes-devtools/ldns/ldns_1.7.1.bb b/meta-openembedded/meta-oe/recipes-devtools/ldns/ldns_1.8.1.bb index 858614ceee..81e1c62a07 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ldns/ldns_1.7.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ldns/ldns_1.8.1.bb @@ -4,19 +4,16 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=34330f15b2b4abbbaaa7623f79a6a019" SRC_URI = "https://www.nlnetlabs.nl/downloads/ldns/ldns-${PV}.tar.gz" -SRC_URI[md5sum] = "166262a46995d9972aba417fd091acd5" -SRC_URI[sha256sum] = "8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229" +SRC_URI[sha256sum] = "958229abce4d3aaa19a75c0d127666564b17216902186e952ca4aef47c6d7fa3" DEPENDS = "openssl" -PNBLACKLIST[ldns] ?= "Needs porting to openssl 3.x" inherit autotools-brokensep PACKAGECONFIG ??= "" PACKAGECONFIG[drill] = "--with-drill,--without-drill" -EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \ - libtool=${TARGET_PREFIX}libtool" +EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR}" do_install:append() { sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb index b83e86a488..2dc3776e81 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb @@ -7,7 +7,7 @@ Cluster segmentation described in Annex #29 (UAX #29)." LICENSE = "Artistic-1.0 | GPLv1+" LIC_FILES_CHKSUM = "file://COPYING;md5=5b122a36d0f6dc55279a0ebc69f3c60b" -SRC_URI = "git://github.com/hatukanezumi/sombok.git;protocol=https \ +SRC_URI = "git://github.com/hatukanezumi/sombok.git;protocol=https;branch=master \ file://0001-configure.ac-fix-cross-compiling-issue.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb index 76d1c8bf3a..872bdb63a0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "\ " SRC_URI = "\ - git://git.openwrt.org/project/libubox.git \ + git://git.openwrt.org/project/libubox.git;branch=master \ file://0001-version-libraries.patch \ file://fix-libdir.patch \ file://0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 37e2ba6690..b6fb1dcdd2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -14,7 +14,7 @@ PV = "7.91+git${SRCPV}" SRCREV = "c22d359433b333937ee3d803450dc41998115685" DEPENDS = "elfutils" -SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http \ +SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http;protocol=https \ file://configure-allow-to-disable-selinux-support.patch \ file://0001-replace-readdir_r-with-readdir.patch \ file://0001-Use-correct-enum-type.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb b/meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb index d9f489b8b0..f6578ca093 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f81069e00c0cad249f20efe958276db1" DEPENDS += "lua-native lua virtual/crypt" -SRC_URI = "git://github.com/luaposix/luaposix.git;branch=release-v${PV} \ +SRC_URI = "git://github.com/luaposix/luaposix.git;branch=release-v${PV};protocol=https \ " SRCREV = "14043c5086ae738823a5dfbc9170d9e14193fbef" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.2.bb b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.3.bb index 1fa916c0e8..52648eb18b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.3.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bd4d7ab13df98988b1ca2a4e01c8c163" SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" -SRC_URI[sha256sum] = "5c19bea8b84e8d74cca5f047e82b147ff3fba096144270e3911ad623d6c587bf" +SRC_URI[sha256sum] = "8154d89f3051903181018166678018155f4c2b6f04a9bb6fe9515656452c4fd7" RDEPENDS:${PN} += "bash perl libxml2" diff --git a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_4.0.0.bb b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_4.0.0.bb index 1bb371addb..c6a6ac4673 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_4.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_4.0.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ PV .= "+git${SRCPV}" -SRC_URI = "git://github.com/msgpack/msgpack-c;branch=c_master \ +SRC_URI = "git://github.com/msgpack/msgpack-c;branch=c_master;protocol=https \ " SRCREV = "a9a48cea3a78ba661ee8096b5dab456361b0ff23" diff --git a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb index f66a00bd84..25b199f572 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ PV .= "+git${SRCPV}" -SRC_URI = "git://github.com/msgpack/msgpack-c;branch=cpp_master \ +SRC_URI = "git://github.com/msgpack/msgpack-c;branch=cpp_master;protocol=https \ " SRCREV = "3bdbf0d2ee75d46d71afa691a594777d89a22cf7" @@ -19,4 +19,6 @@ S = "${WORKDIR}/git" inherit cmake pkgconfig +RDEPENDS:${PN}-dev = "" + BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb index 6af7ab9cd8..ac2b5a266b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb @@ -12,7 +12,7 @@ DEPENDS += "flex-native bison-native flex bison" PV = "1.0.2" SRCREV = "af581482a3e1059458f3c8b20a56f82807ca3bd4" -SRC_URI = "git://github.com/pikhq/musl-nscd \ +SRC_URI = "git://github.com/pikhq/musl-nscd;branch=master;protocol=https \ file://0001-Fix-build-under-GCC-fno-common.patch \ file://0001-configure-Check-for-flex-if-lex-is-not-found.patch \ file://0001-nsswitch.y-Replace-empty-bison-extension.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb index e3c407e6d5..ace3215396 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=b67209a1e36b682a8226de19d265b1e0" -SRC_URI = "git://github.com/nlohmann/fifo_map.git" +SRC_URI = "git://github.com/nlohmann/fifo_map.git;branch=master;protocol=https" PV = "1.0.0+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.10.4.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.10.5.bb index fff32372a4..a69c5c7e58 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.10.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.10.5.bb @@ -2,12 +2,12 @@ SUMMARY = "JSON for modern C++" HOMEPAGE = "https://nlohmann.github.io/json/" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=441793d25a658d58d79a1f87516a6ad1" +LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588" -SRC_URI = "git://github.com/nlohmann/json.git;nobranch=1 \ +SRC_URI = "git://github.com/nlohmann/json.git;nobranch=1;protocol=https \ " -SRCREV = "fec56a1a16c6e1c1b1f4e116a20e79398282626c" +SRCREV = "4f8fba14066156b73f1189a2b8bd568bde5284c5" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-crypto-fix-build-without-scrypt.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-crypto-fix-build-without-scrypt.patch new file mode 100644 index 0000000000..3a2719af34 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-crypto-fix-build-without-scrypt.patch @@ -0,0 +1,38 @@ +From 048203c97009c907ff3891f6ffa8f375fcf1045c Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Tue, 26 Oct 2021 08:34:39 -0700 +Subject: [PATCH] crypto: fix build without scrypt + +* add missing semicolon to fix: + In file included from ../src/node_crypto.h:47, + from ../src/node.cc:46: + ../src/crypto/crypto_scrypt.h:80:2: + error: expected ';' after struct definition + 80 | } + | ^ + | ; + + and fix typo in the comment + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Submitted [https://github.com/nodejs/node/pull/40613] + +--- + src/crypto/crypto_scrypt.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/crypto/crypto_scrypt.h b/src/crypto/crypto_scrypt.h +index 4ca888e31d..3d185637f4 100644 +--- a/src/crypto/crypto_scrypt.h ++++ b/src/crypto/crypto_scrypt.h +@@ -77,8 +77,8 @@ struct ScryptJob { + static void Initialize( + Environment* env, + v8::Local<v8::Object> target) {} +-} +-#endif // !OPENSSL_NO_SCRIPT ++}; ++#endif // !OPENSSL_NO_SCRYPT + + } // namespace crypto + } // namespace node diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb index beed833c09..72fbecb8fb 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" -LICENSE = "MIT & BSD & Artistic-2.0" +LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=12f6b053282af96a218353ae7aff7cd8" DEPENDS = "openssl" @@ -24,6 +24,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://mips-less-memory.patch \ file://system-c-ares.patch \ file://0001-liftoff-Correct-function-signatures.patch \ + file://0001-crypto-fix-build-without-scrypt.patch \ " SRC_URI:append:class-target = " \ file://0002-Using-native-binaries.patch \ @@ -150,49 +151,30 @@ do_configure () { do_compile () { export LD="${CXX}" - install -Dm 0755 ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.sh + install -D ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.sh oe_runmake BUILDTYPE=Release } do_install () { oe_runmake install DESTDIR=${D} - - # wasn't updated since 2009 and is the only thing requiring python2 in runtime - # ERROR: nodejs-12.14.1-r0 do_package_qa: QA Issue: /usr/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples contained in package nodejs-npm requires /usr/bin/python, but no providers found in RDEPENDS:nodejs-npm? [file-rdeps] - rm -f ${D}${exec_prefix}/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples } -do_install:append:class-native() { - # use node from PATH instead of absolute path to sysroot - # node-v0.10.25/tools/install.py is using: - # shebang = os.path.join(node_prefix, 'bin/node') - # update_shebang(link_path, shebang) - # and node_prefix can be very long path to bindir in native sysroot and - # when it exceeds 128 character shebang limit it's stripped to incorrect path - # and npm fails to execute like in this case with 133 characters show in log.do_install: - # updating shebang of /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/work/x86_64-linux/nodejs-native/0.10.15-r0/image/home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/npm to /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/node - # /usr/bin/npm is symlink to /usr/lib/node_modules/npm/bin/npm-cli.js - # use sed on npm-cli.js because otherwise symlink is replaced with normal file and - # npm-cli.js continues to use old shebang - sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js +BINARIES = " \ + bytecode_builtins_list_generator \ + ${@bb.utils.contains('PACKAGECONFIG', 'icu', 'gen-regexp-special-case', '', d)} \ + mkcodecache \ + node_mksnapshot \ + torque \ +" +do_install:append:class-native() { # Install the native binaries to provide it within sysroot for the target compilation install -d ${D}${bindir} - install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque - install -m 0755 ${S}/out/Release/bytecode_builtins_list_generator ${D}${bindir}/bytecode_builtins_list_generator - if ${@bb.utils.contains('PACKAGECONFIG','icu','true','false',d)}; then - install -m 0755 ${S}/out/Release/gen-regexp-special-case ${D}${bindir}/gen-regexp-special-case - fi - install -m 0755 ${S}/out/Release/mkcodecache ${D}${bindir}/mkcodecache - install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot -} - -do_install:append:class-target() { - sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js + (cd ${S}/out/Release && install ${BINARIES} ${D}${bindir}) } PACKAGES =+ "${PN}-npm" -FILES:${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx" +FILES:${PN}-npm = "${nonarch_libdir}/node_modules ${bindir}/npm ${bindir}/npx" RDEPENDS:${PN}-npm = "bash python3-core python3-shell python3-datetime \ python3-misc python3-multiprocessing" diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb index ad770ce2ad..1b06f29c10 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -5,10 +5,10 @@ DEPENDS = "libusb-compat libftdi" RDEPENDS:${PN} = "libusb1" SRC_URI = " \ - git://repo.or.cz/openocd.git;protocol=http;name=openocd \ - git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \ - git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ - git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ + git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \ + git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \ + git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl;branch=master \ + git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \ " SRCREV_FORMAT = "openocd" diff --git a/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb b/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb index 66f7761357..c5c5e8325b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb @@ -10,7 +10,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_HOST = "(x86_64|i.86|aarch64).*-linux" SRCREV = "f02af2553ea58ae1186226af0d0ec835a248358f" -SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git \ +SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git;branch=master \ file://0001-CMakeList.txt-make-python-optional.patch \ file://0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch \ file://0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch" diff --git a/meta-openembedded/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb index 42f5513284..6f4004f970 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" COMPATIBLE_HOST = "(x86_64|aarch64|arm|riscv64)" SRCREV = "09724edb1783a98da2b7ae53c5aaa87493aabc9b" -SRC_URI = "git://github.com/billfarrow/pcimem.git " +SRC_URI = "git://github.com/billfarrow/pcimem.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20200505.0.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20200505.0.bb index 27dc358d15..bab1827ff6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20200505.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20200505.0.bb @@ -9,7 +9,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=0ebd37caf53781e8b7223e6b99b63f4e" DEPENDS = "perl" -SRC_URI = "git://github.com/toddr/IPC-Run.git" +SRC_URI = "git://github.com/toddr/IPC-Run.git;branch=master;protocol=https" SRCREV = "af435a1635ef9e48a84adc3230099e7ecf20c79d" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb index 049dc665dd..760c0ad0a5 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb @@ -15,7 +15,7 @@ DEPENDS += "libdev-checklib-perl-native libdbi-perl-native libmysqlclient" LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" SRCREV = "9b5b70ea372f49fe9bc9e592dae3870596d1e3d6" -SRC_URI = "git://github.com/perl5-dbi/DBD-mysql.git;protocol=https" +SRC_URI = "git://github.com/perl5-dbi/DBD-mysql.git;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb index 156d6c352e..ea1c1d592f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=1171;endline=1176;md5=3be2cb8159d094 DEPENDS += "perl" -SRC_URI = "git://github.com/makamaka/JSON.git;protocol=https" +SRC_URI = "git://github.com/makamaka/JSON.git;protocol=https;branch=master" SRCREV = "ebbae181c5e311fa80ee4c6379b598c7a6400570" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch index 1f3e683a0f..a967d64120 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch @@ -1,13 +1,11 @@ -From a74b42098aededd296ec6a3cd4cf5a17e59d6f29 Mon Sep 17 00:00:00 2001 -From: Claude Bing <cbing@cybernetics.com> -Date: Fri, 8 May 2020 10:15:32 -0400 -Subject: [PATCH] opcache/config.m4: enable opcache +From ca9b419f2c146061f73ee045cb0a069c18b40cd0 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 15 Dec 2021 14:00:08 +0800 +Subject: [PATCH 01/11] ext/opcache/config.m4: enable opcache -We can't use AC_TRY_RUN to run programs in a cross compile environment. -Set -the variables directly instead since we know that we'd be running on -latest -enough linux kernel. +We can't use AC_TRY_RUN to run programs in a cross compile +environment. Set the variables directly instead since we know +that we'd be running on latest enough linux kernel. Upstream-Status: Inappropriate [Configuration] @@ -16,17 +14,21 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> update patch to version 7.4.4 Signed-off-by: Changqing Li <changqing.li@windriver.com> +update patch to version 8.0.12 fix issue linking with librt Signed-off-by: Claude Bing <cbing@cybernetics.com> + +update patch to version 8.1.0 +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- - ext/opcache/config.m4 | 195 +----------------------------------------- - 1 file changed, 4 insertions(+), 191 deletions(-) + ext/opcache/config.m4 | 204 ++---------------------------------------- + 1 file changed, 8 insertions(+), 196 deletions(-) diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index 6c40cafc1c..6569aa9e1c 100644 +index 2a83fa2..9471b5d 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 -@@ -23,201 +23,14 @@ if test "$PHP_OPCACHE" != "no"; then +@@ -108,209 +108,21 @@ if test "$PHP_OPCACHE" != "no"; then AC_CHECK_FUNCS([mprotect]) AC_MSG_CHECKING(for sysvipc shared memory support) @@ -94,11 +96,13 @@ index 6c40cafc1c..6569aa9e1c 100644 - } - return 0; -} --]])],[dnl +-]])],[have_shm_ipc=yes],[have_shm_ipc=no],[have_shm_ipc=no]) +- if test "$have_shm_ipc" = "yes"; then - AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support]) -- msg=yes],[msg=no],[msg=no]) -- AC_MSG_RESULT([$msg]) +- fi + AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support]) ++ have_shm_ipc=yes + AC_MSG_RESULT([$have_shm_ipc]) AC_MSG_CHECKING(for mmap() using MAP_ANON shared memory support) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ @@ -116,8 +120,7 @@ index 6c40cafc1c..6569aa9e1c 100644 -#ifndef MAP_FAILED -# define MAP_FAILED ((void*)-1) -#endif -+ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) - +- -int main() { - pid_t pid; - int status; @@ -148,12 +151,24 @@ index 6c40cafc1c..6569aa9e1c 100644 - } - return 0; -} --]])],[dnl +-]])],[have_shm_mmap_anon=yes],[have_shm_mmap_anon=no],[ +- case $host_alias in +- *linux*) +- have_shm_mmap_anon=yes +- ;; +- *) +- have_shm_mmap_anon=no +- ;; +- esac +-]) +- if test "$have_shm_mmap_anon" = "yes"; then - AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) -- msg=yes],[msg=no],[msg=no]) -- AC_MSG_RESULT([$msg]) -- -- PHP_CHECK_FUNC_LIB(shm_open, rt) +- fi ++ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) ++ have_shm_mmap_anon=yes + AC_MSG_RESULT([$have_shm_mmap_anon]) + + PHP_CHECK_FUNC_LIB(shm_open, rt, root) AC_MSG_CHECKING(for mmap() using shm_open() shared memory support) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include <sys/types.h> @@ -218,16 +233,15 @@ index 6c40cafc1c..6569aa9e1c 100644 - } - return 0; -} --]])],[dnl +-]])],[have_shm_mmap_posix=yes],[have_shm_mmap_posix=no],[have_shm_mmap_posix=no]) +- if test "$have_shm_mmap_posix" = "yes"; then - AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) -- AC_MSG_RESULT([yes]) - PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)]) -- ],[ -- AC_MSG_RESULT([no]) -- ],[ -- AC_MSG_RESULT([no]) -- ]) +- fi +- AC_MSG_RESULT([$have_shm_mmap_posix]) + AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) ++ AC_MSG_RESULT([yes]) ++ have_shm_mmap_posix=yes + PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)]) PHP_NEW_EXTENSION(opcache, diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-php.m4-don-t-unset-cache-variables.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch index 0d721ec506..6183f49c28 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-php.m4-don-t-unset-cache-variables.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch @@ -1,4 +1,7 @@ -php.m4: don't unset cache variables +From 1af203e8e385d46ad3e33b1c253b1c564aa99034 Mon Sep 17 00:00:00 2001 +From: Claude Bing <cbing@cybernetics.com> +Date: Tue, 9 Nov 2021 13:01:55 -0500 +Subject: [PATCH 02/11] build/php.m4: don't unset cache variables Unsetting prevents cache variable from being passed to configure. @@ -8,15 +11,18 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> update this patch to 7.4.4, acinclude.m4 move to build/php.m4 Signed-off-by: Changqing Li <changqing.li@windriver.com> + +update patch to 8.0.12 +Signed-off-by: Claude Bing <cbing@cybernetics.com> --- build/php.m4 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build/php.m4 b/build/php.m4 -index 5c45d13..218ec47 100644 +index 9746ba28f3..93551d9ca7 100644 --- a/build/php.m4 +++ b/build/php.m4 -@@ -1587,8 +1587,6 @@ dnl PHP_CHECK_FUNC_LIB +@@ -1568,8 +1568,6 @@ dnl PHP_CHECK_FUNC_LIB dnl AC_DEFUN([PHP_CHECK_FUNC_LIB],[ ifelse($2,,:,[ @@ -25,7 +31,7 @@ index 5c45d13..218ec47 100644 unset found AC_CHECK_LIB($2, $1, [found=yes], [ AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) -@@ -1620,8 +1618,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and +@@ -1601,8 +1599,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and dnl HAVE_library if found and adds the library to LIBS. dnl AC_DEFUN([PHP_CHECK_FUNC],[ @@ -35,5 +41,5 @@ index 5c45d13..218ec47 100644 AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ]) -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/debian-php-fixheader.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch index a4804d1849..9637ed9516 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/debian-php-fixheader.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch @@ -1,26 +1,30 @@ -From 1234a8ef7c5ab88e24bc5908f0ccfd55af21aa39 Mon Sep 17 00:00:00 2001 -From: Leon Anavi <leon.anavi@konsulko.com> -Date: Mon, 31 Aug 2020 16:03:27 +0300 -Subject: [PATCH] php: remove host specific info from header file +From c81d0bd3491a6c6371d9df2f43956d109f984310 Mon Sep 17 00:00:00 2001 +From: Claude Bing <cbing@cybernetics.com> +Date: Tue, 9 Nov 2021 13:02:29 -0500 +Subject: [PATCH 03/11] php: remove host specific info from header file Based on: https://sources.debian.org/data/main/p/php7.3/7.3.6-1/debian/patches/ 0036-php-5.4.9-fixheader.patch Upstream-Status: Inappropriate [not author] + Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> + +update patch to 8.0.12 +Signed-off-by: Claude Bing <cbing@cybernetics.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 2a474ba36d..6d22a21630 100644 +index 1eafd62a44..90c94323aa 100644 --- a/configure.ac +++ b/configure.ac -@@ -1323,7 +1323,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d` - fi - AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) +@@ -1289,7 +1289,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS) + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" + EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" -UNAME=`uname -a | xargs` +UNAME=`uname | xargs` @@ -28,5 +32,5 @@ index 2a474ba36d..6d22a21630 100644 AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) PHP_OS=`uname | xargs` -- -2.17.1 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0004-configure.ac-don-t-include-build-libtool.m4.patch index 2861366a6b..19a8bf8e4f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/0004-configure.ac-don-t-include-build-libtool.m4.patch @@ -1,7 +1,7 @@ -From f5a34e771532b8433f307b679500c26af328ba35 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Fri, 17 Apr 2020 15:01:57 +0800 -Subject: [PATCH] configure.ac: don't include build/libtool.m4 +From 41ef1121682c245b10df7de4b78c45baf9114c04 Mon Sep 17 00:00:00 2001 +From: Claude Bing <cbing@cybernetics.com> +Date: Tue, 9 Nov 2021 13:03:46 -0500 +Subject: [PATCH 04/11] configure.ac: don't include build/libtool.m4 we delete build/libtool.m4 before do_configure, we will use libtool.m4 under ACLOCALDIR @@ -9,12 +9,15 @@ we will use libtool.m4 under ACLOCALDIR Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Changqing Li <changqing.li@windriver.com> + +update patch to 8.0.12 +Signed-off-by: Claude Bing <cbing@cybernetics.com> --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 06c6a27..f85144e 100644 +index 90c94323aa..161e7c3f53 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,6 @@ dnl ---------------------------------------------------------------------------- @@ -26,5 +29,5 @@ index 06c6a27..f85144e 100644 m4_include([build/php.m4]) m4_include([build/pkg.m4]) -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/pear-makefile.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0005-pear-fix-Makefile.frag-for-Yocto.patch index fcbf25be9b..fa956e0284 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/pear-makefile.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/0005-pear-fix-Makefile.frag-for-Yocto.patch @@ -1,17 +1,21 @@ -From edd575a546d56bb5683aff19782b16963d61fd0b Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Wed, 2 Nov 2011 16:54:57 +0100 -Subject: [PATCH] Upstream-Status: Pending +From f22958b4c1348eec3bb4c0f2cbe2d22676e0ad23 Mon Sep 17 00:00:00 2001 +From: Claude Bing <cbing@cybernetics.com> +Date: Tue, 9 Nov 2021 13:04:29 -0500 +Subject: [PATCH 05/11] pear: fix Makefile.frag for Yocto +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> + +update patch to 8.0.12 +Signed-off-by: Claude Bing <cbing@cybernetics.com> --- pear/Makefile.frag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pear/Makefile.frag b/pear/Makefile.frag -index bbe8ec3..16f43e2 100644 +index 9408757a3a..69072f39e0 100644 --- a/pear/Makefile.frag +++ b/pear/Makefile.frag -@@ -12,7 +12,7 @@ PEAR_SUFFIX = -ds a$(program_suffix) +@@ -10,7 +10,7 @@ PEAR_SUFFIX = -ds a$(program_suffix) PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar install-pear-installer: $(SAPI_CLI_PATH) @@ -20,3 +24,6 @@ index bbe8ec3..16f43e2 100644 install-pear: @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/phar-makefile.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch index eb73bc440e..26872d1204 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/phar-makefile.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch @@ -1,6 +1,7 @@ -Subject: [PATCH] From 08962a56f69963e01892d98ca5b75de8354bd3f5 Mon Sep 17 - 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 2 Nov - 2011 16:54:57 +0100 Subject: [PATCH] Fix phar packaging +From eab5babdadea487bbbef025068c553f5ba741774 Mon Sep 17 00:00:00 2001 +From: Claude Bing <cbing@cybernetics.com> +Date: Tue, 9 Nov 2021 13:07:25 -0500 +Subject: [PATCH 06/11] ext/phar/Makefile.frag: Fix phar packaging Inherited from OE-Classic, with some additions to fix host paths leaking into the target package. @@ -9,12 +10,16 @@ Upstream-Status: Inappropriate [config] update patch to version 7.4.4 Signed-off-by: Changqing Li <changqing.li@windriver.com> +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> + +update patch to version 8.0.12 +Signed-off-by: Claude Bing <cbing@cybernetics.com> --- ext/phar/Makefile.frag | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag -index 6442f33..6145412 100644 +index 58789cae25..c02af1b186 100644 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag @@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar @@ -42,5 +47,5 @@ index 6442f33..6145412 100644 $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc -@test -d $(builddir)/phar || mkdir $(builddir)/phar -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/php_exec_native.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0007-sapi-cli-config.m4-fix-build-directory.patch index 4aec4812f6..9776e7f6db 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/php_exec_native.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/0007-sapi-cli-config.m4-fix-build-directory.patch @@ -1,15 +1,21 @@ -Subject: [PATCH] rom d251b5aa3d23803d016ca16818e2e1d2f2b70a02 Mon Sep 17 - 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 2 Nov - 2011 16:54:57 +0100 Subject: [PATCH] Upstream-Status: Inappriate +From 03aa51625e0d1aa156c2f7cd71503b1f435d35a4 Mon Sep 17 00:00:00 2001 +From: Claude Bing <cbing@cybernetics.com> +Date: Tue, 9 Nov 2021 13:08:06 -0500 +Subject: [PATCH 07/11] sapi/cli/config.m4: fix build directory + +Upstream-Status: Inappropriate update patch to version 7.4.4 Signed-off-by: Changqing Li <changqing.li@windriver.com> + +update patch to version 8.0.12 +Signed-off-by: Claude Bing <cbing@cybernetics.com> --- sapi/cli/config.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 -index 917d45f..aaf1e27 100644 +index d17d531683..f2f87f9164 100644 --- a/sapi/cli/config.m4 +++ b/sapi/cli/config.m4 @@ -47,7 +47,7 @@ if test "$PHP_CLI" != "no"; then @@ -22,5 +28,5 @@ index 917d45f..aaf1e27 100644 dnl Expose to Makefile. -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch index ebe5f6a93c..78bae58e00 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch @@ -1,15 +1,19 @@ -Subject: [PATCH] From c084c8349d1780980e232cb28b60a109e3d89438 Mon Sep 17 - 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 2 Nov - 2011 16:54:57 +0100 Subject: [PATCH] Upstream-Status: Pending +From c3c20db4415e0f6c4a601d6f9da1f3746a96b301 Mon Sep 17 00:00:00 2001 +From: Claude Bing <cbing@cybernetics.com> +Date: Tue, 9 Nov 2021 13:08:58 -0500 +Subject: [PATCH 08/11] ext/imap/config.m4: fix include paths -update patch to version 7.4.4 -Signed-off-by: Changqing Li <changqing.li@windriver.com> +Upstream-Status: Pending +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> + +update patch to version 8.0.12 +Signed-off-by: Claude Bing <cbing@cybernetics.com> --- ext/imap/config.m4 | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 -index 5086a31..0e938bd 100644 +index 5086a312d0..0e938bd544 100644 --- a/ext/imap/config.m4 +++ b/ext/imap/config.m4 @@ -110,7 +110,7 @@ if test "$PHP_IMAP" != "no"; then @@ -37,5 +41,5 @@ index 5086a31..0e938bd 100644 IMAP_LIB_CHK($PHP_LIBDIR) IMAP_LIB_CHK(c-client) -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-php-don-t-use-broken-wrapper-for-mkdir.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch index d68737366e..57b05e6a77 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-php-don-t-use-broken-wrapper-for-mkdir.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch @@ -1,21 +1,21 @@ -From ebc101e0728b9db6c687cff525e5dfc8eb0edbf3 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Thu, 3 Nov 2011 14:27:15 +0100 -Subject: [PATCH 2/8] php: don't use broken wrapper for mkdir +From 8707720c0aea405f0e06d67354f239232cc823cc Mon Sep 17 00:00:00 2001 +From: Claude Bing <cbing@cybernetics.com> +Date: Tue, 9 Nov 2021 13:10:02 -0500 +Subject: [PATCH 09/11] php: don't use broken wrapper for mkdir Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> update patch to version 7.4.4 Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - -Upstream-Status: Inappropriate +update patch to version 8.0.12 +Signed-off-by: Claude Bing <cbing@cybernetics.com> +--- build/Makefile.global | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Makefile.global b/build/Makefile.global -index ff858c2..ae554b4 100644 +index 6566d052de..eb39421f2a 100644 --- a/build/Makefile.global +++ b/build/Makefile.global @@ -1,4 +1,4 @@ @@ -25,5 +25,5 @@ index ff858c2..ae554b4 100644 INSTALL_DATA = $(INSTALL) -m 644 -- -1.9.3 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch new file mode 100644 index 0000000000..e3b8cd4707 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch @@ -0,0 +1,35 @@ +From a04aabc5b80371e579fbaffdd417627390d22722 Mon Sep 17 00:00:00 2001 +From: Claude Bing <cbing@cybernetics.com> +Date: Tue, 9 Nov 2021 13:10:33 -0500 +Subject: [PATCH 10/11] iconv: fix detection + +Upstream-Status: Pending + +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> + +update patch to version 7.4.4 +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +update patch to version 8.0.12 +Signed-off-by: Claude Bing <cbing@cybernetics.com> +--- + build/php.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build/php.m4 b/build/php.m4 +index 93551d9ca7..dba50825fb 100644 +--- a/build/php.m4 ++++ b/build/php.m4 +@@ -1919,7 +1919,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ + unset ICONV_DIR + + dnl Check libc first if no path is provided in --with-iconv. +- if test "$PHP_ICONV" = "yes"; then ++ dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes ++ if test "$PHP_ICONV" != "no"; then + dnl Reset LIBS temporarily as it may have already been included -liconv in. + LIBS_save="$LIBS" + LIBS= +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/70_mod_php7.conf b/meta-openembedded/meta-oe/recipes-devtools/php/php/70_mod_php8.conf index d206265a25..58ce408aa4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/70_mod_php7.conf +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/70_mod_php8.conf @@ -1,6 +1,6 @@ -LoadModule php7_module lib/apache2/modules/libphp7.so +LoadModule php_module lib/apache2/modules/libphp.so -<FilesMatch "\.ph(p[2-7]?|tml)$"> +<FilesMatch "\.ph(p[2-8]?|tml)$"> SetHandler application/x-httpd-php </FilesMatch> diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/iconv.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/iconv.patch deleted file mode 100644 index 9ec8a89b57..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/iconv.patch +++ /dev/null @@ -1,41 +0,0 @@ -Subject: [PATCH] From 17cc5645f3acf943a5a06465d09d0ebcfea987bd Mon Sep 17 - 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 2 Nov - 2011 16:54:57 +0100 Subject: [PATCH] Upstream-Status: Pending - -update patch to version 7.4.4 -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - build/php.m4 | 3 ++- - ext/iconv/config.m4 | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/build/php.m4 b/build/php.m4 -index 7392876..5c45d13 100644 ---- a/build/php.m4 -+++ b/build/php.m4 -@@ -1950,7 +1950,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ - echo > ext/iconv/php_iconv_supports_errno.h - - dnl Check libc first if no path is provided in --with-iconv. -- if test "$PHP_ICONV" = "yes"; then -+ dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes -+ if test "$PHP_ICONV" != "no"; then - dnl Reset LIBS temporarily as it may have already been included -liconv in. - LIBS_save="$LIBS" - LIBS= -diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 -index fe9b47a..b6b632f 100644 ---- a/ext/iconv/config.m4 -+++ b/ext/iconv/config.m4 -@@ -14,7 +14,7 @@ if test "$PHP_ICONV" != "no"; then - - if test "$iconv_avail" != "no"; then - if test -z "$ICONV_DIR"; then -- for i in /usr/local /usr; do -+ for i in $PHP_ICONV /usr/local /usr; do - if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then - PHP_ICONV_PREFIX="$i" - break --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch deleted file mode 100644 index 21057439c9..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -php-ptest: xfail two tests - -If and when these tests are modified to expect the correct output, they will -succeed and generate warnings in the test summary. This patch can then be removed. - -Note that we add a closing '?>' to one test so that it can be executed directly by php. - -Upstream-Status: Pending - -Signed-off-By: Joe Slater <joe.slater@windriver.com> - - ---- a/tests/basic/bug71273.phpt -+++ b/tests/basic/bug71273.phpt -@@ -16,6 +16,8 @@ Bug #71273 A wrong ext directory setup i - var_dump(preg_match(",.+a[\\/].+[\\/]w.php_kartoffelbrei.dll.+,s", $out)); - ?> - ==DONE== -+--XFAIL-- -+Output is int(0), not int(1) - --EXPECT-- - int(1) - ==DONE== ---- a/tests/run-test/bug75042-3.phpt -+++ b/tests/run-test/bug75042-3.phpt -@@ -8,5 +8,8 @@ display_errors=1 - nonexistentsharedmodule - --FILE-- - <?php -+?> -+--XFAIL-- -+No warning message printed. - --EXPECTF-- - PHP Warning: PHP Startup: Unable to load dynamic library '%snonexistentsharedmodule.%s' %A diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.21.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_8.1.0.bb index ab87ced885..43e86fe55b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.21.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_8.1.0.bb @@ -12,28 +12,27 @@ DEPENDS:class-native = "zlib-native libxml2-native" PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ - file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \ - file://debian-php-fixheader.patch \ - file://0001-configure.ac-don-t-include-build-libtool.m4.patch \ - file://0001-php.m4-don-t-unset-cache-variables.patch \ + file://0002-build-php.m4-don-t-unset-cache-variables.patch \ + file://0003-php-remove-host-specific-info-from-header-file.patch \ + file://0004-configure.ac-don-t-include-build-libtool.m4.patch \ + file://0009-php-don-t-use-broken-wrapper-for-mkdir.patch \ + file://0010-iconv-fix-detection.patch \ " SRC_URI:append:class-target = " \ - file://iconv.patch \ - file://imap-fix-autofoo.patch \ - file://php_exec_native.patch \ + file://0001-ext-opcache-config.m4-enable-opcache.patch \ + file://0005-pear-fix-Makefile.frag-for-Yocto.patch \ + file://0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch \ + file://0007-sapi-cli-config.m4-fix-build-directory.patch \ + file://0008-ext-imap-config.m4-fix-include-paths.patch \ file://php-fpm.conf \ file://php-fpm-apache.conf \ file://70_mod_php${PHP_MAJOR_VERSION}.conf \ file://php-fpm.service \ - file://pear-makefile.patch \ - file://phar-makefile.patch \ - file://0001-opcache-config.m4-enable-opcache.patch \ - file://xfail_two_bug_tests.patch \ " S = "${WORKDIR}/php-${PV}" -SRC_URI[sha256sum] = "36ec6102e757e2c2b7742057a700bbff77c76fa0ccbe9c860398c3d24e32822a" +SRC_URI[sha256sum] = "0725ed2baea125496a898455d501a77460218b2a0cfad773fa9322f491b82b61" inherit autotools pkgconfig python3native gettext @@ -77,7 +76,7 @@ EXTRA_OECONF:class-native = " \ ${COMMON_EXTRA_OECONF} \ " -PACKAGECONFIG ??= "mysql sqlite3 imap opcache \ +PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ " PACKAGECONFIG:class-native = "" @@ -108,6 +107,7 @@ PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valg PACKAGECONFIG[mbregex] = "--enable-mbregex, --disable-mbregex, oniguruma" PACKAGECONFIG[mbstring] = "--enable-mbstring,," +export HOSTCC = "${BUILD_CC}" export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2" @@ -129,8 +129,8 @@ do_configure:prepend () { do_configure:append() { # No, libtool, we really don't want rpath set... - sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${HOST_SYS}-libtool - sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${HOST_SYS}-libtool + sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool + sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool } do_install:append:class-native() { @@ -217,6 +217,11 @@ ALLOW_EMPTY:${PN} = "1" INITSCRIPT_PACKAGES = "${PN}-fpm" inherit update-rc.d +# WARNING: lib32-php-8.0.12-r0 do_package_qa: QA Issue: lib32-php: ELF binary /usr/libexec/apache2/modules/libphp.so has relocations in .text [textrel] +#WARNING: lib32-php-8.0.12-r0 do_package_qa: QA Issue: lib32-php-opcache: ELF binary /usr/lib/php8/extensions/no-debug-zts-20200930/opcache.so has relocations in .text [textrel] +INSANE_SKIP:${PN}:append:x86 = " textrel" +INSANE_SKIP:${PN}-opcache:append:x86 = " textrel" + FILES:${PN}-dbg =+ "${bindir}/.debug \ ${libexecdir}/apache2/modules/.debug" FILES:${PN}-doc += "${PHP_LIBDIR}/php/doc" @@ -260,7 +265,6 @@ do_install:append:class-native() { PHP_PEAR_SYSCONF_DIR=${sysconfdir}/ } - # Fails to build with thumb-1 (qemuarm) # | {standard input}: Assembler messages: # | {standard input}:3719: Error: selected processor does not support Thumb mode `smull r0,r2,r9,r3' diff --git a/meta-openembedded/meta-oe/recipes-devtools/ply/ply_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ply/ply_git.bb index b1327efebf..616f5dd7e1 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ply/ply_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ply/ply_git.bb @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS += "bison-native" -PV = "2.1.1+git${SRCPV}" +PV = "2.2.0" -SRC_URI = "git://github.com/iovisor/ply" -SRCREV = "e25c9134b856cc7ffe9f562ff95caf9487d16b59" +SRC_URI = "git://github.com/iovisor/ply;branch=master;protocol=https" +SRCREV = "771c32b299355fb31fc296110e90ae0166409b95" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb b/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb index 27db4bf800..afa503ee42 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" PV = "20130209+git${SRCPV}" -SRC_URI = "git://github.com/anyc/pmtools.git \ +SRC_URI = "git://github.com/anyc/pmtools.git;branch=master;protocol=https \ file://pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch \ " SRCREV = "3ebe0e54c54061b4c627236cbe35d820de2e1168" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb index cc037d3934..b3423ba84d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb @@ -12,13 +12,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cb901168715f4782a2b06c3ddaefa558" DEPENDS = "protobuf-native protobuf" -SRC_URI = "git://github.com/protobuf-c/protobuf-c.git" +SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https" SRCREV = "f224ab2eeb648a818eb20687d7150a285442c907" S = "${WORKDIR}/git" inherit autotools pkgconfig +export PROTOC = "${STAGING_BINDIR_NATIVE}/protoc" + # After several fix attempts there is still a race between generating # t.test-full.pb.h and compiling cxx_generate_packed_data.c despite # BUILT_SOURCES and explicit dependencies. diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch new file mode 100644 index 0000000000..8a0696edfe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch @@ -0,0 +1,32 @@ +From 08e46feb6553af670754e65d94c3bb6fcd4e0cf9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 31 Oct 2021 23:39:44 -0700 +Subject: [PATCH] Fix build on mips/clang + +clang13 crashes on mips, until its fixed upstream disable tailcall on +mips + +https://bugs.llvm.org/show_bug.cgi?id=52367 + +Upstream-Status: Inappropriate [Clang workaround] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/google/protobuf/port_def.inc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc +index 71325c387..303475232 100644 +--- a/src/google/protobuf/port_def.inc ++++ b/src/google/protobuf/port_def.inc +@@ -230,7 +230,7 @@ + #error PROTOBUF_TAILCALL was previously defined + #endif + #if __has_cpp_attribute(clang::musttail) && \ +- !defined(__arm__) && !defined(_ARCH_PPC) && !defined(__wasm__) ++ !defined(__arm__) && !defined(_ARCH_PPC) && !defined(__wasm__) && !defined(__mips__) + # ifndef PROTO2_OPENSOURCE + // Compilation fails on ARM32: b/195943306 + // Compilation fails on powerpc64le: b/187985113 +-- +2.33.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Lower-init-prio-for-extension-attributes.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Lower-init-prio-for-extension-attributes.patch new file mode 100644 index 0000000000..a1200e01c1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Lower-init-prio-for-extension-attributes.patch @@ -0,0 +1,79 @@ +From 8ff34dbff1eac612326b492d0b2cb93901ad7e2b Mon Sep 17 00:00:00 2001 +From: Jani Nurminen <jani.nurminen@windriver.com> +Date: Fri, 24 Sep 2021 09:56:11 +0200 +Subject: [PATCH] Lower init prio for extension attributes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Added PROTOBUF_EXTENSION_ATTRIBUTE_INIT_PRIORITY in +code generation for extension attributes. +It has lower prio than PROTOBUF_ATTRIBUTE_INIT_PRIORITY to +ensure that extension attributes are initialized after +other attribute. +This is needed in some applications to avoid segmentation fault. + +Reported by Karl-Herman Näslund. + +Signed-off-by: Jani Nurminen <jani.nurminen@windriver.com> + +Rebase on master + +Signed-off-by: He Zhe <zhe.he@windriver.com> +--- + src/google/protobuf/compiler/cpp/cpp_extension.cc | 2 +- + src/google/protobuf/port_def.inc | 12 ++++++++++++ + src/google/protobuf/port_undef.inc | 1 + + 3 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/src/google/protobuf/compiler/cpp/cpp_extension.cc b/src/google/protobuf/compiler/cpp/cpp_extension.cc +index 8604da5f2..984345ebe 100644 +--- a/src/google/protobuf/compiler/cpp/cpp_extension.cc ++++ b/src/google/protobuf/compiler/cpp/cpp_extension.cc +@@ -164,7 +164,7 @@ void ExtensionGenerator::GenerateDefinition(io::Printer* printer) { + } + + format( +- "PROTOBUF_ATTRIBUTE_INIT_PRIORITY " ++ "PROTOBUF_EXTENSION_ATTRIBUTE_INIT_PRIORITY " + "::$proto_ns$::internal::ExtensionIdentifier< $extendee$,\n" + " ::$proto_ns$::internal::$type_traits$, $field_type$, $packed$ >\n" + " $scoped_name$($constant_name$, $1$);\n", +diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc +index 7e9119112..a5117090d 100644 +--- a/src/google/protobuf/port_def.inc ++++ b/src/google/protobuf/port_def.inc +@@ -614,6 +614,18 @@ + #define PROTOBUF_ATTRIBUTE_INIT_PRIORITY + #endif + ++// Some embedded systems get a segmentation fault if extension attributes are ++// initialized with higher or equal priority as other attributes. This gives ++// extension attributes high priority, but lower than other attributes. ++#ifdef PROTOBUF_EXTENSION_ATTRIBUTE_INIT_PRIORITY ++#error PROTOBUF_EXTENSION_ATTRIBUTE_INIT_PRIORITY was previously defined ++#endif ++#if PROTOBUF_GNUC_MIN(3, 0) && (!defined(__APPLE__) || defined(__clang__)) && !((defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))) ++#define PROTOBUF_EXTENSION_ATTRIBUTE_INIT_PRIORITY __attribute__((init_priority((103)))) ++#else ++#define PROTOBUF_EXTENSION_ATTRIBUTE_INIT_PRIORITY ++#endif ++ + #ifdef PROTOBUF_PRAGMA_INIT_SEG + #error PROTOBUF_PRAGMA_INIT_SEG was previously defined + #endif +diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc +index ccc5daf56..2b28f3a31 100644 +--- a/src/google/protobuf/port_undef.inc ++++ b/src/google/protobuf/port_undef.inc +@@ -83,6 +83,7 @@ + #undef PROTOBUF_HAVE_ATTRIBUTE_WEAK + #undef PROTOBUF_ATTRIBUTE_NO_DESTROY + #undef PROTOBUF_ATTRIBUTE_INIT_PRIORITY ++#undef PROTOBUF_EXTENSION_ATTRIBUTE_INIT_PRIORITY + #undef PROTOBUF_PRAGMA_INIT_SEG + #undef PROTOBUF_ASAN + #undef PROTOBUF_MSAN +-- +2.26.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.18.0.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.19.3.bb index 46ebef9785..f2d6c6fbdf 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.18.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.19.3.bb @@ -10,15 +10,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS:append:class-target = " protobuf-native" -SRCREV = "89b14b1d16eba4d44af43256fc45b24a6a348557" +SRCREV = "cc7b1b53234cd7a8f50d90ac3933b240dcf4cd97" -SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=3.18.x \ +SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=3.19.x;protocol=https \ file://run-ptest \ file://0001-protobuf-fix-configure-error.patch \ file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \ file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ file://0001-Fix-linking-error-with-ld-gold.patch \ + file://0001-Lower-init-prio-for-extension-attributes.patch \ " +SRC_URI:append:mips:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " +SRC_URI:append:mipsel:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " + S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig ptest diff --git a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.2.bb b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.4.bb index 09abbd9c37..4e4048f5e3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.4.bb @@ -10,8 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=d5ee91fb74cbb64223b3693fd64eb169" SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "2d0be30b843eb9d1893c1ba9ad334946" -SRC_URI[sha256sum] = "599eabdf8976aad86ac092a198920d8c127623d1376842bc6d683b12a37fb74f" +SRC_URI[sha256sum] = "8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716" UPSTREAM_CHECK_URI = "https://github.com/zeux/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb new file mode 100644 index 0000000000..dd00f444ed --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb @@ -0,0 +1,19 @@ +# Python bindings for libcups, from the CUPS project. +# +# Copyright (c) Ambu A/S - All rights reserved +# SPDX-License-Identifier: MIT +# +# Author(s) +# clst@ambu.com (Claus Stovgaard) +# + +DESCRIPTION = "pycups - CUPS bindings for Python" +HOMEPAGE = "https://github.com/OpenPrinting/pycups" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS += "cups" + +# See https://pypi.org/project/pycups/ for data +SRC_URI[sha256sum] = "57434ce5f62548eb12949ca8217f066f4eeb21a5d6ab8b13471dce350e380c90" + +inherit pypi setuptools3
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb index 0dd6edb854..b6ff62b91c 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125" -SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1" +SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1;protocol=https" SRCREV = "0ccdbf364c577803e2a751f5aededce935314313" diff --git a/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb b/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb index 72193b744b..797ec0e7b2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = " \ - git://github.com/nsekhar/serialcheck.git \ + git://github.com/nsekhar/serialcheck.git;branch=master;protocol=https \ " SRCREV = "45eb2ffa5378396e85432872833890b0a1cba872" diff --git a/meta-openembedded/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb b/meta-openembedded/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb index 9176cd4826..c0b22403b1 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb @@ -8,7 +8,7 @@ inherit cmake DEPENDS += "sqlite3" SRCREV = "e8a9e9416f421303f4b8970caab26dadf8bae98b" -SRC_URI = "git://github.com/fnc12/sqlite_orm;protocol=https" +SRC_URI = "git://github.com/fnc12/sqlite_orm;protocol=https;branch=master" S = "${WORKDIR}/git" EXTRA_OECMAKE += "-DSqliteOrm_BuildTests=OFF" diff --git a/meta-openembedded/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.0.2.bb b/meta-openembedded/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.0.2.bb index 18379bc61b..08b1ecbb34 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.0.2.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING.md;md5=c0de2c0aca56349dab98e97992316f7e \ file://licenses/zstd.txt;md5=8df8137b630239cbdd4c0674124cb0c8" SRCREV = "b96f0fc154feef531be76034bf6e38925636146f" -SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https" +SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb index b5820c1aa3..c03cf2f112 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb @@ -1,6 +1,6 @@ LICENSE = "GPLv2 & GPLv3 & BSD-3-Clause & LGPL-2.0 & Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5fa987762101f748a6cdd951b64ffc6b" -SRC_URI = "git://github.com/DrTimothyAldenDavis/SuiteSparse;protocol=https \ +SRC_URI = "git://github.com/DrTimothyAldenDavis/SuiteSparse;protocol=https;branch=master \ file://0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch \ file://0002-Preserve-links-when-installing-libmetis.patch \ file://0003-Add-version-information-to-libmetis.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.10.bb b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.11.bb index 4b79377a96..59c9dd4cb6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.10.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.11.bb @@ -10,9 +10,8 @@ DEPENDS:append:libc-musl = " argp-standalone" inherit autotools -PV .= "+git${SRCPV}" -SRCREV = "a5e5a51d32bdfe59af8b453ca08d78cbdf0b3c61" -SRC_URI = "git://github.com/namhyung/${BPN} \ +SRCREV = "304a492652dc0fd220f601167c4ebb30e2ae4a39" +SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb index aba6dfd885..36205009a4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb @@ -2,10 +2,10 @@ DESCRIPTION = "XML-RPC for C/C++ is programming libraries and related tools to h write an XML-RPC server or client in C or C++." HOMEPAGE = "http://xmlrpc-c.sourceforge.net/" -LICENSE = "BSD & MIT" +LICENSE = "BSD-3-Clause & MIT" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951" -SRC_URI = "git://github.com/mirror/xmlrpc-c.git \ +SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \ file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \ file://0002-fix-formatting-issues.patch \ file://0003-src-Makefile-Fix-Makefile-macro-error.patch \ @@ -16,8 +16,6 @@ SRCREV = "86405c7e1bd4f70287204a28d242a1054daab520" S = "${WORKDIR}/git/stable" -DEPENDS = "libxml2" - inherit autotools-brokensep binconfig pkgconfig TARGET_CFLAGS += "-Wno-narrowing" @@ -32,13 +30,12 @@ EXTRA_OECONF += "--disable-libwww-client --disable-wininet-client" PACKAGECONFIG ??= "curl cplusplus" -PACKAGECONFIG[abyss] = "--enable-abyss-server --enable-abyss-threads --enable-abyss-openssl,--disable-abyss-server --disable-abyss-threads --disable-abyss-openssl,openssl," -PACKAGECONFIG[cplusplus] = "--enable-cplusplus,--disable-cplusplus,," -PACKAGECONFIG[curl] = "--enable-curl-client,--disable-curl-client,curl,curl" +PACKAGECONFIG[abyss] = "--enable-abyss-server --enable-abyss-threads --enable-abyss-openssl,--disable-abyss-server --disable-abyss-threads --disable-abyss-openssl,openssl" +PACKAGECONFIG[cplusplus] = "--enable-cplusplus,--disable-cplusplus" +PACKAGECONFIG[curl] = "--enable-curl-client,--disable-curl-client,curl" do_configure() { - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + gnu-configize --verbose --force ${S} autoconf oe_runconf # license is incompatible with lib/util/getoptx.* diff --git a/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb b/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb index e112a5e30f..186f2c8ed0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=da2e9aa80962d54e7c726f232a2bd1e8" # Use 1.0.12 tag SRCREV = "17b1790fb9c8abbb3c0f7e083864a6a014191d56" -SRC_URI = "git://github.com/lloyd/yajl;nobranch=1" +SRC_URI = "git://github.com/lloyd/yajl;nobranch=1;protocol=https" inherit cmake lib_package diff --git a/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb index d9a5821cbb..cf8dbb183e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://lloyd.github.com/yajl/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://COPYING;md5=39af6eb42999852bdd3ea00ad120a36d" -SRC_URI = "git://github.com/lloyd/yajl" +SRC_URI = "git://github.com/lloyd/yajl;branch=master;protocol=https" SRCREV = "a0ecdde0c042b9256170f2f8890dd9451a4240aa" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb index cacdd74c4e..b5cd35ab3a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb @@ -9,7 +9,7 @@ DEPENDS += "flex-native bison-native xmlto-native" PV = "1.3.0+git${SRCPV}" # v1.3.0 SRCREV = "ba463d3c26c0ece2e797b8d6381b161633b5971a" -SRC_URI = "git://github.com/yasm/yasm.git \ +SRC_URI = "git://github.com/yasm/yasm.git;branch=master;protocol=https \ file://0001-Do-not-use-AC_HEADER_STDC.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.4.9.bb b/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.4.9.bb index 9437b4523a..75cf215909 100644 --- a/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.4.9.bb @@ -7,7 +7,7 @@ BUGTRACKER = "https://github.com/spkr-beep/beep/issues" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://github.com/spkr-beep/beep.git;protocol=https \ +SRC_URI = "git://github.com/spkr-beep/beep.git;protocol=https;branch=master \ file://0001-Do-not-use-Werror-as-it-fails-with-newer-clang-11.patch \ " SRCREV = "8b85ddd09f73b9fd7caa5679298781a57af194ac" diff --git a/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.42.bb b/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.43.bb index 04d4ca6e40..f473ccaf5a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.42.bb +++ b/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.43.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRC_URI = "https://github.com/mellowcandle/bitwise/releases/download/v${PV}/bitwise-v${PV}.tar.gz \ file://0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch \ " -SRC_URI[sha256sum] = "d3d43cef47bf8f49e85f7ed381c3eaf1df921ca51805e0962f1a97a517e1d1d2" +SRC_URI[sha256sum] = "f524f794188a10defc4df673d8cf0b3739f93e58e93aff0cdb8a99fbdcca2ffb" UPSTREAM_CHECK_URI = "https://github.com/mellowcandle/bitwise/releases" diff --git a/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb b/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb index 92d6d9f186..4e2813dded 100644 --- a/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb @@ -6,7 +6,7 @@ BUGTRACKER = "https://github.com/google/brotli/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b" -SRC_URI = "git://github.com/google/brotli.git \ +SRC_URI = "git://github.com/google/brotli.git;branch=master;protocol=https \ file://838.patch " # tag 1.0.9 SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71" diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20210808.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20211224.bb index eeed39f633..85e5072716 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20210808.bb +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20211224.bb @@ -4,7 +4,7 @@ # Setting to PD as this is what the upstream has it as. LICENSE = "PD" -LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=80ce98c6ab91cc4a93a9d2cfb7c14463" +LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=e13dd32663e3159031608d536530a080" require byacc.inc -SRC_URI[sha256sum] = "f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83" +SRC_URI[sha256sum] = "7bc42867a095df2189618b64497016298818e88e513fca792cb5adc9a68ebfb8" diff --git a/meta-openembedded/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb b/meta-openembedded/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb new file mode 100644 index 0000000000..39cdaea1a3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "Terminal based 'The Matrix' screen implementation" +AUTHOR = "Abishek V Ashok" + +LICENSE = "GPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "git://github.com/abishekvashok/cmatrix.git;branch=stable;protocol=https" +SRCREV = "adfdf1656f23e5ab3b52c7d7edf91249a4477e8d" +S = "${WORKDIR}/git" + +inherit cmake + +DEPENDS += "ncurses" + +FILES:${PN} += "${datadir}/* ${libdir}/kbd/*" 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 5c9ea129c0..464d25ad08 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 @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064" SECTION = "Development/Libraries" DEPENDS = "swig-native python3 sblim-cmpi-devel" -SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=http \ +SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=http;branch=master;protocol=https \ file://cmpi-bindings-0.4.17-no-ruby-perl.patch \ file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \ file://cmpi-bindings-0.9.5-python-lib-dir.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb index b443afdb18..1c613b0977 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb @@ -70,8 +70,8 @@ do_install:append() { # Fix configuration file to allow collectd to start up sed -i 's!^#FQDNLookup[ \t]*true!FQDNLookup false!g' ${D}${sysconfdir}/collectd.conf - rmdir "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" + rmdir ${D}${localstatedir}/run ${D}${localstatedir}/log + rmdir --ignore-fail-on-non-empty ${D}${localstatedir} # Install systemd unit files install -d ${D}${systemd_unitdir}/system diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb index 6b906a21c3..e5a3c7c298 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" DEPENDS = "zlib gzip-native json-c" -SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ +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://317.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb index 7a6b0bf95d..28db39ac20 100644 --- a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb @@ -18,7 +18,7 @@ SRCREV = "42ebcec9dc2c99a1b3a4542787572045763ad196" PV = "0.6.3+git${SRCPV}" SRC_URI = "\ - git://github.com/docopt/docopt.cpp.git;protocol=https \ + git://github.com/docopt/docopt.cpp.git;protocol=https;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.6.0.bb b/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.6.0.bb new file mode 100644 index 0000000000..95df28ef2b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.6.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "Duktape embeddable Javascript engine" +DESCRIPTION = "Duktape is an embeddable Javascript engine, with a focus on portability and compact footprint." +HOMEPAGE = "https://duktape.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c83446610de1f63c7ca60cfcc82dec9d" + +SRC_URI = "https://duktape.org/duktape-${PV}.tar.xz \ + file://0001-Support-makefile-variables.patch \ +" +SRC_URI[md5sum] = "01ee8ecf3dd5c6504543c8679661bb20" +SRC_URI[sha256sum] = "96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7" + +do_compile () { + oe_runmake -f Makefile.sharedlibrary INSTALL_PREFIX="${prefix}" DESTDIR="${D}" +} + +do_install () { + oe_runmake -f Makefile.sharedlibrary INSTALL_PREFIX="${prefix}" DESTDIR="${D}" install + # libduktaped is identical to libduktape but has an hard-coded -g build flags, remove it + rm -f ${D}${libdir}/libduktaped.so* +} diff --git a/meta-openembedded/meta-oe/recipes-extended/duktape/files/0001-Support-makefile-variables.patch b/meta-openembedded/meta-oe/recipes-extended/duktape/files/0001-Support-makefile-variables.patch new file mode 100644 index 0000000000..f3fe40bc46 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/duktape/files/0001-Support-makefile-variables.patch @@ -0,0 +1,297 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Luca Boccassi <luca.boccassi@microsoft.com> +Date: Mon, 17 Jan 2022 18:12:03 +0000 +Subject: [PATCH] Support makefile variables + +Makefile*: use CFLAGS/CPPFLAGS/LDFLAGS +Makefile*: allow compiler and install variables to be overridden +Makefile.sharedlibrary: allow destdir and libdir to be overridden +Makefile.sharedlibrary: generate pkg-config file + +Forwarded: https://github.com/svaarala/duktape/pull/2457 +--- + Makefile.cmdline | 5 ++-- + Makefile.codepage | 5 ++-- + Makefile.dukdebug | 5 ++-- + Makefile.eval | 5 ++-- + Makefile.eventloop | 5 ++-- + Makefile.hello | 5 ++-- + Makefile.jsoncbor | 5 ++-- + Makefile.jxpretty | 5 ++-- + Makefile.sandbox | 5 ++-- + Makefile.sharedlibrary | 48 ++++++++++++++++++++----------- + duktape.pc.in | 10 +++++++ + 11 files changed, 68 insertions(+), 35 deletions(-) + create mode 100644 duktape.pc.in + +diff --git a/Makefile.cmdline b/Makefile.cmdline +index 235566b8..0b020510 100644 +--- a/Makefile.cmdline ++++ b/Makefile.cmdline +@@ -8,7 +8,8 @@ DUKTAPE_SOURCES = src/duktape.c + CMDLINE_SOURCES = \ + examples/cmdline/duk_cmdline.c + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + CCOPTS = -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer + CCOPTS += -I./examples/cmdline -I./src # duktape.h and duk_config.h must be in include path + CCLIBS = -lm +@@ -40,7 +41,7 @@ CMDLINE_SOURCES += extras/module-duktape/duk_module_duktape.c + # http://wiki.duktape.org/Configuring.html + + duk: $(DUKTAPE_SOURCES) $(CMDLINE_SOURCES) +- $(CC) -o $@ $(DEFINES) $(CCOPTS) $(DUKTAPE_SOURCES) $(CMDLINE_SOURCES) $(CCLIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(DEFINES) $(CCOPTS) $(DUKTAPE_SOURCES) $(CMDLINE_SOURCES) $(CCLIBS) + + linenoise/linenoise.c: linenoise + linenoise: +diff --git a/Makefile.codepage b/Makefile.codepage +index f6ef1582..29fa6ffc 100644 +--- a/Makefile.codepage ++++ b/Makefile.codepage +@@ -1,6 +1,7 @@ +-CC = gcc ++CC ?= gcc ++CC := $(CC) + + codepage: +- $(CC) -o $@ -std=c99 -O2 -Wall -Wextra -Isrc/ \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -std=c99 -O2 -Wall -Wextra -Isrc/ \ + src/duktape.c examples/codepage-conv/duk_codepage_conv.c \ + examples/codepage-conv/test.c -lm +diff --git a/Makefile.dukdebug b/Makefile.dukdebug +index 9fafcc3f..aa289d2e 100644 +--- a/Makefile.dukdebug ++++ b/Makefile.dukdebug +@@ -10,7 +10,8 @@ CMDLINE_SOURCES = \ + examples/cmdline/duk_cmdline.c \ + examples/debug-trans-socket/duk_trans_socket_unix.c + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + CCOPTS = -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer + CCOPTS += -I./prep -I./examples/cmdline -I./examples/debug-trans-socket + CCOPTS += -DDUK_CMDLINE_DEBUGGER_SUPPORT # enable --debugger in ./duk +@@ -38,4 +39,4 @@ duk: $(CMDLINE_SOURCES) + -DDUK_USE_INTERRUPT_COUNTER \ + -DDUK_USE_DEBUGGER_DUMPHEAP \ + -DDUK_USE_DEBUGGER_INSPECT +- $(CC) -o $@ $(DEFINES) $(CCOPTS) $(DUKTAPE_SOURCES) $(CMDLINE_SOURCES) $(CCLIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(DEFINES) $(CCOPTS) $(DUKTAPE_SOURCES) $(CMDLINE_SOURCES) $(CCLIBS) +diff --git a/Makefile.eval b/Makefile.eval +index 530f74a8..ce831a69 100644 +--- a/Makefile.eval ++++ b/Makefile.eval +@@ -2,8 +2,9 @@ + # Example Makefile for building the eval example + # + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + + eval: +- $(CC) -o $@ -std=c99 -O2 -Wall -Wextra -Isrc/ \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -std=c99 -O2 -Wall -Wextra -Isrc/ \ + src/duktape.c examples/eval/eval.c -lm +diff --git a/Makefile.eventloop b/Makefile.eventloop +index 1a75587b..ab1b2f72 100644 +--- a/Makefile.eventloop ++++ b/Makefile.eventloop +@@ -2,14 +2,15 @@ + # Example Makefile for building the eventloop example + # + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + + evloop: + @echo "NOTE: The eventloop is an example intended to be used on Linux" + @echo " or other common UNIX variants. It is not fully portable." + @echo "" + +- $(CC) -o $@ -std=c99 -Wall -Wextra -O2 -Isrc \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -std=c99 -Wall -Wextra -O2 -Isrc \ + examples/eventloop/main.c \ + examples/eventloop/c_eventloop.c \ + examples/eventloop/poll.c \ +diff --git a/Makefile.hello b/Makefile.hello +index c12b8e09..61269337 100644 +--- a/Makefile.hello ++++ b/Makefile.hello +@@ -13,7 +13,8 @@ DUKTAPE_SOURCES = src/duktape.c + # Compiler options are quite flexible. GCC versions have a significant impact + # on the size of -Os code, e.g. gcc-4.6 is much worse than gcc-4.5. + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + CCOPTS = -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer + CCOPTS += -I./src # for combined sources + CCLIBS = -lm +@@ -29,4 +30,4 @@ DEFINES = + # For debugging, use -O0 -g -ggdb, and don't add -fomit-frame-pointer + + hello: $(DUKTAPE_SOURCES) examples/hello/hello.c +- $(CC) -o $@ $(DEFINES) $(CCOPTS) $(DUKTAPE_SOURCES) examples/hello/hello.c $(CCLIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(DEFINES) $(CCOPTS) $(DUKTAPE_SOURCES) examples/hello/hello.c $(CCLIBS) +diff --git a/Makefile.jsoncbor b/Makefile.jsoncbor +index 30387a2f..8f234004 100644 +--- a/Makefile.jsoncbor ++++ b/Makefile.jsoncbor +@@ -2,9 +2,10 @@ + # Example Makefile for building the jsoncbor example + # + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + + jsoncbor: +- $(CC) -o $@ -std=c99 -Wall -Wextra -O2 -Isrc -Iextras/cbor \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -std=c99 -Wall -Wextra -O2 -Isrc -Iextras/cbor \ + src/duktape.c extras/cbor/duk_cbor.c extras/cbor/jsoncbor.c \ + -lm +diff --git a/Makefile.jxpretty b/Makefile.jxpretty +index 7ab00cec..aa53aa8b 100644 +--- a/Makefile.jxpretty ++++ b/Makefile.jxpretty +@@ -2,9 +2,10 @@ + # Example Makefile for building the jxpretty example + # + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + + jxpretty: +- $(CC) -o $@ -std=c99 -Wall -Wextra -O2 -Isrc \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -std=c99 -Wall -Wextra -O2 -Isrc \ + src/duktape.c examples/jxpretty/jxpretty.c \ + -lm +diff --git a/Makefile.sandbox b/Makefile.sandbox +index 26bb5ffc..d1d69ce4 100644 +--- a/Makefile.sandbox ++++ b/Makefile.sandbox +@@ -2,8 +2,9 @@ + # Example Makefile for building the sandbox example + # + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + + sandbox: +- $(CC) -o $@ -std=c99 -O2 -Wall -Wextra -Isrc/ \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -std=c99 -O2 -Wall -Wextra -Isrc/ \ + src/duktape.c examples/sandbox/sandbox.c -lm +diff --git a/Makefile.sharedlibrary b/Makefile.sharedlibrary +index ace206a1..11620aa7 100644 +--- a/Makefile.sharedlibrary ++++ b/Makefile.sharedlibrary +@@ -24,7 +24,9 @@ + # convention is to set soname version to (100*MAJOR + MINOR), e.g. 104 for + # Duktape 1.4.x, so that it gets automatically bumped for major and minor + # releases (potentially binary incompatible), but not for patch releases. ++# The formatted version is used for the pkg-config file. + DUK_VERSION = 20600 ++DUK_VERSION_FORMATTED = 2.6.0 + SONAME_VERSION = 206 + REAL_VERSION = $(SONAME_VERSION).$(DUK_VERSION) + +@@ -45,44 +45,58 @@ else + endif + + # Change to actual path for actual distribution packaging. +-INSTALL_PREFIX = /usr/local ++INSTALL_PREFIX ?= /usr/local ++INSTALL_PREFIX := $(INSTALL_PREFIX) ++DESTDIR ?= ++DESTDIR := $(DESTDIR) ++LIBDIR ?= /lib ++LIBDIR := $(LIBDIR) + + # The 'noline' variant may be more appropriate for some distributions; it + # doesn't have #line directives in the combined source. + DUKTAPE_SRCDIR = ./src + #DUKTAPE_SRCDIR = ./src-noline + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + + .PHONY: all +-all: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX) ++all: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX) duktape.pc + + # If the default duk_config.h is not suitable for the distribution, modify it + # before compiling the shared library and copy the same, edited duk_config.h + # to $INSTALL_PREFIX/include on installation. + + libduktape.$(SO_REALNAME_SUFFIX): +- $(CC) -shared -fPIC -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) \ + -o $@ $(DUKTAPE_SRCDIR)/duktape.c + + libduktaped.$(SO_REALNAME_SUFFIX): +- $(CC) -shared -fPIC -g -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -g -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \ + -o $@ $(DUKTAPE_SRCDIR)/duktape.c + ++duktape.pc: ++ sed -e "s|@PREFIX@|$(INSTALL_PREFIX)|" \ ++ -e "s|@LIBDIR@|$(LIBDIR)|" \ ++ -e "s|@VERSION@|$(DUK_VERSION_FORMATTED)|" \ ++ duktape.pc.in \ ++ > duktape.pc ++ + # Symlinks depend on platform conventions. + .PHONY: install +-install: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX) +- mkdir -p $(INSTALL_PREFIX)/lib/ +- cp $+ $(INSTALL_PREFIX)/lib/ +- rm -f $(INSTALL_PREFIX)/lib/libduktape.so $(INSTALL_PREFIX)/lib/libduktape.$(SO_SONAME_SUFFIX) +- ln -s libduktape.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktape.so +- ln -s libduktape.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktape.$(SO_SONAME_SUFFIX) +- rm -f $(INSTALL_PREFIX)/lib/libduktaped.so $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX) +- ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.so +- ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX) +- mkdir -p $(INSTALL_PREFIX)/include/ +- cp $(DUKTAPE_SRCDIR)/duktape.h $(DUKTAPE_SRCDIR)/duk_config.h $(INSTALL_PREFIX)/include/ ++install: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX) duktape.pc ++ mkdir -p $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/pkgconfig ++ cp $+ $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/ ++ rm -f $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktape.so $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktape.$(SO_SONAME_SUFFIX) ++ ln -s libduktape.$(SO_REALNAME_SUFFIX) $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktape.so ++ ln -s libduktape.$(SO_REALNAME_SUFFIX) $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktape.$(SO_SONAME_SUFFIX) ++ rm -f $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktaped.so $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktaped.$(SO_SONAME_SUFFIX) ++ ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktaped.so ++ ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktaped.$(SO_SONAME_SUFFIX) ++ mv $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/duktape.pc $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/pkgconfig/ ++ mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/include/ ++ cp $(DUKTAPE_SRCDIR)/duktape.h $(DUKTAPE_SRCDIR)/duk_config.h $(DESTDIR)$(INSTALL_PREFIX)/include/ + + CCOPTS = -I./examples/cmdline + duk: +- $(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib -Wall -Wextra -Os -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm ++ $(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)$(LIBDIR) -Wall -Wextra -Os -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm +diff --git a/duktape.pc.in b/duktape.pc.in +new file mode 100644 +index 00000000..0985c67e +--- /dev/null ++++ b/duktape.pc.in +@@ -0,0 +1,10 @@ ++prefix=@PREFIX@ ++exec_prefix=${prefix} ++libdir=${prefix}@LIBDIR@ ++includedir=${prefix}/include ++ ++Name: duktape ++Description: Embeddable Javascript engine ++Version: @VERSION@ ++Libs: -L${libdir} -lduktape ++Cflags: -I${includedir} diff --git a/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb b/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb index d88775f9d9..310081b822 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5940d39995ea6857d01b8227109c2e9c" SRCREV = "89c1502b9d40b5cb4a844498b14d74ba1dd559bf" -SRC_URI = "git://github.com/Yelp/dumb-init" +SRC_URI = "git://github.com/Yelp/dumb-init;branch=master;protocol=https" S = "${WORKDIR}/git" EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS} ${LDFLAGS}'" diff --git a/meta-openembedded/meta-oe/recipes-extended/figlet/figlet_git.bb b/meta-openembedded/meta-oe/recipes-extended/figlet/figlet_git.bb index 4611646b9b..61b050aac6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/figlet/figlet_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/figlet/figlet_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.figlet.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=1688bcd97b27704f1afcac7336409857" -SRC_URI = "git://github.com/cmatsuoka/figlet.git \ +SRC_URI = "git://github.com/cmatsuoka/figlet.git;branch=master;protocol=https \ file://0001-build-add-autotools-support-to-allow-easy-cross-comp.patch" SRCREV = "5bbcd7383a8c3a531299b216b0c734e1495c6db3" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.1.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.2.bb index 775125575d..5504515e98 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.2.bb @@ -23,7 +23,7 @@ SRC_URI:append:class-target = " \ file://0004-Add-configure-option-to-find-qt5-native-tools.patch \ " -SRC_URI[archive.sha256sum] = "6b690485567eaeb938c26936e5e0681cf70c856d273cc2c45fabf64d8bc6590e" +SRC_URI[archive.sha256sum] = "e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba" SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132" # for building docs (they deserve it) we need *doc2* tools native diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb index 30e126db1d..ba436c2776 100644 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" # v1.9.14 SRCREV = "4da3080ad4587860e5da73072d6ed54d0052938c" -SRC_URI = "git://github.com/jirka-h/haveged.git \ +SRC_URI = "git://github.com/jirka-h/haveged.git;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb b/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb index 7928df4485..658392374f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb @@ -6,7 +6,7 @@ DEPENDS = "ncurses" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "git://github.com/pixel/hexedit.git \ +SRC_URI = "git://github.com/pixel/hexedit.git;branch=master;protocol=https \ " SRCREV = "baf45a289360a39a05253949fb9d1b50e4668d8a" diff --git a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb index 93bda3372d..2ff4946883 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" DEPENDS = "redis" -SRC_URI = "git://github.com/redis/hiredis;protocol=git" +SRC_URI = "git://github.com/redis/hiredis;protocol=https;branch=master" SRCREV = "b731283245f3183af527237166261ad0768ba7d4" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.9.0.bb index 259187b0cd..e8e157658d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.9.0.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] = "12b7cce67b95b09f34873f46948e7f1cef9edd88682139e054b79ba165c53e49" +SRC_URI[sha256sum] = "c76a8c9965a1edde4f2446b47ee17c8564e0e20f3d8474465f6d4c54d1125ac4" UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb deleted file mode 100644 index d1b288cf2e..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Simple top-like I/O monitor" -DESCRIPTION = "iotop does for I/O usage what top(1) does for CPU usage. \ - It watches I/O usage information output by the Linux kernel and displays \ - a table of current I/O usage by processes on the system." -HOMEPAGE = "http://guichaz.free.fr/iotop/" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" - -PV .= "+git${SRCPV}" - -SRCREV = "1bfb3bc70febb1ffb95146b6dcd65257228099a3" -SRC_URI = "git://repo.or.cz/iotop.git" - -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_URI = "http://repo.or.cz/iotop.git/tags" -UPSTREAM_CHECK_REGEX = "iotop-(?P<pver>\d+(\.\d+)+)" - -inherit distutils3 - -do_install:append() { - rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo || true - rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py || true -} - -RDEPENDS:${PN} = "python3-curses \ - python3-codecs python3-ctypes python3-pprint \ - python3-shell python3-core" diff --git a/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_1.20.bb b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_1.20.bb new file mode 100644 index 0000000000..b05c8cd35d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_1.20.bb @@ -0,0 +1,21 @@ +SUMMARY = "A top utility for I/O" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=48e7be78bd2671d08c9c3bad71f1cfaa" + +DEPENDS = "ncurses" + +SRC_URI = "https://github.com/Tomas-M/iotop/releases/download/v1.20/iotop-1.20.tar.xz" +SRC_URI[sha256sum] = "e0227dd4b71ce3ffe50225b85cf9abb38a99c1d2dff69e3f1db7d059d7490d51" +UPSTREAM_CHECK_URI = "https://github.com/Tomas-M/iotop/releases" + +inherit pkgconfig + +EXTRA_OEMAKE = "V=1 STRIP=true" + +# Workaround BFD linker crash with clang on arm +# revisit when upgrading binutils and see if its fixed +LDFLAGS:append:toolchain-clang:arm = " -fuse-ld=lld" + +do_install() { + oe_runmake install DESTDIR=${D} +} diff --git a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb index 0c8aaef7db..b0042b6586 100644 --- a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb @@ -7,7 +7,7 @@ RDEPENDS:${BPN} = "openssl curl" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -SRC_URI = "git://github.com/rhinstaller/isomd5sum.git;branch=master \ +SRC_URI = "git://github.com/rhinstaller/isomd5sum.git;branch=master;protocol=https \ file://0001-tweak-install-prefix.patch \ file://0002-fix-parallel-error.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb b/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb index f2805a1b8d..caa13958dd 100644 --- a/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" PV = "2.3.6+git${SRCPV}" -SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=http" +SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=http;branch=master;protocol=https" SRCREV = "bc1d4f6587a4a4829b5d55e3ca7ad584da6de545" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb index 99cf6ab08a..15a7965935 100644 --- a/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f673270bfc350d9ce1efc8724c6c1873" DEPENDS:append:class-target = " swig-native sblim-cmpi-devel python3" DEPENDS:append:class-native = " cmpi-bindings-native" -SRC_URI = "git://github.com/rnovacek/konkretcmpi.git \ +SRC_URI = "git://github.com/rnovacek/konkretcmpi.git;branch=master;protocol=https \ file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch \ file://0001-drop-including-rpath-cmake-module.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb b/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb index d930b43480..609e55f4ac 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=24b5b3feec63c4be0975e1fea5100440" DEPENDS += "libunwind" -SRC_URI = "git://github.com/ianlancetaylor/libbacktrace;protocol=https" +SRC_URI = "git://github.com/ianlancetaylor/libbacktrace;protocol=https;branch=master" PV = "1.0+git${SRCPV}" SRCREV = "4f57c999716847e45505b3df170150876b545088" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-lvm-Do-not-include-duplicate-entries-in-bd_lvm_lvs-o.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-lvm-Do-not-include-duplicate-entries-in-bd_lvm_lvs-o.patch new file mode 100644 index 0000000000..e608358bf7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-lvm-Do-not-include-duplicate-entries-in-bd_lvm_lvs-o.patch @@ -0,0 +1,100 @@ +From d10fb2c0ee60c97f4dfeab4506a347c26cb389df Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny <vtrefny@redhat.com> +Date: Tue, 7 Dec 2021 15:50:45 +0800 +Subject: [PATCH] lvm: Do not include duplicate entries in bd_lvm_lvs output + +We use "-o segtypes" for the "lvs" command which means multisegment +LVs will be twice in the output. + +Signed-off-by: Vojtech Trefny <vtrefny@redhat.com> + +Upstream-Status: Backport [https://github.com/storaged-project/libblockdev/pull/671] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + src/plugins/lvm.c | 17 +++++++++++++++-- + tests/lvm_test.py | 41 +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 56 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/lvm.c b/src/plugins/lvm.c +index 2be1dbd..acd5b84 100644 +--- a/src/plugins/lvm.c ++++ b/src/plugins/lvm.c +@@ -1810,8 +1810,21 @@ BDLVMLVdata** bd_lvm_lvs (const gchar *vg_name, GError **error) { + if (table && (num_items == 15)) { + /* valid line, try to parse and record it */ + lvdata = get_lv_data_from_table (table, TRUE); +- if (lvdata) +- g_ptr_array_add (lvs, lvdata); ++ if (lvdata) { ++ /* ignore duplicate entries in lvs output, these are caused by multi segments LVs */ ++ for (gsize i = 0; i < lvs->len; i++) { ++ if (g_strcmp0 (((BDLVMLVdata *) g_ptr_array_index (lvs, i))->lv_name, lvdata->lv_name) == 0) { ++ g_debug("Duplicate LV entry for '%s' found in lvs output", ++ lvdata->lv_name); ++ bd_lvm_lvdata_free (lvdata); ++ lvdata = NULL; ++ break; ++ } ++ } ++ ++ if (lvdata) ++ g_ptr_array_add (lvs, lvdata); ++ } + } else + if (table) + g_hash_table_destroy (table); +diff --git a/tests/lvm_test.py b/tests/lvm_test.py +index eb94c91..ab0de21 100644 +--- a/tests/lvm_test.py ++++ b/tests/lvm_test.py +@@ -915,6 +915,47 @@ class LvmTestLVs(LvmPVVGLVTestCase): + lvs = BlockDev.lvm_lvs("testVG") + self.assertEqual(len(lvs), 1) + ++class LvmTestLVsMultiSegment(LvmPVVGLVTestCase): ++ def _clean_up(self): ++ try: ++ BlockDev.lvm_lvremove("testVG", "testLV2", True, None) ++ except: ++ pass ++ ++ LvmPVVGLVTestCase._clean_up(self) ++ ++ def test_lvs(self): ++ """Verify that it's possible to gather info about LVs""" ++ ++ succ = BlockDev.lvm_pvcreate(self.loop_dev, 0, 0, None) ++ self.assertTrue(succ) ++ ++ succ = BlockDev.lvm_vgcreate("testVG", [self.loop_dev], 0, None) ++ self.assertTrue(succ) ++ ++ succ = BlockDev.lvm_lvcreate("testVG", "testLV", 10 * 1024**2) ++ self.assertTrue(succ) ++ ++ lvs = BlockDev.lvm_lvs("testVG") ++ self.assertEqual(len(lvs), 1) ++ self.assertListEqual([lv.lv_name for lv in lvs], ["testLV"]) ++ ++ # add second LV ++ succ = BlockDev.lvm_lvcreate("testVG", "testLV2", 10 * 1024**2) ++ self.assertTrue(succ) ++ ++ lvs = BlockDev.lvm_lvs("testVG") ++ self.assertEqual(len(lvs), 2) ++ self.assertListEqual([lv.lv_name for lv in lvs], ["testLV", "testLV2"]) ++ ++ # by resizing the first LV we will create two segments ++ succ = BlockDev.lvm_lvresize("testVG", "testLV", 20 * 1024**2, None) ++ self.assertTrue(succ) ++ ++ lvs = BlockDev.lvm_lvs("testVG") ++ self.assertEqual(len(lvs), 2) ++ self.assertListEqual([lv.lv_name for lv in lvs], ["testLV", "testLV2"]) ++ + class LvmPVVGthpoolTestCase(LvmPVVGTestCase): + def _clean_up(self): + try: +-- +2.27.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb index 7325b26e35..b9c3bbb407 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb @@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" inherit autotools gobject-introspection pkgconfig -SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch" +SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch;protocol=https \ + file://0001-lvm-Do-not-include-duplicate-entries-in-bd_lvm_lvs-o.patch \ +" SRCREV = "47ff12242c89e36a33259d18b7068b26c3bb1c64" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb index 1e20338827..eabe1d476a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb @@ -10,7 +10,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', ' DEPENDS:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" SRCREV = "29d82c80bcc62be2878a9ac080de7eb286c4beb9" -SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release \ +SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release;protocol=https \ file://0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch \ file://0001-Enhance-reproducibility.patch \ file://0001-Remove-buggy-test-confusing-host-and-target.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb index 116ecd84a8..7ca2a5f2c6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb @@ -11,7 +11,7 @@ inherit autotools pkgconfig PV = "0.7.0" SRCREV = "47cbed5355ffda7b952193a770a9a9fa9f89b25b" -SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https \ +SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb index 41147647bf..a7d2922dd3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb @@ -9,7 +9,7 @@ DEPENDS = "libxml2 glib-2.0 swig python3" inherit autotools pkgconfig python3native python3targetconfig SRCREV = "c5a30e9267068436a75b5d00fcbf95cb9c1f4dcd" -SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https" +SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb index f94c76797e..171e555863 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb @@ -9,7 +9,7 @@ inherit autotools pkgconfig gitpkgv PKGV = "${GITPKGVTAG}" SRCREV = "ce98c346b7c1dc2a21faea4fd3f32c88e27ca2af" -SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https" +SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libleak/libleak_git.bb b/meta-openembedded/meta-oe/recipes-extended/libleak/libleak_git.bb index 32d509b4ad..60aa07b8b2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libleak/libleak_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libleak/libleak_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://README.md;beginline=18;endline=21;md5=de4f705f12cdedb DEPENDS += "libbacktrace" -SRC_URI = "gitsm://github.com/WuBingzheng/libleak;protocol=https \ +SRC_URI = "gitsm://github.com/WuBingzheng/libleak;protocol=https;branch=master \ file://0001-respect-environment-variables.patch \ " 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 7fc5997983..bbfee1ff7a 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,7 @@ 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;branch=master \ file://0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch \ " SRCREV = "59d2b405f95701e5b04326589786dbb43ce49e81" diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch deleted file mode 100644 index 384a4a40bd..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: =?utf-8?b?IlNaIExpbiAo5p6X5LiK5pm6KSI=?= <szlin@debian.org> -Date: Thu, 27 Sep 2018 14:51:32 +0800 -Subject: Fix typo - ---- - doc/modbus_mapping_new_start_address.txt | 4 ++-- - doc/modbus_reply.txt | 2 +- - doc/modbus_reply_exception.txt | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/doc/modbus_mapping_new_start_address.txt b/doc/modbus_mapping_new_start_address.txt -index 4fa196a..94a81fb 100644 ---- a/doc/modbus_mapping_new_start_address.txt -+++ b/doc/modbus_mapping_new_start_address.txt -@@ -21,9 +21,9 @@ The _modbus_mapping_new_start_address()_ function shall allocate four arrays to - store bits, input bits, registers and inputs registers. The pointers are stored - in modbus_mapping_t structure. All values of the arrays are initialized to zero. - --The different starting adresses make it possible to place the mapping at any -+The different starting addresses make it possible to place the mapping at any - address in each address space. This way, you can give access to values stored --at high adresses without allocating memory from the address zero, for eg. to -+at high addresses without allocating memory from the address zero, for eg. to - make available registers from 10000 to 10009, you can use: - - [source,c] -diff --git a/doc/modbus_reply.txt b/doc/modbus_reply.txt -index 0b29d6f..6b71d11 100644 ---- a/doc/modbus_reply.txt -+++ b/doc/modbus_reply.txt -@@ -3,7 +3,7 @@ modbus_reply(3) - - NAME - ---- --modbus_reply - send a reponse to the received request -+modbus_reply - send a response to the received request - - - SYNOPSIS -diff --git a/doc/modbus_reply_exception.txt b/doc/modbus_reply_exception.txt -index 7e6324f..b2170be 100644 ---- a/doc/modbus_reply_exception.txt -+++ b/doc/modbus_reply_exception.txt -@@ -3,7 +3,7 @@ modbus_reply_exception(3) - - NAME - ---- --modbus_reply_exception - send an exception reponse -+modbus_reply_exception - send an exception response - - - SYNOPSIS diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch deleted file mode 100644 index 7fae34e7d3..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d Mon Sep 17 00:00:00 2001 -From: i-ky <gl.ivanovsky@gmail.com> -Date: Tue, 10 Jul 2018 15:58:45 +0300 -Subject: [PATCH] Fixed MODBUS_GET_* macros in case of negative values - -In case resulting value should be negative it is incorrect to use '+' operator to construct it from pieces, because highest bytes will result in negative number after bitwise shift while others will stay positive. Replacing addition with '|' should solve the issue. ---- - src/modbus.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/modbus.h b/src/modbus.h -index f6e9a5f5..c63f5ceb 100644 ---- a/src/modbus.h -+++ b/src/modbus.h -@@ -245,12 +245,12 @@ MODBUS_API int modbus_reply_exception(modbus_t *ctx, const uint8_t *req, - #define MODBUS_GET_HIGH_BYTE(data) (((data) >> 8) & 0xFF) - #define MODBUS_GET_LOW_BYTE(data) ((data) & 0xFF) - #define MODBUS_GET_INT64_FROM_INT16(tab_int16, index) \ -- (((int64_t)tab_int16[(index) ] << 48) + \ -- ((int64_t)tab_int16[(index) + 1] << 32) + \ -- ((int64_t)tab_int16[(index) + 2] << 16) + \ -+ (((int64_t)tab_int16[(index) ] << 48) | \ -+ ((int64_t)tab_int16[(index) + 1] << 32) | \ -+ ((int64_t)tab_int16[(index) + 2] << 16) | \ - (int64_t)tab_int16[(index) + 3]) --#define MODBUS_GET_INT32_FROM_INT16(tab_int16, index) ((tab_int16[(index)] << 16) + tab_int16[(index) + 1]) --#define MODBUS_GET_INT16_FROM_INT8(tab_int8, index) ((tab_int8[(index)] << 8) + tab_int8[(index) + 1]) -+#define MODBUS_GET_INT32_FROM_INT16(tab_int16, index) ((tab_int16[(index)] << 16) | tab_int16[(index) + 1]) -+#define MODBUS_GET_INT16_FROM_INT8(tab_int8, index) ((tab_int8[(index)] << 8) | tab_int8[(index) + 1]) - #define MODBUS_SET_INT16_TO_INT8(tab_int8, index, value) \ - do { \ - tab_int8[(index)] = (value) >> 8; \ diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb deleted file mode 100644 index 8e42fdc5d2..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb +++ /dev/null @@ -1,12 +0,0 @@ -require libmodbus.inc - -SRC_URI += "file://f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch \ - file://Fix-float-endianness-issue-on-big-endian-arch.patch \ - file://Fix-typo.patch" -SRC_URI[md5sum] = "15c84c1f7fb49502b3efaaa668cfd25e" -SRC_URI[sha256sum] = "d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16" - -# this file has been created one minute after the configure file, so it doesn't get recreated during configure step -do_configure:prepend() { - rm -rf ${S}/tests/unit-test.h -} diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.7.bb b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.7.bb new file mode 100644 index 0000000000..6c0e315d79 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.7.bb @@ -0,0 +1,9 @@ +require libmodbus.inc + +SRC_URI += "file://Fix-float-endianness-issue-on-big-endian-arch.patch" +SRC_URI[sha256sum] = "7dfe958431d0570b271e1a5b329b76a658e89c614cf119eb5aadb725c87f8fbd" + +# this file has been created one minute after the configure file, so it doesn't get recreated during configure step +do_configure:prepend() { + rm -rf ${S}/tests/unit-test.h +} diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb index 7ff0725a20..ec427a9a73 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" DEPENDS = "cracklib virtual/gettext" -inherit autotools distutils3-base gettext +inherit autotools setuptools3-base gettext B = "${S}" diff --git a/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_2.0.3.bb b/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_2.0.4.bb index 18d6a4f27c..48a7d086b5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_2.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_2.0.4.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" inherit autotools pkgconfig -SRCREV = "404adbcd998ec83643e47d92b3ea8d9c3970e68b" -SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ +SRCREV = "a2691b96188033b5ad5c08871982048ae1f4f4e8" +SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=main;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb index 7741305f01..631860a903 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb @@ -11,7 +11,7 @@ DEPENDS = "xmlrpc-c xmlrpc-c-native intltool-native \ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://github.com/abrt/libreport.git;protocol=https" +SRC_URI = "git://github.com/abrt/libreport.git;protocol=https;branch=master" SRC_URI += "file://0001-Makefile.am-remove-doc-and-apidoc.patch \ file://0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch \ file://0003-without-build-plugins.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab/0001-configure.ac-Do-not-use-single-line-comment.patch b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab/0001-configure.ac-Do-not-use-single-line-comment.patch deleted file mode 100644 index 46493bb9e7..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab/0001-configure.ac-Do-not-use-single-line-comment.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a8502c5a7e336f1e5068f9dd3bdb359d787f9bdc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 5 Feb 2021 18:35:12 -0800 -Subject: [PATCH] configure.ac: Do not use single line comment - -autoconf 2.70+ does not like it and regenerating configure script fails - -| ../libstatgrab-0.92/configure: line 7818: syntax error near unexpected token `ac_fn_check_decl' -| ../libstatgrab-0.92/configure: line 7818: `fi ac_fn_check_decl "$LINENO" "__sun" "ac_cv_have_decl___sun" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"' - -Upstream-Status: Submitted [https://github.com/libstatgrab/libstatgrab/pull/128] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 99518f8..74e7f0f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -100,7 +100,8 @@ AC_TYPE_UNSIGNED_LONG_LONG_INT - - dnl Check for extra flags to enable some kind of behavior - AC_CHECK_DECL([_AIX],[ac_cv_need_minus_d_linux_source_compat="yes"; ac_cv_need_minus_d_all_source="yes"]) --AC_CHECK_DECL([__linux],[ac_cv_need_minus_d_gnu_source="yes"]) dnl probably required by kfreebsd, too? -+dnl probably required by kfreebsd, too? -+AC_CHECK_DECL([__linux],[ac_cv_need_minus_d_gnu_source="yes"]) - AC_CHECK_DECL([__sun],[ac_cv_need_minus_d_extensions="yes"; ac_cv_need_minus_d_posix_pthread_semantics="yes"]) - AC_CHECK_DECL([__hpux],[ac_cv_need_minus_d_hpux_source="yes"]) - --- -2.30.0 - 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.1.bb index 3f15a259bf..61f159c574 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb @@ -9,11 +9,9 @@ DEPENDS = "ncurses" PACKAGES:prepend = "statgrab statgrab-dbg saidar saidar-dbg ${PN}-mrtg " # don't use the git tag unless docbooc2x is available to build the manpages -SRC_URI = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATGRAB_0_92/libstatgrab-0.92.tar.gz \ - file://0001-configure.ac-Do-not-use-single-line-comment.patch \ +SRC_URI = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATGRAB_0_92_1/libstatgrab-${PV}.tar.gz \ " -SRC_URI[md5sum] = "5362b2ddbec54b3901e7d70c22cda249" -SRC_URI[sha256sum] = "5bf1906aff9ffc3eeacf32567270f4d819055d8386d98b9c8c05519012d5a196" +SRC_URI[sha256sum] = "5688aa4a685547d7174a8a373ea9d8ee927e766e3cc302bdee34523c2c5d6c11" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb b/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb index 781e7aab71..c93c8b0be3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb @@ -3,7 +3,7 @@ SECTION = "base" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SRC_URI = "git://git.code.sf.net/p/libuio/code \ +SRC_URI = "git://git.code.sf.net/p/libuio/code;branch=master \ file://replace_inline_with_static-inline.patch \ file://0001-include-fcntl.h-for-O_RDWR-define.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb index 6c675c4067..2f5e4615f2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" SRCREV = "69d9fff65abb58beb0bb6aa9ecacd572ca1dfc56" -SRC_URI = "git://github.com/CESNET/libyang.git \ +SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ file://libyang-skip-pcre2-config-add-stdint-h.patch \ file://run-ptest \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_git.bb b/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_git.bb index e8c6864c1f..cc31323c3f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_git.bb @@ -9,7 +9,7 @@ PV = "4.4+git${SRCPV}" SRCREV = "877613493ff44807888ce1928129574be393cbb0" -SRC_URI = "git://github.com/jessek/hashdeep.git \ +SRC_URI = "git://github.com/jessek/hashdeep.git;branch=master;protocol=https \ file://wrong-variable-expansion.patch \ file://0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 596ec0b43c..671d320195 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -11,7 +11,7 @@ DEPENDS = "virtual/crypt expat flex python3 bison-native libxml2 nettle lz4" RDEPENDS:${PN} = "python3-core" SRCREV = "aa42957a2e227df41510047cece3cd606dc1cb6a" -SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ +SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;branch=master;protocol=https \ https://curl.haxx.se/download/curl-7.64.0.tar.bz2;name=curl;subdir=git/thirdparty \ https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz;name=libressl;subdir=git/thirdparty \ ${DEBIAN_MIRROR}/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz;name=ossp-uuid;subdir=git/thirdparty \ diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0001-Cargo.toml-do-not-abort-on-panic.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch index e09848f403..e09848f403 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0001-Cargo.toml-do-not-abort-on-panic.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch index a2ccf6b916..a2ccf6b916 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch new file mode 100644 index 0000000000..7b938179c3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch @@ -0,0 +1,56 @@ +From 9eceb43dd676afe2f675bd65ab369ba4d14f6537 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 18 Nov 2021 07:16:39 +0000 +Subject: [PATCH] Rewrite cargo-host-linker in python3 + +Mozjs compile failed with this failure: +/bin/sh: /lib64/libc.so.6: version `GLIBC_2.33' not found (required by /build/tmp-glibc/work/corei7-64-wrs-linux/mozjs/91.1.0-r0/recipe-sysroot-native/usr/lib/libtinfo.so.5) + +Root Cause: +cargo-host-linker has /bin/sh as it's interpreter, but cargo run the cmd +with LD_LIBRARY_PATH set to recipe-sysroot-native. The host /bin/sh links +libtinfo.so.5 under recipe-sysroot-native, which needs higher libc. But +host libc is older libc. So the incompatible problem occurred. + +Solution: +rewrite cargo-host-linker in python3 + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + build/cargo-host-linker | 24 +++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/build/cargo-host-linker b/build/cargo-host-linker +index cbd0472bf7..ccd8bffec1 100755 +--- a/build/cargo-host-linker ++++ b/build/cargo-host-linker +@@ -1,3 +1,21 @@ +-#!/bin/sh +-# See comment in cargo-linker. +-eval ${MOZ_CARGO_WRAP_HOST_LD} ${MOZ_CARGO_WRAP_HOST_LDFLAGS} '"$@"' ++#!/usr/bin/env python3 ++ ++import os,sys ++ ++if os.environ['MOZ_CARGO_WRAP_HOST_LD'].strip(): ++ binary=os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0] ++else: ++ sys.exit(0) ++ ++if os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS'].strip(): ++ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] ++ else: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] ++else: ++ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + sys.argv[1:] ++ else: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + sys.argv[1:] ++ ++os.execvp(binary, args) +-- +2.33.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch new file mode 100644 index 0000000000..5472eddbbb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch @@ -0,0 +1,50 @@ +From b13cad4abc53f816f64c8b0af70cb46820746c72 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 11 Nov 2021 16:05:54 +0800 +Subject: [PATCH] util.configure: fix one occasionally reproduced configure + failure + +error: +| checking whether the C++ compiler supports -Wno-range-loop-analysis... +| DEBUG: Creating /tmp/conftest.jr1qrcw3.cpp with content: +| DEBUG: | int +| DEBUG: | main(void) +| DEBUG: | { +| DEBUG: | +| DEBUG: | ; +| DEBUG: | return 0; +| DEBUG: | } +| DEBUG: Executing: aarch64-wrs-linux-g++ -mcpu=cortex-a53 -march=armv8-a+crc -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mozjs/91.1.0-r0/recipe-sysroot /tmp/conftest.jr1qrcw3.cpp -Werror -Wrange-loop-analysis -c +| DEBUG: The command returned non-zero exit status 1. +| DEBUG: Its error output was: +... +| File "/mozjs/91.1.0-r0/firefox-91.1.0/build/moz.configure/util.configure", line 239, in try_invoke_compiler +| os.remove(path) +| FileNotFoundError: [Errno 2] No such file or directory: '/tmp/conftest.jr1qrcw3.cpp' + +It should be another process that deleted this file by using +"rm -rf conftest*" inappropriately + +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + build/moz.configure/util.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure +index 8f35e89c73..84e256647d 100644 +--- a/build/moz.configure/util.configure ++++ b/build/moz.configure/util.configure +@@ -222,7 +222,7 @@ def try_invoke_compiler(compiler, language, source, flags=None, onerror=None): + "C++": ".cpp", + }[language] + +- fd, path = mkstemp(prefix="conftest.", suffix=suffix, text=True) ++ fd, path = mkstemp(prefix="try_invoke_compiler_conftest.", suffix=suffix, text=True) + try: + source = source.encode("ascii", "replace") + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0002-moz.configure-do-not-look-for-llvm-objdump.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch index 6ff83e3bb2..6ff83e3bb2 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0002-moz.configure-do-not-look-for-llvm-objdump.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch index c440bf178f..c440bf178f 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch new file mode 100644 index 0000000000..b56f0b95b5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch @@ -0,0 +1,35 @@ +From 65acc8800dba7e10da882871d4648241805c47ce Mon Sep 17 00:00:00 2001 +From: Andre McCurdy <amccurdy@gmail.com> +Date: Sat, 30 Apr 2016 15:29:06 -0700 +Subject: [PATCH] use <asm/sgidefs.h> + +Build fix for MIPS with musl libc + +The MIPS specific header <sgidefs.h> is provided by glibc and uclibc +but not by musl. Regardless of the libc, the kernel headers provide +<asm/sgidefs.h> which provides the same definitions, so use that +instead. + +Upstream-Status: Pending + +[Vincent: +Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] + +Signed-off-by: Andre McCurdy <armccurdy@gmail.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> +--- + gdb/mips-linux-nat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/mfbt/RandomNum.cpp ++++ b/mfbt/RandomNum.cpp +@@ -52,7 +52,7 @@ extern "C" BOOLEAN NTAPI RtlGenRandom(PV + # elif defined(__s390__) + # define GETRANDOM_NR 349 + # elif defined(__mips__) +-# include <sgidefs.h> ++# include <asm/sgidefs.h> + # if _MIPS_SIM == _MIPS_SIM_ABI32 + # define GETRANDOM_NR 4353 + # elif _MIPS_SIM == _MIPS_SIM_ABI64 diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/nojit-32bit-arch-fix.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch index f308b4863f..f308b4863f 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/nojit-32bit-arch-fix.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch new file mode 100644 index 0000000000..80bf746e40 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch @@ -0,0 +1,36 @@ +From 0e0548e3f95e22a39db8d5b934afe0672a3f801b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 1 Nov 2021 08:13:29 +0100 +Subject: [PATCH] Fix build on powerpc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Another fix for (this time JIT enabled) +| <...>/irefox-91.2.0/js/src/wasm/WasmFrame.cpp:57:76: error: static assertion failed: Aligned after pushing DebugFrame +| 57 | static_assert((offsetof(DebugFrame, frame_) + sizeof(Frame)) % Alignment == 0, +| | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + js/src/wasm/WasmFrame.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/wasm/WasmFrame.h b/js/src/wasm/WasmFrame.h +index 893762e..2d90656 100644 +--- a/js/src/wasm/WasmFrame.h ++++ b/js/src/wasm/WasmFrame.h +@@ -232,7 +232,7 @@ class DebugFrame { + #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \ + (defined(JS_CODEGEN_NONE) && \ + (defined(__riscv) && __riscv_xlen == 32) || defined(__mips__)) || \ +- defined(JS_CODEGEN_X86) || defined(__wasi__) ++ defined(JS_CODEGEN_X86) || defined(__wasi__) || defined(__powerpc__) + // See alignmentStaticAsserts(). For MIPS32, ARM32 and X86 DebugFrame is only + // 4-byte aligned, so we add another word to get up to 8-byte + // alignment. +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/fix-musl-build.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/fix-musl-build.patch new file mode 100644 index 0000000000..c0834af589 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/fix-musl-build.patch @@ -0,0 +1,15 @@ +Upstream: No +Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: +https://github.com/void-linux/void-packages/issues/2598 +--- a/js/src/old-configure.in ++++ b/js/src/old-configure.in +@@ -1072,6 +1072,9 @@ if test "$ac_cv_thread_keyword" = yes; t + *-android*|*-linuxandroid*) + : + ;; ++ *-musl*) ++ : ++ ;; + *) + AC_DEFINE(HAVE_THREAD_TLS_KEYWORD) + ;; diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/riscv32.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/riscv32.patch index fe9c332a00..fe9c332a00 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/riscv32.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/riscv32.patch diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_91.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb index a1a5ddc3b0..dd02ed94cb 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_91.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb @@ -11,9 +11,12 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://fix-musl-build.patch \ file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \ file://riscv32.patch \ - file://nojit-32bit-arch-fix.patch \ + file://0005-nojit-32bit-arch-fix.patch \ + file://0006-Fix-build-on-powerpc.patch \ + file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ + file://0001-rewrite-cargo-host-linker-in-python3.patch \ " -SRC_URI[sha256sum] = "3ef3cfd321d0c2c80ee1b41b8baf7a1ea4daf93c29e1377274933440ff5e42c3" +SRC_URI[sha256sum] = "e722829db490f9332712a81c35996541737bbfb05232d47190fee779c4fcb327" S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" @@ -61,11 +64,11 @@ inherit multilib_script multilib_header MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js91-config" do_install:append() { - oe_multilib_header mozjs-91/js-config.h - sed -e 's@${STAGING_DIR_HOST}@@g' \ - -i ${D}${bindir}/js91-config + oe_multilib_header mozjs-91/js-config.h + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${bindir}/js91-config + rm -f ${D}${libdir}/libjs_static.ajs } -PACKAGES =+ "lib${BPN}-staticdev lib${BPN}" -FILES:lib${BPN}-staticdev += "${libdir}/libjs_static.ajs" +PACKAGES =+ "lib${BPN}" FILES:lib${BPN} += "${libdir}/lib*" diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb index dcfbabc8a8..2a50550a0e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=91e7de50a8d3cf01057f318d72460acd" SRCREV = "7786c7ded5c9ce7773890d0e3dc27632898fc6b1" PV = "2.2.0+git${SRCPV}" -SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ +SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http;branch=master;protocol=https \ file://0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch \ file://0001-include-Declare-gVERSION-global-as-extern.patch \ " @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" # CMakeLists.txt checks the architecture, only x86 and ARM supported for now COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" -inherit cmake distutils3-base +inherit cmake setuptools3-base DEPENDS += "json-c" 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.6.11.bb index 23db7c679b..af0a3c2bd2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb +++ b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb @@ -17,7 +17,7 @@ REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "d8eba6cb6682b59d84ca1da67a523520b879ade6" -SRC_URI = "git://github.com/Openwsman/openwsman.git \ +SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=master;protocol=https \ file://libssl-is-required-if-eventint-supported.patch \ file://openwsmand.service \ file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.5.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.6.bb index 08cfb136e5..d2d5dc0aa0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.6.bb @@ -17,15 +17,11 @@ DEPENDS = " \ bison-native \ " -# The Yocto mirror has an old export of ostree: -# http://downloads.yoctoproject.org/mirror/sources/git2_github.com.ostreedev.ostree.tar.gz -PREMIRRORS = "" - SRC_URI = " \ - gitsm://github.com/ostreedev/ostree;branch=main \ + gitsm://github.com/ostreedev/ostree;branch=main;protocol=https \ file://run-ptest \ " -SRCREV = "63bf5e606b24c7343bfe622bf6af2110ee6beabc" +SRCREV = "f1155c8d283c3c85d74d5e1050b0dcf8198f750a" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" @@ -33,6 +29,14 @@ S = "${WORKDIR}/git" inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconfig ptest-gnome systemd +# Workaround compile failure: +# |../git/src/libotutil/zbase32.c:37:1: error: function returns an aggregate [-Werror=aggregate-return] +# so remove -Og and use -O2 as workaround +DEBUG_OPTIMIZATION:remove = "-Og" +DEBUG_OPTIMIZATION:append = " -O2" +BUILD_OPTIMIZATION:remove = "-Og" +BUILD_OPTIMIZATION:append = " -O2" + # Package configuration - match ostree defaults, but without rofiles-fuse # otherwise we introduce a dependendency on meta-filesystems PACKAGECONFIG ??= " \ @@ -52,6 +56,13 @@ PACKAGECONFIG:class-native ??= " \ soup \ " +PACKAGECONFIG:class-nativesdk ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ + builtin-grub2-mkconfig \ + gpgme \ + 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" @@ -89,6 +100,11 @@ EXTRA_OECONF:class-native = " \ --disable-otmpfile \ " +EXTRA_OECONF:class-nativesdk = " \ + --enable-wrpseudo-compat \ + --disable-otmpfile \ +" + # Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the # do_configure stage so we do depend on it SYSROOT_DIR = "${STAGING_DIR_TARGET}" @@ -106,6 +122,10 @@ do_install:append:class-native() { create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" } +do_install:append:class-nativesdk() { + create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="\$OECORE_NATIVE_SYSROOT/usr/lib/ostree/ostree-grub-generator" +} + PACKAGE_BEFORE_PN = " \ ${PN}-dracut \ ${PN}-grub \ @@ -186,4 +206,4 @@ RRECOMMENDS:${PN} += "kernel-module-overlay" SYSTEMD_SERVICE:${PN} = "ostree-remount.service ostree-finalize-staged.path" SYSTEMD_SERVICE:${PN}-switchroot = "ostree-prepare-root.service" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb b/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb index b18e52ff41..eca7d874bf 100644 --- a/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://src/os.h;md5=752555fa94e82005d45fd201fee5bd33" PV = "2.1.0.1" -SRC_URI = "git://github.com/Pulse-Eight/platform.git \ +SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https \ file://0001-Make-resulting-cmake-config-relocatable.patch" SRCREV = "2d90f98620e25f47702c9e848380c0d93f29462b" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb index f98c4a7be8..dc7b84986f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb @@ -11,7 +11,7 @@ REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "e2145df09469bf84878e4729b4ecd814efb797d1" -SRC_URI = "git://github.com/PADL/pam_ccreds" +SRC_URI = "git://github.com/PADL/pam_ccreds;branch=master;protocol=https" S = "${WORKDIR}/git" 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 53745394a8..6985590068 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,7 @@ 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;branch=master;protocol=https \ file://0001-include-stdexcept-for-std-invalid_argument.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb index e456603c1c..4354c83371 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb @@ -11,7 +11,7 @@ DEPENDS:append:libc-musl = " fts" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/pmem/pmdk.git;branch=stable-1.11" +SRC_URI = "git://github.com/pmem/pmdk.git;branch=stable-1.11;protocol=https" SRCREV = "5b21904a257eff47f2e87fcbf2de46111f03ddd8" inherit autotools-brokensep pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.119.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.119.bb index a41b0fecad..d76361732a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.119.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.119.bb @@ -5,7 +5,7 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4" -DEPENDS = "expat glib-2.0 intltool-native mozjs" +DEPENDS = "expat glib-2.0 intltool-native mozjs-91" inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection features_check diff --git a/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb b/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb index 450bbb918f..d7e59e9637 100644 --- a/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" PV = "0.0.1+git${SRCPV}" SRCREV = "45863e849b39c4921d6553e6d27e267a96ac7d77" -SRC_URI = "git://github.com/lib-cpp/${BPN}.git" +SRC_URI = "git://github.com/lib-cpp/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.2.bb b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.3.bb index 2a6bb57ed7..c135105f90 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.3.bb @@ -4,8 +4,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI = "git://github.com/sewenew/redis-plus-plus" -SRCREV = "e29c63db54653a660d7a0f556f670b7a6fce0a78" +SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https" +SRCREV = "389ffdf9e72035ea2096b03cda7f4a6809ae6363" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb index e96138ea83..bb72316cf8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb @@ -10,7 +10,7 @@ SRCREV = "56a83f4f52e6745cd4352f9ee008be3183a6dedf" PV = "1.7.2" SRC_URI = "\ - git://github.com/oetiker/rrdtool-1.x.git;branch=master;protocol=http; \ + git://github.com/oetiker/rrdtool-1.x.git;branch=master;protocol=http;;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb index 88ba9edaa1..24ad172674 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a958bb07122368f3e1d9b2efe07d231f" DEPENDS = "" -SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https" +SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https;branch=master" SRCREV = "0293afb3913f760c449348551cca4d2df59c1a00" diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/setuptools.patch b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/setuptools.patch new file mode 100644 index 0000000000..bc2c68c1c5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/setuptools.patch @@ -0,0 +1,18 @@ +Switch to setuptools as distutils is deprecated. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/python/setup.py b/python/setup.py +index b3bfaf1..dfbaf21 100644 +--- a/python/setup.py ++++ b/python/setup.py +@@ -4,7 +4,7 @@ + # modify, copy, or redistribute it subject to the terms and conditions + # of the GNU General Public License v.2. + +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + + sanlocklib = ['sanlock'] + sanlock = Extension(name='sanlock', diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb index fa08d0f98e..3c08c4e003 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb @@ -9,31 +9,32 @@ 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;patchdir=../ \ +SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \ + file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ + file://setuptools.patch \ " SRCREV = "a181e951376d49a82eef17920c8ebedec80b4823" -S = "${WORKDIR}/git/python" +S = "${WORKDIR}/git" DEPENDS = "libaio util-linux" -inherit distutils3 useradd +inherit setuptools3 useradd -do_configure[noexec] = "1" +SETUPTOOLS_SETUP_PATH = "${S}/python" do_compile:prepend () { - 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}" + 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 ${S}/../wdmd DESTDIR=${D} LIBDIR=${libdir} install - oe_runmake -C ${S}/../src DESTDIR=${D} LIBDIR=${libdir} install + 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/sedutil/sedutil_git.bb b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb index 99e358648f..e4323ec83c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://Common/LICENSE.txt;md5=d32239bcb673463ab874e80d47fae5 BASEPV = "1.15.1" PV = "1.20.0" SRCREV = "d3de8e45e06a21d31cca0046ceb16ced1ef3563a" -SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git \ +SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git;branch=master;protocol=https \ file://0001-Fix-build-on-big-endian-architectures.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb b/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb index 5c786d8913..252ba9f3dc 100644 --- a/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb @@ -10,7 +10,7 @@ compression ratio." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" -SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https \ +SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https;branch=master \ file://0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch \ " SRCREV = "2b63814b15a2aaae54b7943f0cd935892fae628f" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index eed79ae7fe..0e53cfa8d0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931" SRCREV = "beb4650660179963a8ed5b5cbf2085cc1b34f608" PV = "1.0+git${SRCPV}" -SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https" +SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb index 1a2d330904..45978bb2c5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=44;md5=a9e1169c6c9a114a61 DEPENDS = "libsocketcan" -SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git" +SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master" SRCREV = "3615bac17e539a06835dcb90855eae844ee18053" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb index 65e1fde0bf..59114b0278 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libsocketcan" SRCREV = "299dff7f5322bf0348dcdd60071958ebedf5f09d" -SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git \ +SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git;branch=master \ file://0001-canutils-candump-Add-error-frame-s-handling.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb index b7a7f6f471..27380ee19d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38ad SRCREV = "077def398ad303043d73339112968e5112d8d7c8" -SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git" +SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Fix-a-lot-of-Werror-format-security-errors-.patch b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Fix-a-lot-of-Werror-format-security-errors-.patch new file mode 100644 index 0000000000..055b0c1c29 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Fix-a-lot-of-Werror-format-security-errors-.patch @@ -0,0 +1,155 @@ +From a5c8e2676b94d2ea41b44b4e05943bee6459f337 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Oct 2021 09:46:35 -0700 +Subject: [PATCH] libsinsp: Fix a lot of -Werror=format-security errors with + mvprintw/mvwprintw + +In all these places a non-constant is used as a format string which +compiler complains about. Fix by using "%s" as format. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + userspace/libsinsp/cursescomponents.cpp | 4 ++-- + userspace/libsinsp/cursesspectro.cpp | 2 +- + userspace/libsinsp/cursestable.cpp | 6 +++--- + userspace/libsinsp/cursesui.cpp | 14 +++++++------- + 4 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/userspace/libsinsp/cursescomponents.cpp b/userspace/libsinsp/cursescomponents.cpp +index 4003cb4e..372b4526 100644 +--- a/userspace/libsinsp/cursescomponents.cpp ++++ b/userspace/libsinsp/cursescomponents.cpp +@@ -877,7 +877,7 @@ void curses_textbox::print_no_data() + string wstr = "No Data For This Selection"; + mvprintw(m_parent->m_screenh / 2, + m_parent->m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + + refresh(); + } +@@ -1100,7 +1100,7 @@ void curses_textbox::render() + attrset(m_parent->m_colors[sinsp_cursesui::LARGE_NUMBER]); + mvprintw(0, + m_parent->m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + } + + // +diff --git a/userspace/libsinsp/cursesspectro.cpp b/userspace/libsinsp/cursesspectro.cpp +index 6858bc95..32012963 100644 +--- a/userspace/libsinsp/cursesspectro.cpp ++++ b/userspace/libsinsp/cursesspectro.cpp +@@ -227,7 +227,7 @@ void curses_spectro::print_error(string wstr) + mvwprintw(m_tblwin, + m_parent->m_screenh / 2, + m_parent->m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + } + + void curses_spectro::update_data(vector<sinsp_sample_row>* data, bool force_selection_change) +diff --git a/userspace/libsinsp/cursestable.cpp b/userspace/libsinsp/cursestable.cpp +index 69c2aa32..54667554 100644 +--- a/userspace/libsinsp/cursestable.cpp ++++ b/userspace/libsinsp/cursestable.cpp +@@ -254,7 +254,7 @@ void curses_table::print_line_centered(string line, int32_t off) + mvwprintw(m_tblwin, + m_parent->m_screenh / 2 + off, + m_parent->m_screenw / 2 - line.size() / 2, +- line.c_str()); ++ "%s", line.c_str()); + } + else + { +@@ -268,7 +268,7 @@ glogf("2, %d %s\n", spos, ss.c_str()); + mvwprintw(m_tblwin, + m_parent->m_screenh / 2 + off + j, + 0, +- ss.c_str()); ++ "%s", ss.c_str()); + + spos += m_parent->m_screenw; + if(spos >= line.size()) +@@ -328,7 +328,7 @@ void curses_table::print_error(string wstr) + mvwprintw(m_tblwin, + m_parent->m_screenh / 2, + m_parent->m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + } + + void curses_table::render(bool data_changed) +diff --git a/userspace/libsinsp/cursesui.cpp b/userspace/libsinsp/cursesui.cpp +index 1eeb0864..69652edc 100644 +--- a/userspace/libsinsp/cursesui.cpp ++++ b/userspace/libsinsp/cursesui.cpp +@@ -825,7 +825,7 @@ void sinsp_cursesui::render_header() + attrset(m_colors[sinsp_cursesui::LARGE_NUMBER]); + mvprintw(0, + m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + } + + // +@@ -1123,7 +1123,7 @@ void sinsp_cursesui::render_filtersearch_main_menu() + + m_cursor_pos = cursor_pos; + +- mvprintw(m_screenh - 1, m_cursor_pos, str->c_str()); ++ mvprintw(m_screenh - 1, m_cursor_pos, "%s", str->c_str()); + + m_cursor_pos += str->size(); + } +@@ -2189,7 +2189,7 @@ void sinsp_cursesui::print_progress(double progress) + string wstr = "Processing File"; + mvprintw(m_screenh / 2, + m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + + // + // Using sprintf because to_string doesn't support setting the precision +@@ -2199,7 +2199,7 @@ void sinsp_cursesui::print_progress(double progress) + wstr = "Progress: " + string(numbuf); + mvprintw(m_screenh / 2 + 1, + m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + + refresh(); + } +@@ -2308,7 +2308,7 @@ sysdig_table_action sinsp_cursesui::handle_textbox_input(int ch) + attrset(m_colors[sinsp_cursesui::FAILED_SEARCH]); + mvprintw(m_screenh / 2, + m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + + // + // Restore the cursor +@@ -2363,7 +2363,7 @@ sysdig_table_action sinsp_cursesui::handle_textbox_input(int ch) + + mvprintw(m_screenh / 2, + m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + + render(); + } +@@ -2436,7 +2436,7 @@ sysdig_table_action sinsp_cursesui::handle_textbox_input(int ch) + + mvprintw(m_screenh / 2, + m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + + render(); + } +-- +2.33.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb index a12f8ba5e1..340a124965 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -21,9 +21,10 @@ JIT:powerpc64 = "" DEPENDS += "libb64 lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp tbb jq openssl elfutils protobuf protobuf-native jq-native" RDEPENDS:${PN} = "bash" -SRC_URI = "git://github.com/draios/sysdig.git;branch=dev \ +SRC_URI = "git://github.com/draios/sysdig.git;branch=dev;protocol=https \ file://0001-fix-build-with-LuaJIT-2.1-betas.patch \ file://aarch64.patch \ + file://0001-libsinsp-Fix-a-lot-of-Werror-format-security-errors-.patch \ " SRCREV = "67833b2aca06bd9d11cff7cb29f04fbf4ef96cad" PV = "0.27.1" diff --git a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index e2e6de6b5f..271fe7a284 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Transparent Inter-Process Communication protocol" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://tipclog/tipc.h;endline=35;md5=985b6ea8735818511d276c1b466cce98" -SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils \ +SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils;branch=master \ file://0001-include-sys-select.h-for-FD_-definitions.patch \ file://0002-replace-non-standard-uint-with-unsigned-int.patch \ file://0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvwp.patch b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvwp.patch new file mode 100644 index 0000000000..6d5e293c7f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvwp.patch @@ -0,0 +1,31 @@ +From 42e99eb6c727df7c9d49586803a4bf9933a9796b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Oct 2021 10:52:42 -0700 +Subject: [PATCH] Fix a lot of -Werror=format-security errors with mvwprintw + +In all these places a non-constant is used as a format string which +compiler complains about. Fix by using "%s" as format. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/helpwin.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/helpwin.c b/src/helpwin.c +index 0d660f9..1623d9c 100644 +--- a/src/helpwin.c ++++ b/src/helpwin.c +@@ -61,7 +61,7 @@ void show_help_win(WINDOW* win, screen_t* screen) + wattroff(win, A_REVERSE); + + /* screen description */ +- mvwprintw(win, 2, 1, screen->desc); ++ mvwprintw(win, 2, 1, "%s", screen->desc); + + /* max size of column headers */ + for(i = 0; i < n; i++) { +-- +2.33.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb index 31d0dae25c..13aa92e116 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb @@ -1,17 +1,19 @@ SUMMARY = "Hardware performance monitoring counters" -HOMEPAGE = "http://tiptop.gforge.inria.fr/" +HOMEPAGE = "https://team.inria.fr/pacap/software/tiptop/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "ncurses libxml2 bison-native flex-native" -SRC_URI = "http://tiptop.gforge.inria.fr/releases/${BP}.tar.gz \ +SRC_URI = "http://files.inria.fr/pacap/${BPN}/${BP}.tar.gz \ file://0001-Fix-parallel-build-problems-by-Adrian-Bunk.patch \ file://0002-fix-reproducibility-of-build-process.patch \ file://0001-Fix-build-when-S-B.patch \ + file://0001-Fix-a-lot-of-Werror-format-security-errors-with-mvwp.patch \ " -SRC_URI[md5sum] = "46ca0fdf0236f02dd2b96d347626d2a2" SRC_URI[sha256sum] = "51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182" +UPSTREAM_CHECK_URI = "https://team.inria.fr/pacap/software/tiptop/" + inherit autotools EXTRA_OECONF = "CFLAGS="$CFLAGS -I${STAGING_INCDIR}/libxml2"" diff --git a/meta-openembedded/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb b/meta-openembedded/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb index 7ae8c51508..6dc5c0c7e5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f7d9aab84ec6567139a4755c48d147fb" DEPENDS:append = " libevent libssh msgpack-c ncurses" SRC_URI = "\ - git://github.com/tmate-io/tmate.git;protocol=https \ + git://github.com/tmate-io/tmate.git;protocol=https;branch=master \ " SRCREV = "5e00bfa5e137e76c81888727712ced2b3fd99f5b" diff --git a/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb b/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb index 472a39589e..c8d585729f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" # matches debian/0.5.0-1 tag SRCREV = "44a173195986d0d853316cb02a58785ded66c12b" PV = "0.5.0+git${SRCPV}" -SRC_URI = "git://github.com/wertarbyte/${BPN}.git;branch=debian" +SRC_URI = "git://github.com/wertarbyte/${BPN}.git;branch=debian;protocol=https" S = "${WORKDIR}/git" 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 cd7dd9ae0f..61e2e38b05 100644 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb @@ -10,7 +10,7 @@ DEPENDS = "libjpeg-turbo mraa" SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d" PV = "2.0.0+git${SRCPV}" -SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ +SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http;branch=master;protocol=https \ 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 \ @@ -25,7 +25,7 @@ S = "${WORKDIR}/git" # Depends on mraa which only supports x86 and ARM for now COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" -inherit distutils3-base cmake pkgconfig +inherit setuptools3-base cmake pkgconfig EXTRA_OECMAKE += "-UPYTHON_EXECUTABLE -DWERROR=off" diff --git a/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_0.24.bb b/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_0.24.bb index 831d514a4e..3ccc5afd5c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_0.24.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_0.24.bb @@ -9,7 +9,7 @@ HOMEPAGE = "http://lambda-diode.com/software/wipe/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "git://github.com/berke/wipe.git;branch=master \ +SRC_URI = "git://github.com/berke/wipe.git;branch=master;protocol=https \ file://support-cross-compile-for-linux.patch \ file://makefile-add-ldflags.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb index 9d9fab2eae..404ab2605b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb @@ -22,7 +22,7 @@ DEPENDS += " \ " SRC_URI = " \ - git://github.com/wxWidgets/wxWidgets.git \ + git://github.com/wxWidgets/wxWidgets.git;branch=master;protocol=https \ file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ " PV = "3.1.4" diff --git a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb index 7dde4182fb..1a77665e99 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb @@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRCREV = "876099f3c66033f3de11d79f63814766b1021dbe" -SRC_URI = "git://github.com/HardySimpson/zlog" +SRC_URI = "git://github.com/HardySimpson/zlog;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb index adb72d5de2..84593387d3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb @@ -5,7 +5,7 @@ DEPENDS = "curl" LICENSE = "Artistic-2.0" LIC_FILES_CHKSUM = "file://src/COPYING;md5=71c0ac4d86266533509aa0825b8d323c" -SRC_URI = "git://github.com/probonopd/zsync-curl;protocol=https \ +SRC_URI = "git://github.com/probonopd/zsync-curl;protocol=https;branch=master \ file://fixes.patch \ file://make.patch" SRCREV = "00141c2806ccc4ddf2ff6263ee1612d19c0b713f" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb index 7f38d42bed..d89613d749 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb @@ -5,7 +5,7 @@ SECTION = "libs" DEPENDS = "glib-2.0 zlib" -inherit gnomebase gobject-introspection +inherit gnomebase gobject-introspection vala SRC_URI += "file://iconv-detect.h \ file://nodolt.patch" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb index 3a018bb519..bba972006a 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb @@ -12,6 +12,8 @@ ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" DEPENDS += "intltool-native gtk+" +# PV is 3.28 not 3.28.0, so the gnomebase SRC_URI isn't right. +SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz;name=archive" SRC_URI[archive.md5sum] = "f9f2c6c521948da427f702372e16f826" SRC_URI[archive.sha256sum] = "7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch deleted file mode 100644 index 9eb7f6bf5c..0000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Updated to apply to gtk+-2.24.15 - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -Index: gtk+-2.24.31/configure.ac -=================================================================== ---- gtk+-2.24.31.orig/configure.ac -+++ gtk+-2.24.31/configure.ac -@@ -415,7 +415,7 @@ AC_MSG_CHECKING([Whether to write depend - case $enable_explicit_deps in - auto) - export SED -- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` -+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` - if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else -@@ -772,7 +772,7 @@ else - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then -- module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" - module_deplibs_check=`$module_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1579,7 +1579,7 @@ fi - # We are using gmodule-no-export now, but I'm leaving the stripping - # code in place for now, since pango and atk still require gmodule. - export SED --export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - if test -n "$export_dynamic"; then - GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` - GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb index ccd82b91f2..082967e04c 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ file://xsettings.patch \ - file://hardcoded_libtool.patch \ file://toggle-font.diff;striplevel=0 \ file://doc-fixes.patch \ file://strict-prototypes.patch \ diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb index 428ec69d76..a8c7713645 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1 & GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "glib-2.0-native atkmm pangomm glibmm gtk+3 cairomm" +DEPENDS = "glib-2.0-native atkmm pangomm glibmm gtk+3 cairomm gdk-pixbuf-native" BPN = "gtkmm" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.8.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.9.bb index 977c3213f5..b0871c6a48 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.8.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.9.bb @@ -8,13 +8,13 @@ DEPENDS = "\ " SRC_URI = "\ - git://github.com/hughsie/libjcat.git \ + git://github.com/hughsie/libjcat.git;branch=main;protocol=https \ file://run-ptest \ " -SRCREV = "356cd2faf2d2197156b0dae7984482cf781d64db" +SRCREV = "d4833949f8f1997b83f35a03127b9e12c104a7c8" S = "${WORKDIR}/git" -inherit gobject-introspection gtk-doc meson ptest-gnome vala +inherit gobject-introspection gtk-doc meson ptest-gnome vala lib_package PACKAGECONFIG ??= "\ gpg \ diff --git a/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.3.bb b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.6.bb index 0ebd653fe8..585c490194 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.3.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.6.bb @@ -2,13 +2,13 @@ SUMMARY = "A library to help create and query binary XML blobs" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" -SRC_URI = "git://github.com/hughsie/libxmlb.git;branch=main \ +SRC_URI = "git://github.com/hughsie/libxmlb.git;branch=main;protocol=https \ file://run-ptest \ " -SRCREV = "5108556a17bb1c2863c2ca5df088143ea65474a3" +SRCREV = "89276ffa4407a8d684e95675990fa864793a7586" S = "${WORKDIR}/git" -inherit gobject-introspection gtk-doc meson ptest-gnome +inherit gobject-introspection gtk-doc meson ptest-gnome lib_package PACKAGECONFIG ??= "\ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ @@ -16,3 +16,5 @@ PACKAGECONFIG ??= "\ PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" GTKDOC_MESON_OPTION = "gtkdoc" + +FILES:${PN}-bin += "${libexecdir}/*" diff --git a/meta-openembedded/meta-oe/recipes-gnome/pyxdg/pyxdg_0.26.bb b/meta-openembedded/meta-oe/recipes-gnome/pyxdg/pyxdg_0.27.bb index a957c1d673..35ecd7ff5d 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/pyxdg/pyxdg_0.26.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/pyxdg/pyxdg_0.27.bb @@ -4,9 +4,9 @@ SECTION = "devel/python" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" -SRCREV = "7db14dcf4c4305c3859a2d9fcf9f5da2db328330" -SRC_URI = "git://anongit.freedesktop.org/xdg/pyxdg" +SRCREV = "f097a66923a65e93640c48da83e6e9cfbddd86ba" +SRC_URI = "git://anongit.freedesktop.org/xdg/pyxdg;branch=master" -inherit distutils3 +inherit setuptools3 S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb b/meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb index 985706a8a3..541b938967 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb @@ -8,7 +8,7 @@ PV = "0.3" PR = "r1" SRCREV = "ef2e1a390e768e21e6a6268977580ee129a96633" -SRC_URI = "git://github.com/lucasdemarchi/dietsplash.git \ +SRC_URI = "git://github.com/lucasdemarchi/dietsplash.git;branch=master;protocol=https \ file://0001-configure.ac-Do-not-demand-linker-hash-style.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb b/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.2.bb index 70e1a47f06..eea231a2ea 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.2.bb @@ -3,18 +3,17 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ " -SRC_URI = "git://github.com/manatools/dnfdragora.git \ +SRC_URI = "git://github.com/manatools/dnfdragora.git;branch=master;protocol=https \ file://0001-disable-build-manpages.patch \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0001-To-fix-error-when-do_package.patch \ " -PV = "1.1.2+git${SRCPV}" -SRCREV = "19e123132cfd4efd860e5204261c3c228bfe80a8" +SRCREV = "5cbbc07c9d015af284a424a172a379b385f05b6f" S = "${WORKDIR}/git" -inherit cmake gettext pkgconfig python3-dir python3native distutils3-base mime-xdg +inherit cmake gettext pkgconfig python3-dir python3native setuptools3-base mime-xdg DEPENDS += "dnf python3 " #DEPENDS:class-nativesdk += "nativesdk-python3" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb b/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb index dfd137c041..833a41683e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a" SECTION = "console/utils" DEPENDS = "libpng zlib" -SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https" +SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https;branch=master" SRCREV = "f43ce6d5ce48fb01360eaa7c4a92c2573a1d02f8" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb index bcc85157cb..e715f7433b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb @@ -15,7 +15,7 @@ REQUIRED_DISTRO_FEATURES:append:class-target = " x11" # tag 20190801 SRCREV = "ac635b818e38ddb8e7e2e1057330a32b4e25476e" -SRC_URI = "git://github.com/${BPN}/${BPN}.git \ +SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \ file://0001-include-sys-select-on-non-glibc-platforms.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb index e0449269c0..b2ad1b6116 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb @@ -32,7 +32,7 @@ DEPENDS = " \ " SRC_URI = " \ - git://github.com/fvwmorg/fvwm.git;protocol=https \ + git://github.com/fvwmorg/fvwm.git;protocol=https;branch=master \ file://0001-Fix-compilation-for-disabled-gnome.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb b/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb index a2eb864b97..71a005a564 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://copying.txt;md5=462e4b97f73ef12f8171c3c546ce4e8d" SRC_URI = " \ - git://github.com/g-truc/glm;branch=master \ + git://github.com/g-truc/glm;branch=master;protocol=https \ file://0001-Silence-clang-warnings.patch \ file://glmConfig.cmake.in \ file://glmConfigVersion.cmake.in \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphene/graphene_1.10.6.bb b/meta-openembedded/meta-oe/recipes-graphics/graphene/graphene_1.10.6.bb new file mode 100644 index 0000000000..0c05c60eee --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/graphene/graphene_1.10.6.bb @@ -0,0 +1,22 @@ +SUMMARY = "A thin layer of graphic data types" +HOMEPAGE = "http://ebassi.github.io/graphene/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7d871d9e23c450c421a85bb2819f648" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gobject-introspection gtk-doc + +SRC_URI[archive.sha256sum] = "80ae57723e4608e6875626a88aaa6f56dd25df75024bd16e9d77e718c3560b25" + +# gtk4 & mutter 41.0 requires graphene build with introspection +PACKAGECONFIG ?= "introspection" +PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled," + +GTKDOC_MESON_OPTION = "gtk_doc" + +EXTRA_OEMESON = "-Dinstalled_tests=false" + +FILES:${PN} += "${libdir}/graphene-1.0" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.109.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.111.bb index ce2a83dcdb..36b1e04407 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.109.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.111.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz" -SRC_URI[sha256sum] = "35461eccd9b8b4470caa78ab9a8f14ecacbcc9eff63033d8dce58093e786deb7" +SRC_URI[sha256sum] = "b4e1c2f718fb3c4b4f412a220876b9da599fe11745fb6f7eb4aed107b1106233" S = "${WORKDIR}/${BPN}-gtk3-${PV}" DEPENDS = " \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb index a90d40e4d8..56d41cd394 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb @@ -2,7 +2,7 @@ SUMMARY = "A graphic library for file loading, saving, rendering, and manipulati HOMEPAGE = "https://sourceforge.net/projects/enlightenment/" SECTION = "libs" -LICENSE = "MIT & BSD" +LICENSE = "Imlib2" LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" DEPENDS = "freetype " @@ -14,7 +14,7 @@ inherit autotools pkgconfig lib_package AUTO_LIBNAME_PKGS = "" -SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git;protocol=https" +SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git;protocol=https;branch=master" S = "${WORKDIR}/git" PACKAGECONFIG ??= "jpeg png zlib ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.26.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb index e633854887..4c17105a99 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.26.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://jasper-software.github.io/jasper/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" -SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https" -SRCREV = "5083b949f0caa5bc6257cd81162a33c15bf8a1d1" +SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https;branch=master" +SRCREV = "fe00207dc10db1d7cc6f2757961c5c6bdfd10973" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch index 871e6e94ef..962c119791 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch @@ -1,4 +1,4 @@ -From f9c4ad3a171d676e3818b8f6897f325ccf0b2203 Mon Sep 17 00:00:00 2001 +From 6ec375eaafc43a2b3c30a0e0e49447d231d81a67 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 9 May 2017 00:57:10 -0700 @@ -7,10 +7,10 @@ Date: Tue, 9 May 2017 00:57:10 -0700 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am -index 8166d91..8e05e49 100644 +index 8568dd2..5efc91e 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -2,6 +2,8 @@ +@@ -3,6 +3,8 @@ ACLOCAL_AMFLAGS = -I acinclude lib_LTLIBRARIES = libSDL2_ttf.la diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.15.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.18.bb index 5787e988dd..513b411448 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.15.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.18.bb @@ -2,21 +2,19 @@ SUMMARY = "Simple DirectMedia Layer truetype font library" SECTION = "libs" DEPENDS = "virtual/libsdl2 freetype virtual/libgl" LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=4bb27d550fdafcd8f8e4fb8cbb2775ef" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=e98cfd01ca78f683e9d035795810ce87" -SRC_URI = " \ - http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \ - file://automake_foreign.patch \ -" -SRC_URI[md5sum] = "04fe06ff7623d7bdcb704e82f5f88391" -SRC_URI[sha256sum] = "a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33" +SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \ + file://automake_foreign.patch \ + " +SRC_URI[sha256sum] = "7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251" S = "${WORKDIR}/SDL2_ttf-${PV}" inherit autotools pkgconfig features_check # links to libGL.so -REQUIRED_DISTRO_FEATURES += "x11 opengl" +REQUIRED_DISTRO_FEATURES += "opengl" do_configure:prepend() { # Removing these files fixes a libtool version mismatch. diff --git a/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb b/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb index 3ed9e9473f..c3b664599a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb @@ -44,7 +44,7 @@ FILES:libvncclient = "${libdir}/libvncclient.*" inherit cmake -SRC_URI = "git://github.com/LibVNC/libvncserver" +SRC_URI = "git://github.com/LibVNC/libvncserver;branch=master;protocol=https" SRCREV = "2aa20dad4c23c18948d3f63b33f9dfec1f837729" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb index b298684fff..bdcbfd7c32 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad0 file://../COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ " -SRC_URI = "git://github.com/libyui/libyui.git" +SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https" SRC_URI:append:class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb index b15343c2c7..4ea217736e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://../COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -SRC_URI = "git://github.com/libyui/libyui.git \ +SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \ file://0001-Fix-build-with-clang.patch \ file://0001-Use-relative-install-paths-for-CMake.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb index a7478d4d5b..7ccee6bf11 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb @@ -1,21 +1,18 @@ # SPDX-FileCopyrightText: Huawei Inc. +# # SPDX-License-Identifier: MIT -# TODO: Pin upstream release (current v7.11.0-80-g419a757) -src_org = "lvgl" -SRC_URI = "gitsm://github.com/${src_org}/lv_drivers;destsuffix=${S};protocol=https;nobranch=1" -SRCREV = "419a757c23aaa67c676fe3a2196d64808fcf2254" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" - HOMEPAGE = "https://docs.lvgl.io/latest/en/html/porting/index.html" SUMMARY = "LVGL's Display and Touch pad drivers" DESCRIPTION = "Collection of drivers: SDL, framebuffer, wayland and more..." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" -DEPENDS += "libxkbcommon" -DEPENDS += "lvgl" -DEPENDS += "wayland" +# TODO: Pin upstream release (current v7.11.0-80-g419a757) +SRC_URI = "git://github.com/lvgl/lv_drivers;destsuffix=${S};protocol=https;nobranch=1" +SRCREV = "419a757c23aaa67c676fe3a2196d64808fcf2254" + +DEPENDS = "libxkbcommon lvgl wayland" REQUIRED_DISTRO_FEATURES = "wayland" @@ -24,22 +21,26 @@ inherit features_check S = "${WORKDIR}/${PN}-${PV}" +LVGL_CONFIG_WAYLAND_HOR_RES ?= "480" +LVGL_CONFIG_WAYLAND_VER_RES ?= "320" + EXTRA_OECMAKE += "-Dinstall:BOOL=ON" TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1" TARGET_CFLAGS += "-I${RECIPE_SYSROOT}/${includedir}/lvgl" - +# Upstream does not support a default configuration +# but propose a default "disabled" template, which is used as reference +# More configuration can be done using external configuration variables do_configure:append() { [ -r "${S}/lv_drv_conf.h" ] \ || sed -e "s|#if 0 .*Set it to \"1\" to enable the content.*|#if 1 // Enabled by ${PN}|g" \ -e "s|# define USE_WAYLAND 0|# define USE_WAYLAND 1|g" \ + -e "s|\(^ *# *define *WAYLAND_HOR_RES *\).*|\1${LVGL_CONFIG_WAYLAND_HOR_RES}|g" \ + -e "s|\(^ *# *define *WAYLAND_VER_RES *\).*|\1${LVGL_CONFIG_WAYLAND_VER_RES}|g" \ < "${S}/lv_drv_conf_template.h" > "${S}/lv_drv_conf.h" } - -FILES:${PN}-dev = "\ +FILES:${PN}-dev += "\ ${includedir}/lvgl/lv_drivers/ \ " - -FILES:${PN}-staticdev = "${libdir}/" diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb index 084070c436..5b3b38d4a6 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb @@ -1,16 +1,15 @@ # SPDX-FileCopyrightText: Huawei Inc. +# # SPDX-License-Identifier: MIT -src_org = "lvgl" -SRC_URI = "gitsm://github.com/${src_org}/lv_lib_png;destsuffix=${S};protocol=https;nobranch=1" -SRCREV = "bf1531afe07c9f861107559e29ab8a2d83e4715a" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" - HOMEPAGE = "https://docs.lvgl.io" SUMMARY = "PNG decoder for LVGL" DESCRIPTION = "Allow the use of PNG images in LVGL. This implementation uses lodepng" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" + +SRC_URI = "git://github.com/lvgl/lv_lib_png;destsuffix=${S};protocol=https;nobranch=1" +SRCREV = "bf1531afe07c9f861107559e29ab8a2d83e4715a" # because of lvgl dependency REQUIRED_DISTRO_FEATURES = "wayland" @@ -26,5 +25,3 @@ TARGET_CFLAGS += "-I${RECIPE_SYSROOT}/${includedir}/lvgl" FILES:${PN}-dev = "\ ${includedir}/lvgl/lv_lib_png/ \ " - -FILES:${PN}-staticdev = "${libdir}/" diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb index 2ca7f60e85..958639b046 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb @@ -8,9 +8,8 @@ SUMMARY = "Light and Versatile Graphics Library" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" -# TODO: Pin upstream release (current is v8.0.3-dev-239-g7b7bed37d) SRC_URI = "gitsm://github.com/lvgl/lvgl;destsuffix=${S};protocol=https;nobranch=1" -SRCREV = "7b7bed37d3e937c59ec99fccba58774fbf9f1930" +SRCREV = "d38eb1e689fa5a64c25e677275172d9c8a4ab2f0" REQUIRED_DISTRO_FEATURES = "wayland" @@ -19,11 +18,15 @@ inherit features_check S = "${WORKDIR}/${PN}-${PV}" -EXTRA_OECMAKE += "-Dinstall:BOOL=ON" +LVGL_CONFIG_LV_MEM_CUSTOM ?= "0" +# Upstream does not support a default configuration +# but propose a default "disabled" template, which is used as reference +# More configuration can be done using external configuration variables do_configure:prepend() { [ -r "${S}/lv_conf.h" ] \ - || sed -e "s|#if 0 /*Set it to \"1\" to enable the content*/|#if 1 // Enabled by ${PN}|g" \ + || sed -e 's|#if 0 .*Set it to "1" to enable .*|#if 1 // Enabled|g' \ + -e "s|\(#define LV_MEM_CUSTOM .*\)0|\1${LVGL_CONFIG_LV_MEM_CUSTOM}|g" \ < "${S}/lv_conf_template.h" > "${S}/lv_conf.h" } diff --git a/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb b/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb index bb1e7528ee..4ff0d26219 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb @@ -13,7 +13,7 @@ PV = "2.0.4+git${SRCPV}" SRCREV = "63ec47c5e295ad4f09d1df6d92afb7e10c3fec39" SRC_URI = " \ - git://git.openbox.org/dana/obconf \ + git://git.openbox.org/dana/obconf;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb index 9f610ef737..0533f9262a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" DEPENDS = "libpng tiff lcms zlib" SRC_URI = " \ - git://github.com/uclouvain/openjpeg.git \ + git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ file://0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb index 4c02cc55af..52723d7af1 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb @@ -1,7 +1,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4f59d6446bf2e004e80df1a0937129fa" -SRC_URI = "git://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git;protocol=https \ +SRC_URI = "git://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git;protocol=https;branch=master \ file://0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb index 3eb23dc0fa..defaaeea79 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SRCREV = "715e29fd4cd71b6e452ae0f4e36d917b43122ce8" -SRC_URI = "git://github.com/fukuchi/libqrencode.git" +SRC_URI = "git://github.com/fukuchi/libqrencode.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb index be5b6013f6..0bc03941fa 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5486c0df458c74c85828e0cdbffd499e" SRCREV = "cc05b288b6d1660ab04c6cf01173f1bb62e6f5dd" SRC_URI = " \ - git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \ + git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x;protocol=https \ file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb b/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb index b787972da6..bf0a5947b0 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb @@ -6,7 +6,7 @@ SECTION = "graphics" S = "${WORKDIR}/git" SRCREV = "ed16b3e69985feaf565efbecea70a1cc2fca2a58" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Cross.git \ +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Cross.git;branch=master;protocol=https \ file://0001-Add-install-PHONY-target-in-Makefile.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.1.bb b/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.1.bb index 710ed9bce9..51c14624af 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.1.bb @@ -9,16 +9,20 @@ DEPENDS = "webkitgtk gtk+3 glib-2.0 gcr" REQUIRED_DISTRO_FEATURES = "x11 opengl" +SRCREV = "bcd7d74e613fb8af11b40c351f0a6c1a771b2d2b" SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \ - file://0001-config.mk-Fix-compiler-and-linker.patch \ - file://0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch \ " -SRCREV = "bcd7d74e613fb8af11b40c351f0a6c1a771b2d2b" +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'soup3', 'file://0001-config.mk-Fix-compiler-and-linke,ig.ml-make-compatible-with-webkitgtk-2.34.0.patch', '', d)}" S = "${WORKDIR}/git" inherit pkgconfig features_check +PACKAGECONFIG ?= "" + +# Enable if soup3 is enabled in webkit recipe +PACKAGECONFIG[soup3] = ",,," + TARGET_CC_ARCH += "${LDFLAGS}" do_install () { diff --git a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb index dea579c4f9..3a3068f73a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV = "4767ea922bcc460e70b87b1d303ebdfed0897da8" -SRC_URI = "git://github.com/tesseract-ocr/tessdata.git" +SRC_URI = "git://github.com/tesseract-ocr/tessdata.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_4.1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_4.1.3.bb index 7856fabb5b..6f92679682 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_4.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_4.1.3.bb @@ -6,8 +6,8 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" BRANCH = "4.1" -SRCREV = "f4ef2f2050f4c25b28bdbf0063b7d2eb30f41cf7" -SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=${BRANCH} \ +SRCREV = "f38e7a7ba850b668d4505dd4c712238d7ec63ca8" +SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=${BRANCH};protocol=https \ file://0001-include-sys-time.h.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb index e7673c58da..a946d92ff7 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb @@ -17,7 +17,7 @@ B = "${S}" SRCREV = "540bfc3278e396321124d4b18a798ac2bc18b6ca" -SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch \ +SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch;protocol=https \ file://0002-do-not-build-tests-sub-directory.patch \ file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \ file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb index 4cec02db9f..7fa155a22f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb @@ -8,7 +8,7 @@ SRCREV = "21e6e2de1f0062f949fcc52d0b4559dfa3246e0e" PV = "0.1+gitr${SRCPV}" PR = "r3" -SRC_URI = "git://github.com/android/platform_frameworks_base.git;branch=master" +SRC_URI = "git://github.com/android/platform_frameworks_base.git;branch=master;protocol=https" S = "${WORKDIR}/git/data/fonts" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.92.1.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.92.1.bb index f72b8b6fe7..8340cccbb4 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.92.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.92.1.bb @@ -8,7 +8,7 @@ LICENSE = "OFL-1.1" LIC_FILES_CHKSUM = "file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402" SRCREV = "a403c9b7f509dad5e58dde85ef63b1c36fde3a21" -SRC_URI = "git://github.com/pravins/lohit.git;branch=master" +SRC_URI = "git://github.com/pravins/lohit.git;branch=master;protocol=https" DEPENDS = "fontforge-native" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb index 8a6b6f8142..f3602f1947 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb @@ -5,7 +5,7 @@ AUTHOR = "Ingo Bürk" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b25d2c4cca175f44120d1b8e67cb358d" -SRC_URI = "git://github.com/Airblader/unclutter-xfixes.git \ +SRC_URI = "git://github.com/Airblader/unclutter-xfixes.git;branch=master;protocol=https \ file://0001-build-use-autotools.patch" SRCREV = "160ae3760a51126eb225ce77d83e4706eccd4ed9" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb index 64dd3ea785..2c08ff3ec6 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=83af8811a28727a13f04132cc33b7f58" DEPENDS = "virtual/libx11 libxext xorgproto" SRCREV = "c3d1a9dbafdfe6144ff474d0d523dc01b068750f" -SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau" +SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 1faee4d3a1..7d73bfbf31 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "\ git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \ git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;branch=main \ - git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang \ - git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers \ - git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools \ + git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;branch=master \ + git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;branch=master \ + git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;branch=master \ https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb index 21b20f42fa..0a7af92da0 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRCREV = "87cd0530f438372dda3c70bb491a6fd19f09acc2" PV .= "+git${SRCPV}" -SRC_URI = "git://github.com/LibVNC/x11vnc \ +SRC_URI = "git://github.com/LibVNC/x11vnc;branch=master;protocol=https \ file://starting-fix.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb index 3b7bbd138b..404df4ee99 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" DEPENDS += "virtual/libx11 libdrm xorgproto" SRCREV = "8bbdb2ae3bb8ef649999a8da33ddbe11a04763b8" -SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-armsoc" +SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-armsoc;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-ati-cleanup-terminology-to-use-primary-secondary.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-ati-cleanup-terminology-to-use-primary-secondary.patch new file mode 100644 index 0000000000..cda2c2f146 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-ati-cleanup-terminology-to-use-primary-secondary.patch @@ -0,0 +1,369 @@ +From 6e035c007876ffe972a497681dd3debdc806e979 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Mon, 13 Jul 2020 09:11:28 +1000 +Subject: [PATCH] ati: cleanup terminology to use primary/secondary + +The X server changed some API/ABIs here. + +Based on amdgpu patch by Michel +--- +Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680.patch] +man/radeon.man | 2 +- + src/compat-api.h | 6 ++++ + src/drmmode_display.c | 4 +-- + src/evergreen_state.h | 2 +- + src/r600_state.h | 2 +- + src/radeon.h | 10 +++--- + src/radeon_exa.c | 2 +- + src/radeon_glamor.c | 2 +- + src/radeon_kms.c | 74 +++++++++++++++++++++---------------------- + 9 files changed, 55 insertions(+), 49 deletions(-) + +diff --git a/man/radeon.man b/man/radeon.man +index dcebf53..247dcdb 100644 +--- a/man/radeon.man ++++ b/man/radeon.man +@@ -290,7 +290,7 @@ on. If this option is set, the default value of the property is 'on' or 'off' + accordingly. If this option isn't set, the default value of the property is + .B auto, + which means that TearFree is on for rotated outputs, outputs with RandR +-transforms applied and for RandR 1.4 slave outputs, otherwise off. ++transforms applied and for RandR 1.4 secondary outputs, otherwise off. + .TP + .BI "Option \*qAccelMethod\*q \*q" "string" \*q + Chooses between available acceleration architectures. Valid values are +diff --git a/src/compat-api.h b/src/compat-api.h +index f4e7524..def6d3e 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -34,4 +34,10 @@ + #define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask + #endif + ++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) ++#define current_primary current_master ++#define primary_pixmap master_pixmap ++#define secondary_dst slave_dst ++#endif ++ + #endif +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index 0e9e247..3dec91e 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -720,7 +720,7 @@ drmmode_crtc_prime_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode, + xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, + ent) { + if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { +- dirty->slave_dst = ++ dirty->secondary_dst = + drmmode_crtc->scanout[scanout_id].pixmap; + break; + } +@@ -1356,7 +1356,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix) + + xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) { + if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { +- PixmapStopDirtyTracking(dirty->src, dirty->slave_dst); ++ PixmapStopDirtyTracking(dirty->src, dirty->secondary_dst); + break; + } + } +diff --git a/src/evergreen_state.h b/src/evergreen_state.h +index 7e54e1c..34ba87b 100644 +--- a/src/evergreen_state.h ++++ b/src/evergreen_state.h +@@ -350,7 +350,7 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, + int *new_pitch); + extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv); + extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix); +-extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p); ++extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p); + extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle); + + #endif +diff --git a/src/r600_state.h b/src/r600_state.h +index 3434599..567c3ca 100644 +--- a/src/r600_state.h ++++ b/src/r600_state.h +@@ -321,6 +321,6 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, + int *new_pitch); + extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv); + extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix); +-extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p); ++extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p); + extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle); + #endif +diff --git a/src/radeon.h b/src/radeon.h +index 2c91346..85fd021 100644 +--- a/src/radeon.h ++++ b/src/radeon.h +@@ -182,18 +182,18 @@ typedef enum { + + + static inline ScreenPtr +-radeon_master_screen(ScreenPtr screen) ++radeon_primary_screen(ScreenPtr screen) + { +- if (screen->current_master) +- return screen->current_master; ++ if (screen->current_primary) ++ return screen->current_primary; + + return screen; + } + + static inline ScreenPtr +-radeon_dirty_master(PixmapDirtyUpdatePtr dirty) ++radeon_dirty_primary(PixmapDirtyUpdatePtr dirty) + { +- return radeon_master_screen(dirty->slave_dst->drawable.pScreen); ++ return radeon_primary_screen(dirty->secondary_dst->drawable.pScreen); + } + + static inline DrawablePtr +diff --git a/src/radeon_exa.c b/src/radeon_exa.c +index 268155e..320ff99 100644 +--- a/src/radeon_exa.c ++++ b/src/radeon_exa.c +@@ -282,7 +282,7 @@ void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv) + free(driverPriv); + } + +-Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **fd_handle) ++Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr seconndary, void **fd_handle) + { + struct radeon_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(ppix); + +diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c +index f109838..ccf9994 100644 +--- a/src/radeon_glamor.c ++++ b/src/radeon_glamor.c +@@ -366,7 +366,7 @@ radeon_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap) + + + static Bool +-radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave, ++radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary, + void **handle_p) + { + ScreenPtr screen = pixmap->drawable.pScreen; +diff --git a/src/radeon_kms.c b/src/radeon_kms.c +index b3db7c4..62962d6 100644 +--- a/src/radeon_kms.c ++++ b/src/radeon_kms.c +@@ -559,8 +559,8 @@ dirty_region(PixmapDirtyUpdatePtr dirty) + if (dirty->rotation != RR_Rotate_0) { + dstregion = transform_region(damageregion, + &dirty->f_inverse, +- dirty->slave_dst->drawable.width, +- dirty->slave_dst->drawable.height); ++ dirty->secondary_dst->drawable.width, ++ dirty->secondary_dst->drawable.height); + } else + #endif + { +@@ -568,7 +568,7 @@ dirty_region(PixmapDirtyUpdatePtr dirty) + + dstregion = RegionDuplicate(damageregion); + RegionTranslate(dstregion, -dirty->x, -dirty->y); +- PixmapRegionInit(&pixregion, dirty->slave_dst); ++ PixmapRegionInit(&pixregion, dirty->secondary_dst); + RegionIntersect(dstregion, dstregion, &pixregion); + RegionUninit(&pixregion); + } +@@ -585,8 +585,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region) + if (RegionNil(region)) + goto out; + +- if (dirty->slave_dst->master_pixmap) +- DamageRegionAppend(&dirty->slave_dst->drawable, region); ++ if (dirty->secondary_dst->primary_pixmap) ++ DamageRegionAppend(&dirty->secondary_dst->drawable, region); + + #ifdef HAS_DIRTYTRACKING_ROTATION + PixmapSyncDirtyHelper(dirty); +@@ -595,8 +595,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region) + #endif + + radeon_cs_flush_indirect(src_scrn); +- if (dirty->slave_dst->master_pixmap) +- DamageRegionProcessPending(&dirty->slave_dst->drawable); ++ if (dirty->secondary_dst->primary_pixmap) ++ DamageRegionProcessPending(&dirty->secondary_dst->drawable); + + out: + DamageEmpty(dirty->damage); +@@ -613,12 +613,12 @@ radeon_prime_scanout_update_abort(xf86CrtcPtr crtc, void *event_data) + void + radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) + { +- ScreenPtr master_screen = radeon_dirty_master(dirty); ++ ScreenPtr primary_screen = radeon_dirty_primary(dirty); + PixmapDirtyUpdatePtr ent; + RegionPtr region; + +- xorg_list_for_each_entry(ent, &master_screen->pixmap_dirty_list, ent) { +- if (!radeon_dirty_src_equals(dirty, ent->slave_dst)) ++ xorg_list_for_each_entry(ent, &primary_screen->pixmap_dirty_list, ent) { ++ if (!radeon_dirty_src_equals(dirty, ent->secondary_dst)) + continue; + + region = dirty_region(ent); +@@ -631,45 +631,45 @@ radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) + #if HAS_SYNC_SHARED_PIXMAP + + static Bool +-master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) ++primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) + { +- ScreenPtr master_screen = radeon_dirty_master(dirty); ++ ScreenPtr primary_screen = radeon_dirty_primary(dirty); + +- return !!master_screen->SyncSharedPixmap; ++ return !!primary_screen->SyncSharedPixmap; + } + + static Bool +-slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) ++secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) + { +- ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen; ++ ScreenPtr secondary_screen = dirty->secondary_dst->drawable.pScreen; + +- return !!slave_screen->SyncSharedPixmap; ++ return !!secondary_screen->SyncSharedPixmap; + } + + static void + call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) + { +- ScreenPtr master_screen = radeon_dirty_master(dirty); ++ ScreenPtr primary_screen = radeon_dirty_primary(dirty); + +- master_screen->SyncSharedPixmap(dirty); ++ primary_screen->SyncSharedPixmap(dirty); + } + + #else /* !HAS_SYNC_SHARED_PIXMAP */ + + static Bool +-master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) ++primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) + { +- ScrnInfoPtr master_scrn = xf86ScreenToScrn(radeon_dirty_master(dirty)); ++ ScrnInfoPtr primary_scrn = xf86ScreenToScrn(radeon_dirty_primary(dirty)); + +- return master_scrn->driverName == scrn->driverName; ++ return primary_scrn->driverName == scrn->driverName; + } + + static Bool +-slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) ++secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) + { +- ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen); ++ ScrnInfoPtr secondary_scrn = xf86ScreenToScrn(dirty->secondary_dst->drawable.pScreen); + +- return slave_scrn->driverName == scrn->driverName; ++ return secondary_scrn->driverName == scrn->driverName; + } + + static void +@@ -684,12 +684,12 @@ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) + static xf86CrtcPtr + radeon_prime_dirty_to_crtc(PixmapDirtyUpdatePtr dirty) + { +- ScreenPtr screen = dirty->slave_dst->drawable.pScreen; ++ ScreenPtr screen = dirty->secondary_dst->drawable.pScreen; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); + int c; + +- /* Find the CRTC which is scanning out from this slave pixmap */ ++ /* Find the CRTC which is scanning out from this secondary pixmap */ + for (c = 0; c < xf86_config->num_crtc; c++) { + xf86CrtcPtr xf86_crtc = xf86_config->crtc[c]; + drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private; +@@ -714,7 +714,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id) + if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { + RegionPtr region; + +- if (master_has_sync_shared_pixmap(scrn, dirty)) ++ if (primary_has_sync_shared_pixmap(scrn, dirty)) + call_sync_shared_pixmap(dirty); + + region = dirty_region(dirty); +@@ -727,7 +727,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id) + radeon_cs_flush_indirect(scrn); + RegionCopy(&drmmode_crtc->scanout_last_region, region); + RegionTranslate(region, -crtc->x, -crtc->y); +- dirty->slave_dst = drmmode_crtc->scanout[scanout_id].pixmap; ++ dirty->secondary_dst = drmmode_crtc->scanout[scanout_id].pixmap; + } + + redisplay_dirty(dirty, region); +@@ -754,7 +754,7 @@ radeon_prime_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t u + static void + radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty) + { +- ScreenPtr screen = dirty->slave_dst->drawable.pScreen; ++ ScreenPtr screen = dirty->secondary_dst->drawable.pScreen; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); + xf86CrtcPtr xf86_crtc = radeon_prime_dirty_to_crtc(dirty); +@@ -818,7 +818,7 @@ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty) + static void + radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent) + { +- ScreenPtr screen = ent->slave_dst->drawable.pScreen; ++ ScreenPtr screen = ent->secondary_dst->drawable.pScreen; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); + xf86CrtcPtr crtc = radeon_prime_dirty_to_crtc(ent); +@@ -893,11 +893,11 @@ radeon_dirty_update(ScrnInfoPtr scrn) + if (screen->isGPU) { + PixmapDirtyUpdatePtr region_ent = ent; + +- if (master_has_sync_shared_pixmap(scrn, ent)) { +- ScreenPtr master_screen = radeon_dirty_master(ent); ++ if (primary_has_sync_shared_pixmap(scrn, ent)) { ++ ScreenPtr primary_screen = radeon_dirty_primary(ent); + +- xorg_list_for_each_entry(region_ent, &master_screen->pixmap_dirty_list, ent) { +- if (radeon_dirty_src_equals(ent, region_ent->slave_dst)) ++ xorg_list_for_each_entry(region_ent, &primary_screen->pixmap_dirty_list, ent) { ++ if (radeon_dirty_src_equals(ent, region_ent->secondary_dst)) + break; + } + } +@@ -921,7 +921,7 @@ radeon_dirty_update(ScrnInfoPtr scrn) + + RegionDestroy(region); + } else { +- if (slave_has_sync_shared_pixmap(scrn, ent)) ++ if (secondary_has_sync_shared_pixmap(scrn, ent)) + continue; + + region = dirty_region(ent); +@@ -1216,7 +1216,7 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL) + (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS); + pScreen->BlockHandler = RADEONBlockHandler_KMS; + +- if (!xf86ScreenToScrn(radeon_master_screen(pScreen))->vtSema) ++ if (!xf86ScreenToScrn(radeon_primary_screen(pScreen))->vtSema) + return; + + if (!pScreen->isGPU) +@@ -2584,7 +2584,7 @@ CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, pointer data) + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); + int c; + +- if (xf86ScreenToScrn(radeon_master_screen(screen))->vtSema) ++ if (xf86ScreenToScrn(radeon_primary_screen(screen))->vtSema) + return 0; + + /* Unreference the all-black FB created by RADEONLeaveVT_KMS. After +-- +2.33.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.1.0.bb index 3ba28d9a83..c8ce77ab88 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.1.0.bb @@ -12,12 +12,12 @@ DEPENDS += "virtual/libx11 libxvmc drm \ inherit features_check REQUIRED_DISTRO_FEATURES += "opengl" -SRC_URI += "file://0001-Fix-link-failure-with-gcc-10.patch" +SRC_URI += "file://0001-Fix-link-failure-with-gcc-10.patch \ + file://0001-ati-cleanup-terminology-to-use-primary-secondary.patch \ + " +SRC_URI[sha256sum] = "659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49" -SRC_URI[md5sum] = "47eccf71823206ade9629cba69de7ef6" -SRC_URI[sha256sum] = "5cb6015d8664546ad1311bc9c363d7bc41ebf60e7046ceb44dd38e5b707961b0" - -EXTRA_OECONF += "--disable-glamor" +#EXTRA_OECONF += "--disable-glamor" RDEPENDS:${PN} += "xserver-xorg-module-exa" RRECOMMENDS:${PN} += "linux-firmware-radeon" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch new file mode 100644 index 0000000000..e49c99574e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch @@ -0,0 +1,66 @@ +From 7ae2f6ba4cbf29fc3f1b08579b838679a3301cb3 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Mon, 13 Jul 2020 09:20:15 +1000 +Subject: [PATCH] nouveau: fixup driver for new X server ABI + +Upstream-Status: Backport [https://cgit.freedesktop.org/nouveau/xf86-video-nouveau/commit/?id=e80e73ced69b15662103d0fd6837db4ce6c6eb5b] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/compat-api.h | 4 ++++ + src/nouveau_exa.c | 2 +- + src/nv_driver.c | 6 +++--- + 3 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/compat-api.h b/src/compat-api.h +index fde2f4b..8a1fcf9 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -102,4 +102,8 @@ + + #endif + ++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) ++#define secondary_dst slave_dst ++#endif ++ + #endif +diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c +index 55df6f8..db3b112 100644 +--- a/src/nouveau_exa.c ++++ b/src/nouveau_exa.c +@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv) + + #ifdef NOUVEAU_PIXMAP_SHARING + static Bool +-nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p) ++nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p) + { + struct nouveau_bo *bo = nouveau_pixmap_bo(ppix); + struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix); +diff --git a/src/nv_driver.c b/src/nv_driver.c +index e72a6b6..f9ab4af 100644 +--- a/src/nv_driver.c ++++ b/src/nv_driver.c +@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) + { + RegionRec pixregion; + +- PixmapRegionInit(&pixregion, dirty->slave_dst); ++ PixmapRegionInit(&pixregion, dirty->secondary_dst); + +- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); ++ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion); + #ifdef HAS_DIRTYTRACKING_ROTATION + PixmapSyncDirtyHelper(dirty); + #else + PixmapSyncDirtyHelper(dirty, &pixregion); + #endif + +- DamageRegionProcessPending(&dirty->slave_dst->drawable); ++ DamageRegionProcessPending(&dirty->secondary_dst->drawable); + RegionUninit(&pixregion); + } + +-- +2.33.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.17.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.17.bb index d9d09a242f..d471610bab 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.17.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.17.bb @@ -15,4 +15,5 @@ REQUIRED_DISTRO_FEATURES += "opengl" COMPATIBLE_HOST = '(i.86|x86_64).*-linux' +SRC_URI += "file://0001-nouveau-fixup-driver-for-new-X-server-ABI.patch" SRC_URI[sha256sum] = "499322e27a55c8183166bf2dd1e47d085eb834143e0d7036baba8427b90c156b" diff --git a/meta-openembedded/meta-oe/recipes-graphics/yad/yad_6.0.bb b/meta-openembedded/meta-oe/recipes-graphics/yad/yad_6.0.bb index 6ede557c7c..029d79316b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/yad/yad_6.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/yad/yad_6.0.bb @@ -5,7 +5,7 @@ AUTHOR = "Victor Ananjevsky" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "git://github.com/v1cont/yad.git" +SRC_URI = "git://github.com/v1cont/yad.git;branch=master;protocol=https" SRCREV = "a5b1a7a3867bc7dffbbc539f586f301687b6ec02" inherit autotools gsettings features_check pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb b/meta-openembedded/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb index 2eb19206d3..57232f8d5f 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb @@ -10,7 +10,7 @@ EXTRA_OEMAKE = "'CC=${CC}'" SRCREV = "468fe4c31e6c62c9bbb328b06ba71eaf7be0b76a" -SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git;protocol=git \ +SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git;protocol=git;branch=master \ file://0001-Makefile-Add-LDFLAGS-variable.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb b/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb index bc00e3d326..e135b05c82 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb @@ -9,7 +9,7 @@ LICENSE = "Firmware-Broadcom-WIDCOMM" NO_GENERIC_LICENSE[Firmware-Broadcom-WIDCOMM] = "LICENSE.broadcom_bcm20702" LIC_FILES_CHKSUM = "file://LICENSE.broadcom_bcm20702;md5=c0d5ea0502b00df74173d0f8a48b619d" -SRC_URI = "git://github.com/winterheart/broadcom-bt-firmware.git" +SRC_URI = "git://github.com/winterheart/broadcom-bt-firmware.git;branch=master;protocol=https" SRCREV = "1af1116f73782951bd7bbe2139928e497c3a634b" PE = "1" diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.3.0.bb b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.3.0.bb index 4b228bbd9f..35de3c5c34 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.3.0.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING3;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "zlib readline coreutils-native ncurses-native" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/crash-utility/${BPN}.git \ +SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=https \ ${GNU_MIRROR}/gdb/gdb-7.6.tar.gz;name=gdb;subdir=git \ file://7001force_define_architecture.patch \ file://7003cross_ranlib.patch \ diff --git a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb index e3c74a5162..3337fe5006 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb @@ -37,6 +37,9 @@ SRC_URI[sha256sum] = "0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8 inherit autotools +PACKAGES =+ "${PN}-ipmievd" +FILES:${PN}-ipmievd += "${sbindir}/ipmievd" + # --disable-dependency-tracking speeds up the build # --enable-file-security adds some security checks # --disable-intf-free disables FreeIPMI support - we don't want to depend on diff --git a/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch.inc b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch.inc index 9e626179f5..13c4549211 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch.inc +++ b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch.inc @@ -3,7 +3,7 @@ DESCRIPTION = "kpatch is a Linux dynamic kernel patching infrastructure which al LICENSE = "GPLv2 & LGPLv2" DEPENDS = "elfutils bash" -SRC_URI = "git://github.com/dynup/kpatch.git;protocol=https \ +SRC_URI = "git://github.com/dynup/kpatch.git;protocol=https;branch=master \ file://0001-kpatch-build-add-cross-compilation-support.patch \ file://0002-kpatch-build-allow-overriding-of-distro-name.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.5.0.bb b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.5.0.bb index 7ce7234528..4a3b834c79 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.5.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238 DEPENDS = "zlib elfutils" -SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https" +SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=master" SRCREV = "5579664205e42194e1921d69d0839f660c801a4d" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch index 2b108ab6c9..1dd87c8b11 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch @@ -13,9 +13,12 @@ Subject: [PATCH] makedumpfile: replace hardcode CFLAGS Upstream-Status: Inappropriate[oe specific] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> + +[2021-11-18] Patch updated to use CFLAGS_COMMON for zstd +Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> --- - Makefile | 45 +++++++++++++++++++++++---------------------- - 1 file changed, 23 insertions(+), 22 deletions(-) + Makefile | 47 ++++++++++++++++++++++++----------------------- + 1 file changed, 24 insertions(+), 23 deletions(-) --- a/Makefile +++ b/Makefile @@ -94,7 +97,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> endif ifeq ($(USESNAPPY), on) -@@ -65,7 +66,7 @@ LIBS := -lsnappy $(LIBS) +@@ -65,12 +66,12 @@ LIBS := -lsnappy $(LIBS) ifneq ($(LINKTYPE), dynamic) LIBS := $(LIBS) -lstdc++ endif @@ -102,8 +105,14 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +CFLAGS_COMMON += -DUSESNAPPY endif - LIBS := $(LIBS) -lpthread -@@ -90,14 +91,14 @@ LIBS := $(LIBS) $(call try-run,\ + ifeq ($(USEZSTD), on) + LIBS := -lzstd $(LIBS) +-CFLAGS += -DUSEZSTD ++CFLAGS_COMMON += -DUSEZSTD + endif + + ifeq ($(DEBUG), on) +@@ -104,14 +105,14 @@ LIBS := $(LIBS) $(call try-run,\ all: makedumpfile $(OBJ_PART): $(SRC_PART) @@ -120,7 +129,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8 grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8 mv temp.8 makedumpfile.8 -@@ -108,7 +109,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $( +@@ -122,7 +123,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $( gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz eppic_makedumpfile.so: extension_eppic.c diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch deleted file mode 100644 index f46fb3117a..0000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 9045b72bdb703bf58a6586d77461eea8f59f50f7 Mon Sep 17 00:00:00 2001 -From: Alexandru Moise <alexandru.moise@windriver.com> -Date: Fri, 29 Apr 2016 07:40:46 +0000 -Subject: [PATCH] mem_section: Support only 46 bit for MAX_PHYSMEM_BITS on - PPC64 - -Related to change: -http://lists.infradead.org/pipermail/kexec/2013-January/007849.html - -Linux on PPC64 has supported only 46 bit MAX_PHYSMEM_BITS since commit: -048ee0993ec8360abb0b51bdf8f8721e9ed62ec4 - -Also remove set_ppc64_max_physmem_bits and set info->max_physmem_bits in -get_machdep_info_ppc64 instead. set_ppc64_max_physmem_bits is broken -for all kernels compiled with CONFIG_SPARSEMEM=n. makedumpfile is -unable to get mem_section field from powerpc kernel since commit: -fd59d231f81cb02870b9cf15f456a897f3669b4e - -Upstream-Status: Pending - -Signed-off-by: Alexandru Moise <alexandru.moise@windriver.com> -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> - -[hqBai: adjusted patch for context, no logical change] -Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - arch/ppc64.c | 38 ++------------------------------------ - 1 file changed, 2 insertions(+), 36 deletions(-) - ---- a/arch/ppc64.c -+++ b/arch/ppc64.c -@@ -462,44 +462,6 @@ ppc64_vtop_level4(unsigned long vaddr) - return paddr; - } - --int --set_ppc64_max_physmem_bits(void) --{ -- long array_len = ARRAY_LENGTH(mem_section); -- -- /* Check if we can get MAX_PHYSMEM_BITS from vmcoreinfo */ -- if (NUMBER(MAX_PHYSMEM_BITS) != NOT_FOUND_NUMBER) { -- info->max_physmem_bits = NUMBER(MAX_PHYSMEM_BITS); -- return TRUE; -- } -- -- /* -- * The older ppc64 kernels uses _MAX_PHYSMEM_BITS as 42 and the -- * newer kernels 3.7 onwards uses 46 bits. -- */ -- -- info->max_physmem_bits = _MAX_PHYSMEM_BITS_ORIG ; -- if ((array_len == (NR_MEM_SECTIONS() / _SECTIONS_PER_ROOT_EXTREME())) -- || (array_len == (NR_MEM_SECTIONS() / _SECTIONS_PER_ROOT()))) -- return TRUE; -- -- info->max_physmem_bits = _MAX_PHYSMEM_BITS_3_7; -- if ((array_len == (NR_MEM_SECTIONS() / _SECTIONS_PER_ROOT_EXTREME())) -- || (array_len == (NR_MEM_SECTIONS() / _SECTIONS_PER_ROOT()))) -- return TRUE; -- -- info->max_physmem_bits = _MAX_PHYSMEM_BITS_4_19; -- if ((array_len == (NR_MEM_SECTIONS() / _SECTIONS_PER_ROOT_EXTREME())) -- || (array_len == (NR_MEM_SECTIONS() / _SECTIONS_PER_ROOT()))) -- return TRUE; -- -- info->max_physmem_bits = _MAX_PHYSMEM_BITS_4_20; -- if ((array_len == (NR_MEM_SECTIONS() / _SECTIONS_PER_ROOT_EXTREME())) -- || (array_len == (NR_MEM_SECTIONS() / _SECTIONS_PER_ROOT()))) -- return TRUE; -- -- return FALSE; --} - - int - get_machdep_info_ppc64(void) -@@ -507,10 +469,8 @@ get_machdep_info_ppc64(void) - unsigned long vmlist, vmap_area_list, vmalloc_start; - - info->section_size_bits = _SECTION_SIZE_BITS; -- if (!set_ppc64_max_physmem_bits()) { -- ERRMSG("Can't detect max_physmem_bits.\n"); -- return FALSE; -- } -+ info->max_physmem_bits = _MAX_PHYSMEM_BITS_3_7; -+ - info->page_offset = __PAGE_OFFSET; - - if (SYMBOL(_stext) == NOT_FOUND_SYMBOL) { diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.9.bb b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.0.bb index cf34d34d93..e703ee71b7 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.9.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.0.bb @@ -11,22 +11,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LICENSE = "GPLv2.0" SRCBRANCH ?= "master" -SRCREV = "a9ad811c15e769c8e6d8d915a05cebc32f2ea2f5" +SRCREV = "06ef8e2b814feb08a668b7a3783c86674e49a7b1" DEPENDS = "bzip2 zlib elfutils xz" RDEPENDS:${PN}-tools = "perl ${PN}" -# arm and aarch64 would compile but has never been tested upstream. mips would not compile. -# +# mips would not compile. COMPATIBLE_HOST = "(x86_64|i.86|powerpc|arm|aarch64).*-linux" PACKAGES =+ "${PN}-tools" FILES:${PN}-tools = "${bindir}/*.pl" SRC_URI = "\ - git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH} \ + git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH};protocol=https \ file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ - file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ " S = "${WORKDIR}/git" @@ -47,6 +45,7 @@ EXTRA_OEMAKE = "\ PACKAGECONFIG ??= "" PACKAGECONFIG[lzo] = "USELZO=on,USELZO=off,lzo" PACKAGECONFIG[snappy] = "USESNAPPY=on,USESNAPPY=off,snappy" +PACKAGECONFIG[zstd] = "USEZSTD=on,USEZSTD=off,zstd" do_install () { mkdir -p ${D}/usr/bin diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb index 1b578d33bb..887390c8b8 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb @@ -13,7 +13,7 @@ SRCREV = "16a0d44f1725eaa93096eaa0e086f42ef4c2712c" PR .= "+git${SRCPV}" -SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https \ +SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https;branch=master \ file://0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch \ file://minicoredumper.service \ file://minicoredumper.init \ diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb index 06a02bb1c3..0562f31112 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb @@ -6,7 +6,7 @@ LICENSE = "GPL-2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6" -SRC_URI = "git://github.com/intel/pm-graph.git \ +SRC_URI = "git://github.com/intel/pm-graph.git;branch=master;protocol=https \ file://0001-Makefile-fix-multilib-build-failure.patch \ file://0001-sleepgraph.py-use-python3.patch \ file://0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch \ diff --git a/meta-openembedded/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb b/meta-openembedded/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb new file mode 100644 index 0000000000..a2b0dea550 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb @@ -0,0 +1,69 @@ +# Recipe for building userspace part of USB/IP +# +# Started with work from chuck kamas - 2021-11-05 +# https://lists.yoctoproject.org/g/yocto/topic/86249103?p=,,,20,0,0,0::recentpostdate/sticky,,,20,0,0,86249103 +# Though have rewritten all the logic to be much simpler +# +# SPDX-License-Identifier: MIT +# +# Author(s) +# clst@ambu.com (Claus Stovgaard) +# + +SUMMARY = "userspace usbip from Linux kernel tools" +DESCRIPTION = " USB/IP protocol allows to pass USB device from server to \ +client over the network. Server is a machine which provides (shares) a \ +USB device. Client is a machine which uses USB device provided by server \ +over the network. The USB device may be either physical device connected \ +to a server or software entity created on a server using USB gadget subsystem." + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" +DEPENDS = "virtual/kernel udev" +PROVIDES = "virtual/usbip-tools" + +inherit kernelsrc autotools-brokensep + +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +# We need to set S, for not being set to STAGING_KERNEL_DIR, and by that +# be wiped when we prune dest below. We just set it to usbip-tools-1.0 +S = "${WORKDIR}/${BP}" + +# Copy the source files from KERNEL/tools/usb/usbip to ${S} +do_configure[prefuncs] += "copy_usbip_source_from_kernel" +python copy_usbip_source_from_kernel() { + dir_in_kernel = "tools/usb/usbip" + src_dir = d.getVar("STAGING_KERNEL_DIR") + src = oe.path.join(src_dir, dir_in_kernel) + dest = d.getVar("S") + bb.utils.mkdirhier(dest) + bb.utils.prunedir(dest) + # copy src to dest folder + if not os.path.exists(src): + bb.fatal("Path does not exist: %s. Maybe dir_in_kernel does not match the kernel version." % src) + if os.path.isdir(src): + oe.path.copyhardlinktree(src, dest) + else: + src_path = os.path.dirname(src) + os.makedirs(os.path.join(dest,src_path),exist_ok=True) + bb.utils.copyfile(src, dest) +} + +# Use local scripts before relying on inherited autotools +do_configure () { + # We are in ${B} - equal to ${S}, so just run the scripts + ./cleanup.sh || bbnote "${PN} failed to cleanup.sh" + ./autogen.sh || bbnote "${PN} failed to autogen.sh" + oe_runconf +} + +# As usbip integrate with the kernel module, we set this package to be build specific for +# this machine, and not generally for the architecture +PACKAGE_ARCH = "${MACHINE_ARCH}" + +# Even though the libusbip is set to version 0.0.1, set the package version to match kernel +# e.g. usbip-tools-5.14.21-r0.qemux86_64.rpm for qemu package using kernel 5.14.21 +python do_package:prepend() { + d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0]) +}
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index c89204062e..e9841e483e 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb @@ -23,6 +23,8 @@ inherit cmake DEPENDS = "libcap file bzip2" RDEPENDS:dirsplit = "perl" +RDEPENDS:${PN}-dev = "" + PACKAGES =+ "dirsplit genisoimage icedax wodim" FILES:dirsplit = " \ diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb index 1351dc4e17..fa4da18c8c 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb @@ -11,7 +11,7 @@ DEPENDS:append:libc-musl = " libexecinfo" SRCREV = "de37569c926c5886768f892c019e3f0468615038" SRC_URI = " \ - git://github.com/linuxaudio/a2jmidid;protocol=https \ + git://github.com/linuxaudio/a2jmidid;protocol=https;branch=master \ file://riscv_ucontext.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb index c4a271e922..8411cbaefb 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "libsamplerate0 libsndfile1 readline" -SRC_URI = "git://github.com/jackaudio/jack2.git \ +SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https \ file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \ " SRCREV = "3e6ca6b734b69e2f5dfb85935068e15006fb5acf" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb index 8b57c39e2d..0e62307363 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a42532a0684420bdb15556c3cdd49a75" DEPENDS = "enca fontconfig freetype libpng fribidi" -SRC_URI = "git://github.com/libass/libass.git" +SRC_URI = "git://github.com/libass/libass.git;branch=master;protocol=https" SRCREV = "73284b676b12b47e17af2ef1b430527299e10c17" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch new file mode 100644 index 0000000000..09e7dc3dfb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch @@ -0,0 +1,40 @@ +From e5e54be286bf6d8336b747503c803750bc674c57 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Oct 2021 01:28:18 -0700 +Subject: [PATCH] Fix a few -Werror=format-security errors with mvprintw() + +In all these places a non-constant is used as a format string which +compiler complains about. Fix by using "%s" as format. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/cdda-player.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/cdda-player.c b/src/cdda-player.c +index 69eddee..8834d60 100644 +--- a/src/cdda-player.c ++++ b/src/cdda-player.c +@@ -298,7 +298,7 @@ action(const char *psz_action) + psz_action); + else + snprintf(psz_action_line, sizeof(psz_action_line), "%s", "" ); +- mvprintw(LINE_ACTION, 0, psz_action_line); ++ mvprintw(LINE_ACTION, 0, "%s", psz_action_line); + clrtoeol(); + refresh(); + } +@@ -1029,10 +1029,10 @@ display_tracks(void) + } + if (sub.track == i) { + attron(A_STANDOUT); +- mvprintw(i_line++, 0, line); ++ mvprintw(i_line++, 0, "%s", line); + attroff(A_STANDOUT); + } else +- mvprintw(i_line++, 0, line); ++ mvprintw(i_line++, 0, "%s", line); + clrtoeol(); + } + } diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb index 2340132984..2becafb2a4 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb @@ -4,7 +4,9 @@ SECTION = "libs" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2 \ + file://0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch \ + " SRC_URI[md5sum] = "aa7629e8f73662a762f64c444b901055" SRC_URI[sha256sum] = "8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch new file mode 100644 index 0000000000..54f49f6f23 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch @@ -0,0 +1,40 @@ +From 91fcf66b9182c75cd2b96d88991d5a1c6307d4b4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 2 Aug 2017 16:27:52 +0300 +Subject: [PATCH] Fix gperf 3.1 incompatibility. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + compat.h | 2 +- + frametype.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/compat.h b/compat.h +index 8af71ec..b3d80d9 100644 +--- a/compat.h ++++ b/compat.h +@@ -34,7 +34,7 @@ struct id3_compat { + }; + + struct id3_compat const *id3_compat_lookup(register char const *, +- register unsigned int); ++ register size_t); + + int id3_compat_fixup(struct id3_tag *); + +diff --git a/frametype.h b/frametype.h +index dd064b2..b5b7593 100644 +--- a/frametype.h ++++ b/frametype.h +@@ -37,6 +37,6 @@ extern struct id3_frametype const id3_frametype_unknown; + extern struct id3_frametype const id3_frametype_obsolete; + + struct id3_frametype const *id3_frametype_lookup(register char const *, +- register unsigned int); ++ register size_t); + + # endif +-- +2.13.2 + diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch new file mode 100644 index 0000000000..10e089018c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch @@ -0,0 +1,34 @@ +libid3tag: patch for CVE-2004-2779 + +The patch comes from +https://sources.debian.org/patches/libid3tag/0.15.1b-13/10_utf16.dpatch + +Upstream-Status: Pending + +CVE: CVE-2004-2779 +CVE: CVE-2017-11551 + +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +diff -urNad libid3tag-0.15.1b/utf16.c /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c +--- libid3tag-0.15.1b/utf16.c 2006-01-13 15:26:29.000000000 +0100 ++++ /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c 2006-01-13 15:27:19.000000000 +0100 +@@ -282,5 +282,18 @@ + + free(utf16); + ++ if (end == *ptr && length % 2 != 0) ++ { ++ /* We were called with a bogus length. It should always ++ * be an even number. We can deal with this in a few ways: ++ * - Always give an error. ++ * - Try and parse as much as we can and ++ * - return an error if we're called again when we ++ * already tried to parse everything we can. ++ * - tell that we parsed it, which is what we do here. ++ */ ++ (*ptr)++; ++ } ++ + return ucs4; + } diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch new file mode 100644 index 0000000000..38d40c3632 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch @@ -0,0 +1,43 @@ +Upstream-Status: Inappropriate [configuration] + +Index: libid3tag-0.15.1b/Makefile.am +=================================================================== +--- libid3tag-0.15.1b.orig/Makefile.am 2009-07-29 09:29:20.000000000 +0100 ++++ libid3tag-0.15.1b/Makefile.am 2009-07-29 09:29:47.000000000 +0100 +@@ -27,6 +27,9 @@ + lib_LTLIBRARIES = libid3tag.la + include_HEADERS = id3tag.h + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = id3tag.pc ++ + ## From the libtool documentation on library versioning: + ## + ## CURRENT +Index: libid3tag-0.15.1b/configure.ac +=================================================================== +--- libid3tag-0.15.1b.orig/configure.ac 2009-07-29 09:27:15.000000000 +0100 ++++ libid3tag-0.15.1b/configure.ac 2009-07-29 09:27:45.000000000 +0100 +@@ -201,5 +201,5 @@ + dnl AC_SUBST(LTLIBOBJS) + + AC_CONFIG_FILES([Makefile msvc++/Makefile \ +- libid3tag.list]) ++ libid3tag.list id3tag.pc]) + AC_OUTPUT +Index: libid3tag-0.15.1b/id3tag.pc.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libid3tag-0.15.1b/id3tag.pc.in 2009-07-29 09:29:10.000000000 +0100 +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: id3tag ++Description: ID3 tag reading library ++Requires: ++Version: @VERSION@ ++Libs: -L${libdir} -lid3tag -lz ++Cflags: -I${includedir} diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch new file mode 100644 index 0000000000..1895748d1d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch @@ -0,0 +1,19 @@ +configure contains CFLAGS filtering code which was removing our prefix-map +flags. We need those to generate reproducible binaries. Allow them through. + +Upstream-Status: Pending +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +--- a/configure.ac ++++ b/configure.ac +@@ -99,6 +99,10 @@ do + -mno-cygwin) + shift + ;; ++ -fmacro-prefix-map*|-fdebug-prefix-map*|-ffile-prefix-map*) ++ CFLAGS="$CFLAGS $1" ++ shift ++ ;; + -m*) + arch="$arch $1" + shift diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch new file mode 100644 index 0000000000..2845fb1d3a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-Status: Submitted [https://sourceforge.net/tracker/?func=detail&aid=3599280&group_id=12349&atid=112349] + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd libid3tag-0.15.1b/configure.ac libid3tag-0.15.1b/configure.ac +--- libid3tag-0.15.1b/configure.ac 2004-01-24 01:22:46.000000000 +0200 ++++ libid3tag-0.15.1b/configure.ac 2013-01-03 06:41:02.734835014 +0200 +@@ -28,7 +28,7 @@ + +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + dnl System type. diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch new file mode 100644 index 0000000000..f0867b5f01 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch @@ -0,0 +1,39 @@ +In case of an unknown/invalid encoding, id3_parse_string() will +return NULL, but the return value wasn't checked resulting +in segfault in id3_ucs4_length(). This is the only place +the return value wasn't checked. + +Patch taken from Debian: +https://sources.debian.org/patches/libid3tag/0.15.1b-14/11_unknown_encoding.dpatch/ + +CVE: CVE-2017-11550 +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf +--- libid3tag-0.15.1b~/compat.gperf 2004-01-23 09:41:32.000000000 +0000 ++++ libid3tag-0.15.1b/compat.gperf 2007-01-14 14:36:53.000000000 +0000 +@@ -236,6 +236,10 @@ + + encoding = id3_parse_uint(&data, 1); + string = id3_parse_string(&data, end - data, encoding, 0); ++ if (!string) ++ { ++ continue; ++ } + + if (id3_ucs4_length(string) < 4) { + free(string); +diff -urNad libid3tag-0.15.1b~/parse.c libid3tag-0.15.1b/parse.c +--- libid3tag-0.15.1b~/parse.c 2004-01-23 09:41:32.000000000 +0000 ++++ libid3tag-0.15.1b/parse.c 2007-01-14 14:37:34.000000000 +0000 +@@ -165,6 +165,9 @@ + case ID3_FIELD_TEXTENCODING_UTF_8: + ucs4 = id3_utf8_deserialize(ptr, length); + break; ++ default: ++ /* FIXME: Unknown encoding! Print warning? */ ++ return NULL; + } + + if (ucs4 && !full) { diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb new file mode 100644 index 0000000000..80581765ac --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb @@ -0,0 +1,28 @@ +SUMMARY = "Library for interacting with ID3 tags in MP3 files" +HOMEPAGE = "http://sourceforge.net/projects/mad/" +BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://COPYRIGHT;md5=5e6279efb87c26c6e5e7a68317a6a87a \ + file://version.h;beginline=1;endline=8;md5=86ac68b67f054b7afde9e149bbc3fe63" +SECTION = "libs" +DEPENDS = "zlib gperf-native" +PR = "r7" + +SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libid3tag-${PV}.tar.gz \ + file://addpkgconfig.patch \ + file://obsolete_automake_macros.patch \ + file://0001-Fix-gperf-3.1-incompatibility.patch \ + file://10_utf16.patch \ + file://unknown-encoding.patch \ + file://cflags_filter.patch \ + " +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mad/files/libid3tag/" +UPSTREAM_CHECK_REGEX = "/projects/mad/files/libid3tag/(?P<pver>.*)/$" + +SRC_URI[md5sum] = "e5808ad997ba32c498803822078748c3" +SRC_URI[sha256sum] = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151" + +S = "${WORKDIR}/libid3tag-${PV}" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.33.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.34.0.bb index e26c1864e7..ebcaa6c932 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.33.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.34.0.bb @@ -16,11 +16,11 @@ DEPENDS += " \ " LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=91f1cb870c1cc2d31351a4d2595441cb" +LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV_mpv = "b5d3e43198b9d57af5620b63537885aaa41fa8cd" +SRCREV_mpv = "9ca9066d052acecb5b05369141a76993a753ee1e" SRC_URI = " \ - git://github.com/mpv-player/mpv;name=mpv;branch=release/0.33;protocol=https \ + git://github.com/mpv-player/mpv;name=mpv;branch=master;protocol=https \ https://waf.io/waf-2.0.20;name=waf;subdir=git \ " SRC_URI[waf.sha256sum] = "bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb index deffa4a146..39e73d3b78 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Yet Another V4L2 Test Application" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://git.ideasonboard.org/yavta.git \ +SRC_URI = "git://git.ideasonboard.org/yavta.git;branch=master \ " SRCREV = "65f740aa1758531fd810339bc1b7d1d33666e28a" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb index fe428be7df..0e12587a20 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb @@ -8,7 +8,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" SRCREV = "7ec7a33a081aeeb53fed1a8d87e4cbd189152527" -SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https \ +SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=master \ file://libvpx-configure-support-blank-prefix.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb index 8763c68ed7..c11d4c76d6 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb @@ -34,6 +34,7 @@ EXTRA_OESCONS = " \ nostrip='true' \ systemd='${SYSTEMD_OESCONS}' \ libdir='${libdir}' \ + sbindir='${sbindir}' \ udevdir='${nonarch_base_libdir}/udev' \ unitdir='${systemd_system_unitdir}' \ manbuild='false' \ @@ -47,6 +48,7 @@ do_compile:prepend() { export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" + export CC="${CC}" export LD="${CC}" export LINKFLAGS="${LDFLAGS}" } @@ -75,12 +77,11 @@ do_install:append() { install -m 755 ${D}${libdir}/gps/*.py ${D}${PYTHON_SITEPACKAGES_DIR}/gps } -PACKAGES =+ "libgps libgpsd python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils" +PACKAGES =+ "libgps python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils" RPROVIDES:${PN}-dbg += "python-pygps-dbg" -FILES:${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \ - ${libdir}/libQgpsmm.prl" +FILES:${PN}-dev += "${libdir}/libQgpsmm.prl" FILES:${PN}-doc += "${datadir}/${BPN}/doc" @@ -91,9 +92,6 @@ SUMMARY:gpsd-udev = "udev relevant files to use gpsd hotplugging" FILES:gpsd-udev = "${nonarch_base_libdir}/udev" RDEPENDS:gpsd-udev += "udev gpsd-conf" -SUMMARY:libgpsd = "C service library used for communicating with gpsd" -FILES:libgpsd = "${libdir}/libgpsd.so.*" - SUMMARY:libgps = "C service library used for communicating with gpsd" FILES:libgps = "${libdir}/libgps.so.*" @@ -106,7 +104,32 @@ FILES:gpsd-gpsctl = "${bindir}/gpsctl" SUMMARY:gps-utils = "Utils used for simulating, monitoring,... a GPS" # Python files are required for gps/fake, required for gpsfake. -FILES:gps-utils = "${bindir}/* ${libdir}/gps/*.py ${libdir}/gps/*.so" +FILES:gps-utils = "\ + ${bindir}/cgps \ + ${bindir}/gegps \ + ${bindir}/gps2udp \ + ${bindir}/gpscat \ + ${bindir}/gpscsv \ + ${bindir}/gpsctl \ + ${bindir}/gpsdebuginfo \ + ${bindir}/gpsdecode \ + ${bindir}/gpsfake \ + ${bindir}/gpsmon \ + ${bindir}/gpspipe \ + ${bindir}/gpsplot \ + ${bindir}/gpsprof \ + ${bindir}/gpsrinex \ + ${bindir}/gpssnmp \ + ${bindir}/gpssubframe \ + ${bindir}/gpxlogger \ + ${bindir}/lcdgps \ + ${bindir}/ntpshmmon \ + ${bindir}/ppscheck \ + ${bindir}/ubxtool \ + ${bindir}/xgps \ + ${bindir}/xgpsspeed \ + ${bindir}/zerk \ +" RDEPENDS:gps-utils = "python3-pygps" SUMMARY:python3-pygps = "Python bindings to gpsd" diff --git a/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters.inc b/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters.inc index c01e2cd49f..061c8a6257 100644 --- a/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters.inc +++ b/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters.inc @@ -2,7 +2,7 @@ DESCRIPTION = "CUPS backends, filters, and other software" HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters" LICENSE = "GPLv2 & LGPLv2 & MIT & GPLv2+ & GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=516215fd57564996d70327db19b368ff" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d77679ce6a2cc4d873d4ebbf2a401e6" SECTION = "console/utils" diff --git a/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb b/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb deleted file mode 100644 index 35c4a929b5..0000000000 --- a/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -include cups-filters.inc - -SRC_URI[md5sum] = "90ebcae31f2eabd802236408646b1dd9" -SRC_URI[sha256sum] = "174a2a5c919bf88c63ced692a2170add6c2cd70ff06c49bcea32e9cf56960492" diff --git a/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters_1.28.11.bb b/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters_1.28.11.bb new file mode 100644 index 0000000000..bfe5375b28 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters_1.28.11.bb @@ -0,0 +1,3 @@ +include cups-filters.inc + +SRC_URI[sha256sum] = "472418f1a1e12c9ad91b01caa020eb668626776d85de9da488be38e6663102ca" diff --git a/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint-native_git.bb b/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint-native_git.bb new file mode 100644 index 0000000000..c6e00c340a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint-native_git.bb @@ -0,0 +1,42 @@ +# Recipe for building gutenprint-native +# +# Native part is for generating strings - xmli18n-tmp.h used by target recipe +# We don't depend on cups as this is for generating the string header. +# +# Copyright (c) Ambu A/S - All rights reserved +# SPDX-License-Identifier: MIT +# +# Author(s) +# clst@ambu.com (Claus Stovgaard) +# + +require gutenprint.inc + +# We could consider switching to BBCLASSEXTEND native instead of inherit +# Using devtool with this results in warning, as devtool append externalsrc to +# inheritance, making native not being inherited last. +inherit autotools-brokensep pkgconfig native + +SECTION = "libs" + +# binutils is for xz etc. +# gettext-native for configuration +# flex-native is used for compilation +# byacc-native is for yacc command (compilation) +DEPENDS += "binutils-native gettext-native flex-native byacc-native" + +EXTRA_OECONF = "--without-doc --without-cups" + +# gutenprint does not have a configure file in its root folder. +# Rather it has a autogen.sh in its root folder. We just use it +do_configure() { + ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" + oe_runconf +} + +# Currently we only uses the string header, even though we compile the complete +# native version of the library. So we limit the install to the needed. +do_install() { + install -d ${D}${datadir}/gutenprint/ + install -m644 ${B}/src/xml/xmli18n-tmp.h ${D}${datadir}/gutenprint/ +}
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint.inc b/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint.inc new file mode 100644 index 0000000000..0a162d2b59 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint.inc @@ -0,0 +1,22 @@ +# common part for gutenprint-native / gutenprint +# +# As we are using the native part for generating string header to the target +# version, it is important they use the same version. +# So we set the SRC_URI and SRCREV here. +# +# Copyright (c) Ambu A/S - All rights reserved +# SPDX-License-Identifier: MIT +# +# Author(s) +# clst@ambu.com (Claus Stovgaard) +# + +DESCRIPTION = "Gutenprint printer drivers" +HOMEPAGE = "http://gimp-print.sourceforge.net/" +LICENSE = "GPLv2+" + +SRC_URI = "git://git.code.sf.net/p/gimp-print/source;protocol=https;branch=master" +SRCREV = "8e47dc44dd7738302ba9e8fbc1f918461fed0236" +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb b/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb new file mode 100644 index 0000000000..7779793948 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb @@ -0,0 +1,46 @@ +# Recipe for building gutenprint +# +# Uses the gutenprint-native extracted strings and disable local build stuff +# +# Copyright (c) Ambu A/S - All rights reserved +# SPDX-License-Identifier: MIT +# +# Author(s) +# clst@ambu.com (Claus Stovgaard) +# + +require gutenprint.inc + +inherit autotools-brokensep pkgconfig + +DEPENDS += "cups gutenprint-native" + +# cups-genppdupdate depend on perl +# We also set the path to PERL as else the version in hosttools would be used +# with full path +RDEPENDS:${PN} = "perl " + +EXTRA_OECONF = "--without-doc --disable-test --disable-nls PERL=/usr/bin/perl" + +# gutenprint does not have a configure file in its root folder. +# Rather it has a autogen.sh in its root folder. We just use it +# together with adapting for cross compilation +do_configure() { + # Disable the xmli18n-tmp.h rule + # It depend on the local build extract-strings, we are not able to run this + # So we are using the xmli18n-tmp.h created by gutenprint-native + sed -i 's/all-local: xmli18n-tmp.h xml-stamp/all-local: xml-stamp/' ${S}/src/xml/Makefile.am + sed -i 's/dist-hook: xmli18n-tmp.h xml-stamp/dist-hook: xml-stamp/' ${S}/src/xml/Makefile.am + cp ${RECIPE_SYSROOT_NATIVE}${datadir}/gutenprint/xmli18n-tmp.h ${S}/src/xml/ + + ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" + oe_runconf +} + +# gutenprint install the calibrate.ppm and net.sf.gimp-print.usb-quirks in +# /usr/share/cups +FILES:${PN} += "${datadir}/cups/*" + +# Install in /etc/cups when RPM needs DIRFILES to not conflict +# https://stackoverflow.com/questions/44762430/why-do-i-get-etc-cups-conflicts-between-attempted-installs-in-yocto +DIRFILES = "1"
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.3.2.bb b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.5.0.bb index cfbe529f33..9644c653ee 100644 --- a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.5.0.bb @@ -5,9 +5,9 @@ SECTION = "libs" DEPENDS = "libpcre zlib libjpeg-turbo" SRC_URI = "${SOURCEFORGE_MIRROR}/qpdf/qpdf-${PV}.tar.gz" +SRC_URI[sha256sum] = "88257d36a44fd5c50b2879488324dd9cafc11686ae49d8c4922a4872203ce006" LIC_FILES_CHKSUM = "file://Artistic-2.0;md5=7806296b9fae874361e6fb10072b7ee3" -SRC_URI[sha256sum] = "062808c40ef8741ec8160ae00168638a712cfa1d4bf673e8e595ab5eba1da947" inherit autotools-brokensep gettext @@ -17,8 +17,6 @@ EXTRA_OECONF = "--without-random \ --disable-check-autofiles \ " -EXTRA_OEMAKE:class-target = "LIBTOOL=${HOST_SYS}-libtool" - LDFLAGS:append:mipsarch = " -latomic" LDFLAGS:append:riscv32 = " -latomic" diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit_2.8.5.bb b/meta-openembedded/meta-oe/recipes-security/audit/audit_2.8.5.bb index 10c1afbb8b..b3a377d8a2 100644 --- a/meta-openembedded/meta-oe/recipes-security/audit/audit_2.8.5.bb +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit_2.8.5.bb @@ -7,7 +7,7 @@ SECTION = "base" LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=2.8_maintenance \ +SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=2.8_maintenance;protocol=https \ file://0001-Add-substitue-functions-for-strndupa-rawmemchr.patch \ file://0002-Fixed-swig-host-contamination-issue.patch \ file://0003-Header-definitions-need-to-be-external-when-building.patch \ diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.6.bb b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.6.bb index 2d75232b85..7e4cc274eb 100644 --- a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.6.bb +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.6.bb @@ -7,7 +7,7 @@ SECTION = "base" LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master \ +SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https \ file://Fixed-swig-host-contamination-issue.patch \ file://auditd \ file://auditd.service \ diff --git a/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.5.bb b/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.5.bb index 8fe601a2d4..20f840411f 100644 --- a/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.5.bb +++ b/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.5.bb @@ -2,7 +2,7 @@ SUMMARY = "Small and fast POSIX-compliant shell" HOMEPAGE = "http://gondor.apana.org.au/~herbert/dash/" SECTION = "System Environment/Shells" -LICENSE = "BSD & GPLv2+" +LICENSE = "BSD-3-Clause & GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b5262b4a1a1bff72b48e935531976d2e" inherit autotools update-alternatives diff --git a/meta-openembedded/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb b/meta-openembedded/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb index 15cfb6eec9..746d4182a9 100644 --- a/meta-openembedded/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb @@ -4,7 +4,7 @@ SUMMARY = "Ace is a code editor written in JavaScript. This repository has only LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=794d11c5219c59c9efa2487c2b4066b2" -SRC_URI = "git://github.com/ajaxorg/ace-builds.git;protocol=https" +SRC_URI = "git://github.com/ajaxorg/ace-builds.git;protocol=https;branch=master" PV = "02.07.17+git${SRCPV}" SRCREV = "812e2c56aed246931a667f16c28b096e34597016" diff --git a/meta-openembedded/meta-oe/recipes-support/atop/atop_2.4.0.bb b/meta-openembedded/meta-oe/recipes-support/atop/atop_2.4.0.bb index c91d866106..819303c57e 100644 --- a/meta-openembedded/meta-oe/recipes-support/atop/atop_2.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/atop/atop_2.4.0.bb @@ -42,6 +42,10 @@ do_install() { rm -f ${D}${sysconfdir}/init.d/atopacct fi + # /var/log/atop will be created in runtime + rm -rf ${D}${localstatedir}/log + rmdir --ignore-fail-on-non-empty ${D}${localstatedir} + # remove atopacct related files rm -rf ${D}${sbindir} ${D}${mandir}/man8 } diff --git a/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.10.2.bb b/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.11.0.bb index 98f464fd04..8558f75c50 100644 --- a/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.10.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.11.0.bb @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae" DEPENDS = "jansson zlib xz" -BRANCH = "branch-1.10" -SRCREV = "8111cdc35430ff68dcb644306362859de40999d9" -SRC_URI = "git://github.com/apache/avro;branch=${BRANCH} \ +BRANCH = "branch-1.11" +SRCREV = "4e1fefca493029ace961b7ef8889a3722458565a" +SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \ " S = "${WORKDIR}/git/lang/c" diff --git a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.0.bb b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.0.bb index ad94009b71..7ee63b1332 100644 --- a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.0.bb @@ -24,7 +24,7 @@ LIC_FILES_CHKSUM = "file://README.QUICK;md5=7912d9213b3547f8a81aadd08893fe84" DEPENDS = "libatomic-ops" SRCREV = "47e9106c17b72e9ee5501308f69ea94531e798b3" -SRC_URI = "git://github.com/ivmai/bdwgc.git" +SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.18.1.bb index 2109d955d0..2cd00cb578 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.18.1.bb @@ -5,8 +5,8 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" -SRC_URI = "git://github.com/c-ares/c-ares.git;branch=main" -SRCREV = "6654436a307a5a686b008c1d4c93b0085da6e6d8" +SRC_URI = "git://github.com/c-ares/c-ares.git;branch=main;protocol=https" +SRCREV = "2aa086f822aad5017a6f2061ef656f237a62d0ed" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb index effab9de90..b5bdcd5b19 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb @@ -8,7 +8,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" -SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https" +SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https;branch=master" SRCREV = "23bfa4ab481edbad82a69ee385fc58ce03b63084" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch b/meta-openembedded/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch deleted file mode 100644 index 477cc31ad2..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch +++ /dev/null @@ -1,18 +0,0 @@ -No need to link with libfl. - -Upstream-Status: Pending -Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se> - -Index: ccid-1.4.8/src/Makefile.am -=================================================================== ---- ccid-1.4.8.orig/src/Makefile.am -+++ ccid-1.4.8/src/Makefile.am -@@ -53,7 +53,7 @@ PROVIDED_BY_PCSC = debug.c - endif - - libccid_la_SOURCES = $(COMMON) $(USB) $(TOKEN_PARSER) $(PROVIDED_BY_PCSC) $(T1) --libccid_la_LIBADD = $(LEXLIB) $(LIBUSB_LIBS) $(PTHREAD_LIBS) -+libccid_la_LIBADD = $(LIBUSB_LIBS) $(PTHREAD_LIBS) - libccid_la_CFLAGS = $(PCSC_CFLAGS) $(LIBUSB_CFLAGS) $(PTHREAD_CFLAGS) \ - $(SYMBOL_VISIBILITY) -D$(CCID_VERSION) -DSIMCLIST_NO_DUMPRESTORE - libccid_la_LDFLAGS = -avoid-version diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb index 4b1c421733..e3cb7cef19 100644 --- a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb +++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb @@ -7,7 +7,6 @@ DEPENDS = "virtual/libusb0 pcsc-lite" RDEPENDS:${PN} = "pcsc-lite" SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ - file://no-dep-on-libfl.patch \ file://0001-Add-build-rule-for-README.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb index a5165166c9..bfd2d035fa 100644 --- a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bb761279816b72be19d7ce646e4e2a14" DEPENDS = "libeigen glog" -SRC_URI = "git://github.com/ceres-solver/ceres-solver.git" +SRC_URI = "git://github.com/ceres-solver/ceres-solver.git;branch=master;protocol=https" SRCREV = "399cda773035d99eaf1f4a129a666b3c4df9d1b1" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.1.bb b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.1.bb index a01f2c2725..7de3335abd 100644 --- a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b73927b18d5c6cd8d2ed28a6ad539733" SRCREV = "5cb3efabce007c3a0230e4cc2e27da491c646b6c" PV .= "+git${SRCPV}" -SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=v1" +SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=v1;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.2.bb b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.2.bb index 6669c6e500..6d6d3e5850 100644 --- a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/commonmark/cmark" LICENSE = "BSD-2-Clause & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" -SRC_URI = "git://github.com/commonmark/cmark.git" +SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https" SRCREV = "a8da5a2f252b96eca60ae8bada1a9ba059a38401" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord.bb b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb index 563a0ee00a..e300222518 100644 --- a/meta-openembedded/meta-oe/recipes-support/colord/colord.bb +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb @@ -4,7 +4,7 @@ inherit meson gobject-introspection gsettings gettext bash-completion systemd fe # polkit and gobject-introspection are mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST:append = " introspection" +GIR_MESON_OPTION = "" DEPENDS += " \ ${BPN}-native \ diff --git a/meta-openembedded/meta-oe/recipes-support/consolation/consolation_0.0.8.bb b/meta-openembedded/meta-oe/recipes-support/consolation/consolation_0.0.8.bb index 2bd69e8d5f..01a02d4962 100644 --- a/meta-openembedded/meta-oe/recipes-support/consolation/consolation_0.0.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/consolation/consolation_0.0.8.bb @@ -14,7 +14,7 @@ DEPENDS = " \ udev \ " -SRC_URI = "git://salsa.debian.org/consolation-team/consolation.git" +SRC_URI = "git://salsa.debian.org/consolation-team/consolation.git;branch=master" SRCREV = "4581eaece6e49fa2b687efbdbe23b2de452e7902" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb b/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb index c76632781a..f46dec59fc 100644 --- a/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb @@ -7,7 +7,7 @@ PV = "1.7.8" inherit autotools SRCREV = "18869a797dab12bf1c917ba3b4782fef484c407c" -SRC_URI = "git://github.com/bmc/daemonize.git \ +SRC_URI = "git://github.com/bmc/daemonize.git;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb b/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb index 9fcc278d35..cac2b4fd61 100644 --- a/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb @@ -4,7 +4,7 @@ DEPENDS = "libusb1" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0" -SRC_URI = "git://github.com/bcl/digitemp" +SRC_URI = "git://github.com/bcl/digitemp;branch=master;protocol=https" SRCREV = "a162e63aad35358aab325388f3d5e88121606419" diff --git a/meta-openembedded/meta-oe/recipes-support/dool/dool/0001-Fix-build-error-as-following.patch b/meta-openembedded/meta-oe/recipes-support/dool/dool/0001-Fix-build-error-as-following.patch new file mode 100644 index 0000000000..2324af4997 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/dool/dool/0001-Fix-build-error-as-following.patch @@ -0,0 +1,39 @@ +From e81feec1ebbc676220cd8759d83f46335602d079 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Fri, 7 Jan 2022 14:37:36 +0900 +Subject: [PATCH] Fix build error as following: + +*** No rule to make target 'dstat.1', needed by 'docs'. Stop. + +Upstream-Status: Pending + +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + docs/Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/docs/Makefile b/docs/Makefile +index c031e82..1a85e61 100644 +--- a/docs/Makefile ++++ b/docs/Makefile +@@ -11,13 +11,13 @@ all: + + dist: docs + +-docs: dstat.1 $(htmltargets) ++docs: dool.1 $(htmltargets) + +-install: dstat.1 +- install -Dp -m0644 dstat.1 $(DESTDIR)$(mandir)/man1/dstat.1 ++install: dool.1 ++ install -Dp -m0644 dool.1 $(DESTDIR)$(mandir)/man1/dool.1 + + clean: +- rm -f dstat.1 *.html *.xml ++ rm -f dool.1 *.html *.xml + + %.1.html: %.1.adoc + asciidoc -d manpage $< +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb b/meta-openembedded/meta-oe/recipes-support/dool/dool_1.0.0.bb index a1076ccf94..0cbc32ff3c 100644 --- a/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/dool/dool_1.0.0.bb @@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS += "asciidoc-native xmlto-native" -SRC_URI = "git://github.com/dagwieers/dstat.git \ - file://0001-change-dstat-to-python3.patch \ +SRC_URI = "git://github.com/scottchiefbaker/dool.git;branch=master;protocol=https \ + file://0001-Fix-build-error-as-following.patch \ " -SRCREV = "6f5db0aed26bf8cf2700d4ffe90a9bd3436ac728" +SRCREV = "34a3244b46aa70a31f871a7ca8ffa8d3a7b950d2" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/driverctl/driverctl_0.111.bb b/meta-openembedded/meta-oe/recipes-support/driverctl/driverctl_0.111.bb index 7404f40c21..2b9a2f8085 100644 --- a/meta-openembedded/meta-oe/recipes-support/driverctl/driverctl_0.111.bb +++ b/meta-openembedded/meta-oe/recipes-support/driverctl/driverctl_0.111.bb @@ -7,7 +7,7 @@ REQUIRED_DISTRO_FEATURES = "systemd" DEPENDS = "systemd" RDEPENDS:${PN} += "bash bash-completion" -SRC_URI = " git://gitlab.com/driverctl/driverctl.git" +SRC_URI = " git://gitlab.com/driverctl/driverctl.git;branch=master" SRCREV = "fa9dce43d1a667d6e6e26895fbed01b3b04362c9" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch b/meta-openembedded/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch deleted file mode 100644 index 06a8498f3c..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch +++ /dev/null @@ -1,89 +0,0 @@ -From ce0528cb48666843fed2ad10ece5ecb0ac0b8cf8 Mon Sep 17 00:00:00 2001 -From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> -Date: Fri, 15 May 2020 12:38:49 +0900 -Subject: [PATCH] change dstat to python3. - -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - dstat | 2 +- - examples/curstest | 2 +- - examples/devtest.py | 2 +- - examples/mmpipe.py | 2 +- - examples/mstat.py | 2 +- - examples/read.py | 2 +- - examples/tdbtest | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/dstat b/dstat -index 9359965..f250f06 100755 ---- a/dstat -+++ b/dstat -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - ### This program is free software; you can redistribute it and/or - ### modify it under the terms of the GNU General Public License -diff --git a/examples/curstest b/examples/curstest -index afc4e70..d720cca 100755 ---- a/examples/curstest -+++ b/examples/curstest -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - import curses, sys - - #c = curses.wrapper(s) -diff --git a/examples/devtest.py b/examples/devtest.py -index 0e9e969..e53babd 100755 ---- a/examples/devtest.py -+++ b/examples/devtest.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - import sys - sys.path.insert(0, '/usr/share/dstat/') -diff --git a/examples/mmpipe.py b/examples/mmpipe.py -index 5c93567..f91515f 100755 ---- a/examples/mmpipe.py -+++ b/examples/mmpipe.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - import select, sys, os - - def readpipe(file, tmout = 0.001): -diff --git a/examples/mstat.py b/examples/mstat.py -index abf4d07..ac157e4 100755 ---- a/examples/mstat.py -+++ b/examples/mstat.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - ### Example2: simple sub-second monitor (ministat) - -diff --git a/examples/read.py b/examples/read.py -index 556b7ae..a925109 100755 ---- a/examples/read.py -+++ b/examples/read.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - ### Example 1: Direct accessing stats - ### This is a quick example showing how you can access dstat data -diff --git a/examples/tdbtest b/examples/tdbtest -index 528a8ea..ae7fef9 100755 ---- a/examples/tdbtest -+++ b/examples/tdbtest -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - import sys, tdb - - db = tdb.tdb('/var/cache/samba/connections.tdb') --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/epeg/epeg_git.bb b/meta-openembedded/meta-oe/recipes-support/epeg/epeg_git.bb index 8ca574014b..bdffe4ba78 100644 --- a/meta-openembedded/meta-oe/recipes-support/epeg/epeg_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/epeg/epeg_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7732a9290ea1e4b034fdc15cf49968d \ file://COPYING-PLAIN;md5=f59cacc08235a546b0c34a5422133035" DEPENDS = "jpeg libexif" -SRC_URI = "git://github.com/mattes/epeg.git" +SRC_URI = "git://github.com/mattes/epeg.git;branch=master;protocol=https" SRCREV = "9a175cd67eaa61fe45413d8da82da72936567047" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/fftw/fftw/club-libtool.patch b/meta-openembedded/meta-oe/recipes-support/fftw/fftw/club-libtool.patch deleted file mode 100644 index d4a1ef8d03..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/fftw/fftw/club-libtool.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- ./tests/Makefile.am.orig 2021-03-23 11:45:12.756371739 -0400 -+++ ./tests/Makefile.am 2021-03-23 11:46:43.224132851 -0400 -@@ -1,5 +1,5 @@ - AM_CPPFLAGS = -I $(top_srcdir) --noinst_PROGRAMS = bench -+bin_PROGRAMS = bench@PREC_SUFFIX@ - EXTRA_DIST = check.pl README - - if THREADS diff --git a/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.9.bb b/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.10.bb index 38bf3a19c6..13541bce46 100644 --- a/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.10.bb @@ -9,7 +9,7 @@ SRC_URI = " \ file://install-bench.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "bf2c7ce40b04ae811af714deb512510cc2c17b9ab9d6ddcf49fe4487eea7af3d" +SRC_URI[sha256sum] = "56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467" inherit autotools pkgconfig ptest diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc index 6e8fdc9d3f..2eaf491b8e 100644 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc @@ -11,8 +11,8 @@ SRC_URI = " \ file://0002-always-build-fluid-and-export-pointers.patch \ " -PV = "1.3.7" -SRC_URI[sha256sum] = "5ff1e90766ff4216e78e9a19a9bf527e6258f04accccd4429e9bb829b01d690d" +PV = "1.3.8" +SRC_URI[sha256sum] = "1d9832409fc08c908c64ab40ad9fd8b0e8af5d203651eb9690b810f41e2f412d" inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_8.0.1.bb b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_8.1.1.bb index 0dc8e038d2..c53dd38901 100644 --- a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_8.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_8.1.1.bb @@ -4,8 +4,8 @@ HOMEPAGE = "https://fmt.dev" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=af88d758f75f3c5c48a967501f24384b" -SRC_URI = "git://github.com/fmtlib/fmt" -SRCREV = "d141cdbeb0fb422a3fb7173b285fd38e0d1772dc" +SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https" +SRCREV = "b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch deleted file mode 100644 index 04fe644d47..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f703b1184229796d504a2e833f72ace4cc605d15 Mon Sep 17 00:00:00 2001 -From: Ondrej Holy <oholy@redhat.com> -Date: Wed, 12 May 2021 12:48:15 +0200 -Subject: [PATCH 1/2] Fix FIPS mode support and build with OpenSSL 3.0 - -FreeRDP fails to build with OpenSSL 3.0 because of usage of the `FIPS_mode` -and `FIPS_mode_set` functions, which were removed there. Just a note that -the FIPS mode is not supported by OpenSSL 1.1.* although the mentioned -functions are still there (see https://wiki.openssl.org/index.php/FIPS_modules). -Let's make FreeRDP build with OpenSSL 3.0 and fix the FIPS mode support. - -See: https://bugzilla.redhat.com/show_bug.cgi?id=1952937 -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - winpr/libwinpr/utils/ssl.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c -index 3a8590390..03b23af43 100644 ---- a/winpr/libwinpr/utils/ssl.c -+++ b/winpr/libwinpr/utils/ssl.c -@@ -244,9 +244,17 @@ static BOOL winpr_enable_fips(DWORD flags) - #else - WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled"); - -+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) -+ if (!EVP_default_properties_is_fips_enabled(NULL)) -+#else - if (FIPS_mode() != 1) -+#endif - { -+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) -+ if (EVP_set_default_properties(NULL, "fips=yes")) -+#else - if (FIPS_mode_set(1)) -+#endif - WLog_INFO(TAG, "Openssl fips mode ENabled!"); - else - { --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch deleted file mode 100644 index 728638e15d..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4dbf108c0ae5e997d5c432f3da4b4c5fd7b35373 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Sun, 1 Aug 2021 12:14:43 -0400 -Subject: [PATCH 2/2] winpr: avoid calling FIPS_mode() with OpenSSL 3.0 - -Fixes: 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - winpr/libwinpr/utils/ssl.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c -index 03b23af43..74ef156e7 100644 ---- a/winpr/libwinpr/utils/ssl.c -+++ b/winpr/libwinpr/utils/ssl.c -@@ -364,6 +364,8 @@ BOOL winpr_FIPSMode(void) - { - #if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) - return FALSE; -+#elif defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) -+ return (EVP_default_properties_is_fips_enabled(NULL) == 1); - #else - return (FIPS_mode() == 1); - #endif --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.4.1.bb index 78af5389b6..aba77e20fc 100644 --- a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.4.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "FreeRDP RDP client & server library" HOMEPAGE = "http://www.freerdp.com" -DEPENDS = "openssl alsa-lib pcsc-lite" +DEPENDS = "openssl alsa-lib libusb1" SECTION = "net" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" @@ -13,18 +13,15 @@ inherit pkgconfig cmake gitpkgv PE = "1" PKGV = "${GITPKGVTAG}" -SRCREV = "14c7f7aed7dd4e2454ee0cd81028b9f790885021" -SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0 \ +SRCREV = "d39a7ba5c38e3ba3b99b1558dc2ab0970cbfb0c5" +SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ file://winpr-makecert-Build-with-install-RPATH.patch \ - file://0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch \ - file://0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch \ " S = "${WORKDIR}/git" EXTRA_OECMAKE += " \ -DWITH_ALSA=ON \ - -DWITH_PCSC=ON \ -DWITH_FFMPEG=OFF \ -DWITH_CUNIT=OFF \ -DWITH_NEON=OFF \ @@ -35,7 +32,7 @@ EXTRA_OECMAKE += " \ PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'directfb pam pulseaudio wayland x11', d)}\ - gstreamer cups \ + gstreamer cups pcsc \ " X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" @@ -43,6 +40,7 @@ PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCU PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland wayland-native libxkbcommon" PACKAGECONFIG[directfb] = "-DWITH_DIRECTFB=ON,-DWITH_DIRECTFB=OFF,directfb" PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam" +PACKAGECONFIG[pcsc] = "-DWITH_PCSC=ON,-DWITH_PCSC=OFF,pcsc-lite" PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio" PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" diff --git a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb index 8b0c786674..2843939ee8 100644 --- a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRCREV = "02ca99831de59c7c3a4b834789260253cace0ced" PV .= "+git${SRCPV}" -SRC_URI += "gitsm://github.com/Naios/function2" +SRC_URI += "gitsm://github.com/Naios/function2;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.3.bb b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.3.bb index cbd45c088d..9d4ee1fe4b 100644 --- a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.3.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ace63adfdac78400fc30fa22ee9c1bb1" DEPENDS = "freetype libpng jpeg zlib tiff" -SRC_URI = "git://github.com/libgd/libgd.git;nobranch=1 \ +SRC_URI = "git://github.com/libgd/libgd.git;nobranch=1;protocol=https \ " SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc" diff --git a/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.2.bb b/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.2.bb index 6436df457e..a9a867b575 100644 --- a/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gflags/gflags" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df" -SRC_URI = "git://github.com/gflags/gflags.git" +SRC_URI = "git://github.com/gflags/gflags.git;branch=master;protocol=https" SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb index 40199343ee..61581d96d7 100644 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" SRC_URI = " \ - git://github.com/google/glog.git;nobranch=1 \ + git://github.com/google/glog.git;nobranch=1;protocol=https \ file://libexecinfo.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb b/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb index 146747eee1..ac46b5676c 100644 --- a/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb +++ b/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb @@ -13,7 +13,7 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=56a22a6e5bcce45e2c8ac184f81412b5" SRCREV = "0d6e3307bbdb8df4d56043d5f373eeeffe4cbef3" -SRC_URI = "git://git.sv.gnu.org/gnulib.git \ +SRC_URI = "git://git.sv.gnu.org/gnulib.git;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb index 557af0e858..bd42e7c4ec 100644 --- a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" DEPENDS:append:libc-musl = " libucontext" SRCREV = "f7c6fb6c8e99d6b1b725e5994373bcd19ffdf8fd" -SRC_URI = "git://github.com/gperftools/gperftools \ +SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https \ file://0001-Support-Atomic-ops-on-clang.patch \ file://0001-fix-build-with-musl-libc.patch \ file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb index 039c9554ed..7e353d5af3 100644 --- a/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb @@ -13,7 +13,7 @@ SRCREV = "e82d1a653ca94aa4ed12441424da6ce780b1e530" DEPENDS = "ncurses bison-native" -SRC_URI = "git://github.com/telmich/gpm;protocol=git \ +SRC_URI = "git://github.com/telmich/gpm;protocol=https;branch=master \ file://init \ file://gpm.service.in \ " diff --git a/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.7.1.bb b/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.7.1.bb new file mode 100644 index 0000000000..a4dc1437e2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.7.1.bb @@ -0,0 +1,4 @@ +include gsl.inc + +SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" +SRC_URI[sha256sum] = "dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b" diff --git a/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.7.bb b/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.7.bb deleted file mode 100644 index d40eebb4ca..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.7.bb +++ /dev/null @@ -1,4 +0,0 @@ -include gsl.inc - -SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" -SRC_URI[sha256sum] = "efbbf3785da0e53038be7907500628b466152dbc3c173a87de1b5eba2e23602b" diff --git a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb index e45445073f..9106abec25 100644 --- a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb @@ -11,7 +11,7 @@ RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-utf-16" inherit autotools pkgconfig -SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https \ +SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master \ file://0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch \ " PV = "0.10.1" diff --git a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch index 93d6d58573..2760162acf 100644 --- a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch +++ b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch @@ -1,4 +1,4 @@ -From 14100c6fc2cce7260ca5ace81094aee0ae40dd07 Mon Sep 17 00:00:00 2001 +From 98ed72177c49a8015a443b3ec272fee3fb5a4eb3 Mon Sep 17 00:00:00 2001 From: Paul Barker <pbarker@toganlabs.com> Date: Sun, 5 Nov 2017 22:07:30 +0000 Subject: [PATCH] htop: Update to v2.0.2 @@ -17,32 +17,32 @@ Upstream-status: Inappropriate 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 115d894..0e0a1eb 100644 +index 0e69096..d20014f 100644 --- a/configure.ac +++ b/configure.ac -@@ -205,10 +205,10 @@ AS_VAR_POPDEF([CACHEVAR])dnl - - AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") +@@ -322,10 +322,10 @@ AC_ARG_ENABLE([unicode], + [], + [enable_unicode=yes]) if test "x$enable_unicode" = xyes; then -- HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", -- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", -+ HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", -+ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", -+ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", -+ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncurses5", +- HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", +- HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", +- HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "ncursesw5-config", +- HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "ncurses5-config", ++ HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", ++ HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", ++ HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", ++ HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncurses5", HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], -@@ -225,8 +225,8 @@ if test "x$enable_unicode" = xyes; then +@@ -342,8 +342,8 @@ if test "x$enable_unicode" = xyes; then # (at this point we already link against a working ncurses library with wide character support) AC_SEARCH_LIBS([keypad], [tinfow tinfo]) else -- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", -- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", -+ HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses6", -+ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses5", - HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], - HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], - missing_libraries="$missing_libraries libncurses" +- HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses6-config], +- HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses5-config], ++ HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses6], ++ HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses5], + HTOP_CHECK_LIB([ncurses6], [doupdate], [HAVE_LIBNCURSES], + HTOP_CHECK_LIB([ncurses], [doupdate], [HAVE_LIBNCURSES], + HTOP_CHECK_LIB([curses], [doupdate], [HAVE_LIBNCURSES], diff --git a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.1.2.bb index 7854c7bebe..d8e241ed06 100644 --- a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.1.2.bb @@ -2,14 +2,14 @@ SUMMARY = "Interactive process viewer" HOMEPAGE = "https://htop.dev" SECTION = "console/utils" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=4099d367cd5e59b6d4fc1ee33accb891" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "ncurses" -SRC_URI = "git://github.com/htop-dev/htop.git \ +SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https \ file://0001-Use-pkg-config.patch \ - " -SRCREV = "ce6d60e7def146c13d0b8bca4642e7401a0a8995" +" +SRCREV = "d73783d6dbec4a8d9d20d744bf2b5e6a7073aa46" S = "${WORKDIR}/git" @@ -17,18 +17,19 @@ inherit autotools pkgconfig PACKAGECONFIG ??= " \ unicode \ - linux-affinity \ + affinity \ delayacct \ " +PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode" +PACKAGECONFIG[affinity] = "--enable-affinity,--disable-affinity,,,,hwloc" +PACKAGECONFIG[unwind] = "--enable-unwind,--disable-unwind,libunwind" +PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc,,,affinity" PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz" PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver" PACKAGECONFIG[ancient-vserver] = "--enable-ancient-vserver,--disable-ancient-vserver" -PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode" -PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc" -PACKAGECONFIG[linux-affinity] = "--enable-linux-affinity,--disable-linux-affinity" -PACKAGECONFIG[setuid] = "--enable-setuid,--disable-setuid" +PACKAGECONFIG[capabilities] = "--enable-capabilities,--disable-capabilities,libcap" PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl" -PACKAGECONFIG[sensors] = "--with-sensors,--without-sensors,lmsensors,lmsensors-libsensors" +PACKAGECONFIG[sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors" FILES:${PN} += "${datadir}/icons/hicolor/scalable/apps/htop.svg" diff --git a/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb b/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb index eb1472feae..9e8583be1c 100644 --- a/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb +++ b/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb @@ -135,7 +135,7 @@ RDEPENDS:${PN} = "hunspell" PV = "0.0.0+git${SRCPV}" SRCREV = "820a65e539e34a3a8c2a855d2450b84745c624ee" -SRC_URI = "git://github.com/wooorm/dictionaries.git" +SRC_URI = "git://github.com/wooorm/dictionaries.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb b/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb index b0aa4f719d..f5813dfcb7 100644 --- a/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ " SRCREV = "4ddd8ed5ca6484b930b111aec50c2750a6119a0f" -SRC_URI = "git://github.com/${BPN}/${BPN}.git" +SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.347.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.347.bb index 192aa57465..3713004e8a 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.347.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.347.bb @@ -6,7 +6,7 @@ LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" SRCREV = "ae89c73d89bb9f416b25ad9e850e9606e66a573e" -SRC_URI = "git://github.com/vcrhonek/${BPN}.git" +SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" do_configure() { diff --git a/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb b/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb index 986984d1ff..ac23630d01 100644 --- a/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRCREV = "978b733462e41efd5db72bc9974cb3b0d1d5f6fa" PV = "1.5+git${SRCPV}" -SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https \ +SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https;branch=master \ file://fix-configure-option-parsing.patch \ file://avoid-obsolete-gnutls-apis.patch" diff --git a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index d8e63156e9..bb111a1c9b 100644 --- a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -11,7 +11,7 @@ DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" BASE_PV := "${PV}" PV .= "_25" -SRC_URI = "git://github.com/ImageMagick/ImageMagick.git " +SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=master;protocol=https" SRCREV = "8b4e00829eb84d4e7b4da11acf1f98f1e8166e5b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb b/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb index 00747f4d41..cf390800b9 100644 --- a/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb @@ -9,7 +9,7 @@ PR = "r3" # The github repository provides a cmake and pkg-config integration SRCREV = "c858aff8c31fa63ef4d1e0176c10e5928cde9a23" -SRC_URI = "git://github.com/OSSystems/inih.git \ +SRC_URI = "git://github.com/OSSystems/inih.git;branch=master;protocol=https \ file://0001-include-install-header-files-without-prefix-dir-inih.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/iniparser/iniparser_4.1.bb b/meta-openembedded/meta-oe/recipes-support/iniparser/iniparser_4.1.bb index f4b553a578..f3593fb5ff 100644 --- a/meta-openembedded/meta-oe/recipes-support/iniparser/iniparser_4.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/iniparser/iniparser_4.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e02baf71c76e0650e667d7da133379ac" DEPENDS = "doxygen-native" -SRC_URI = "git://github.com/ndevilla/iniparser.git;protocol=https \ +SRC_URI = "git://github.com/ndevilla/iniparser.git;protocol=https;branch=master \ file://Add-CMake-support.patch" # tag 4.1 diff --git a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch new file mode 100644 index 0000000000..f30a62d594 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch @@ -0,0 +1,29 @@ +From 1e37cc3aa674c4b052f0655fef59a910fd7325cb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 16 Dec 2021 14:53:25 -0800 +Subject: [PATCH 1/2] libinotifytools: Include limit.h for PATH_MAX + +musl builds fail since the required header which defines PATH_MAX is +missing, its perhaps included indirectly via glibc based systems + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/153] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libinotifytools/src/inotifytools.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c +index 8bdfdb6..902eac2 100644 +--- a/libinotifytools/src/inotifytools.c ++++ b/libinotifytools/src/inotifytools.c +@@ -17,6 +17,7 @@ + #include "inotifytools_p.h" + #include "stats.h" + ++#include <limits.h> + #include <string.h> + #include <strings.h> + #include <stdlib.h> +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch new file mode 100644 index 0000000000..931244830c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch @@ -0,0 +1,40 @@ +From 6c3ce01a281a9aa661494d24a862219fc9e2b460 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 16 Dec 2021 14:57:55 -0800 +Subject: [PATCH 2/2] libinotifytools: Bridge differences between + musl/glibc/kernel fnotify.h + +System detects to use sys/fnotify.h and then assumes glibc's definitions +but musl has definitions of its own. perhaps portable thing would be to +use linux/fnotify.h interface directly on linux irrespective of libc + +See the differences discussion here [1] + +[1] https://inbox.vuxu.org/musl/20191112220151.GC27331@x230/T/#ma8700992467200c8792e0fa8508eae656b81aeba + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/154] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libinotifytools/src/inotifytools.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c +index 902eac2..2b96395 100644 +--- a/libinotifytools/src/inotifytools.c ++++ b/libinotifytools/src/inotifytools.c +@@ -55,6 +55,12 @@ struct fanotify_event_fid { + struct fanotify_event_info_fid info; + struct file_handle handle; + }; ++ ++#ifndef __GLIBC__ ++#define val __val ++#define __kernel_fsid_t fsid_t ++#endif ++ + #endif + + /** +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_3.21.9.6.bb index 26e7e84592..89c3a00b71 100644 --- a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_3.21.9.6.bb @@ -5,10 +5,12 @@ SECTION = "console/devel" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" -SRCREV = "98e8dfa47eb6a6ba52e35de55d2de21b274a4af8" -PV = "3.20.11.0" +SRCREV = "8f8fcdffb7e80928bea6c1fccd3527a9f5d8fe77" -SRC_URI = "git://github.com/rvoicilas/${BPN}" +SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https \ + file://0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch \ + file://0002-libinotifytools-Bridge-differences-between-musl-glib.patch \ + " S = "${WORKDIR}/git" @@ -16,6 +18,10 @@ inherit autotools EXTRA_OECONF = "--disable-doxygen" +# workaround until glibc 2.35 is fixed for this [1] +# [1] https://sourceware.org/pipermail/libc-alpha/2021-December/134215.html +CFLAGS += "-Wno-error" + PACKAGES =+ "libinotifytools" FILES:libinotifytools = "${libdir}/lib*.so.*" diff --git a/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb b/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb index 127f71da44..4ca41cbcd2 100644 --- a/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb +++ b/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "udev" SRCREV = "de6258940960443038b4c1651dfda3620075e870" -SRC_URI = "git://git.0pointer.de/libatasmart.git \ +SRC_URI = "git://git.0pointer.de/libatasmart.git;branch=master \ file://0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.6.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.6.bb index 7b8d4a3f91..cbf6be4765 100644 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.6.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/git" B = "${S}" SRCREV = "c9864f4dd03736839f40d225da494cb1eb64e654" -SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master" +SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master;protocol=https" inherit gettext autotools pkgconfig python3native diff --git a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb index 6498bb367a..0dbd5204d7 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb @@ -16,7 +16,7 @@ PROVIDES += "${PN}-dev" PV .= "+git${SRCPV}" SRCREV = "64f50dbd5cecdaba785217e2b0aeea3a4f1cdfab" -SRC_URI = "git://github.com/USCiLab/cereal.git \ +SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https \ file://0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb b/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb index d98fa2c2f7..8f777eb182 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE;md5=d8b4ca15d239dc1485ef495c8f1bcc72 \ " -SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https" +SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https;branch=master" SRCREV = "5e4b350806d561473138ce7a982e8f6cf2e77733" DEPENDS = "librdkafka boost chrpath-replacement-native" diff --git a/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb b/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb index 98871c3cf0..35083847cb 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb @@ -8,7 +8,7 @@ DEPENDS = "libusb udev" PV = "1.0.0+git${SRCPV}" SRCREV = "655e2d544183d094f0e2d119c7e0c6206a0ddb3f" -SRC_URI = "git://github.com/cyrozap/${BPN}.git" +SRC_URI = "git://github.com/cyrozap/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libfann/libfann_git.bb b/meta-openembedded/meta-oe/recipes-support/libfann/libfann_git.bb index eae24461dc..5ab484d8a5 100644 --- a/meta-openembedded/meta-oe/recipes-support/libfann/libfann_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libfann/libfann_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=f14599a2f089f6ff8c97e2baa4e3d575" inherit cmake SRCREV ?= "7ec1fc7e5bd734f1d3c89b095e630e83c86b9be1" -SRC_URI = "git://github.com/libfann/fann.git;branch=master \ +SRC_URI = "git://github.com/libfann/fann.git;branch=master;protocol=https \ " PV = "2.2.0+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest b/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest index 60c661fc10..61b9b69fc6 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest @@ -7,7 +7,7 @@ cd $ptestdir/tests for testbin in $testbins; do if test -e ./$testbin; then - ./$testbin > ./$testbin.out + ./$testbin > ./$testbin.out 2>&1 if [ $? -ne 0 ]; then echo "FAIL: $testbin" else diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb index ac4ba85d77..51b74ba5b7 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb @@ -49,7 +49,11 @@ FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.so" FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '', d)}" -RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-mockup" +RRECOMMENDS:${PN}-ptest += " \ + kernel-module-gpio-mockup \ + coreutils \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-unittest', '', d)} \ +" PACKAGECONFIG:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.8.bb b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.8.bb deleted file mode 100644 index c22030b983..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.8.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "GUsb is a GObject wrapper for libusb1" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -DEPENDS = "glib-2.0 libusb" - -inherit meson gobject-introspection gtk-doc gettext vala - -SRC_URI = "git://github.com/hughsie/libgusb.git;branch=main" -SRCREV = "db9edbd8b45662d551194a0985173732f8f557a5" -S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.9.bb b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.9.bb new file mode 100644 index 0000000000..3fdb2b7d3d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.9.bb @@ -0,0 +1,14 @@ +SUMMARY = "GUsb is a GObject wrapper for libusb1" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = "glib-2.0 libusb" + +inherit meson gobject-introspection gtk-doc gettext vala + +PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)}" +PACKAGECONFIG[vapi] = "-Dvapi=true,-Dvapi=false" + +SRC_URI = "git://github.com/hughsie/libgusb.git;branch=main;protocol=https" +SRCREV = "582f33178a986e74543de8ced087865009f8fef0" +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb index 01c94f847a..7477c5f03b 100644 --- a/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb @@ -6,7 +6,7 @@ DESCRIPTION = "libHaru is a library for generating PDF files. \ LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://README;md5=3ee6bc1f64d9cc7907f44840c8e50cb1" -SRC_URI = "git://github.com/libharu/libharu.git;branch=2_3 \ +SRC_URI = "git://github.com/libharu/libharu.git;branch=2_3;protocol=https \ file://libharu-RELEASE_2_3_0_cmake.patch \ file://0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index 488d4e3b0b..6632f7e647 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" SRCREV = "565bf68eccfdbbf22cf5cb6d792e23de564665c7" PV = "0.21+git${SRCPV}" -SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https \ +SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=master \ file://0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.1.bb b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.1.bb index 66fb5a3ffb..2db16e114e 100644 --- a/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/js-cookie/js-cookie" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=e16cf0e247d84f8999bf55865a9c98cf" -SRC_URI = "git://github.com/js-cookie/js-cookie.git;protocol=http" +SRC_URI = "git://github.com/js-cookie/js-cookie.git;protocol=http;branch=master;protocol=https" SRCREV = "0ba77141dd215782cc7770347a457906908c66ff" diff --git a/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb index a87c5bf758..b6147ffeb2 100644 --- a/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb @@ -7,7 +7,8 @@ S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://LICENSE;md5=4db68fb4d1d9986d736b35039f2ad9ea" -SRC_URI = "git://github.com/globalizejs/globalize;tag=1.7.0;nobranch=1" +SRCREV = "771061fb35f7fd8d7c2c37f5d5bb26115be382bc" +SRC_URI = "git://github.com/globalizejs/globalize;protocol=https;nobranch=1" FILES:${PN} = "${datadir}/javascript/jquery-globalize" FILES:${PN}-doc += "${docdir}/${PN}" diff --git a/meta-openembedded/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-openembedded/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb index 590c4ebc28..fc0b1ee495 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb @@ -10,7 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b49da7df0ca479ef01ff7f2d799eabee" SRCREV = "50486af99b4f9b35522d7b3de40b6ce107505279" -SRC_URI += "git://github.com/LadislavSopko/mimetic/ \ +SRC_URI += "git://github.com/LadislavSopko/mimetic/;branch=master;protocol=https \ file://0001-libmimetic-Removing-test-directory-from-the-Makefile.patch \ file://0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.2.bb b/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.3.bb index 2e8ecbfc44..c8e2167795 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.3.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" HOMEPAGE = "https://www.msweet.org/mxml/" BUGTRACKER = "https://github.com/michaelrsweet/mxml/issues" -SRC_URI = "git://github.com/michaelrsweet/mxml.git;nobranch=1" -SRCREV = "38b044ed8ca2a611ed9ed3e26c4b46416335194e" +SRC_URI = "git://github.com/michaelrsweet/mxml.git;nobranch=1;protocol=https" +SRCREV = "0237559fdbcecae34157b547aa2b99e12de305a2" S = "${WORKDIR}/git" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb index 4c99a328be..dc2cc892fe 100644 --- a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb @@ -9,7 +9,7 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" DEPENDS = "libtool openssl" -SRC_URI = "git://github.com/OpenSC/libp11.git" +SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https" SRCREV = "9ca6a71c890b5583c8af3b4900172626bca55e72" UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.20.2.bb b/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.20.2.bb index 0a7c534be2..4765264166 100644 --- a/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.20.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.20.2.bb @@ -2,7 +2,7 @@ SUMMARY = "raw image decoder" LICENSE = "LGPL-2.1 | CDDL-1.0" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=74c9dffdc42805f9c0de2f97df6031fc" -SRC_URI = "git://github.com/LibRaw/LibRaw.git" +SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=master;protocol=https" SRCREV = "0209b6a2caec189e6d1a9b21c10e9e49f46e5a92" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/librdkafka/librdkafka/0001_fix_absolute_path_usage.patch b/meta-openembedded/meta-oe/recipes-support/librdkafka/librdkafka/0001_fix_absolute_path_usage.patch deleted file mode 100644 index d60978661d..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/librdkafka/librdkafka/0001_fix_absolute_path_usage.patch +++ /dev/null @@ -1,83 +0,0 @@ -From dd06894a786edf4bea11dace50d7380b89dfaba5 Mon Sep 17 00:00:00 2001 -From: hasan.men <hasan.men@bosphorusiss.com> -Date: Sun, 4 Apr 2021 17:20:32 +0200 -Subject: [PATCH] fix absolute path problem - ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c6c05e06..e6c47374 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -176,7 +176,7 @@ if(MINGW) - endif(MINGW) - - # Support '#include <rdkafka.h>' --target_include_directories(rdkafka PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>") -+target_include_directories(rdkafka PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) - target_compile_definitions(rdkafka PUBLIC ${rdkafka_compile_definitions}) - if(RDKAFKA_BUILD_STATIC) - target_compile_definitions(rdkafka PUBLIC LIBRDKAFKA_STATICLIB) -@@ -188,7 +188,7 @@ if(MINGW) - target_link_libraries(rdkafka PUBLIC crypt32 ws2_32 secur32) - endif(MINGW) - --if(WIN32) -+if(WIN32) - if(RDKAFKA_BUILD_STATIC) - target_link_libraries(rdkafka PUBLIC crypt32) - else() -@@ -207,13 +207,13 @@ endif() - - if(WITH_ZLIB) - find_package(ZLIB REQUIRED) -- target_include_directories(rdkafka PUBLIC ${ZLIB_INCLUDE_DIRS}) -+ target_include_directories(rdkafka PRIVATE ${ZLIB_INCLUDE_DIRS}) - target_link_libraries(rdkafka PUBLIC ZLIB::ZLIB) - endif() - - if(WITH_ZSTD) -- target_link_libraries(rdkafka PUBLIC ${ZSTD_LIBRARY}) -- target_include_directories(rdkafka PUBLIC ${ZSTD_INCLUDE_DIR}) -+ target_link_libraries(rdkafka PRIVATE ${ZSTD_LIBRARY}) -+ target_include_directories(rdkafka PRIVATE ${ZSTD_INCLUDE_DIR}) - message(STATUS "Found ZSTD: ${ZSTD_LIBRARY}") - endif() - -@@ -222,12 +222,12 @@ if(WITH_SSL) - if(NOT TARGET bundled-ssl) - message(FATAL_ERROR "bundled-ssl target not exist") - endif() -- target_include_directories(rdkafka BEFORE PUBLIC ${BUNDLED_SSL_INCLUDE_DIR}) -+ target_include_directories(rdkafka BEFORE PRIVATE ${BUNDLED_SSL_INCLUDE_DIR}) - target_link_libraries(rdkafka PUBLIC ${BUNDLED_SSL_LIBRARIES}) - add_dependencies(rdkafka bundled-ssl) - else() - find_package(OpenSSL REQUIRED) -- target_include_directories(rdkafka PUBLIC ${OPENSSL_INCLUDE_DIR}) -+ target_include_directories(rdkafka PRIVATE ${OPENSSL_INCLUDE_DIR}) - target_link_libraries(rdkafka PUBLIC OpenSSL::SSL OpenSSL::Crypto) - get_target_property(OPENSSL_TARGET_TYPE OpenSSL::SSL TYPE) - if(OPENSSL_CRYPTO_LIBRARY MATCHES "\\.a$") -@@ -244,7 +244,7 @@ find_package(Threads REQUIRED) - target_link_libraries(rdkafka PUBLIC Threads::Threads) - - if(WITH_SASL_CYRUS) -- target_include_directories(rdkafka PUBLIC ${SASL_INCLUDE_DIRS}) -+ target_include_directories(rdkafka PRIVATE ${SASL_INCLUDE_DIRS}) - target_link_libraries(rdkafka PUBLIC ${SASL_LIBRARIES}) - endif() - -@@ -253,7 +253,7 @@ if(WITH_LIBDL) - endif() - - if(WITH_LZ4_EXT) -- target_include_directories(rdkafka PUBLIC ${LZ4_INCLUDE_DIRS}) -+ target_include_directories(rdkafka PRIVATE ${LZ4_INCLUDE_DIRS}) - target_link_libraries(rdkafka PUBLIC LZ4::LZ4) - endif() - --- -2.17.1
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb b/meta-openembedded/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb index 0fa229662f..f9f3baaf2c 100644 --- a/meta-openembedded/meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb @@ -1,16 +1,14 @@ SUMMARY = "the Apache Kafka C/C++ client library" -DESCRIPTION = "librdkafka is a C library implementation of the Apache Kafka protocol, providing Producer, Consumer and Admin clients." +DESCRIPTION = "librdkafka is a C library implementation of the Apache Kafka protocol, \ + providing Producer, Consumer and Admin clients." HOMEPAGE = "https://github.com/edenhill/librdkafka" SECTION = "libs" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = " \ -file://LICENSE;md5=2be8675acbfdac48935e73897af5f646 \ -" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2be8675acbfdac48935e73897af5f646" -SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https \ - file://0001_fix_absolute_path_usage.patch" -SRCREV = "1a722553638bba85dbda5050455f7b9a5ef302de" +SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master" +SRCREV = "063a9ae7a65cebdf1cc128da9815c05f91a2a996" DEPENDS = "zlib openssl zstd" @@ -20,4 +18,4 @@ S = "${WORKDIR}/git" FILES:${PN} += "${datadir}" -EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF -DRDKAFKA_BUILD_TESTS=OFF"
\ No newline at end of file +EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF -DRDKAFKA_BUILD_TESTS=OFF" diff --git a/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.2.bb b/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.2.bb index 79a1a0fb85..1dc4a072ce 100644 --- a/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.2.bb @@ -4,7 +4,7 @@ AUTHOR = "Martin Pool, Andrew Tridgell, Donovan Baarda, Adam Schubert" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" -SRC_URI = "git://github.com/librsync/librsync.git" +SRC_URI = "git://github.com/librsync/librsync.git;branch=master;protocol=https" SRCREV = "42b636d2a65ab6914ea7cac50886da28192aaf9b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb b/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb index 9abba6e04b..6c943bedc1 100644 --- a/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=e0bfebea12a718922225ba987b2126a5" inherit autotools pkgconfig python3-dir SRCREV = "fd1ad6e7823fa76d8db0d3c5884faffa8ffddafb" -SRC_URI = "git://github.com/jackmitch/libsoc.git" +SRC_URI = "git://github.com/jackmitch/libsoc.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.8.9.bb b/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.8.9.bb index cbda8b7be3..63be2ac060 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.8.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.8.9.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0" DEPENDS = "zlib openssl" -SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=stable-0.8" +SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.8" SRCREV = "04685a74df9ce1db1bc116a83a0da78b4f4fa1f8" S = "${WORKDIR}/git" @@ -33,3 +33,5 @@ do_configure:prepend () { } TOOLCHAIN = "gcc" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-check-the-return-value.patch b/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-check-the-return-value.patch new file mode 100644 index 0000000000..96891c9ea7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-check-the-return-value.patch @@ -0,0 +1,34 @@ +From e86a58271d7d0a3b9cd546251d2527e93898bdb8 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Tue, 21 Dec 2021 11:15:31 +0800 +Subject: [PATCH] team_basic_test.py: check the return value + +Not only print the traceback like before, also check the +return value. + +Upstream-Status: Submitted [https://github.com/jpirko/libteam/pull/63] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + scripts/team_basic_test.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py +index 0b64af2..17588c7 100755 +--- a/scripts/team_basic_test.py ++++ b/scripts/team_basic_test.py +@@ -203,4 +203,10 @@ def main(): + btest.run() + + if __name__ == "__main__": +- main() ++ try: ++ ret = main() ++ except Exception as esc: ++ ret = 1 ++ import traceback ++ traceback.print_exc() ++ sys.exit(ret) +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch b/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch new file mode 100644 index 0000000000..69276aba91 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch @@ -0,0 +1,101 @@ +From 06050e79655f0fa7d9daeda1fbd3a9a2c7736841 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 2 Dec 2021 15:08:25 +0800 +Subject: [PATCH] team_basic_test.py: switch to python3 + +Switch the script team_basic_test.py to python3 + +Upstream-Status: Submitted [https://github.com/jpirko/libteam/pull/63] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + scripts/team_basic_test.py | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py +index faabd18..0b64af2 100755 +--- a/scripts/team_basic_test.py ++++ b/scripts/team_basic_test.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + """ + Basic test. + +@@ -32,11 +32,11 @@ def usage(): + """ + Print usage of this app + """ +- print "Usage: team_basic_test.py [OPTION...]" +- print "" +- print " -h, --help print this message" +- print " -c, --loop-count=NUMBER number of loops (default 1)" +- print " -p, --port=NETDEV port device (can be defined multiple times)" ++ print("Usage: team_basic_test.py [OPTION...]") ++ print("") ++ print(" -h, --help print this message") ++ print(" -c, --loop-count=NUMBER number of loops (default 1)") ++ print(" -p, --port=NETDEV port device (can be defined multiple times)") + sys.exit() + + class CmdExecFailedException(Exception): +@@ -55,15 +55,15 @@ class CmdExecUnexpectedOutputException(Exception): + return "Command execution output unexpected: \"%s\" != \"%s\"" % (self.__output, self.__expected_output) + + def print_output(out_type, string): +- print("%s:\n" ++ print(("%s:\n" + "----------------------------\n" + "%s" +- "----------------------------" % (out_type, string)) ++ "----------------------------" % (out_type, string))) + + def cmd_exec(cmd, expected_output=None, cleaner=False): + cmd = cmd.rstrip(" ") + if not cleaner: +- print("# \"%s\"" % cmd) ++ print(("# \"%s\"" % cmd)) + subp = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + (data_stdout, data_stderr) = subp.communicate() +@@ -74,7 +74,7 @@ def cmd_exec(cmd, expected_output=None, cleaner=False): + if data_stderr: + print_output("Stderr", data_stderr) + raise CmdExecFailedException(subp.returncode) +- output = data_stdout.rstrip() ++ output = (data_stdout.rstrip()).decode() + if expected_output: + if output != expected_output: + raise CmdExecUnexpectedOutputException(output, expected_output) +@@ -166,7 +166,7 @@ TEAM_PORT_CONFIG='{"prio": 10}' + os.removedirs("/tmp/team_test/") + + def _run_one_loop(self, run_nr): +- print "RUN #%d" % (run_nr) ++ print("RUN #%d" % (run_nr)) + self._created_teams = [] + try: + for mode_name in self._team_modes: +@@ -176,7 +176,7 @@ TEAM_PORT_CONFIG='{"prio": 10}' + cmd_exec("modprobe -r team_mode_loadbalance team_mode_roundrobin team_mode_activebackup team_mode_broadcast team"); + + def run(self): +- for i in xrange(self._loop_count): ++ for i in range(self._loop_count): + self._run_one_loop(i + 1) + + def main(): +@@ -186,8 +186,8 @@ def main(): + "hc:p:", + ["help", "loop-count=", "port="] + ) +- except getopt.GetoptError, err: +- print str(err) ++ except getopt.GetoptError as err: ++ print(str(err)) + usage() + + btest = TeamBasicTest() +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-use-python3-interpreter.patch b/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-use-python3-interpreter.patch deleted file mode 100644 index e27e4f3291..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-use-python3-interpreter.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 571c141b434dff13494c6a3afe621f63a8e610e9 Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin <andrey.z@gmail.com> -Date: Mon, 27 Jan 2020 14:29:34 +0000 -Subject: [PATCH] team_basic_test.py: use python3 interpreter - -Use python3 since python2 is EOL and has been removed from several -distributions. - -Upstream-Status: Pending - -Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> ---- - scripts/team_basic_test.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py -index b05be9e..ad980e8 100755 ---- a/scripts/team_basic_test.py -+++ b/scripts/team_basic_test.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /usr/bin/env python3 - """ - Basic test. - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/libteam/libteam/run-ptest b/meta-openembedded/meta-oe/recipes-support/libteam/libteam/run-ptest index b5c6f4ebb9..26f097d587 100644 --- a/meta-openembedded/meta-oe/recipes-support/libteam/libteam/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/libteam/libteam/run-ptest @@ -1,3 +1,8 @@ #!/bin/sh python3 $(dirname $0)/team_basic_test.py +if [ $? -eq 0 ] ; then + echo "PASS: libteam" +else + echo "FAIL: libteam" +fi diff --git a/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.31.bb b/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.31.bb index a131de36c2..e43d3e0dae 100644 --- a/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.31.bb +++ b/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.31.bb @@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libnl libdaemon jansson" -SRC_URI = "git://github.com/jpirko/libteam \ +SRC_URI = "git://github.com/jpirko/libteam;branch=master;protocol=https \ file://0001-include-sys-select.h-for-fd_set-definition.patch \ file://0002-teamd-Re-adjust-include-header-order.patch \ file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \ - file://0001-team_basic_test.py-use-python3-interpreter.patch \ + file://0001-team_basic_test.py-switch-to-python3.patch \ + file://0001-team_basic_test.py-check-the-return-value.patch \ file://run-ptest \ " SRCREV = "3ee12c6d569977cf1cd30d0da77807a07aa77158" diff --git a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb index 215f32a785..7f205987f4 100644 --- a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" -SRC_URI = "git://github.com/leethomason/tinyxml2.git" +SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https" SRCREV = "1dee28e51f9175a31955b9791c74c430fe13dc82" diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-examples-ucontext-cp.c-Do-not-use-SIGSTKSZ.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-examples-ucontext-cp.c-Do-not-use-SIGSTKSZ.patch deleted file mode 100644 index a2ba66c3ab..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-examples-ucontext-cp.c-Do-not-use-SIGSTKSZ.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a30d62dfb9ea30af58ef331fae1e6f727d0558c0 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 4 May 2021 10:32:08 -0700 -Subject: [PATCH] examples/ucontext-cp.c: Do not use SIGSTKSZ - -glibc 2.34 has removed SIGSTKSZ therefore we replace it - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - examples/ucontext-cp.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - ---- a/examples/ucontext-cp.c -+++ b/examples/ucontext-cp.c -@@ -3,6 +3,7 @@ - * gcc -Wall -O2 -D_GNU_SOURCE -o ucontext-cp ucontext-cp.c -luring - */ - #define _POSIX_C_SOURCE 199309L -+#include <stddef.h> - #include <stdio.h> - #include <fcntl.h> - #include <string.h> -@@ -22,13 +23,9 @@ - #define QD 64 - #define BS 1024 - --#ifndef SIGSTKSZ --#define SIGSTKSZ 8192 --#endif -- - typedef struct { - struct io_uring *ring; -- unsigned char stack_buf[SIGSTKSZ]; -+ max_align_t stack_buf[(8 * 1024 + sizeof (max_align_t) - 1) / sizeof (max_align_t)]; - ucontext_t ctx_main, ctx_fnew; - } async_context; - diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Use-syscall-wrappers-instead-of-using-syscall-2.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Use-syscall-wrappers-instead-of-using-syscall-2.patch new file mode 100644 index 0000000000..2777a94045 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Use-syscall-wrappers-instead-of-using-syscall-2.patch @@ -0,0 +1,59 @@ +From cb350a8989adbd65db574325d9a86d5437d800da Mon Sep 17 00:00:00 2001 +From: Guillem Jover <guillem@hadrons.org> +Date: Mon, 13 Sep 2021 23:56:08 +0200 +Subject: [PATCH] test: Use syscall wrappers instead of using syscall(2) directly + +Some of these syscalls have different entry points depending on the +architecture. Use the wrappers to avoid having to reimplement them +portably. + +Fixes build failures on Debian armel and armhf builds. + +Upstream-Status: Backport [https://github.com/kraj/liburing/commit/cb350a8989adbd65db574325d9a86d5437d800da] +Signed-off-by: Guillem Jover <guillem@hadrons.org> +--- + test/sqpoll-cancel-hang.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/test/sqpoll-cancel-hang.c b/test/sqpoll-cancel-hang.c +index c9032c8..e561478 100644 +--- a/test/sqpoll-cancel-hang.c ++++ b/test/sqpoll-cancel-hang.c +@@ -4,7 +4,6 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/mman.h> +-#include <sys/syscall.h> + #include <sys/wait.h> + #include <time.h> + #include <unistd.h> +@@ -29,8 +28,6 @@ static uint64_t current_time_ms(void) + + #define IORING_OFF_SQES 0x10000000ULL + +-#define sys_io_uring_setup 425 +- + static void kill_and_wait(int pid, int* status) + { + kill(-pid, SIGKILL); +@@ -53,7 +50,7 @@ a5) + void* vma2 = (void*)a3; + void** ring_ptr_out = (void**)a4; + void** sqes_ptr_out = (void**)a5; +- uint32_t fd_io_uring = syscall(sys_io_uring_setup, entries, setup_params); ++ uint32_t fd_io_uring = __sys_io_uring_setup(entries, setup_params); + uint32_t sq_ring_sz = setup_params->sq_off.array + + setup_params->sq_entries * sizeof(uint32_t); + uint32_t cq_ring_sz = setup_params->cq_off.cqes + +@@ -135,7 +132,7 @@ void trigger_bug(void) + } + int main(void) + { +- syscall(__NR_mmap, 0x20000000ul, 0x1000000ul, 7ul, 0x32ul, -1, 0ul); ++ mmap((void *)0x20000000ul, 0x1000000ul, 7ul, 0x32ul, -1, 0ul); + int pid = fork(); + if (pid < 0) + exit(1); +-- +2.33.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-tests-fix-portability-issue-when-using-__NR_mmap-sys.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-tests-fix-portability-issue-when-using-__NR_mmap-sys.patch deleted file mode 100644 index f2f03c18b4..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-tests-fix-portability-issue-when-using-__NR_mmap-sys.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2d3940163e14d183fddc4d8b24cc1d3865bba0b3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 5 May 2021 09:36:36 -0700 -Subject: [PATCH] tests: fix portability issue when using __NR_mmap syscall - -On some architectures e.g. ARM and RISCV32, __NR_mmap does not exist and -libc will then use NR_mmap2 to implement mmap() API, therefore use -system C library mmap() API instead of calling the syscall directly - -Upstream-Status: Partial Backport [https://github.com/axboe/liburing/commit/808b6c72ab753bda0c300b5683cfd31750d1d49b] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - test/double-poll-crash.c | 6 +++--- - test/sqpoll-disable-exit.c | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/test/double-poll-crash.c b/test/double-poll-crash.c -index 1a219c7..6e08285 100644 ---- a/test/double-poll-crash.c -+++ b/test/double-poll-crash.c -@@ -150,9 +150,9 @@ int main(int argc, char *argv[]) - if (argc > 1) - return 0; - -- syscall(__NR_mmap, 0x1ffff000ul, 0x1000ul, 0ul, 0x32ul, -1, 0ul); -- syscall(__NR_mmap, 0x20000000ul, 0x1000000ul, 7ul, 0x32ul, -1, 0ul); -- syscall(__NR_mmap, 0x21000000ul, 0x1000ul, 0ul, 0x32ul, -1, 0ul); -+ mmap((void *) 0x1ffff000, (size_t) 0x1000, PROT_NONE, MAP_FIXED | MAP_ANONYMOUS, -1, 0); -+ mmap((void *) 0x20000000, (size_t) 0x1000000, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_FIXED | MAP_ANONYMOUS, -1, 0); -+ mmap((void *) 0x21000000, (size_t) 0x1000, PROT_NONE, MAP_FIXED | MAP_ANONYMOUS, -1, 0); - intptr_t res = 0; - *(uint32_t*)0x20000484 = 0; - *(uint32_t*)0x20000488 = 0; -diff --git a/test/sqpoll-disable-exit.c b/test/sqpoll-disable-exit.c -index d4e17f8..a0d00cc 100644 ---- a/test/sqpoll-disable-exit.c -+++ b/test/sqpoll-disable-exit.c -@@ -223,9 +223,9 @@ void execute_one(void) - } - int main(void) - { -- syscall(__NR_mmap, 0x1ffff000ul, 0x1000ul, 0ul, 0x32ul, -1, 0ul); -- syscall(__NR_mmap, 0x20000000ul, 0x1000000ul, 7ul, 0x32ul, -1, 0ul); -- syscall(__NR_mmap, 0x21000000ul, 0x1000ul, 0ul, 0x32ul, -1, 0ul); -+ mmap((void *) 0x1ffff000, (size_t) 0x1000, PROT_NONE, MAP_FIXED | MAP_ANONYMOUS, -1, 0); -+ mmap((void *) 0x20000000, (size_t) 0x1000000, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_FIXED | MAP_ANONYMOUS, -1, 0); -+ mmap((void *) 0x21000000, (size_t) 0x1000, PROT_NONE, MAP_FIXED | MAP_ANONYMOUS, -1, 0); - loop(); - return 0; - } --- -2.31.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.0.bb b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.1.bb index 7a903e5d4a..f519bf2363 100644 --- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.1.bb @@ -10,13 +10,12 @@ LICENSE = "LGPLv2.1 | MIT" LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=d51b5805e2a675685e6a66ca50904cf9" SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \ - file://0001-examples-ucontext-cp.c-Do-not-use-SIGSTKSZ.patch \ - file://0001-tests-fix-portability-issue-when-using-__NR_mmap-sys.patch \ + file://0001-test-Use-syscall-wrappers-instead-of-using-syscall-2.patch \ " SRC_URI:append:libc-musl:riscv64 = " file://0001-do-not-build-examples.patch " SRC_URI:append:libc-musl:riscv32 = " file://0001-do-not-build-examples.patch " +SRCREV = "41a61c97c2e3df4475c93fdf5026d575ce3f1377" -SRCREV = "b013dfd5a5f65116373d5e0f0bdfb73db9d8816e" S = "${WORKDIR}/git" DEPENDS:append:libc-musl = " libucontext" diff --git a/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb b/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb index 8c3337370e..94d833aa3a 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb @@ -19,7 +19,7 @@ BBCLASSEXTEND = "native nativesdk" PE = "1" SRC_URI = " \ - git://github.com/libusb/libusb-compat-0.1.git;protocol=https \ + git://github.com/libusb/libusb-compat-0.1.git;protocol=https;branch=master \ file://0001-usb.h-Include-sys-types.h.patch \ " SRCREV = "4a27760ec5954ec8605e052a3207afbe0979eeef" diff --git a/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb b/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb index 94399a0171..3330e03969 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb @@ -8,7 +8,7 @@ inherit autotools update-alternatives PV = "0.1.0" SRCREV = "a826d136e0e8fa53815f1ba05893e6dd74208c15" -SRC_URI = "git://github.com/libusbg/libusbg.git \ +SRC_URI = "git://github.com/libusbg/libusbg.git;branch=master;protocol=https \ file://0001-Fix-out-of-tree-builds.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb index dc0d5c08d1..d4bb9bf698 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb @@ -11,7 +11,7 @@ PV = "0.2.0+git${SRCPV}" SRCREV = "45c14ef4d5d7ced0fbf984208de44ced6d5ed898" SRCBRANCH = "master" SRC_URI = " \ - git://github.com/libusbgx/libusbgx.git;branch=${SRCBRANCH} \ + git://github.com/libusbgx/libusbgx.git;branch=${SRCBRANCH};protocol=https \ file://gadget-start \ file://usbgx.initd \ file://usbgx.service \ diff --git a/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb b/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb index 68a8ad364a..b178a92fe6 100644 --- a/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb +++ b/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SRCREV = "3ef74fff310f09e2601e241b9f042cd39d591018" PV = "1.1.6-alt2+git${SRCPV}" -SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git \ +SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git;branch=master \ file://0001-Fix-macro-error.patch \ file://0002-Proper-macro-path-generation.patch \ file://libutempter-remove-glibc-assumption.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb index 7d7c67b659..108d65298e 100644 --- a/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df PV = "4.1+git${SRCPV}" -SRC_URI = "git://github.com/Datera/lio-utils.git \ +SRC_URI = "git://github.com/Datera/lio-utils.git;branch=master;protocol=https \ file://0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch \ " SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index 43356c9cd5..cccc041bc3 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -21,6 +21,8 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ SRCREV = "3e8bd8d1bd70691f09a170785836aeb4f83154e6" S = "${WORKDIR}/git" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" + inherit autotools-brokensep pkgconfig systemd LVM2_PACKAGECONFIG = "dmeventd" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb index 3988d54910..a729324c9b 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb @@ -17,13 +17,16 @@ do_install:append() { install -d ${D}${sysconfdir}/lvm install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - oe_runmake 'DESTDIR=${D}' install install_systemd_units - sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service - else - oe_runmake 'DESTDIR=${D}' install install_initscripts - mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d - rm -rf ${D}${sysconfdir}/rc.d + # We don't want init scripts/systemd units for native SDK utilities + if [ "${PN}" != "nativesdk-lvm2" ]; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + oe_runmake 'DESTDIR=${D}' install install_systemd_units + sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service + else + oe_runmake 'DESTDIR=${D}' install install_initscripts + mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d + rm -rf ${D}${sysconfdir}/rc.d + fi fi } diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-inject_git.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-inject_git.bb index cc33cbaf28..8241bd2342 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-inject_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-inject_git.bb @@ -4,7 +4,7 @@ software level into a running Linux kernel. This is intended for \ validation of the kernel machine check handler." SECTION = "System Environment/Base" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git" +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git;branch=master" SRCREV = "4cbe46321b4a81365ff3aafafe63967264dbfec5" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb index 328f7c99ba..cfceaa1743 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb @@ -10,7 +10,7 @@ containment and recovery, ACPI/APEI support etc." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git \ +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git;branch=master \ file://makefile-remove-ldflags.patch \ file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_175.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_175.bb index b77709485f..c66dd0f971 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_175.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_175.bb @@ -5,7 +5,7 @@ and should run on all Linux systems that need error handling." HOMEPAGE = "http://mcelog.org/" SECTION = "System Environment/Base" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ file://0001-test-avoid-the-pfa-test-hang.patch \ file://run-ptest \ " diff --git a/meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb b/meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb index 797e91eae1..5deb5c66e3 100644 --- a/meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb +++ b/meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb @@ -6,7 +6,7 @@ DEPENDS = "ncurses libbsd" SECTION = "console/editors" SRCREV = "688f49cd67ab30dfa6482c74815e117cbf7af63a" -SRC_URI = "git://github.com/hboetes/mg \ +SRC_URI = "git://github.com/hboetes/mg;branch=master;protocol=https \ file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.29.0.bb b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.30.0.bb index 9528fe7354..1496243c15 100644 --- a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.29.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.30.0.bb @@ -15,7 +15,7 @@ SRC_URI = " \ file://monitrc \ " -SRC_URI[sha256sum] = "f665e6dd1f26a74b5682899a877934167de2b2582e048652ecf036318477885f" +SRC_URI[sha256sum] = "e85649dfa8586f4fcdd34a0295c55ddd69b0eda6cfbdac47105a2673d10b1008" DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index d4d6c6ba9c..69fd9dfde1 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -29,7 +29,7 @@ DEPENDS = "libdevmapper \ LICENSE = "GPLv2" -SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ +SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http;branch=master \ file://multipathd.oe \ file://multipath.conf.example \ file://0021-RH-fixup-udev-rules-for-redhat.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.9.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_6.0.bb index 85c81fb799..72558644f4 100644 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_6.0.bb @@ -13,7 +13,7 @@ RDEPENDS:${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[sha256sum] = "757db8cda4bb2873599e47783af463e3b547a627b0cabb30ea7bf71fb4c24937" +SRC_URI[sha256sum] = "93ac8cb68b4ad10e0aaeb80a2dd15c5bb89eb665a4844f7ad01c67efcb169ea2" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" diff --git a/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb index 295628c77b..0e16b15c97 100644 --- a/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e7fe20c9be97be5579e3ab5d92d3a218" SECTION = "libs" -SRC_URI = "git://github.com/projectNe10/Ne10.git \ +SRC_URI = "git://github.com/projectNe10/Ne10.git;branch=master;protocol=https \ file://0001-CMakeLists.txt-Remove-mthumb-interwork.patch \ file://0001-Dont-specify-march-explicitly.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch b/meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch new file mode 100644 index 0000000000..af79efed96 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch @@ -0,0 +1,175 @@ +From eba852316735daec27d4ff11483018ca596312d0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Oct 2021 02:11:49 -0700 +Subject: [PATCH] Fix a lot of -Werror=format-security errors with + mvprintw/mvwprintw + +In all these places a non-constant is used as a format string which +compiler complains about. Fix by using "%s" as format. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lmon16m.c | 86 +++++++++++++++++++++++++++---------------------------- + 1 file changed, 43 insertions(+), 43 deletions(-) + +diff --git a/lmon16m.c b/lmon16m.c +index 7e46642..1d53367 100644 +--- a/lmon16m.c ++++ b/lmon16m.c +@@ -5475,20 +5475,20 @@ int main(int argc, char **argv) + /* + *mvwprintw(padsmp,2, 0, "CPU User%% Sys%% Wait%% Idle|0 |25 |50 |75 100|"); + */ +- mvwprintw(padsmp, 1, 0, cpu_line); +- mvwprintw(padsmp, 2, 0, "CPU "); ++ mvwprintw(padsmp, 1, 0, "%s", cpu_line); ++ mvwprintw(padsmp, 2, 0, "%s", "CPU "); + COLOUR wattrset(padsmp, COLOR_PAIR(2)); /* Green */ +- mvwprintw(padsmp, 2, 4, "User%%"); ++ mvwprintw(padsmp, 2, 4, "%s", "User%%"); + COLOUR wattrset(padsmp, COLOR_PAIR(1)); /* Red */ +- mvwprintw(padsmp, 2, 9, " Sys%%"); ++ mvwprintw(padsmp, 2, 9, "%s", " Sys%%"); + COLOUR wattrset(padsmp, COLOR_PAIR(4)); /* Blue */ +- mvwprintw(padsmp, 2, 15, " Wait%%"); ++ mvwprintw(padsmp, 2, 15, "%s", " Wait%%"); + if (p->cpu_total.steal != q->cpu_total.steal) { + COLOUR wattrset(padsmp, COLOR_PAIR(5)); +- mvwprintw(padsmp, 2, 22, "Steal"); ++ mvwprintw(padsmp, 2, 22, "%s", "Steal"); + } else { + COLOUR wattrset(padsmp, COLOR_PAIR(0)); +- mvwprintw(padsmp, 2, 22, " Idle"); ++ mvwprintw(padsmp, 2, 22, "%s", " Idle"); + } + COLOUR wattrset(padsmp, COLOR_PAIR(0)); + mvwprintw(padsmp, 2, 27, +@@ -5579,8 +5579,8 @@ int main(int argc, char **argv) + /* lparcfg gathered above */ + if (lparcfg.smt_mode > 1 + && i % lparcfg.smt_mode == 0) { +- mvwprintw(padsmp, 3 + i, 27, "*"); +- mvwprintw(padsmp, 3 + i, 77, "*"); ++ mvwprintw(padsmp, 3 + i, 27, "%s", "*"); ++ mvwprintw(padsmp, 3 + i, 77, "%s", "*"); + } + #endif + +@@ -5597,7 +5597,7 @@ int main(int argc, char **argv) + 100.0); + } + } /* for (i = 0; i < cpus; i++) */ +- CURSE mvwprintw(padsmp, i + 3, 0, cpu_line); ++ CURSE mvwprintw(padsmp, i + 3, 0, "%s", cpu_line); + #ifdef POWER + /* proc_lparcfg called above in previous ifdef + */ +@@ -5673,7 +5673,7 @@ int main(int argc, char **argv) + 100.0); + } + +- CURSE mvwprintw(padsmp, i + 5, 0, cpu_line); ++ CURSE mvwprintw(padsmp, i + 5, 0, "%s", cpu_line); + i = i + 2; + } /* if (cpus > 1 || !cursed) */ + smp_first_time = 0; +@@ -5704,16 +5704,16 @@ int main(int argc, char **argv) + char *wide10 = + " 10%%-| |-10%%"; + +- mvwprintw(padwide, 1, 0, wide1); +- mvwprintw(padwide, 2, 0, wide2); +- mvwprintw(padwide, 3, 0, wide3); +- mvwprintw(padwide, 4, 0, wide4); +- mvwprintw(padwide, 5, 0, wide5); +- mvwprintw(padwide, 6, 0, wide6); +- mvwprintw(padwide, 7, 0, wide7); +- mvwprintw(padwide, 8, 0, wide8); +- mvwprintw(padwide, 9, 0, wide9); +- mvwprintw(padwide, 10, 0, wide10); ++ mvwprintw(padwide, 1, 0, "%s", wide1); ++ mvwprintw(padwide, 2, 0, "%s", wide2); ++ mvwprintw(padwide, 3, 0, "%s", wide3); ++ mvwprintw(padwide, 4, 0, "%s", wide4); ++ mvwprintw(padwide, 5, 0, "%s", wide5); ++ mvwprintw(padwide, 6, 0, "%s", wide6); ++ mvwprintw(padwide, 7, 0, "%s", wide7); ++ mvwprintw(padwide, 8, 0, "%s", wide8); ++ mvwprintw(padwide, 9, 0, "%s", wide9); ++ mvwprintw(padwide, 10, 0, "%s", wide10); + mvwprintw(padwide, 11, 0, + " CPU +1--------+10-------+20-------+30-------+40-------+50-------+60--+--0%%"); + mvwprintw(padwide, 1, 6, "CPU(s)=%d", cpus); +@@ -5755,16 +5755,16 @@ int main(int argc, char **argv) + rows = 12; + } + if (cpus > 63) { +- mvwprintw(padwide, rows + 0, 0, wide1); +- mvwprintw(padwide, rows + 1, 0, wide2); +- mvwprintw(padwide, rows + 2, 0, wide3); +- mvwprintw(padwide, rows + 3, 0, wide4); +- mvwprintw(padwide, rows + 4, 0, wide5); +- mvwprintw(padwide, rows + 5, 0, wide6); +- mvwprintw(padwide, rows + 6, 0, wide7); +- mvwprintw(padwide, rows + 7, 0, wide8); +- mvwprintw(padwide, rows + 8, 0, wide9); +- mvwprintw(padwide, rows + 9, 0, wide10); ++ mvwprintw(padwide, rows + 0, 0, "%s", wide1); ++ mvwprintw(padwide, rows + 1, 0, "%s", wide2); ++ mvwprintw(padwide, rows + 2, 0, "%s", wide3); ++ mvwprintw(padwide, rows + 3, 0, "%s", wide4); ++ mvwprintw(padwide, rows + 4, 0, "%s", wide5); ++ mvwprintw(padwide, rows + 5, 0, "%s", wide6); ++ mvwprintw(padwide, rows + 6, 0, "%s", wide7); ++ mvwprintw(padwide, rows + 7, 0, "%s", wide8); ++ mvwprintw(padwide, rows + 8, 0, "%s", wide9); ++ mvwprintw(padwide, rows + 9, 0, "%s", wide10); + mvwprintw(padwide, rows + 10, 0, + " CPU +65---+70-------+80-------+90-------+100------+110------+120-----+--0%%"); + if (wide_first_time) { +@@ -5813,16 +5813,16 @@ int main(int argc, char **argv) + rows = 23; + } + if (cpus > 127) { +- mvwprintw(padwide, rows + 0, 0, wide1); +- mvwprintw(padwide, rows + 1, 0, wide2); +- mvwprintw(padwide, rows + 2, 0, wide3); +- mvwprintw(padwide, rows + 3, 0, wide4); +- mvwprintw(padwide, rows + 4, 0, wide5); +- mvwprintw(padwide, rows + 5, 0, wide6); +- mvwprintw(padwide, rows + 6, 0, wide7); +- mvwprintw(padwide, rows + 7, 0, wide8); +- mvwprintw(padwide, rows + 8, 0, wide9); +- mvwprintw(padwide, rows + 9, 0, wide10); ++ mvwprintw(padwide, rows + 0, 0, "%s", wide1); ++ mvwprintw(padwide, rows + 1, 0, "%s", wide2); ++ mvwprintw(padwide, rows + 2, 0, "%s", wide3); ++ mvwprintw(padwide, rows + 3, 0, "%s", wide4); ++ mvwprintw(padwide, rows + 4, 0, "%s", wide5); ++ mvwprintw(padwide, rows + 5, 0, "%s", wide6); ++ mvwprintw(padwide, rows + 6, 0, "%s", wide7); ++ mvwprintw(padwide, rows + 7, 0, "%s", wide8); ++ mvwprintw(padwide, rows + 8, 0, "%s", wide9); ++ mvwprintw(padwide, rows + 9, 0, "%s", wide10); + mvwprintw(padwide, rows + 10, 0, + " CPU +129--------+140------+150------+160------+170------+180------+190--0%%"); + if (wide_first_time) { +@@ -8274,7 +8274,7 @@ I/F Name Recv=KB/s Trans=KB/s packin packout insize outsize Peak->Recv Trans + formatstring = + " PID %%CPU Size Res Res Res Res Shared Faults Command"; + } +- CURSE mvwprintw(padtop, 1, y, formatstring); ++ CURSE mvwprintw(padtop, 1, y, "%s", formatstring); + + if (show_args == ARGS_ONLY) { + formatstring = +@@ -8294,7 +8294,7 @@ I/F Name Recv=KB/s Trans=KB/s packin packout insize outsize Peak->Recv Trans + formatstring = + " Used KB Set Text Data Lib KB Min Maj "; + } +- CURSE mvwprintw(padtop, 2, 1, formatstring); ++ CURSE mvwprintw(padtop, 2, 1, "%s", formatstring); + for (j = 0; j < max_sorted; j++) { + i = topper[j].index; + if (!show_all) { diff --git a/meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch b/meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch index e8debe56af..5a8b046039 100644 --- a/meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch +++ b/meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch @@ -9,13 +9,13 @@ defines from sys/cdefs.h is used Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - lmon16g.c | 4 ++-- + lmon16m.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/lmon16g.c b/lmon16g.c +diff --git a/lmon16m.c b/lmon16m.c index cb27e09..d2a11c5 100644 ---- a/lmon16g.c -+++ b/lmon16g.c +--- a/lmon16m.c ++++ b/lmon16m.c @@ -63,7 +63,7 @@ static char *SccsId = "nmon " VERSION; #include <fcntl.h> #include <math.h> diff --git a/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16g.bb b/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16m.bb index 32b60fef9c..723da85d0f 100644 --- a/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16g.bb +++ b/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16m.bb @@ -2,17 +2,16 @@ SUMMARY = "nmon performance monitor" HOMEPAGE = "http://nmon.sf.net" SECTION = "console/utils" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://${WORKDIR}/Documentation.txt;md5=dbb13658cf55d687c4f2ff771a696d4a" +LIC_FILES_CHKSUM = "file://Documentation.txt;md5=dbb13658cf55d687c4f2ff771a696d4a" DEPENDS = "ncurses" DEPENDS:append:libc-musl = " bsd-headers" SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon${PV}.c;name=lmon \ ${SOURCEFORGE_MIRROR}/nmon/Documentation.txt;name=doc \ file://0001-lmon16g.c-Adjust-system-headers.patch \ -" -SRC_URI[lmon.md5sum] = "246ccfc74d5af55d992601fc4d3d4a72" -SRC_URI[lmon.sha256sum] = "da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688" -SRC_URI[doc.md5sum] = "dbb13658cf55d687c4f2ff771a696d4a" + file://0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch \ + " +SRC_URI[lmon.sha256sum] = "2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1" SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecca933869278" CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index 65e1500ae5..72ee1ee009 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -1,4 +1,4 @@ -From 8b67c22b057e158f61c9fdd5b01f37195c6f5ca4 Mon Sep 17 00:00:00 2001 +From 9937e89c22eb2f2db9a936e7bc4442857b4192f5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 18 Dec 2019 12:29:50 +0100 Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto @@ -15,19 +15,19 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 2 files changed, 5 insertions(+) diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index fe8c526..922f67c 100644 +index b38889f..4616aac 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile -@@ -125,6 +125,8 @@ else - DEFINES += -DNSS_X86 - endif +@@ -139,6 +139,8 @@ endif + endif + endif endif +ifdef NSS_USE_ARM_HW_CRYPTO + DEFINES += -DNSS_USE_ARM_HW_CRYPTO ifeq ($(CPU_ARCH),aarch64) ifdef CC_IS_CLANG DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 -@@ -166,6 +168,7 @@ endif +@@ -180,6 +182,7 @@ endif endif endif endif @@ -36,7 +36,7 @@ index fe8c526..922f67c 100644 ifeq ($(OS_TARGET),OSF1) DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c -index c2cc18d..b77f573 100644 +index ac461b4..04cb180 100644 --- a/nss/lib/freebl/gcm.c +++ b/nss/lib/freebl/gcm.c @@ -18,6 +18,7 @@ diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch index 3d90e2d951..eb6174a7b0 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch @@ -1,4 +1,4 @@ -From 8cea16e7550ae14494fbb3a8fe9f5452e6bd1407 Mon Sep 17 00:00:00 2001 +From 919fc5d674fae99fe21ba1351d98b75e466f425f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 22 Feb 2017 11:36:11 +0200 Subject: [PATCH] nss: fix support cross compiling @@ -15,7 +15,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 790372d..2563134 100644 +index 2012d18..78fca62 100644 --- a/nss/coreconf/arch.mk +++ b/nss/coreconf/arch.mk @@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) @@ -28,7 +28,7 @@ index 790372d..2563134 100644 # diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 52d827c..f99f769 100644 +index 0b8c6f4..b38889f 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile @@ -36,6 +36,12 @@ ifdef USE_64 diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch index e87dc9f76b..4c9bea30c0 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch @@ -1,4 +1,4 @@ -From c5b2c6327f3692ed07bf8d212123e0bf08485722 Mon Sep 17 00:00:00 2001 +From f613c9a9107435a40d91329f33f12cfb16927f07 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 7 Mar 2020 08:34:02 -0800 Subject: [PATCH] nss,nspr: Add recipes diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch index 6f02dbcb4b..735b06b5ca 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch @@ -1,4 +1,4 @@ -From 028ec9c7e9f7a6f083eec987f3ad7e7623398d9d Mon Sep 17 00:00:00 2001 +From 2ce67b1f4b1f582d556ae058da10698bbaa0edc1 Mon Sep 17 00:00:00 2001 From: Ovidiu Panait <ovidiu.panait@windriver.com> Date: Mon, 13 Jul 2020 12:12:31 +0300 Subject: [PATCH] nss: fix incorrect shebang of perl diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch index 224a5d236e..a1897f88d8 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch @@ -1,4 +1,4 @@ -From 2701905e689cf7c1ee7ca2d116f20b5bbc146431 Mon Sep 17 00:00:00 2001 +From f9b2b1c738576a17460aebd005f511f427aa1974 Mon Sep 17 00:00:00 2001 From: Wenzong Fan <wenzong.fan@windriver.com> Date: Sat, 7 Mar 2020 08:34:02 -0800 Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch index 7dbc1a3721..8c715cc447 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch @@ -1,4 +1,4 @@ -From dc51214895bcd63fc8eb8d1fe7941cd3e5500620 Mon Sep 17 00:00:00 2001 +From 73edfbdf33fe4e41724e7e947033d8caeec8f3d0 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Sat, 7 Mar 2020 08:34:02 -0800 Subject: [PATCH] nss:no rpath for cross compiling diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch index 5505ae36ac..589b4d5e7f 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch @@ -1,4 +1,4 @@ -From a550bdf458f11dff46ebddbac94cf48c27d3471e Mon Sep 17 00:00:00 2001 +From cbd367160338847b28fc801a12c74f1c8b5b03ee Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 7 Mar 2020 08:34:02 -0800 Subject: [PATCH] nss does not build on mips with clang because wrong types are @@ -16,7 +16,7 @@ Upstream-Status: Pending 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c -index 626b2fb..052ad36 100644 +index 1b03278..ad895b7 100644 --- a/nss/lib/freebl/pqg.c +++ b/nss/lib/freebl/pqg.c @@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H) diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.73.1.bb index c935c6a2ae..274e85d1f9 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.73.1.bb @@ -33,7 +33,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://nss-fix-nsinstall-build.patch \ file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ " -SRC_URI[sha256sum] = "d3175427172e9c3a6f1ebc74452cb791590f28191c6a1a443dbc0d87c9df1126" +SRC_URI[sha256sum] = "c768f9fe3129e8bcc2e9679456d7edd9453a225784a8fc7dc4501806f1fe9abe" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" diff --git a/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb b/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb index 9fd88ced95..831b15a455 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/Oblomov/clinfo" LICENSE = "CC0-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fd8857f774dfb0eefe1e80c8f9240a7e" -SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https" +SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https;branch=master" SRCREV = "59d0daf898e48d76ccbb788acbba258fa0a8ba7c" diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/ade_0.1.1f.bb b/meta-openembedded/meta-oe/recipes-support/opencv/ade_0.1.1f.bb index 12b71226ac..48a45143db 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/ade_0.1.1f.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/ade_0.1.1f.bb @@ -4,7 +4,7 @@ and processing framework. ADE Framework is suitable for \ organizing data flow processing and execution." HOMEPAGE = "https://github.com/opencv/ade" -SRC_URI = "git://github.com/opencv/ade.git \ +SRC_URI = "git://github.com/opencv/ade.git;branch=master;protocol=https \ file://0001-use-GNUInstallDirs-for-detecting-install-paths.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb index 8d557e0868..2f2a505ed3 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb @@ -38,13 +38,13 @@ IPP_FILENAME = "${@ipp_filename(d)}" IPP_MD5 = "${@ipp_md5sum(d)}" SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" -SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ - git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ - git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode \ +SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \ + git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib;branch=master;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face;protocol=https \ + git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode;protocol=https \ file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ file://0003-To-fix-errors-as-following.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ @@ -141,7 +141,7 @@ PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," inherit pkgconfig cmake -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'setuptools3-base', '', d)} inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/0001-build-top.mk-unset-STRIP_OPTS.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/0001-build-top.mk-unset-STRIP_OPTS.patch new file mode 100644 index 0000000000..9d25f2c599 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/0001-build-top.mk-unset-STRIP_OPTS.patch @@ -0,0 +1,38 @@ +From 321839cbd1d57f12d3d6695254d2003473d8dd1a Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 8 Dec 2021 16:58:55 +0800 +Subject: [PATCH] build/top.mk: unset STRIP_OPTS + +Unset STRIP_OPTS to disable strip to fix QA errors: + +ERROR: openldap-2.5.9-r0 do_package: QA Issue: File +'/usr/bin/ldapcompare' from openldap was already stripped, this will +prevent future debugging! [already-stripped] + +ERROR: openldap-2.5.9-r0 do_package: QA Issue: File +'/usr/bin/ldapdelete' from openldap was already stripped, this will +prevent future debugging! [already-stripped] + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + build/top.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/top.mk b/build/top.mk +index 38ce146..6e9fe1f 100644 +--- a/build/top.mk ++++ b/build/top.mk +@@ -60,7 +60,7 @@ INSTALL_PROGRAM = $(INSTALL) + INSTALL_DATA = $(INSTALL) -m 644 + INSTALL_SCRIPT = $(INSTALL) + +-STRIP_OPTS = -s ++STRIP_OPTS = + + LINT = lint + 5LINT = 5lint +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/0001-ldif-filter-fix-parallel-build-failure.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/0001-ldif-filter-fix-parallel-build-failure.patch new file mode 100644 index 0000000000..b42bd9764f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/0001-ldif-filter-fix-parallel-build-failure.patch @@ -0,0 +1,32 @@ +From 9e4ccd1e78ceac8de1ab66ee62ee216f1fbd4956 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Thu, 2 Dec 2021 11:38:15 +0800 +Subject: [PATCH] ldif-filter: fix parallel build failure + +Add slapd-common.o as dependency for ldif-filter to fix the parallel +build failure: + ld: cannot find slapd-common.o: No such file or directory + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + tests/progs/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in +index 13f1e8be2..e4f4ccf98 100644 +--- a/tests/progs/Makefile.in ++++ b/tests/progs/Makefile.in +@@ -56,7 +56,7 @@ slapd-modify: slapd-modify.o $(OBJS) $(XLIBS) + slapd-bind: slapd-bind.o $(OBJS) $(XLIBS) + $(LTLINK) -o $@ slapd-bind.o $(OBJS) $(LIBS) + +-ldif-filter: ldif-filter.o $(XLIBS) ++ldif-filter: ldif-filter.o $(OBJS) $(XLIBS) + $(LTLINK) -o $@ ldif-filter.o $(OBJS) $(LIBS) + + slapd-mtread: slapd-mtread.o $(OBJS) $(XLIBS) +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/0001-libraries-Makefile.in-ignore-the-mkdir-errors.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/0001-libraries-Makefile.in-ignore-the-mkdir-errors.patch new file mode 100644 index 0000000000..552726bb0a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/0001-libraries-Makefile.in-ignore-the-mkdir-errors.patch @@ -0,0 +1,33 @@ +From 690f69791eb6cd0d7e94b4d73219ee864de27f62 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Mon, 10 Jan 2022 10:13:51 +0800 +Subject: [PATCH] libraries/Makefile.in: ignore the mkdir errors + +Ignore the mkdir errors to fix the parallel build failure: + +../../build/shtool mkdir -p TOPDIR/tmp-glibc/work/cortexa15t2hf-neon-wrs-linux-gnueabi/openldap/2.5.9-r0/image/usr/lib +mkdir: cannot create directory 'TOPDIR/tmp-glibc/work/cortexa15t2hf-neon-wrs-linux-gnueabi/openldap/2.5.9-r0/image/usr/lib': File exists + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + libraries/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libraries/Makefile.in b/libraries/Makefile.in +index d9cb2ff..c6b251f 100644 +--- a/libraries/Makefile.in ++++ b/libraries/Makefile.in +@@ -24,7 +24,7 @@ PKGCONFIG_DIR=$(DESTDIR)$(libdir)/pkgconfig + PKGCONFIG_SRCDIRS=liblber libldap + + install-local: +- @$(MKDIR) $(PKGCONFIG_DIR) ++ @-$(MKDIR) $(PKGCONFIG_DIR) + @for i in $(PKGCONFIG_SRCDIRS); do \ + $(INSTALL_DATA) $$i/*.pc $(PKGCONFIG_DIR); \ + done +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch deleted file mode 100644 index b59db3939e..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch +++ /dev/null @@ -1,17 +0,0 @@ -# This patch ensures that the install operations which strip -# programs and libraries (LTINSTALL) work in a cross build -# environment. - -Upstream-Status: Pending - ---- a/build/top.mk -+++ b/build/top.mk -@@ -121,7 +121,7 @@ LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) - LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \ - $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD) - --LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) -+LTINSTALL = STRIPPROG="" $(LIBTOOL) --mode=install $(top_srcdir)/contrib/ldapc++/install-sh -c - LTFINISH = $(LIBTOOL) --mode=finish - - # Misc UNIX commands used in build environment diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch index 91bcc0435e..8cfd0033c8 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch @@ -1,14 +1,12 @@ From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/ -Upstream-status: Pending +Upstream-Status: Pending --- - ---- a/configure.in -+++ b/configure.in -@@ -1227,7 +1227,7 @@ if test $ol_link_tls = no ; then - ol_with_tls=gnutls +--- a/configure.ac ++++ b/configure.ac +@@ -1263,7 +1263,7 @@ if test $ol_link_tls = no ; then ol_link_tls=yes + WITH_TLS_TYPE=gnutls - TLS_LIBS="-lgnutls" + TLS_LIBS="-lgnutls -lgcrypt" diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch deleted file mode 100644 index ab5c4de66a..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch +++ /dev/null @@ -1,58 +0,0 @@ -openldap CVE-2015-3276 - -the patch comes from: -https://bugzilla.redhat.com/show_bug.cgi?id=1238322 -https://bugzilla.redhat.com/attachment.cgi?id=1055640 - -The nss_parse_ciphers function in libraries/libldap/tls_m.c in -OpenLDAP does not properly parse OpenSSL-style multi-keyword mode -cipher strings, which might cause a weaker than intended cipher to -be used and allow remote attackers to have unspecified impact via -unknown vectors. - -Upstream-Status: Pending - -CVE: CVE-2015-3276 - -Signed-off-by: Li Wang <li.wang@windriver.com> ---- - libraries/libldap/tls_m.c | 27 ++++++++++++++++----------- - 1 file changed, 16 insertions(+), 11 deletions(-) - ---- a/libraries/libldap/tls_m.c -+++ b/libraries/libldap/tls_m.c -@@ -620,18 +620,23 @@ nss_parse_ciphers(const char *cipherstr, - */ - if (mask || strength || protocol) { - for (i=0; i<ciphernum; i++) { -- if (((ciphers_def[i].attr & mask) || -- (ciphers_def[i].strength & strength) || -- (ciphers_def[i].version & protocol)) && -- (cipher_list[i] != -1)) { -- /* Enable the NULL ciphers only if explicity -- * requested */ -- if (ciphers_def[i].attr & SSL_eNULL) { -- if (mask & SSL_eNULL) -- cipher_list[i] = action; -- } else -+ /* if more than one mask is provided -+ * then AND logic applies (to match openssl) -+ */ -+ if ( cipher_list[i] == -1) ) -+ continue; -+ if ( mask && ! (ciphers_def[i].attr & mask) ) -+ continue; -+ if ( strength && ! (ciphers_def[i].strength & strength) ) -+ continue; -+ if ( protocol && ! (ciphers_def[i].version & protocol) ) -+ continue; -+ /* Enable the NULL ciphers only if explicity requested */ -+ if (ciphers_def[i].attr & SSL_eNULL) { -+ if (mask & SSL_eNULL) - cipher_list[i] = action; -- } -+ } else -+ cipher_list[i] = action; - } - } else { - for (i=0; i<ciphernum; i++) { diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch deleted file mode 100644 index 4d1fda96e4..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Pending - ---- a/build/openldap.m4 -+++ b/build/openldap.m4 -@@ -651,7 +651,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ - ]]) - - AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], --AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES -+[AC_LANG_SOURCE([[OL_PTHREAD_TEST_INCLUDES - - int main(argc, argv) - int argc; -@@ -659,7 +659,7 @@ int main(argc, argv) - { - OL_PTHREAD_TEST_FUNCTION - } --])) -+]])]) - dnl -------------------------------------------------------------------- - AC_DEFUN([OL_PTHREAD_TRY], [# Pthread try link: $1 ($2) - if test "$ol_link_threads" = no ; then diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/thread_stub.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/thread_stub.patch deleted file mode 100644 index 540ba4a635..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/thread_stub.patch +++ /dev/null @@ -1,20 +0,0 @@ -openldap: set pointer - -When the function ldap_pvt_thread_pool_getkey() succeeds, it -must set the value of *data since the caller may try to use it. - -Upstream-Status: pending - -Signed-off-by: Joe Slater <jslater@windriver.com> - - ---- a/libraries/libldap_r/thr_stub.c -+++ b/libraries/libldap_r/thr_stub.c -@@ -217,6 +217,7 @@ ldap_pvt_thread_pool_unidle ( ldap_pvt_t - int ldap_pvt_thread_pool_getkey ( - void *ctx, void *key, void **data, ldap_pvt_thread_pool_keyfree_t **kfree ) - { -+ if (data) *data = NULL; /* avoid problems with uninitialized *data */ - return(0); - } - diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/use-urandom.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/use-urandom.patch index 96a03369a7..0b7e3a28a6 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/use-urandom.patch +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/use-urandom.patch @@ -4,24 +4,21 @@ When we are cross-compiling, we want to assume that /dev/urandom exists. We could change the source code to look for it, but this is the easy way out. -Upstream-Status: pending +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Joe Slater <jslater@windriver.com> - ---- a/configure.in -+++ b/configure.in -@@ -2153,8 +2153,8 @@ fi +--- a/configure.ac ++++ b/configure.ac +@@ -2117,6 +2117,7 @@ AC_SUBST(systemdsystemunitdir) dnl ---------------------------------------------------------------- dnl Check for entropy sources +dev=no if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then -- dev=no + dev=no if test -r /dev/urandom ; then - dev="/dev/urandom"; - elif test -r /idev/urandom ; then -@@ -2167,9 +2167,11 @@ if test $cross_compiling != yes && test +@@ -2131,9 +2132,11 @@ if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then dev="/idev/random"; fi @@ -29,7 +26,7 @@ Signed-off-by: Joe Slater <jslater@windriver.com> - AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) - fi +elif test $cross_compiling == yes ; then -+ dev="/dev/urandom"; ++ dev="/dev/urandom"; +fi +if test $dev != no ; then + AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.58.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.5.9.bb index f9dc58a4c0..f3b8c6c987 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.58.bb +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.5.9.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html" # basically BSD. opensource.org does not record this license # at present (so it is apparently not OSI certified). LICENSE = "OpenLDAP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b6dea6c170362fc46381fe3690c722cb \ +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=5cc6ef74da4ad25d707c4f5903d64975 \ file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ " SECTION = "libs" @@ -15,27 +15,22 @@ SECTION = "libs" LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \ - file://openldap-m4-pthread.patch \ file://openldap-2.4.28-gnutls-gcrypt.patch \ file://use-urandom.patch \ file://initscript \ file://slapd.service \ - file://thread_stub.patch \ - file://openldap-CVE-2015-3276.patch \ file://remove-user-host-pwd-from-version.patch \ + file://0001-ldif-filter-fix-parallel-build-failure.patch \ + file://0001-build-top.mk-unset-STRIP_OPTS.patch \ + file://0001-libraries-Makefile.in-ignore-the-mkdir-errors.patch \ " -SRC_URI[md5sum] = "c203d735ba69976e5b28dc39006f29b5" -SRC_URI[sha256sum] = "57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b" +SRC_URI[md5sum] = "237fc2d881c27f8dd5d9f396e2865c11" +SRC_URI[sha256sum] = "c08e12f4ca5803d5d9f9948c70ad3491282cda3c17ec8b655dcbcb2364e6fb9e" DEPENDS = "util-linux groff-native" -# The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when -# installing .so and executables, this fails in cross compilation -# environments -SRC_URI += "file://install-strip.patch" - -inherit autotools-brokensep update-rc.d systemd +inherit autotools-brokensep update-rc.d systemd pkgconfig # CV SETTINGS # Required to work round AC_FUNC_MEMCMP which gets the wrong answer @@ -50,8 +45,8 @@ EXTRA_OECONF += "--with-yielding-select=yes" # Shared libraries are nice... EXTRA_OECONF += "--enable-dynamic" -PACKAGECONFIG ??= "gnutls modules \ - mdb ldap meta monitor null passwd shell proxycache dnssrv \ +PACKAGECONFIG ??= "asyncmeta gnutls modules \ + mdb ldap meta null passwd proxycache dnssrv \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " #--with-tls with TLS/SSL support auto|openssl|gnutls [auto] @@ -72,25 +67,20 @@ EXTRA_OECONF += "--enable-crypt" # The backend must be set by the configuration. This controls the # required database. # -# Backends="bdb dnssrv hdb ldap mdb meta monitor ndb null passwd perl relay shell sock sql" +# Backends="asyncmeta dnssrv ldap mdb meta ndb null passwd perl relay sock sql wt" # # Note that multiple backends can be built. The ldbm backend requires a -# build-time choice of database API. The bdb backend forces this to be -# DB4. To use the gdbm (or other) API the Berkely database module must -# be removed from the build. +# build-time choice of database API. To use the gdbm (or other) API the +# Berkely database module must be removed from the build. md = "${libexecdir}/openldap" # -#--enable-bdb enable Berkeley DB backend no|yes|mod yes -# The Berkely DB is the standard choice. This version of OpenLDAP requires -# the version 4 implementation or better. -PACKAGECONFIG[bdb] = "--enable-bdb=yes,--enable-bdb=no,db" + +#--enable-asyncmeta enable asyncmeta backend no|yes|mod no +PACKAGECONFIG[asyncmeta] = "--enable-asyncmeta=mod,--enable-asyncmeta=no" #--enable-dnssrv enable dnssrv backend no|yes|mod no PACKAGECONFIG[dnssrv] = "--enable-dnssrv=mod,--enable-dnssrv=no" -#--enable-hdb enable Hierarchical DB backend no|yes|mod no -PACKAGECONFIG[hdb] = "--enable-hdb=yes,--enable-hdb=no,db" - #--enable-ldap enable ldap backend no|yes|mod no PACKAGECONFIG[ldap] = "--enable-ldap=mod,--enable-ldap=no," @@ -100,9 +90,6 @@ PACKAGECONFIG[mdb] = "--enable-mdb=yes,--enable-mdb=no," #--enable-meta enable metadirectory backend no|yes|mod no PACKAGECONFIG[meta] = "--enable-meta=mod,--enable-meta=no," -#--enable-monitor enable monitor backend no|yes|mod yes -PACKAGECONFIG[monitor] = "--enable-monitor=mod,--enable-monitor=no," - #--enable-ndb enable MySQL NDB Cluster backend no|yes|mod [no] PACKAGECONFIG[ndb] = "--enable-ndb=mod,--enable-ndb=no," @@ -121,10 +108,6 @@ PACKAGECONFIG[perl] = "--enable-perl=mod,--enable-perl=no,perl" #--enable-relay enable relay backend no|yes|mod [yes] PACKAGECONFIG[relay] = "--enable-relay=mod,--enable-relay=no," -#--enable-shell enable shell backend no|yes|mod no -# configure: WARNING: Use of --without-threads is recommended with back-shell -PACKAGECONFIG[shell] = "--enable-shell=mod --without-threads,--enable-shell=no," - #--enable-sock enable sock backend no|yes|mod [no] PACKAGECONFIG[sock] = "--enable-sock=mod,--enable-sock=no," @@ -133,6 +116,10 @@ PACKAGECONFIG[sock] = "--enable-sock=mod,--enable-sock=no," # sqlite.h (which may be compatible but hasn't been tried.) PACKAGECONFIG[sql] = "--enable-sql=mod,--enable-sql=no,sqlite3" +#--enable-wt enable wt backend no|yes|mod no +# back-wt is marked currently as experimental +PACKAGECONFIG[wt] = "--enable-wt=mod,--enable-wt=no" + #--enable-dyngroup Dynamic Group overlay no|yes|mod no # This is a demo, Proxy Cache defines init_module which conflicts with the # same symbol in dyngroup @@ -176,7 +163,7 @@ FILES:${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${local ${sysconfdir}/openldap/DB_CONFIG.example ${systemd_unitdir}/system/*" FILES:${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp" FILES:${PN}-bin = "${bindir}" -FILES:${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so" +FILES:${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so ${libdir}/pkgconfig/*.pc" FILES:${PN}-dbg += "${libexecdir}/openldap/.debug" do_install:append() { @@ -189,7 +176,7 @@ do_install:append() { # Installing slapd under ${sbin} is more FHS and LSB compliance mv ${D}${libexecdir}/slapd ${D}/${sbindir}/slapd rmdir --ignore-fail-on-non-empty ${D}${libexecdir} - SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema" + SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema slapmodify" cd ${D}/${sbindir}/ rm -f ${SLAPTOOLS} for i in ${SLAPTOOLS}; do ln -sf slapd $i; done @@ -210,8 +197,6 @@ do_install:append() { -i ${D}${sysconfdir}/openldap/slapd.conf mkdir -p ${D}${localstatedir}/${BPN}/data - - } INITSCRIPT_PACKAGES = "${PN}-slapd" @@ -220,19 +205,16 @@ INITSCRIPT_PARAMS:${PN}-slapd = "defaults" SYSTEMD_SERVICE:${PN}-slapd = "hostapd.service" SYSTEMD_AUTO_ENABLE:${PN}-slapd ?= "disable" - PACKAGES_DYNAMIC += "^${PN}-backends.* ^${PN}-backend-.*" # The modules require their .so to be dynamicaly loaded -INSANE_SKIP:${PN}-backend-dnssrv += "dev-so" -INSANE_SKIP:${PN}-backend-ldap += "dev-so" -INSANE_SKIP:${PN}-backend-meta += "dev-so" -INSANE_SKIP:${PN}-backend-mdb += "dev-so" -INSANE_SKIP:${PN}-backend-monitor += "dev-so" -INSANE_SKIP:${PN}-backend-null += "dev-so" -INSANE_SKIP:${PN}-backend-passwd += "dev-so" -INSANE_SKIP:${PN}-backend-shell += "dev-so" - +INSANE_SKIP:${PN}-backend-asyncmeta += "dev-so" +INSANE_SKIP:${PN}-backend-dnssrv += "dev-so" +INSANE_SKIP:${PN}-backend-ldap += "dev-so" +INSANE_SKIP:${PN}-backend-meta += "dev-so" +INSANE_SKIP:${PN}-backend-mdb += "dev-so" +INSANE_SKIP:${PN}-backend-null += "dev-so" +INSANE_SKIP:${PN}-backend-passwd += "dev-so" python populate_packages:prepend () { backend_dir = d.expand('${libexecdir}/openldap') diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.22.0.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.22.0.bb index 44a0dccbba..f1ac7dff1c 100644 --- a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.22.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.22.0.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" #v0.21.0 SRCREV = "c902e1992195e00ada12d71beb1029287cd72037" -SRC_URI = "git://github.com/OpenSC/OpenSC \ +SRC_URI = "git://github.com/OpenSC/OpenSC;branch=master;protocol=https \ " DEPENDS = "virtual/libiconv openssl" diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp-native_5.3.5.bb b/meta-openembedded/meta-oe/recipes-support/pcp/pcp-native_5.3.5.bb new file mode 100644 index 0000000000..029a47531b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp-native_5.3.5.bb @@ -0,0 +1,49 @@ +require pcp.inc +inherit python3native native +#autotools-brokensep +DEPENDS = "python3-native python3-setuptools-native flex-native bison-native" + +export PCP_DIR = "${D}" +export PCP_TMP_DIR = "${D}/tmp" +export PCP_BIN_DIR = "${D}/usr/bin" + +B = "${S}" + +do_configure:prepend() { + export SED=${TMPDIR}/hosttools/sed + export AR=${TMPDIR}/hosttools/ar +# export PYTHON=python3 + + rm -rf ${S}/include/pcp/configsz.h + rm -rf ${S}/include/pcp/platformsz.h + +} +do_compile:prepend() { + sed -i -e "s,#undef HAVE_64BIT_LONG,,g" \ + -e "s,#undef HAVE_64BIT_PTR,,g" \ + -e "s,#undef PM_SIZEOF_SUSECONDS_T,,g" \ + -e "s,#undef PM_SIZEOF_TIME_T,,g" \ + ${S}/src/include/pcp/config.h.in + + export AR=${TMPDIR}/hosttools/ar +# export PYTHON=python3 +} + +do_compile() { + oe_runmake default_pcp +} + +do_install () { + oe_runmake install \ + PCP_ETC_DIR=${D}/${sysconfdir} \ + PCP_SYSCONF_DIR=${D}/${sysconfdir} \ + PCP_VAR_DIR=${D}/${localstatedir} \ + PCP_SHARE_DIR=${D}/${datadir} \ + PCP_BIN_DIR=${D}/${bindir} \ + PCP_BINADM_DIR=${D}/${libexecdir}/pcp/bin \ + PCP_LIBADM_DIR=${D}/${libdir} \ + PCP_LIB_DIR=${D}/${libdir} \ + PCP_MAN_DIR=${D}/${mandir} \ + PCP_DOC_DIR=${D}/${docdir} +} + diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp.inc b/meta-openembedded/meta-oe/recipes-support/pcp/pcp.inc new file mode 100644 index 0000000000..37b6c45f18 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp.inc @@ -0,0 +1,34 @@ +SUMMARY = "System-level performance monitoring and performance management" +HOMEPAGE = "http://www.pcp.io" +SECTION = "Applications/System" + +LICENSE = "GPLv2+ & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=37ab75b580d5aad4ada04260efa3702f \ + " +COMPATIBLE_HOST:libc-musl = "null" + +SRC_URI = "https://performancecopilot.jfrog.io/artifactory/pcp-source-release/pcp-5.3.5.src.tar.gz \ + file://config.linux \ + " + +SRC_URI[sha256sum] = "589a610f753a49af6d2015cede87e9d469bd07880ebef26fe1607b6ded375e97" + +inherit setuptools3-base pkgconfig autotools + +B = "${S}" + +# Specify any options you want to pass to the configure script using EXTRA_OECONF: +CACHED_CONFIGUREVARS = "PACKAGE_DISTRIBUTION=arch" +EXTRA_OECONF:append = " --with-dstat-symlink=yes --with-infiniband=no \ + --with-pmdapodman=no --with-python=no --with-python3=yes --with-perl=no \ + --with-pmdabcc=no --with-pmdajson=no --with-perfevent=no \ + --with-pmdabcc=yes \ + --with-rundir=${localstatedir}/run \ + --with-sysconfigdir=${sysconfdir} \ + --with-logdir=${localstatedir}/log \ + --with-docdir=${docdir} \ + " + +PACKAGECONFIG[qt5] = "--with-qt=yes --with-qt3d=yes,--with-qt=no --with-qt3d=no,qtbase qt3d" + +PACKAGECONFIG ?= "" diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch b/meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch new file mode 100644 index 0000000000..292499850e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch @@ -0,0 +1,45 @@ +From db9e6a4b7a48dee62fccb662347dd638a2d286d5 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Thu, 2 Dec 2021 14:29:06 +0900 +Subject: [PATCH] Remove unsuitble part for cross-compile. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + configure.ac | 6 ------ + src/libpcp/src/GNUmakefile | 1 - + 2 files changed, 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5b25382..5d24714 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -623,12 +623,6 @@ fi + which=$WHICH + AC_SUBST(which) + +-if test -z "$AR"; then +- AC_PATH_PROGS(AR, [gcc-ar ar], /usr/bin/ar) +-fi +-if test ! -x "$AR"; then +- AC_MSG_ERROR([cannot find a valid 'ar' command.]) +-fi + ar=$AR + AC_SUBST(ar) + +diff --git a/src/libpcp/src/GNUmakefile b/src/libpcp/src/GNUmakefile +index 3c4ccd6..d1eba19 100644 +--- a/src/libpcp/src/GNUmakefile ++++ b/src/libpcp/src/GNUmakefile +@@ -176,7 +176,6 @@ exports: exports.in mk.exports + # cases + # + check.done: $(OBJECTS) +- ./check-statics + touch check.done + + ifneq ($(LIBTARGET),) +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp/config.linux b/meta-openembedded/meta-oe/recipes-support/pcp/pcp/config.linux new file mode 100644 index 0000000000..191f87acc6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp/config.linux @@ -0,0 +1,13 @@ +sizeof_int=4 +sizeof_long=4 +sizeof_pointer=8 +sizeof_suseconds_t=8 +sizeof_time_t=8 +bit_field_scheme=2100 +enable_python3='yes' +enable_python3='true' +have_python_OrderedDict="true" +have_python=python3 +printf_p_prefix=0x +printf_fmt_int64=I64d +strtoint64=strtoll diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch b/meta-openembedded/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch new file mode 100644 index 0000000000..630f51a494 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch @@ -0,0 +1,11 @@ +--- a/qa/src/GNUlocaldefs ++++ b/qa/src/GNUlocaldefs +@@ -728,7 +728,7 @@ scale.o: localconfig.h + 779246.o: libpcp.h + aggrstore.o: libpcp.h + badmmv.o: libpcp.h +-chkacc1.o: libpcp.h ++chkacc1.o: libpcp.h localconfig.h + chkacc2.o: libpcp.h + chkacc3.o: libpcp.h + chkacc4.o: libpcp.h diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch b/meta-openembedded/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch new file mode 100644 index 0000000000..6fa864cd21 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch @@ -0,0 +1,29 @@ +Do not pass cr option + +These options are already coming from builddefs + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/src/include/builddefs.in ++++ b/src/include/builddefs.in +@@ -167,7 +167,7 @@ OBJECTS = $(ASFILES:.s=.o) \ + + #NB: don't override $(MAKE); gnumake sets it well, propagating -j etc. + #MAKE = @make@ +-AR = @ar@ ++AR = @ar@ cqs + CC = @cc@ + CXX = @cxx@ + LD = @ld@ +--- a/src/include/buildrules ++++ b/src/include/buildrules +@@ -93,7 +93,7 @@ $(STATICLIBTARGET) : $(SUBDIRS) $(OBJECT + ifeq ($(TARGET_OS), darwin) + libtool -static -o $(STATICLIBTARGET) $? + else +- $(AR) cr $(STATICLIBTARGET) $? ++ $(AR) $(STATICLIBTARGET) $? + endif + endif + diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp_5.3.5.bb b/meta-openembedded/meta-oe/recipes-support/pcp/pcp_5.3.5.bb new file mode 100644 index 0000000000..290dbaaf4b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp_5.3.5.bb @@ -0,0 +1,221 @@ +require pcp.inc +#inherit perlnative + +# NOTE: the following prog dependencies are unknown, ignoring: gtar gzip pkgmk xmlto lzma qshape md5sum pod2man publican git makedepend qmake-qt4 xconfirm true gmake xz dblatex hdiutil rpm bzip2 which mkinstallp dtrace seinfo qmake-qt5 gawk dlltool rpmbuild dpkg makepkg qmake echo +# NOTE: unable to map the following pkg-config dependencies: libmicrohttpd libsystemd-journal +# (this is based on recipes that have previously been built and packaged) +# NOTE: the following library dependencies are unknown, ignoring: nspr gen ibumad regex sasl2 pfm nss papi ibmad +# (this is based on recipes that have previously been built and packaged) +DEPENDS += "perl-native bison-native flex-native python3-native python3-setuptools python3 \ + pcp-native cairo zlib ncurses readline libx11 avahi openssl" + + +SRC_URI += "file://0001-Remove-unsuitble-part-for-cross-compile.patch \ + file://pass-options-to-AR.patch \ + file://fix_parallel_make.patch \ + " + +export PCP_DIR="${RECIPE_SYSROOT_NATIVE}" +#export PCP_RUN_DIR="${RECIPE_SYSROOT_NATIVE}" +EXTRA_OEMAKE = "CC="${CC}" LD="${LD}"" +inherit useradd systemd + +SYSTEMD_AUTO_ENABLE:${PN} = "enable" +SYSTEMD_SERVICE:${PN} = "pmcd.service pmcd.service pmie_check.service pmie_farm_check.service \ + pmlogger_daily.service pmlogger_farm_check.service pmfind.service \ + pmie_daily.service pmlogger.service pmlogger_daily_report.service \ + pmproxy.service pmie.service pmie_farm.service pmlogger_check.service \ + pmlogger_farm.service" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/lib/pcp --no-create-home \ + --user-group pcp" + +USERADD_PACKAGES = "${PN}-testsuite" +USERADD_PARAM:${PN}-testsuite = "--system --home ${localstatedir}/lib/pcp/testsuite --no-create-home \ + --user-group pcpqa" + +RDEPENDS:${PN} += "perl" +RDEPENDS:${PN}-testsuite += "${PN} bash perl" +RDEPENDS:python3-${PN} += "${PN} python3" + +do_configure:prepend () { + cp ${WORKDIR}/config.linux ${B} + rm -rf ${S}/include/pcp/configsz.h + rm -rf ${S}/include/pcp/platformsz.h + export SED=${TMPDIR}/hosttools/sed + export PYTHON=python3 +} + +do_compile:prepend() { + sed -i -e "s,#undef HAVE_64BIT_LONG,,g" \ + -e "s,#undef HAVE_64BIT_PTR,,g" \ + -e "s,#undef PM_SIZEOF_SUSECONDS_T,,g" \ + -e "s,#undef PM_SIZEOF_TIME_T,,g" \ + ${S}/src/include/pcp/config.h.in + sed -i -e "s,HAVE_PYTHON_ORDEREDDICT = false,HAVE_PYTHON_ORDEREDDICT = true,g" \ + ${S}/src/include/builddefs + sed -i -e "s,TOPDIR)/python3-pcp.list,TOPDIR)/python3-pcp.list --install-lib=${PYTHON_SITEPACKAGES_DIR},g" ${S}/src/python/GNUmakefile + export PYTHON=python3 + #export PYTHON3=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} +} + +do_compile() { + oe_runmake default_pcp +} + +do_install () { + export NO_CHOWN=true + oe_runmake install DIST_ROOT=${D}\ + install_pcp + + rm -rf ${D}${localstatedir}/log + rm -rf ${D}${localstatedir}/lib/pcp/pmcd + rm -rf ${D}${localstatedir}/lib/pcp/tmp + rm -rf ${D}${localstatedir}/run + mv ${D}${docdir}/C* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/I* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/R* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/V* ${D}${docdir}/pcp-doc/ + sed -i "s#PCP_AWK_PROG=.*#PCP_AWK_PROG=awk#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_WHICH_PROG=.*#PCP_WHICH_PROG=which#" ${D}/${sysconfdir}/pcp.conf +} + +PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ + libpcp-gui2 libpcp-gui2-dev \ + libpcp-import1 \ + libpcp-mmv1 libpcp-mmv1-dev \ + libpcp-pmda3 libpcp-pmda3-dev \ + libpcp-trace2 libpcp-trace2-dev \ + libpcp-web1 libpcp-web1-dev \ + libpcp3 libpcp3-dev python3-${PN}\ +" +FILES:libpcp-gui2 = "${libdir}/libpcp_gui.so.2 \ +" +FILES:libpcp-gui2-dev = " \ + ${libdir}/libpcp_gui.so \ + ${libdir}/libpcp_gui.a \ + ${includedir}/pmafm.h \ + ${includedir}/pmtime.h \ +" +FILES:libpcp-mmv1 = " \ + ${libdir}/libpcp_mmv.so.1 \ +" +FILES:libpcp-mmv1-dev = " \ + ${libdir}/libpcp_mmv.a \ + ${libdir}/libpcp_mmv.so \ + ${libdir}/libpcp_mmv.so \ + ${includedir}/mmv_stats.h \ + ${includedir}/mmv_dev.h \ + ${datadir}/man/man3/mmv_* \ + ${datadir}/man/man5/mmv.5.gz \ +" +FILES:libpcp-import1 = " \ + ${libdir}/libpcp_import.so.1 \ +" +FILES:libpcp-pmda3 = " \ + ${libdir}/libpcp_pmda.so.3 \ +" +FILES:libpcp-pmda3-dev = " \ + ${includedir}/pmda.h \ + ${includedir}/pmdaroot.h \ + ${libdir}/libpcp_pmda.a \ + ${libdir}/libpcp_pmda.so \ + ${libdir}/pkgconfig/libpcp_pmda.pc \ + ${datadir}/man/man3/PMDA.3.gz \ + ${datadir}/man/man3/pmda* \ +" +FILES:libpcp-trace2 = " \ + ${libdir}/libpcp_trace.so.2 \ +" +FILES:libpcp-trace2-dev = " \ + ${includedir}/trace.h \ + ${includedir}/trace_dev.h \ + ${libdir}/libpcp_trace.a \ + ${libdir}/libpcp_trace.so \ + ${datadir}/man/man3/pmtrace* \ +" +FILES:libpcp-web1 = " \ + ${libdir}/libpcp_web.so.1 \ +" +FILES:libpcp-web1-dev = " \ + ${includedir}/pmhttp.h \ + ${includedir}/pmjson.h \ + ${libdir}/libpcp_web.a \ + ${libdir}/libpcp_web.so \ + ${datadir}/man/man3/pmhttp* \ + ${datadir}/man/man3/pmjson* \ +" +FILES:libpcp3 = " \ + ${libdir}/libpcp.so.3 \ +" + +FILES:${PN} = " \ + ${sysconfdir}/pcp \ + ${sysconfdir}/cron.d \ + ${sysconfdir}/init.d \ + ${libexecdir} \ + ${bindir} \ + ${datadir}/bash-completion \ + ${datadir}/pcp-gui \ + ${datadir}/zsh \ + ${systemd_system_unitdir}/ \ + ${libdir}/pcp/ \ + ${datadir}/pcp \ + ${libdir}/*.sh \ + ${datadir}/man \ + ${libdir}/rc-proc.sh.minimal \ + ${sysconfdir}/p* \ + ${sysconfdir}/s* \ + ${localstatedir}/lib/pcp/config \ + ${localstatedir}/lib/pcp/pmdas/ \ + ${localstatedir}/lib/pcp/pmns \ + ${libdir}/libpcp_fault.so.3 \ +" + +FILES:${PN}-export-zabbix-agent += " \ + ${libdir}/zabbix \ + ${sysconfdir}/zabbix \ + ${mandir}/man3/zbxpcp.3.gz \ + ${libdir}/zabbix \ +" +FILES:${PN}-testsuite = "${localstatedir}/lib/pcp/testsuite/" +FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-dev += " \ + ${includedir}/pcp \ + ${libdir}/libpcp.a \ + ${libdir}/libpcp.so \ + ${localstatedir}/lib/pcp/pmdas/*/*.so \ + ${libexecdir}/pcp/bin/install-sh \ + ${libdir}/pkgconfig/libpcp.pc \ + ${libdir}/zabbix/modules/*.so \ + ${datadir}/man/man3/LOGIMPORT.3.gz \ + ${datadir}/man/man3/P* \ + ${datadir}/man/man3/Q* \ + ${datadir}/man/man3/__pm* \ + ${datadir}/man/man3/pmA* \ + ${datadir}/man/man3/pmC* \ + ${datadir}/man/man3/pmD* \ + ${datadir}/man/man3/pmE* \ + ${datadir}/man/man3/pmF* \ + ${datadir}/man/man3/pmG* \ + ${datadir}/man/man3/pmH* \ + ${datadir}/man/man3/pmI* \ + ${datadir}/man/man3/pmL* \ + ${datadir}/man/man3/pmM* \ + ${datadir}/man/man3/pmN* \ + ${datadir}/man/man3/pmO* \ + ${datadir}/man/man3/pmP* \ + ${datadir}/man/man3/pmR* \ + ${datadir}/man/man3/pmS* \ + ${datadir}/man/man3/pmT* \ + ${datadir}/man/man3/pmU* \ + ${datadir}/man/man3/pmW* \ + ${datadir}/man/man3/pmf* \ + ${datadir}/man/man3/pmg* \ + ${datadir}/man/man3/pmi* \ + ${datadir}/man/man3/pms* \ + ${datadir}/man/man3/pmt* \ +" diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb index 93b18ba1d5..d90dd43042 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb @@ -1,11 +1,11 @@ SUMMARY = "PC/SC Lite smart card framework and applications" HOMEPAGE = "http://pcsclite.alioth.debian.org/" -LICENSE = "BSD & GPLv3+" -LICENSE:${PN} = "BSD" -LICENSE:${PN}-lib = "BSD" -LICENSE:${PN}-doc = "BSD" -LICENSE:${PN}-dev = "BSD" -LICENSE:${PN}-dbg = "BSD & GPLv3+" +LICENSE = "BSD-3-Clause & GPLv3+" +LICENSE:${PN} = "BSD-3-Clause" +LICENSE:${PN}-lib = "BSD-3-Clause" +LICENSE:${PN}-doc = "BSD-3-Clause" +LICENSE:${PN}-dev = "BSD-3-Clause" +LICENSE:${PN}-dbg = "BSD-3-Clause & GPLv3+" LICENSE:${PN}-spy = "GPLv3+" LICENSE:${PN}-spy-dev = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6" diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.8.bb index a5825d5a9f..19654f15b1 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.8.bb @@ -3,9 +3,9 @@ HOMEPAGE = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f" -SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https" +SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master" -SRCREV = "34ac207adbba0d1a951b314c1676610a1d0bba01" +SRCREV = "53923ef8e98062c478f99e3bfcc8eb4654996c27" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb index 3d26b9364b..801300e707 100644 --- a/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb @@ -9,7 +9,7 @@ PV = "${BASEPV}+git${SRCPV}" SRCREV = "90385aabe2b51f39fa130627d46b377569f82d4a" -SRC_URI = "git://github.com/npat-efault/picocom \ +SRC_URI = "git://github.com/npat-efault/picocom;branch=master;protocol=https \ file://0001-Fix-building-with-musl.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb index 89d463699e..6c7802e18a 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb @@ -7,7 +7,7 @@ DEPENDS = "pidgin json-glib glib-2.0" inherit pkgconfig -SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=git" +SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=https" SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb index 02cd12bf4e..2f415de3d9 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb @@ -9,7 +9,7 @@ PV = "0.1+gitr${SRCPV}" inherit pkgconfig -SRC_URI = "git://github.com/EionRobb/icyque" +SRC_URI = "git://github.com/EionRobb/icyque;branch=master;protocol=https" SRCREV = "513fc162d5d1a201c2b044e2b42941436d1069d5" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb index 1a82495282..a29a445c90 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb @@ -7,7 +7,7 @@ DEPENDS = "pidgin json-glib glib-2.0 zlib" inherit pkgconfig -SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=git" +SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=https" SRCREV = "b226d1c457d73900ae89b8a7469247fbe33677a6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.0.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.0.bb index 5f63910983..c364f7220b 100644 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" DEPENDS = "libpcre zlib" SRC_URI = " \ - git://github.com/pocoproject/poco.git;branch=master \ + git://github.com/pocoproject/poco.git;branch=master;protocol=https \ file://0001-fix-missing-expat-definition.patch \ file://run-ptest \ " diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.10.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.01.0.bb index 164a348815..02df6d2163 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.01.0.bb @@ -7,7 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[sha256sum] = "964b5b16290fbec3fae57c2a5bcdea49bb0736bd750c3a3711c47995c9efc394" +SRC_URI[sha256sum] = "7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" diff --git a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb index ac360659ae..f34912ed28 100644 --- a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df" PV = "v190700" SRC_URI = " \ - git://github.com/PortAudio/portaudio.git \ + git://github.com/PortAudio/portaudio.git;branch=master;protocol=https \ file://0001-Find-jack.patch \ file://0001-cmake-Use-GNUInstallDirs.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb b/meta-openembedded/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb index 262f05f497..344dbcaafe 100644 --- a/meta-openembedded/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb @@ -4,8 +4,8 @@ HOMEPAGE = "http://linuxpps.org" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "cb48b7ecf7079ceba7081c78d4e61e507b0e8d2d" -SRC_URI = "git://github.com/ago/pps-tools.git" +SRCREV = "c50cb7183e252b47308fa22f420e0a877277aa29" +SRC_URI = "git://github.com/ago/pps-tools.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb b/meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb index a289d962e4..698fe7e497 100644 --- a/meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb +++ b/meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760" SRCREV = "166dbbeb3b0ab7e733b278e8f42a84f6882b8a25" -SRC_URI = "git://github.com/google/re2.git;branch=master" +SRC_URI = "git://github.com/google/re2.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb index 5a915c4766..996d8540fe 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb @@ -26,7 +26,7 @@ DEPENDS:append:libc-musl = " libexecinfo" LDFLAGS:append:libc-musl = " -lexecinfo" SRCREV = "045862cc7d7dd986b349c68131df2f86b9b1cd9c" -SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https" +SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master" S = "${WORKDIR}/git" inherit cmake features_check mime mime-xdg gtk-icon-cache pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index 3cdf78200f..2887f4d0b5 100644 --- a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -25,7 +25,7 @@ RDEPENDS:${PN} = "rsync \ SRCREV = "4dc82bfe6be3f83fcfa94946dcf6accfd6a18031" PV = "1.4.4+git${SRCPV}" -SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ +SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=https \ file://configure-fix-cmd_rsync.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb index bc2ec805e5..4d709fc526 100644 --- a/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" inherit autotools -SRC_URI = "git://github.com/sass/libsass.git;branch=master" +SRC_URI = "git://github.com/sass/libsass.git;branch=master;protocol=https" SRCREV = "f6afdbb9288d20d1257122e71d88e53348a53af3" PV = "3.6.5" diff --git a/meta-openembedded/meta-oe/recipes-support/sass/sassc_git.bb b/meta-openembedded/meta-oe/recipes-support/sass/sassc_git.bb index 407cbbddd0..9bb8c76e87 100644 --- a/meta-openembedded/meta-oe/recipes-support/sass/sassc_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/sass/sassc_git.bb @@ -6,7 +6,7 @@ DEPENDS = "libsass" inherit autotools pkgconfig -SRC_URI = "git://github.com/sass/sassc.git" +SRC_URI = "git://github.com/sass/sassc.git;branch=master;protocol=https" SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0" S = "${WORKDIR}/git" PV = "3.6.2" diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.38.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.39.bb index 4c0845a0fa..732a1440e0 100644 --- a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.38.bb +++ b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.39.bb @@ -7,10 +7,10 @@ LICENSE = "GPLv2" inherit autotools-brokensep python3native pkgconfig -SRC_URI = "git://github.com/abrt/satyr.git \ +SRC_URI = "git://github.com/abrt/satyr.git;branch=master;protocol=https \ file://0002-fix-compile-failure-against-musl-C-library.patch \ " -SRCREV = "ad0030f071b7ce7eb748eca3c31cb381038e2b21" +SRCREV = "f8a0dbfe7fcc6e44f03d66ca5c81363aea318380" S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/meta-openembedded/meta-oe/recipes-support/serial-utils/pty-forward-native.bb b/meta-openembedded/meta-oe/recipes-support/serial-utils/pty-forward-native.bb index 7f59b3ecad..87d9c52903 100644 --- a/meta-openembedded/meta-oe/recipes-support/serial-utils/pty-forward-native.bb +++ b/meta-openembedded/meta-oe/recipes-support/serial-utils/pty-forward-native.bb @@ -6,7 +6,7 @@ SECTION = "console/network" SRCREV = "00dbec2636ae0385ad028587e20e446272ff97ec" PV = "1.1+gitr${SRCPV}" -SRC_URI = "git://github.com/freesmartphone/cornucopia.git;protocol=https" +SRC_URI = "git://github.com/freesmartphone/cornucopia.git;protocol=https;branch=master" S = "${WORKDIR}/git/tools/serial_forward" inherit autotools native diff --git a/meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward_git.bb b/meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward_git.bb index 0ef829856c..dcad8f7104 100644 --- a/meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward_git.bb @@ -6,7 +6,7 @@ SECTION = "console/devel" SRCREV = "07c6fdede0870edc37a8d51d033b6e7e29aa7c91" PV = "1.1+gitr${SRCPV}" -SRC_URI = "git://github.com/freesmartphone/cornucopia.git \ +SRC_URI = "git://github.com/freesmartphone/cornucopia.git;branch=master;protocol=https \ file://0001-serial_forward-Disable-default-static-linking.patch;striplevel=3 \ " S = "${WORKDIR}/git/tools/serial_forward" diff --git a/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb b/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb index 43ee19afb8..3d07c01f07 100644 --- a/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb +++ b/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb @@ -5,7 +5,7 @@ DESCRIPTION = "This package contains low level utilities for devices that use th HOMEPAGE = "http://sg.danny.cz/sg/sg3_utils.html" SECTION = "console/admin" -LICENSE = "GPLv2+ & BSD" +LICENSE = "GPLv2+ & BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=f90da7fc52172599dbf082d7620f18ca" SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz \ diff --git a/meta-openembedded/meta-oe/recipes-support/smarty/smarty_3.1.39.bb b/meta-openembedded/meta-oe/recipes-support/smarty/smarty_3.1.39.bb index 50d9958384..c5b09a0c50 100644 --- a/meta-openembedded/meta-oe/recipes-support/smarty/smarty_3.1.39.bb +++ b/meta-openembedded/meta-oe/recipes-support/smarty/smarty_3.1.39.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3" DEPENDS = "php" -SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;tag=v${PV}" +SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;tag=v${PV};branch=master" FILES:${PN} = "${datadir}/php/smarty3/" diff --git a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.3.bb b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.3.bb index 0079cf7298..0d9a8c93d2 100644 --- a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/martinmoene/span-lite" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI += "git://github.com/martinmoene/span-lite" +SRC_URI += "git://github.com/martinmoene/span-lite;branch=master;protocol=https" SRCREV = "cbb9c3c5162a0d7018c7b3e053153a04d4fbbbb9" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb index c103c34936..ba6bbcce40 100644 --- a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRCREV = "eb3220622e73a4889eee355ffa37972b3cac3df5" -SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x; \ +SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x; \ file://0001-Enable-use-of-external-fmt-library.patch" DEPENDS += "fmt" diff --git a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb index bb41a33c14..8302576f43 100644 --- a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb @@ -5,12 +5,12 @@ LICENSE="GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381" BPV = "1.0.0" -PV = "${BPV}" -SRCREV = "f5d87954bd9e13689481700105efe2f42199d364" +PV = "1.0.1" +SRCREV = "87da3bfc03f3088e2e880b6b48195bb225fafeac" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=git" +SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=https;branch=master" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/srecord/files/libtool.patch b/meta-openembedded/meta-oe/recipes-support/srecord/files/libtool.patch new file mode 100644 index 0000000000..95063cea59 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/srecord/files/libtool.patch @@ -0,0 +1,67 @@ +Instead of just looking for a libtool binary, actually configure libtool. + +As the build doesn't use automake we need to manually set top_builddir in the Makefile. + +Upstream-Status: Inactive-Upstream [2014] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/Makefile.in b/Makefile.in +index a2b5494..aa0b8ca 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -36,6 +36,7 @@ + # + srcdir = @srcdir@ + VPATH = @srcdir@ ++top_builddir = @srcdir@ + + # + # the name of the install program to use +diff --git a/etc/configure.ac b/etc/configure.ac +index e444543..b137443 100644 +--- a/etc/configure.ac ++++ b/etc/configure.ac +@@ -161,42 +161,7 @@ AS_IF([test "x$with_gcrypt" != xno], AC_GCRYPT_SETUP()) + dnl! + dnl! Now look for libtool. + dnl! +-AC_CHECK_PROGS(LIBTOOL, libtool) +-if test -z "$LIBTOOL" +-then +- AC_MSG_RESULT([ +- You must have GNU Libtool installed to build srecord. +- Homepage: http://www.gnu.org/software/libtool/]) +- OK=no +- if apt-get --version > /dev/null 2> /dev/null; then +- AC_MSG_RESULT([ +- The following command may be used to install it: +- sudo apt-get install libtool +- ]) +- OK=yes +- fi +- if yum --version > /dev/null 2> /dev/null; then +- AC_MSG_RESULT([ +- The following command may be used to install it: +- sudo yum install libtool +- ]) +- OK=yes +- fi +- if pkg_info -a > /dev/null 2> /dev/null; then +- AC_MSG_RESULT([ +- The following command may be used to install it: +- sudo pkg_add -r libtool +- ]) +- OK=yes +- fi +- if test "$OK" != "yes"; then +- AC_MSG_RESULT([ +- If you are using a package based install, you will need the +- libtool package. +- ]) +- fi +- exit 1 +-fi ++LT_INIT + + dnl + dnl If the soelim program exists, and understands the -I option, diff --git a/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb b/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb index 4c34fa1bc3..6f9418b718 100644 --- a/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb +++ b/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8dfcbf2f0a144b97f0931b6394debea7" SRC_URI = " \ http://srecord.sourceforge.net/srecord-${PV}.tar.gz \ file://add-option-to-remove-docs.patch \ + file://libtool.patch \ " SRC_URI[md5sum] = "4de4a7497472d7972645c2af91313769" @@ -13,11 +14,18 @@ SRC_URI[sha256sum] = "49a4418733c508c03ad79a29e95acec9a2fbc4c7306131d2a8f5ef3201 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/srecord/files/releases" -DEPENDS = "libtool-native boost groff-native" +DEPENDS = "boost groff-native" inherit autotools-brokensep -EXTRA_OECONF = "--without-gcrypt LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" +do_configure:prepend() { + # To autoreconf we need the script in ${S}, we can't tell autotools to use + # etc/ because then it can't find the Makefile.in + ln -s ${S}/etc/configure.ac ${S} +} + +PACKAGECONFIG ??= "gcrypt" +PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,libgcrypt" # Set variable WITHOUT_DOC=0 to enable documentation generation EXTRA_OEMAKE = "WITHOUT_DOC=1" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch index 0e1d09492b..7334800304 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch @@ -38,7 +38,7 @@ index 0ccc2b9..7f08c0e 100644 -CONTROL_FILE=/var/run/syslog-ng.ctl -PID_FILE=/var/run/syslog-ng.pid +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist -+CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl ++CONTROL_FILE=@LOCALSTATEDIR@/run/syslog-ng/syslog-ng.ctl +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid OTHER_OPTIONS="--enable-core" -- diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-CMakeLists.txt-exclude-riscv64-riscv32.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-CMakeLists.txt-exclude-riscv64-riscv32.patch index ff6154808c..b34762710d 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-CMakeLists.txt-exclude-riscv64-riscv32.patch +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-CMakeLists.txt-exclude-riscv64-riscv32.patch @@ -11,32 +11,25 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> src/tbbmalloc/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/tbb/CMakeLists.txt b/src/tbb/CMakeLists.txt -index a6edb6ad..4f261813 100644 --- a/src/tbb/CMakeLists.txt +++ b/src/tbb/CMakeLists.txt -@@ -55,7 +55,7 @@ target_compile_definitions(tbb - PRIVATE - __TBB_BUILD) +@@ -58,7 +58,7 @@ target_compile_definitions(tbb + $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_DYNAMIC_LOAD_ENABLED=0> + $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_SOURCE_DIRECTLY_INCLUDED=1>) -if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64)" OR +if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64|riscv64|riscv32)" OR "${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64" OR WINDOWS_STORE OR TBB_WINDOWS_DRIVER)) -diff --git a/src/tbbmalloc/CMakeLists.txt b/src/tbbmalloc/CMakeLists.txt -index de7ca7ea..31e854fe 100644 --- a/src/tbbmalloc/CMakeLists.txt +++ b/src/tbbmalloc/CMakeLists.txt -@@ -28,7 +28,7 @@ target_compile_definitions(tbbmalloc - PRIVATE - __TBBMALLOC_BUILD) +@@ -30,7 +30,7 @@ target_compile_definitions(tbbmalloc + $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_DYNAMIC_LOAD_ENABLED=0> + $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_SOURCE_DIRECTLY_INCLUDED=1>) -if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64)" OR +if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64|riscv64|riscv32)" OR "${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64" OR WINDOWS_STORE OR - TBB_WINDOWS_DRIVER)) --- -2.17.1 - + TBB_WINDOWS_DRIVER OR diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-Disable-LTO-on-clang-riscv32.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-Disable-LTO-on-clang-riscv32.patch new file mode 100644 index 0000000000..662065635d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-Disable-LTO-on-clang-riscv32.patch @@ -0,0 +1,29 @@ +From 95a5c97122b7c5bdeba61f2e890bae9a961dd4bf Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 8 Dec 2021 10:01:22 -0800 +Subject: [PATCH] Disable LTO on clang/riscv + +With clang in OE LTO does not work as it does not seem to carry right +target info and mixes ABIs + +| Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi) +| /mnt/b/yoe/master/build/tmp/work/riscv32-yoe-linux/tbb/1_2021.4.0-r0/recipe-sysroot-native/usr/bin/riscv32-yoe-linux/riscv32-yoe-linux-ld: /tmp/lto-llvm-3fb1bf.o: can't link soft-float modules with double-float modules +| /mnt/b/yoe/master/build/tmp/work/riscv32-yoe-linux/tbb/1_2021.4.0-r0/recipe-sysroot-native/usr/bin/riscv32-yoe-linux/riscv32-yoe-linux-ld: failed to merge target specific data of file /tmp/lto-llvm-3fb1bf.o + +Upstream-Status: Inappropriate [ OE-Specific ] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + cmake/compilers/Clang.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/cmake/compilers/Clang.cmake ++++ b/cmake/compilers/Clang.cmake +@@ -60,7 +60,7 @@ endif() + + # Enabling LTO on Android causes the NDK bug. + # NDK throws the warning: "argument unused during compilation: '-Wa,--noexecstack'" +-if (NOT ANDROID_PLATFORM AND BUILD_SHARED_LIBS) ++if (NOT ANDROID_PLATFORM AND BUILD_SHARED_LIBS AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "(riscv32|riscv64|arm)") + set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>) + set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>) + endif() diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-Disable-use-of-_tpause-instruction.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-Disable-use-of-_tpause-instruction.patch index 7a4cc3e4e3..78051d7eef 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-Disable-use-of-_tpause-instruction.patch +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-Disable-use-of-_tpause-instruction.patch @@ -16,19 +16,14 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> src/tbb/scheduler_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/tbb/scheduler_common.h b/src/tbb/scheduler_common.h -index ee13dbf9..49052001 100644 --- a/src/tbb/scheduler_common.h +++ b/src/tbb/scheduler_common.h -@@ -219,7 +219,7 @@ inline void prolonged_pause_impl() { +@@ -220,7 +220,7 @@ inline void prolonged_pause_impl() { #endif inline void prolonged_pause() { --#if __TBB_WAITPKG_INTRINSICS_PRESENT && (_WIN32 || _WIN64 || __linux__) && (__TBB_x86_32 || __TBB_x86_64) +-#if __TBB_WAITPKG_INTRINSICS_PRESENT && (_WIN32 || _WIN64 || __unix__) && (__TBB_x86_32 || __TBB_x86_64) +#if 0 if (governor::wait_package_enabled()) { std::uint64_t time_stamp = machine_time_stamp(); // _tpause function directs the processor to enter an implementation-dependent optimized state --- -2.29.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch new file mode 100644 index 0000000000..355cf2e0bb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch @@ -0,0 +1,33 @@ +From a7289eeff4ac9e3ca2d2289672c923518433124c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 8 Dec 2021 09:26:58 -0800 +Subject: [PATCH] Musl/linux can not use RTLD_DEEPBIND + +Exclude non-glibc linux systems along with android +Fixes +src/tbb/dynamic_link.cpp:417:29: error: use + of undeclared identifier 'RTLD_DEEPBIND' | flags = flags | RTLD_DEEPBIND; +| ^ + +Upstream-Status: Submitted [https://github.com/oneapi-src/oneTBB/pull/684] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/tbb/dynamic_link.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp +index 12f35cfd..942c1c64 100644 +--- a/src/tbb/dynamic_link.cpp ++++ b/src/tbb/dynamic_link.cpp +@@ -413,7 +413,7 @@ namespace r1 { + int flags = RTLD_NOW; + if (local_binding) { + flags = flags | RTLD_LOCAL; +-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS ++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS + flags = flags | RTLD_DEEPBIND; + #endif + } else { +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-arena-Remove-dead-code.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-arena-Remove-dead-code.patch deleted file mode 100644 index 8a603ffe30..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-arena-Remove-dead-code.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b94a1e3d6b5c733ba24cfa0d35450d8659d48289 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 4 Jun 2021 13:07:28 -0700 -Subject: [PATCH] arena: Remove dead code - -Fixes clang warning -arena.cpp:226:19: error: variable 'drained' set b -ut not used [-Werror,-Wunused-but-set-variable] -| std::intptr_t drained = 0; -| ^ - -Upstream-Status: Submitted [https://github.com/oneapi-src/oneTBB/pull/429] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/tbb/arena.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/tbb/arena.cpp b/src/tbb/arena.cpp -index 4a9c0f8a..c8ed4999 100644 ---- a/src/tbb/arena.cpp -+++ b/src/tbb/arena.cpp -@@ -232,14 +232,13 @@ void arena::free_arena () { - __TBB_ASSERT( !my_global_concurrency_mode, NULL ); - #endif - poison_value( my_guard ); -- std::intptr_t drained = 0; - for ( unsigned i = 0; i < my_num_slots; ++i ) { - // __TBB_ASSERT( !my_slots[i].my_scheduler, "arena slot is not empty" ); - // TODO: understand the assertion and modify - // __TBB_ASSERT( my_slots[i].task_pool == EmptyTaskPool, NULL ); - __TBB_ASSERT( my_slots[i].head == my_slots[i].tail, NULL ); // TODO: replace by is_quiescent_local_task_pool_empty - my_slots[i].free_task_pool(); -- drained += mailbox(i).drain(); -+ mailbox(i).drain(); - my_slots[i].my_default_task_dispatcher->~task_dispatcher(); - } - __TBB_ASSERT(my_fifo_task_stream.empty(), "Not all enqueued tasks were executed"); --- -2.31.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch index 49325447e8..9af37ebc64 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch @@ -13,11 +13,9 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> src/tbbmalloc_proxy/proxy.cpp | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp -index f9942bf1..fe0dad89 100644 --- a/src/tbbmalloc_proxy/proxy.cpp +++ b/src/tbbmalloc_proxy/proxy.cpp -@@ -253,6 +253,7 @@ int mallopt(int /*param*/, int /*value*/) __THROW +@@ -260,6 +260,7 @@ int mallopt(int /*param*/, int /*value*/ return 1; } @@ -25,7 +23,7 @@ index f9942bf1..fe0dad89 100644 struct mallinfo mallinfo() __THROW { struct mallinfo m; -@@ -260,6 +261,7 @@ struct mallinfo mallinfo() __THROW +@@ -267,6 +268,7 @@ struct mallinfo mallinfo() __THROW return m; } @@ -33,6 +31,3 @@ index f9942bf1..fe0dad89 100644 #if __ANDROID__ // Android doesn't have malloc_usable_size, provide it to be compatible --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-set_my_tls_end_of_input-Use-an-arbitrary-but-valid-p.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-set_my_tls_end_of_input-Use-an-arbitrary-but-valid-p.patch deleted file mode 100644 index caa68e64c5..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-set_my_tls_end_of_input-Use-an-arbitrary-but-valid-p.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a996fd451bbd7be93cff5f466bff7282ae972fe1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 11 May 2021 10:52:51 -0700 -Subject: [PATCH] set_my_tls_end_of_input: Use an arbitrary but valid pointer - as value - -Pass a valid pointer to pthread_setspecific to avoid GCC 11 warning. -Fixes - -src/tbb/tls.h:44:46: error: 'int pthread_setspecific(pthread_key_t, const void*)' expecting 1 byte in a region of size 0 [-Werror=stringop-overread] -| 44 | void set( T value ) { pthread_setspecific(my_key, (void*)value); } -| | ~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~ -| compilation terminated due to -Wfatal-errors. - -Upstream-Status: Submitted [https://github.com/oneapi-src/oneTBB/pull/394] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/tbb/parallel_pipeline.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/tbb/parallel_pipeline.cpp b/src/tbb/parallel_pipeline.cpp -index b7655c6b..ca518b5b 100644 ---- a/src/tbb/parallel_pipeline.cpp -+++ b/src/tbb/parallel_pipeline.cpp -@@ -243,7 +243,8 @@ public: - return end_of_input_tls.get() != 0; - } - void set_my_tls_end_of_input() { -- end_of_input_tls.set(1); -+ // Use an arbitrary but valid pointer as value. -+ end_of_input_tls.set(array_size); - } - }; - --- -2.31.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch deleted file mode 100644 index fb10684cde..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5cac8b5fffa4ebf5f0090456c9e0cbf43827242a Mon Sep 17 00:00:00 2001 -From: Naveen Saini <naveen.kumar.saini@intel.com> -Date: Wed, 7 Apr 2021 11:32:52 +0800 -Subject: [PATCH] src/tbbmalloc/proxy.cpp: __GLIBC_PREREQ is not defined on - musl - -Do not call __GLIBC_PREREQ if it is not defined otherwise build will -fail on musl - -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> - -Upstream-Status: Submitted [https://github.com/oneapi-src/oneTBB/pull/203] - -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> -Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> ---- - src/tbbmalloc_proxy/proxy.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp -index fe0dad89..93e68049 100644 ---- a/src/tbbmalloc_proxy/proxy.cpp -+++ b/src/tbbmalloc_proxy/proxy.cpp -@@ -24,7 +24,8 @@ - // of aligned_alloc as required by new C++ standard, this makes it hard to - // redefine aligned_alloc here. However, running on systems with new libc - // version, it still needs it to be redefined, thus tricking system headers --#if defined(__GLIBC_PREREQ) && !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC -+#if defined(__GLIBC_PREREQ) -+#if !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC - // tell <cstdlib> that there is no aligned_alloc - #undef _GLIBCXX_HAVE_ALIGNED_ALLOC - // trick <stdlib.h> to define another symbol instead -@@ -32,7 +33,8 @@ - // Fix the state and undefine the trick - #include <cstdlib> - #undef aligned_alloc --#endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC -+#endif // defined(__GLIBC_PREREQ) -+#endif // !__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC - #endif // __linux__ && !__ANDROID__ - - #include "proxy.h" --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.5.0.bb index c726bef3b5..0d108f21ad 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.5.0.bb @@ -12,14 +12,13 @@ DEPENDS:append:libc-musl = " libucontext" PE = "1" BRANCH = "onetbb_2021" -SRCREV = "2dba2072869a189b9fdab3ffa431d3ea49059a19" +SRCREV = "3df08fe234f23e732a122809b40eb129ae22733f" SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ file://0001-mallinfo-is-glibc-specific-API-mark-it-so.patch \ - file://GLIBC-PREREQ-is-not-defined-on-musl.patch \ file://0001-CMakeLists.txt-exclude-riscv64-riscv32.patch \ file://0001-Disable-use-of-_tpause-instruction.patch \ - file://0001-set_my_tls_end_of_input-Use-an-arbitrary-but-valid-p.patch \ - file://0001-arena-Remove-dead-code.patch \ + file://0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch \ + file://0001-Disable-LTO-on-clang-riscv32.patch \ " S = "${WORKDIR}/git" @@ -51,3 +50,5 @@ LDFLAGS:append:libc-musl = " -lucontext" # The latest version of oneTBB does not support PPC COMPATIBLE_MACHINE:powerpc = "(!.*ppc).*" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.9.0.bb index 3f82734acd..0588e9be7b 100644 --- a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.9.0.bb @@ -7,12 +7,12 @@ SECTION = "devel" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/jthornber/thin-provisioning-tools;branch=main \ +SRC_URI = "git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ file://0001-do-not-strip-pdata_tools-at-do_install.patch \ file://use-sh-on-path.patch \ " -SRCREV = "5e5409f48b5403d2c6dffd9919b35ad77d6fb7b4" +SRCREV = "d6d93c3157631b242a13a81d30f75453e576c55a" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb b/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb index 3aecc6a76c..efc2795d58 100644 --- a/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://main.c;start_line=5;end_line=16;md5=9ae4bf20caf291afa # 0.2 version SRCREV = "8586d617aed19fc75f5ae1e07270752c1b2f9a30" -SRC_URI = "git://github.com/OSSystems/toscoterm.git" +SRC_URI = "git://github.com/OSSystems/toscoterm.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/tree/tree_1.8.0.bb b/meta-openembedded/meta-oe/recipes-support/tree/tree_2.0.1.bb index 01b1ac384c..9e1e787f10 100644 --- a/meta-openembedded/meta-oe/recipes-support/tree/tree_1.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/tree/tree_2.0.1.bb @@ -5,8 +5,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" SRC_URI = "http://mama.indstate.edu/users/ice/tree/src/${BP}.tgz" -SRC_URI[md5sum] = "715191c7f369be377fc7cc8ce0ccd835" -SRC_URI[sha256sum] = "715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2" +SRC_URI[sha256sum] = "e3339c5a194cf6b4080f15ec59faa3679f02d5a793b2147912fbfcfb4cdf2239" # tree's default CFLAGS for Linux CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.9.3.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb index de8249e289..ec13cfa26b 100644 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.9.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb @@ -17,8 +17,8 @@ DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" RDEPENDS:${PN} = "acl" -SRC_URI = "git://github.com/storaged-project/udisks.git;branch=2.9.x-branch" -SRCREV = "c430dd9a27e158693cc783e9ee91bf6e5b2a8819" +SRC_URI = "git://github.com/storaged-project/udisks.git;branch=2.9.x-branch;protocol=https" +SRCREV = "001c486e6d099ed33e2de4f5c73c03e3ee180f81" S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" diff --git a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.4.0.bb b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.4.0.bb index 44aeaed099..e8587ea265 100644 --- a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.4.0.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRCREV = "014b55ac5d1d7fb46a8f1eefe9fc3b87ea65a75f" -SRC_URI = "git://github.com/mvp/${BPN}" +SRC_URI = "git://github.com/mvp/${BPN};branch=master;protocol=https" S = "${WORKDIR}/git" # uhubctl gets its program version from "git describe". As we use the source diff --git a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb index 2a0188649c..f0f3a66e07 100644 --- a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${WORKDIR}/license.html;beginline=43;endline=83;md5=cf6c4777b109bcee78b6083a21be6192" SRC_URI = " \ - https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd \ + https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd;downloadfilename=unicode-ucd-${PV}.zip \ https://www.unicode.org/license.html;name=license \ " SRC_URI[ucd.sha256sum] = "033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600" diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.13.bb index ad302a0e1c..1059763169 100644 --- a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.13.bb @@ -4,13 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" DEPENDS = "intltool-native libusb1 libgudev glib-2.0 dbus-glib" -SRC_URI = " \ - http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ -" -SRC_URI[md5sum] = "abe6acb617f11f2e8dbd9846fcf86e24" -SRC_URI[sha256sum] = "64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef" +SRC_URI = "git://gitlab.freedesktop.org/upower/upower.git;protocol=https;branch=master" +SRCREV = "0f6cc0a10be22d7ddd684e1cd851e4364a440494" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "UPOWER_(?P<pver>\d+(\_\d+)+)" -inherit autotools pkgconfig gettext gobject-introspection systemd +inherit autotools pkgconfig gtk-doc gettext gobject-introspection systemd PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" @@ -24,6 +24,9 @@ SYSTEMD_SERVICE:${PN} = "upower.service" SYSTEMD_AUTO_ENABLE = "disable" do_configure:prepend() { + touch ${S}/ABOUT-NLS + mkdir -p ${S}/build-aux + touch ${S}/build-aux/config.rpath sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am sed -i -e 's: doc : :g' ${S}/Makefile.am } diff --git a/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.5.bb b/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.6.bb index f506223589..0d45a15595 100644 --- a/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.6.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=fcc5a53146c2401f4b4f6a3bdf3f0168" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${BP}/${BP}.tar.gz" -SRC_URI[sha256sum] = "1987466a798becb5441a491d29e762ab1a4817a525f82ef239e3d38f85605a77" +SRC_URI[sha256sum] = "10e6f90d359c1087c45f907f95e527a8aca84422251081d1533231e031a084ff" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.3.0.bb index b512f8c67d..ef15613586 100644 --- a/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.3.0.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=736712b5904dd42f8678df7172bc5f2b" SRCREV = "e493aa90a2833b4655927598f169c31cfcdf7861" SRC_URI = "\ - git://github.com/troydhanson/${BPN}.git \ + git://github.com/troydhanson/${BPN}.git;branch=master;protocol=https \ file://run-ptest \ " diff --git a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb index a5a881d1fe..d06f6702f7 100644 --- a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" inherit autotools -SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http \ +SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http;branch=master \ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ " SRCREV = "9752b50e922572e4cd214ac45ed95e4ee410fe24" diff --git a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb index ca74d911f8..12231f6a90 100644 --- a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb @@ -9,7 +9,7 @@ DEPENDS += "mtdev utouch-evemu" inherit autotools pkgconfig -SRC_URI = "git://bitmath.org/git/frame.git;protocol=http \ +SRC_URI = "git://bitmath.org/git/frame.git;protocol=http;branch=master \ file://remove-man-page-creation.patch \ file://0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch \ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb index 04d1f3fc7f..b4322ab3de 100644 --- a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb @@ -9,7 +9,7 @@ inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "git://bitmath.org/git/mtview.git;protocol=http" +SRC_URI = "git://bitmath.org/git/mtview.git;protocol=http;branch=master" SRCREV = "ad437c38dc111cf3990a03abf14efe1b5d89604b" DEPENDS += "mtdev utouch-frame utouch-evemu libx11" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-utils-fix-build-against-5.15-libc-headers-headers.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-utils-fix-build-against-5.15-libc-headers-headers.patch new file mode 100644 index 0000000000..6c11f1d4ca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-utils-fix-build-against-5.15-libc-headers-headers.patch @@ -0,0 +1,62 @@ +From 7213a5bfa3bd9f360d6be01e6dbd59d91095a0fd Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 4 Nov 2021 14:53:46 -0400 +Subject: [PATCH] utils: fix build against 5.15 libc-headers headers + +In kernel v5.15+ stdarg.h is part of the kernel source, and the +upstream project has a change to prefer that stdarg.h to the +c-library variant and hence includes it as <linux/stdarg.h>, which +leads to the following build error: + + | In file included from ../vboxsf/include/iprt/types.h:34, + | from ../vboxsf/include/iprt/string.h:33, + | from mount.vboxsf.c:53: + | ../vboxsf/include/iprt/stdarg.h:49:13: fatal error: linux/stdarg.h: No such file or directory + | 49 | # include <linux/stdarg.h> + | | ^~~~~~~~~~~~~~~~ + +If we modify our build of the vboxdrivers to have the kernel source +directory on the include path (to find linux/stdarg.h, that leads +to the following errors: + + In file included from build/tmp/work/qemux86_64-poky-linux/vboxguestdrivers/6.1.28-r0/recipe-sysroot/usr/include/stdlib.h:394, + | from mount.vboxsf.c:36: + | build/tmp/work/qemux86_64-poky-linux/vboxguestdrivers/6.1.28-r0/recipe-sysroot/usr/include/sys/types.h:192:20: note: previous declaration of 'blkcnt_t' with type 'blkcnt_t' {aka 'long int'} + | 192 | typedef __blkcnt_t blkcnt_t; /* Type to count number of disk blocks. */ + | | ^~~~~~~~ + | In file included from build/tmp/work-shared/qemux86-64/kernel-source/include/linux/time.h:5, + | from poky/build/tmp/work-shared/qemux86-64/kernel-source/include/linux/stat.h:19, + | from build/tmp/work/qemux86_64-poky-linux/vboxguestdrivers/6.1.28-r0/recipe-sysroot/usr/include/bits/statx.h:31, + +Our libc-headers are safe and don't lead to the potential conflicing +information that the upstream commit is guarding against. The easiest +solution is to revert the upstream change and trust our headers. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + vboxsf/include/iprt/stdarg.h | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/include/iprt/stdarg.h b/include/iprt/stdarg.h +index c73093c..7bffde5 100644 +--- a/include/iprt/stdarg.h ++++ b/include/iprt/stdarg.h +@@ -44,12 +44,7 @@ + # define __builtin_stdarg_start __builtin_va_start + # endif + # elif defined(RT_OS_LINUX) && defined(IN_RING0) +-# include "linux/version.h" +-# if RTLNX_VER_MIN(5,15,0) +-# include <linux/stdarg.h> +-# else +-# include <stdarg.h> +-# endif ++# include <stdarg.h> + # else + # include <stdarg.h> + # endif +-- +2.19.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.30.bb index 0265e38f5f..099d82ae42 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.30.bb @@ -13,10 +13,10 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ + file://0001-utils-fix-build-against-5.15-libc-headers-headers.patch \ " -SRC_URI[md5sum] = "c6efae8dc115b90c6124e13126794c4f" -SRC_URI[sha256sum] = "8d34993d8e9c0cf35e7bd44dd26c8c757f17a3b7d5a64052f945d00fd798ebfe" +SRC_URI[sha256sum] = "3c60a29375549ffc148aaebe859be91b27c19d6fa2deefde1373c4f6da8f18ef" S ?= "${WORKDIR}/vbox_module" S:task-patch = "${WORKDIR}/${VBOX_NAME}" diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb index 4237801547..a6f2186e4e 100644 --- a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=4d168d763c111f4ffc62249870e4e0ea" DEPENDS = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'openssl boost zlib', '', d)} " -SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https \ +SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https;branch=master \ file://0001-cmake-Use-GNUInstallDirs.patch \ file://855.patch \ file://857.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb b/meta-openembedded/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb index d100030f9b..c161781989 100644 --- a/meta-openembedded/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb @@ -7,7 +7,7 @@ SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SRC_URI = "git://github.com/jmacd/xdelta.git;branch=release3_1_apl" +SRC_URI = "git://github.com/jmacd/xdelta.git;branch=release3_1_apl;protocol=https" SRCREV = "4b4aed71a959fe11852e45242bb6524be85d3709" S = "${WORKDIR}/git/xdelta3" diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.32.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.33.bb index 15da5aa6cb..0cca2fe774 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.32.bb +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.33.bb @@ -22,7 +22,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ file://ensure-search-path-non-host.patch \ " -SRC_URI[sha256sum] = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043" +SRC_URI[sha256sum] = "26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931" inherit autotools-brokensep ptest pkgconfig @@ -63,3 +63,5 @@ do_install:append() { do_install_ptest () { oe_runmake -C ${S}/examples DESTDIR=${D}${PTEST_PATH} ${PTEST_EXTRA_ARGS} install-ptest } + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb b/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.18.bb index 25dbe1379c..eadf8c1b0b 100644 --- a/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.18.bb @@ -10,16 +10,14 @@ DEPENDS = "virtual/libx11 xserver-xorg xrdp nasm-native" inherit features_check REQUIRED_DISTRO_FEATURES = "x11 pam" -SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git" +SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git;branch=devel;protocol=https" -SRCREV = "c122544f184d4031bbae1ad80fbab554c34a9427" +SRCREV = "752b7659773a11ca6d4600645547c06fdb8a23d9" -PV = "0.2.5" +PV = "0.2.18" S = "${WORKDIR}/git" FILES:${PN} += "${libdir}/xorg/modules/*" INSANE_SKIP:${PN} += "xorg-driver-abi" - -PNBLACKLIST[xorgxrdp] ?= "Depends on xrdp which needs porting to openssl 3.x" diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.17.bb b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.18.bb index e933c6679f..7ec6ae15f6 100644 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.17.bb +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.18.bb @@ -6,19 +6,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=72cfbe4e7bd33a0a1de9630c91195c21 \ inherit features_check autotools pkgconfig useradd systemd -DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native" +DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native imlib2 pixman libsm" REQUIRED_DISTRO_FEATURES = "x11 pam" -SRC_URI = "git://github.com/neutrinolabs/xrdp.git;branch=devel \ +SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ file://xrdp.sysconfig \ file://0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch \ file://0001-Fix-the-compile-error.patch \ file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ " -SRCREV = "58088324956d94fd2eb5e7694a318cccec6990f1" -S = "${WORKDIR}/git" +SRC_URI[sha256sum] = "c5eea0af055fac90c632e44fb667f1a25c55de2e34b37127e4cb0aabaef90a0f" + +CFLAGS += " -Wno-deprecated-declarations" PACKAGECONFIG ??= "" PACKAGECONFIG[fuse] = " --enable-fuse, --disable-fuse, fuse" @@ -36,7 +37,9 @@ FILES:${PN}-dev += "${libdir}/xrdp/libcommon.so \ ${libdir}/xrdp/libscp.so \ ${libdir}/xrdp/libxrdpapi.so " -EXTRA_OECONF = "--enable-pam-config=suse" +EXTRA_OECONF = "--enable-pam-config=suse --enable-fuse \ + --enable-pixman --enable-painter --enable-vsock \ + --enable-ipv6 --with-imlib2 --with-socketdir=${localstatedir}/run/${PN}" do_configure:prepend() { cd ${S} @@ -48,12 +51,7 @@ do_compile:prepend() { sed -i 's/(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am/(MAKE) $(AM_MAKEFLAGS) install-exec-am/g' ${S}/keygen/Makefile.in } - do_install:append() { - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/xrdp - install -d ${D}${sysconfdir}/xrdp/pam.d - install -d ${D}${sysconfdir}/sysconfig/xrdp # deal with systemd unit files install -d ${D}${systemd_unitdir}/system @@ -63,11 +61,8 @@ do_install:append() { sed -i -e 's,@sysconfdir@,${sysconfdir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service sed -i -e 's,@sbindir@,${sbindir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service + install -d ${D}${sysconfdir}/sysconfig/xrdp install -m 0644 ${S}/instfiles/*.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/sesman/sesman.ini.in ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/sesman/startwm.sh ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/xrdp/xrdp.ini.in ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/xrdp/xrdp_keyboard.ini ${D}${sysconfdir}/xrdp/ install -m 0644 ${S}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ install -m 0644 ${WORKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ chown xrdp:xrdp ${D}${sysconfdir}/xrdp @@ -92,4 +87,3 @@ pkg_postinst:${PN}() { fi fi } -PNBLACKLIST[xrdp] ?= "Needs porting to openssl 3.x" diff --git a/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb b/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb index 9d359d6244..e38303781d 100644 --- a/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6a8aaf0595c2efc1a9c2e0913e9c1a2c" # yaml-cpp releases are stored as archive files in github. # download the exact revision of release -SRC_URI = "git://github.com/jbeder/yaml-cpp.git" +SRC_URI = "git://github.com/jbeder/yaml-cpp.git;branch=master;protocol=https" SRCREV = "9a3624205e8774953ef18f57067b3426c1c5ada6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb index 39d3894ff7..d956a841aa 100644 --- a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb @@ -9,7 +9,7 @@ SECTION = "graphics" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5e9ee833a2118adc7d8b5ea38e5b1cef" -SRC_URI = "git://github.com/mchehab/zbar.git;branch=master \ +SRC_URI = "git://github.com/mchehab/zbar.git;branch=master;protocol=https \ file://0001-qt-Create-subdir-in-Makefile.patch \ file://0002-zbarcam-Create-subdir-in-Makefile.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.4.1.bb b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.5.0.bb index 30e83457c9..ffbb37c8a1 100644 --- a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.5.0.bb @@ -6,11 +6,9 @@ HOMEPAGE = "https://github.com/bats-core/bats-core" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2970203aedf9e829edb96a137a4fe81b" -SRC_URI = "git://github.com/bats-core/bats-core.git \ - file://0001-install.sh-consider-multilib.patch \ - " +SRC_URI = "git://github.com/bats-core/bats-core.git;branch=master;protocol=https" # v1.4.1 -SRCREV = "54e965fa9d269c2b3ff9036d81f32bac3df0edea" +SRCREV = "99d64eb017abcd6a766dd0d354e625526da69cb3" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch b/meta-openembedded/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch deleted file mode 100644 index c7393ca2ed..0000000000 --- a/meta-openembedded/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6e3d01f1ff199383b78a7504858c374fbce05f4e Mon Sep 17 00:00:00 2001 -From: Kai Kang <kai.kang@windriver.com> -Date: Thu, 10 Jun 2021 11:11:07 +0800 -Subject: [PATCH] install.sh: consider multilib - -It may install files to /usr/lib64 when multilib is enabled. Add an -optional parameter for install.sh to support it. - -Upstream-Status: Submitted [https://github.com/bats-core/bats-core/pull/452] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - install.sh | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/install.sh b/install.sh -index e660866..d91159e 100755 ---- a/install.sh -+++ b/install.sh -@@ -4,6 +4,7 @@ set -e - - BATS_ROOT="${0%/*}" - PREFIX="$1" -+BASELIB="${2:-lib}" - - if [[ -z "$PREFIX" ]]; then - printf '%s\n' \ -@@ -12,10 +13,10 @@ if [[ -z "$PREFIX" ]]; then - exit 1 - fi - --install -d -m 755 "$PREFIX"/{bin,libexec/bats-core,lib/bats-core,share/man/man{1,7}} -+install -d -m 755 "$PREFIX"/{bin,libexec/bats-core,${BASELIB}/bats-core,share/man/man{1,7}} - install -m 755 "$BATS_ROOT/bin"/* "$PREFIX/bin" - install -m 755 "$BATS_ROOT/libexec/bats-core"/* "$PREFIX/libexec/bats-core" --install -m 755 "$BATS_ROOT/lib/bats-core"/* "$PREFIX/lib/bats-core" -+install -m 755 "$BATS_ROOT/lib/bats-core"/* "$PREFIX/${BASELIB}/bats-core" - install -m 644 "$BATS_ROOT/man/bats.1" "$PREFIX/share/man/man1" - install -m 644 "$BATS_ROOT/man/bats.7" "$PREFIX/share/man/man7" - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.7.bb b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.7.bb index 3eda96c731..ed50f659d3 100644 --- a/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.7.bb +++ b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.7.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/catchorg/Catch2" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI = "git://github.com/catchorg/Catch2.git;branch=v2.x" +SRC_URI = "git://github.com/catchorg/Catch2.git;branch=v2.x;protocol=https" SRCREV = "c4e3767e265808590986d5db6ca1b5532a7f3d13" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb b/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb index 59626df07a..554d582a57 100644 --- a/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV = "a4fc3dd7705c277e3a57432895e9852ea105dac9" PV .= "+git${SRCPV}" -SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git \ +SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=master \ file://run-ptest \ " diff --git a/meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb b/meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb index e84e03cdb2..921143a74c 100644 --- a/meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb +++ b/meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb @@ -5,7 +5,7 @@ SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177" -SRC_URI = "git://github.com/cpputest/cpputest.git;protocol=https" +SRC_URI = "git://github.com/cpputest/cpputest.git;protocol=https;branch=master" SRCREV = "67d2dfd41e13f09ff218aa08e2d35f1c32f032a1" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb b/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb index b760690652..65b54ed548 100644 --- a/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb +++ b/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb @@ -2,21 +2,22 @@ DESCRIPTION = "CxxTest is a unit testing framework for C++ that is similar in sp HOMEPAGE = "http://cxxtest.com/" SECTION = "devel" LICENSE = "LGPL-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/cxxtest-${PV}/COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/cxxtest-${PV}.tar.gz" +SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/${BP}.tar.gz" SRC_URI[md5sum] = "c3cc3355e2ac64e34c215f28e44cfcec" SRC_URI[sha256sum] = "1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8" -S = "${WORKDIR}/cxxtest-${PV}/python" +inherit setuptools3 -inherit distutils3 +SETUPTOOLS_SETUP_PATH = "${S}/python" do_install:append() { install -d ${D}${includedir} - cp -a ../cxxtest ${D}${includedir} + cp -a ${S}/cxxtest/ ${D}${includedir} + # Fix the interpretter as otherwise this points to the build host python sed '1c\ -#!/usr/bin/env python' -i ${D}${bindir}/cxxtestgen +#!/usr/bin/env python3' -i ${D}${bindir}/cxxtestgen } BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb b/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb index a3a23c8951..eb6a34f301 100644 --- a/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb +++ b/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "libxml2" SRCREV = "16e5104127a620686bdddc4a9ad62881134d6c69" -SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https \ +SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https;branch=master \ file://add_missing_limits_h_include.patch \ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_git.bb b/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb index 6a9d4b2787..14ab41b144 100644 --- a/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb @@ -1,12 +1,10 @@ SUMMARY = "Test suite for Linux framebuffer" -PV = "1.1.0" - LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" SRCREV = "063ec650960c2d79ac51f5c5f026cb05343a33e2" -SRC_URI = "git://github.com/prpplague/fb-test-app.git" +SRC_URI = "git://github.com//ponty/fb-test-app.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.06.00.bb b/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.06.00.bb index d33000b8b5..0480adb96c 100644 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.06.00.bb +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.06.00.bb @@ -20,8 +20,7 @@ COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux" DEPENDS = "libpcre glib-2.0 dtc bison-native libbsd" DEPENDS:append:libc-musl = " libexecinfo" -# Use brokensep for now (https://github.com/ColinIanKing/fwts/issues/2) -inherit autotools-brokensep bash-completion pkgconfig +inherit autotools bash-completion pkgconfig LDFLAGS:append:libc-musl = " -lexecinfo" diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb index ff8cecc5b2..ff8191eff6 100644 --- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb @@ -10,7 +10,7 @@ PROVIDES += "gmock gtest" S = "${WORKDIR}/git" SRCREV = "e2239ee6043f73722e7aa812a459f54a28552929" -SRC_URI = "git://github.com/google/googletest.git" +SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https" inherit cmake |