[OE-core] [PATCH] image_types: fix vname var init in multiubi_mkfs() function
From: Romuald JEANNE As vname var is needed in multiubi_mkfs() function, we need to keep it defined and use it as parameter to the new write_ubi_config() function. See [YOCTO #15027] Signed-off-by: Romuald JEANNE --- meta/classes-recipe/image_types.bbclass | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass index 764e6a5574..c6cb8f5336 100644 --- a/meta/classes-recipe/image_types.bbclass +++ b/meta/classes-recipe/image_types.bbclass @@ -157,11 +157,7 @@ UBI_VOLTYPE ?= "dynamic" UBI_IMGTYPE ?= "ubifs" write_ubi_config() { - if [ -z "$1" ]; then - local vname="" - else - local vname="_$1" - fi + local vname="$1" cat < ubinize${vname}-${IMAGE_NAME}.cfg [ubifs] @@ -183,7 +179,12 @@ multiubi_mkfs() { bbfatal "MKUBIFS_ARGS and UBINIZE_ARGS have to be set, see http://www.linux-mtd.infradead.org/faq/ubifs.html for details" fi - write_ubi_config "$3" + if [ -z "$3" ]; then + local vname="" + else + local vname="_$3" + fi + write_ubi_config "${vname}" if [ -n "$vname" ]; then mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args} -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178210): https://lists.openembedded.org/g/openembedded-core/message/178210 Mute This Topic: https://lists.openembedded.org/mt/97491796/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] Inconsistent libOpenCL.so.1 expectations
2023. 03. 09. 3:32 keltezéssel, Anuj Mittal írta: On Wed, 2023-03-08 at 18:23 +0100, Zoltan Boszormenyi wrote: Added cc for the interested parties. 2023. 03. 08. 18:19 keltezéssel, Zoltan Boszormenyi via lists.openembedded.org írta: Hi, I observed the following inconsistencies: 1. opencl-icd-loader and ocd-icd both provide libOpenCL.so.1 2. opencl-icd-loader has PROVIDES="virtual/opencl-icd", ocl-icd hasn't 3. oe-core's piglit recipe explicitly depends on opencl-icd-loader (should be virtual/opencl-icd) 4. meta-intel recipes RDEPENDS on ocl-icd (should be virtual/opencl-icd) I think all should be changed to use virtual/opencl-icd and ocl-icd can do a PROVIDES for it. We will have to set a PREFERRED_PROVIDER for it as well then. Most distros seem to prefer ocl-icd as the default perhaps because it has been around longer? I have some internal fixes for this problem that I was able to use in Kirkstone. However, to satisfy *RDEPENDS*, I also had to add RPROVIDES:${PN} = "virtual/opencl-icd" to both opencl-icd-loader and ocl-icd and use PREFERRED_PROVIDER and PREFERRED_RPROVIDER to select on of them. Would that still be needed for Mickledore? Thanks, Anuj -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178209): https://lists.openembedded.org/g/openembedded-core/message/178209 Mute This Topic: https://lists.openembedded.org/mt/97477512/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] Inconsistent libOpenCL.so.1 expectations
On Wed, 2023-03-08 at 18:23 +0100, Zoltan Boszormenyi wrote: > Added cc for the interested parties. > > 2023. 03. 08. 18:19 keltezéssel, Zoltan Boszormenyi via > lists.openembedded.org írta: > > Hi, > > > > I observed the following inconsistencies: > > > > 1. opencl-icd-loader and ocd-icd both provide libOpenCL.so.1 > > > > 2. opencl-icd-loader has PROVIDES="virtual/opencl-icd", ocl-icd > > hasn't > > > > 3. oe-core's piglit recipe explicitly depends on opencl-icd-loader > > (should be > > virtual/opencl-icd) > > > > 4. meta-intel recipes RDEPENDS on ocl-icd (should be > > virtual/opencl-icd) I think all should be changed to use virtual/opencl-icd and ocl-icd can do a PROVIDES for it. We will have to set a PREFERRED_PROVIDER for it as well then. Most distros seem to prefer ocl-icd as the default perhaps because it has been around longer? Thanks, Anuj -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178208): https://lists.openembedded.org/g/openembedded-core/message/178208 Mute This Topic: https://lists.openembedded.org/mt/97477512/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] rust: added missing runtime dependencies to run rust on target
All the 3 ' gcc g++ binutil ' are required to run rust on target. > > Without binutils getting error 'cannot find ld ' and > without g++ getting below error: > > root@qemux86-64:~# rustc -o hello main.rs > error: linking with `x86_64-poky-linux-gcc` failed: exit status: 1 > | > = note: "x86_64-poky-linux-gcc" "/tmp/rustcuD3OmE/symbols.o" > "hello.main.cbe1d0af-cgu.0.rcgu.o" "hello.main.cbe1d0af-cgu.1.rcgu.o" > "hello.main.cbe1d0af-cgu.2.rcgu.o" "hello.main.cbe1d0af > = note: > /usr/lib/gcc/x86_64-poky-linux/12.2.0/../../../../x86_64-poky-linux/bin/ld: > cannot find Scrt1.o: No such file or directory > /usr/lib/gcc/x86_64-poky-linux/12.2.0/../../../../x86_64-poky-linux/bin/ld: > cannot find crti.o: No such file or directory > /usr/lib/gcc/x86_64-poky-linux/12.2.0/../../../../x86_64-poky-linux/bin/ld: > cannot find crtbeginS.o: No such file or directory > /usr/lib/gcc/x86_64-poky-linux/12.2.0/../../../../x86_64-poky-linux/bin/ld: > cannot find -lgcc_s: No such file or directory > /usr/lib/gcc/x86_64-poky-linux/12.2.0/../../../../x86_64-poky-linux/bin/ld: > cannot find -lutil: No such file or directory > /usr/lib/gcc/x86_64-poky-linux/12.2.0/../../../../x86_64-poky-linux/bin/ld: > cannot find -lrt: No such file or directory > /usr/lib/gcc/x86_64-poky-linux/12.2.0/../../../../x86_64-poky-linux/bin/ld: > cannot find -lpthread: No such file or directory > /usr/lib/gcc/x86_64-poky-linux/12.2.0/../../../../x86_64-poky-linux/bin/ld: > cannot find -lm: No such file or directory > /usr/lib/gcc/x86_64-poky-linux/12.2.0/../../../../x86_64-poky-linux/bin/ld: > cannot find -ldl: No such file or directory > /usr/lib/gcc/x86_64-poky-linux/12.2.0/../../../../x86_64-poky-linux/bin/ld: > cannot find -lc: No such file or directory > /usr/lib/gcc/x86_64-poky-linux/12.2.0/../../../../x86_64-poky-linux/bin/ld: > cannot find crtendS.o: No such file or directory > /usr/lib/gcc/x86_64-poky-linux/12.2.0/../../../../x86_64-poky-linux/bin/ld: > cannot find crtn.o: No such file or directory > collect2: error: ld returned 1 exit status > error: aborting due to previous error > I tried the given dependencies ' gcc gcc-symlinks binutils ${LIBC_DEPENDENCIES} libgcc-dev ' to avoid g++ but that giving below QA error: > > NOTE: Executing Tasks > ERROR: rust-1.67.1-r0 do_package_qa: QA Issue: rust rdepends on glibc-dbg > [debug-deps] > ERROR: rust-1.67.1-r0 do_package_qa: QA Issue: rust rdepends on glibc-dev > [dev-deps] > ERROR: rust-1.67.1-r0 do_package_qa: QA Issue: rust rdepends on libgcc-dev > [dev-deps] > ERROR: rust-1.67.1-r0 do_package_qa: Fatal QA errors were found, failing > task. > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178207): https://lists.openembedded.org/g/openembedded-core/message/178207 Mute This Topic: https://lists.openembedded.org/mt/97477865/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 5/5] bash: Fix install conflict when enable multilib.
> I think we should just change the MACHINE, OS, CC and MACHTYPE lines to > something like "". So for the correction of this problem, do we need to continue to vote for patch? Or accept this patch temporarily, and then roll it back after the bash update? -- Best Regards --- Wang Mingyu Development Dept.I Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China TEL: +86+25-86630566-8568 COINS: 79988548 FAX: +86+25-83317685 MAIL: wan...@fujitsu.com http://www.fujitsu.com/cn/fnst/ > -Original Message- > From: Richard Purdie > Sent: Wednesday, March 8, 2023 5:25 PM > To: Wang, Mingyu/王 鸣瑜 ; > openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH V2 5/5] bash: Fix install conflict when enable > multilib. > > On Wed, 2023-03-08 at 09:40 +0800, wangmy wrote: > > From: Wang Mingyu > > > > Error: Transaction test error: > > file /usr/bin/bashbug conflicts between attempted installs of > > lib32-bash-bashbug-5.2.15-r0.armv7ahf_neon and > > bash-bashbug-5.2.15-r0.aarch64 > > > > The differences between the two files are as follows: > > @@ -26,14 +26,14 @@ > > # configuration section: > > # these variables are filled in by the make target in Makefile > > # > > -MACHINE="aarch64" > > -OS="linux-gnu" > > -CC="aarch64-poky-linux-gcc -mcpu=cortex-a57 -march=armv8-a+crc > -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat > -Wformat-security -Werror=format-security " > > +MACHINE="arm" > > +OS="linux-gnueabi" > > +CC="arm-pokymllib32-linux-gnueabi-gcc -march=armv7-a -mfpu=neon > -mfloat-abi=hard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 > -Wformat -Wformat-security -Werror=format-security " > > CFLAGS=" -O2 -pipe -g -feliminate-unused-debug-types > -DNON_INTERACTIVE_LOGIN_SHELLS -DHEREDOC_PIPESIZE=65536 > -DBRACKETED_PASTE_DEFAULT=0" > > RELEASE="5.2" > > PATCHLEVEL="15" > > RELSTATUS="release" > > -MACHTYPE="aarch64-poky-linux-gnu" > > +MACHTYPE="arm-pokymllib32-linux-gnueabi" > > > > PATH=/bin:/usr/bin:/usr/local/bin:$PATH > > export PATH > > > > Signed-off-by: Wang Mingyu > > --- > > meta/recipes-extended/bash/bash_5.2.15.bb | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/meta/recipes-extended/bash/bash_5.2.15.bb > > b/meta/recipes-extended/bash/bash_5.2.15.bb > > index f78f79fcc5..ce81496f52 100644 > > --- a/meta/recipes-extended/bash/bash_5.2.15.bb > > +++ b/meta/recipes-extended/bash/bash_5.2.15.bb > > @@ -20,3 +20,6 @@ DEBUG_OPTIMIZATION:append:armv4 = " > > ${@bb.utils.contains('TUNE_CCARGS', '-mthumb > > DEBUG_OPTIMIZATION:append:armv5 = " > ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', > d)}" > > > > BBCLASSEXTEND = "nativesdk" > > + > > +inherit multilib_script > > +MULTILIB_SCRIPTS = "${PN}-bashbug:${bindir}/bashbug" > > I think we should just change the MACHINE, OS, CC and MACHTYPE lines to > something like "". > > Cheers, > > Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178206): https://lists.openembedded.org/g/openembedded-core/message/178206 Mute This Topic: https://lists.openembedded.org/mt/97464376/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] selftest/runtime_test/virgl: Disable for all Rocky Linux
RHEL compatible kernels do not support vgem so we disable virgl headless testing. Signed-off-by: Michael Halstead --- meta/lib/oeqa/selftest/cases/runtime_test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index e32c4aff85..81b8d056cc 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -257,7 +257,8 @@ class TestImage(OESelftestTestCase): import subprocess, os distro = oe.lsb.distro_identifier() -if distro and (distro in ['debian-9', 'debian-10', 'centos-7', 'centos-8', 'ubuntu-16.04', 'ubuntu-18.04'] or distro.startswith('almalinux')): +if distro and (distro in ['debian-9', 'debian-10', 'centos-7', 'centos-8', 'ubuntu-16.04', 'ubuntu-18.04'] or +distro.startswith('almalinux') or distro.startswith('rocky')): self.skipTest('virgl headless cannot be tested with %s' %(distro)) qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native') -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178205): https://lists.openembedded.org/g/openembedded-core/message/178205 Mute This Topic: https://lists.openembedded.org/mt/97486168/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/leave/8023207/21656/1426099254/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 3/3] cups: add/fix web interface packaging
cups includes a web server. Users can surf to port 631 (default) of a machine running cups to (potentially, based on configuration, default off) view jobs, add printers, and perform other forms of administration. The location of the various resources that are used by the built-in web server (e.g. index.html) are installed under ${datadir}/doc/cups. By default these artifacts would be included in the ${PN}-doc package. The comments in this recipe, however, would suggest an attempt was made to have them added to ${PN}; albeit unsuccessfully. These resources add roughly 1.8M to an image. Since cups does include a configuration option to disable the web interface (--enable-webif), add a PACKAGECONFIG (default off) to allow the user to decide whether or not they would like the web interface configured and its pieces added to the image. Enabling this PACKAGECONFIG both enables the web interface to be configured and built into cups, and also adds (by way of a recommendation) the web interface package to the image. Considering that the previous intention was not working, defaulting this option to off preserves the existing behaviour. Previously in order to have the web interface data included in an image, a user would have needed to explicitly add the ${PN}-doc package to their image. Signed-off-by: Trevor Woerner --- meta/recipes-extended/cups/cups.inc | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 1b522d7d8535..da320b108552 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -47,6 +47,7 @@ PACKAGECONFIG[gnutls] = "--with-tls=gnutls,--with-tls=no,gnutls" PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" +PACKAGECONFIG[webif] = "--enable-webif,--disable-webif" EXTRA_OECONF = " \ --enable-dbus \ @@ -92,7 +93,7 @@ do_install () { fi } -PACKAGES =+ "${PN}-lib ${PN}-libimage" +PACKAGES =+ "${PN}-lib ${PN}-libimage ${PN}-webif" RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" FILES:${PN} += "${libexecdir}/cups/" @@ -101,13 +102,10 @@ FILES:${PN}-lib = "${libdir}/libcups.so.*" FILES:${PN}-libimage = "${libdir}/libcupsimage.so.*" -#package the html for the webgui inside the main packages (~1MB uncompressed) +# put the html for the web interface into its own PACKAGE +FILES:${PN}-webif += "${datadir}/doc/cups/ ${datadir}/icons/" +RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'webif', '${PN}-webif', '', d)}" -FILES:${PN} += "${datadir}/doc/cups/images \ -${datadir}/doc/cups/*html \ -${datadir}/doc/cups/*.css \ -${datadir}/icons/ \ - " CONFFILES:${PN} += "${sysconfdir}/cups/cupsd.conf" MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" -- 2.36.0.rc2.17.g4027e30c53 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178204): https://lists.openembedded.org/g/openembedded-core/message/178204 Mute This Topic: https://lists.openembedded.org/mt/97484588/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] cups: check PACKAGECONFIG for pam feature
The cups' PACKAGECONFIG is populated based on DISTRO_FEATURES, but a user is free to enable or disable PACKAGECONFIGs at will. In theory it is possible that pam is enabled globally in DISTRO_FEATURES but disabled in cups' PACKAGECONFIG. Checking the PACKAGECONFIG to determine whether or not pam is enabled would be a safer check rather than relying on DISTRO_FEATURES. Signed-off-by: Trevor Woerner --- meta/recipes-extended/cups/cups.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index b8b655a4fb85..1b522d7d8535 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -74,7 +74,7 @@ do_install () { rmdir ${D}/${libexecdir}/${BPN}/driver # Fix the pam configuration file permissions - if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then + if ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'true', 'false', d)}; then chmod 0644 ${D}${sysconfdir}/pam.d/cups fi -- 2.36.0.rc2.17.g4027e30c53 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178203): https://lists.openembedded.org/g/openembedded-core/message/178203 Mute This Topic: https://lists.openembedded.org/mt/97484587/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] cups: use BUILDROOT instead of DESTDIR
The cups documentation is clear that the correct way to install into an alternate root directory is to use the BUILDROOT variable. From INSTALL.md: Use the `BUILDROOT` variable to install to an alternate root directory: make BUILDROOT=/some/other/root/directory install DESTDIR works, but we should use the mechanism the project specifically created for this purpose. Signed-off-by: Trevor Woerner --- meta/recipes-extended/cups/cups.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 9c920bb133ff..b8b655a4fb85 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -66,7 +66,7 @@ EXTRA_OECONF = " \ EXTRA_AUTORECONF += "--exclude=autoheader" do_install () { - oe_runmake "DESTDIR=${D}" install + oe_runmake "BUILDROOT=${D}" install # Remove /var/run from package as cupsd will populate it on startup rm -fr ${D}/${localstatedir}/run -- 2.36.0.rc2.17.g4027e30c53 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178202): https://lists.openembedded.org/g/openembedded-core/message/178202 Mute This Topic: https://lists.openembedded.org/mt/97484586/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] meson: remove obsolete RPATH stripping patch
As per the release notes for 0.55.0[1], this patch is no longer needed as Meson now only removes the RPATHs that it adds itself, any RPATHs added via LDFLAGS or pkgconfig files are left untouched. [1] https://mesonbuild.com/Release-notes-for-0-55-0.html#rpath-removal-now-more-careful Signed-off-by: Ross Burton --- .../meson/meson/disable-rpath-handling.patch | 37 --- meta/recipes-devtools/meson/meson_1.0.1.bb| 1 - 2 files changed, 38 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson/disable-rpath-handling.patch diff --git a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch deleted file mode 100644 index 7aaed8b4a38..000 --- a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 18600f7a1cddf23aeabd188f86e66983f27ccfe3 Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Fri, 23 Nov 2018 15:28:28 + -Subject: [PATCH] meson: Disable rpath stripping at install time - -We need to allow our rpaths generated through the compiler flags to make it into -our binaries. Therefore disable the meson manipulations of these unless there -is a specific directive to do something differently in the project. - -RP 2018/11/23 - -Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567] - mesonbuild/minstall.py | 7 +-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 7d0da13..17d50db 100644 a/mesonbuild/minstall.py -+++ b/mesonbuild/minstall.py -@@ -718,8 +718,11 @@ class Installer: - if file_copied: - self.did_install_something = True - try: --self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, -- install_name_mappings, verbose=False) -+if install_rpath: -+self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, -+ install_name_mappings, verbose=False) -+else: -+print("RPATH changes at install time disabled") - except SystemExit as e: - if isinstance(e.code, int) and e.code == 0: - pass --- -2.20.1 - diff --git a/meta/recipes-devtools/meson/meson_1.0.1.bb b/meta/recipes-devtools/meson/meson_1.0.1.bb index ce12a3126bc..fd478b21612 100644 --- a/meta/recipes-devtools/meson/meson_1.0.1.bb +++ b/meta/recipes-devtools/meson/meson_1.0.1.bb @@ -12,7 +12,6 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ file://meson-setup.py \ file://meson-wrapper \ file://0001-python-module-do-not-manipulate-the-environment-when.patch \ - file://disable-rpath-handling.patch \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \ -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178201): https://lists.openembedded.org/g/openembedded-core/message/178201 Mute This Topic: https://lists.openembedded.org/mt/97483574/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] systemd: add ignore for CVE-2022-4415
The relevant fix was also backported to 252.4. Signed-off-by: Ross Burton --- meta/recipes-core/systemd/systemd_252.5.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/systemd/systemd_252.5.bb b/meta/recipes-core/systemd/systemd_252.5.bb index 8b92b2cf425..784a2482075 100644 --- a/meta/recipes-core/systemd/systemd_252.5.bb +++ b/meta/recipes-core/systemd/systemd_252.5.bb @@ -826,3 +826,6 @@ pkg_postinst:udev-hwdb () { pkg_prerm:udev-hwdb () { rm -f $D${sysconfdir}/udev/hwdb.bin } + +# This was also fixed in 252.4 with 9b75a3d0 +CVE_CHECK_IGNORE += "CVE-2022-4415" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178200): https://lists.openembedded.org/g/openembedded-core/message/178200 Mute This Topic: https://lists.openembedded.org/mt/97483495/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 v4 1/2] qemu: split out qemu-guest-agent, add startup scripts
On Wed, 8 Mar 2023 at 22:15, Richard Purdie wrote: > > On Wed, 2023-03-08 at 21:22 +0100, Clément Péron wrote: > > Hi Richard, > > > > On Wed, 8 Mar 2023 at 18:31, Richard Purdie > > wrote: > > > > > > On Wed, 2023-03-08 at 18:14 +0100, Clément Péron wrote: > > > > Split out the QEMU guest agent into a separate package. The agent is > > > > intended to be installed within a QEMU VM guest where a user is likely > > > > to not want to have the rest of the QEMU installation within it. > > > > > > > > Additionally, an initscript, udev rules file, and systemd unit file are > > > > added to the package so that the guest agent can start automatically; > > > > the former two come from Debian's packaging for qemu-guest-agent. > > > > > > > > Signed-off-by: Brenda Streiff > > > > Signed-off-by: Clément Péron > > > > --- > > > > > > > > Changes since v3: > > > > - fix missing comma in udev rule > > > > > > > > Changes since v2: > > > > - Add missing files > > > > - rebase on top of master > > > > > > > > Changes since v1: > > > > - Fix systemd-service using PN where it should not > > > > > > > > meta/recipes-devtools/qemu/qemu.inc | 35 +++- > > > > .../qemu/qemu/qemu-guest-agent.init | 84 +++ > > > > .../qemu/qemu/qemu-guest-agent.udev | 2 + > > > > 3 files changed, 120 insertions(+), 1 deletion(-) > > > > create mode 100644 > > > > meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > > > > create mode 100644 > > > > meta/recipes-devtools/qemu/qemu/qemu-guest-agent.udev > > > > > > > > diff --git a/meta/recipes-devtools/qemu/qemu.inc > > > > b/meta/recipes-devtools/qemu/qemu.inc > > > > index 1e768b560d..b41055fe5d 100644 > > > > --- a/meta/recipes-devtools/qemu/qemu.inc > > > > +++ b/meta/recipes-devtools/qemu/qemu.inc > > > > @@ -9,7 +9,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" > > > > RDEPENDS:${PN}-ptest = "bash" > > > > > > > > require qemu-targets.inc > > > > -inherit pkgconfig ptest > > > > +inherit pkgconfig ptest update-rc.d systemd > > > > > > > > LIC_FILES_CHKSUM = > > > > "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ > > > > > > > > file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" > > > > @@ -32,6 +32,8 @@ SRC_URI = > > > > "https://download.qemu.org/${BPN}-${PV}.tar.xz \ > > > > > > > > file://0001-configure-Fix-check-tcg-not-executing-any-tests.patch \ > > > > > > > > file://0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch \ > > > > > > > > file://0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch \ > > > > + file://qemu-guest-agent.init \ > > > > + file://qemu-guest-agent.udev \ > > > > " > > > > UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" > > > > > > > > @@ -132,6 +134,20 @@ do_configure[cleandirs] += "${B}" > > > > do_install () { > > > > export STRIP="" > > > > oe_runmake 'DESTDIR=${D}' install > > > > + > > > > + # If we built the guest agent, also install startup/udev rules > > > > + if [ -e "${D}${bindir}/qemu-ga" ]; then > > > > + install -d ${D}${sysconfdir}/init.d/ > > > > + install -m 0755 ${WORKDIR}/qemu-guest-agent.init > > > > ${D}${sysconfdir}/init.d/qemu-guest-agent > > > > + sed -i 's:@bindir@:${bindir}:' > > > > ${D}${sysconfdir}/init.d/qemu-guest-agent > > > > + > > > > + install -d ${D}${sysconfdir}/udev/rules.d/ > > > > + install -m 0644 ${WORKDIR}/qemu-guest-agent.udev > > > > ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules > > > > + > > > > + install -d ${D}${systemd_unitdir}/system/ > > > > + install -m 0644 > > > > ${S}/contrib/systemd/qemu-guest-agent.service > > > > ${D}${systemd_unitdir}/system > > > > + sed -i -e 's,-/usr/bin/,-${bindir}/,g' > > > > ${D}${systemd_unitdir}/system/qemu-guest-agent.service > > > > + fi > > > > } > > > > > > > > # The following fragment will create a wrapper for qemu-mips user > > > > emulation > > > > @@ -210,3 +226,20 @@ PACKAGECONFIG[jack] = > > > > "--enable-jack,--disable-jack,jack," > > > > INSANE_SKIP:${PN} = "arch" > > > > > > > > FILES:${PN} += "${datadir}/icons" > > > > + > > > > +# Put the guest agent in a separate package > > > > +PACKAGES =+ "${PN}-guest-agent" > > > > +SUMMARY:${PN}-guest-agent = "QEMU guest agent" > > > > +FILES:${PN}-guest-agent += " \ > > > > +${bindir}/qemu-ga \ > > > > +${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules \ > > > > +${sysconfdir}/init.d/qemu-guest-agent \ > > > > +${systemd_unitdir}/system/qemu-guest-agent.service \ > > > > +" > > > > + > > > > +INITSCRIPT_PACKAGES = "${PN}-guest-agent" > > > > +INITSCRIPT_NAME:${PN}-guest-agent = "qemu-guest-agent" > > > > +INITSCRIPT_PARAMS:${PN}-guest-agent = "defaults" > > > > + > > > > +SYSTEMD_PACKAGES = "${PN}-guest-agent" > > > > +SYSTEMD_SERVICE:${PN}-guest-agent =
Re: [OE-core] [PATCH v4 1/2] qemu: split out qemu-guest-agent, add startup scripts
On Wed, 2023-03-08 at 21:22 +0100, Clément Péron wrote: > Hi Richard, > > On Wed, 8 Mar 2023 at 18:31, Richard Purdie > wrote: > > > > On Wed, 2023-03-08 at 18:14 +0100, Clément Péron wrote: > > > Split out the QEMU guest agent into a separate package. The agent is > > > intended to be installed within a QEMU VM guest where a user is likely > > > to not want to have the rest of the QEMU installation within it. > > > > > > Additionally, an initscript, udev rules file, and systemd unit file are > > > added to the package so that the guest agent can start automatically; > > > the former two come from Debian's packaging for qemu-guest-agent. > > > > > > Signed-off-by: Brenda Streiff > > > Signed-off-by: Clément Péron > > > --- > > > > > > Changes since v3: > > > - fix missing comma in udev rule > > > > > > Changes since v2: > > > - Add missing files > > > - rebase on top of master > > > > > > Changes since v1: > > > - Fix systemd-service using PN where it should not > > > > > > meta/recipes-devtools/qemu/qemu.inc | 35 +++- > > > .../qemu/qemu/qemu-guest-agent.init | 84 +++ > > > .../qemu/qemu/qemu-guest-agent.udev | 2 + > > > 3 files changed, 120 insertions(+), 1 deletion(-) > > > create mode 100644 meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > > > create mode 100644 meta/recipes-devtools/qemu/qemu/qemu-guest-agent.udev > > > > > > diff --git a/meta/recipes-devtools/qemu/qemu.inc > > > b/meta/recipes-devtools/qemu/qemu.inc > > > index 1e768b560d..b41055fe5d 100644 > > > --- a/meta/recipes-devtools/qemu/qemu.inc > > > +++ b/meta/recipes-devtools/qemu/qemu.inc > > > @@ -9,7 +9,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" > > > RDEPENDS:${PN}-ptest = "bash" > > > > > > require qemu-targets.inc > > > -inherit pkgconfig ptest > > > +inherit pkgconfig ptest update-rc.d systemd > > > > > > LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ > > > > > > file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" > > > @@ -32,6 +32,8 @@ SRC_URI = > > > "https://download.qemu.org/${BPN}-${PV}.tar.xz \ > > > > > > file://0001-configure-Fix-check-tcg-not-executing-any-tests.patch \ > > > > > > file://0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch \ > > > > > > file://0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch \ > > > + file://qemu-guest-agent.init \ > > > + file://qemu-guest-agent.udev \ > > > " > > > UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" > > > > > > @@ -132,6 +134,20 @@ do_configure[cleandirs] += "${B}" > > > do_install () { > > > export STRIP="" > > > oe_runmake 'DESTDIR=${D}' install > > > + > > > + # If we built the guest agent, also install startup/udev rules > > > + if [ -e "${D}${bindir}/qemu-ga" ]; then > > > + install -d ${D}${sysconfdir}/init.d/ > > > + install -m 0755 ${WORKDIR}/qemu-guest-agent.init > > > ${D}${sysconfdir}/init.d/qemu-guest-agent > > > + sed -i 's:@bindir@:${bindir}:' > > > ${D}${sysconfdir}/init.d/qemu-guest-agent > > > + > > > + install -d ${D}${sysconfdir}/udev/rules.d/ > > > + install -m 0644 ${WORKDIR}/qemu-guest-agent.udev > > > ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules > > > + > > > + install -d ${D}${systemd_unitdir}/system/ > > > + install -m 0644 > > > ${S}/contrib/systemd/qemu-guest-agent.service > > > ${D}${systemd_unitdir}/system > > > + sed -i -e 's,-/usr/bin/,-${bindir}/,g' > > > ${D}${systemd_unitdir}/system/qemu-guest-agent.service > > > + fi > > > } > > > > > > # The following fragment will create a wrapper for qemu-mips user > > > emulation > > > @@ -210,3 +226,20 @@ PACKAGECONFIG[jack] = > > > "--enable-jack,--disable-jack,jack," > > > INSANE_SKIP:${PN} = "arch" > > > > > > FILES:${PN} += "${datadir}/icons" > > > + > > > +# Put the guest agent in a separate package > > > +PACKAGES =+ "${PN}-guest-agent" > > > +SUMMARY:${PN}-guest-agent = "QEMU guest agent" > > > +FILES:${PN}-guest-agent += " \ > > > +${bindir}/qemu-ga \ > > > +${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules \ > > > +${sysconfdir}/init.d/qemu-guest-agent \ > > > +${systemd_unitdir}/system/qemu-guest-agent.service \ > > > +" > > > + > > > +INITSCRIPT_PACKAGES = "${PN}-guest-agent" > > > +INITSCRIPT_NAME:${PN}-guest-agent = "qemu-guest-agent" > > > +INITSCRIPT_PARAMS:${PN}-guest-agent = "defaults" > > > + > > > +SYSTEMD_PACKAGES = "${PN}-guest-agent" > > > +SYSTEMD_SERVICE:${PN}-guest-agent = "qemu-guest-agent.service" > > > diff --git a/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > > > b/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > > > new file mode 100644 > > > index 00..493da0ef1a > > > --- /dev/null > > > +++ b/meta/recipes-devtools/qemu/qemu/qemu-
Re: [OE-core] [PATCH v4 1/2] qemu: split out qemu-guest-agent, add startup scripts
Hi Richard, On Wed, 8 Mar 2023 at 18:31, Richard Purdie wrote: > > On Wed, 2023-03-08 at 18:14 +0100, Clément Péron wrote: > > Split out the QEMU guest agent into a separate package. The agent is > > intended to be installed within a QEMU VM guest where a user is likely > > to not want to have the rest of the QEMU installation within it. > > > > Additionally, an initscript, udev rules file, and systemd unit file are > > added to the package so that the guest agent can start automatically; > > the former two come from Debian's packaging for qemu-guest-agent. > > > > Signed-off-by: Brenda Streiff > > Signed-off-by: Clément Péron > > --- > > > > Changes since v3: > > - fix missing comma in udev rule > > > > Changes since v2: > > - Add missing files > > - rebase on top of master > > > > Changes since v1: > > - Fix systemd-service using PN where it should not > > > > meta/recipes-devtools/qemu/qemu.inc | 35 +++- > > .../qemu/qemu/qemu-guest-agent.init | 84 +++ > > .../qemu/qemu/qemu-guest-agent.udev | 2 + > > 3 files changed, 120 insertions(+), 1 deletion(-) > > create mode 100644 meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > > create mode 100644 meta/recipes-devtools/qemu/qemu/qemu-guest-agent.udev > > > > diff --git a/meta/recipes-devtools/qemu/qemu.inc > > b/meta/recipes-devtools/qemu/qemu.inc > > index 1e768b560d..b41055fe5d 100644 > > --- a/meta/recipes-devtools/qemu/qemu.inc > > +++ b/meta/recipes-devtools/qemu/qemu.inc > > @@ -9,7 +9,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" > > RDEPENDS:${PN}-ptest = "bash" > > > > require qemu-targets.inc > > -inherit pkgconfig ptest > > +inherit pkgconfig ptest update-rc.d systemd > > > > LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ > > > > file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" > > @@ -32,6 +32,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ > > > > file://0001-configure-Fix-check-tcg-not-executing-any-tests.patch \ > > > > file://0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch \ > > > > file://0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch \ > > + file://qemu-guest-agent.init \ > > + file://qemu-guest-agent.udev \ > > " > > UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" > > > > @@ -132,6 +134,20 @@ do_configure[cleandirs] += "${B}" > > do_install () { > > export STRIP="" > > oe_runmake 'DESTDIR=${D}' install > > + > > + # If we built the guest agent, also install startup/udev rules > > + if [ -e "${D}${bindir}/qemu-ga" ]; then > > + install -d ${D}${sysconfdir}/init.d/ > > + install -m 0755 ${WORKDIR}/qemu-guest-agent.init > > ${D}${sysconfdir}/init.d/qemu-guest-agent > > + sed -i 's:@bindir@:${bindir}:' > > ${D}${sysconfdir}/init.d/qemu-guest-agent > > + > > + install -d ${D}${sysconfdir}/udev/rules.d/ > > + install -m 0644 ${WORKDIR}/qemu-guest-agent.udev > > ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules > > + > > + install -d ${D}${systemd_unitdir}/system/ > > + install -m 0644 ${S}/contrib/systemd/qemu-guest-agent.service > > ${D}${systemd_unitdir}/system > > + sed -i -e 's,-/usr/bin/,-${bindir}/,g' > > ${D}${systemd_unitdir}/system/qemu-guest-agent.service > > + fi > > } > > > > # The following fragment will create a wrapper for qemu-mips user emulation > > @@ -210,3 +226,20 @@ PACKAGECONFIG[jack] = > > "--enable-jack,--disable-jack,jack," > > INSANE_SKIP:${PN} = "arch" > > > > FILES:${PN} += "${datadir}/icons" > > + > > +# Put the guest agent in a separate package > > +PACKAGES =+ "${PN}-guest-agent" > > +SUMMARY:${PN}-guest-agent = "QEMU guest agent" > > +FILES:${PN}-guest-agent += " \ > > +${bindir}/qemu-ga \ > > +${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules \ > > +${sysconfdir}/init.d/qemu-guest-agent \ > > +${systemd_unitdir}/system/qemu-guest-agent.service \ > > +" > > + > > +INITSCRIPT_PACKAGES = "${PN}-guest-agent" > > +INITSCRIPT_NAME:${PN}-guest-agent = "qemu-guest-agent" > > +INITSCRIPT_PARAMS:${PN}-guest-agent = "defaults" > > + > > +SYSTEMD_PACKAGES = "${PN}-guest-agent" > > +SYSTEMD_SERVICE:${PN}-guest-agent = "qemu-guest-agent.service" > > diff --git a/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > > b/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > > new file mode 100644 > > index 00..493da0ef1a > > --- /dev/null > > +++ b/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > > @@ -0,0 +1,84 @@ > > +#!/bin/sh > > +### BEGIN INIT INFO > > +# Provides: qemu-guest-agent > > +# Required-Start:$remote_fs $syslog > > +# Required-Stop: $remote_fs $syslog > > +# Default-Start: 2 3 4 5 > > +# Default-Stop: 0 1 6 > > +# Short-Description: QEMU Guest
Re: [OE-core] [PATCH v4 1/2] qemu: split out qemu-guest-agent, add startup scripts
Hi Michael, On Wed, 8 Mar 2023 at 18:55, Michael Tokarev wrote: > > 08.03.2023 20:28, Clément Péron пишет: > ... > >> meta/recipes-devtools/qemu/qemu.inc | 35 +++- > >> .../qemu/qemu/qemu-guest-agent.init | 84 +++ > >> .../qemu/qemu/qemu-guest-agent.udev | 2 + > > > > In this patch, > > > > qemu-guest-agent.init and qemu-guest-agent.udev come from the Debian > > source repo. > > > > Could you confirm that these files use the same license as the repo? > > Or are they following another one? > > I wrote those files. It's not much. The license is the same as whole QEMU, > which basically means GPL2. Thanks for the confirmation Best, Clement > > /mjt -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178196): https://lists.openembedded.org/g/openembedded-core/message/178196 Mute This Topic: https://lists.openembedded.org/mt/97477394/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 v3 1/3] mesa, mesa-gl: 23.0.0
On Wed, 8 Mar 2023 at 06:28, Böszörményi Zoltán wrote: > I think that was already brewing with 22.3.x, since that version > cut off the "classic" drivers, keeping only the gallium ones. > Like the kernel, Mesa's drivers were implicitly expected to work > with everything built from the same main version because > they were using internal structures that may be reworked > from one major version to another. I just posted a RFC patchset that switches runqemu to use mesa-native fully. Some form of that patchset has to go in before mesa can be updated to 23.3 - we're in the middle of feature freeze now, so it'll likely have to wait. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178195): https://lists.openembedded.org/g/openembedded-core/message/178195 Mute This Topic: https://lists.openembedded.org/mt/97421290/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [RFC PATCH 5/5] llvm: allow building libllvm in native builds, subject to PACKAGECONFIG
Also, enable that, if opengl is in native DISTRO_FEATURES: this allows mesa-native to build drivers that rely on libllbm, particularly llvmpipe, which is a (sort of) accelerated software renderer that is the only option on build hosts without dedicated or supported GPUs. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/llvm/llvm_git.bb | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index b4e983d2d0..f133653903 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -57,9 +57,11 @@ def get_llvm_arch(bb, d, arch_var): def get_llvm_host_arch(bb, d): return get_llvm_arch(bb, d, 'HOST_ARCH') -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "libllvm" +PACKAGECONFIG:class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libllvm', '', d)}" # if optviewer OFF, force the modules to be not found or the ones on the host would be found PACKAGECONFIG[optviewer] = ",-DPY_PYGMENTS_FOUND=OFF -DPY_PYGMENTS_LEXERS_C_CPP_FOUND=OFF -DPY_YAML_FOUND=OFF,python3-pygments python3-pyyaml,python3-pygments python3-pyyaml" +PACKAGECONFIG[libllvm] = "" # # Default to build all OE-Core supported target arches (user overridable). @@ -102,14 +104,15 @@ do_compile:prepend:class-target() { } do_compile() { +if ${@bb.utils.contains('PACKAGECONFIG', 'libllvm', 'true', 'false', d)}; then ninja -v ${PARALLEL_MAKE} -} - -do_compile:class-native() { +else ninja -v ${PARALLEL_MAKE} llvm-config llvm-tblgen +fi } do_install() { +if ${@bb.utils.contains('PACKAGECONFIG', 'libllvm', 'true', 'false', d)}; then DESTDIR=${D} ninja -v install # llvm harcodes usr/lib as install path, so this corrects it to actual libdir @@ -121,9 +124,10 @@ do_install() { # reproducibility sed -i -e 's,${WORKDIR},,g' ${D}/${libdir}/cmake/llvm/LLVMConfig.cmake +fi } -do_install:class-native() { +do_install:append:class-native() { install -D -m 0755 ${B}/bin/llvm-tblgen ${D}${bindir}/llvm-tblgen${PV} install -D -m 0755 ${B}/bin/llvm-config ${D}${bindir}/llvm-config${PV} ln -sf llvm-config${PV} ${D}${bindir}/llvm-config -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178194): https://lists.openembedded.org/g/openembedded-core/message/178194 Mute This Topic: https://lists.openembedded.org/mt/97480129/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [RFC PATCH 3/5] mesa: allow mesa-native/nativesdk only subject to opengl/vulkan DISTRO_FEATURE
This prevents accidental builds of it when native/nativesdk opengl is not actually enabled (which may cause undesirable lengthening of dependency chains or build failures because those dependencies don't enable options required for mesa). Signed-off-by: Alexander Kanavin --- meta/recipes-graphics/mesa/mesa.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 8a8a057c6b..8690df0bc2 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -50,7 +50,7 @@ inherit meson pkgconfig python3native gettext features_check BBCLASSEXTEND = "native nativesdk" -ANY_OF_DISTRO_FEATURES:class-target = "opengl vulkan" +ANY_OF_DISTRO_FEATURES = "opengl vulkan" PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178192): https://lists.openembedded.org/g/openembedded-core/message/178192 Mute This Topic: https://lists.openembedded.org/mt/97480127/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [RFC PATCH 4/5] mesa: enable a rich set of drivers for native builds
Without this, the only available driver would be swrast (without llvmpipe) which is far too slow to be practical, and so qemu wouldn't be able to perform accelerated graphics. Note that mesa-native itself is guarded by presence of 'opengl' in DISTRO_FEATURES_NATIVE, so building it is entirely opt-in. The one major dependency is llvm-native which takes just under three minutes on my machine. Signed-off-by: Alexander Kanavin --- meta/recipes-graphics/mesa/mesa.inc | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 8690df0bc2..95854f3010 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -88,6 +88,8 @@ PACKAGECONFIG = " \ ${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'video-codecs', '', d)} \ " +PACKAGECONFIG:append:class-native = "gallium-llvm r600" + # "gbm" requires "opengl" PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled" @@ -101,8 +103,8 @@ PACKAGECONFIG[dri3] = "-Ddri3=enabled, -Ddri3=disabled, xorgproto libxshmfence" # Vulkan drivers need dri3 enabled # amd could be enabled as well but requires gallium-llvm with llvm >= 3.9 VULKAN_DRIVERS = "" -VULKAN_DRIVERS:append:x86:class-target = ",intel" -VULKAN_DRIVERS:append:x86-64:class-target = ",intel" +VULKAN_DRIVERS:append:x86 = ",intel" +VULKAN_DRIVERS:append:x86-64 = ",intel" VULKAN_DRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}" VULKAN_DRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'broadcom', ',broadcom', '', d)}" PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')}, -Dvulkan-drivers='',glslang-native vulkan-loader vulkan-headers" @@ -148,8 +150,8 @@ PACKAGECONFIG[zink] = "" GALLIUMDRIVERS = "swrast" # gallium swrast was found to crash Xorg on startup in x32 qemu GALLIUMDRIVERS:x86-x32 = "" -GALLIUMDRIVERS:append:x86:class-target = ",i915,iris,crocus" -GALLIUMDRIVERS:append:x86-64:class-target = ",i915,iris,crocus" +GALLIUMDRIVERS:append:x86 = ",i915,iris,crocus" +GALLIUMDRIVERS:append:x86-64 = ",i915,iris,crocus" GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}" @@ -161,8 +163,8 @@ GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'zink', ',zink', ' # radeonsi requires LLVM GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}" GALLIUMDRIVERS_LLVM = "r300,nouveau${GALLIUMDRIVERS_RADEONSI}" -GALLIUMDRIVERS_LLVM:append:x86:class-target = ",svga" -GALLIUMDRIVERS_LLVM:append:x86-64:class-target = ",svga" +GALLIUMDRIVERS_LLVM:append:x86 = ",svga" +GALLIUMDRIVERS_LLVM:append:x86-64 = ",svga" PACKAGECONFIG[r600] = "" PACKAGECONFIG[virgl] = "" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178193): https://lists.openembedded.org/g/openembedded-core/message/178193 Mute This Topic: https://lists.openembedded.org/mt/97480128/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [RFC PATCH 2/5] bitbake.conf: do not set native opengl distro feature from target
This makes native opengl (and thus accelerated graphics in qemu) opt-in; the reason is that latest mesa tightly couples hardware drivers with its libraries, so we have to build both in mesa-native. Doing so significantly lengthens the builds, and so cannot be imposed by default. Add a check and a hint to runqemu so that there is a helpful error when there is no native/nativesdk opengl/virgl support. Signed-off-by: Alexander Kanavin --- meta/conf/bitbake.conf | 4 ++-- meta/lib/oeqa/selftest/cases/runtime_test.py | 4 ++-- scripts/runqemu | 11 ++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index afd9e2f552..d1dc428583 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -912,8 +912,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 wayland" -DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod opengl wayland" +DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation debuginfod wayland" +DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod wayland" DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig" MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode" diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index e32c4aff85..74d8a1c23b 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -232,7 +232,7 @@ class TestImage(OESelftestTestCase): if 'sdl' not in qemu_packageconfig: features += 'PACKAGECONFIG:append:pn-qemu-system-native = " sdl"\n' if 'opengl' not in qemu_distrofeatures: -features += 'DISTRO_FEATURES:append = " opengl"\n' +features += 'DISTRO_FEATURES_NATIVE:append = " opengl"\n' features += 'TEST_SUITES = "ping ssh virgl"\n' features += 'IMAGE_FEATURES:append = " ssh-server-dropbear"\n' features += 'IMAGE_INSTALL:append = " kmscube"\n' @@ -263,7 +263,7 @@ class TestImage(OESelftestTestCase): qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native') features = 'IMAGE_CLASSES += "testimage"\n' if 'opengl' not in qemu_distrofeatures: -features += 'DISTRO_FEATURES:append = " opengl"\n' +features += 'DISTRO_FEATURES_NATIVE:append = " opengl"\n' features += 'TEST_SUITES = "ping ssh virgl"\n' features += 'IMAGE_FEATURES:append = " ssh-server-dropbear"\n' features += 'IMAGE_INSTALL:append = " kmscube"\n' diff --git a/scripts/runqemu b/scripts/runqemu index 8e915f3d4c..9f82aa12f1 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -447,7 +447,16 @@ class BaseConfig(object): self.set("MACHINE", arg) def set_dri_path(self): -self.qemu_environ['LIBGL_DRIVERS_PATH'] = os.path.join(self.bindir_native, '../lib/dri') +drivers_path = os.path.join(self.bindir_native, '../lib/dri') +if not os.path.exists(drivers_path) or not os.listdir(drivers_path): +raise RunQemuError(""" +qemu has been built without opengl support and accelerated graphics support is not available. +To enable it, add: +DISTRO_FEATURES_NATIVE:append = " opengl" +DISTRO_FEATURES_NATIVESDK:append = " opengl" +to your build configuration. +""") +self.qemu_environ['LIBGL_DRIVERS_PATH'] = drivers_path def check_args(self): for debug in ("-d", "--debug"): -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178191): https://lists.openembedded.org/g/openembedded-core/message/178191 Mute This Topic: https://lists.openembedded.org/mt/97480126/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [RFC PATCH 1/5] runqemu: direct mesa to use its own drivers, rather than ones provided by host distro
With mesa 23.0, it is not longer possible to use the host drivers, as mesa upstream has added strict checks for matching builds between drivers and libraries that load them. Signed-off-by: Alexander Kanavin --- scripts/runqemu | 25 + 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 58b0c191e1..8e915f3d4c 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -447,30 +447,7 @@ class BaseConfig(object): self.set("MACHINE", arg) def set_dri_path(self): -# As runqemu can be run within bitbake (when using testimage, for example), -# we need to ensure that we run host pkg-config, and that it does not -# get mis-directed to native build paths set by bitbake. -env = os.environ.copy() -try: -del env['PKG_CONFIG_PATH'] -del env['PKG_CONFIG_DIR'] -del env['PKG_CONFIG_LIBDIR'] -del env['PKG_CONFIG_SYSROOT_DIR'] -except KeyError: -pass -try: -dripath = subprocess.check_output("PATH=/bin:/usr/bin:$PATH pkg-config --variable=dridriverdir dri", shell=True, env=env) -except subprocess.CalledProcessError as e: -raise RunQemuError("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.") -self.qemu_environ['LIBGL_DRIVERS_PATH'] = dripath.decode('utf-8').strip() - -# This preloads uninative libc pieces and therefore ensures that RPATH/RUNPATH -# in host mesa drivers doesn't trick uninative into loading host libc. -preload_items = ['libdl.so.2', 'librt.so.1', 'libpthread.so.0'] -uninative_path = os.path.dirname(self.get("UNINATIVE_LOADER")) -if os.path.exists(uninative_path): -preload_paths = [os.path.join(uninative_path, i) for i in preload_items] -self.qemu_environ['LD_PRELOAD'] = " ".join(preload_paths) +self.qemu_environ['LIBGL_DRIVERS_PATH'] = os.path.join(self.bindir_native, '../lib/dri') def check_args(self): for debug in ("-d", "--debug"): -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178190): https://lists.openembedded.org/g/openembedded-core/message/178190 Mute This Topic: https://lists.openembedded.org/mt/97480125/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] rust: added missing runtime dependencies to run rust on target
On Wed, 8 Mar 2023 at 18:30, Sundeep KOKKONDA wrote: > rust files are not linking on target due to missing dependencies and observed > below error. > error: linker `x86_64-poky-linux-gcc` not found > > Added the required dependencies to run rust on target machine. > +RDEPENDS:${PN}:append:class-target = " gcc g++ binutils" Are all three required? Particularly, why g++? Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178189): https://lists.openembedded.org/g/openembedded-core/message/178189 Mute This Topic: https://lists.openembedded.org/mt/97477865/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] rust: added missing runtime dependencies to run rust on target
On Wed, Mar 8, 2023 at 5:30 PM Sundeep KOKKONDA wrote: > > [YOCTO #14975] > rust files are not linking on target due to missing dependencies and observed > below error. > error: linker `x86_64-poky-linux-gcc` not found > > Added the required dependencies to run rust on target machine. > > Signed-off-by: Sundeep KOKKONDA > --- > meta/recipes-devtools/rust/rust_1.67.1.bb | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/recipes-devtools/rust/rust_1.67.1.bb > b/meta/recipes-devtools/rust/rust_1.67.1.bb > index 2118faec8f..f4c6d9511d 100644 > --- a/meta/recipes-devtools/rust/rust_1.67.1.bb > +++ b/meta/recipes-devtools/rust/rust_1.67.1.bb > @@ -13,6 +13,8 @@ DEPENDS:append:class-nativesdk = " nativesdk-rust-llvm" > > DEPENDS += "rust-llvm (=${PV})" > > +RDEPENDS:${PN}:append:class-target = " gcc g++ binutils" > + I did some digging a while ago (so it may have drifted) - I got to this list, which avoided g++ gcc gcc-symlinks binutils ${LIBC_DEPENDENCIES} libgcc-dev What I don't understand is why doesn't gcc have a dependency on binutils? > # Otherwise we'll depend on what we provide > INHIBIT_DEFAULT_RUST_DEPS:class-native = "1" > # We don't need to depend on gcc-native because yocto assumes it exists > -- > 2.34.1 > > > > -- Alex Kiernan -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178188): https://lists.openembedded.org/g/openembedded-core/message/178188 Mute This Topic: https://lists.openembedded.org/mt/97477865/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 v4 1/2] qemu: split out qemu-guest-agent, add startup scripts
On Wed, 2023-03-08 at 18:14 +0100, Clément Péron wrote: > Split out the QEMU guest agent into a separate package. The agent is > intended to be installed within a QEMU VM guest where a user is likely > to not want to have the rest of the QEMU installation within it. > > Additionally, an initscript, udev rules file, and systemd unit file are > added to the package so that the guest agent can start automatically; > the former two come from Debian's packaging for qemu-guest-agent. > > Signed-off-by: Brenda Streiff > Signed-off-by: Clément Péron > --- > > Changes since v3: > - fix missing comma in udev rule > > Changes since v2: > - Add missing files > - rebase on top of master > > Changes since v1: > - Fix systemd-service using PN where it should not > > meta/recipes-devtools/qemu/qemu.inc | 35 +++- > .../qemu/qemu/qemu-guest-agent.init | 84 +++ > .../qemu/qemu/qemu-guest-agent.udev | 2 + > 3 files changed, 120 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > create mode 100644 meta/recipes-devtools/qemu/qemu/qemu-guest-agent.udev > > diff --git a/meta/recipes-devtools/qemu/qemu.inc > b/meta/recipes-devtools/qemu/qemu.inc > index 1e768b560d..b41055fe5d 100644 > --- a/meta/recipes-devtools/qemu/qemu.inc > +++ b/meta/recipes-devtools/qemu/qemu.inc > @@ -9,7 +9,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" > RDEPENDS:${PN}-ptest = "bash" > > require qemu-targets.inc > -inherit pkgconfig ptest > +inherit pkgconfig ptest update-rc.d systemd > > LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ > > file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" > @@ -32,6 +32,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ > file://0001-configure-Fix-check-tcg-not-executing-any-tests.patch > \ > > file://0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch \ > > file://0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch \ > + file://qemu-guest-agent.init \ > + file://qemu-guest-agent.udev \ > " > UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" > > @@ -132,6 +134,20 @@ do_configure[cleandirs] += "${B}" > do_install () { > export STRIP="" > oe_runmake 'DESTDIR=${D}' install > + > + # If we built the guest agent, also install startup/udev rules > + if [ -e "${D}${bindir}/qemu-ga" ]; then > + install -d ${D}${sysconfdir}/init.d/ > + install -m 0755 ${WORKDIR}/qemu-guest-agent.init > ${D}${sysconfdir}/init.d/qemu-guest-agent > + sed -i 's:@bindir@:${bindir}:' > ${D}${sysconfdir}/init.d/qemu-guest-agent > + > + install -d ${D}${sysconfdir}/udev/rules.d/ > + install -m 0644 ${WORKDIR}/qemu-guest-agent.udev > ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules > + > + install -d ${D}${systemd_unitdir}/system/ > + install -m 0644 ${S}/contrib/systemd/qemu-guest-agent.service > ${D}${systemd_unitdir}/system > + sed -i -e 's,-/usr/bin/,-${bindir}/,g' > ${D}${systemd_unitdir}/system/qemu-guest-agent.service > + fi > } > > # The following fragment will create a wrapper for qemu-mips user emulation > @@ -210,3 +226,20 @@ PACKAGECONFIG[jack] = > "--enable-jack,--disable-jack,jack," > INSANE_SKIP:${PN} = "arch" > > FILES:${PN} += "${datadir}/icons" > + > +# Put the guest agent in a separate package > +PACKAGES =+ "${PN}-guest-agent" > +SUMMARY:${PN}-guest-agent = "QEMU guest agent" > +FILES:${PN}-guest-agent += " \ > +${bindir}/qemu-ga \ > +${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules \ > +${sysconfdir}/init.d/qemu-guest-agent \ > +${systemd_unitdir}/system/qemu-guest-agent.service \ > +" > + > +INITSCRIPT_PACKAGES = "${PN}-guest-agent" > +INITSCRIPT_NAME:${PN}-guest-agent = "qemu-guest-agent" > +INITSCRIPT_PARAMS:${PN}-guest-agent = "defaults" > + > +SYSTEMD_PACKAGES = "${PN}-guest-agent" > +SYSTEMD_SERVICE:${PN}-guest-agent = "qemu-guest-agent.service" > diff --git a/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > b/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > new file mode 100644 > index 00..493da0ef1a > --- /dev/null > +++ b/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > @@ -0,0 +1,84 @@ > +#!/bin/sh > +### BEGIN INIT INFO > +# Provides: qemu-guest-agent > +# Required-Start:$remote_fs $syslog > +# Required-Stop: $remote_fs $syslog > +# Default-Start: 2 3 4 5 > +# Default-Stop: 0 1 6 > +# Short-Description: QEMU Guest Agent > +### END INIT INFO > +# > +# Do not configure this file. Edit /etc/default/qemu-guest-agent > +# Do we install a /etc/default/qemu-guest-agent? The whole comment block above can probably be dropped including the INIT INFO as it isn't applicable for us? Do we need to mention which
[OE-core] [PATCH] rust: added missing runtime dependencies to run rust on target
[YOCTO #14975] rust files are not linking on target due to missing dependencies and observed below error. error: linker `x86_64-poky-linux-gcc` not found Added the required dependencies to run rust on target machine. Signed-off-by: Sundeep KOKKONDA --- meta/recipes-devtools/rust/rust_1.67.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/rust/rust_1.67.1.bb b/meta/recipes-devtools/rust/rust_1.67.1.bb index 2118faec8f..f4c6d9511d 100644 --- a/meta/recipes-devtools/rust/rust_1.67.1.bb +++ b/meta/recipes-devtools/rust/rust_1.67.1.bb @@ -13,6 +13,8 @@ DEPENDS:append:class-nativesdk = " nativesdk-rust-llvm" DEPENDS += "rust-llvm (=${PV})" +RDEPENDS:${PN}:append:class-target = " gcc g++ binutils" + # Otherwise we'll depend on what we provide INHIBIT_DEFAULT_RUST_DEPS:class-native = "1" # We don't need to depend on gcc-native because yocto assumes it exists -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178186): https://lists.openembedded.org/g/openembedded-core/message/178186 Mute This Topic: https://lists.openembedded.org/mt/97477865/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 v4 1/2] qemu: split out qemu-guest-agent, add startup scripts
Hi Michael, On Wed, 8 Mar 2023 at 18:14, Clément Péron via lists.openembedded.org wrote: > > Split out the QEMU guest agent into a separate package. The agent is > intended to be installed within a QEMU VM guest where a user is likely > to not want to have the rest of the QEMU installation within it. > > Additionally, an initscript, udev rules file, and systemd unit file are > added to the package so that the guest agent can start automatically; > the former two come from Debian's packaging for qemu-guest-agent. > > Signed-off-by: Brenda Streiff > Signed-off-by: Clément Péron > --- > > Changes since v3: > - fix missing comma in udev rule > > Changes since v2: > - Add missing files > - rebase on top of master > > Changes since v1: > - Fix systemd-service using PN where it should not > > meta/recipes-devtools/qemu/qemu.inc | 35 +++- > .../qemu/qemu/qemu-guest-agent.init | 84 +++ > .../qemu/qemu/qemu-guest-agent.udev | 2 + In this patch, qemu-guest-agent.init and qemu-guest-agent.udev come from the Debian source repo. Could you confirm that these files use the same license as the repo? Or are they following another one? Thanks for your help, Regards Clement > 3 files changed, 120 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > create mode 100644 meta/recipes-devtools/qemu/qemu/qemu-guest-agent.udev > > diff --git a/meta/recipes-devtools/qemu/qemu.inc > b/meta/recipes-devtools/qemu/qemu.inc > index 1e768b560d..b41055fe5d 100644 > --- a/meta/recipes-devtools/qemu/qemu.inc > +++ b/meta/recipes-devtools/qemu/qemu.inc > @@ -9,7 +9,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" > RDEPENDS:${PN}-ptest = "bash" > > require qemu-targets.inc > -inherit pkgconfig ptest > +inherit pkgconfig ptest update-rc.d systemd > > LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ > > file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" > @@ -32,6 +32,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ > file://0001-configure-Fix-check-tcg-not-executing-any-tests.patch > \ > > file://0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch \ > > file://0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch \ > + file://qemu-guest-agent.init \ > + file://qemu-guest-agent.udev \ > " > UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" > > @@ -132,6 +134,20 @@ do_configure[cleandirs] += "${B}" > do_install () { > export STRIP="" > oe_runmake 'DESTDIR=${D}' install > + > + # If we built the guest agent, also install startup/udev rules > + if [ -e "${D}${bindir}/qemu-ga" ]; then > + install -d ${D}${sysconfdir}/init.d/ > + install -m 0755 ${WORKDIR}/qemu-guest-agent.init > ${D}${sysconfdir}/init.d/qemu-guest-agent > + sed -i 's:@bindir@:${bindir}:' > ${D}${sysconfdir}/init.d/qemu-guest-agent > + > + install -d ${D}${sysconfdir}/udev/rules.d/ > + install -m 0644 ${WORKDIR}/qemu-guest-agent.udev > ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules > + > + install -d ${D}${systemd_unitdir}/system/ > + install -m 0644 ${S}/contrib/systemd/qemu-guest-agent.service > ${D}${systemd_unitdir}/system > + sed -i -e 's,-/usr/bin/,-${bindir}/,g' > ${D}${systemd_unitdir}/system/qemu-guest-agent.service > + fi > } > > # The following fragment will create a wrapper for qemu-mips user emulation > @@ -210,3 +226,20 @@ PACKAGECONFIG[jack] = > "--enable-jack,--disable-jack,jack," > INSANE_SKIP:${PN} = "arch" > > FILES:${PN} += "${datadir}/icons" > + > +# Put the guest agent in a separate package > +PACKAGES =+ "${PN}-guest-agent" > +SUMMARY:${PN}-guest-agent = "QEMU guest agent" > +FILES:${PN}-guest-agent += " \ > +${bindir}/qemu-ga \ > +${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules \ > +${sysconfdir}/init.d/qemu-guest-agent \ > +${systemd_unitdir}/system/qemu-guest-agent.service \ > +" > + > +INITSCRIPT_PACKAGES = "${PN}-guest-agent" > +INITSCRIPT_NAME:${PN}-guest-agent = "qemu-guest-agent" > +INITSCRIPT_PARAMS:${PN}-guest-agent = "defaults" > + > +SYSTEMD_PACKAGES = "${PN}-guest-agent" > +SYSTEMD_SERVICE:${PN}-guest-agent = "qemu-guest-agent.service" > diff --git a/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > b/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > new file mode 100644 > index 00..493da0ef1a > --- /dev/null > +++ b/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init > @@ -0,0 +1,84 @@ > +#!/bin/sh > +### BEGIN INIT INFO > +# Provides:qemu-guest-agent > +# Required-Start: $remote_fs $syslog > +# Required-Stop: $remote_fs $syslog > +# Default-Start: 2 3 4 5 > +# Default-Stop:0 1 6 > +# Short-Description
Re: [OE-core] Inconsistent libOpenCL.so.1 expectations
Added cc for the interested parties. 2023. 03. 08. 18:19 keltezéssel, Zoltan Boszormenyi via lists.openembedded.org írta: Hi, I observed the following inconsistencies: 1. opencl-icd-loader and ocd-icd both provide libOpenCL.so.1 2. opencl-icd-loader has PROVIDES="virtual/opencl-icd", ocl-icd hasn't 3. oe-core's piglit recipe explicitly depends on opencl-icd-loader (should be virtual/opencl-icd) 4. meta-intel recipes RDEPENDS on ocl-icd (should be virtual/opencl-icd) Currently, I can't install piglit together with e.g. openvino-inference-engine because opencl-icd-loader and ocd-icl would conflict. Best regards, Zoltán Böszörményi -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178184): https://lists.openembedded.org/g/openembedded-core/message/178184 Mute This Topic: https://lists.openembedded.org/mt/97477512/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Inconsistent libOpenCL.so.1 expectations
Hi, I observed the following inconsistencies: 1. opencl-icd-loader and ocd-icd both provide libOpenCL.so.1 2. opencl-icd-loader has PROVIDES="virtual/opencl-icd", ocl-icd hasn't 3. oe-core's piglit recipe explicitly depends on opencl-icd-loader (should be virtual/opencl-icd) 4. meta-intel recipes RDEPENDS on ocl-icd (should be virtual/opencl-icd) Currently, I can't install piglit together with e.g. openvino-inference-engine because opencl-icd-loader and ocd-icl would conflict. Best regards, Zoltán Böszörményi -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178183): https://lists.openembedded.org/g/openembedded-core/message/178183 Mute This Topic: https://lists.openembedded.org/mt/97477512/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 v4 2/2] runqemu: add an option to enable guest-agent virtio device
Add support to the runqemu script for a new option, 'guestagent', that enables the virtio serial port for host-to-guest communication. Signed-off-by: Brenda Streiff Signed-off-by: Clément Péron --- scripts/runqemu | 14 ++ 1 file changed, 14 insertions(+) diff --git a/scripts/runqemu b/scripts/runqemu index 58b0c191e1..38aa35fdd4 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -82,6 +82,7 @@ of the following environment variables (in any order): kvm-vhost - enable KVM with vhost when running x86/x86_64 (VT-capable CPU required) publicvnc - enable a VNC server open to all hosts audio - enable audio +guestagent - enable guest agent communication [*/]ovmf* - OVMF firmware file or base name for booting with UEFI tcpserial= - specify tcp serial port number qemuparams= - specify custom parameters to QEMU @@ -216,6 +217,8 @@ class BaseConfig(object): self.cleaned = False # Files to cleanup after run self.cleanup_files = [] +self.guest_agent = False +self.guest_agent_sockpath = '/tmp/qga.sock' def acquire_taplock(self, error=True): logger.debug("Acquiring lockfile %s..." % self.taplock) @@ -526,6 +529,10 @@ class BaseConfig(object): elif arg == 'publicvnc': self.publicvnc = True self.qemu_opt_script += ' -vnc :0' +elif arg == 'guestagent': +self.guest_agent = True +elif arg.startswith('guestagent-sockpath='): +self.guest_agent_sockpath = '%s' % arg[len('guestagent-sockpath='):] elif arg.startswith('tcpserial='): self.tcpserial_portnum = '%s' % arg[len('tcpserial='):] elif arg.startswith('qemuparams='): @@ -1375,6 +1382,12 @@ class BaseConfig(object): except FileNotFoundError: raise RunQemuError("/dev/dri directory does not exist; no render nodes available on this machine. %s" %(render_hint)) +def setup_guest_agent(self): +if self.guest_agent == True: +self.qemu_opt += ' -chardev socket,path=' + self.guest_agent_sockpath + ',server,nowait,id=qga0 ' +self.qemu_opt += ' -device virtio-serial ' +self.qemu_opt += ' -device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 ' + def setup_vga(self): if self.nographic == True: if self.sdl == True: @@ -1506,6 +1519,7 @@ class BaseConfig(object): if self.snapshot: self.qemu_opt += " -snapshot" +self.setup_guest_agent() self.setup_serial() self.setup_vga() -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178182): https://lists.openembedded.org/g/openembedded-core/message/178182 Mute This Topic: https://lists.openembedded.org/mt/97477395/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 v4 1/2] qemu: split out qemu-guest-agent, add startup scripts
Split out the QEMU guest agent into a separate package. The agent is intended to be installed within a QEMU VM guest where a user is likely to not want to have the rest of the QEMU installation within it. Additionally, an initscript, udev rules file, and systemd unit file are added to the package so that the guest agent can start automatically; the former two come from Debian's packaging for qemu-guest-agent. Signed-off-by: Brenda Streiff Signed-off-by: Clément Péron --- Changes since v3: - fix missing comma in udev rule Changes since v2: - Add missing files - rebase on top of master Changes since v1: - Fix systemd-service using PN where it should not meta/recipes-devtools/qemu/qemu.inc | 35 +++- .../qemu/qemu/qemu-guest-agent.init | 84 +++ .../qemu/qemu/qemu-guest-agent.udev | 2 + 3 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init create mode 100644 meta/recipes-devtools/qemu/qemu/qemu-guest-agent.udev diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 1e768b560d..b41055fe5d 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -9,7 +9,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" RDEPENDS:${PN}-ptest = "bash" require qemu-targets.inc -inherit pkgconfig ptest +inherit pkgconfig ptest update-rc.d systemd LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" @@ -32,6 +32,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0001-configure-Fix-check-tcg-not-executing-any-tests.patch \ file://0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch \ file://0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch \ + file://qemu-guest-agent.init \ + file://qemu-guest-agent.udev \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" @@ -132,6 +134,20 @@ do_configure[cleandirs] += "${B}" do_install () { export STRIP="" oe_runmake 'DESTDIR=${D}' install + + # If we built the guest agent, also install startup/udev rules + if [ -e "${D}${bindir}/qemu-ga" ]; then + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/qemu-guest-agent.init ${D}${sysconfdir}/init.d/qemu-guest-agent + sed -i 's:@bindir@:${bindir}:' ${D}${sysconfdir}/init.d/qemu-guest-agent + + install -d ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/qemu-guest-agent.udev ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules + + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${S}/contrib/systemd/qemu-guest-agent.service ${D}${systemd_unitdir}/system + sed -i -e 's,-/usr/bin/,-${bindir}/,g' ${D}${systemd_unitdir}/system/qemu-guest-agent.service + fi } # The following fragment will create a wrapper for qemu-mips user emulation @@ -210,3 +226,20 @@ PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack," INSANE_SKIP:${PN} = "arch" FILES:${PN} += "${datadir}/icons" + +# Put the guest agent in a separate package +PACKAGES =+ "${PN}-guest-agent" +SUMMARY:${PN}-guest-agent = "QEMU guest agent" +FILES:${PN}-guest-agent += " \ +${bindir}/qemu-ga \ +${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules \ +${sysconfdir}/init.d/qemu-guest-agent \ +${systemd_unitdir}/system/qemu-guest-agent.service \ +" + +INITSCRIPT_PACKAGES = "${PN}-guest-agent" +INITSCRIPT_NAME:${PN}-guest-agent = "qemu-guest-agent" +INITSCRIPT_PARAMS:${PN}-guest-agent = "defaults" + +SYSTEMD_PACKAGES = "${PN}-guest-agent" +SYSTEMD_SERVICE:${PN}-guest-agent = "qemu-guest-agent.service" diff --git a/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init b/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init new file mode 100644 index 00..493da0ef1a --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init @@ -0,0 +1,84 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides:qemu-guest-agent +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop:0 1 6 +# Short-Description: QEMU Guest Agent +### END INIT INFO +# +# Do not configure this file. Edit /etc/default/qemu-guest-agent +# + +set -e + +. /etc/init.d/functions + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="QEMU Guest Agent" +NAME=qemu-ga +DAEMON=@bindir@/$NAME +PIDFILE=/var/run/$NAME.pid + +# config +DAEMON_ARGS="" +# default transport +TRANSPORT=virtio-serial:/dev/virtio-ports/org.qemu.guest_agent.0 +NO_START=0 + +test ! -r /etc/default/qemu-guest-agent || . /etc/default/qemu-guest-agent +test "$NO_START" = "0" || exit 0 +test -x "$DAEMON" || exit 0 + +# +# Function t
[OE-core] [PATCH v3 1/2] qemu: split out qemu-guest-agent, add startup scripts
Split out the QEMU guest agent into a separate package. The agent is intended to be installed within a QEMU VM guest where a user is likely to not want to have the rest of the QEMU installation within it. Additionally, an initscript, udev rules file, and systemd unit file are added to the package so that the guest agent can start automatically; the former two come from Debian's packaging for qemu-guest-agent. Signed-off-by: Brenda Streiff Signed-off-by: Clément Péron --- Changes since v2: - Add missing files - rebase on top of master Changes since v1: - Fix systemd-service using PN where it should not meta/recipes-devtools/qemu/qemu.inc | 35 +++- .../qemu/qemu/qemu-guest-agent.init | 84 +++ .../qemu/qemu/qemu-guest-agent.udev | 2 + 3 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init create mode 100644 meta/recipes-devtools/qemu/qemu/qemu-guest-agent.udev diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 1e768b560d..b41055fe5d 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -9,7 +9,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" RDEPENDS:${PN}-ptest = "bash" require qemu-targets.inc -inherit pkgconfig ptest +inherit pkgconfig ptest update-rc.d systemd LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" @@ -32,6 +32,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0001-configure-Fix-check-tcg-not-executing-any-tests.patch \ file://0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch \ file://0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch \ + file://qemu-guest-agent.init \ + file://qemu-guest-agent.udev \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" @@ -132,6 +134,20 @@ do_configure[cleandirs] += "${B}" do_install () { export STRIP="" oe_runmake 'DESTDIR=${D}' install + + # If we built the guest agent, also install startup/udev rules + if [ -e "${D}${bindir}/qemu-ga" ]; then + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/qemu-guest-agent.init ${D}${sysconfdir}/init.d/qemu-guest-agent + sed -i 's:@bindir@:${bindir}:' ${D}${sysconfdir}/init.d/qemu-guest-agent + + install -d ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/qemu-guest-agent.udev ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules + + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${S}/contrib/systemd/qemu-guest-agent.service ${D}${systemd_unitdir}/system + sed -i -e 's,-/usr/bin/,-${bindir}/,g' ${D}${systemd_unitdir}/system/qemu-guest-agent.service + fi } # The following fragment will create a wrapper for qemu-mips user emulation @@ -210,3 +226,20 @@ PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack," INSANE_SKIP:${PN} = "arch" FILES:${PN} += "${datadir}/icons" + +# Put the guest agent in a separate package +PACKAGES =+ "${PN}-guest-agent" +SUMMARY:${PN}-guest-agent = "QEMU guest agent" +FILES:${PN}-guest-agent += " \ +${bindir}/qemu-ga \ +${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules \ +${sysconfdir}/init.d/qemu-guest-agent \ +${systemd_unitdir}/system/qemu-guest-agent.service \ +" + +INITSCRIPT_PACKAGES = "${PN}-guest-agent" +INITSCRIPT_NAME:${PN}-guest-agent = "qemu-guest-agent" +INITSCRIPT_PARAMS:${PN}-guest-agent = "defaults" + +SYSTEMD_PACKAGES = "${PN}-guest-agent" +SYSTEMD_SERVICE:${PN}-guest-agent = "qemu-guest-agent.service" diff --git a/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init b/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init new file mode 100644 index 00..493da0ef1a --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/qemu-guest-agent.init @@ -0,0 +1,84 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides:qemu-guest-agent +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop:0 1 6 +# Short-Description: QEMU Guest Agent +### END INIT INFO +# +# Do not configure this file. Edit /etc/default/qemu-guest-agent +# + +set -e + +. /etc/init.d/functions + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="QEMU Guest Agent" +NAME=qemu-ga +DAEMON=@bindir@/$NAME +PIDFILE=/var/run/$NAME.pid + +# config +DAEMON_ARGS="" +# default transport +TRANSPORT=virtio-serial:/dev/virtio-ports/org.qemu.guest_agent.0 +NO_START=0 + +test ! -r /etc/default/qemu-guest-agent || . /etc/default/qemu-guest-agent +test "$NO_START" = "0" || exit 0 +test -x "$DAEMON" || exit 0 + +# +# Function that checks whenever system has necessary environment
[OE-core] [PATCH v3 2/2] runqemu: add an option to enable guest-agent virtio device
Add support to the runqemu script for a new option, 'guestagent', that enables the virtio serial port for host-to-guest communication. Signed-off-by: Brenda Streiff Signed-off-by: Clément Péron --- scripts/runqemu | 14 ++ 1 file changed, 14 insertions(+) diff --git a/scripts/runqemu b/scripts/runqemu index 58b0c191e1..38aa35fdd4 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -82,6 +82,7 @@ of the following environment variables (in any order): kvm-vhost - enable KVM with vhost when running x86/x86_64 (VT-capable CPU required) publicvnc - enable a VNC server open to all hosts audio - enable audio +guestagent - enable guest agent communication [*/]ovmf* - OVMF firmware file or base name for booting with UEFI tcpserial= - specify tcp serial port number qemuparams= - specify custom parameters to QEMU @@ -216,6 +217,8 @@ class BaseConfig(object): self.cleaned = False # Files to cleanup after run self.cleanup_files = [] +self.guest_agent = False +self.guest_agent_sockpath = '/tmp/qga.sock' def acquire_taplock(self, error=True): logger.debug("Acquiring lockfile %s..." % self.taplock) @@ -526,6 +529,10 @@ class BaseConfig(object): elif arg == 'publicvnc': self.publicvnc = True self.qemu_opt_script += ' -vnc :0' +elif arg == 'guestagent': +self.guest_agent = True +elif arg.startswith('guestagent-sockpath='): +self.guest_agent_sockpath = '%s' % arg[len('guestagent-sockpath='):] elif arg.startswith('tcpserial='): self.tcpserial_portnum = '%s' % arg[len('tcpserial='):] elif arg.startswith('qemuparams='): @@ -1375,6 +1382,12 @@ class BaseConfig(object): except FileNotFoundError: raise RunQemuError("/dev/dri directory does not exist; no render nodes available on this machine. %s" %(render_hint)) +def setup_guest_agent(self): +if self.guest_agent == True: +self.qemu_opt += ' -chardev socket,path=' + self.guest_agent_sockpath + ',server,nowait,id=qga0 ' +self.qemu_opt += ' -device virtio-serial ' +self.qemu_opt += ' -device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 ' + def setup_vga(self): if self.nographic == True: if self.sdl == True: @@ -1506,6 +1519,7 @@ class BaseConfig(object): if self.snapshot: self.qemu_opt += " -snapshot" +self.setup_guest_agent() self.setup_serial() self.setup_vga() -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178180): https://lists.openembedded.org/g/openembedded-core/message/178180 Mute This Topic: https://lists.openembedded.org/mt/97477166/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] glibc: Add missing binutils dependency
glibc has it's dependencies handled more manually due to it's place in the toolchain bootstrap. It depends upon the compiler and indirectly through that to binutils. This did mean that if binutils changes and the compiler does not, sstate and hash equivalence could mean that glibc wouldn't rebuild. Add a direct dependency on binutils that if it changes, it forces glibc to rebuild, as it should. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index fdd241d973b..3b940b8ab29 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -1,7 +1,9 @@ require glibc-common.inc require glibc-ld.inc -DEPENDS = "virtual/${TARGET_PREFIX}gcc libgcc-initial linux-libc-headers" +DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}binutils${BUSUFFIX} libgcc-initial linux-libc-headers" +BUSUFFIX= "" +BUSUFFIX:class-nativesdk = "-crosssdk" PROVIDES = "virtual/libc" PROVIDES += "virtual/libintl virtual/libiconv" -- 2.38.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178178): https://lists.openembedded.org/g/openembedded-core/message/178178 Mute This Topic: https://lists.openembedded.org/mt/97476533/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] binutils: Enable --enable-new-dtags
Awesome, thanks! I think any recipe which is using INHIBIT_DEFAULT_DEPENDENCIES could run into these sorts of errors. On Wed, Mar 8, 2023 at 3:53 AM Richard Purdie wrote: > > On Wed, 2023-03-08 at 09:33 +, Richard Purdie via > lists.openembedded.org wrote: > > On Wed, 2023-02-22 at 22:58 -0800, Khem Raj wrote: > > > Use DT_RUNPATH over DT_RPATH. If DT_RUNPATH is present, LD_LIBRARY_PATH > > > is searched before > > > DT_RUNPATH, Search order is DT_RPATH then LD_LIBRARY_PATH then > > > DT_RUNPATH, this order ensures that injecting > > > malicious shared objects is way harder with DT_RUNPATH. > > > > > > This is now default on major linux distributions already > > > > > > Signed-off-by: Khem Raj > > > --- > > > meta/recipes-devtools/binutils/binutils.inc | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/meta/recipes-devtools/binutils/binutils.inc > > > b/meta/recipes-devtools/binutils/binutils.inc > > > index b2dbf241df..c69d29448f 100644 > > > --- a/meta/recipes-devtools/binutils/binutils.inc > > > +++ b/meta/recipes-devtools/binutils/binutils.inc > > > @@ -96,6 +96,7 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ > > > --disable-werror \ > > > --enable-deterministic-archives \ > > > --enable-plugins \ > > > +--enable-new-dtags \ > > > --disable-gdb \ > > > --disable-gdbserver \ > > > --disable-libdecnumber \ > > > > FWIW I 100% agree we should look to enable this. > > > > Sadly, doing so exposes a bug where things that should rebuild don't. > > That manifests as a failure in the reproducible test builds on the > > autobuilder. I suspect a taskhash problem somewhere, maybe hash > > equivalence, maybe somewhere else, hard to say without debugging it. > > > > I've been trying to get to this to help. The first issue was to sort > > the other gdb issue this appeared to trigger but was in fact unrelated > > and an issue from the recent binutils/gdb version upgrade. I've > > debugged the initial buildtools tarball bug and re-deployed buildtools > > on the infrastructure. That fixed some of the manifestations but not > > all, I then debugged the remaining ones, worked out the regression in > > upstream gdb and sent a patch yesterday which was merged upstream to > > fix it. > > > > I am trying to get to helping with the problem this patch causes but > > these things take a ton of time. Whilst I may get paid to work on the > > project, I am one person and I'm getting pulled in a ridiculous number > > of directions at once. > > > > People should worry this triggers a reproducibility issue, it means > > there is a bug somewhere. > > > > I am hoping to get to this and to help try and debug it but the patch > > cannot merge until we get to the bottom of the issue it triggers. > > I did have a look and the issue is actually fairly simple, glibc is > missing a dependency directly on binutils. Most recipes have this > magically, the magic is disabled for glibc as it is part of toolchain > bootstrap and has to be manually curated. > > Adding the missing dependency appears to resolve things locally so I'll > send out a patch and we'll have to run some autobuilder tests. > > Cheers, > > Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178177): https://lists.openembedded.org/g/openembedded-core/message/178177 Mute This Topic: https://lists.openembedded.org/mt/97178429/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone][PATCH 1/1] libmicrohttpd: upgrade 0.9.75 -> 0.9.76
Changelog: Fix potential DoS vector in MHD_PostProcessor.(CVE-2023-27371) Releasing GNU libmicrohttpd 0.9.76 hotfix. https://github.com/Karlson2k/libmicrohttpd/blob/v0.9.76/ChangeLog Signed-off-by: Narpat Mali --- .../{libmicrohttpd_0.9.75.bb => libmicrohttpd_0.9.76.bb}| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/libmicrohttpd/{libmicrohttpd_0.9.75.bb => libmicrohttpd_0.9.76.bb} (91%) diff --git a/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.75.bb b/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.76.bb similarity index 91% rename from meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.75.bb rename to meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.76.bb index 9c99af7c91..ad3c34ab9e 100644 --- a/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.75.bb +++ b/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.76.bb @@ -7,7 +7,7 @@ SECTION = "net" DEPENDS = "file" SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz" -SRC_URI[sha256sum] = "9278907a6f571b391aab9644fd646a5108ed97311ec66f6359cebbedb0a4e3bb" +SRC_URI[sha256sum] = "f0b1547b5a42a6c0f724e8e1c1cb5ce9c4c35fb495e7d780b9930d35011ceb4c" inherit autotools lib_package pkgconfig gettext -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178176): https://lists.openembedded.org/g/openembedded-core/message/178176 Mute This Topic: https://lists.openembedded.org/mt/97473405/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] [qa-build-notification] QA notification for completed autobuilder build (yocto-4.1.3.rc1)
Hi all, Intel and WR YP QA is planning for QA execution for YP build yocto-4.1.3.rc1. We are planning to execute following tests for this cycle: OEQA-manual tests for following module: 1. OE-Core 2. BSP-hw Runtime auto test for following platforms: 1. MinnowTurbot 32-bit 2. NUC 7 3. ADL 4. TGL NUC 11 5. Edgerouter 6. Beaglebone ETA for completion next Monday, March 13. Best regards, Jing Hui > -Original Message- > From: qa-build-notificat...@lists.yoctoproject.org notificat...@lists.yoctoproject.org> On Behalf Of Pokybuild User > Sent: Tuesday, 7 March, 2023 3:43 PM > To: yo...@lists.yoctoproject.org > Cc: qa-build-notificat...@lists.yoctoproject.org > Subject: [qa-build-notification] QA notification for completed autobuilder > build > (yocto-4.1.3.rc1) > > > A build flagged for QA (yocto-4.1.3.rc1) was completed on the autobuilder and > is > available at: > > > https://autobuilder.yocto.io/pub/releases/yocto-4.1.3.rc1 > > > Build hash information: > > bitbake: 592ee222a1c6da42925fb56801f226884b6724ec > meta-agl: 09135164a21a216c6e3e75d7decce896b92962f0 > meta-arm: 04071ec9f5091ec76da202ce610e256d8d347a60 > meta-aws: 93a2f788e773b36d9813243d2164987c040d6cf4 > meta-intel: de84b34a9596aa96f9cc4c187efebdccc6690d06 > meta-mingw: b0067202db8573df3d23d199f82987cebe1bee2c > meta-openembedded: b5b732876da1885ecbab2aa45f80d7a3086c5262 > meta-virtualization: d1cbc4c9fc44f0c5994a1276e38cdbb7bdb5bbd3 > oecore: b995ea45773211bd7bdd60eabcc9bbffda6beb5c > poky: 91d0157d6daf4ea61d6b4e090c0b682d3f3ca60f > > > > This is an automated message from the Yocto Project Autobuilder > Git: git://git.yoctoproject.org/yocto-autobuilder2 > Email: richard.pur...@linuxfoundation.org > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178175): https://lists.openembedded.org/g/openembedded-core/message/178175 Mute This Topic: https://lists.openembedded.org/mt/97472726/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] [yocto] QA notification for completed autobuilder build (yocto-4.0.8.rc2)
Hi All, QA for yocto-4.0.8.rc2 is completed. This is the full report for this release: https://git.yoctoproject.org/cgit/cgit.cgi/yocto-testresults-contrib/tree/?h=intel-yocto-testresults === Summary No high milestone defects. No new issue found. Thanks, Jing Hui > -Original Message- > From: yo...@lists.yoctoproject.org On Behalf > Of Pokybuild User > Sent: Thursday, 2 March, 2023 7:39 AM > To: yo...@lists.yoctoproject.org > Cc: qa-build-notificat...@lists.yoctoproject.org > Subject: [yocto] QA notification for completed autobuilder build > (yocto-4.0.8.rc2) > > > A build flagged for QA (yocto-4.0.8.rc2) was completed on the autobuilder and > is > available at: > > > https://autobuilder.yocto.io/pub/releases/yocto-4.0.8.rc2 > > > Build hash information: > > bitbake: 9bbdedc0ba7ca819b898e2a29a151d6a2014ca11 > meta-agl: ac4fed9040280e687e45b38b4e59940fcf2121b3 > meta-arm: a0216a41bde3f191037332a9238648bedfbc61bd > meta-aws: ac332252f6b50071a2de47ddc2c92ea65f669d16 > meta-gplv2: d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a > meta-intel: 64e8ccb47e11fc021a2a679f2e05d849b7518461 > meta-mingw: a90614a6498c3345704e9611f2842eb933dc51c1 > meta-openembedded: 82c75b466e55d7dca7a2364986ecb704cf63d141 > meta-virtualization: a7413c5d7568ce91b809ed11f84305b1afb468bb > oecore: b20e2134daec33fbb8ce358d984751d887752bd5 > poky: a361fb3df9c87cf12963a9d785a9f99faa839222 > > > > This is an automated message from the Yocto Project Autobuilder > Git: git://git.yoctoproject.org/yocto-autobuilder2 > Email: richard.pur...@linuxfoundation.org > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178174): https://lists.openembedded.org/g/openembedded-core/message/178174 Mute This Topic: https://lists.openembedded.org/mt/97357295/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] libgit2: update license information
On 2 Mar 2023, at 21:47, Sudip Mukherjee via lists.openembedded.org wrote: > > The LICENSE did not have complete information. > Some examples of missing license: > > Zlib: deps/zlib/ > ISC: tests/clar/clar.c > LGPL-2.1-or-later: src/libgit2/xdiff/xdiffi.c > CC0-1.0: src/util/rand.c > > Signed-off-by: Sudip Mukherjee > --- > meta/recipes-support/libgit2/libgit2_1.5.1.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-support/libgit2/libgit2_1.5.1.bb > b/meta/recipes-support/libgit2/libgit2_1.5.1.bb > index 59866ce385..eb7b538ece 100644 > --- a/meta/recipes-support/libgit2/libgit2_1.5.1.bb > +++ b/meta/recipes-support/libgit2/libgit2_1.5.1.bb > @@ -1,6 +1,6 @@ > SUMMARY = "the Git linkable library" > HOMEPAGE = "http://libgit2.github.com/"; > -LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause" > +LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause & Zlib > & ISC & LGPL-2.1-or-later & CC0-1.0" > LIC_FILES_CHKSUM = "file://COPYING;md5=112e6bb421dea73cd41de09e777f2d2c” Can you also expand LIC_FILES_CHKSUM to cover these? Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178173): https://lists.openembedded.org/g/openembedded-core/message/178173 Mute This Topic: https://lists.openembedded.org/mt/97349650/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/1] wic: Add support for F2FS in WIC rootfs plugin
On 6 Mar 2023, at 15:10, Anna-Lena Marx via lists.openembedded.org wrote: > > Hi, > moving the support or the tests to meta-filesystems does not make sense to me. > Wic is located in oe-core, move support and tests would not really work at > all and create another dependency. > It may be an option to move f2fs from meta-filesystems to > meta/recipes-devtools where e.g. btrfs, dosfs tools and erofs are located. > Otherwise, allowing it without tests would be an option, but that's not ideal > either. > On the other hand is there merged support for some filesystems in wic without > matching tests. The other option would be for the test to determine if the recipes are available, so adding meta-filesystems would enable the tests. Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178172): https://lists.openembedded.org/g/openembedded-core/message/178172 Mute This Topic: https://lists.openembedded.org/mt/97291696/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] python3-ninja to speed up cmake builds of python modules
> On 8 Mar 2023, at 12:32, Böszörményi Zoltán wrote: > The code in pytorch does "import ninja" conditionally, > so it expects it as a python module. Also, this specific > package and anything that uses pytorch for its build > (like torchvision) complains about the same. That would be: https://pypi.org/project/ninja/ https://github.com/scikit-build/ninja-python-distributions Which is a bit icky. We have a ninja binary already, I wonder if we can build just the python pieces there. Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178171): https://lists.openembedded.org/g/openembedded-core/message/178171 Mute This Topic: https://lists.openembedded.org/mt/97450739/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] python3-ninja to speed up cmake builds of python modules
2023. 03. 08. 12:43 keltezéssel, Ross Burton írta: On 7 Mar 2023, at 15:13, Zoltan Boszormenyi via lists.openembedded.org wrote: Hi, Recently, I had to create recipes for a few python modules, among which a few used cmake to build their C or C++ pieces. I saw from their build log that they complained about the missing (optional) "ninja" python module, and falling back to the traditional compile-one-file-at-a-time method. Do we want to speed up building python modules that exploit this or using ninja is too rare to bother? Ninja is used by cmake.bbclass and meson.bbclass, so absolutely use ninja if the build supports it. Cool. However, I am talking about this below when trying to build ByteTrack from https://github.com/ifzhang/ByteTrack which needs pytorch to build. Pytorch also has some build extensions itself: python3-bytetrack/0.0.1-r0/temp/log.do_compile:/data2/yocto-4.0/tmp-sicom-glibc/work/corei7-64-oe-linux/python3-bytetrack/0.0.1-r0/recipe-sysroot-native/usr/lib/python3.10/site-packages/torch/utils/cpp_extension.py:415: UserWarning: Attempted to use ninja as the BuildExtension backend but we could not find ninja.. Falling back to using the slow distutils backend. The code in pytorch does "import ninja" conditionally, so it expects it as a python module. Also, this specific package and anything that uses pytorch for its build (like torchvision) complains about the same. My question was out of curiosity, not as a real need. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178170): https://lists.openembedded.org/g/openembedded-core/message/178170 Mute This Topic: https://lists.openembedded.org/mt/97450739/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] binutils: Enable --enable-new-dtags
On Wed, 2023-03-08 at 09:33 +, Richard Purdie via lists.openembedded.org wrote: > On Wed, 2023-02-22 at 22:58 -0800, Khem Raj wrote: > > Use DT_RUNPATH over DT_RPATH. If DT_RUNPATH is present, LD_LIBRARY_PATH is > > searched before > > DT_RUNPATH, Search order is DT_RPATH then LD_LIBRARY_PATH then > > DT_RUNPATH, this order ensures that injecting > > malicious shared objects is way harder with DT_RUNPATH. > > > > This is now default on major linux distributions already > > > > Signed-off-by: Khem Raj > > --- > > meta/recipes-devtools/binutils/binutils.inc | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/meta/recipes-devtools/binutils/binutils.inc > > b/meta/recipes-devtools/binutils/binutils.inc > > index b2dbf241df..c69d29448f 100644 > > --- a/meta/recipes-devtools/binutils/binutils.inc > > +++ b/meta/recipes-devtools/binutils/binutils.inc > > @@ -96,6 +96,7 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ > > --disable-werror \ > > --enable-deterministic-archives \ > > --enable-plugins \ > > +--enable-new-dtags \ > > --disable-gdb \ > > --disable-gdbserver \ > > --disable-libdecnumber \ > > FWIW I 100% agree we should look to enable this. > > Sadly, doing so exposes a bug where things that should rebuild don't. > That manifests as a failure in the reproducible test builds on the > autobuilder. I suspect a taskhash problem somewhere, maybe hash > equivalence, maybe somewhere else, hard to say without debugging it. > > I've been trying to get to this to help. The first issue was to sort > the other gdb issue this appeared to trigger but was in fact unrelated > and an issue from the recent binutils/gdb version upgrade. I've > debugged the initial buildtools tarball bug and re-deployed buildtools > on the infrastructure. That fixed some of the manifestations but not > all, I then debugged the remaining ones, worked out the regression in > upstream gdb and sent a patch yesterday which was merged upstream to > fix it. > > I am trying to get to helping with the problem this patch causes but > these things take a ton of time. Whilst I may get paid to work on the > project, I am one person and I'm getting pulled in a ridiculous number > of directions at once. > > People should worry this triggers a reproducibility issue, it means > there is a bug somewhere. > > I am hoping to get to this and to help try and debug it but the patch > cannot merge until we get to the bottom of the issue it triggers. I did have a look and the issue is actually fairly simple, glibc is missing a dependency directly on binutils. Most recipes have this magically, the magic is disabled for glibc as it is part of toolchain bootstrap and has to be manually curated. Adding the missing dependency appears to resolve things locally so I'll send out a patch and we'll have to run some autobuilder tests. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178169): https://lists.openembedded.org/g/openembedded-core/message/178169 Mute This Topic: https://lists.openembedded.org/mt/97178429/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] glibc: Add missing binutils dependency
glibc has it's dependencies handled more manually due to it's place in the toolchain bootstrap. It depends upon the compiler and indirectly through that to binutils. This did mean that if binutils changes and the compiler does not, sstate and hash equivalence could mean that glibc wouldn't rebuild. Add a direct dependency on binutils that if it changes, it forces glibc to rebuild, as it should. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index fdd241d973b..fbfd967f5f3 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -1,7 +1,7 @@ require glibc-common.inc require glibc-ld.inc -DEPENDS = "virtual/${TARGET_PREFIX}gcc libgcc-initial linux-libc-headers" +DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}binutils libgcc-initial linux-libc-headers" PROVIDES = "virtual/libc" PROVIDES += "virtual/libintl virtual/libiconv" -- 2.38.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178168): https://lists.openembedded.org/g/openembedded-core/message/178168 Mute This Topic: https://lists.openembedded.org/mt/97470503/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] python3-ninja to speed up cmake builds of python modules
On 7 Mar 2023, at 15:13, Zoltan Boszormenyi via lists.openembedded.org wrote: > > Hi, > > Recently, I had to create recipes for a few python modules, > among which a few used cmake to build their C or C++ pieces. > I saw from their build log that they complained about > the missing (optional) "ninja" python module, and falling back > to the traditional compile-one-file-at-a-time method. > > Do we want to speed up building python modules that > exploit this or using ninja is too rare to bother? Ninja is used by cmake.bbclass and meson.bbclass, so absolutely use ninja if the build supports it. Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178167): https://lists.openembedded.org/g/openembedded-core/message/178167 Mute This Topic: https://lists.openembedded.org/mt/97450739/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 2/2] sstate.bbclass: fix cleanup when sysroot in manifest != RECIPE_SYSROOT
On 08.03.2023 12:18, Richard Purdie wrote: Yes, this is still reproducible in a clean build, with a fresh poky clone. Same steps as before: git clone https://github.com/yoctoproject/poky.git; cd poky/; . oe-init-build-env add to local.conf: require conf/multilib.conf MACHINE = "qemuarm64" MULTILIBS = "multilib:lib32" DEFAULTTUNE:virtclass-multilib-lib32 = "armv7athf-neon" bitbake gcc-cross-canadian-arm update local.conf to force a rebuild: GCCPIE = "--disable-default-pie" bitbake gcc-cross-canadian-arm Sorry, it looks like I messed something up in testing. The approach is the right one but as you mention, it isn't quite working. I've sent another patch which does work with the steps above. We can't just use nativesdk since the file lists of the different canadian targets may be different and would cause a different kind of failure. I therefore tweaked the prefix accordingly and made the fix multilib specific at the call site that triggers the issue. The new patch fixes the build for me as well, thanks a lot! Ovidiu Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178166): https://lists.openembedded.org/g/openembedded-core/message/178166 Mute This Topic: https://lists.openembedded.org/mt/97268632/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] meta/lib/oeqa/selftest/cases/wic: Add tests for configuring kernel image install into boot partition.
- test_skip_kernel_install: This test verifies that the kernel is not installed in the boot partition when the 'install-kernel-into-boot-dir' parameter is set to false. - test_kernel_install: This test verifies that the kernel is installed in the boot partition when the 'install-kernel-into-boot-dir' parameter is set to true . Both tests use a WKS (Kickstart) file to specify the desired configuration, build a disk image using WIC, and extract the disk image to a temporary directory to verify the results. Signed-off-by: Kareem Zarka --- meta/lib/oeqa/selftest/cases/wic.py | 70 + 1 file changed, 70 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index b9430cdb3b..7f5db1dc73 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -16,6 +16,7 @@ import hashlib from glob import glob from shutil import rmtree, copy from tempfile import NamedTemporaryFile +from tempfile import TemporaryDirectory from oeqa.selftest.case import OESelftestTestCase from oeqa.core.decorator import OETestTag @@ -146,6 +147,75 @@ class CLITests(OESelftestTestCase): self.assertEqual(1, runCmd('wic', ignore_status=True).status) class Wic(WicTestCase): +def test_skip_kernel_install(self): +"""Test the functionality of not installing the kernel in the boot directory using the wic plugin""" +# Build the mtools package to support FAT filesystem handling +bitbake("mtools") +# create a temporary file for the WKS content +with NamedTemporaryFile("w", suffix=".wks") as wks: +wks.write( +'part --source bootimg-efi ' + '--sourceparams="loader=grub-efi,install-kernel-into-boot-dir=false" ' +'--label boot --active\n' +) +wks.flush() +# create a temporary directory to extract the disk image to +with TemporaryDirectory() as tmpdir: +img = 'core-image-minimal' +# build the image using the WKS file +cmd = "wic create %s -e %s -o %s" % ( +wks.name, img, self.resultdir) +runCmd(cmd) +wksname = os.path.splitext(os.path.basename(wks.name))[0] +out = glob(os.path.join( +self.resultdir, "%s-*.direct" % wksname)) +self.assertEqual(1, len(out)) +# extract the content of the disk image to the temporary directory +cmd = "wic cp %s:1 %s" % (out[0], tmpdir) +runCmd(cmd) +# check if the kernel is installed or not +kimgtype = get_bb_var('KERNEL_IMAGETYPE', img) +for file in os.listdir(tmpdir): +if file == kimgtype: +raise AssertionError( +"The kernel image '{}' was found in the partition".format(kimgtype) +) + +def test_kernel_install(self): +"""Test the installation of the kernel to the boot directory in the wic plugin""" +# Build the mtools package to support FAT filesystem handling +bitbake("mtools") +# create a temporary file for the WKS content +with NamedTemporaryFile("w", suffix=".wks") as wks: +wks.write( +'part --source bootimg-efi ' + '--sourceparams="loader=grub-efi,install-kernel-into-boot-dir=true" ' +'--label boot --active\n' +) +wks.flush() +# create a temporary directory to extract the disk image to +with TemporaryDirectory() as tmpdir: +img = 'core-image-minimal' +# build the image using the WKS file +cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir) +runCmd(cmd) +wksname = os.path.splitext(os.path.basename(wks.name))[0] +out = glob(os.path.join(self.resultdir, "%s-*.direct" % wksname)) +self.assertEqual(1, len(out)) +# extract the content of the disk image to the temporary directory +cmd = "wic cp %s:1 %s" % (out[0], tmpdir) +runCmd(cmd) +# check if the kernel is installed or not +kimgtype = get_bb_var('KERNEL_IMAGETYPE', img) +found = False +for file in os.listdir(tmpdir): +if file == kimgtype: +found = True +break +self.assertTrue( +found, "The kernel image '{}' was not found in the boot partition".format(kimgtype) +) + def test_build_image_name(self): """Test wic create wictestdisk --image-name=core-image-minimal""" cmd = "wic create wictestdisk --image-name=core-image-minimal -o %s"
[OE-core] [PATCH] wic/plugins/source/bootimg-efi: Configure installation of kernel image into boot partition.
The issue with installing the kernel image to both rootfs and boot partition is that some systems rely on the kernel image in rootfs and not in the boot partition. This leads to duplication of the kernel image, which can cause unnecessary storage usage. This patch provides a solution to the problem by adding a new parameter "install-kernel-into-boot-dir" to the wic kickstart file. If this parameter is set to 'true', the plugin will install the kernel image to the boot partition. If the parameter is set to 'false', the plugin will skip installing the kernel image, avoiding duplication. Tests for this functionality will be added in the next patch. Signed-off-by: Kareem Zarka --- scripts/lib/wic/plugins/source/bootimg-efi.py | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index d6aeab2aad..09e9d6417c 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -363,9 +363,10 @@ class BootimgEFIPlugin(SourcePlugin): objcopy_cmd += " %s %s/EFI/Linux/linux.efi" % (efi_stub, hdddir) exec_native_cmd(objcopy_cmd, native_sysroot) else: -install_cmd = "install -m 0644 %s/%s %s/%s" % \ -(staging_kernel_dir, kernel, hdddir, kernel) -exec_cmd(install_cmd) +if source_params.get('install-kernel-into-boot-dir') != 'false': +install_cmd = "install -m 0644 %s/%s %s/%s" % \ +(staging_kernel_dir, kernel, hdddir, kernel) +exec_cmd(install_cmd) if get_bitbake_var("IMAGE_EFI_BOOT_FILES"): for src_path, dst_path in cls.install_task: -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178164): https://lists.openembedded.org/g/openembedded-core/message/178164 Mute This Topic: https://lists.openembedded.org/mt/97469748/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 2/2] sstate.bbclass: fix cleanup when sysroot in manifest != RECIPE_SYSROOT
On Wed, 2023-03-08 at 08:52 +0200, Ovidiu Panait wrote: > On 3/7/23 22:45, Richard Purdie wrote: > > CAUTION: This email comes from a non Wind River email account! > > Do not click links or open attachments unless you recognize the sender and > > know the content is safe. > > > > On Tue, 2023-03-07 at 21:04 +0200, Ovidiu Panait wrote: > > > > > > The manifest files still show lib32-recipe-sysroot instead of > > > recipe-sysroot (the manifest file seems to have already been cached by > > > lib32-gcc-cross-arm): > > > $ head -2 > > > tmp/work/x86_64-nativesdk-pokysdk-linux/gcc-cross-canadian-arm/12.2.0-r0/recipe-sysroot-native/installeddeps/lib32-linux-libc-headers > > > lib32-recipe-sysroot/usr/include/asm/byteorder-32.h > > > lib32-recipe-sysroot/usr/include/asm/sigcontext-32.h > > > > > > MLPREFIX is set to lib32- for gcc-cross-canadian-arm, so the existing > > > manifest file with lib32-recipe-sysroot paths is used: > > > $ bitbake -e gcc-cross-canadian-arm | grep ^MLPREFIX > > > MLPREFIX="lib32-" > > > > > > Adding an exception for cross-canadian to the the mlprefix code added > > > earlier seems to make it work: > > > > > > diff --git a/meta/classes-global/staging.bbclass > > > b/meta/classes-global/staging.bbclass > > > index e6d0d1d55c..a9142ce780 100644 > > > --- a/meta/classes-global/staging.bbclass > > > +++ b/meta/classes-global/staging.bbclass > > > @@ -276,6 +276,10 @@ python extend_recipe_sysroot() { > > >stagingdir = d.getVar("STAGING_DIR") > > >sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" > > >mlprefix = d.getVar("MLPREFIX") > > > +if "-cross-canadian" in pn: > > > +mlprefix = "nativesdk-" > > >if mlprefix: > > >sharedmanifests = sharedmanifests + "/" + mlprefix > > >recipesysroot = d.getVar("RECIPE_SYSROOT") > > Was this in a clean build? The change will need a clean TMPDIR to > > properly take effect. I didn't force everyone to rebuild since the > > issue is reported so rarely and has been present for a long time. > Yes, this is still reproducible in a clean build, with a fresh poky > clone. Same steps as before: > > git clone https://github.com/yoctoproject/poky.git; cd poky/; . > oe-init-build-env > > > add to local.conf: > require conf/multilib.conf > MACHINE = "qemuarm64" > MULTILIBS = "multilib:lib32" > DEFAULTTUNE:virtclass-multilib-lib32 = "armv7athf-neon" > > bitbake gcc-cross-canadian-arm > > update local.conf to force a rebuild: > GCCPIE = "--disable-default-pie" > > bitbake gcc-cross-canadian-arm > Sorry, it looks like I messed something up in testing. The approach is the right one but as you mention, it isn't quite working. I've sent another patch which does work with the steps above. We can't just use nativesdk since the file lists of the different canadian targets may be different and would cause a different kind of failure. I therefore tweaked the prefix accordingly and made the fix multilib specific at the call site that triggers the issue. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178163): https://lists.openembedded.org/g/openembedded-core/message/178163 Mute This Topic: https://lists.openembedded.org/mt/97268632/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] staging/multilib: Fix manifest corruption
The previous fix wasn't enough to address all the possible ways the manifests might be ordered. Rework the previous fix so it is tied to the multilib cross-canadian code which is causing the problem. RECIPE_SYSROOT_MANIFEST_SUBDIR is not documented as I'd hope nobody ever needs to use this outside the core multilib code. Signed-off-by: Richard Purdie --- meta/classes-global/staging.bbclass | 7 --- meta/classes/multilib.bbclass | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass index e6d0d1d55cf..a058d344fde 100644 --- a/meta/classes-global/staging.bbclass +++ b/meta/classes-global/staging.bbclass @@ -275,9 +275,10 @@ python extend_recipe_sysroot() { pn = d.getVar("PN") stagingdir = d.getVar("STAGING_DIR") sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" -mlprefix = d.getVar("MLPREFIX") -if mlprefix: -sharedmanifests = sharedmanifests + "/" + mlprefix +# only needed by multilib cross-canadian since it redefines RECIPE_SYSROOT +manifestprefix = d.getVar("RECIPE_SYSROOT_MANIFEST_SUBDIR") +if manifestprefix: +sharedmanifests = sharedmanifests + "/" + manifestprefix recipesysroot = d.getVar("RECIPE_SYSROOT") recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 10a4ef9c37a..8a1a51aabad 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -51,6 +51,7 @@ python multilib_virtclass_handler () { e.data.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot") e.data.setVar("STAGING_DIR_TARGET", "${WORKDIR}/recipe-sysroot") e.data.setVar("STAGING_DIR_HOST", "${WORKDIR}/recipe-sysroot") +e.data.setVar("RECIPE_SYSROOT_MANIFEST_SUBDIR", "nativesdk-" + variant) e.data.setVar("MLPREFIX", variant + "-") override = ":virtclass-multilib-" + variant e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) -- 2.38.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178162): https://lists.openembedded.org/g/openembedded-core/message/178162 Mute This Topic: https://lists.openembedded.org/mt/97469544/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] binutils: Enable --enable-new-dtags
On Wed, 2023-02-22 at 22:58 -0800, Khem Raj wrote: > Use DT_RUNPATH over DT_RPATH. If DT_RUNPATH is present, LD_LIBRARY_PATH is > searched before > DT_RUNPATH, Search order is DT_RPATH then LD_LIBRARY_PATH then > DT_RUNPATH, this order ensures that injecting > malicious shared objects is way harder with DT_RUNPATH. > > This is now default on major linux distributions already > > Signed-off-by: Khem Raj > --- > meta/recipes-devtools/binutils/binutils.inc | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/meta/recipes-devtools/binutils/binutils.inc > b/meta/recipes-devtools/binutils/binutils.inc > index b2dbf241df..c69d29448f 100644 > --- a/meta/recipes-devtools/binutils/binutils.inc > +++ b/meta/recipes-devtools/binutils/binutils.inc > @@ -96,6 +96,7 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ > --disable-werror \ > --enable-deterministic-archives \ > --enable-plugins \ > +--enable-new-dtags \ > --disable-gdb \ > --disable-gdbserver \ > --disable-libdecnumber \ FWIW I 100% agree we should look to enable this. Sadly, doing so exposes a bug where things that should rebuild don't. That manifests as a failure in the reproducible test builds on the autobuilder. I suspect a taskhash problem somewhere, maybe hash equivalence, maybe somewhere else, hard to say without debugging it. I've been trying to get to this to help. The first issue was to sort the other gdb issue this appeared to trigger but was in fact unrelated and an issue from the recent binutils/gdb version upgrade. I've debugged the initial buildtools tarball bug and re-deployed buildtools on the infrastructure. That fixed some of the manifestations but not all, I then debugged the remaining ones, worked out the regression in upstream gdb and sent a patch yesterday which was merged upstream to fix it. I am trying to get to helping with the problem this patch causes but these things take a ton of time. Whilst I may get paid to work on the project, I am one person and I'm getting pulled in a ridiculous number of directions at once. People should worry this triggers a reproducibility issue, it means there is a bug somewhere. I am hoping to get to this and to help try and debug it but the patch cannot merge until we get to the bottom of the issue it triggers. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178161): https://lists.openembedded.org/g/openembedded-core/message/178161 Mute This Topic: https://lists.openembedded.org/mt/97178429/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 2/2] runqemu: add an option to enable guest-agent virtio device
Hi Alexander, On Mon, 6 Mar 2023 at 07:30, Alexander Kanavin wrote: > > Can you please explain the use case? Who would want to enable the > option, and what could they do when there's a running qemu? Guest agent communication is useful to retrieve some information about a running VM. In my case, I use it to get the IP address of a VM configured using macvtap which is not able to directly talk to the host over IP. BR, Clement > > This kind of information needs to go to the commit message, so we can > document those things for the users. > > Alex > > On Sun, 5 Mar 2023 at 21:10, Clément Péron wrote: > > > > Add support to the runqemu script for a new option, 'guestagent', that > > enables the virtio serial port for host-to-guest communication. > > > > Signed-off-by: Brenda Streiff > > Signed-off-by: Clément Péron > > --- > > scripts/runqemu | 14 ++ > > 1 file changed, 14 insertions(+) > > > > diff --git a/scripts/runqemu b/scripts/runqemu > > index def11ea911..e71a1e8828 100755 > > --- a/scripts/runqemu > > +++ b/scripts/runqemu > > @@ -82,6 +82,7 @@ of the following environment variables (in any order): > > kvm-vhost - enable KVM with vhost when running x86/x86_64 (VT-capable > > CPU required) > > publicvnc - enable a VNC server open to all hosts > > audio - enable audio > > +guestagent - enable guest agent communication > > [*/]ovmf* - OVMF firmware file or base name for booting with UEFI > >tcpserial= - specify tcp serial port number > >qemuparams= - specify custom parameters to QEMU > > @@ -216,6 +217,8 @@ class BaseConfig(object): > > self.cleaned = False > > # Files to cleanup after run > > self.cleanup_files = [] > > +self.guest_agent = False > > +self.guest_agent_sockpath = '/tmp/qga.sock' > > > > def acquire_taplock(self, error=True): > > logger.debug("Acquiring lockfile %s..." % self.taplock) > > @@ -526,6 +529,10 @@ class BaseConfig(object): > > elif arg == 'publicvnc': > > self.publicvnc = True > > self.qemu_opt_script += ' -vnc :0' > > +elif arg == 'guestagent': > > +self.guest_agent = True > > +elif arg.startswith('guestagent-sockpath='): > > +self.guest_agent_sockpath = '%s' % > > arg[len('guestagent-sockpath='):] > > elif arg.startswith('tcpserial='): > > self.tcpserial_portnum = '%s' % arg[len('tcpserial='):] > > elif arg.startswith('qemuparams='): > > @@ -1366,6 +1373,12 @@ class BaseConfig(object): > > raise RunQemuError("Failed to boot, QB_SYSTEM_NAME is NULL!") > > self.qemu_system = qemu_system > > > > +def setup_guest_agent(self): > > +if self.guest_agent == True: > > +self.qemu_opt += ' -chardev socket,path=' + > > self.guest_agent_sockpath + ',server,nowait,id=qga0 ' > > +self.qemu_opt += ' -device virtio-serial ' > > +self.qemu_opt += ' -device > > virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 ' > > + > > def setup_vga(self): > > if self.nographic == True: > > if self.sdl == True: > > @@ -1496,6 +1509,7 @@ class BaseConfig(object): > > if self.snapshot: > > self.qemu_opt += " -snapshot" > > > > +self.setup_guest_agent() > > self.setup_serial() > > self.setup_vga() > > > > -- > > 2.34.1 > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178160): https://lists.openembedded.org/g/openembedded-core/message/178160 Mute This Topic: https://lists.openembedded.org/mt/97410707/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 5/5] bash: Fix install conflict when enable multilib.
On Wed, 2023-03-08 at 09:40 +0800, wangmy wrote: > From: Wang Mingyu > > Error: Transaction test error: > file /usr/bin/bashbug conflicts between attempted installs of > lib32-bash-bashbug-5.2.15-r0.armv7ahf_neon and bash-bashbug-5.2.15-r0.aarch64 > > The differences between the two files are as follows: > @@ -26,14 +26,14 @@ > # configuration section: > # these variables are filled in by the make target in Makefile > # > -MACHINE="aarch64" > -OS="linux-gnu" > -CC="aarch64-poky-linux-gcc -mcpu=cortex-a57 -march=armv8-a+crc > -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security > -Werror=format-security " > +MACHINE="arm" > +OS="linux-gnueabi" > +CC="arm-pokymllib32-linux-gnueabi-gcc -march=armv7-a -mfpu=neon > -mfloat-abi=hard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat > -Wformat-security -Werror=format-security " > CFLAGS=" -O2 -pipe -g -feliminate-unused-debug-types > -DNON_INTERACTIVE_LOGIN_SHELLS -DHEREDOC_PIPESIZE=65536 > -DBRACKETED_PASTE_DEFAULT=0" > RELEASE="5.2" > PATCHLEVEL="15" > RELSTATUS="release" > -MACHTYPE="aarch64-poky-linux-gnu" > +MACHTYPE="arm-pokymllib32-linux-gnueabi" > > PATH=/bin:/usr/bin:/usr/local/bin:$PATH > export PATH > > Signed-off-by: Wang Mingyu > --- > meta/recipes-extended/bash/bash_5.2.15.bb | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/meta/recipes-extended/bash/bash_5.2.15.bb > b/meta/recipes-extended/bash/bash_5.2.15.bb > index f78f79fcc5..ce81496f52 100644 > --- a/meta/recipes-extended/bash/bash_5.2.15.bb > +++ b/meta/recipes-extended/bash/bash_5.2.15.bb > @@ -20,3 +20,6 @@ DEBUG_OPTIMIZATION:append:armv4 = " > ${@bb.utils.contains('TUNE_CCARGS', '-mthumb > DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', > '-mthumb', '-fomit-frame-pointer', '', d)}" > > BBCLASSEXTEND = "nativesdk" > + > +inherit multilib_script > +MULTILIB_SCRIPTS = "${PN}-bashbug:${bindir}/bashbug" I think we should just change the MACHINE, OS, CC and MACHTYPE lines to something like "". Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178159): https://lists.openembedded.org/g/openembedded-core/message/178159 Mute This Topic: https://lists.openembedded.org/mt/97464376/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 4/5] xcb-proto: Fix install conflict when enable multilib.
On Wed, 2023-03-08 at 09:40 +0800, wangmy wrote: > From: Wang Mingyu > > Error: Transaction test error: > file /usr/share/pkgconfig/xcb-proto.pc conflicts between attempted installs > of lib32-xcb-proto-dev-1.15.2-r0.armv7ahf_neon and > xcb-proto-dev-1.15.2-r0.cortexa57 > > The differences between the two files are as follows: > @@ -2,7 +2,7 @@ > exec_prefix=/usr > datarootdir=${prefix}/share > datadir=/usr/share > -libdir=/usr/lib64 > +libdir=/usr/lib > xcbincludedir=${pc_sysrootdir}${datadir}/xcb > PYTHON_PREFIX=${prefix} > pythondir=${pc_sysrootdir}${libdir}/python3.11/site-packages > > Signed-off-by: Wang Mingyu > --- > meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb > b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb > index 4e4472a9c1..0fdca732e8 100644 > --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb > +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb > @@ -28,3 +28,6 @@ DEV_PKG_DEPENDENCY = "" > RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" > > BBCLASSEXTEND = "native nativesdk" > +inherit multilib_script > +MULTILIB_SCRIPTS = "${PN}-dev:${datadir}/pkgconfig/xcb-proto.pc" > + If the .pc file doesn't use libdir anywhere, we should just delete that line. It is being installed into a "noarch" location (datadir) so it shouldn't be library specific. Also, we should *never* be putting pkgconfig files under update- alternatives control! Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178158): https://lists.openembedded.org/g/openembedded-core/message/178158 Mute This Topic: https://lists.openembedded.org/mt/97464370/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 1/5] dhcpcd: Fix install conflict when enable multilib.
On Wed, 2023-03-08 at 09:40 +0800, wangmy wrote: > From: Wang Mingyu > > Error: Transaction test error: >file /usr/share/man/man8/dhcpcd.8 conflicts between attempted installs of > dhcpcd-doc-9.4.1-r0.cortexa57 and lib32-dhcpcd-doc-9.4.1-r0.armv7ahf_neon > > The differences between the two files are as follows: > @@ -821,7 +821,7 @@ > If you always use the same options, put them here. > .It Pa /usr/libexec/dhcpcd-run-hooks > Bourne shell script that is run to configure or de-configure an interface. > -.It Pa /usr/lib64/dhcpcd/dev > +.It Pa /usr/lib/dhcpcd/dev > Linux > .Pa /dev > management modules. > > > Signed-off-by: Wang Mingyu > --- > meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb > b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb > index 39e689d2f6..03dbf31b35 100644 > --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb > +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb > @@ -62,3 +62,6 @@ do_install:append () { > } > > FILES:${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" > + > +inherit multilib_script > +MULTILIB_SCRIPTS = "${PN}-doc:${datadir}/man/man8/dhcpcd.8" For something as simple as that we should just patch the docs to say /usr//dhcpcd/dev rather than trying to manage multiple versions. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178157): https://lists.openembedded.org/g/openembedded-core/message/178157 Mute This Topic: https://lists.openembedded.org/mt/97464365/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 1/5] dhcpcd: Fix install conflict when enable multilib.
But what is the use case for installing two sets of documentation? Is it really something that needs to be fixed, or can you simply install just one of the two packages? Alex On Wed, 8 Mar 2023 at 02:40, wangmy wrote: > > From: Wang Mingyu > > Error: Transaction test error: >file /usr/share/man/man8/dhcpcd.8 conflicts between attempted installs of > dhcpcd-doc-9.4.1-r0.cortexa57 and lib32-dhcpcd-doc-9.4.1-r0.armv7ahf_neon > > The differences between the two files are as follows: > @@ -821,7 +821,7 @@ > If you always use the same options, put them here. > .It Pa /usr/libexec/dhcpcd-run-hooks > Bourne shell script that is run to configure or de-configure an interface. > -.It Pa /usr/lib64/dhcpcd/dev > +.It Pa /usr/lib/dhcpcd/dev > Linux > .Pa /dev > management modules. > > > Signed-off-by: Wang Mingyu > --- > meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb > b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb > index 39e689d2f6..03dbf31b35 100644 > --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb > +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb > @@ -62,3 +62,6 @@ do_install:append () { > } > > FILES:${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" > + > +inherit multilib_script > +MULTILIB_SCRIPTS = "${PN}-doc:${datadir}/man/man8/dhcpcd.8" > -- > 2.34.1 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178156): https://lists.openembedded.org/g/openembedded-core/message/178156 Mute This Topic: https://lists.openembedded.org/mt/97464365/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-