ufw: Fix "could not find required binary 'iptables'"
PATCH 1/5 ufw: Fix "could not find required binary 'iptables'"
From: Howard Cochran <[email protected]>
Switch from using DISTUTILS_*_ARGS to SETUPTOOLS_*_ARGS to correspond with the earlier change to use setuptools3_legacy instead of distutils3.
Without this change, you will get the following error if your build host does not have iptables installed:
Fixes:
ERROR: ufw-0.36.1-r0 do_compile: 'python3 setup.py build ' execution failed. Log data follows:
| DEBUG: Executing shell function do_compile | ERROR: could not find required binary 'iptables' | ERROR: 'python3 setup.py build ' execution failed. | WARNING: exit code 1 from a shell command.
ERROR: Task ([snip]/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb:do_compile) failed with exit code '1'
Also, although the build will not fail on a host that has iptables, it could cause a problem if it is installed at a different path than where OpenEmbedded's iptables will be installed on the target.
--- meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb +2 -2
@@ -70,5 +70,5 @@ FILES:${PN} += " \ REQUIRED_DISTRO_FEATURES = "ipv6" -DISTUTILS_BUILD_ARGS:append = " --iptables-dir /usr/sbin" -DISTUTILS_INSTALL_ARGS:append = " --iptables-dir /usr/sbin" +SETUPTOOLS_BUILD_ARGS:append = " --iptables-dir /usr/sbin" +SETUPTOOLS_INSTALL_ARGS:append = " --iptables-dir /usr/sbin"
Signature · 1 line
2.25.1
PATCH 2/5 pim435: Relocate sources to eclipse
From: Philippe Coval <[email protected]>
This driver is now part of Eclipse's oniro-blueprints project
Note: Once transition is finished, existing copies will be need to be archived For history referer to related tickets if curious.
Relate-to: https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/issues/787
Relate-to: https://gitlab.eclipse.org/eclipse/oniro-blueprints/vending-machine/meta-oniro-blueprints-vending-machine/-/issues/1
Relate-to: https://gitlab.eclipse.org/pcoval/pim435/-/issues/2
Relate-to: https://git.ostc-eu.org/distro/components/vending-machine-control-application/-/issues/2
Forwarded: https://github.com/openembedded/meta-openembedded/pull/603
Origin: https://github.com/astrolabe-coop/meta-openembedded
--- meta-oe/recipes-core/pim435/pim435_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-core/pim435/pim435_git.bb +2 -2
@@ -9,8 +9,8 @@ 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" +SRC_URI = "git://gitlab.eclipse.org/eclipse/oniro-blueprints/core/pim435;protocol=https;branch=main" +SRCREV = "445ed623ec8d3ecbb1d566900b4ef3fb3031d689" S = "${WORKDIR}/git" DEPENDS = "i2c-tools"
Signature · 1 line
2.25.1
PATCH 3/5 spdlog: Fix CMake flag
In reply to Armin KusterFrom: Carsten Bäcker <[email protected]>
https://github.com/gabime/spdlog/blob/eb3220622e73a4889eee355ffa37972b3cac3df5/CMakeLists.txt#L72
--- meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb +2 -2
@@ -12,7 +12,7 @@ DEPENDS += "fmt" S = "${WORKDIR}/git" BBCLASSEXTEND = "native" -# no need to build example&text&benchmarks on pure yocto -EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on" +# no need to build example & tests & benchmarks on pure yocto +EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLE=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on" inherit cmake
Signature · 1 line
2.25.1
PATCH 4/5 Fix tigervnc crash due to missing xkbcomp rdepends
In reply to Armin KusterFrom: Alexander Thoma <[email protected]>
--- meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb +1 -1
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.tigervnc.com/" LICENSE = "GPL-2.0-or-later" SECTION = "x11/utils" DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk libpam" -RDEPENDS:${PN} = "coreutils hicolor-icon-theme perl bash" +RDEPENDS:${PN} = "coreutils hicolor-icon-theme perl bash xkbcomp" LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3"
Signature · 1 line
2.25.1
PATCH 5/5 kernel-selftest: install kselftest runner
In reply to Armin KusterFrom: Chase Qi <[email protected]>
Install kselftest runner and the required kselftest-list.txt.
--- meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +7 -1
@@ -85,7 +85,13 @@ do_install() { for i in ${TEST_LIST} do oe_runmake -C ${S}/tools/testing/selftests/${i} INSTALL_PATH=${D}/usr/kernel-selftest/${i} install + # Install kselftest-list.txt that required by kselftest runner. + oe_runmake -s --no-print-directory COLLECTION=${i} -C ${S}/tools/testing/selftests/${i} emit_tests \ + >> ${D}/usr/kernel-selftest/kselftest-list.txt done + # Install kselftest runner. + install -m 0755 ${S}/tools/testing/selftests/run_kselftest.sh ${D}/usr/kernel-selftest/ + cp -R --no-dereference --preserve=mode,links -v ${S}/tools/testing/selftests/kselftest ${D}/usr/kernel-selftest/ if [ -e ${D}/usr/kernel-selftest/bpf/test_offload.py ]; then sed -i -e '1s,#!.*python3,#! /usr/bin/env python3,' ${D}/usr/kernel-selftest/bpf/test_offload.py fi
@@ -127,7 +133,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_PACKAGE_DEBUG_SPLIT="1" FILES:${PN} += "/usr/kernel-selftest" -RDEPENDS:${PN} += "python3" +RDEPENDS:${PN} += "python3 perl" # tools/testing/selftests/vm/Makefile doesn't respect LDFLAGS and tools/testing/selftests/Makefile explicitly overrides to empty INSANE_SKIP:${PN} += "ldflags"
Signature · 1 line
2.25.1