[OE-core] [PATCH] python3-nose: translate to python3 code before build
Setuptools has removed support for 2to3 during builds since version
58[1]. But the nose's setup.py relies on use_2to3 option in setuptools,
it is failing an import and building without running 2to3 and generating
valid python3 code. As a workaround, we use command line 2to3 tool to
translate to Python3 code before build it.
Fixes:
$ python3
>>> import nose
Traceback (most recent call last):
File "", line 1, in
File "/usr/lib/python3.10/site-packages/nose/_init_.py", line 1, in
from nose.core import collector, main, run, run_exit, runmodule
File "/usr/lib/python3.10/site-packages/nose/core.py", line 153
print "%s version %s" % (os.path.basename(sys.argv[0]), _version_)
SyntaxError: Missing parentheses in call to 'print'. Did you mean print(...)?
>>>
[1] https://github.com/pypa/setuptools/issues/2086
Signed-off-by: Yi Zhao
---
meta/recipes-devtools/python/python-nose.inc | 6 ++
.../python3-nose/0001-Remove-use_2to3.patch | 71 +++
2 files changed, 77 insertions(+)
create mode 100644
meta/recipes-devtools/python/python3-nose/0001-Remove-use_2to3.patch
diff --git a/meta/recipes-devtools/python/python-nose.inc
b/meta/recipes-devtools/python/python-nose.inc
index dfae202299..1a19cb96cf 100644
--- a/meta/recipes-devtools/python/python-nose.inc
+++ b/meta/recipes-devtools/python/python-nose.inc
@@ -6,6 +6,8 @@ SECTION = "devel/python"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://lgpl.txt;md5=a6f89e2100d9b6cdffcea4f398e37343"
+SRC_URI += "file://0001-Remove-use_2to3.patch"
+
SRC_URI[md5sum] = "4d3ad0ff07b61373d2cefc89c5d0b20b"
SRC_URI[sha256sum] =
"f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"
@@ -15,4 +17,8 @@ RDEPENDS:${PN} = "\
${PYTHON_PN}-unittest \
"
+do_compile:prepend() {
+2to3 --write --nobackups --no-diffs ${S}
+}
+
BBCLASSEXTEND = "native nativesdk"
diff --git
a/meta/recipes-devtools/python/python3-nose/0001-Remove-use_2to3.patch
b/meta/recipes-devtools/python/python3-nose/0001-Remove-use_2to3.patch
new file mode 100644
index 00..1a0aabef75
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-nose/0001-Remove-use_2to3.patch
@@ -0,0 +1,71 @@
+From 4307868e31065c56456ddbf03325fc03643cd33f Mon Sep 17 00:00:00 2001
+From: Yi Zhao
+Date: Fri, 5 Nov 2021 10:12:16 +0800
+Subject: [PATCH] Remove use_2to3
+
+Since version 58, setuptools removed support for 2to3 during builds.
+
+Upstream-Status: Pending
+
+Signed-off-by: Yi Zhao
+---
+ setup.py | 3 +--
+ setup3lib.py | 7 +--
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index a2091c0..7e01bba 100644
+--- a/setup.py
b/setup.py
+@@ -13,8 +13,7 @@ if sys.version_info >= (3,):
+ from distribute_setup import use_setuptools
+ use_setuptools()
+
+-extra = {'use_2to3': True,
+- 'test_dirs': test_dirs,
++extra = {'test_dirs': test_dirs,
+ 'test_build_dir': 'build/tests',
+ 'pyversion_patching': True,
+ }
+diff --git a/setup3lib.py b/setup3lib.py
+index 27bdb93..761b74f 100644
+--- a/setup3lib.py
b/setup3lib.py
+@@ -18,7 +18,6 @@ else:
+ import logging
+ from setuptools import Distribution as _Distribution
+ from distutils.core import Command
+-from setuptools.command.build_py import Mixin2to3
+ from distutils import dir_util, file_util, log
+ import setuptools.command.test
+ from pkg_resources import normalize_path
+@@ -68,7 +67,7 @@ else:
+ self.pyversion_patching = False
+ _Distribution.__init__(self, attrs)
+
+-class BuildTestsCommand (Command, Mixin2to3):
++class BuildTestsCommand (Command):
+ # Create mirror copy of tests, convert all .py files using 2to3
+ user_options = []
+
+@@ -83,7 +82,6 @@ else:
+ self.test_base = test_base
+
+ def run(self):
+-use_2to3 = getattr(self.distribution, 'use_2to3', False)
+ test_dirs = getattr(self.distribution, 'test_dirs', [])
+ test_base = self.test_base
+ bpy_cmd = self.get_finalized_command("build_py")
+@@ -112,9 +110,6 @@ else:
+ if fn.endswith(ext):
+ doc_modified.append(dstfile)
+ break
+-if use_2to3:
+-self.run_2to3(py_modified)
+-self.run_2to3(doc_modified, True)
+ if self.distribution.pyversion_patching:
+ if patch is not None:
+ for file in modified:
+--
+2.17.1
+
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157965):
https://lists.openembedded.org/g/openembedded-core/message/157965
Mute This Topic: https://lists.openembedded.org/mt/86900770/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe:
[OE-core] [PATCH] qemu: Build on musl targets
This has been disabled for the given compile error which has been fixed
over time, qemu for target builds fine with musl now a days
Signed-off-by: Khem Raj
---
meta/recipes-devtools/qemu/qemu_6.1.0.bb | 4
1 file changed, 4 deletions(-)
diff --git a/meta/recipes-devtools/qemu/qemu_6.1.0.bb
b/meta/recipes-devtools/qemu/qemu_6.1.0.bb
index f8a816b12b6..017a054d5d6 100644
--- a/meta/recipes-devtools/qemu/qemu_6.1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_6.1.0.bb
@@ -2,10 +2,6 @@ BBCLASSEXTEND = "nativesdk"
require qemu.inc
-# error: a parameter list without types is only allowed in a function
definition
-#void (*_function)(sigval_t);
-COMPATIBLE_HOST:libc-musl = 'null'
-
DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native"
RDEPENDS:${PN}:class-target += "bash"
--
2.33.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157964):
https://lists.openembedded.org/g/openembedded-core/message/157964
Mute This Topic: https://lists.openembedded.org/mt/86900599/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH RFC 2/2] conf/recipes: Replace VIRTUAL-RUNTIME with PACKAGE_GLOBAL_RENAMES
On 11/04/2021 07:05 PM, Richard Purdie wrote: I don't think anyone has ever liked VIRTUAL-RUNTIME as a solution. This patch replaces it with PACKAGE_GLOBAL_RENAME. There are two types of VIRTUAL-RUNTIME. Direct package replacements like getopt or keymaps and "namespaces" for things like "device-manager" or "login-manager". The later are different in that one recipe may provide several but they need to be configured individually. If they were all "systemd", we couldn't replace the correct ones. As such this patch introduces the "virtual-XXX" namespace where the system is expected to resolve these into final values as per the configuration. The advantage of this approach is that we no longer need to have specific VIRTUAL-RUNTIME parameterisation for a user to change a particular dependency, they can just do things like: PACKAGE_GLOBAL_RENAME[keymaps] = "mykeymaps" or simply: PACKAGE_GLOBAL_RENAME[keymaps] = "" to remove it. You can see examples of the virtual-* mappings in the init manager includes. This patch uses the PACKAGE_GLOBAL_RENAMES variable and mechanism from the previous patch to function but to be clear, this only works at package creation time, not at build time. As such we have to inject the virtual namespace into RPROVIDES. Filtering all package variables at parse time isn't really viable at present (the multilib classes show the work involved). Known issues: a) The changes apply at final image build time which means that the original provider would be built and the alternate only swapped in at do_rootfs. b) The patch throwns build-rdeps QA warnings (probably as a result of a). c) As a result of b) there are probably missing build dependencies d) The tests are unconverted. Hi Richard, I think this is a very good solution. From my point of view, it solves the problem that VIRTUAL-RUNTIME solution will never scale and is always tending to expand. I tried out these two patches a little bit, made a few local changes and core-image-minimal built successfully without warning. There are mainly two changes: 1) make recipe build if required e.g. PACKAGE_GLOBAL_RENAMES[A] = C, and B rdepends on A. We need to make sure C is built when building A. I order to do this, I tweaked the rpovides injection logic a little bit, making it apply to all PACKAGE_GLOBAL_RENAMES items. 2) make sure pkgdata is written out correctly As yocto uses pkgdata as the key database when creating packages and performing some package QA checks, we need to make sure the database is correct. In order to do this, I tweaked the write_if_exists() function a little bit, considering PACKAGE_GLOBAL_RENAMES, RPROVIDES, RRECOMMENDS and RDEPENDS. Attached is the patch. Regards, Qi As such I suspect this patch won't quite work but I want to share it and see what people think and if a better solution could rise from this as a result. Adding "filter" support to variables as JPEW and I once discussed may be a different way of handling this which would also handle some multilib issues. Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 6 + meta/classes/image.bbclass| 3 ++- meta/classes/multilib_global.bbclass | 5 + meta/classes/package.bbclass | 4 +++- meta/classes/packagegroup.bbclass | 4 ++-- meta/classes/update-alternatives.bbclass | 5 + .../conf/distro/include/default-providers.inc | 13 +-- .../include/init-manager-mdev-busybox.inc | 9 .../conf/distro/include/init-manager-none.inc | 7 +++--- .../distro/include/init-manager-systemd.inc | 9 .../distro/include/init-manager-sysvinit.inc | 7 +++--- meta/conf/layer.conf | 2 +- meta/lib/oe/rootfs.py | 2 +- meta/recipes-core/busybox/busybox.inc | 4 ++-- meta/recipes-core/busybox/busybox_1.34.1.bb | 6 ++--- .../images/core-image-minimal-initramfs.bb| 2 +- .../images/core-image-tiny-initramfs.bb | 4 +--- .../initrdscripts/initramfs-framework_1.0.bb | 4 ++-- .../initramfs-live-install-efi_1.0.bb | 4 ++-- .../initramfs-live-install_1.0.bb | 4 ++-- .../initramfs-module-install-efi_1.0.bb | 4 ++-- .../initramfs-module-install_1.0.bb | 4 ++-- .../packagegroups/packagegroup-base.bb| 9 +++- .../packagegroups/packagegroup-core-boot.bb | 22 --- meta/recipes-devtools/dpkg/dpkg.inc | 2 +- meta/recipes-devtools/opkg/opkg_0.4.5.bb | 2 +- meta/recipes-extended/lsb/lsb-release_1.4.bb | 2 +- .../packagegroup-core-base-utils.bb | 4 +--- .../packagegroup-core-full-cmdline.bb | 9 .../packagegroups/packagegroup-core-weston.bb | 2 +- .../packagegroups/packagegroup-core-x11.bb| 9 +--- meta/recipes-graphics/wayland/weston-init.bb | 6 ++---
Re: [OE-core] [V3][PATCH] ruby: workaround ptest hang problem
On 11/6/21 5:27 PM, Richard Purdie wrote: [Please note: This e-mail is from an EXTERNAL e-mail address] On Fri, 2021-11-05 at 10:18 +0800, Changqing Li wrote: From: Changqing Li since openssl 3 not compatible problem, ruby have disable openssl extention. But disable openssl extention make test_smtp.rs hang at test case "test_start". Net::TestSMTP#test_start: NameError: uninitialized constant Net::SMTP::OpenSSL Did you mean? Open3 /usr/lib64/ruby/3.0.0/net/smtp.rb:195:in `default_ssl_context' /usr/lib64/ruby/3.0.0/net/smtp.rb:552:in `start' /usr/lib64/ruby/3.0.0/net/smtp.rb:475:in `start' /usr/lib64/ruby/ptest/test/net/smtp/test_smtp.rb:199:in `test_start' temporarily remove the hang case to make other testcases can be run. Meantime, move ruby-ptest out of the PTESTS_PROBLEMS list. On 48 core host, run ruby ptest in qemux86-64: root@qemux86-64:/usr/lib64/ruby/ptest# time ./run-ptest PASS: test/test_set.rb PASS: test/stringio/test_stringio.rb ... PASS: test/did_you_mean/test_tree_spell_checker.rb PASS: test/test_mutex_m.rb real 5m42.872s user 3m50.923s sys 0m44.136s Signed-off-by: Changqing Li --- meta/conf/distro/include/ptest-packagelists.inc | 3 +-- meta/recipes-devtools/ruby/ruby.inc | 4 2 files changed, 5 insertions(+), 2 deletions(-) Unfortunately the success rate isn't like that when we tried this on the autobuilder, it failed on both arm64 and x86_64 with multiple failures: https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/2791 https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2507 Sorry, I thought this is expected. Ruby have 800+ test cases, and failed about 30+ all the time. so I think we still need to put ruby ptest in the PTESTS_PROBLEMS list until we address all the failed cases. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157962): https://lists.openembedded.org/g/openembedded-core/message/157962 Mute This Topic: https://lists.openembedded.org/mt/86832482/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] OE-core CVE metrics for dunfell on Sun 07 Nov 2021 04:26:47 PM HST
Branch: dunfell New this week: 2 CVEs CVE-2021-25219: bind https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-25219 * CVE-2021-3903: vim https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3903 * Removed this week: 1 CVEs CVE-2021-22897: curl:curl-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-22897 * Full list: Found 79 unpatched CVEs CVE-2016-20012: openssh https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-20012 * CVE-2018-21232: re2c:re2c-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2018-21232 * CVE-2019-12067: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-12067 * CVE-2020-13253: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-13253 * CVE-2020-13754: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-13754 * CVE-2020-13791: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-13791 * CVE-2020-14372: grub:grub-efi:grub-efi-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-14372 * CVE-2020-15469: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-15469 * CVE-2020-15705: grub:grub-efi:grub-efi-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-15705 * CVE-2020-15859: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-15859 * CVE-2020-15900: ghostscript-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-15900 * CVE-2020-16590: binutils:binutils-cross-testsuite:binutils-cross-x86_64:binutils-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-16590 * CVE-2020-16591: binutils:binutils-cross-testsuite:binutils-cross-x86_64:binutils-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-16591 * CVE-2020-16599: binutils:binutils-cross-testsuite:binutils-cross-x86_64:binutils-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-16599 * CVE-2020-17380: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-17380 * CVE-2020-18974: nasm:nasm-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-18974 * CVE-2020-25632: grub:grub-efi:grub-efi-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-25632 * CVE-2020-25647: grub:grub-efi:grub-efi-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-25647 * CVE-2020-25742: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-25742 * CVE-2020-25743: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-25743 * CVE-2020-27661: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-27661 * CVE-2020-27749: grub:grub-efi:grub-efi-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-27749 * CVE-2020-27779: grub:grub-efi:grub-efi-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-27779 * CVE-2020-27821: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-27821 * CVE-2020-29510: go:go-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-29510 * CVE-2020-29623: webkitgtk https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-29623 * CVE-2020-35503: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-35503 * CVE-2020-35504: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-35504 * CVE-2020-35505: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-35505 * CVE-2020-35506: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-35506 * CVE-2020-36254: dropbear https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-36254 * CVE-2020-3810: apt https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-3810 * CVE-2021-0129: bluez5 https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-0129 * CVE-2021-1765: webkitgtk https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1765 * CVE-2021-1789: webkitgtk https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1789 * CVE-2021-1799: webkitgtk https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1799 * CVE-2021-1801: webkitgtk https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1801 * CVE-2021-1870: webkitgtk https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1870 * CVE-2021-20225: grub:grub-efi:grub-efi-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-20225 * CVE-2021-20233: grub:grub-efi:grub-efi-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-20233 * CVE-2021-20255: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-20255 * CVE-2021-20294:
[OE-core] [PATCH v2 3/3] bitbake.conf: Use wayland distro feature for native builds
The wayland-scanner is missing from SDKs with weston, but the weston build requires wayland-scanner. Allow the distro feature in order to include the wayland-scanner packages via nativesdk-packagegroup-sdk-host.bb. Signed-off-by: Tom Hochstein --- meta/conf/bitbake.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 790f2f7a8c..71c1e52ad6 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -869,8 +869,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11" # Normally target distro features will not be applied to native builds: # Native distro features on this list will use the target feature value -DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation debuginfod opengl" -DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod opengl" +DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation debuginfod opengl wayland" +DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod opengl wayland" DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig" MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157960): https://lists.openembedded.org/g/openembedded-core/message/157960 Mute This Topic: https://lists.openembedded.org/mt/86888902/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2 2/3] nativesdk-packagegroup-sdk-host.bb: Update host tools for wayland
The wayland-scanner host tool required to build weston is moved to the
wayland-tools package, so update the SDK host tools list accordingly.
Also, the weston build requires wayland-scanner.pc to find wayland-scanner,
so add wayland-dev.
Signed-off-by: Tom Hochstein
---
.../packagegroups/nativesdk-packagegroup-sdk-host.bb| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
index 39e5002bb7..9166a0851f 100644
--- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
+++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
@@ -25,7 +25,7 @@ RDEPENDS:${PN} = "\
nativesdk-makedevs \
nativesdk-cmake \
nativesdk-meson \
-${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland',
'', d)} \
+${@bb.utils.contains('DISTRO_FEATURES', 'wayland',
'nativesdk-wayland-tools nativesdk-wayland-dev', '', d)} \
nativesdk-sdk-provides-dummy \
nativesdk-bison \
nativesdk-flex \
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157959):
https://lists.openembedded.org/g/openembedded-core/message/157959
Mute This Topic: https://lists.openembedded.org/mt/86888900/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2 1/3] wayland: Fix wayland-tools packaging
There are some packaging problems due to the wayland-tools packaging
implementation. The wayland-tools package currently looks like this:
wayland-tools
└── usr
├── bin
│ └── wayland-scanner
└── share
└── wayland
├── wayland.dtd
├── wayland-scanner.mk
└── wayland.xml
The files wayland.dtd and wayland.xml belong in the main package,
while wayland-scanner.mk belongs in wayland-dev.
Fix the wayland.dtd and wayland.xml packaging by prepending the
wayland-tools package and dropping the main package FILES variable
override. The file wayland-scanner.mk is included in the main
package by default, and so must be explicitly added to wayland-dev.
Signed-off-by: Tom Hochstein
---
meta/recipes-graphics/wayland/wayland_1.19.0.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/wayland/wayland_1.19.0.bb
b/meta/recipes-graphics/wayland/wayland_1.19.0.bb
index d6e468497d..5f8b972f76 100644
--- a/meta/recipes-graphics/wayland/wayland_1.19.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.19.0.bb
@@ -52,10 +52,10 @@ sysroot_stage_all:append:class-target () {
cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4
${SYSROOT_DESTDIR}/${datadir}/aclocal/
}
-PACKAGES += "${PN}-tools"
+PACKAGES =+ "${PN}-tools"
-FILES:${PN} = "${libdir}/*${SOLIBS}"
-FILES:${PN}-tools += "${bindir} ${datadir}/wayland"
+FILES:${PN}-tools = "${bindir}/wayland-scanner"
+FILES:${PN}-dev += "${datadir}/${BPN}/wayland-scanner.mk"
BBCLASSEXTEND = "native nativesdk"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157958):
https://lists.openembedded.org/g/openembedded-core/message/157958
Mute This Topic: https://lists.openembedded.org/mt/8691/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/3] wayland: Fix wayland-tools packaging problems
On Sun, 2021-11-07 at 10:00 -0600, Tom Hochstein wrote:
> There are several packaging problems due to the wayland-tools packaging
> implementation. The wayland-tools package currently looks like this:
>
> wayland-tools
> └── usr
> ├── bin
> │ └── wayland-scanner
> └── share
> └── wayland
> ├── wayland.dtd
> ├── wayland-scanner.mk
> └── wayland.xml
>
> The files wayland-scanner.pc and wayland-scanner.m4 are incorrectly
> located in the main package. The files wayland.dtd and wayland.xml
> are incorrectly located here but belong in the main package.
>
> Fix the problems by moving wayland-tools before the other packages,
> adding wayland-tools-dev, and dropping the main package FILES
> variable override as no longer needed.
>
> After the fix wayland-tools and wayland-tools-dev look like this:
>
> wayland-tools
> └── usr
> └── bin
> └── wayland-scanner
> wayland-tools-dev
> └── usr
> ├── lib
> │ └── pkgconfig
> │ └── wayland-scanner.pc
> └── share
> ├── aclocal
> │ └── wayland-scanner.m4
> └── wayland
> └── wayland-scanner.mk
>
> Signed-off-by: Tom Hochstein
> ---
> meta/recipes-graphics/wayland/wayland_1.19.0.bb | 10 +++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-graphics/wayland/wayland_1.19.0.bb
> b/meta/recipes-graphics/wayland/wayland_1.19.0.bb
> index d6e468497d..74d6d65e9e 100644
> --- a/meta/recipes-graphics/wayland/wayland_1.19.0.bb
> +++ b/meta/recipes-graphics/wayland/wayland_1.19.0.bb
> @@ -52,10 +52,14 @@ sysroot_stage_all:append:class-target () {
> cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4
> ${SYSROOT_DESTDIR}/${datadir}/aclocal/
> }
>
> -PACKAGES += "${PN}-tools"
> +PACKAGES =+ "${PN}-tools ${PN}-tools-dev"
>
> -FILES:${PN} = "${libdir}/*${SOLIBS}"
> -FILES:${PN}-tools += "${bindir} ${datadir}/wayland"
> +FILES:${PN}-tools = "${bindir}/wayland-scanner"
> +FILES:${PN}-tools-dev = " \
> +${libdir}/pkgconfig/wayland-scanner.pc \
> +${datadir}/aclocal/wayland-scanner.m4 \
> +${datadir}/wayland/wayland-scanner.mk \
> +"
>
> BBCLASSEXTEND = "native nativesdk"
>
Shouldn't these just go into wayland-dev?
Cheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157957):
https://lists.openembedded.org/g/openembedded-core/message/157957
Mute This Topic: https://lists.openembedded.org/mt/86885053/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 3/3] bitbake.conf: Use wayland distro feature for native builds
The wayland-scanner is missing from SDKs with weston, but the weston build requires wayland-scanner. Allow the distro feature in order to include the wayland-scanner packages via nativesdk-packagegroup-sdk-host.bb. Signed-off-by: Tom Hochstein --- meta/conf/bitbake.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 790f2f7a8c..71c1e52ad6 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -869,8 +869,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11" # Normally target distro features will not be applied to native builds: # Native distro features on this list will use the target feature value -DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation debuginfod opengl" -DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod opengl" +DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation debuginfod opengl wayland" +DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod opengl wayland" DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig" MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157956): https://lists.openembedded.org/g/openembedded-core/message/157956 Mute This Topic: https://lists.openembedded.org/mt/86885059/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/3] nativesdk-packagegroup-sdk-host.bb: Update host tools for wayland
The wayland-scanner host tool required to build weston is moved to the
wayland-tools package, so update the SDK host tools list accordingly.
Also, the weston build requires wayland-scanner.pc to find wayland-scanner,
so add wayland-tools-dev.
Signed-off-by: Tom Hochstein
---
.../packagegroups/nativesdk-packagegroup-sdk-host.bb| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
index 39e5002bb7..16752026d0 100644
--- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
+++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
@@ -25,7 +25,7 @@ RDEPENDS:${PN} = "\
nativesdk-makedevs \
nativesdk-cmake \
nativesdk-meson \
-${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland',
'', d)} \
+${@bb.utils.contains('DISTRO_FEATURES', 'wayland',
'nativesdk-wayland-tools nativesdk-wayland-tools-dev', '', d)} \
nativesdk-sdk-provides-dummy \
nativesdk-bison \
nativesdk-flex \
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157955):
https://lists.openembedded.org/g/openembedded-core/message/157955
Mute This Topic: https://lists.openembedded.org/mt/86885057/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/3] wayland: Fix wayland-tools packaging problems
There are several packaging problems due to the wayland-tools packaging
implementation. The wayland-tools package currently looks like this:
wayland-tools
└── usr
├── bin
│ └── wayland-scanner
└── share
└── wayland
├── wayland.dtd
├── wayland-scanner.mk
└── wayland.xml
The files wayland-scanner.pc and wayland-scanner.m4 are incorrectly
located in the main package. The files wayland.dtd and wayland.xml
are incorrectly located here but belong in the main package.
Fix the problems by moving wayland-tools before the other packages,
adding wayland-tools-dev, and dropping the main package FILES
variable override as no longer needed.
After the fix wayland-tools and wayland-tools-dev look like this:
wayland-tools
└── usr
└── bin
└── wayland-scanner
wayland-tools-dev
└── usr
├── lib
│ └── pkgconfig
│ └── wayland-scanner.pc
└── share
├── aclocal
│ └── wayland-scanner.m4
└── wayland
└── wayland-scanner.mk
Signed-off-by: Tom Hochstein
---
meta/recipes-graphics/wayland/wayland_1.19.0.bb | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/wayland/wayland_1.19.0.bb
b/meta/recipes-graphics/wayland/wayland_1.19.0.bb
index d6e468497d..74d6d65e9e 100644
--- a/meta/recipes-graphics/wayland/wayland_1.19.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.19.0.bb
@@ -52,10 +52,14 @@ sysroot_stage_all:append:class-target () {
cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4
${SYSROOT_DESTDIR}/${datadir}/aclocal/
}
-PACKAGES += "${PN}-tools"
+PACKAGES =+ "${PN}-tools ${PN}-tools-dev"
-FILES:${PN} = "${libdir}/*${SOLIBS}"
-FILES:${PN}-tools += "${bindir} ${datadir}/wayland"
+FILES:${PN}-tools = "${bindir}/wayland-scanner"
+FILES:${PN}-tools-dev = " \
+${libdir}/pkgconfig/wayland-scanner.pc \
+${datadir}/aclocal/wayland-scanner.m4 \
+${datadir}/wayland/wayland-scanner.mk \
+"
BBCLASSEXTEND = "native nativesdk"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157954):
https://lists.openembedded.org/g/openembedded-core/message/157954
Mute This Topic: https://lists.openembedded.org/mt/86885053/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Setting COMPATIBLE_MACHINE in nativesdk only recipe
Hi all,
I got a nativesdk-only recipe
...
COMPATIBLE_MACHINE = "^.*x86-64"
inherit nativesdk
...
as I need to limit the targets (SDK hosts) to x64 machines only.
Unfortunately this doesn't build, as the recipe is rejected claiming
"qemux86-64" is not in the comp-list
Looking at base.bbclass the following is done
need_machine = d.getVar('COMPATIBLE_MACHINE')
if need_machine and not d.getVar('PARSE_ALL_RECIPES', False):
import re
compat_machines = (d.getVar('MACHINEOVERRIDES') or "").split(":")
for m in compat_machines:
if re.match(need_machine, m):
break
which is fine, but since d09e6d883042e5d094cd08d829327c4bbbfae135 (yeah
it's been a while) all MACHINEOVERRIDES for nativesdk recipe are
forcefully reset (reasoning is in the commit message).
Is there any way to limit the target machines for such a corner case?
Cheers
Konrad
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157953):
https://lists.openembedded.org/g/openembedded-core/message/157953
Mute This Topic: https://lists.openembedded.org/mt/86884995/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] OE-core CVE metrics for honister on Sun 07 Nov 2021 05:30:01 AM HST
Branch: honister New this week: 2 CVEs CVE-2021-25219: bind https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-25219 * CVE-2021-3903: vim https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3903 * Removed this week: 0 CVEs Full list: Found 18 unpatched CVEs CVE-2016-20012: openssh https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-20012 * CVE-2019-12067: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-12067 * CVE-2020-18974: nasm:nasm-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-18974 * CVE-2020-35503: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-35503 * CVE-2021-20255: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-20255 * CVE-2021-25219: bind https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-25219 * CVE-2021-31879: wget https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-31879 * CVE-2021-3507: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3507 * CVE-2021-36976: libarchive:libarchive-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-36976 * CVE-2021-3713: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3713 * CVE-2021-3796: vim https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3796 * CVE-2021-38297: go https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-38297 * CVE-2021-3872: vim https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3872 * CVE-2021-3875: vim https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3875 * CVE-2021-3903: vim https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3903 * CVE-2021-39537: ncurses:ncurses-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-39537 * CVE-2021-41617: openssh https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-41617 * CVE-2021-42762: webkitgtk https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42762 * -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157952): https://lists.openembedded.org/g/openembedded-core/message/157952 Mute This Topic: https://lists.openembedded.org/mt/86884463/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] OE-core CVE metrics for hardknott on Sun 07 Nov 2021 05:00:01 AM HST
Branch: hardknott New this week: 2 CVEs CVE-2021-25219: bind https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-25219 * CVE-2021-3903: vim https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3903 * Removed this week: 1 CVEs CVE-2021-41617: openssh https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-41617 * Full list: Found 39 unpatched CVEs CVE-2013-0340: expat:expat-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-0340 * CVE-2016-20012: openssh https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-20012 * CVE-2019-12067: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-12067 * CVE-2020-18974: nasm:nasm-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-18974 * CVE-2020-29623: webkitgtk https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-29623 * CVE-2020-35503: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-35503 * CVE-2021-1765: webkitgtk https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1765 * CVE-2021-1789: webkitgtk https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1789 * CVE-2021-1799: webkitgtk https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1799 * CVE-2021-1801: webkitgtk https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1801 * CVE-2021-1870: webkitgtk https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1870 * CVE-2021-20196: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-20196 * CVE-2021-20255: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-20255 * CVE-2021-22922: curl:curl-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-22922 * CVE-2021-22923: curl:curl-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-22923 * CVE-2021-22945: curl:curl-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-22945 * CVE-2021-22946: curl:curl-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-22946 * CVE-2021-22947: curl:curl-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-22947 * CVE-2021-25219: bind https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-25219 * CVE-2021-27645: glibc https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-27645 * CVE-2021-31879: wget https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-31879 * CVE-2021-33574: glibc https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-33574 * CVE-2021-33833: connman https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-33833 * CVE-2021-33928: libsolv https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-33928 * CVE-2021-33929: libsolv https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-33929 * CVE-2021-33930: libsolv https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-33930 * CVE-2021-33938: libsolv https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-33938 * CVE-2021-3445: libdnf https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3445 * CVE-2021-3507: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3507 * CVE-2021-36976: libarchive https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-36976 * CVE-2021-3713: qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3713 * CVE-2021-38297: go https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-38297 * CVE-2021-38604: glibc https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-38604 * CVE-2021-3872: vim https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3872 * CVE-2021-3875: vim https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3875 * CVE-2021-3903: vim https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3903 * CVE-2021-40491: inetutils https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-40491 * CVE-2021-40528: libgcrypt:libgcrypt-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-40528 * CVE-2021-42762: webkitgtk https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42762 * -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157951): https://lists.openembedded.org/g/openembedded-core/message/157951 Mute This Topic: https://lists.openembedded.org/mt/86883829/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2] sstate: another fix for touching files inside pseudo
Steve Sakoman escreveu no dia sábado, 6/11/2021 à(s)
21:18:
> On Sat, Nov 6, 2021 at 8:09 AM Jose Quaresma
> wrote:
> >
> > Hi Steve,
> >
> > Can this patch be backported to dunfell branch to land in the next
> release 3.1.12?
>
> This patch won't apply due to the zstd related changes in master.
> Could you submit a dunfell version of the patch?
>
Sure, I have send it for dunfell
Jose
>
> Steve
>
> >
> > Jose
> >
> > Jose Quaresma via lists.openembedded.org gmail@lists.openembedded.org> escreveu no dia quinta, 4/11/2021 à(s)
> 19:14:
> >>
> >> This patch is a fixup for 676757f "sstate: fix touching files inside
> pseudo"
> >>
> >> running the 'id' command inside the sstate_unpack_package
> >> function shows that this funcion run inside the pseudo:
> >>
> >> uid=0(root) gid=0(root) groups=0(root)
> >>
> >> The check for [ -w ${SSTATE_PKG} ] and [ -O ${SSTATE_PKG}.siginfo ]
> >> will always return true and the touch can fail when the real user
> >> don't have permission or in readonly filesystem.
> >>
> >> As the documentation refers:
> >> - the file test operator "-w" check if the file has write permission
> >> (for the user running the test).
> >> - the file test operator "-O" check if you are owner of file
> >>
> >> We can avoid this test running the touch and mask any return errors
> >> that we have.
> >>
> >> Signed-off-by: Jose Quaresma
> >> ---
> >>
> >> V2: match the original code
> >>
> >> meta/classes/sstate.bbclass | 12 ++--
> >> 1 file changed, 6 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
> >> index 8182010047..849723d4dc 100644
> >> --- a/meta/classes/sstate.bbclass
> >> +++ b/meta/classes/sstate.bbclass
> >> @@ -900,12 +900,12 @@ sstate_unpack_package () {
> >> fi
> >>
> >> tar -I "$ZSTD" -xvf ${SSTATE_PKG}
> >> - # update .siginfo atime on local/NFS mirror
> >> - [ -O ${SSTATE_PKG}.siginfo ] && [ -w ${SSTATE_PKG}.siginfo ] &&
> [ -h ${SSTATE_PKG}.siginfo ] && touch -a ${SSTATE_PKG}.siginfo
> >> - # Use "! -w ||" to return true for read only files
> >> - [ ! -w ${SSTATE_PKG} ] || touch --no-dereference ${SSTATE_PKG}
> >> - [ ! -w ${SSTATE_PKG}.sig ] || [ ! -e ${SSTATE_PKG}.sig ] ||
> touch --no-dereference ${SSTATE_PKG}.sig
> >> - [ ! -w ${SSTATE_PKG}.siginfo ] || [ ! -e ${SSTATE_PKG}.siginfo
> ] || touch --no-dereference ${SSTATE_PKG}.siginfo
> >> + # update .siginfo atime on local/NFS mirror if it is a symbolic
> link
> >> + [ ! -h ${SSTATE_PKG}.siginfo ] || touch -a
> ${SSTATE_PKG}.siginfo 2>/dev/null || true
> >> + # update each symbolic link instead of any referenced file
> >> + touch --no-dereference ${SSTATE_PKG} 2>/dev/null || true
> >> + [ ! -e ${SSTATE_PKG}.sig ] || touch --no-dereference
> ${SSTATE_PKG}.sig 2>/dev/null || true
> >> + [ ! -e ${SSTATE_PKG}.siginfo ] || touch --no-dereference
> ${SSTATE_PKG}.siginfo 2>/dev/null || true
> >> }
> >>
> >> BB_HASHCHECK_FUNCTION = "sstate_checkhashes"
> >> --
> >> 2.33.1
> >>
> >>
> >>
> >>
> >
> >
> > --
> > Best regards,
> >
> > José Quaresma
> >
> >
> >
>
--
Best regards,
José Quaresma
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157950):
https://lists.openembedded.org/g/openembedded-core/message/157950
Mute This Topic: https://lists.openembedded.org/mt/86824160/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [dunfell][PATCH v2] sstate: another fix for touching files inside pseudo
This patch is a fixup for 676757f "sstate: fix touching files inside pseudo"
running the 'id' command inside the sstate_unpack_package
function shows that this funcion run inside the pseudo:
uid=0(root) gid=0(root) groups=0(root)
The check for [ -w ${SSTATE_PKG} ] and [ -O ${SSTATE_PKG}.siginfo ]
will always return true and the touch can fail when the real user
don't have permission or in readonly filesystem.
As the documentation refers:
- the file test operator "-w" check if the file has write permission
(for the user running the test).
- the file test operator "-O" check if you are owner of file
We can avoid this test running the touch and mask any return errors
that we have.
(From OE-Core rev: 29fc85997ade490ae46ffca37ef8e1a56957c876)
Signed-off-by: Jose Quaresma
Signed-off-by: Richard Purdie
(cherry picked from commit 5b9210d66c78bb3f79056e5586cea7b0edd714a9)
---
The patch sent to master branch don't apply on dunfell branch
because of the ZSTD changes.
V2: match the original code
meta/classes/sstate.bbclass | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 38dc3bff30..930d87424f 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -859,12 +859,12 @@ python sstate_report_unihash() {
#
sstate_unpack_package () {
tar -xvzf ${SSTATE_PKG}
- # update .siginfo atime on local/NFS mirror
- [ -O ${SSTATE_PKG}.siginfo ] && [ -w ${SSTATE_PKG}.siginfo ] && [ -h
${SSTATE_PKG}.siginfo ] && touch -a ${SSTATE_PKG}.siginfo
- # Use "! -w ||" to return true for read only files
- [ ! -w ${SSTATE_PKG} ] || touch --no-dereference ${SSTATE_PKG}
- [ ! -w ${SSTATE_PKG}.sig ] || [ ! -e ${SSTATE_PKG}.sig ] || touch
--no-dereference ${SSTATE_PKG}.sig
- [ ! -w ${SSTATE_PKG}.siginfo ] || [ ! -e ${SSTATE_PKG}.siginfo ] ||
touch --no-dereference ${SSTATE_PKG}.siginfo
+ # update .siginfo atime on local/NFS mirror if it is a symbolic link
+ [ ! -h ${SSTATE_PKG}.siginfo ] || touch -a ${SSTATE_PKG}.siginfo
2>/dev/null || true
+ # update each symbolic link instead of any referenced file
+ touch --no-dereference ${SSTATE_PKG} 2>/dev/null || true
+ [ ! -e ${SSTATE_PKG}.sig ] || touch --no-dereference ${SSTATE_PKG}.sig
2>/dev/null || true
+ [ ! -e ${SSTATE_PKG}.siginfo ] || touch --no-dereference
${SSTATE_PKG}.siginfo 2>/dev/null || true
}
BB_HASHCHECK_FUNCTION = "sstate_checkhashes"
--
2.33.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157949):
https://lists.openembedded.org/g/openembedded-core/message/157949
Mute This Topic: https://lists.openembedded.org/mt/86880455/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [bitbake-devel] [PATCH 2/2] fetch2: Fix race condition in latest_revision
On Fri, 2021-11-05 at 14:30 +0100, Jasper Orschulko via lists.openembedded.org wrote: > From: Martin Koppehel > > Setting latest_revision contained a race condition, where it would be > set to an empty string, if the hash calculation function would take to > long. > > Signed-off-by: Jasper Orschulko > --- > lib/bb/fetch2/__init__.py | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py > index 6a38cb09..9dc23d05 100644 > --- a/lib/bb/fetch2/__init__.py > +++ b/lib/bb/fetch2/__init__.py > @@ -1602,7 +1602,9 @@ class FetchMethod(object): > try: > return revs[key] > except KeyError: > -revs[key] = rev = self._latest_revision(ud, d, name) > +rev = self._latest_revision(ud, d, name) > +if rev != '': > +revs[key] = rev > return rev > > def sortable_revision(self, ud, d, name): I'm afraid I don't understand why this is a race condition? Where is the timeout that stops one being set? Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157947): https://lists.openembedded.org/g/openembedded-core/message/157947 Mute This Topic: https://lists.openembedded.org/mt/86878868/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [bitbake-devel] [oe-core][PATCH 1/2] devtools: Initial recipe for repo 2.17.3
On Fri, 2021-11-05 at 14:31 +0100, Jasper Orschulko via lists.openembedded.org
wrote:
> From: Jasper Orschulko
>
> Add a recipe for repo, prerequisite for the repo fetcher.
>
> Signed-off-by: Jasper Orschulko
> ---
> .../repo/files/0001-python3-shebang.patch | 21
> .../0001-Set-REPO_REV-to-v2.17.3.patch| 33 +++
> meta/recipes-devtools/repo/repo.inc | 25 ++
> meta/recipes-devtools/repo/repo_2.17.3.bb | 7
> 4 files changed, 86 insertions(+)
> create mode 100644
> meta/recipes-devtools/repo/files/0001-python3-shebang.patch
> create mode 100644
> meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch
> create mode 100644 meta/recipes-devtools/repo/repo.inc
> create mode 100644 meta/recipes-devtools/repo/repo_2.17.3.bb
This basically looks ok to me, I've some minor comments below.
The patch is missing adding an entry to:
meta/conf/distro/include/maintainers.inc
which is required for OE-Core recipes and will trip up automated testing if we
don't.
>
> diff --git a/meta/recipes-devtools/repo/files/0001-python3-shebang.patch
> b/meta/recipes-devtools/repo/files/0001-python3-shebang.patch
> new file mode 100644
> index 00..09ccf58264
> --- /dev/null
> +++ b/meta/recipes-devtools/repo/files/0001-python3-shebang.patch
I'd put this in a folder called "repo" rather than files.
> @@ -0,0 +1,21 @@
> +From b8e84b202cd302a7c99288d3835dc9c63071f8f2 Mon Sep 17 00:00:00 2001
> +From: Jasper Orschulko
> +Date: Tue, 14 Sep 2021 16:46:51 +0200
> +Subject: [PATCH] python3 shebang
> +
> +---
> + repo | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
>
Missing Upstream-Status: (you got the second one ok though! :)
> +diff --git a/repo b/repo
> +index b13e34c..205e0e5 100755
> +--- a/repo
> b/repo
> +@@ -1,4 +1,4 @@
> +-#!/usr/bin/env python
> ++#!/usr/bin/env python3
> + # -*- coding:utf-8 -*-
> + #
> + # Copyright (C) 2008 The Android Open Source Project
> +--
> +2.33.0
> diff --git
> a/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch
> b/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch
> new file mode 100644
> index 00..294a3af53a
> --- /dev/null
> +++
> b/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch
> @@ -0,0 +1,33 @@
> +From bdd2a528da59c28db8ae2986834926de7cebf3ab Mon Sep 17 00:00:00 2001
> +From: Jasper Orschulko
> +Date: Thu, 4 Nov 2021 16:55:12 +0100
> +Subject: [PATCH] Set REPO_REV to v2.17.3
> +
> +repo is an unusual tool because it downloads all of its own Python modules
> +using GPG-signed git tags, and stores those files as part of the project
> +that it is working with.
> +
> +So in order to have a reproducible repo installation within the project
> +folders, we hardcode the REPO_REV variable to this recipes PV.
> +
> +Upstream-Status: Inappropriate [configuration]
> +Signed-off-by: Jasper Orschulko
> +---
> + repo | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/repo b/repo
> +index 4cddbf1..cf5f6b1 100755
> +--- a/repo
> b/repo
> +@@ -142,7 +142,7 @@ if __name__ == '__main__':
> + REPO_URL = os.environ.get('REPO_URL', None)
> + if not REPO_URL:
> + REPO_URL = 'https://gerrit.googlesource.com/git-repo'
> +-REPO_REV = os.environ.get('REPO_REV')
> ++REPO_REV = 'v2.17.3'
> + if not REPO_REV:
> + REPO_REV = 'stable'
> + # URL to file bug reports for repo tool issues.
> +--
> +2.33.1
> diff --git a/meta/recipes-devtools/repo/repo.inc
> b/meta/recipes-devtools/repo/repo.inc
> new file mode 100644
> index 00..60b32e4d74
> --- /dev/null
> +++ b/meta/recipes-devtools/repo/repo.inc
> @@ -0,0 +1,25 @@
> +# SPDX-License-Identifier: MIT
> +# Copyright (C) 2021 iris-GmbH infrared & intelligent sensors
> +
> +SUMMARY = "Tool for managing many Git repositories"
> +DESCRIPTION = "Repo is a tool built on top of Git. Repo helps manage many
> Git repositories, does the uploads to revision control systems, and automates
> parts of the development workflow."
> +HOMEPAGE = "https://android.googlesource.com/tools/repo;
> +SECTION = "console/utils"
> +
> +LICENSE = "Apache-2.0"
> +
> +SRC_URI =
> "git://g...@gerrit.googlesource.com/git-repo.git;protocol=https;branch=main"
> +MIRRORS = "git://g...@gerrit.googlesource.com/git-repo.git
> git://github.com/GerritCodeReview/git-repo.git \n"
You shouldn't be clearing MIRRORS with "=" as the user may have something set in
there the system needs to work, you probably want += here.
> +
> +SRC_URI += "file://0001-python3-shebang.patch"
> +
> +S = "${WORKDIR}/git"
> +
> +RDEPENDS_${PN} = "python3"
This is old overrides syntax, it is RDEPENDS:${PN} now as others have mentioned.
> +
> +do_install() {
> +install -d ${D}${bindir}
> +install -m 755 ${WORKDIR}/git/repo ${D}${bindir}
> +}
> +
> +BBCLASSEXTEND = "native nativesdk"
> diff --git a/meta/recipes-devtools/repo/repo_2.17.3.bb
>
