* [PATCH 1/8] llvm: update 12.0.0 -> 12.0.1
@ 2021-07-22 22:45 Alexander Kanavin
2021-07-22 22:45 ` [PATCH 2/8] systemd: update 248.3 -> 249.1 Alexander Kanavin
` (6 more replies)
0 siblings, 7 replies; 11+ messages in thread
From: Alexander Kanavin @ 2021-07-22 22:45 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Other than the tcmode tweak, this was done by devtool \0/
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
meta/recipes-devtools/llvm/llvm_git.bb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 68e5d848ba..1d4aa1e11f 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -26,7 +26,7 @@ QEMUVERSION ?= "6.0%"
GOVERSION ?= "1.16%"
# This can not use wildcards like 8.0.% since it is also used in mesa to denote
# llvm version being used, so always bump it with llvm recipe version bump
-LLVMVERSION ?= "12.0.0"
+LLVMVERSION ?= "12.0.1"
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index de79adc410..4554b752eb 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -19,7 +19,7 @@ inherit cmake pkgconfig
PROVIDES += "llvm${PV}"
-PV = "12.0.0"
+PV = "12.0.1"
MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}"
@@ -27,7 +27,7 @@ LLVM_RELEASE = "${PV}"
LLVM_DIR = "llvm${LLVM_RELEASE}"
BRANCH = "release/${MAJOR_VERSION}.x"
-SRCREV = "fa0971b87fb2c9d14d1bba2551e61f02f18f329b"
+SRCREV = "fed41342a82f5a3a9201819a82bf7a48313e296b"
SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \
file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \
file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \
--
2.31.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/8] systemd: update 248.3 -> 249.1 2021-07-22 22:45 [PATCH 1/8] llvm: update 12.0.0 -> 12.0.1 Alexander Kanavin @ 2021-07-22 22:45 ` Alexander Kanavin 2021-07-29 13:37 ` [OE-core] " Martin Jansa 2021-07-22 22:45 ` [PATCH 3/8] cmake: update 3.20.5 -> 3.21.0 Alexander Kanavin ` (5 subsequent siblings) 6 siblings, 1 reply; 11+ messages in thread From: Alexander Kanavin @ 2021-07-22 22:45 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin jinja is now required: https://github.com/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704 Drop 0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch as it is a backport. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- ...md-boot_248.3.bb => systemd-boot_249.1.bb} | 2 +- meta/recipes-core/systemd/systemd.inc | 4 +- ...tall-dependency-links-at-install-tim.patch | 38 +++++++++--------- ...comp-Check-for-__NR_ppoll-before-use.patch | 39 ------------------- .../{systemd_248.3.bb => systemd_249.1.bb} | 7 ++-- 5 files changed, 25 insertions(+), 65 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_248.3.bb => systemd-boot_249.1.bb} (98%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch rename meta/recipes-core/systemd/{systemd_248.3.bb => systemd_249.1.bb} (99%) diff --git a/meta/recipes-core/systemd/systemd-boot_248.3.bb b/meta/recipes-core/systemd/systemd-boot_249.1.bb similarity index 98% rename from meta/recipes-core/systemd/systemd-boot_248.3.bb rename to meta/recipes-core/systemd/systemd-boot_249.1.bb index 249e620f4e..2c0bec4eda 100644 --- a/meta/recipes-core/systemd/systemd-boot_248.3.bb +++ b/meta/recipes-core/systemd/systemd-boot_249.1.bb @@ -3,7 +3,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" require conf/image-uefi.conf -DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" +DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native python3-jinja2-native" inherit meson pkgconfig gettext inherit deploy diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 0524a25008..0e92a72bb7 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76" -SRCBRANCH = "v248-stable" +SRCREV = "764b74113e36ac5219a4b82a05f311b5a92136ce" +SRCBRANCH = "v249-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \ " diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index 8dd22eeb7b..d3af734e06 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -1,4 +1,4 @@ -From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001 +From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Thu, 21 Feb 2019 16:23:24 +0800 Subject: [PATCH] binfmt: Don't install dependency links at install time for @@ -25,11 +25,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -Index: systemd-stable/units/meson.build -=================================================================== ---- systemd-stable.orig/units/meson.build -+++ systemd-stable/units/meson.build -@@ -55,8 +55,7 @@ units = [ +diff --git a/units/meson.build b/units/meson.build +index 17e9ead9c1..e5502be620 100644 +--- a/units/meson.build ++++ b/units/meson.build +@@ -59,8 +59,7 @@ units = [ ['poweroff.target', '', (with_runlevels ? 'runlevel0.target' : '')], ['printer.target', ''], @@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], ['reboot.target', '', 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')], -@@ -166,8 +165,7 @@ in_units = [ - ['rc-local.service', 'HAVE_SYSV_COMPAT'], +@@ -178,8 +177,7 @@ in_units = [ ['rescue.service', ''], + ['serial-getty@.service', ''], ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], - ['systemd-binfmt.service', 'ENABLE_BINFMT', - 'sysinit.target.wants/'], @@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['systemd-coredump@.service', 'ENABLE_COREDUMP'], -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount -=================================================================== ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount -@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ +diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount +index 172c8757ab..f65d8930c6 100644 +--- a/units/proc-sys-fs-binfmt_misc.automount ++++ b/units/proc-sys-fs-binfmt_misc.automount +@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] Where=/proc/sys/fs/binfmt_misc + +[Install] +WantedBy=sysinit.target -Index: systemd-stable/units/systemd-binfmt.service.in -=================================================================== ---- systemd-stable.orig/units/systemd-binfmt.service.in -+++ systemd-stable/units/systemd-binfmt.service.in +diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in +index fdafce7ff7..4efc05e495 100644 +--- a/units/systemd-binfmt.service.in ++++ b/units/systemd-binfmt.service.in @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no @@ -73,8 +73,8 @@ Index: systemd-stable/units/systemd-binfmt.service.in After=proc-sys-fs-binfmt_misc.mount Before=sysinit.target shutdown.target @@ -30,3 +31,6 @@ RemainAfterExit=yes - ExecStart=@rootlibexecdir@/systemd-binfmt - ExecStop=@rootlibexecdir@/systemd-binfmt --unregister + ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt + ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister TimeoutSec=90s + +[Install] diff --git a/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch b/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch deleted file mode 100644 index 0ba5fa2547..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 027ac2ad0695bb506460f9dd7e57149b71055887 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 8 Jun 2021 23:21:01 -0700 -Subject: [PATCH] test-seccomp: Check for __NR_ppoll before use - -some newer architectures like riscv32 do not have __NR_ppoll from get go - -Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/19858] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/test/test-seccomp.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c -index b1f917eb54..daac0fcea8 100644 ---- a/src/test/test-seccomp.c -+++ b/src/test/test-seccomp.c -@@ -832,7 +832,7 @@ static void test_load_syscall_filter_set_raw(void) { - assert_se(s = hashmap_new(NULL)); - #if defined __NR_poll && __NR_poll >= 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(-1)) >= 0); --#else -+#elif defined __NR_ppoll - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); - #endif - -@@ -849,7 +849,8 @@ static void test_load_syscall_filter_set_raw(void) { - assert_se(s = hashmap_new(NULL)); - #if defined __NR_poll && __NR_poll >= 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(EILSEQ)) >= 0); --#else -+#elif defined __NR_ppoll -+ assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(EILSEQ)) >= 0); - #endif - --- -2.32.0 - diff --git a/meta/recipes-core/systemd/systemd_248.3.bb b/meta/recipes-core/systemd/systemd_249.1.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_248.3.bb rename to meta/recipes-core/systemd/systemd_249.1.bb index f5022a99c2..9bfb12249c 100644 --- a/meta/recipes-core/systemd/systemd_248.3.bb +++ b/meta/recipes-core/systemd/systemd_249.1.bb @@ -4,7 +4,7 @@ PROVIDES = "udev" PE = "1" -DEPENDS = "intltool-native gperf-native libcap util-linux" +DEPENDS = "intltool-native gperf-native libcap util-linux python3-jinja2-native" SECTION = "base/shell" @@ -14,8 +14,7 @@ inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu # that we don't build both udev and systemd in world builds. REQUIRED_DISTRO_FEATURES = "systemd" -SRC_URI += " \ - file://touchscreen.rules \ +SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '', d)} \ @@ -26,7 +25,6 @@ SRC_URI += " \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ file://0001-test-parse-argument-Include-signal.h.patch \ - file://0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch \ " # patches needed by musl @@ -687,6 +685,7 @@ FILES_udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \ ${rootlibexecdir}/udev/rules.d/80-drivers.rules \ ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \ + ${rootlibexecdir}/udev/rules.d/81-net-dhcp.rules \ ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \ ${rootlibexecdir}/udev/rules.d/README \ ${sysconfdir}/udev \ -- 2.31.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [OE-core] [PATCH 2/8] systemd: update 248.3 -> 249.1 2021-07-22 22:45 ` [PATCH 2/8] systemd: update 248.3 -> 249.1 Alexander Kanavin @ 2021-07-29 13:37 ` Martin Jansa 0 siblings, 0 replies; 11+ messages in thread From: Martin Jansa @ 2021-07-29 13:37 UTC (permalink / raw) To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 12863 bytes --] FYI: This introduces new build failure with ld-is-gold in DISTRO_FEATURES: | [17/21] Generating linuxx64.elf.stub with a custom command | FAILED: src/boot/efi/linuxx64.elf.stub | /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-ld -o src/boot/efi/linuxx64.elf.stub -T /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot/usr/lib/elf_x86_64_efi.lds -shared -Bsymbolic -nostdlib -znocombreloc --build-id=sha1 -L /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot/usr/lib /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot/usr/lib/crt0-efi-x86_64.o src/boot/efi/string-util-fundamental.c.o src/boot/efi/disk.c.o src/boot/efi/graphics.c.o src/boot/efi/measure.c.o src/boot/efi/pe.c.o src/boot/efi/secure-boot.c.o src/boot/efi/util.c.o src/boot/efi/linux.c.o src/boot/efi/splash.c.o src/boot/efi/stub.c.o -lefi -lgnuefi /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot/usr/lib/../lib/x86_64-oe-linux/11.1.1/libgcc.a | /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-ld: internal error in segment_precedes, at ../../gold/layout.cc:3721 | [18/21] Generating boot.c.o with a custom command On Fri, Jul 23, 2021 at 12:45 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > jinja is now required: > > https://github.com/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704 > > Drop 0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch as it is a > backport. > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > --- > ...md-boot_248.3.bb => systemd-boot_249.1.bb} | 2 +- > meta/recipes-core/systemd/systemd.inc | 4 +- > ...tall-dependency-links-at-install-tim.patch | 38 +++++++++--------- > ...comp-Check-for-__NR_ppoll-before-use.patch | 39 ------------------- > .../{systemd_248.3.bb => systemd_249.1.bb} | 7 ++-- > 5 files changed, 25 insertions(+), 65 deletions(-) > rename meta/recipes-core/systemd/{systemd-boot_248.3.bb => > systemd-boot_249.1.bb} (98%) > delete mode 100644 > meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch > rename meta/recipes-core/systemd/{systemd_248.3.bb => systemd_249.1.bb} > (99%) > > diff --git a/meta/recipes-core/systemd/systemd-boot_248.3.bb > b/meta/recipes-core/systemd/systemd-boot_249.1.bb > similarity index 98% > rename from meta/recipes-core/systemd/systemd-boot_248.3.bb > rename to meta/recipes-core/systemd/systemd-boot_249.1.bb > index 249e620f4e..2c0bec4eda 100644 > --- a/meta/recipes-core/systemd/systemd-boot_248.3.bb > +++ b/meta/recipes-core/systemd/systemd-boot_249.1.bb > @@ -3,7 +3,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" > > require conf/image-uefi.conf > > -DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" > +DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native > python3-jinja2-native" > > inherit meson pkgconfig gettext > inherit deploy > diff --git a/meta/recipes-core/systemd/systemd.inc > b/meta/recipes-core/systemd/systemd.inc > index 0524a25008..0e92a72bb7 100644 > --- a/meta/recipes-core/systemd/systemd.inc > +++ b/meta/recipes-core/systemd/systemd.inc > @@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1" > LIC_FILES_CHKSUM = > "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ > > file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" > > -SRCREV = "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76" > -SRCBRANCH = "v248-stable" > +SRCREV = "764b74113e36ac5219a4b82a05f311b5a92136ce" > +SRCBRANCH = "v249-stable" > SRC_URI = "git:// > github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} > <http://github.com/systemd/systemd-stable.git;protocol=git;branch=$%7BSRCBRANCH%7D> > \ > " > > diff --git > a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch > b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch > index 8dd22eeb7b..d3af734e06 100644 > --- > a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch > +++ > b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch > @@ -1,4 +1,4 @@ > -From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001 > +From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001 > From: Chen Qi <Qi.Chen@windriver.com> > Date: Thu, 21 Feb 2019 16:23:24 +0800 > Subject: [PATCH] binfmt: Don't install dependency links at install time > for > @@ -25,11 +25,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com > > > units/systemd-binfmt.service.in | 4 ++++ > 3 files changed, 9 insertions(+), 4 deletions(-) > > -Index: systemd-stable/units/meson.build > -=================================================================== > ---- systemd-stable.orig/units/meson.build > -+++ systemd-stable/units/meson.build > -@@ -55,8 +55,7 @@ units = [ > +diff --git a/units/meson.build b/units/meson.build > +index 17e9ead9c1..e5502be620 100644 > +--- a/units/meson.build > ++++ b/units/meson.build > +@@ -59,8 +59,7 @@ units = [ > ['poweroff.target', '', > (with_runlevels ? 'runlevel0.target' : '')], > ['printer.target', ''], > @@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build > ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], > ['reboot.target', '', > 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : > '')], > -@@ -166,8 +165,7 @@ in_units = [ > - ['rc-local.service', 'HAVE_SYSV_COMPAT'], > +@@ -178,8 +177,7 @@ in_units = [ > ['rescue.service', ''], > + ['serial-getty@.service', ''], > ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], > - ['systemd-binfmt.service', 'ENABLE_BINFMT', > - 'sysinit.target.wants/'], > @@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build > ['systemd-bless-boot.service', 'ENABLE_EFI > HAVE_BLKID'], > ['systemd-boot-check-no-failures.service', ''], > ['systemd-coredump@.service', 'ENABLE_COREDUMP'], > -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount > -=================================================================== > ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount > -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount > -@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ > +diff --git a/units/proc-sys-fs-binfmt_misc.automount > b/units/proc-sys-fs-binfmt_misc.automount > +index 172c8757ab..f65d8930c6 100644 > +--- a/units/proc-sys-fs-binfmt_misc.automount > ++++ b/units/proc-sys-fs-binfmt_misc.automount > +@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/ > > [Automount] > Where=/proc/sys/fs/binfmt_misc > + > +[Install] > +WantedBy=sysinit.target > -Index: systemd-stable/units/systemd-binfmt.service.in > -=================================================================== > ---- systemd-stable.orig/units/systemd-binfmt.service.in > -+++ systemd-stable/units/systemd-binfmt.service.in > +diff --git a/units/systemd-binfmt.service.in b/units/ > systemd-binfmt.service.in > +index fdafce7ff7..4efc05e495 100644 > +--- a/units/systemd-binfmt.service.in > ++++ b/units/systemd-binfmt.service.in > @@ -14,6 +14,7 @@ Documentation= > https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm > Documentation= > https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems > DefaultDependencies=no > @@ -73,8 +73,8 @@ Index: systemd-stable/units/systemd-binfmt.service.in > After=proc-sys-fs-binfmt_misc.mount > Before=sysinit.target shutdown.target > @@ -30,3 +31,6 @@ RemainAfterExit=yes > - ExecStart=@rootlibexecdir@/systemd-binfmt > - ExecStop=@rootlibexecdir@/systemd-binfmt --unregister > + ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt > + ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister > TimeoutSec=90s > + > +[Install] > diff --git > a/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch > b/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch > deleted file mode 100644 > index 0ba5fa2547..0000000000 > --- > a/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch > +++ /dev/null > @@ -1,39 +0,0 @@ > -From 027ac2ad0695bb506460f9dd7e57149b71055887 Mon Sep 17 00:00:00 2001 > -From: Khem Raj <raj.khem@gmail.com> > -Date: Tue, 8 Jun 2021 23:21:01 -0700 > -Subject: [PATCH] test-seccomp: Check for __NR_ppoll before use > - > -some newer architectures like riscv32 do not have __NR_ppoll from get go > - > -Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/19858 > ] > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - src/test/test-seccomp.c | 5 +++-- > - 1 file changed, 3 insertions(+), 2 deletions(-) > - > -diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c > -index b1f917eb54..daac0fcea8 100644 > ---- a/src/test/test-seccomp.c > -+++ b/src/test/test-seccomp.c > -@@ -832,7 +832,7 @@ static void test_load_syscall_filter_set_raw(void) { > - assert_se(s = hashmap_new(NULL)); > - #if defined __NR_poll && __NR_poll >= 0 > - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), > INT_TO_PTR(-1)) >= 0); > --#else > -+#elif defined __NR_ppoll > - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), > INT_TO_PTR(-1)) >= 0); > - #endif > - > -@@ -849,7 +849,8 @@ static void test_load_syscall_filter_set_raw(void) { > - assert_se(s = hashmap_new(NULL)); > - #if defined __NR_poll && __NR_poll >= 0 > - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), > INT_TO_PTR(EILSEQ)) >= 0); > --#else > -+#elif defined __NR_ppoll > -+ assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), > INT_TO_PTR(-1)) >= 0); > - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), > INT_TO_PTR(EILSEQ)) >= 0); > - #endif > - > --- > -2.32.0 > - > diff --git a/meta/recipes-core/systemd/systemd_248.3.bb > b/meta/recipes-core/systemd/systemd_249.1.bb > similarity index 99% > rename from meta/recipes-core/systemd/systemd_248.3.bb > rename to meta/recipes-core/systemd/systemd_249.1.bb > index f5022a99c2..9bfb12249c 100644 > --- a/meta/recipes-core/systemd/systemd_248.3.bb > +++ b/meta/recipes-core/systemd/systemd_249.1.bb > @@ -4,7 +4,7 @@ PROVIDES = "udev" > > PE = "1" > > -DEPENDS = "intltool-native gperf-native libcap util-linux" > +DEPENDS = "intltool-native gperf-native libcap util-linux > python3-jinja2-native" > > SECTION = "base/shell" > > @@ -14,8 +14,7 @@ inherit useradd pkgconfig meson perlnative update-rc.d > update-alternatives qemu > # that we don't build both udev and systemd in world builds. > REQUIRED_DISTRO_FEATURES = "systemd" > > -SRC_URI += " \ > - file://touchscreen.rules \ > +SRC_URI += "file://touchscreen.rules \ > file://00-create-volatile.conf \ > ${@bb.utils.contains('PACKAGECONFIG', > 'polkit_hostnamed_fallback', > 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \ > ${@bb.utils.contains('PACKAGECONFIG', > 'polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '', > d)} \ > @@ -26,7 +25,6 @@ SRC_URI += " \ > file://0003-implment-systemd-sysv-install-for-OE.patch \ > > file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ > file://0001-test-parse-argument-Include-signal.h.patch \ > - file://0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch > \ > " > > # patches needed by musl > @@ -687,6 +685,7 @@ FILES_udev += "${base_sbindir}/udevd \ > ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \ > ${rootlibexecdir}/udev/rules.d/80-drivers.rules \ > ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \ > + ${rootlibexecdir}/udev/rules.d/81-net-dhcp.rules \ > ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \ > ${rootlibexecdir}/udev/rules.d/README \ > ${sysconfdir}/udev \ > -- > 2.31.1 > > > > > [-- Attachment #2: Type: text/html, Size: 17485 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/8] cmake: update 3.20.5 -> 3.21.0 2021-07-22 22:45 [PATCH 1/8] llvm: update 12.0.0 -> 12.0.1 Alexander Kanavin 2021-07-22 22:45 ` [PATCH 2/8] systemd: update 248.3 -> 249.1 Alexander Kanavin @ 2021-07-22 22:45 ` Alexander Kanavin 2021-07-22 22:45 ` [PATCH 4/8] python3-testools: update 2.4.0 -> 2.5.0 Alexander Kanavin ` (4 subsequent siblings) 6 siblings, 0 replies; 11+ messages in thread From: Alexander Kanavin @ 2021-07-22 22:45 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- .../cmake/{cmake-native_3.20.5.bb => cmake-native_3.21.0.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 2 +- .../recipes-devtools/cmake/{cmake_3.20.5.bb => cmake_3.21.0.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/cmake/{cmake-native_3.20.5.bb => cmake-native_3.21.0.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.20.5.bb => cmake_3.21.0.bb} (100%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.20.5.bb b/meta/recipes-devtools/cmake/cmake-native_3.21.0.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.20.5.bb rename to meta/recipes-devtools/cmake/cmake-native_3.21.0.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index c557a55527..358f284279 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -21,7 +21,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0" +SRC_URI[sha256sum] = "4a42d56449a51f4d3809ab4d3b61fd4a96a469e56266e896ce1009b5768bd2ab" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake_3.20.5.bb b/meta/recipes-devtools/cmake/cmake_3.21.0.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.20.5.bb rename to meta/recipes-devtools/cmake/cmake_3.21.0.bb -- 2.31.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/8] python3-testools: update 2.4.0 -> 2.5.0 2021-07-22 22:45 [PATCH 1/8] llvm: update 12.0.0 -> 12.0.1 Alexander Kanavin 2021-07-22 22:45 ` [PATCH 2/8] systemd: update 248.3 -> 249.1 Alexander Kanavin 2021-07-22 22:45 ` [PATCH 3/8] cmake: update 3.20.5 -> 3.21.0 Alexander Kanavin @ 2021-07-22 22:45 ` Alexander Kanavin 2021-07-22 22:45 ` [PATCH 5/8] mtools: update 4.0.32 -> 4.0.33 Alexander Kanavin ` (3 subsequent siblings) 6 siblings, 0 replies; 11+ messages in thread From: Alexander Kanavin @ 2021-07-22 22:45 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Drop no_traceback2.patch as issue fixed upstream. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- .../python/python-testtools.inc | 3 +-- .../python3-testtools/no_traceback2.patch | 23 ------------------- ...ls_2.4.0.bb => python3-testtools_2.5.0.bb} | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-testtools/no_traceback2.patch rename meta/recipes-devtools/python/{python3-testtools_2.4.0.bb => python3-testtools_2.5.0.bb} (54%) diff --git a/meta/recipes-devtools/python/python-testtools.inc b/meta/recipes-devtools/python/python-testtools.inc index e8d308b717..de463fc2c3 100644 --- a/meta/recipes-devtools/python/python-testtools.inc +++ b/meta/recipes-devtools/python/python-testtools.inc @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c9d3e8ba7141c83bfef190e0b9379a" inherit pypi -SRC_URI[md5sum] = "e8fc7185b47cfb908c641f8c4b2a6add" -SRC_URI[sha256sum] = "64c974a6cca4385d05f4bbfa2deca1c39ce88ede31c3448bee86a7259a9a61c8" +SRC_URI[sha256sum] = "57c13433d94f9ffde3be6534177d10fb0c1507cc499319128958ca91a65cb23f" DEPENDS += " \ ${PYTHON_PN}-pbr \ diff --git a/meta/recipes-devtools/python/python3-testtools/no_traceback2.patch b/meta/recipes-devtools/python/python3-testtools/no_traceback2.patch deleted file mode 100644 index 594510342b..0000000000 --- a/meta/recipes-devtools/python/python3-testtools/no_traceback2.patch +++ /dev/null @@ -1,23 +0,0 @@ -traceback2 adds traceback for python2. Rather than depend on traceback2, we're -python3 only so just use traceback. -This caused breakage in oe-selftest -j which uses testtools on the autobuilder -using buildtools-tarball. - -Upstream-Status: Inappropriate [Our recipe is python3 specific] -(Once py2 is EOL upstream probably could/should take this) -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Index: testtools-2.3.0/testtools/content.py -=================================================================== ---- testtools-2.3.0.orig/testtools/content.py -+++ testtools-2.3.0/testtools/content.py -@@ -19,8 +19,7 @@ import os - import sys - - from extras import try_import --# To let setup.py work, make this a conditional import. --traceback = try_import('traceback2') -+import traceback - - from testtools.compat import ( - _b, diff --git a/meta/recipes-devtools/python/python3-testtools_2.4.0.bb b/meta/recipes-devtools/python/python3-testtools_2.5.0.bb similarity index 54% rename from meta/recipes-devtools/python/python3-testtools_2.4.0.bb rename to meta/recipes-devtools/python/python3-testtools_2.5.0.bb index a254b90a75..896ecee65c 100644 --- a/meta/recipes-devtools/python/python3-testtools_2.4.0.bb +++ b/meta/recipes-devtools/python/python3-testtools_2.5.0.bb @@ -1,4 +1,2 @@ inherit setuptools3 require python-testtools.inc - -SRC_URI += "file://no_traceback2.patch" -- 2.31.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 5/8] mtools: update 4.0.32 -> 4.0.33 2021-07-22 22:45 [PATCH 1/8] llvm: update 12.0.0 -> 12.0.1 Alexander Kanavin ` (2 preceding siblings ...) 2021-07-22 22:45 ` [PATCH 4/8] python3-testools: update 2.4.0 -> 2.5.0 Alexander Kanavin @ 2021-07-22 22:45 ` Alexander Kanavin 2021-07-24 10:49 ` [OE-core] " Alexandre Belloni 2021-07-22 22:45 ` [PATCH 6/8] libuv: update 1.41.0 -> 1.42.0 Alexander Kanavin ` (2 subsequent siblings) 6 siblings, 1 reply; 11+ messages in thread From: Alexander Kanavin @ 2021-07-22 22:45 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Drop no-x11.gplv3.patch (the libraries are now dynamically enabled from configure.in). Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- .../mtools/disable-hardcoded-configs.patch | 4 ++-- .../mtools/mtools/no-x11.gplv3.patch | 18 ------------------ .../{mtools_4.0.32.bb => mtools_4.0.33.bb} | 3 +-- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch rename meta/recipes-devtools/mtools/{mtools_4.0.32.bb => mtools_4.0.33.bb} (91%) diff --git a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch index 81d76d060e..90573dcb1a 100644 --- a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch +++ b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch @@ -1,4 +1,4 @@ -From 630dbcabc408cf5d73edaa7cf64a48194976b290 Mon Sep 17 00:00:00 2001 +From 7efdb47246413f938e3b2d8378ce9c363d98b371 Mon Sep 17 00:00:00 2001 From: Ed Bartosh <ed.bartosh@linux.intel.com> Date: Tue, 13 Jun 2017 14:55:52 +0300 Subject: [PATCH] Disabled reading host configs. @@ -12,7 +12,7 @@ Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> 1 file changed, 8 deletions(-) diff --git a/config.c b/config.c -index bb13682..9186c77 100644 +index 173eae0..0654cc1 100644 --- a/config.c +++ b/config.c @@ -836,14 +836,6 @@ void read_config(void) diff --git a/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch b/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch deleted file mode 100644 index 9cb3e39f5c..0000000000 --- a/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch +++ /dev/null @@ -1,18 +0,0 @@ -Disable building with X11 support. - -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - -diff -urN mtools-4.0.15.orig//Makefile.in mtools-4.0.15//Makefile.in ---- mtools-4.0.15.orig//Makefile.in 2010-10-17 08:41:09.000000000 -0700 -+++ mtools-4.0.15//Makefile.in 2010-11-23 13:59:49.258258374 -0800 -@@ -146,7 +146,7 @@ - CXXFLAGS = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS) - LINK = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@ - ALLLIBS = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS) --X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) -lXau -lX11 $(LIBS) -+X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(LIBS) - X_CCFLAGS = $(X_CFLAGS) $(CFLAGS) - - all: mtools $(LINKS) mkmanifest @FLOPPYD@ mtools.1 mtools.5 diff --git a/meta/recipes-devtools/mtools/mtools_4.0.32.bb b/meta/recipes-devtools/mtools/mtools_4.0.33.bb similarity index 91% rename from meta/recipes-devtools/mtools/mtools_4.0.32.bb rename to meta/recipes-devtools/mtools/mtools_4.0.33.bb index 501875037a..fd9febb01d 100644 --- a/meta/recipes-devtools/mtools/mtools_4.0.32.bb +++ b/meta/recipes-devtools/mtools/mtools_4.0.33.bb @@ -24,11 +24,10 @@ RRECOMMENDS_${PN}_libc-glibc = "\ glibc-gconv-ibm866 \ glibc-gconv-ibm869 \ " -SRC_URI[sha256sum] = "62498cd51ae7c79a27c879a45f0d2a8c44e1404cbb901372d09b02735ef5ad89" +SRC_URI[sha256sum] = "1cb10f8e1e20302f86eaa9c5db262f4559d1dc94bd11fdda7692bc2d1beab954" SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ file://mtools-makeinfo.patch \ - file://no-x11.gplv3.patch \ file://clang_UNUSED.patch \ " -- 2.31.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [OE-core] [PATCH 5/8] mtools: update 4.0.32 -> 4.0.33 2021-07-22 22:45 ` [PATCH 5/8] mtools: update 4.0.32 -> 4.0.33 Alexander Kanavin @ 2021-07-24 10:49 ` Alexandre Belloni 2021-07-26 10:41 ` Alexander Kanavin 0 siblings, 1 reply; 11+ messages in thread From: Alexandre Belloni @ 2021-07-24 10:49 UTC (permalink / raw) To: Alexander Kanavin; +Cc: openembedded-core Hello, On 23/07/2021 00:45:05+0200, Alexander Kanavin wrote: > Drop no-x11.gplv3.patch (the libraries are now > dynamically enabled from configure.in). > This update causes failures with wic because mcopy fails with: mcopy: No directory slots Full log here: https://autobuilder.yoctoproject.org/typhoon/#/builders/58/builds/3686/steps/11/logs/stdio 12 builds failed so this should be easily reproducible. > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > --- > .../mtools/disable-hardcoded-configs.patch | 4 ++-- > .../mtools/mtools/no-x11.gplv3.patch | 18 ------------------ > .../{mtools_4.0.32.bb => mtools_4.0.33.bb} | 3 +-- > 3 files changed, 3 insertions(+), 22 deletions(-) > delete mode 100644 meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch > rename meta/recipes-devtools/mtools/{mtools_4.0.32.bb => mtools_4.0.33.bb} (91%) > > diff --git a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch > index 81d76d060e..90573dcb1a 100644 > --- a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch > +++ b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch > @@ -1,4 +1,4 @@ > -From 630dbcabc408cf5d73edaa7cf64a48194976b290 Mon Sep 17 00:00:00 2001 > +From 7efdb47246413f938e3b2d8378ce9c363d98b371 Mon Sep 17 00:00:00 2001 > From: Ed Bartosh <ed.bartosh@linux.intel.com> > Date: Tue, 13 Jun 2017 14:55:52 +0300 > Subject: [PATCH] Disabled reading host configs. > @@ -12,7 +12,7 @@ Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> > 1 file changed, 8 deletions(-) > > diff --git a/config.c b/config.c > -index bb13682..9186c77 100644 > +index 173eae0..0654cc1 100644 > --- a/config.c > +++ b/config.c > @@ -836,14 +836,6 @@ void read_config(void) > diff --git a/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch b/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch > deleted file mode 100644 > index 9cb3e39f5c..0000000000 > --- a/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch > +++ /dev/null > @@ -1,18 +0,0 @@ > -Disable building with X11 support. > - > -Upstream-Status: Inappropriate [disable feature] > - > -Signed-off-by: Scott Garman <scott.a.garman@intel.com> > - > -diff -urN mtools-4.0.15.orig//Makefile.in mtools-4.0.15//Makefile.in > ---- mtools-4.0.15.orig//Makefile.in 2010-10-17 08:41:09.000000000 -0700 > -+++ mtools-4.0.15//Makefile.in 2010-11-23 13:59:49.258258374 -0800 > -@@ -146,7 +146,7 @@ > - CXXFLAGS = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS) > - LINK = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@ > - ALLLIBS = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS) > --X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) -lXau -lX11 $(LIBS) > -+X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(LIBS) > - X_CCFLAGS = $(X_CFLAGS) $(CFLAGS) > - > - all: mtools $(LINKS) mkmanifest @FLOPPYD@ mtools.1 mtools.5 > diff --git a/meta/recipes-devtools/mtools/mtools_4.0.32.bb b/meta/recipes-devtools/mtools/mtools_4.0.33.bb > similarity index 91% > rename from meta/recipes-devtools/mtools/mtools_4.0.32.bb > rename to meta/recipes-devtools/mtools/mtools_4.0.33.bb > index 501875037a..fd9febb01d 100644 > --- a/meta/recipes-devtools/mtools/mtools_4.0.32.bb > +++ b/meta/recipes-devtools/mtools/mtools_4.0.33.bb > @@ -24,11 +24,10 @@ RRECOMMENDS_${PN}_libc-glibc = "\ > glibc-gconv-ibm866 \ > glibc-gconv-ibm869 \ > " > -SRC_URI[sha256sum] = "62498cd51ae7c79a27c879a45f0d2a8c44e1404cbb901372d09b02735ef5ad89" > +SRC_URI[sha256sum] = "1cb10f8e1e20302f86eaa9c5db262f4559d1dc94bd11fdda7692bc2d1beab954" > > SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ > file://mtools-makeinfo.patch \ > - file://no-x11.gplv3.patch \ > file://clang_UNUSED.patch \ > " > > -- > 2.31.1 > > > > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [OE-core] [PATCH 5/8] mtools: update 4.0.32 -> 4.0.33 2021-07-24 10:49 ` [OE-core] " Alexandre Belloni @ 2021-07-26 10:41 ` Alexander Kanavin 0 siblings, 0 replies; 11+ messages in thread From: Alexander Kanavin @ 2021-07-26 10:41 UTC (permalink / raw) To: Alexandre Belloni; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 4516 bytes --] Thanks, I think this is fixed by an even newer version. I'll resubmit the update. Alex On Sat, 24 Jul 2021 at 12:49, Alexandre Belloni < alexandre.belloni@bootlin.com> wrote: > Hello, > > On 23/07/2021 00:45:05+0200, Alexander Kanavin wrote: > > Drop no-x11.gplv3.patch (the libraries are now > > dynamically enabled from configure.in). > > > > This update causes failures with wic because mcopy fails with: > mcopy: No directory slots > > Full log here: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/58/builds/3686/steps/11/logs/stdio > > 12 builds failed so this should be easily reproducible. > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > --- > > .../mtools/disable-hardcoded-configs.patch | 4 ++-- > > .../mtools/mtools/no-x11.gplv3.patch | 18 ------------------ > > .../{mtools_4.0.32.bb => mtools_4.0.33.bb} | 3 +-- > > 3 files changed, 3 insertions(+), 22 deletions(-) > > delete mode 100644 > meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch > > rename meta/recipes-devtools/mtools/{mtools_4.0.32.bb => > mtools_4.0.33.bb} (91%) > > > > diff --git > a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch > b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch > > index 81d76d060e..90573dcb1a 100644 > > --- a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch > > +++ b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch > > @@ -1,4 +1,4 @@ > > -From 630dbcabc408cf5d73edaa7cf64a48194976b290 Mon Sep 17 00:00:00 2001 > > +From 7efdb47246413f938e3b2d8378ce9c363d98b371 Mon Sep 17 00:00:00 2001 > > From: Ed Bartosh <ed.bartosh@linux.intel.com> > > Date: Tue, 13 Jun 2017 14:55:52 +0300 > > Subject: [PATCH] Disabled reading host configs. > > @@ -12,7 +12,7 @@ Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> > > 1 file changed, 8 deletions(-) > > > > diff --git a/config.c b/config.c > > -index bb13682..9186c77 100644 > > +index 173eae0..0654cc1 100644 > > --- a/config.c > > +++ b/config.c > > @@ -836,14 +836,6 @@ void read_config(void) > > diff --git a/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch > b/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch > > deleted file mode 100644 > > index 9cb3e39f5c..0000000000 > > --- a/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch > > +++ /dev/null > > @@ -1,18 +0,0 @@ > > -Disable building with X11 support. > > - > > -Upstream-Status: Inappropriate [disable feature] > > - > > -Signed-off-by: Scott Garman <scott.a.garman@intel.com> > > - > > -diff -urN mtools-4.0.15.orig//Makefile.in mtools-4.0.15//Makefile.in > > ---- mtools-4.0.15.orig//Makefile.in 2010-10-17 08:41:09.000000000 -0700 > > -+++ mtools-4.0.15//Makefile.in 2010-11-23 13:59:49.258258374 -0800 > > -@@ -146,7 +146,7 @@ > > - CXXFLAGS = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ > -I@srcdir@ $(USERCFLAGS) > > - LINK = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@ > > - ALLLIBS = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS) > > --X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) -lXau -lX11 $(LIBS) > > -+X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(LIBS) > > - X_CCFLAGS = $(X_CFLAGS) $(CFLAGS) > > - > > - all: mtools $(LINKS) mkmanifest @FLOPPYD@ mtools.1 mtools.5 > > diff --git a/meta/recipes-devtools/mtools/mtools_4.0.32.bb > b/meta/recipes-devtools/mtools/mtools_4.0.33.bb > > similarity index 91% > > rename from meta/recipes-devtools/mtools/mtools_4.0.32.bb > > rename to meta/recipes-devtools/mtools/mtools_4.0.33.bb > > index 501875037a..fd9febb01d 100644 > > --- a/meta/recipes-devtools/mtools/mtools_4.0.32.bb > > +++ b/meta/recipes-devtools/mtools/mtools_4.0.33.bb > > @@ -24,11 +24,10 @@ RRECOMMENDS_${PN}_libc-glibc = "\ > > glibc-gconv-ibm866 \ > > glibc-gconv-ibm869 \ > > " > > -SRC_URI[sha256sum] = > "62498cd51ae7c79a27c879a45f0d2a8c44e1404cbb901372d09b02735ef5ad89" > > +SRC_URI[sha256sum] = > "1cb10f8e1e20302f86eaa9c5db262f4559d1dc94bd11fdda7692bc2d1beab954" > > > > SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ > > file://mtools-makeinfo.patch \ > > - file://no-x11.gplv3.patch \ > > file://clang_UNUSED.patch \ > > " > > > > -- > > 2.31.1 > > > > > > > > > > > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > [-- Attachment #2: Type: text/html, Size: 6658 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 6/8] libuv: update 1.41.0 -> 1.42.0 2021-07-22 22:45 [PATCH 1/8] llvm: update 12.0.0 -> 12.0.1 Alexander Kanavin ` (3 preceding siblings ...) 2021-07-22 22:45 ` [PATCH 5/8] mtools: update 4.0.32 -> 4.0.33 Alexander Kanavin @ 2021-07-22 22:45 ` Alexander Kanavin 2021-07-22 22:45 ` [PATCH 7/8] gnu-config: update to latest revision Alexander Kanavin 2021-07-22 22:45 ` [PATCH 8/8] vulkan-samples: " Alexander Kanavin 6 siblings, 0 replies; 11+ messages in thread From: Alexander Kanavin @ 2021-07-22 22:45 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- .../libuv/{libuv_1.41.0.bb => libuv_1.42.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-connectivity/libuv/{libuv_1.41.0.bb => libuv_1.42.0.bb} (92%) diff --git a/meta/recipes-connectivity/libuv/libuv_1.41.0.bb b/meta/recipes-connectivity/libuv/libuv_1.42.0.bb similarity index 92% rename from meta/recipes-connectivity/libuv/libuv_1.41.0.bb rename to meta/recipes-connectivity/libuv/libuv_1.42.0.bb index 4987331dc8..169bd6206b 100644 --- a/meta/recipes-connectivity/libuv/libuv_1.41.0.bb +++ b/meta/recipes-connectivity/libuv/libuv_1.42.0.bb @@ -5,7 +5,7 @@ BUGTRACKER = "https://github.com/libuv/libuv/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" -SRCREV = "1dff88e5161cba5c59276d2070d2e304e4dcb242" +SRCREV = "6ce14710da7079eb248868171f6343bc409ea3a4" SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" S = "${WORKDIR}/git" -- 2.31.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 7/8] gnu-config: update to latest revision 2021-07-22 22:45 [PATCH 1/8] llvm: update 12.0.0 -> 12.0.1 Alexander Kanavin ` (4 preceding siblings ...) 2021-07-22 22:45 ` [PATCH 6/8] libuv: update 1.41.0 -> 1.42.0 Alexander Kanavin @ 2021-07-22 22:45 ` Alexander Kanavin 2021-07-22 22:45 ` [PATCH 8/8] vulkan-samples: " Alexander Kanavin 6 siblings, 0 replies; 11+ messages in thread From: Alexander Kanavin @ 2021-07-22 22:45 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Adjust lines in license check; checksum is same. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 420363415c..6e4435be2c 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -3,14 +3,14 @@ DESCRIPTION = "Tool that installs the GNU config.guess / config.sub into a direc HOMEPAGE = "https://git.savannah.gnu.org/cgit/config.git" SECTION = "devel" LICENSE = "GPL-3.0-with-autoconf-exception" -LIC_FILES_CHKSUM = "file://config.guess;beginline=7;endline=27;md5=b75d42f59f706ea56d6a8e00216fca6a" +LIC_FILES_CHKSUM = "file://config.guess;beginline=9;endline=29;md5=b75d42f59f706ea56d6a8e00216fca6a" DEPENDS_class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "4550d2f15b3a7ce2451c1f29500b9339430c877f" -PV = "20210620+git${SRCPV}" +SRCREV = "805517123cbfe33d17c989a18e78c5789fab0437" +PV = "20210722+git${SRCPV}" SRC_URI = "git://git.savannah.gnu.org/config.git \ file://gnu-configize.in" -- 2.31.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 8/8] vulkan-samples: update to latest revision 2021-07-22 22:45 [PATCH 1/8] llvm: update 12.0.0 -> 12.0.1 Alexander Kanavin ` (5 preceding siblings ...) 2021-07-22 22:45 ` [PATCH 7/8] gnu-config: update to latest revision Alexander Kanavin @ 2021-07-22 22:45 ` Alexander Kanavin 6 siblings, 0 replies; 11+ messages in thread From: Alexander Kanavin @ 2021-07-22 22:45 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 972173ef50..503b058101 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -11,7 +11,7 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "47c5237be21209afc945e43d03ae409fa80a0155" +SRCREV = "43ee480644a20dbc8d4983b22578068f8bed7571" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git" @@ -32,3 +32,6 @@ EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${P # from some builds depending on the point the PCH was compiled. Disable it to be # deterministic EXTRA_OECMAKE += "-DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON" + +# This needs to be specified explicitly to avoid xcb/xlib dependencies +EXTRA_OECMAKE += "-DVKB_WSI_SELECTION=D2D" -- 2.31.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-07-29 13:37 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-07-22 22:45 [PATCH 1/8] llvm: update 12.0.0 -> 12.0.1 Alexander Kanavin 2021-07-22 22:45 ` [PATCH 2/8] systemd: update 248.3 -> 249.1 Alexander Kanavin 2021-07-29 13:37 ` [OE-core] " Martin Jansa 2021-07-22 22:45 ` [PATCH 3/8] cmake: update 3.20.5 -> 3.21.0 Alexander Kanavin 2021-07-22 22:45 ` [PATCH 4/8] python3-testools: update 2.4.0 -> 2.5.0 Alexander Kanavin 2021-07-22 22:45 ` [PATCH 5/8] mtools: update 4.0.32 -> 4.0.33 Alexander Kanavin 2021-07-24 10:49 ` [OE-core] " Alexandre Belloni 2021-07-26 10:41 ` Alexander Kanavin 2021-07-22 22:45 ` [PATCH 6/8] libuv: update 1.41.0 -> 1.42.0 Alexander Kanavin 2021-07-22 22:45 ` [PATCH 7/8] gnu-config: update to latest revision Alexander Kanavin 2021-07-22 22:45 ` [PATCH 8/8] vulkan-samples: " Alexander Kanavin
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.