Re: [OE-core] [PATCH v4] systemd-boot: Add recipe to compile native
Assigned maintainer assigned with https://lists.openembedded.org/g/openembedded-core/message/192993 ( https://lists.openembedded.org/g/openembedded-core/message/192993 ) -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192998): https://lists.openembedded.org/g/openembedded-core/message/192998 Mute This Topic: https://lists.openembedded.org/mt/103202155/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][dunfell][PATCH] qemu: Fix CVE-2023-5088
From: Vijay Anusuri A bug in QEMU could cause a guest I/O operation otherwise addressed to an arbitrary disk offset to be targeted to offset 0 instead (potentially overwriting the VM's boot code). This change is to fix CVE-2023-5088. Link: https://gitlab.com/qemu-project/qemu/-/commit/7d7512019fc40c577e2bdd61f114f31a9eb84a8e Signed-off-by: Vijay Anusuri --- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2023-5088.patch | 114 ++ 2 files changed, 115 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2023-5088.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 9dd90e8789..4f856c749e 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -141,6 +141,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2023-3354.patch \ file://CVE-2023-3180.patch \ file://CVE-2020-24165.patch \ + file://CVE-2023-5088.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2023-5088.patch b/meta/recipes-devtools/qemu/qemu/CVE-2023-5088.patch new file mode 100644 index 00..db02210fa4 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2023-5088.patch @@ -0,0 +1,114 @@ +From 7d7512019fc40c577e2bdd61f114f31a9eb84a8e Mon Sep 17 00:00:00 2001 +From: Fiona Ebner +Date: Wed, 6 Sep 2023 15:09:21 +0200 +Subject: [PATCH] hw/ide: reset: cancel async DMA operation before resetting + state +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +If there is a pending DMA operation during ide_bus_reset(), the fact +that the IDEState is already reset before the operation is canceled +can be problematic. In particular, ide_dma_cb() might be called and +then use the reset IDEState which contains the signature after the +reset. When used to construct the IO operation this leads to +ide_get_sector() returning 0 and nsector being 1. This is particularly +bad, because a write command will thus destroy the first sector which +often contains a partition table or similar. + +Traces showing the unsolicited write happening with IDEState +0x5595af6949d0 being used after reset: + +> ahci_port_write ahci(0x5595af6923f0)[0]: port write [reg:PxSCTL] @ 0x2c: 0x0300 +> ahci_reset_port ahci(0x5595af6923f0)[0]: reset port +> ide_reset IDEstate 0x5595af6949d0 +> ide_reset IDEstate 0x5595af694da8 +> ide_bus_reset_aio aio_cancel +> dma_aio_cancel dbs=0x7f64600089a0 +> dma_blk_cb dbs=0x7f64600089a0 ret=0 +> dma_complete dbs=0x7f64600089a0 ret=0 cb=0x5595acd40b30 +> ahci_populate_sglist ahci(0x5595af6923f0)[0] +> ahci_dma_prepare_buf ahci(0x5595af6923f0)[0]: prepare buf limit=512 prepared=512 +> ide_dma_cb IDEState 0x5595af6949d0; sector_num=0 n=1 cmd=DMA WRITE +> dma_blk_io dbs=0x7f6420802010 bs=0x5595ae2c6c30 offset=0 to_dev=1 +> dma_blk_cb dbs=0x7f6420802010 ret=0 + +> (gdb) p *qiov +> $11 = {iov = 0x7f647c76d840, niov = 1, {{nalloc = 1, local_iov = {iov_base = 0x0, +> iov_len = 512}}, {__pad = "\001\000\000\000\000\000\000\000\000\000\000", +> size = 512}}} +> (gdb) bt +> #0 blk_aio_pwritev (blk=0x5595ae2c6c30, offset=0, qiov=0x7f6420802070, flags=0, +> cb=0x5595ace6f0b0 , opaque=0x7f6420802010) +> at ../block/block-backend.c:1682 +> #1 0x5595ace6f185 in dma_blk_cb (opaque=0x7f6420802010, ret=) +> at ../softmmu/dma-helpers.c:179 +> #2 0x5595ace6f778 in dma_blk_io (ctx=0x5595ae0609f0, +> sg=sg@entry=0x5595af694d00, offset=offset@entry=0, align=align@entry=512, +> io_func=io_func@entry=0x5595ace6ee30 , +> io_func_opaque=io_func_opaque@entry=0x5595ae2c6c30, +> cb=0x5595acd40b30 , opaque=0x5595af6949d0, +> dir=DMA_DIRECTION_TO_DEVICE) at ../softmmu/dma-helpers.c:244 +> #3 0x5595ace6f90a in dma_blk_write (blk=0x5595ae2c6c30, +> sg=sg@entry=0x5595af694d00, offset=offset@entry=0, align=align@entry=512, +> cb=cb@entry=0x5595acd40b30 , opaque=opaque@entry=0x5595af6949d0) +> at ../softmmu/dma-helpers.c:280 +> #4 0x5595acd40e18 in ide_dma_cb (opaque=0x5595af6949d0, ret=) +> at ../hw/ide/core.c:953 +> #5 0x5595ace6f319 in dma_complete (ret=0, dbs=0x7f64600089a0) +> at ../softmmu/dma-helpers.c:107 +> #6 dma_blk_cb (opaque=0x7f64600089a0, ret=0) at ../softmmu/dma-helpers.c:127 +> #7 0x5595ad12227d in blk_aio_complete (acb=0x7f6460005b10) +> at ../block/block-backend.c:1527 +> #8 blk_aio_complete (acb=0x7f6460005b10) at ../block/block-backend.c:1524 +> #9 blk_aio_write_entry (opaque=0x7f6460005b10) at ../block/block-backend.c:1594 +> #10 0x5595ad258cfb in coroutine_trampoline (i0=, +> i1=) at ../util/coroutine-ucontext.c:177 + +Signed-off-by: Fiona Ebner +Reviewed-by: Philippe Mathieu-Daudé +Tested-by: simon.r...@nutanix.com +Message-ID: <20230906130922.142845-1-f.eb...@proxmox.com> +Signed-off-by: Phili
[OE-core] [PATCH v2] aspell: upgrade 0.60.8 -> 0.60.8.1
From: Wang Mingyu CVE-2019-25051.patch removed since it's included in 0.60.8.1 Changelog: -Fix memory leak in suggestion code introduced in 0.60.8. -Various documentation fixes. -Fix various warnings when compiling with -Wall. -Fix two buffer overflows found by Google's OSS-Fuzz. -Other minor updates. Signed-off-by: Wang Mingyu --- ...pell_0.60.8.bbappend => aspell_%.bbappend} | 0 .../{aspell_0.60.8.bb => aspell_0.60.8.1.bb} | 7 +- .../aspell/files/CVE-2019-25051.patch | 101 -- 3 files changed, 2 insertions(+), 106 deletions(-) rename meta-selftest/recipes-test/aspell/{aspell_0.60.8.bbappend => aspell_%.bbappend} (100%) rename meta/recipes-support/aspell/{aspell_0.60.8.bb => aspell_0.60.8.1.bb} (83%) delete mode 100644 meta/recipes-support/aspell/files/CVE-2019-25051.patch diff --git a/meta-selftest/recipes-test/aspell/aspell_0.60.8.bbappend b/meta-selftest/recipes-test/aspell/aspell_%.bbappend similarity index 100% rename from meta-selftest/recipes-test/aspell/aspell_0.60.8.bbappend rename to meta-selftest/recipes-test/aspell/aspell_%.bbappend diff --git a/meta/recipes-support/aspell/aspell_0.60.8.bb b/meta/recipes-support/aspell/aspell_0.60.8.1.bb similarity index 83% rename from meta/recipes-support/aspell/aspell_0.60.8.bb rename to meta/recipes-support/aspell/aspell_0.60.8.1.bb index 39b55f4ff2..0ea9b063e0 100644 --- a/meta/recipes-support/aspell/aspell_0.60.8.bb +++ b/meta/recipes-support/aspell/aspell_0.60.8.1.bb @@ -13,11 +13,8 @@ HOMEPAGE = "http://aspell.net/"; LICENSE = "LGPL-2.0-only | LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" -SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz \ - file://CVE-2019-25051.patch \ -" -SRC_URI[md5sum] = "012fa9209203ae4e5a61c2a668fd10e3" -SRC_URI[sha256sum] = "f9b77e515334a751b2e60daab5db23499e26c9209f5e7b7443b05235ad0226f2" +SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz" +SRC_URI[sha256sum] = "d6da12b34d42d457fa604e435ad484a74b2effcd120ff40acd6bb3fb2887d21b" PACKAGECONFIG ??= "" PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses" diff --git a/meta/recipes-support/aspell/files/CVE-2019-25051.patch b/meta/recipes-support/aspell/files/CVE-2019-25051.patch deleted file mode 100644 index 8513f6de79..00 --- a/meta/recipes-support/aspell/files/CVE-2019-25051.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 0718b375425aad8e54e1150313b862e4c6fd324a Mon Sep 17 00:00:00 2001 -From: Kevin Atkinson -Date: Sat, 21 Dec 2019 20:32:47 + -Subject: [PATCH] objstack: assert that the alloc size will fit within a chunk - to prevent a buffer overflow - -Bug found using OSS-Fuze. - -Upstream-Status: Backport -[https://github.com/gnuaspell/aspell/commit/0718b375425aad8e54e1150313b862e4c6fd324a] -CVE: CVE-2019-25051 -Signed-off-by: Chee Yang Lee - common/objstack.hpp | 18 ++ - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/common/objstack.hpp b/common/objstack.hpp -index 3997bf7..bd97ccd 100644 a/common/objstack.hpp -+++ b/common/objstack.hpp -@@ -5,6 +5,7 @@ - #include "parm_string.hpp" - #include - #include -+#include - - namespace acommon { - -@@ -26,6 +27,12 @@ class ObjStack - byte * temp_end; - void setup_chunk(); - void new_chunk(); -+ bool will_overflow(size_t sz) const { -+return offsetof(Node,data) + sz > chunk_size; -+ } -+ void check_size(size_t sz) { -+assert(!will_overflow(sz)); -+ } - - ObjStack(const ObjStack &); - void operator=(const ObjStack &); -@@ -56,7 +63,7 @@ class ObjStack - void * alloc_bottom(size_t size) { - byte * tmp = bottom; - bottom += size; --if (bottom > top) {new_chunk(); tmp = bottom; bottom += size;} -+if (bottom > top) {check_size(size); new_chunk(); tmp = bottom; bottom += size;} - return tmp; - } - // This alloc_bottom will insure that the object is aligned based on the -@@ -66,7 +73,7 @@ class ObjStack - align_bottom(align); - byte * tmp = bottom; - bottom += size; --if (bottom > top) {new_chunk(); goto loop;} -+if (bottom > top) {check_size(size); new_chunk(); goto loop;} - return tmp; - } - char * dup_bottom(ParmString str) { -@@ -79,7 +86,7 @@ class ObjStack - // always be aligned as such. - void * alloc_top(size_t size) { - top -= size; --if (top < bottom) {new_chunk(); top -= size;} -+if (top < bottom) {check_size(size); new_chunk(); top -= size;} - return top; - } - // This alloc_top will insure that the object is aligned based on -@@ -88,7 +95,7 @@ class ObjStack - {loop: - top -= size; - align_top(align); --if (top < bottom) {new_chunk(); goto loop;} -+if (top < bottom) {check_size(size); new_chunk(); goto loop;} - return top; - } - char * dup_top(ParmString str) { -@@ -117,6 +124,7 @@ class ObjStack - void * alloc_temp(size_t size) { - temp_end = bottom + size; - if (temp_end > top) { -+ check_siz
Re: [OE-core][PATCH 1/3] systemd: upgrade to 255.1
On 12/29/23 05:14, Alexandre Belloni wrote: On 28/12/2023 03:00:08+, Chen, Qi wrote: I double checked it in my environment, setting INIT_MANAGER to "systemd" and then 'bitbake systemd' will not generate this warning. In this case ROOT_HOME's value is "/root". I checked https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/8354, but I couldn't find the configuration items that set the init manager to systemd. Does the build use the variable 'INIT_MANAGER'? Does it set ROOT_HOME to "/home/root" somewhere? This is the config that is used: MACHINE = "qemux86-64" DISTRO = "poky" SDKMACHINE = "x86_64" PACKAGE_CLASSES = "package_rpm package_deb package_ipk" DL_DIR = '/srv/autobuilder/autobuilder.yocto.io/current_sources' SSTATE_DIR ?= '/srv/autobuilder/autobuilder.yocto.io/pub/sstate' TEST_SUITES:append = ' systemd' DISTRO_FEATURES:append = ' pam systemd usrmerge' VIRTUAL-RUNTIME_init_manager = 'systemd' DISTRO_FEATURES_BACKFILL_CONSIDERED = 'sysvinit' OK, I see. I'd suggest replacing the above 4 lines with a single line: INIT_MANAGER = "systemd" The INIT_MANAGER mechanism was added to make switching init managers easier. Another choice is adding the following line to sync with the meta/conf/distro/include/init-manager-systemd.inc settings. ROOT_HOME ?= "/root" Regards, Qi DISTRO_FEATURES:remove = 'x11' QEMU_USE_KVM = 'True' INHERIT += 'report-error' PREMIRRORS = '' BB_GENERATE_MIRROR_TARBALLS = '1' BB_NUMBER_THREADS = '16' BB_NUMBER_PARSE_THREADS = '16' PARALLEL_MAKE = '-j 16 -l 52' BB_PRESSURE_MAX_CPU = '1' BB_PRESSURE_MAX_IO = '1' XZ_MEMLIMIT = '5%' XZ_THREADS = '8' ZSTD_THREADS = '8' BB_TASK_NICE_LEVEL = '5' BB_TASK_NICE_LEVEL:task-testimage = '0' BB_TASK_IONICE_LEVEL = '2.7' BB_TASK_IONICE_LEVEL:task-testimage = '2.1' IMAGE_CLASSES += 'testimage' TEST_QEMUBOOT_TIMEOUT = '1500' SANITY_TESTED_DISTROS = '' SDK_EXT_TYPE = 'minimal' SDK_INCLUDE_TOOLCHAIN = '1' ESDK_LOCAL_CONF_REMOVE:append = 'BB_HASHSERVE' BB_DISKMON_DIRS = 'STOPTASKS,${TMPDIR},1G,100K STOPTASKS,${DL_DIR},1G STOPTASKS,${SSTATE_DIR},1G STOPTASKS,/tmp,100M,30K HALT,${TMPDIR},100M,1K HALT,${DL_DIR},100M HALT,${SSTATE_DIR},100M HALT,/tmp,10M,1K' BB_HASHSERVE = 'hashserv.yocto.io:8686' RUNQEMU_TMPFS_DIR = '/home/pokybuild/tmp' BB_HEARTBEAT_EVENT = '60' BB_LOG_HOST_STAT_ON_INTERVAL = '1' BB_LOG_HOST_STAT_CMDS_INTERVAL = 'oe-time-dd-test.sh -c 100 -t 3' BB_LOG_HOST_STAT_ON_FAILURE = '1' BB_LOG_HOST_STAT_CMDS_FAILURE = 'oe-time-dd-test.sh -l' SDK_TOOLCHAIN_LANGS += 'rust' BB_SERVER_TIMEOUT = '60' It is in auto.conf and it is displayed in the first lines of https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/8354/steps/14/logs/stdio Regards, Qi -Original Message- From: Alexandre Belloni Sent: Wednesday, December 27, 2023 7:59 PM To: Chen, Qi Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core][PATCH 1/3] systemd: upgrade to 255.1 We hit the added warning on the autobuilders: WARNING: systemd-1_255.1-r0 do_install: Using /home/root as root user's home directory is not fully supported by systemd https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/8354/steps/14/logs/warnings On 27/12/2023 12:20:34+0800, Chen Qi via lists.openembedded.org wrote: From: Chen Qi 1. Patch changes: 0004-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch is removed because it has no real effect now. The /lib is now /usr/lib because 'usrmerge' is a required distro feature for systemd. 0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch is refreshed for the new version to avoid patch-fuzz issue. 2. root user's home directory now defaults to "/root": The sysuers.d/basic.conf is still modified to respect the ROOT_HOME value, so if users set ROOT_HOME to "/home/root", the behavior is the same as before. However, this is only for backward compatibility. With this patch, The ROOT_HOME value is set to "/root" in init-manager-systemd.inc. This is because systemd's source codes are hardcoding "/root", and other values are not officially supported. See the list below. $ grep -rl '"/root"' src/ | grep -v 'src/test' src/core/namespace.c src/basic/user-util.c src/nss-systemd/nss-systemd.c src/nspawn/nspawn.c src/firstboot/firstboot.c src/shared/userdb.c src/shared/user-record.c $ grep -rl /root network/ factory/ sysctl.d/ sysusers.d/ rules.d/ tmpfiles.d/ units/ xorg/ tools/ sysusers.d/basic.conf.in tmpfiles.d/provision.conf units/emergency.service.in units/rescue.service.in tools/list-discoverable-partitions.py Previously, the recipe was just substituting sysusers.d/basic.conf.in, which is not enough to be treated as 'fully support'. I deliberately put a warning message in do_install to warn users about non "/root" ROOT_HOME value. Don't remove it until all above places are handled. 3. cgroupv2 is now the default. cgroupv2 is the default for systemd for many years and it's the default for distros such as ubuntu and fedora. Let's also use it as the defaul
Re: [OE-core][PATCH 1/3] systemd: upgrade to 255.1
On 28/12/2023 03:00:08+, Chen, Qi wrote: > I double checked it in my environment, setting INIT_MANAGER to "systemd" and > then 'bitbake systemd' will not generate this warning. In this case > ROOT_HOME's value is "/root". > I checked > https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/8354, but I > couldn't find the configuration items that set the init manager to systemd. > Does the build use the variable 'INIT_MANAGER'? Does it set ROOT_HOME to > "/home/root" somewhere? > This is the config that is used: MACHINE = "qemux86-64" DISTRO = "poky" SDKMACHINE = "x86_64" PACKAGE_CLASSES = "package_rpm package_deb package_ipk" DL_DIR = '/srv/autobuilder/autobuilder.yocto.io/current_sources' SSTATE_DIR ?= '/srv/autobuilder/autobuilder.yocto.io/pub/sstate' TEST_SUITES:append = ' systemd' DISTRO_FEATURES:append = ' pam systemd usrmerge' VIRTUAL-RUNTIME_init_manager = 'systemd' DISTRO_FEATURES_BACKFILL_CONSIDERED = 'sysvinit' DISTRO_FEATURES:remove = 'x11' QEMU_USE_KVM = 'True' INHERIT += 'report-error' PREMIRRORS = '' BB_GENERATE_MIRROR_TARBALLS = '1' BB_NUMBER_THREADS = '16' BB_NUMBER_PARSE_THREADS = '16' PARALLEL_MAKE = '-j 16 -l 52' BB_PRESSURE_MAX_CPU = '1' BB_PRESSURE_MAX_IO = '1' XZ_MEMLIMIT = '5%' XZ_THREADS = '8' ZSTD_THREADS = '8' BB_TASK_NICE_LEVEL = '5' BB_TASK_NICE_LEVEL:task-testimage = '0' BB_TASK_IONICE_LEVEL = '2.7' BB_TASK_IONICE_LEVEL:task-testimage = '2.1' IMAGE_CLASSES += 'testimage' TEST_QEMUBOOT_TIMEOUT = '1500' SANITY_TESTED_DISTROS = '' SDK_EXT_TYPE = 'minimal' SDK_INCLUDE_TOOLCHAIN = '1' ESDK_LOCAL_CONF_REMOVE:append = 'BB_HASHSERVE' BB_DISKMON_DIRS = 'STOPTASKS,${TMPDIR},1G,100K STOPTASKS,${DL_DIR},1G STOPTASKS,${SSTATE_DIR},1G STOPTASKS,/tmp,100M,30K HALT,${TMPDIR},100M,1K HALT,${DL_DIR},100M HALT,${SSTATE_DIR},100M HALT,/tmp,10M,1K' BB_HASHSERVE = 'hashserv.yocto.io:8686' RUNQEMU_TMPFS_DIR = '/home/pokybuild/tmp' BB_HEARTBEAT_EVENT = '60' BB_LOG_HOST_STAT_ON_INTERVAL = '1' BB_LOG_HOST_STAT_CMDS_INTERVAL = 'oe-time-dd-test.sh -c 100 -t 3' BB_LOG_HOST_STAT_ON_FAILURE = '1' BB_LOG_HOST_STAT_CMDS_FAILURE = 'oe-time-dd-test.sh -l' SDK_TOOLCHAIN_LANGS += 'rust' BB_SERVER_TIMEOUT = '60' It is in auto.conf and it is displayed in the first lines of https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/8354/steps/14/logs/stdio > Regards, > Qi > > -Original Message- > From: Alexandre Belloni > Sent: Wednesday, December 27, 2023 7:59 PM > To: Chen, Qi > Cc: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core][PATCH 1/3] systemd: upgrade to 255.1 > > We hit the added warning on the autobuilders: > > WARNING: systemd-1_255.1-r0 do_install: Using /home/root as root user's home > directory is not fully supported by systemd > > https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/8354/steps/14/logs/warnings > > On 27/12/2023 12:20:34+0800, Chen Qi via lists.openembedded.org wrote: > > From: Chen Qi > > > > 1. Patch changes: > > > > 0004-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch > > is removed because it has no real effect now. The /lib is now /usr/lib > > because 'usrmerge' is a required distro feature for systemd. > > > > 0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch is > > refreshed for the new version to avoid patch-fuzz issue. > > > > 2. root user's home directory now defaults to "/root": > > > > The sysuers.d/basic.conf is still modified to respect the ROOT_HOME > > value, so if users set ROOT_HOME to "/home/root", the behavior is the > > same as before. However, this is only for backward compatibility. With > > this patch, The ROOT_HOME value is set to "/root" in > > init-manager-systemd.inc. > > This is because systemd's source codes are hardcoding "/root", and > > other values are not officially supported. See the list below. > > $ grep -rl '"/root"' src/ | grep -v 'src/test' > > src/core/namespace.c > > src/basic/user-util.c > > src/nss-systemd/nss-systemd.c > > src/nspawn/nspawn.c > > src/firstboot/firstboot.c > > src/shared/userdb.c > > src/shared/user-record.c > > $ grep -rl /root network/ factory/ sysctl.d/ sysusers.d/ rules.d/ > > tmpfiles.d/ units/ xorg/ tools/ sysusers.d/basic.conf.in > > tmpfiles.d/provision.conf units/emergency.service.in > > units/rescue.service.in tools/list-discoverable-partitions.py > > Previously, the recipe was just substituting sysusers.d/basic.conf.in, > > which is not enough to be treated as 'fully support'. I deliberately > > put a warning message in do_install to warn users about non "/root" > > ROOT_HOME value. Don't remove it until all above places are handled. > > > > 3. cgroupv2 is now the default. > > cgroupv2 is the default for systemd for many years and it's the > > default for distros such as ubuntu and fedora. Let's also use it as the > > default. > > > > Signed-off-by: Chen Qi > > --- > > .../distro/include/init-manager-systemd.inc | 2 + > > meta/recipes-core/systemd/systemd.inc | 4 +
[OE-core] [PATCH v5] systemd-boot: Add recipe to compile native
systemd-boot native recipe provides ukify tool to build UKI images for systemd-boot Signed-off-by: Viswanath Kraleti --- meta/conf/distro/include/maintainers.inc | 1 + .../systemd/systemd-boot-native_254.4.bb | 15 +++ 2 files changed, 16 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd-boot-native_254.4.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 445f797bcb..18da5435a3 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -787,6 +787,7 @@ RECIPE_MAINTAINER:pn-systemd = "Chen Qi " RECIPE_MAINTAINER:pn-systemd-boot = "Chen Qi " RECIPE_MAINTAINER:pn-systemd-bootchart = "Chen Qi " RECIPE_MAINTAINER:pn-systemd-bootconf = "Chen Qi " +RECIPE_MAINTAINER:pn-systemd-boot-native = "Viswanath Kraleti " RECIPE_MAINTAINER:pn-systemd-conf = "Chen Qi " RECIPE_MAINTAINER:pn-systemd-compat-units = "Chen Qi " RECIPE_MAINTAINER:pn-systemd-machine-units = "Chen Qi " diff --git a/meta/recipes-core/systemd/systemd-boot-native_254.4.bb b/meta/recipes-core/systemd/systemd-boot-native_254.4.bb new file mode 100644 index 00..73db59b14e --- /dev/null +++ b/meta/recipes-core/systemd/systemd-boot-native_254.4.bb @@ -0,0 +1,15 @@ +require systemd.inc + +inherit native + +deltask do_configure +deltask do_compile + +do_install () { + install -Dm 0755 ${S}/src/ukify/ukify.py ${D}${bindir}/ukify +} +addtask install after do_unpack + +PACKAGES = "${PN}" + +FILES:${PN} = "${bindir}/ukify" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192993): https://lists.openembedded.org/g/openembedded-core/message/192993 Mute This Topic: https://lists.openembedded.org/mt/103402442/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 v3 10/10] rust: Upgrade 1.74.0 -> 1.74.1
https://blog.rust-lang.org/2023/12/07/Rust-1.74.1.html Signed-off-by: Alex Kiernan --- (no changes since v1) meta/recipes-devtools/rust/{cargo_1.74.0.bb => cargo_1.74.1.bb} | 0 .../rust/{libstd-rs_1.74.0.bb => libstd-rs_1.74.1.bb} | 0 ...t-cross-canadian_1.74.0.bb => rust-cross-canadian_1.74.1.bb} | 0 .../rust/{rust-llvm_1.74.0.bb => rust-llvm_1.74.1.bb} | 0 meta/recipes-devtools/rust/rust-source.inc | 2 +- meta/recipes-devtools/rust/{rust_1.74.0.bb => rust_1.74.1.bb} | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/rust/{cargo_1.74.0.bb => cargo_1.74.1.bb} (100%) rename meta/recipes-devtools/rust/{libstd-rs_1.74.0.bb => libstd-rs_1.74.1.bb} (100%) rename meta/recipes-devtools/rust/{rust-cross-canadian_1.74.0.bb => rust-cross-canadian_1.74.1.bb} (100%) rename meta/recipes-devtools/rust/{rust-llvm_1.74.0.bb => rust-llvm_1.74.1.bb} (100%) rename meta/recipes-devtools/rust/{rust_1.74.0.bb => rust_1.74.1.bb} (100%) diff --git a/meta/recipes-devtools/rust/cargo_1.74.0.bb b/meta/recipes-devtools/rust/cargo_1.74.1.bb similarity index 100% rename from meta/recipes-devtools/rust/cargo_1.74.0.bb rename to meta/recipes-devtools/rust/cargo_1.74.1.bb diff --git a/meta/recipes-devtools/rust/libstd-rs_1.74.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.74.1.bb similarity index 100% rename from meta/recipes-devtools/rust/libstd-rs_1.74.0.bb rename to meta/recipes-devtools/rust/libstd-rs_1.74.1.bb diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.74.0.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.74.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust-cross-canadian_1.74.0.bb rename to meta/recipes-devtools/rust/rust-cross-canadian_1.74.1.bb diff --git a/meta/recipes-devtools/rust/rust-llvm_1.74.0.bb b/meta/recipes-devtools/rust/rust-llvm_1.74.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust-llvm_1.74.0.bb rename to meta/recipes-devtools/rust/rust-llvm_1.74.1.bb diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index e8dafe59c9b0..83a0dbc15fae 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -11,7 +11,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://0005-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC} \ file://0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch;patchdir=${RUSTSRC} \ " -SRC_URI[rust.sha256sum] = "23705e38c1a37acfd7fbb921c5dd8772619476e80d0b3b39ac8eb45bc0c33187" +SRC_URI[rust.sha256sum] = "b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e" RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src" diff --git a/meta/recipes-devtools/rust/rust_1.74.0.bb b/meta/recipes-devtools/rust/rust_1.74.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust_1.74.0.bb rename to meta/recipes-devtools/rust/rust_1.74.1.bb -- 2.39.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192991): https://lists.openembedded.org/g/openembedded-core/message/192991 Mute This Topic: https://lists.openembedded.org/mt/103401578/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 v3 08/10] rust: Upgrade 1.72.1 -> 1.73.0
https://blog.rust-lang.org/2023/10/05/Rust-1.73.0.html Signed-off-by: Alex Kiernan --- (no changes since v1) meta/conf/distro/include/tcmode-default.inc | 2 +- .../rust/{cargo_1.72.1.bb => cargo_1.73.0.bb} | 0 ...-Do-not-use-LFS64-on-linux-with-musl.patch | 36 +- .../rust/files/hardcodepaths.patch| 8 ++- ...ibstd-rs_1.72.1.bb => libstd-rs_1.73.0.bb} | 0 72.1.bb => rust-cross-canadian_1.73.0.bb} | 0 ...ust-llvm_1.72.1.bb => rust-llvm_1.73.0.bb} | 0 meta/recipes-devtools/rust/rust-snapshot.inc | 68 --- meta/recipes-devtools/rust/rust-source.inc| 2 +- .../rust/{rust_1.72.1.bb => rust_1.73.0.bb} | 0 10 files changed, 55 insertions(+), 61 deletions(-) rename meta/recipes-devtools/rust/{cargo_1.72.1.bb => cargo_1.73.0.bb} (100%) rename meta/recipes-devtools/rust/{libstd-rs_1.72.1.bb => libstd-rs_1.73.0.bb} (100%) rename meta/recipes-devtools/rust/{rust-cross-canadian_1.72.1.bb => rust-cross-canadian_1.73.0.bb} (100%) rename meta/recipes-devtools/rust/{rust-llvm_1.72.1.bb => rust-llvm_1.73.0.bb} (100%) rename meta/recipes-devtools/rust/{rust_1.72.1.bb => rust_1.73.0.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index f67b7be39c60..8960d9e0144e 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -25,7 +25,7 @@ LINUXLIBCVERSION ?= "6.5%" QEMUVERSION ?= "8.1%" GOVERSION ?= "1.20%" LLVMVERSION ?= "17.%" -RUSTVERSION ?= "1.72%" +RUSTVERSION ?= "1.73%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" diff --git a/meta/recipes-devtools/rust/cargo_1.72.1.bb b/meta/recipes-devtools/rust/cargo_1.73.0.bb similarity index 100% rename from meta/recipes-devtools/rust/cargo_1.72.1.bb rename to meta/recipes-devtools/rust/cargo_1.73.0.bb diff --git a/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch b/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch index dd23d09101ef..794ad804f0dc 100644 --- a/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch +++ b/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch @@ -19,10 +19,10 @@ Signed-off-by: Khem Raj library/std/src/sys/unix/fs.rs | 27 --- 3 files changed, 38 insertions(+), 12 deletions(-) -Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs +Index: rustc-1.73.0-src/library/std/src/os/linux/fs.rs === rustc-1.72.0-src.orig/library/std/src/os/linux/fs.rs -+++ rustc-1.72.0-src/library/std/src/os/linux/fs.rs +--- rustc-1.73.0-src.orig/library/std/src/os/linux/fs.rs rustc-1.73.0-src/library/std/src/os/linux/fs.rs @@ -329,7 +329,14 @@ pub trait MetadataExt { impl MetadataExt for Metadata { #[allow(deprecated)] @@ -39,10 +39,10 @@ Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs } fn st_dev(&self) -> u64 { self.as_inner().as_inner().st_dev as u64 -Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs +Index: rustc-1.73.0-src/library/std/src/sys/unix/fd.rs === rustc-1.72.0-src.orig/library/std/src/sys/unix/fd.rs -+++ rustc-1.72.0-src/library/std/src/sys/unix/fd.rs +--- rustc-1.73.0-src.orig/library/std/src/sys/unix/fd.rs rustc-1.73.0-src/library/std/src/sys/unix/fd.rs @@ -124,9 +124,12 @@ impl FileDesc { } @@ -73,11 +73,11 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs use libc::pwrite64; unsafe { -Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs +Index: rustc-1.73.0-src/library/std/src/sys/unix/fs.rs === rustc-1.72.0-src.orig/library/std/src/sys/unix/fs.rs -+++ rustc-1.72.0-src/library/std/src/sys/unix/fs.rs -@@ -50,9 +50,13 @@ use libc::{c_int, mode_t}; +--- rustc-1.73.0-src.orig/library/std/src/sys/unix/fs.rs rustc-1.73.0-src/library/std/src/sys/unix/fs.rs +@@ -39,9 +39,13 @@ use libc::{c_int, mode_t}; all(target_os = "linux", target_env = "gnu") ))] use libc::c_char; @@ -93,7 +93,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs use libc::fstatat64; #[cfg(any( target_os = "android", -@@ -64,7 +68,7 @@ use libc::fstatat64; +@@ -53,7 +57,7 @@ use libc::fstatat64; target_os = "vita", ))] use libc::readdir as readdir64; @@ -102,7 +102,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs use libc::readdir64; #[cfg(any(target_os = "emscripten", target_os = "l4re"))] use libc::readdir64_r; -@@ -79,6 +83,7 @@ use libc::readdir64_r; +@@ -68,6 +72,7 @@ use libc::readdir64_r; target_os = "redox", target_os = "nto", target_os = "vita", @@ -110,7 +110,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs
[OE-Core][PATCH v3 07/10] rust: Upgrade 1.72.0 -> 1.72.1
https://blog.rust-lang.org/2023/09/19/Rust-1.72.1.html Signed-off-by: Alex Kiernan --- (no changes since v1) meta/recipes-devtools/rust/{cargo_1.72.0.bb => cargo_1.72.1.bb} | 0 .../rust/{libstd-rs_1.72.0.bb => libstd-rs_1.72.1.bb} | 0 ...t-cross-canadian_1.72.0.bb => rust-cross-canadian_1.72.1.bb} | 0 .../rust/{rust-llvm_1.72.0.bb => rust-llvm_1.72.1.bb} | 0 meta/recipes-devtools/rust/rust-source.inc | 2 +- meta/recipes-devtools/rust/{rust_1.72.0.bb => rust_1.72.1.bb} | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/rust/{cargo_1.72.0.bb => cargo_1.72.1.bb} (100%) rename meta/recipes-devtools/rust/{libstd-rs_1.72.0.bb => libstd-rs_1.72.1.bb} (100%) rename meta/recipes-devtools/rust/{rust-cross-canadian_1.72.0.bb => rust-cross-canadian_1.72.1.bb} (100%) rename meta/recipes-devtools/rust/{rust-llvm_1.72.0.bb => rust-llvm_1.72.1.bb} (100%) rename meta/recipes-devtools/rust/{rust_1.72.0.bb => rust_1.72.1.bb} (100%) diff --git a/meta/recipes-devtools/rust/cargo_1.72.0.bb b/meta/recipes-devtools/rust/cargo_1.72.1.bb similarity index 100% rename from meta/recipes-devtools/rust/cargo_1.72.0.bb rename to meta/recipes-devtools/rust/cargo_1.72.1.bb diff --git a/meta/recipes-devtools/rust/libstd-rs_1.72.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.72.1.bb similarity index 100% rename from meta/recipes-devtools/rust/libstd-rs_1.72.0.bb rename to meta/recipes-devtools/rust/libstd-rs_1.72.1.bb diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.72.0.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.72.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust-cross-canadian_1.72.0.bb rename to meta/recipes-devtools/rust/rust-cross-canadian_1.72.1.bb diff --git a/meta/recipes-devtools/rust/rust-llvm_1.72.0.bb b/meta/recipes-devtools/rust/rust-llvm_1.72.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust-llvm_1.72.0.bb rename to meta/recipes-devtools/rust/rust-llvm_1.72.1.bb diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index 253a8436d2a7..ca3fcf9e884d 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -7,7 +7,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC} \ file://0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch;patchdir=${RUSTSRC} \ " -SRC_URI[rust.sha256sum] = "d307441f8ee78a7e94f72cb5c81383822f13027f79e67a5551bfd2c2d2db3014" +SRC_URI[rust.sha256sum] = "aea58d962ff1c19521b9f587aad88285f0fd35b6b6738b031a7a15bb1b70a7c3" RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src" diff --git a/meta/recipes-devtools/rust/rust_1.72.0.bb b/meta/recipes-devtools/rust/rust_1.72.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust_1.72.0.bb rename to meta/recipes-devtools/rust/rust_1.72.1.bb -- 2.39.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192988): https://lists.openembedded.org/g/openembedded-core/message/192988 Mute This Topic: https://lists.openembedded.org/mt/103401575/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 v3 05/10] zvariant: Drop recipe
This fails to build with newer rust Signed-off-by: Alex Kiernan --- (no changes since v1) .../zvariant/zvariant-crates.inc | 258 .../zvariant/zvariant-git-crates.inc | 14 - .../0001-Tweak-zvariant-crate-config.patch| 1292 - .../zvariant/zvariant_3.12.0.bb | 37 - 4 files changed, 1601 deletions(-) delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant-crates.inc delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant-git-crates.inc delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant/0001-Tweak-zvariant-crate-config.patch delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant_3.12.0.bb diff --git a/meta-selftest/recipes-extended/zvariant/zvariant-crates.inc b/meta-selftest/recipes-extended/zvariant/zvariant-crates.inc deleted file mode 100644 index 3a9759c4a533.. --- a/meta-selftest/recipes-extended/zvariant/zvariant-crates.inc +++ /dev/null @@ -1,258 +0,0 @@ -# Autogenerated with 'bitbake -c update_crates zvariant' - -# from Cargo.lock -SRC_URI += " \ -crate://crates.io/anes/0.1.6;name=anes-0.1.6 \ -crate://crates.io/anyhow/1.0.70;name=anyhow-1.0.70 \ -crate://crates.io/arrayvec/0.7.2;name=arrayvec-0.7.2 \ -crate://crates.io/atty/0.2.14;name=atty-0.2.14 \ -crate://crates.io/autocfg/1.1.0;name=autocfg-1.1.0 \ -crate://crates.io/bitflags/1.3.2;name=bitflags-1.3.2 \ -crate://crates.io/bumpalo/3.12.0;name=bumpalo-3.12.0 \ -crate://crates.io/byteorder/1.4.3;name=byteorder-1.4.3 \ -crate://crates.io/cast/0.3.0;name=cast-0.3.0 \ -crate://crates.io/cfg-if/1.0.0;name=cfg-if-1.0.0 \ -crate://crates.io/chrono/0.4.24;name=chrono-0.4.24 \ -crate://crates.io/ciborium/0.2.0;name=ciborium-0.2.0 \ -crate://crates.io/ciborium-io/0.2.0;name=ciborium-io-0.2.0 \ -crate://crates.io/ciborium-ll/0.2.0;name=ciborium-ll-0.2.0 \ -crate://crates.io/clap/3.2.23;name=clap-3.2.23 \ -crate://crates.io/clap_lex/0.2.4;name=clap_lex-0.2.4 \ -crate://crates.io/criterion/0.4.0;name=criterion-0.4.0 \ -crate://crates.io/criterion-plot/0.5.0;name=criterion-plot-0.5.0 \ -crate://crates.io/crossbeam-channel/0.5.7;name=crossbeam-channel-0.5.7 \ -crate://crates.io/crossbeam-deque/0.8.3;name=crossbeam-deque-0.8.3 \ -crate://crates.io/crossbeam-epoch/0.9.14;name=crossbeam-epoch-0.9.14 \ -crate://crates.io/crossbeam-utils/0.8.15;name=crossbeam-utils-0.8.15 \ -crate://crates.io/either/1.8.1;name=either-1.8.1 \ -crate://crates.io/enumflags2/0.7.5;name=enumflags2-0.7.5 \ -crate://crates.io/enumflags2_derive/0.7.4;name=enumflags2_derive-0.7.4 \ -crate://crates.io/form_urlencoded/1.1.0;name=form_urlencoded-1.1.0 \ -crate://crates.io/futures-channel/0.3.27;name=futures-channel-0.3.27 \ -crate://crates.io/futures-core/0.3.27;name=futures-core-0.3.27 \ -crate://crates.io/futures-executor/0.3.27;name=futures-executor-0.3.27 \ -crate://crates.io/futures-macro/0.3.27;name=futures-macro-0.3.27 \ -crate://crates.io/futures-task/0.3.27;name=futures-task-0.3.27 \ -crate://crates.io/futures-util/0.3.27;name=futures-util-0.3.27 \ -crate://crates.io/getrandom/0.2.8;name=getrandom-0.2.8 \ -crate://crates.io/half/1.8.2;name=half-1.8.2 \ -crate://crates.io/hashbrown/0.12.3;name=hashbrown-0.12.3 \ -crate://crates.io/heck/0.3.3;name=heck-0.3.3 \ -crate://crates.io/hermit-abi/0.1.19;name=hermit-abi-0.1.19 \ -crate://crates.io/hermit-abi/0.2.6;name=hermit-abi-0.2.6 \ -crate://crates.io/idna/0.3.0;name=idna-0.3.0 \ -crate://crates.io/indexmap/1.9.2;name=indexmap-1.9.2 \ -crate://crates.io/itertools/0.9.0;name=itertools-0.9.0 \ -crate://crates.io/itertools/0.10.5;name=itertools-0.10.5 \ -crate://crates.io/itoa/1.0.6;name=itoa-1.0.6 \ -crate://crates.io/js-sys/0.3.61;name=js-sys-0.3.61 \ -crate://crates.io/lazy_static/1.4.0;name=lazy_static-1.4.0 \ -crate://crates.io/libc/0.2.140;name=libc-0.2.140 \ -crate://crates.io/log/0.4.17;name=log-0.4.17 \ -crate://crates.io/memchr/2.5.0;name=memchr-2.5.0 \ -crate://crates.io/memoffset/0.8.0;name=memoffset-0.8.0 \ -crate://crates.io/num-integer/0.1.45;name=num-integer-0.1.45 \ -crate://crates.io/num-traits/0.2.15;name=num-traits-0.2.15 \ -crate://crates.io/num_cpus/1.15.0;name=num_cpus-1.15.0 \ -crate://crates.io/once_cell/1.17.1;name=once_cell-1.17.1 \ -crate://crates.io/oorandom/11.1.3;name=oorandom-11.1.3 \ -crate://crates.io/os_str_bytes/6.5.0;name=os_str_bytes-6.5.0 \ -crate://crates.io/percent-encoding/2.2.0;name=percent-encoding-2.2.0 \ -crate://crates.io/pin-project-lite/0.2.9;name=pin-project-lite-0.2.9 \ -crate://crates.io/pin-utils/0.1.0;name=pin-utils-0.1.0 \ -crate://crates.io/pkg-config/0.3.26;name=pkg-config-0.3.26 \ -crate://crates.io/plotters/0.3.4;name=plotters-0.3.4 \ -crate://crates.io/plotters-backend/0.3.4;name=plotters-backend-0.3.4
[OE-Core][PATCH v3 04/10] devtool: selftest: Swap to hello-rs for crates testing
zvariant fails to build with newer rust Signed-off-by: Alex Kiernan --- Changes in v3: - Add hello-rs as a replacement for the tests which used zvariant Changes in v2: - Skip zvariant based test rather than deleting it. meta/lib/oeqa/selftest/cases/devtool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index cc28731402e7..a87772076946 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -928,7 +928,7 @@ class DevtoolModifyTests(DevtoolBase): #some crate:// in SRC_URI #others git:// in SRC_URI #cointains a patch -testrecipe = 'zvariant' +testrecipe = 'hello-rs' bb_vars = get_bb_vars(['SRC_URI', 'FILE', 'WORKDIR', 'CARGO_HOME'], testrecipe) recipefile = bb_vars['FILE'] workdir = bb_vars['WORKDIR'] -- 2.39.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192986): https://lists.openembedded.org/g/openembedded-core/message/192986 Mute This Topic: https://lists.openembedded.org/mt/103401572/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 v3 03/10] meta-selftest: hello-rs: Simple rust test recipe
Signed-off-by: Alex Kiernan --- (no changes since v1) .../hello-rs/hello-rs-crates.inc | 8 +++ .../hello-rs/0001-Greet-OE-Core.patch | 24 +++ .../hello-rs/hello-rs_0.1.0.bb| 19 +++ 3 files changed, 51 insertions(+) create mode 100644 meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc create mode 100644 meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch create mode 100644 meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb diff --git a/meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc b/meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc new file mode 100644 index ..9646482b2875 --- /dev/null +++ b/meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc @@ -0,0 +1,8 @@ +# Autogenerated with 'bitbake -c update_crates hello-rs' + +# from Cargo.lock +SRC_URI += " \ +crate://crates.io/figlet-rs/0.1.5 \ +" + +SRC_URI[figlet-rs-0.1.5.sha256sum] = "4742a071cd9694fc86f9fa1a08fa3e53d40cc899d7ee532295da2d085639fbc5" diff --git a/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch b/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch new file mode 100644 index ..7569ccef7bbb --- /dev/null +++ b/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch @@ -0,0 +1,24 @@ +From 3aea1ece0ca6ac0bf0ffe42736827af22966f767 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Wed, 27 Dec 2023 09:55:48 + +Subject: [PATCH] Greet "OE-Core" + +Signed-off-by: Alex Kiernan +Upstream-Status: Inappropriate +--- + src/main.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main.rs b/src/main.rs +index f4a310758b19..224eca65c38d 100644 +--- a/src/main.rs b/src/main.rs +@@ -3,7 +3,7 @@ use hello_lib::greet; + + fn main() { + let standard_font = FIGfont::standard().unwrap(); +-let greeting = greet(None); ++let greeting = greet(Some("OE-Core")); + let figure = standard_font.convert(&greeting); + println!("{}", figure.unwrap()); + } diff --git a/meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb b/meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb new file mode 100644 index ..0046b2ca0356 --- /dev/null +++ b/meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Simple hello world example" +HOMEPAGE = "https://github.com/akiernan/hello-bin"; +LICENSE = "Unlicense" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7246f848faa4e9c9fc0ea91122d6e680" + +SRC_URI = "git://github.com/akiernan/hello-bin.git;protocol=https;branch=main;subpath=rust \ + file://0001-Greet-OE-Core.patch \ + git://github.com/akiernan/hello-lib.git;protocol=https;branch=main;name=hello-lib;destsuffix=hello-lib;type=git-dependency \ + " +SRCREV = "d3d096eda182644868f8e7458dcfa538ff637db3" + +SRCREV_FORMAT .= "_hello-lib" +SRCREV_hello-lib = "59c84574e844617043cf337bc8fa537cf87ad8ae" + +S = "${WORKDIR}/rust" + +inherit cargo cargo-update-recipe-crates ptest-cargo + +require ${BPN}-crates.inc -- 2.39.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192985): https://lists.openembedded.org/g/openembedded-core/message/192985 Mute This Topic: https://lists.openembedded.org/mt/103401571/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 0/6] Stepwise rust upgrade 1.71.1 -> 1.74.1
On Wed, Dec 27, 2023 at 6:46 PM Alex Kiernan via lists.openembedded.org wrote: > > On Tue, Dec 26, 2023 at 8:59 AM Alex Kiernan via > lists.openembedded.org > wrote: > > > > On Mon, Dec 25, 2023 at 10:02 PM Richard Purdie > > wrote: > > > > > > On Mon, 2023-12-25 at 08:40 +, Richard Purdie via > > > lists.openembedded.org wrote: > > > > On Sun, 2023-12-24 at 23:09 +, Alex Kiernan wrote: > > > > > This is the 1.74.1 rust series rebased to include a revert of > > > > > https://github.com/rust-lang/cc-rs/commit/c4f414f449bb7cffba3bc923f277704d1d08a8ec > > > > > which I'm pretty sure is what's causing our filename churn. I've > > > > > checked > > > > > 1.72.0 and 1.74.1 for the absvdi2.o intrinsic (one of many intrinsics > > > > > which had the issue) and in both cases we're not generating the > > > > > dirname > > > > > based prefix - hopefully that means that the interim commits are fine > > > > > too, if not we can do the step back through the commits to find the > > > > > next > > > > > issue. > > > > > > > > > > I've dropped the zvariant tests as upgrading it isn't useful (since it > > > > > no longer includes git crate dependency) and spurious oe-selftest > > > > > failures aren't helpful. I guess we need to include either something > > > > > synthetic which tests git crates, or pull in > > > > > https://github.com/jthornber/thin-provisioning-tools/ from > > > > > meta-openembedded which includes a live example (though who knows for > > > > > how long!) > > > > > > > > > > Assuming this does actually fix the reproducibility issue, I'll look > > > > > at > > > > > how we fix the issue properly, rather than just reverting the commit > > > > > which I think is our problem, but I'd like to try and get us back on > > > > > the > > > > > rust release train if we can! > > > > > > > > > > > > > > > Alex Kiernan (6): > > > > > meta-selftest: Drop zvariant recipe > > > > > rust: Upgrade 1.71.1 -> 1.72.0 > > > > > rust: Upgrade 1.72.0 -> 1.72.1 > > > > > rust: Upgrade 1.72.1 -> 1.73.0 > > > > > rust: Upgrade 1.73.0 -> 1.74.0 > > > > > rust: Upgrade 1.74.0 -> 1.74.1 > > > > > > > > Sounds like a good plan, I've started a reproducibility test: > > > > > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4142 > > > > > > > > With zvariant, we might be better replacing with a synthetic example > > > > for testing purposes? > > > > > > That build went green so I ran an a-full to double check and check > > > everything else: > > > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/6374 > > > > > > Curl ptest warning was the only issue (unrelated) so it also looks > > > good. > > > > > > Looks like you might have tracked down the issue, nice work! :) > > > > > > Should I merge this as is or is there something we should do first now > > > we know where the issue is? > > > > > > > Obviously we need the upstream pieces sorting, but I don't think > > that's a blocker to merging here. Just ripping out zvariant and all > > the associated infrastructure I guess wants fixing first, though I > > think don't we need anything more complicated than: > > > > https://github.com/akiernan/hello-rs > > > > I'll try and have a look at that later. > > > > The pieces I have are: > > https://github.com/akiernan/hello-bin > https://github.com/akiernan/hello-lib > > Which build/work fine, but the swapping it in for the zvariant tests > fails with things totally unrelated to upgrading rust, which suggest > we have more stuff to fix, so after two days looking at it, on and > off, I think just skipping the relevant test is the right thing for > now. > Unsurprisingly this was a complete idiot mistake I'd made... step away from it and look at it fresh and its obvious why it didn't work! Will send a v3 w/ a replacement for zvariant. -- Alex Kiernan -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192983): https://lists.openembedded.org/g/openembedded-core/message/192983 Mute This Topic: https://lists.openembedded.org/mt/103354255/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 v3 02/10] devtool: selftest: Fix test_devtool_modify_git_crates_subpath bbappend check
The recipe being tested is in `testrecipe`, use that rather than the literal `zvariant`. Signed-off-by: Alex Kiernan --- (no changes since v1) meta/lib/oeqa/selftest/cases/devtool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index d733dd158106..cc28731402e7 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -958,7 +958,7 @@ class DevtoolModifyTests(DevtoolBase): result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir)) self.assertExists(os.path.join(tempdir, 'Cargo.toml'), 'Extracted source could not be found') self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created. devtool output: %s' % result.output) -matches = glob.glob(os.path.join(self.workspacedir, 'appends', 'zvariant_*.bbappend')) +matches = glob.glob(os.path.join(self.workspacedir, 'appends', '%s_*.bbappend' % testrecipe)) self.assertTrue(matches, 'bbappend not created') # Test devtool status result = runCmd('devtool status') -- 2.39.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192984): https://lists.openembedded.org/g/openembedded-core/message/192984 Mute This Topic: https://lists.openembedded.org/mt/103401570/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 v3 01/10] devtool: selftest: Fix test_devtool_modify_git_crates_subpath inequality
test_devtool_modify_git_crates_subpath expects 2 or more git URIs, change the test from Greater to GreateEqual. Signed-off-by: Alex Kiernan --- (no changes since v1) meta/lib/oeqa/selftest/cases/devtool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 47353dadff93..d733dd158106 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -940,7 +940,7 @@ class DevtoolModifyTests(DevtoolBase): 'This test expects the %s recipe to have a git uri with subpath' % testrecipe) self.assertTrue(any([uri.startswith('crate://') for uri in src_uri]), 'This test expects the %s recipe to have some crates in its src uris' % testrecipe) -self.assertGreater(sum(map(lambda x:x.startswith('git://'), src_uri)), 2, +self.assertGreaterEqual(sum(map(lambda x:x.startswith('git://'), src_uri)), 2, 'This test expects the %s recipe to have several git:// uris' % testrecipe) self.assertTrue(any([uri.startswith('file://') and '.patch' in uri for uri in src_uri]), 'This test expects the %s recipe to have a patch in its src uris' % testrecipe) -- 2.39.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192982): https://lists.openembedded.org/g/openembedded-core/message/192982 Mute This Topic: https://lists.openembedded.org/mt/103401569/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 v3 00/10] Stepwise rust upgrade 1.71.1 -> 1.74.1
This is the 1.74.1 rust series rebased to include a revert of https://github.com/rust-lang/cc-rs/commit/c4f414f449bb7cffba3bc923f277704d1d08a8ec which I'm pretty sure is what's causing our filename churn. I've checked 1.72.0 and 1.74.1 for the absvdi2.o intrinsic (one of many intrinsics which had the issue) and in both cases we're not generating the dirname based prefix - hopefully that means that the interim commits are fine too, if not we can do the step back through the commits to find the next issue. Changes in v3: - Add hello-rs as a replacement for the tests which used zvariant Changes in v2: - Skip zvariant based test rather than deleting it. Alex Kiernan (10): devtool: selftest: Fix test_devtool_modify_git_crates_subpath inequality devtool: selftest: Fix test_devtool_modify_git_crates_subpath bbappend check meta-selftest: hello-rs: Simple rust test recipe devtool: selftest: Swap to hello-rs for crates testing zvariant: Drop recipe rust: Upgrade 1.71.1 -> 1.72.0 rust: Upgrade 1.72.0 -> 1.72.1 rust: Upgrade 1.72.1 -> 1.73.0 rust: Upgrade 1.73.0 -> 1.74.0 rust: Upgrade 1.74.0 -> 1.74.1 .../hello-rs/hello-rs-crates.inc |8 + .../hello-rs/0001-Greet-OE-Core.patch | 24 + .../hello-rs/hello-rs_0.1.0.bb| 19 + .../zvariant/zvariant-crates.inc | 258 .../zvariant/zvariant-git-crates.inc | 14 - .../0001-Tweak-zvariant-crate-config.patch| 1292 - .../zvariant/zvariant_3.12.0.bb | 37 - meta/conf/distro/include/tcmode-default.inc |2 +- meta/lib/oeqa/selftest/cases/devtool.py |6 +- .../rust/{cargo_1.71.1.bb => cargo_1.74.1.bb} |0 ...-Do-not-use-LFS64-on-linux-with-musl.patch | 164 --- ...0001-Don-t-use-LFS64-symbols-on-musl.patch | 163 +++ ...e-absolute-paths-to-OUT_DIR-as-relat.patch | 67 + ...Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch | 122 ++ ...efine-SOCK_SEQPACKET-in-common-place.patch | 114 -- ...ine-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch | 41 + ...GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch | 205 +++ ...-musl-Define-O_LARGEFILE-for-riscv32.patch | 32 + ...efine-SOCK_SEQPACKET-in-common-place.patch | 115 ++ .../rust/files/getrandom-open64.patch | 50 - .../rust/files/hardcodepaths.patch| 14 +- .../rust/files/zlib-off64_t.patch | 17 +- ...ibstd-rs_1.71.1.bb => libstd-rs_1.74.1.bb} |0 71.1.bb => rust-cross-canadian_1.74.1.bb} |0 ...ust-llvm_1.71.1.bb => rust-llvm_1.74.1.bb} |0 meta/recipes-devtools/rust/rust-snapshot.inc | 64 +- meta/recipes-devtools/rust/rust-source.inc| 12 +- .../rust/{rust_1.71.1.bb => rust_1.74.1.bb} |1 + 28 files changed, 856 insertions(+), 1985 deletions(-) create mode 100644 meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc create mode 100644 meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch create mode 100644 meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant-crates.inc delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant-git-crates.inc delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant/0001-Tweak-zvariant-crate-config.patch delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant_3.12.0.bb rename meta/recipes-devtools/rust/{cargo_1.71.1.bb => cargo_1.74.1.bb} (100%) delete mode 100644 meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch create mode 100644 meta/recipes-devtools/rust/files/0001-Don-t-use-LFS64-symbols-on-musl.patch create mode 100644 meta/recipes-devtools/rust/files/0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch create mode 100644 meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch delete mode 100644 meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch create mode 100644 meta/recipes-devtools/rust/files/0002-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch create mode 100644 meta/recipes-devtools/rust/files/0003-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch create mode 100644 meta/recipes-devtools/rust/files/0004-musl-Define-O_LARGEFILE-for-riscv32.patch create mode 100644 meta/recipes-devtools/rust/files/0005-musl-Define-SOCK_SEQPACKET-in-common-place.patch delete mode 100644 meta/recipes-devtools/rust/files/getrandom-open64.patch rename meta/recipes-devtools/rust/{libstd-rs_1.71.1.bb => libstd-rs_1.74.1.bb} (100%) rename meta/recipes-devtools/rust/{rust-cross-canadian_1.71.1.bb => rust-cross-canadian_1.74.1.bb} (100%) rename meta/recipes-devtools/rust/{rust-llvm_1.71.1.bb => rust-llvm_1.74.1.bb} (100%) rename meta/recipes-devtools/rust/{rust_1.71.1.bb => rust_1.74.1.bb} (99%) -- 2.39.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#19
Re: [OE-core] [patch] packagegroups: Add perl modules to rdeps
Hi Randy, I have sent a new patch for this. the link to new patch is given below, https://lists.openembedded.org/g/openembedded-core/message/192979 Thanks & Regards Harish Sadineni -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192980): https://lists.openembedded.org/g/openembedded-core/message/192980 Mute This Topic: https://lists.openembedded.org/mt/103383878/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] autoconf: Add missing perl modules to RDEPENDS
From: Deepthi Hemraj In SDK,running "x86_64-poky-linux-gp-display-html --help" fails due to missing perl modules which are required for it to work. Fixes:Can't locate feature.pm in @INC (you may need to install the feature module). Signed-off-by: Deepthi Hemraj --- meta/recipes-devtools/autoconf/autoconf_2.72d.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/autoconf/autoconf_2.72d.bb b/meta/recipes-devtools/autoconf/autoconf_2.72d.bb index 939fc3abd5..d76db28796 100644 --- a/meta/recipes-devtools/autoconf/autoconf_2.72d.bb +++ b/meta/recipes-devtools/autoconf/autoconf_2.72d.bb @@ -51,6 +51,7 @@ RDEPENDS:${PN} = "m4 gnu-config \ perl-module-symbol \ perl-module-thread-queue \ perl-module-threads \ + perl-module-feature \ " RDEPENDS:${PN}:class-native = "m4-native gnu-config-native hostperl-runtime-native" -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192979): https://lists.openembedded.org/g/openembedded-core/message/192979 Mute This Topic: https://lists.openembedded.org/mt/103400787/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] aspell: upgrade 0.60.8 -> 0.60.8.1
This can probably be fixed properly by using % in bbappend filename? Alex On Wed, 27 Dec 2023 at 22:01, Alexandre Belloni via lists.openembedded.org wrote: > > > Hello, > > This breaks the selftests: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/145/builds/1080/steps/12/logs/stdio > ERROR: No recipes in default available for: > > /home/pokybuild/yocto-worker/qemux86-tc/build/build-st-3959354/meta-selftest/recipes-test/aspell/aspell_0.60.8.bbappend > > On 27/12/2023 21:05:37+0800, wangmy wrote: > > From: Wang Mingyu > > > > CVE-2019-25051.patch > > removed since it's included in 0.60.8.1 > > > > Changelog: > > > > -Fix memory leak in suggestion code introduced in 0.60.8. > > -Various documentation fixes. > > -Fix various warnings when compiling with -Wall. > > -Fix two buffer overflows found by Google's OSS-Fuzz. > > -Other minor updates. > > > > Signed-off-by: Wang Mingyu > > --- > > .../{aspell_0.60.8.bb => aspell_0.60.8.1.bb} | 7 +- > > .../aspell/files/CVE-2019-25051.patch | 101 -- > > 2 files changed, 2 insertions(+), 106 deletions(-) > > rename meta/recipes-support/aspell/{aspell_0.60.8.bb => > > aspell_0.60.8.1.bb} (83%) > > delete mode 100644 meta/recipes-support/aspell/files/CVE-2019-25051.patch > > > > diff --git a/meta/recipes-support/aspell/aspell_0.60.8.bb > > b/meta/recipes-support/aspell/aspell_0.60.8.1.bb > > similarity index 83% > > rename from meta/recipes-support/aspell/aspell_0.60.8.bb > > rename to meta/recipes-support/aspell/aspell_0.60.8.1.bb > > index 39b55f4ff2..0ea9b063e0 100644 > > --- a/meta/recipes-support/aspell/aspell_0.60.8.bb > > +++ b/meta/recipes-support/aspell/aspell_0.60.8.1.bb > > @@ -13,11 +13,8 @@ HOMEPAGE = "http://aspell.net/"; > > LICENSE = "LGPL-2.0-only | LGPL-2.1-only" > > LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" > > > > -SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz \ > > - file://CVE-2019-25051.patch \ > > -" > > -SRC_URI[md5sum] = "012fa9209203ae4e5a61c2a668fd10e3" > > -SRC_URI[sha256sum] = > > "f9b77e515334a751b2e60daab5db23499e26c9209f5e7b7443b05235ad0226f2" > > +SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz" > > +SRC_URI[sha256sum] = > > "d6da12b34d42d457fa604e435ad484a74b2effcd120ff40acd6bb3fb2887d21b" > > > > PACKAGECONFIG ??= "" > > PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses" > > diff --git a/meta/recipes-support/aspell/files/CVE-2019-25051.patch > > b/meta/recipes-support/aspell/files/CVE-2019-25051.patch > > deleted file mode 100644 > > index 8513f6de79..00 > > --- a/meta/recipes-support/aspell/files/CVE-2019-25051.patch > > +++ /dev/null > > @@ -1,101 +0,0 @@ > > -From 0718b375425aad8e54e1150313b862e4c6fd324a Mon Sep 17 00:00:00 2001 > > -From: Kevin Atkinson > > -Date: Sat, 21 Dec 2019 20:32:47 + > > -Subject: [PATCH] objstack: assert that the alloc size will fit within a > > chunk > > - to prevent a buffer overflow > > - > > -Bug found using OSS-Fuze. > > - > > -Upstream-Status: Backport > > -[https://github.com/gnuaspell/aspell/commit/0718b375425aad8e54e1150313b862e4c6fd324a] > > -CVE: CVE-2019-25051 > > -Signed-off-by: Chee Yang Lee > > > > - common/objstack.hpp | 18 ++ > > - 1 file changed, 14 insertions(+), 4 deletions(-) > > - > > -diff --git a/common/objstack.hpp b/common/objstack.hpp > > -index 3997bf7..bd97ccd 100644 > > a/common/objstack.hpp > > -+++ b/common/objstack.hpp > > -@@ -5,6 +5,7 @@ > > - #include "parm_string.hpp" > > - #include > > - #include > > -+#include > > - > > - namespace acommon { > > - > > -@@ -26,6 +27,12 @@ class ObjStack > > - byte * temp_end; > > - void setup_chunk(); > > - void new_chunk(); > > -+ bool will_overflow(size_t sz) const { > > -+return offsetof(Node,data) + sz > chunk_size; > > -+ } > > -+ void check_size(size_t sz) { > > -+assert(!will_overflow(sz)); > > -+ } > > - > > - ObjStack(const ObjStack &); > > - void operator=(const ObjStack &); > > -@@ -56,7 +63,7 @@ class ObjStack > > - void * alloc_bottom(size_t size) { > > - byte * tmp = bottom; > > - bottom += size; > > --if (bottom > top) {new_chunk(); tmp = bottom; bottom += size;} > > -+if (bottom > top) {check_size(size); new_chunk(); tmp = bottom; > > bottom += size;} > > - return tmp; > > - } > > - // This alloc_bottom will insure that the object is aligned based on the > > -@@ -66,7 +73,7 @@ class ObjStack > > - align_bottom(align); > > - byte * tmp = bottom; > > - bottom += size; > > --if (bottom > top) {new_chunk(); goto loop;} > > -+if (bottom > top) {check_size(size); new_chunk(); goto loop;} > > - return tmp; > > - } > > - char * dup_bottom(ParmString str) { > > -@@ -79,7 +86,7 @@ class ObjStack > > - // always be aligned as such. > > - void * alloc_top(size_t size) { > > - top -= size; > > --if (top < bottom) {new_chunk(); top -= size;} > > -+if (top < bot
[OE-core] [PATCH] scripts: Drop shell sstate-cache-management
Since there is a faster python version, drop the slower shell one. Signed-off-by: Richard Purdie --- scripts/sstate-cache-management.sh | 458 - 1 file changed, 458 deletions(-) delete mode 100755 scripts/sstate-cache-management.sh diff --git a/scripts/sstate-cache-management.sh b/scripts/sstate-cache-management.sh deleted file mode 100755 index d39671f7c6b..000 --- a/scripts/sstate-cache-management.sh +++ /dev/null @@ -1,458 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2012 Wind River Systems, Inc. -# -# SPDX-License-Identifier: GPL-2.0-only -# - -# Global vars -cache_dir= -confirm= -fsym= -total_deleted=0 -verbose= -debug=0 - -usage () { - cat << EOF -Welcome to sstate cache management utilities. -sstate-cache-management.sh - -Options: - -h, --help -Display this help and exit. - - --cache-dir= -Specify sstate cache directory, will use the environment -variable SSTATE_CACHE_DIR if it is not specified. - - --extra-archs=,... -Specify list of architectures which should be tested, this list -will be extended with native arch, allarch and empty arch. The -script won't be trying to generate list of available archs from -AVAILTUNES in tune files. - - --extra-layer=,... -Specify the layer which will be used for searching the archs, -it will search the meta and meta-* layers in the top dir by -default, and will search meta, meta-*, , , -... when specified. Use "," as the separator. - -This is useless for --stamps-dir or when --extra-archs is used. - - -d, --remove-duplicated -Remove the duplicated sstate cache files of one package, only -the newest one will be kept. The duplicated sstate cache files -of one package must have the same arch, which means sstate cache -files with multiple archs are not considered duplicate. - -Conflicts with --stamps-dir. - - --stamps-dir=,... -Specify the build directory's stamps directories, the sstate -cache file which IS USED by these build diretories will be KEPT, -other sstate cache files in cache-dir will be removed. Use "," -as the separator. For example: ---stamps-dir=build1/tmp/stamps,build2/tmp/stamps - -Conflicts with --remove-duplicated. - - -L, --follow-symlink -Remove both the symbol link and the destination file, default: no. - - -y, --yes -Automatic yes to prompts; assume "yes" as answer to all prompts -and run non-interactively. - - -v, --verbose -Explain what is being done. - - -D, --debug -Show debug info, repeat for more debug info. - -EOF -} - -if [ $# -lt 1 ]; then - usage - exit 0 -fi - -# Echo no files to remove -no_files () { -echo No files to remove -} - -# Echo nothing to do -do_nothing () { - echo Nothing to do -} - -# Read the input "y" -read_confirm () { - echo "$total_deleted out of $total_files files will be removed! " - if [ "$confirm" != "y" ]; then - echo "Do you want to continue (y/n)? " - while read confirm; do - [ "$confirm" = "Y" -o "$confirm" = "y" -o "$confirm" = "n" \ --o "$confirm" = "N" ] && break - echo "Invalid input \"$confirm\", please input 'y' or 'n': " - done - else - echo - fi -} - -# Print error information and exit. -echo_error () { - echo "ERROR: $1" >&2 - exit 1 -} - -# Generate the remove list: -# -# * Add .done/.siginfo to the remove list -# * Add destination of symlink to the remove list -# -# $1: output file, others: sstate cache file (.tar.zst) -gen_rmlist (){ - local rmlist_file="$1" - shift - local files="$@" - for i in $files; do - echo $i >> $rmlist_file - # Add the ".siginfo" - if [ -e $i.siginfo ]; then - echo $i.siginfo >> $rmlist_file - fi - # Add the destination of symlink - if [ -L "$i" ]; then - if [ "$fsym" = "y" ]; then - dest="`readlink -e $i`" - if [ -n "$dest" ]; then - echo $dest >> $rmlist_file - # Remove the .siginfo when .tar.zst is removed - if [ -f "$dest.siginfo" ]; then - echo $dest.siginfo >> $rmlist_file - fi - fi - fi - # Add the ".tar.zst.done" and ".siginfo.done" (may exist in the future) - base_fn="${i##/*/}" - t_fn="$base_fn.done" - s_fn="$base_fn.siginfo.done" - for d in $t_fn $s_fn; do - if [ -f $cache_dir/$d ]; then - echo $cache_dir/$d >> $rmlist_file - fi - done - fi - done -} - -# Remove the duplicated cache files for the pkg, keep the newest one -remove_duplicated () { - - local topdir - local oe_core_dir - local tunedirs - local all_archs - local all_machines - local ava_archs - local arch - local file_names - local sstate_files_list - local fn_tmp - loca
Re: [OE-core] [PATCH V3] rust-cross-canadian: Fix file conflicts for arm and aarch64
Hi Ross, >> if the environment scripts are both overwriting the same environment >> variables? The environment script variables are generated based on the architectures. Please find the environment variables generated in the script file: RUST_TARGET_PATH="$OECORE_NATIVE_SYSROOT/usr/lib/aarch64-poky-linux/rustlib" RUST_TARGET_PATH="$OECORE_NATIVE_SYSROOT/usr/lib/arm-pokymllib32-linux-gnueabi/rustlib" Please let me know if this was your query or did I misinterrupted it? -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192976): https://lists.openembedded.org/g/openembedded-core/message/192976 Mute This Topic: https://lists.openembedded.org/mt/103206453/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-