meson: update 0.58.1 -> 0.59.1
PATCH 1/26 meson: update 0.58.1 -> 0.59.1
Drop 0003-native_bindir.patch: it doesn't seem to actually define anything where the use_native parameter is set to true.
Also, the issue should be solved without invasive, custom patching of the code: via meson.cross, custom .pc files for the items in question or some other configuration mechanism.
---
meta/recipes-devtools/meson/meson.inc | 4 +-
.../0001-Make-CPU-family-warnings-fatal.patch | 20 ++--
.../meson/meson/0003-native_bindir.patch | 94 -------------------
.../meson/meson/gi-target-dep.patch | 41 --------
.../{meson_0.58.1.bb => meson_0.59.1.bb} | 0
...on_0.58.1.bb => nativesdk-meson_0.59.1.bb} | 0
6 files changed, 10 insertions(+), 149 deletions(-)
delete mode 100644 meta/recipes-devtools/meson/meson/0003-native_bindir.patch
delete mode 100644 meta/recipes-devtools/meson/meson/gi-target-dep.patch
rename meta/recipes-devtools/meson/{meson_0.58.1.bb => meson_0.59.1.bb} (100%)
rename meta/recipes-devtools/meson/{nativesdk-meson_0.58.1.bb => nativesdk-meson_0.59.1.bb} (100%)meta/recipes-devtools/meson/meson.inc +1 -3
@@ -9,15 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz \ file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch \ - file://0003-native_bindir.patch \ file://0001-python-module-do-not-manipulate-the-environment-when.patch \ file://disable-rpath-handling.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ - file://gi-target-dep.patch \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ " -SRC_URI[sha256sum] = "3144a3da662fcf79f1e5602fa929f2821cba4eba28c2c923fe0a7d3e3db04d5d" +SRC_URI[sha256sum] = "db586a451650d46bbe10984a87b79d9bcdc1caebf38d8e189f8848f8d502356d" UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +9 -11
@@ -1,20 +1,21 @@ -From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00 2001 +From 6c4eef1d92e9e42fdbc888365cab3c95fb33c605 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Tue, 3 Jul 2018 13:59:09 +0100 -Subject: [PATCH 1/2] Make CPU family warnings fatal +Subject: [PATCH] Make CPU family warnings fatal Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ross Burton <[email protected]> + --- mesonbuild/envconfig.py | 2 +- mesonbuild/environment.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index c6a4df3..4d58c91 100644 +index 307aac3..66fb7ec 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -266,7 +266,7 @@ class MachineInfo: +@@ -267,7 +267,7 @@ class MachineInfo(HoldableObject): cpu_family = literal['cpu_family'] if cpu_family not in known_cpu_families:
@@ -24,20 +25,17 @@ index c6a4df3..4d58c91 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index fc9b703..eea8345 100644 +index 71286a5..179917e 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +@@ -352,9 +352,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: trial = 'ppc64' if trial not in known_cpu_families: -- mlog.warning('Unknown CPU family {!r}, please report this at ' +- mlog.warning(f'Unknown CPU family {trial!r}, please report this at ' - 'https://github.com/mesonbuild/meson/issues/new with the ' -- 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) +- 'output of `uname -a` and `cat /proc/cpuinfo`') + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) return trial --- -2.24.0 -
meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0 -94
94 lines not on this page · raw message
meta/recipes-devtools/meson/meson/gi-target-dep.patch deleted +0 -41
41 lines not on this page · raw message
meta/recipes-devtools/meson/meson_0.59.1.bb renamed from meta/recipes-devtools/meson/meson_0.58.1.bb +0 -0
meta/recipes-devtools/meson/nativesdk-meson_0.59.1.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb +0 -0
Signature · 1 line
2.31.1
PATCH 2/26 libcap: update 2.51 -> 2.54
Rebase patches.
Delete 0001-tests-do-not-statically-link-a-test.patch as centos builds are now using their own buildtools.
---
...-tests-do-not-statically-link-a-test.patch | 52 -------------------
...-tests-do-not-run-target-executables.patch | 10 ++--
.../libcap/{libcap_2.51.bb => libcap_2.54.bb} | 4 +-
3 files changed, 7 insertions(+), 59 deletions(-)
delete mode 100644 meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
rename meta/recipes-support/libcap/{libcap_2.51.bb => libcap_2.54.bb} (92%)meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch deleted +0 -52
@@ -1,52 +0,0 @@ -From 897900f3f9084c5542097851323bba3f2691df20 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 15 Jan 2020 17:16:28 +0100 -Subject: [PATCH] tests: do not statically link a test - -This fails on e.g. centos 7 - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - progs/Makefile | 2 +- - tests/Makefile | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/progs/Makefile b/progs/Makefile -index 3e82862..48533f3 100644 ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -49,7 +49,7 @@ capsh: capsh.c capshdoc.h.cf $(DEPS) - $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) - - tcapsh-static: capsh.c capshdoc.h.cf $(DEPS) -- $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static -+ $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) - - uns_test: ../tests/uns_test.c - $(MAKE) -C ../tests uns_test -diff --git a/tests/Makefile b/tests/Makefile -index 4a5f2f9..4266d86 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -22,7 +22,7 @@ ifeq ($(PTHREADS),yes) - DEPS += ../libcap/libpsx.so - endif - else --LDFLAGS += --static -+LDFLAGS += - DEPS=../libcap/libcap.a - ifeq ($(PTHREADS),yes) - DEPS += ../libcap/libpsx.a -@@ -113,7 +113,7 @@ noexploit: exploit.o $(DEPS) - - # This one runs in a chroot with no shared library files. - noop: noop.c -- $(CC) $(CFLAGS) $< -o $@ --static -+ $(CC) $(CFLAGS) $< -o $@ - - clean: - rm -f psx_test libcap_psx_test libcap_launch_test uns_test *~ --- -2.25.1 -
meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch +5 -5
@@ -1,4 +1,4 @@ -From 652071e430d5eea758965176b7648e79ad404daa Mon Sep 17 00:00:00 2001 +From cc97f84469ee7b266977a20d9cfa63c52f821384 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 20 Dec 2019 16:54:05 +0100 Subject: [PATCH] tests: do not run target executables
@@ -11,20 +11,20 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile -index fc39fee..3431df9 100644 +index d9ed248..2864f77 100644 --- a/tests/Makefile +++ b/tests/Makefile -@@ -59,13 +59,11 @@ endif +@@ -63,13 +63,11 @@ endif # unprivileged run_psx_test: psx_test - ./psx_test psx_test: psx_test.c $(DEPS) - $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) + $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) run_libcap_psx_test: libcap_psx_test - ./libcap_psx_test libcap_psx_test: libcap_psx_test.c $(DEPS) - $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) + $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS)
meta/recipes-support/libcap/libcap_2.54.bb renamed from meta/recipes-support/libcap/libcap_2.51.bb +2 -2
@@ -12,9 +12,8 @@ DEPENDS = "hostperl-runtime-native gperf-native" SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz \ file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \ file://0002-tests-do-not-run-target-executables.patch \ - file://0001-tests-do-not-statically-link-a-test.patch \ " -SRC_URI[sha256sum] = "6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9" +SRC_URI[sha256sum] = "5091b24247999fd7a5e62bd9ac8bc761cda29f9baa0d1a2ca6a46f13891b4f0f" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
@@ -42,6 +41,7 @@ do_compile() { AR="${AR}" \ CC="${CC}" \ RANLIB="${RANLIB}" \ + OBJCOPY="${OBJCOPY}" \ COPTS="${CFLAGS}" \ BUILD_COPTS="${BUILD_CFLAGS}" }
Signature · 1 line
2.31.1
PATCH 3/26 lua: add a recipe from meta-oe
In reply to Alexander KanavinLua is a hard dependency in rpm 4.17.
--- meta/conf/distro/include/maintainers.inc | 1 + .../distro/include/ptest-packagelists.inc | 1 + ...ilding-lua-without-readline-on-Linux.patch | 59 +++++++ ...rriers-cannot-be-active-during-sweep.patch | 90 ++++++++++ .../lua/lua/CVE-2020-15888.patch | 45 +++++ .../lua/lua/CVE-2020-15945.patch | 167 ++++++++++++++++++ meta/recipes-devtools/lua/lua/lua.pc.in | 10 ++ meta/recipes-devtools/lua/lua/run-ptest | 19 ++ meta/recipes-devtools/lua/lua_5.3.6.bb | 67 +++++++ 9 files changed, 459 insertions(+) create mode 100644 meta/recipes-devtools/lua/lua/0001-Allow-building-lua-without-readline-on-Linux.patch create mode 100644 meta/recipes-devtools/lua/lua/0001-Fixed-bug-barriers-cannot-be-active-during-sweep.patch create mode 100644 meta/recipes-devtools/lua/lua/CVE-2020-15888.patch create mode 100644 meta/recipes-devtools/lua/lua/CVE-2020-15945.patch create mode 100644 meta/recipes-devtools/lua/lua/lua.pc.in create mode 100644 meta/recipes-devtools/lua/lua/run-ptest create mode 100644 meta/recipes-devtools/lua/lua_5.3.6.bb
meta/conf/distro/include/maintainers.inc +1 -0
@@ -467,6 +467,7 @@ RECIPE_MAINTAINER:pn-ltp = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-lttng-modules = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER:pn-lttng-tools = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER:pn-lttng-ust = "Richard Purdie <[email protected]>" +RECIPE_MAINTAINER:pn-lua = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-lz4 = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER:pn-lzo = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER:pn-lzip = "Denys Dmytriyenko <[email protected]>"
meta/conf/distro/include/ptest-packagelists.inc +1 -0
@@ -40,6 +40,7 @@ PTESTS_FAST = "\ libxml-sax-base-perl-ptest \ libxml-simple-perl-ptest \ libxml2-ptest \ + lua-ptest \ lzo-ptest \ m4-ptest \ nettle-ptest \
meta/recipes-devtools/lua/lua/0001-Allow-building-lua-without-readline-on-Linux.patch new file +59 -0
59 lines not on this page · raw message
meta/recipes-devtools/lua/lua/0001-Fixed-bug-barriers-cannot-be-active-during-sweep.patch new file +90 -0
90 lines not on this page · raw message
meta/recipes-devtools/lua/lua/CVE-2020-15888.patch new file +45 -0
45 lines not on this page · raw message
meta/recipes-devtools/lua/lua/CVE-2020-15945.patch new file +167 -0
167 lines not on this page · raw message
meta/recipes-devtools/lua/lua/lua.pc.in new file +10 -0
@@ -0,0 +1,10 @@ +prefix=/usr +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: Lua +Description: Lua language engine +Version: @VERSION@ +Requires: +Libs: -L${libdir} -llua -lm -ldl +Cflags: -I${includedir}
meta/recipes-devtools/lua/lua/run-ptest new file +19 -0
@@ -0,0 +1,19 @@ +#!/bin/sh + +cd test +lua -e"_U=true" all.lua > lua-test.tmp + +echo "--- test output ---" +cat lua-test.tmp +echo "" +echo "" +echo "--- ptest result ---" + +grep "final OK \!\!\!" lua-test.tmp > /dev/null +if [ $? -eq 0 ]; then + echo "PASS: lua" +else + echo "FAIL: lua" +fi + +rm -f lua-test.tmp
meta/recipes-devtools/lua/lua_5.3.6.bb new file +67 -0
67 lines not on this page · raw message
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 03/26] lua: add a recipe from meta-oe
also send a a patch to remove it from meta-oe once its merged in core, otherwise distros using meta-oe wont use it from core.
Quoted 552 lines · Alexander Kanavin
Lua is a hard dependency in rpm 4.17.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/maintainers.inc | 1 + .../distro/include/ptest-packagelists.inc | 1 + ...ilding-lua-without-readline-on-Linux.patch | 59 +++++++ ...rriers-cannot-be-active-during-sweep.patch | 90 ++++++++++ .../lua/lua/CVE-2020-15888.patch | 45 +++++ .../lua/lua/CVE-2020-15945.patch | 167 ++++++++++++++++++ meta/recipes-devtools/lua/lua/lua.pc.in | 10 ++ meta/recipes-devtools/lua/lua/run-ptest | 19 ++ meta/recipes-devtools/lua/lua_5.3.6.bb | 67 +++++++ 9 files changed, 459 insertions(+) create mode 100644 meta/recipes-devtools/lua/lua/0001-Allow-building-lua-without-readline-on-Linux.patch create mode 100644 meta/recipes-devtools/lua/lua/0001-Fixed-bug-barriers-cannot-be-active-during-sweep.patch create mode 100644 meta/recipes-devtools/lua/lua/CVE-2020-15888.patch create mode 100644 meta/recipes-devtools/lua/lua/CVE-2020-15945.patch create mode 100644 meta/recipes-devtools/lua/lua/lua.pc.in create mode 100644 meta/recipes-devtools/lua/lua/run-ptest create mode 100644 meta/recipes-devtools/lua/lua_5.3.6.bbmeta/conf/distro/include/maintainers.inc +1
-0@@ -467,6 +467,7 @@ RECIPE_MAINTAINER:pn-ltp = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-lttng-modules = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER:pn-lttng-tools = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER:pn-lttng-ust = "Richard Purdie <[email protected]>" +RECIPE_MAINTAINER:pn-lua = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-lz4 = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER:pn-lzo = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER:pn-lzip = "Denys Dmytriyenko <[email protected]>"meta/conf/distro/include/ptest-packagelists.inc +1
-0@@ -40,6 +40,7 @@ PTESTS_FAST = "\ libxml-sax-base-perl-ptest \ libxml-simple-perl-ptest \ libxml2-ptest \ + lua-ptest \ lzo-ptest \ m4-ptest \ nettle-ptest \meta/recipes-devtools/lua/lua/0001-Allow-building-lua-without-readline-on-Linux.patch new file +59
-0@@ -0,0 +1,59 @@ +From 601ef636fc4dfb2af3e7fda88d8ea1c1d92affe4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 2 Oct 2019 17:54:15 +0200 +Subject: [PATCH] Allow building lua without readline on Linux + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- + Makefile | 2 +- + src/Makefile | 3 +++ + src/luaconf.h | 5 +++++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 119110d..9f6df45 100644 +--- a/Makefile ++++ b/Makefile +@@ -36,7 +36,7 @@ RM= rm -f + # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + + # Convenience platforms targets. +-PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris ++PLATS= aix bsd c89 freebsd generic linux linux-no-readline macosx mingw posix solaris + + # What to install. + TO_BIN= lua luac +diff --git a/src/Makefile b/src/Makefile +index 64c78f7..5c0428a 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -109,6 +109,9 @@ generic: $(ALL) + linux: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" + ++linux-no-readline: ++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX_NO_READLINE" SYSLIBS="-Wl,-E -ldl" ++ + macosx: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" + +diff --git a/src/luaconf.h b/src/luaconf.h +index 9eeeea6..d71ca25 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -64,6 +64,11 @@ + #define LUA_USE_READLINE /* needs some extra libraries */ + #endif + ++#if defined(LUA_USE_LINUX_NO_READLINE) ++#define LUA_USE_POSIX ++#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ ++#endif ++ + + #if defined(LUA_USE_MACOSX) + #define LUA_USE_POSIX +-- +2.17.1 +meta/recipes-devtools/lua/lua/0001-Fixed-bug-barriers-cannot-be-active-during-sweep.patch new file +90
-0@@ -0,0 +1,90 @@ +From 1e6df25ac28dcd89f0324177bb55019422404b44 Mon Sep 17 00:00:00 2001 +From: Roberto Ierusalimschy <[email protected]> +Date: Thu, 3 Sep 2020 15:32:17 +0800 +Subject: [PATCH] Fixed bug: barriers cannot be active during sweep + +Barriers cannot be active during sweep, even in generational mode. +(Although gen. mode is not incremental, it can hit a barrier when +deleting a thread and closing its upvalues.) The colors of objects are +being changed during sweep and, therefore, cannot be trusted. + +Upstream-Status: Backport [https://github.com/lua/lua/commit/a6da1472c0c5e05ff249325f979531ad51533110] +CVE: CVE-2020-24371 + +[Adjust code KGC_INC -> KGC_NORMAL, refer 69371c4b84becac09c445aae01d005b49658ef82] +Signed-off-by: Wenlin Kang <[email protected]> +--- + src/lgc.c | 33 ++++++++++++++++++++++++--------- + 1 file changed, 24 insertions(+), 9 deletions(-) + +diff --git a/src/lgc.c b/src/lgc.c +index 973c269..7af23d5 100644 +--- a/src/lgc.c ++++ b/src/lgc.c +@@ -142,10 +142,17 @@ static int iscleared (global_State *g, const TValue *o) { + + + /* +-** barrier that moves collector forward, that is, mark the white object +-** being pointed by a black object. (If in sweep phase, clear the black +-** object to white [sweep it] to avoid other barrier calls for this +-** same object.) ++** Barrier that moves collector forward, that is, marks the white object ++** 'v' being pointed by the black object 'o'. In the generational ++** mode, 'v' must also become old, if 'o' is old; however, it cannot ++** be changed directly to OLD, because it may still point to non-old ++** objects. So, it is marked as OLD0. In the next cycle it will become ++** OLD1, and in the next it will finally become OLD (regular old). By ++** then, any object it points to will also be old. If called in the ++** incremental sweep phase, it clears the black object to white (sweep ++** it) to avoid other barrier calls for this same object. (That cannot ++** be done is generational mode, as its sweep does not distinguish ++** whites from deads.) + */ + void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v) { + global_State *g = G(L); +@@ -154,7 +161,8 @@ void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v) { + reallymarkobject(g, v); /* restore invariant */ + else { /* sweep phase */ + lua_assert(issweepphase(g)); +- makewhite(g, o); /* mark main obj. as white to avoid other barriers */ ++ if (g->gckind == KGC_NORMAL) /* incremental mode? */ ++ makewhite(g, o); /* mark 'o' as white to avoid other barriers */ + } + } + +@@ -299,10 +307,15 @@ static void markbeingfnz (global_State *g) { + + + /* +-** Mark all values stored in marked open upvalues from non-marked threads. +-** (Values from marked threads were already marked when traversing the +-** thread.) Remove from the list threads that no longer have upvalues and +-** not-marked threads. ++** For each non-marked thread, simulates a barrier between each open ++** upvalue and its value. (If the thread is collected, the value will be ++** assigned to the upvalue, but then it can be too late for the barrier ++** to act. The "barrier" does not need to check colors: A non-marked ++** thread must be young; upvalues cannot be older than their threads; so ++** any visited upvalue must be young too.) Also removes the thread from ++** the list, as it was already visited. Removes also threads with no ++** upvalues, as they have nothing to be checked. (If the thread gets an ++** upvalue later, it will be linked in the list again.) + */ + static void remarkupvals (global_State *g) { + lua_State *thread; +@@ -313,9 +326,11 @@ static void remarkupvals (global_State *g) { + p = &thread->twups; /* keep marked thread with upvalues in the list */ + else { /* thread is not marked or without upvalues */ + UpVal *uv; ++ lua_assert(!isold(thread) || thread->openupval == NULL); + *p = thread->twups; /* remove thread from the list */ + thread->twups = thread; /* mark that it is out of list */ + for (uv = thread->openupval; uv != NULL; uv = uv->u.open.next) { ++ lua_assert(getage(uv) <= getage(thread)); + if (uv->u.open.touched) { + markvalue(g, uv->v); /* remark upvalue's value */ + uv->u.open.touched = 0; +-- +1.9.1 +meta/recipes-devtools/lua/lua/CVE-2020-15888.patch new file +45
-0@@ -0,0 +1,45 @@ +From 6298903e35217ab69c279056f925fb72900ce0b7 Mon Sep 17 00:00:00 2001 +From: Roberto Ierusalimschy <[email protected]> +Date: Mon, 6 Jul 2020 12:11:54 -0300 +Subject: [PATCH] Keep minimum size when shrinking a stack + +When shrinking a stack (during GC), do not make it smaller than the +initial stack size. +--- + ldo.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +==== end of original header ==== + +CVE: CVE-2020-15888 + +Upstream-Status: backport [https://github.com/lua/lua.git] + +Signed-off-by: Joe Slater <[email protected]> + +==== +diff --git a/ldo.c b/ldo.c +index c563b1d9..a89ac010 100644 +--- a/src/ldo.c ++++ b/src/ldo.c +@@ -220,7 +220,7 @@ static int stackinuse (lua_State *L) { + + void luaD_shrinkstack (lua_State *L) { + int inuse = stackinuse(L); +- int goodsize = inuse + (inuse / 8) + 2*EXTRA_STACK; ++ int goodsize = inuse + BASIC_STACK_SIZE; + if (goodsize > LUAI_MAXSTACK) + goodsize = LUAI_MAXSTACK; /* respect stack limit */ + if (L->stacksize > LUAI_MAXSTACK) /* had been handling stack overflow? */ +@@ -229,8 +229,7 @@ void luaD_shrinkstack (lua_State *L) { + luaE_shrinkCI(L); /* shrink list */ + /* if thread is currently not handling a stack overflow and its + good size is smaller than current size, shrink its stack */ +- if (inuse <= (LUAI_MAXSTACK - EXTRA_STACK) && +- goodsize < L->stacksize) ++ if (inuse <= (LUAI_MAXSTACK - EXTRA_STACK) && goodsize < L->stacksize) + luaD_reallocstack(L, goodsize); + else /* don't change stack */ + condmovestack(L,{},{}); /* (change only for debugging) */ +-- +2.17.1 +meta/recipes-devtools/lua/lua/CVE-2020-15945.patch new file +167
-0@@ -0,0 +1,167 @@ +From d8d344365945a534f700c82c5dd26f704f89fef3 Mon Sep 17 00:00:00 2001 +From: Roberto Ierusalimschy <[email protected]> +Date: Wed, 5 Aug 2020 16:59:58 +0800 +Subject: [PATCH] Fixed bug: invalid 'oldpc' when returning to a function + +The field 'L->oldpc' is not always updated when control returns to a +function; an invalid value can seg. fault when computing 'changedline'. +(One example is an error in a finalizer; control can return to +'luaV_execute' without executing 'luaD_poscall'.) Instead of trying to +fix all possible corner cases, it seems safer to be resilient to invalid +values for 'oldpc'. Valid but wrong values at most cause an extra call +to a line hook. + +CVE: CVE-2020-15945 + +[Adjust the code to be applicable to the tree] + +Upstream-Status: Backport [https://github.com/lua/lua/commit/a2195644d89812e5b157ce7bac35543e06db05e3] + +Signed-off-by: Wenlin Kang <[email protected]> +Signed-off-by: Joe Slater <joe.slater@@windriver.com> + +--- + src/ldebug.c | 30 +++++++++++++++--------------- + src/ldebug.h | 4 ++++ + src/ldo.c | 2 +- + src/lstate.c | 1 + + src/lstate.h | 2 +- + 5 files changed, 22 insertions(+), 17 deletions(-) + +diff --git a/src/ldebug.c b/src/ldebug.c +index 239affb..832b16c 100644 +--- a/src/ldebug.c ++++ b/src/ldebug.c +@@ -34,9 +34,8 @@ + #define noLuaClosure(f) ((f) == NULL || (f)->c.tt == LUA_TCCL) + + +-/* Active Lua function (given call info) */ +-#define ci_func(ci) (clLvalue((ci)->func)) +- ++/* inverse of 'pcRel' */ ++#define invpcRel(pc, p) ((p)->code + (pc) + 1) + + static const char *funcnamefromcode (lua_State *L, CallInfo *ci, + const char **name); +@@ -71,20 +70,18 @@ static void swapextra (lua_State *L) { + + /* + ** This function can be called asynchronously (e.g. during a signal). +-** Fields 'oldpc', 'basehookcount', and 'hookcount' (set by +-** 'resethookcount') are for debug only, and it is no problem if they +-** get arbitrary values (causes at most one wrong hook call). 'hookmask' +-** is an atomic value. We assume that pointers are atomic too (e.g., gcc +-** ensures that for all platforms where it runs). Moreover, 'hook' is +-** always checked before being called (see 'luaD_hook'). ++** Fields 'basehookcount' and 'hookcount' (set by 'resethookcount') ++** are for debug only, and it is no problem if they get arbitrary ++** values (causes at most one wrong hook call). 'hookmask' is an atomic ++** value. We assume that pointers are atomic too (e.g., gcc ensures that ++** for all platforms where it runs). Moreover, 'hook' is always checked ++** before being called (see 'luaD_hook'). + */ + LUA_API void lua_sethook (lua_State *L, lua_Hook func, int mask, int count) { + if (func == NULL || mask == 0) { /* turn off hooks? */ + mask = 0; + func = NULL; + } +- if (isLua(L->ci)) +- L->oldpc = L->ci->u.l.savedpc; + L->hook = func; + L->basehookcount = count; + resethookcount(L); +@@ -665,7 +662,10 @@ l_noret luaG_runerror (lua_State *L, const char *fmt, ...) { + void luaG_traceexec (lua_State *L) { + CallInfo *ci = L->ci; + lu_byte mask = L->hookmask; ++ const Proto *p = ci_func(ci)->p; + int counthook = (--L->hookcount == 0 && (mask & LUA_MASKCOUNT)); ++ /* 'L->oldpc' may be invalid; reset it in this case */ ++ int oldpc = (L->oldpc < p->sizecode) ? L->oldpc : 0; + if (counthook) + resethookcount(L); /* reset count */ + else if (!(mask & LUA_MASKLINE)) +@@ -677,15 +677,15 @@ void luaG_traceexec (lua_State *L) { + if (counthook) + luaD_hook(L, LUA_HOOKCOUNT, -1); /* call count hook */ + if (mask & LUA_MASKLINE) { +- Proto *p = ci_func(ci)->p; + int npc = pcRel(ci->u.l.savedpc, p); + int newline = getfuncline(p, npc); + if (npc == 0 || /* call linehook when enter a new function, */ +- ci->u.l.savedpc <= L->oldpc || /* when jump back (loop), or when */ +- newline != getfuncline(p, pcRel(L->oldpc, p))) /* enter a new line */ ++ ci->u.l.savedpc <= invpcRel(oldpc, p) || /* when jump back (loop), or when */ ++ newline != getfuncline(p, oldpc)) /* enter a new line */ + luaD_hook(L, LUA_HOOKLINE, newline); /* call line hook */ ++ ++ L->oldpc = npc; /* 'pc' of last call to line hook */ + } +- L->oldpc = ci->u.l.savedpc; + if (L->status == LUA_YIELD) { /* did hook yield? */ + if (counthook) + L->hookcount = 1; /* undo decrement to zero */ +diff --git a/src/ldebug.h b/src/ldebug.h +index 0e31546..c224cc4 100644 +--- a/src/ldebug.h ++++ b/src/ldebug.h +@@ -13,6 +13,10 @@ + + #define pcRel(pc, p) (cast(int, (pc) - (p)->code) - 1) + ++/* Active Lua function (given call info) */ ++#define ci_func(ci) (clLvalue((ci)->func)) ++ ++ + #define getfuncline(f,pc) (((f)->lineinfo) ? (f)->lineinfo[pc] : -1) + + #define resethookcount(L) (L->hookcount = L->basehookcount) +diff --git a/src/ldo.c b/src/ldo.c +index 90b695f..f66ac1a 100644 +--- a/src/ldo.c ++++ b/src/ldo.c +@@ -382,7 +382,7 @@ int luaD_poscall (lua_State *L, CallInfo *ci, StkId firstResult, int nres) { + luaD_hook(L, LUA_HOOKRET, -1); + firstResult = restorestack(L, fr); + } +- L->oldpc = ci->previous->u.l.savedpc; /* 'oldpc' for caller function */ ++ L->oldpc = pcRel(ci->u.l.savedpc, ci_func(ci)->p); /* 'oldpc' for caller function */ + } + res = ci->func; /* res == final position of 1st result */ + L->ci = ci->previous; /* back to caller */ +diff --git a/src/lstate.c b/src/lstate.c +index 9194ac3..3573e36 100644 +--- a/src/lstate.c ++++ b/src/lstate.c +@@ -236,6 +236,7 @@ static void preinit_thread (lua_State *L, global_State *g) { + L->nny = 1; + L->status = LUA_OK; + L->errfunc = 0; ++ L->oldpc = 0; + } + + +diff --git a/src/lstate.h b/src/lstate.h +index a469466..d75eadf 100644 +--- a/src/lstate.h ++++ b/src/lstate.h +@@ -164,7 +164,6 @@ struct lua_State { + StkId top; /* first free slot in the stack */ + global_State *l_G; + CallInfo *ci; /* call info for current function */ +- const Instruction *oldpc; /* last pc traced */ + StkId stack_last; /* last free slot in the stack */ + StkId stack; /* stack base */ + UpVal *openupval; /* list of open upvalues in this stack */ +@@ -174,6 +173,7 @@ struct lua_State { + CallInfo base_ci; /* CallInfo for first level (C calling Lua) */ + volatile lua_Hook hook; + ptrdiff_t errfunc; /* current error handling function (stack index) */ ++ int oldpc; /* last pc traced */ + int stacksize; + int basehookcount; + int hookcount; +-- +2.13.3 +meta/recipes-devtools/lua/lua/lua.pc.in new file +10
-0@@ -0,0 +1,10 @@ +prefix=/usr +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: Lua +Description: Lua language engine +Version: @VERSION@ +Requires: +Libs: -L${libdir} -llua -lm -ldl +Cflags: -I${includedir}meta/recipes-devtools/lua/lua/run-ptest new file +19
-0@@ -0,0 +1,19 @@ +#!/bin/sh + +cd test +lua -e"_U=true" all.lua > lua-test.tmp + +echo "--- test output ---" +cat lua-test.tmp +echo "" +echo "" +echo "--- ptest result ---" + +grep "final OK \!\!\!" lua-test.tmp > /dev/null +if [ $? -eq 0 ]; then + echo "PASS: lua" +else + echo "FAIL: lua" +fi + +rm -f lua-test.tmpmeta/recipes-devtools/lua/lua_5.3.6.bb new file +67
-1@@ -0,0 +1,67 @@ +DESCRIPTION = "Lua is a powerful light-weight programming language designed \ +for extending applications." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=318;endline=352;md5=f43d8ee6bc4df18ef8b276439cc4a153" +HOMEPAGE = "http://www.lua.org/" + +SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \ + file://lua.pc.in \ + file://0001-Allow-building-lua-without-readline-on-Linux.patch \ + file://CVE-2020-15888.patch \ + file://CVE-2020-15945.patch \ + file://0001-Fixed-bug-barriers-cannot-be-active-during-sweep.patch \ + " + +# if no test suite matches PV release of Lua exactly, download the suite for the closest Lua release. +PV_testsuites = "5.3.4" + +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', \ + 'http://www.lua.org/tests/lua-${PV_testsuites}-tests.tar.gz;name=tarballtest \ + file://run-ptest \ + ', '', d)}" + +SRC_URI[tarballsrc.md5sum] = "83f23dbd5230140a3770d5f54076948d" +SRC_URI[tarballsrc.sha256sum] = "fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60" +SRC_URI[tarballtest.md5sum] = "b14fe3748c1cb2d74e3acd1943629ba3" +SRC_URI[tarballtest.sha256sum] = "b80771238271c72565e5a1183292ef31bd7166414cd0d43a8eb79845fa7f599f" + +inherit pkgconfig binconfig ptest + +PACKAGECONFIG ??= "readline" +PACKAGECONFIG[readline] = ",,readline" + +TARGET_CC_ARCH += " -fPIC ${LDFLAGS}" +EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -fPIC' MYLDFLAGS='${LDFLAGS}'" + +do_configure:prepend() { + sed -i -e s:/usr/local:${prefix}:g src/luaconf.h + sed -i -e s:lib/lua/:${baselib}/lua/:g src/luaconf.h +} + +do_compile () { + oe_runmake ${@bb.utils.contains('PACKAGECONFIG', 'readline', 'linux', 'linux-no-readline', d)} +} + +do_install () { + oe_runmake \ + 'INSTALL_TOP=${D}${prefix}' \ + 'INSTALL_BIN=${D}${bindir}' \ + 'INSTALL_INC=${D}${includedir}/' \ + 'INSTALL_MAN=${D}${mandir}/man1' \ + 'INSTALL_SHARE=${D}${datadir}/lua' \ + 'INSTALL_LIB=${D}${libdir}' \ + 'INSTALL_CMOD=${D}${libdir}/lua/5.3' \ + install + install -d ${D}${libdir}/pkgconfig + + sed -e s/@VERSION@/${PV}/ ${WORKDIR}/lua.pc.in > ${WORKDIR}/lua.pc + install -m 0644 ${WORKDIR}/lua.pc ${D}${libdir}/pkgconfig/ + rmdir ${D}${datadir}/lua/5.3 + rmdir ${D}${datadir}/lua +} + +do_install_ptest () { + cp -R --no-dereference --preserve=mode,links -v ${WORKDIR}/lua-${PV_testsuites}-tests ${D}${PTEST_PATH}/test +} + +BBCLASSEXTEND = "native nativesdk" --2.31.1
PATCH 4/26 lua: update 5.3.6 -> 5.4.3
In reply to Alexander KanavinDrop three backports and 0001-Allow-building-lua-without-readline-on-Linux.patch (feature added upstream, adjust the recipe accordingly).
Adjust ar/ranlib flags for reproducibility on liblua.a.
License-Update: lines moved around, formatting
---
...ilding-lua-without-readline-on-Linux.patch | 59 -------
...rriers-cannot-be-active-during-sweep.patch | 90 ----------
.../lua/lua/CVE-2020-15888.patch | 45 -----
.../lua/lua/CVE-2020-15945.patch | 167 ------------------
.../lua/{lua_5.3.6.bb => lua_5.4.3.bb} | 31 ++--
5 files changed, 13 insertions(+), 379 deletions(-)
delete mode 100644 meta/recipes-devtools/lua/lua/0001-Allow-building-lua-without-readline-on-Linux.patch
delete mode 100644 meta/recipes-devtools/lua/lua/0001-Fixed-bug-barriers-cannot-be-active-during-sweep.patch
delete mode 100644 meta/recipes-devtools/lua/lua/CVE-2020-15888.patch
delete mode 100644 meta/recipes-devtools/lua/lua/CVE-2020-15945.patch
rename meta/recipes-devtools/lua/{lua_5.3.6.bb => lua_5.4.3.bb} (58%)meta/recipes-devtools/lua/lua/0001-Allow-building-lua-without-readline-on-Linux.patch deleted +0 -59
@@ -1,59 +0,0 @@ -From 601ef636fc4dfb2af3e7fda88d8ea1c1d92affe4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 2 Oct 2019 17:54:15 +0200 -Subject: [PATCH] Allow building lua without readline on Linux - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <[email protected]> ---- - Makefile | 2 +- - src/Makefile | 3 +++ - src/luaconf.h | 5 +++++ - 3 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 119110d..9f6df45 100644 ---- a/Makefile -+++ b/Makefile -@@ -36,7 +36,7 @@ RM= rm -f - # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= - - # Convenience platforms targets. --PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris -+PLATS= aix bsd c89 freebsd generic linux linux-no-readline macosx mingw posix solaris - - # What to install. - TO_BIN= lua luac -diff --git a/src/Makefile b/src/Makefile -index 64c78f7..5c0428a 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -109,6 +109,9 @@ generic: $(ALL) - linux: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" - -+linux-no-readline: -+ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX_NO_READLINE" SYSLIBS="-Wl,-E -ldl" -+ - macosx: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" - -diff --git a/src/luaconf.h b/src/luaconf.h -index 9eeeea6..d71ca25 100644 ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -64,6 +64,11 @@ - #define LUA_USE_READLINE /* needs some extra libraries */ - #endif - -+#if defined(LUA_USE_LINUX_NO_READLINE) -+#define LUA_USE_POSIX -+#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ -+#endif -+ - - #if defined(LUA_USE_MACOSX) - #define LUA_USE_POSIX --- -2.17.1 -
meta/recipes-devtools/lua/lua/0001-Fixed-bug-barriers-cannot-be-active-during-sweep.patch deleted +0 -90
90 lines not on this page · raw message
meta/recipes-devtools/lua/lua/CVE-2020-15888.patch deleted +0 -45
45 lines not on this page · raw message
meta/recipes-devtools/lua/lua/CVE-2020-15945.patch deleted +0 -167
167 lines not on this page · raw message
meta/recipes-devtools/lua/lua_5.4.3.bb renamed from meta/recipes-devtools/lua/lua_5.3.6.bb +13 -18
@@ -1,29 +1,24 @@ DESCRIPTION = "Lua is a powerful light-weight programming language designed \ for extending applications." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=318;endline=352;md5=f43d8ee6bc4df18ef8b276439cc4a153" +LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=307;endline=330;md5=79c3f6b19ad05efe24c1681f025026bb" HOMEPAGE = "http://www.lua.org/" SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \ file://lua.pc.in \ - file://0001-Allow-building-lua-without-readline-on-Linux.patch \ - file://CVE-2020-15888.patch \ - file://CVE-2020-15945.patch \ - file://0001-Fixed-bug-barriers-cannot-be-active-during-sweep.patch \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'http://www.lua.org/tests/lua-${PV_testsuites}-tests.tar.gz;name=tarballtest file://run-ptest ', '', d)} \ " # if no test suite matches PV release of Lua exactly, download the suite for the closest Lua release. -PV_testsuites = "5.3.4" +PV_testsuites = "5.4.3" -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', \ - 'http://www.lua.org/tests/lua-${PV_testsuites}-tests.tar.gz;name=tarballtest \ - file://run-ptest \ - ', '', d)}" +SRC_URI[tarballsrc.sha256sum] = "f8612276169e3bfcbcfb8f226195bfc6e466fe13042f1076cbde92b7ec96bbfb" +SRC_URI[tarballtest.sha256sum] = "5d29c3022897a8290f280ebe1c6853248dfa35a668e1fc02ba9c8cde4e7bf110" -SRC_URI[tarballsrc.md5sum] = "83f23dbd5230140a3770d5f54076948d" -SRC_URI[tarballsrc.sha256sum] = "fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60" -SRC_URI[tarballtest.md5sum] = "b14fe3748c1cb2d74e3acd1943629ba3" -SRC_URI[tarballtest.sha256sum] = "b80771238271c72565e5a1183292ef31bd7166414cd0d43a8eb79845fa7f599f" +# remove at next version upgrade or when output changes +# was added after intermittent repro failures poisoned the cache +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".2" inherit pkgconfig binconfig ptest
@@ -31,7 +26,7 @@ PACKAGECONFIG ??= "readline" PACKAGECONFIG[readline] = ",,readline" TARGET_CC_ARCH += " -fPIC ${LDFLAGS}" -EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -fPIC' MYLDFLAGS='${LDFLAGS}'" +EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -fPIC' MYLDFLAGS='${LDFLAGS}' 'AR=ar rcD' 'RANLIB=ranlib -D'" do_configure:prepend() { sed -i -e s:/usr/local:${prefix}:g src/luaconf.h
@@ -39,7 +34,7 @@ do_configure:prepend() { } do_compile () { - oe_runmake ${@bb.utils.contains('PACKAGECONFIG', 'readline', 'linux', 'linux-no-readline', d)} + oe_runmake ${@bb.utils.contains('PACKAGECONFIG', 'readline', 'linux-readline', 'linux', d)} } do_install () {
@@ -50,13 +45,13 @@ do_install () { 'INSTALL_MAN=${D}${mandir}/man1' \ 'INSTALL_SHARE=${D}${datadir}/lua' \ 'INSTALL_LIB=${D}${libdir}' \ - 'INSTALL_CMOD=${D}${libdir}/lua/5.3' \ + 'INSTALL_CMOD=${D}${libdir}/lua/5.4' \ install install -d ${D}${libdir}/pkgconfig sed -e s/@VERSION@/${PV}/ ${WORKDIR}/lua.pc.in > ${WORKDIR}/lua.pc install -m 0644 ${WORKDIR}/lua.pc ${D}${libdir}/pkgconfig/ - rmdir ${D}${datadir}/lua/5.3 + rmdir ${D}${datadir}/lua/5.4 rmdir ${D}${datadir}/lua }
Signature · 1 line
2.31.1
PATCH 5/26 rpm: update 4.16.1.3 -> 4.17.0
In reply to Alexander KanavinThe flagship features are migration from bdb to sqlite and zstd support, both are enabled and taken into use. The relationship and upstream preference between sqlite and ndb formats isn't quite clear.
Lua is now a hard dependency.
Added packageconfig option for r/o support for bdb (that doesn't need bdb itself), but not enabled it as upstream marks it EXPERIMENTAL in capital letters.
Drop sed adjustment for a file that is not anymore installed.
Adjust oeqa test to check for sqlite database instead of bdb.
Drop
0001-Fix-build-with-musl-C-library.patch (nss support removed upstream) 0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch (difficult to undersand and rebase; obsolete with the move to zstd) 0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch (upstream made the same change)
Portions of 0001-tools-Add-error.h-for-non-glibc-case.patch dropped (upstream moved the files to a separate component).
Added 0001-docs-do-not-build-manpages-requires-pandoc.patch to avoid pandoc dependency.
Added 0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch to restore reproducibility when compression thread amount varies between hosts.
---
meta/lib/oeqa/runtime/cases/rpm.py | 6 +-
...lib-rpm-as-the-installation-path-for.patch | 14 ++--
.../0001-Fix-build-with-musl-C-library.patch | 22 -------
...not-insert-payloadflags-into-.rpm-me.patch | 28 ++++++++
...o-not-build-manpages-requires-pandoc.patch | 26 ++++++++
...rict-virtual-memory-usage-if-limit-s.patch | 65 -------------------
...tools-Add-error.h-for-non-glibc-case.patch | 59 ++---------------
...hat-ELF-binaries-are-executable-to-b.patch | 33 ----------
.../rpm/{rpm_4.16.1.3.bb => rpm_4.17.0.bb} | 22 +++----
9 files changed, 81 insertions(+), 194 deletions(-)
delete mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch
create mode 100644 meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch
create mode 100644 meta/recipes-devtools/rpm/files/0001-docs-do-not-build-manpages-requires-pandoc.patch
delete mode 100644 meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
delete mode 100644 meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch
rename meta/recipes-devtools/rpm/{rpm_4.16.1.3.bb => rpm_4.17.0.bb} (90%)meta/lib/oeqa/runtime/cases/rpm.py +3 -3
@@ -116,12 +116,12 @@ class RpmInstallRemoveTest(OERuntimeTestCase): Author: Alexander Kanavin <[email protected]> AutomatedBy: Daniel Istrate <[email protected]> """ - db_files_cmd = 'ls /var/lib/rpm/__db.*' + db_files_cmd = 'ls /var/lib/rpm/rpmdb.sqlite*' check_log_cmd = "grep RPM /var/log/messages | wc -l" - # Make sure that some database files are under /var/lib/rpm as '__db.xxx' + # Make sure that some database files are under /var/lib/rpm as 'rpmdb.sqlite' status, output = self.target.run(db_files_cmd) - msg = 'Failed to find database files under /var/lib/rpm/ as __db.xxx' + msg = 'Failed to find database files under /var/lib/rpm/ as rpmdb.sqlite' self.assertEqual(0, status, msg=msg) self.tc.target.copyTo(self.test_file, self.dst)
meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +7 -7
@@ -1,4 +1,4 @@ -From 7b2dd83d8fcd06af8e583b53da79ed0033793d46 Mon Sep 17 00:00:00 2001 +From 8d013fe154a162305f76141151baf767dd04b598 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 27 Feb 2017 09:43:30 +0200 Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index fe35a90fa..b2faec6f3 100644 +index eb7d6941b..10a889b5d 100644 --- a/configure.ac +++ b/configure.ac -@@ -966,7 +966,7 @@ else +@@ -871,7 +871,7 @@ else usrprefix=$prefix fi
@@ -27,10 +27,10 @@ index fe35a90fa..b2faec6f3 100644 AC_SUBST(OBJDUMP) diff --git a/macros.in b/macros.in -index 35c8cf9df..9d8b2825c 100644 +index a1f795e5f..689e784ef 100644 --- a/macros.in +++ b/macros.in -@@ -996,7 +996,7 @@ package or when debugging this package.\ +@@ -933,7 +933,7 @@ package or when debugging this package.\ %_sharedstatedir %{_prefix}/com %_localstatedir %{_prefix}/var %_lib lib
@@ -40,7 +40,7 @@ index 35c8cf9df..9d8b2825c 100644 %_infodir %{_datadir}/info %_mandir %{_datadir}/man diff --git a/rpm.am b/rpm.am -index 8e1dc2184..3d889ec86 100644 +index 7b57f433b..9bbb9ee96 100644 --- a/rpm.am +++ b/rpm.am @@ -1,10 +1,10 @@
@@ -55,4 +55,4 @@ index 8e1dc2184..3d889ec86 100644 +rpmconfigdir = $(libdir)/rpm # Libtool version (current-revision-age) for all our libraries - rpm_version_info = 10:3:1 + rpm_version_info = 11:0:2
meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch deleted +0 -22
@@ -1,22 +0,0 @@ -From d076de030deb9cafd9b2e82be5d506cebdefad0b Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 27 Feb 2017 14:43:21 +0200 -Subject: [PATCH 1/9] Fix build with musl C library. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - configure.ac | 3 ++- - rpmio/digest_nss.c | 1 + - 2 files changed, 3 insertions(+), 1 deletion(-) - ---- a/rpmio/digest_nss.c -+++ b/rpmio/digest_nss.c -@@ -1,5 +1,6 @@ - #include "system.h" - -+#include <signal.h> - #include <pthread.h> - #include <nss.h> - #include <sechash.h>
meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch new file +28 -0
@@ -0,0 +1,28 @@ +From 2d351c666f09cc1b9e368422653fb42ac8b86249 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 31 Aug 2021 10:37:05 +0200 +Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata + +The flags look like '19T56' where 19 is the compression level +(deterministic), and 56 is the amount of threads (varies from one +host to the next and breaks reproducibility for .rpm). + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + build/pack.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/pack.c b/build/pack.c +index 932cb213e..b45d0726f 100644 +--- a/build/pack.c ++++ b/build/pack.c +@@ -328,7 +328,7 @@ static char *getIOFlags(Package pkg) + headerPutString(pkg->header, RPMTAG_PAYLOADCOMPRESSOR, compr); + buf = xstrdup(rpmio_flags); + buf[s - rpmio_flags] = '\0'; +- headerPutString(pkg->header, RPMTAG_PAYLOADFLAGS, buf+1); ++ headerPutString(pkg->header, RPMTAG_PAYLOADFLAGS, ""); + free(buf); + } + exit:
meta/recipes-devtools/rpm/files/0001-docs-do-not-build-manpages-requires-pandoc.patch new file +26 -0
@@ -0,0 +1,26 @@ +From 9bf1693092385eba9841614613313010221ca01f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 29 Jun 2021 20:11:26 +0200 +Subject: [PATCH] docs: do not build manpages (requires pandoc) + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + docs/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/docs/Makefile.am b/docs/Makefile.am +index 5a6bd203a..6257767fd 100644 +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -1,7 +1,5 @@ + ## Process this file with automake to produce Makefile.in + +-SUBDIRS = man +- + EXTRA_DIST = + + EXTRA_DIST += \ +-- +2.32.0 +
meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch deleted +0 -65
65 lines not on this page · raw message
meta/recipes-devtools/rpm/files/0001-tools-Add-error.h-for-non-glibc-case.patch +6 -53
75 lines not on this page · raw message
meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 5141d50d7b3d3c209a22c53deedb4ceef014401d Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt <[email protected]> -Date: Mon, 15 May 2017 10:21:08 +0200 -Subject: [PATCH 09/15] Do not require that ELF binaries are executable to be - identifiable - -There is nothing that requires, e.g., a DSO to be executable, but it -is still an ELF binary and should be identified as such. - -Upstream probably expects all ELF binaries to be marked as executable, -but rather than imposing such a limitation for OE, allow any file to -be identified as an ELF binary regardless of whether it is executable -or not. - -Upstream-Status: Inappropriate -Signed-off-by: Peter Kjellerstedt <[email protected]> - ---- - fileattrs/elf.attr | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/fileattrs/elf.attr b/fileattrs/elf.attr -index 5805dd0ee..3516f309d 100644 ---- a/fileattrs/elf.attr -+++ b/fileattrs/elf.attr -@@ -1,4 +1,3 @@ - %__elf_provides %{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private} - %__elf_requires %{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private} - %__elf_magic ^(setuid,? )?(setgid,? )?(sticky )?ELF (32|64)-bit.*$ --%__elf_flags exeonly --- -2.14.2 -
meta/recipes-devtools/rpm/rpm_4.17.0.bb renamed from meta/recipes-devtools/rpm/rpm_4.16.1.3.bb +11 -11
@@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \ +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.17.x \ file://environment.d-rpm.sh \ file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \ file://0001-Do-not-read-config-files-from-HOME.patch \
@@ -32,22 +32,21 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \ file://0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch \ file://0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch \ file://0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch \ - file://0001-Fix-build-with-musl-C-library.patch \ file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \ - file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \ file://0001-perl-disable-auto-reqs.patch \ - file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \ file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ file://0001-tools-Add-error.h-for-non-glibc-case.patch \ + file://0001-docs-do-not-build-manpages-requires-pandoc.patch \ + file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ " PE = "1" -SRCREV = "3659b8a04f5b8bacf6535e0124e7fe23f15286bd" +SRCREV = "3e74e8ba2dd5e76a5353d238dc7fc38651ce27b3" S = "${WORKDIR}/git" -DEPENDS = "libgcrypt file popt xz bzip2 elfutils python3" +DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3" DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" inherit autotools gettext pkgconfig python3native
@@ -58,7 +57,7 @@ AUTOTOOLS_AUXDIR = "${S}/build-aux" # OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe EXTRA_AUTORECONF:append = " --exclude=gnu-configize" -EXTRA_OECONF:append = " --without-lua --enable-python --with-crypto=libgcrypt" +EXTRA_OECONF:append = " --enable-python --with-crypto=libgcrypt" EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs
@@ -70,15 +69,18 @@ EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc --disable-plugins" BBCLASSEXTEND = "native nativesdk" -PACKAGECONFIG ??= "bdb ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)} sqlite zstd" # The inhibit plugin serves no purpose outside of the target PACKAGECONFIG:remove:class-native = "inhibit" PACKAGECONFIG:remove:class-nativesdk = "inhibit" -PACKAGECONFIG[bdb] = "--enable-bdb,--disable-bdb,db" PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" +PACKAGECONFIG[sqlite] = "--enable-sqlite=yes,--enable-sqlite=no,sqlite3" +PACKAGECONFIG[ndb] = "--enable-ndb,--disable-ndb" +PACKAGECONFIG[bdb-ro] = "--enable-bdb-ro,--disable-bdb-ro" +PACKAGECONFIG[zstd] = "--enable-zstd=yes,--enable-zstd=no,zstd" ASNEEDED = ""
@@ -136,8 +138,6 @@ do_install:append () { sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ ${D}/${libdir}/rpm/macros - sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \ - ${D}${libdir}/rpm/pythondistdeps.py } FILES:${PN} += "${libdir}/rpm-plugins/*.so \
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 05/26] rpm: update 4.16.1.3 -> 4.17.0
Quoted 5 lines · Alexander Kanavin
The flagship features are migration from bdb to sqlite and zstd support, both are enabled and taken into use. The relationship and upstream preference
between sqlite and ndb formats isn't quite clear.
FYI: interesting side-effect of bdb removal in
https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
was that in some of our builds I've started to see:
ERROR: rpm-native-1_4.17.0-r0 do_configure: QA Issue: rpm-native: configure was passed unrecognised options: --without-api-sanity-checker --without-abi-compliance-checker [unknown-configure-option]
And the interesting part is that reporting unrecognised options stops working (enable_option_checking=no gets set in generated configure) when there is AC_CONFIG_SUBDIRS in configure.ac (even when not actively being used as in
https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810L509
when not using internal bdb), see
https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/status.m4#n1099
The unrecognized options were used since rpm-5 was removed in 2017 with:
https://git.openembedded.org/openembedded-core/commit/?id=d0365f35303db3595688a6e5290677e02a72c54e
but they didn't make it to QA issue, because of configure behavior.
Regards,
PATCH 6/26 libdnf: fix the rpm sqlite-only target setup
In reply to Alexander Kanavin--- ...xt.cpp-do-not-try-to-access-BDB-data.patch | 37 +++++++++++++++++++ meta/recipes-devtools/libdnf/libdnf_0.63.1.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch
meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 2f7382b35d59fe08034603497e82ffb943fedef1 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 30 Jun 2021 15:31:16 +0200 +Subject: [PATCH] libdnf/dnf-context.cpp: do not try to access BDB database + +Upstream-Status: Inappropriate [upstream needs to rework this to support +sqlite] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + libdnf/dnf-context.cpp | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/libdnf/dnf-context.cpp b/libdnf/dnf-context.cpp +index 86f71a79..9cdcf769 100644 +--- a/libdnf/dnf-context.cpp ++++ b/libdnf/dnf-context.cpp +@@ -2264,20 +2264,6 @@ dnf_context_setup(DnfContext *context, + !dnf_context_set_os_release(context, error)) + return FALSE; + +- /* setup a file monitor on the rpmdb, if we're operating on the native / */ +- if (g_strcmp0(priv->install_root, "/") == 0) { +- rpmdb_path = g_build_filename(priv->install_root, "var/lib/rpm/Packages", NULL); +- file_rpmdb = g_file_new_for_path(rpmdb_path); +- priv->monitor_rpmdb = g_file_monitor_file(file_rpmdb, +- G_FILE_MONITOR_NONE, +- NULL, +- error); +- if (priv->monitor_rpmdb == NULL) +- return FALSE; +- g_signal_connect(priv->monitor_rpmdb, "changed", +- G_CALLBACK(dnf_context_rpmdb_changed_cb), context); +- } +- + /* copy any vendor distributed cached metadata */ + if (!dnf_context_copy_vendor_cache(context, error)) + return FALSE;
meta/recipes-devtools/libdnf/libdnf_0.63.1.bb +1 -0
@@ -13,6 +13,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \ file://enable_test_data_dir_set.patch \ file://0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch \ file://0001-drop-FindPythonInstDir.cmake.patch \ + file://0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch \ " SRCREV = "8e451380bf84bd76e3925cbae2a06bb0e56f5cd9"
Signature · 1 line
2.31.1
PATCH 7/26 libsolv: disable rpm bdb format support
In reply to Alexander KanavinOtherwise this causes runtime errors when only sqlite is present.
--- meta/recipes-extended/libsolv/libsolv_0.7.19.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/libsolv/libsolv_0.7.19.bb +1 -1
@@ -20,7 +20,7 @@ S = "${WORKDIR}/git" inherit cmake PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}" -PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON -DENABLE_RPMDB_BDB=ON,,db rpm" +PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON"
Signature · 1 line
2.31.1
PATCH 8/26 perl: do not build berkeley db module by default
In reply to Alexander KanavinBdb is unmaintained and altogether obsolete, the less dependencies we have on it, the better.
This leaves only apt (specifically, apt-ftparchive) in core as a bdb consumer, sadly it has a hard dependency that isn't easy to patch out. Maybe apt upstream will get to it at some point.
--- meta/recipes-devtools/perl/perl_5.34.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/perl/perl_5.34.0.bb +1 -1
@@ -35,7 +35,7 @@ DEPENDS += "perlcross-native zlib virtual/crypt" PERL_LIB_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}.0" -PACKAGECONFIG ??= "bdb gdbm" +PACKAGECONFIG ??= "gdbm" PACKAGECONFIG[bdb] = ",-Ui_db,db" PACKAGECONFIG[gdbm] = ",-Ui_gdbm,gdbm"
Signature · 1 line
2.31.1
PATCH 9/26 package_rpm: use zstd instead of xz
In reply to Alexander Kanavinzstd has similar time and space performance in compression but is vastly faster in decompression, which benefits rootfs creation (especially when installing very large packages) and on-target package installation.
--- meta/classes/package_rpm.bbclass | 4 ++-- meta/conf/bitbake.conf | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-)
meta/classes/package_rpm.bbclass +2 -2
@@ -684,8 +684,8 @@ python do_package_rpm () { cmd = cmd + " --define '_use_internal_dependency_generator 0'" cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" cmd = cmd + " --define '_build_id_links none'" - cmd = cmd + " --define '_binary_payload w6T%d.xzdio'" % int(d.getVar("XZ_THREADS")) - cmd = cmd + " --define '_source_payload w6T%d.xzdio'" % int(d.getVar("XZ_THREADS")) + cmd = cmd + " --define '_binary_payload w19T%d.zstdio'" % int(d.getVar("ZSTD_THREADS")) + cmd = cmd + " --define '_source_payload w19T%d.zstdio'" % int(d.getVar("ZSTD_THREADS")) cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'" cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'" cmd = cmd + " --define '_buildhost reproducible'"
meta/conf/bitbake.conf +3 -0
@@ -814,6 +814,9 @@ XZ_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" XZ_DEFAULTS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" XZ_DEFAULTS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" +# Default parallelism for zstd +ZSTD_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" + # Limit the number of threads that OpenMP libraries will use. Otherwise they # may fallback to using all CPUs export OMP_NUM_THREADS = "${BB_NUMBER_THREADS}"
Signature · 1 line
2.31.1
PATCH 10/26 qemu: update 6.0.0 -> 6.1.0
In reply to Alexander KanavinRecipe changes:qemu-plugin.h is installed by both qemu-native and qemu-system-native
qmp.py module is now provided in a module directory (no other files from that directory are necessary to use it though)
additional host-specific info is stripeed from ptest tests/tcg/*.mak
Patches:
drop all backports
drop 0001-Add-enable-disable-udev.patch (change added upstream)
drop 0001-linux-user-Tag-vsx-with-ieee128-fpbits.patch (issue fixed upstream)
drop 0004-qemu-disable-Valgrind.patch (valgrind detection moved from configure to meson, and should be robust against host contamination)
rebase 0010-configure-Add-pkg-config-handling-for-libgcrypt.patch (upstream moved libgcrypt handling from configure to meson, and using pkg-config is now a one-liner adjustment)
rebase cross.patch
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
...u-native_6.0.0.bb => qemu-native_6.1.0.bb} | 0
...e_6.0.0.bb => qemu-system-native_6.1.0.bb} | 3 +-
meta/recipes-devtools/qemu/qemu.inc | 19 +---
.../qemu/0001-Add-enable-disable-udev.patch | 29 -------
...igure-fix-detection-of-gdbus-codegen.patch | 50 -----------
...nux-user-Tag-vsx-with-ieee128-fpbits.patch | 35 --------
...ix-memory-disclosure-in-virgl_cmd_ge.patch | 43 ---------
...ix-resource-leak-in-vg_resource_crea.patch | 41 ---------
...ix-memory-leak-in-vg_resource_attach.patch | 48 ----------
.../qemu/0004-qemu-disable-Valgrind.patch | 34 --------
...ix-memory-leak-while-calling-vg_reso.patch | 50 -----------
...ix-memory-leak-in-virgl_cmd_resource.patch | 58 -------------
...ix-memory-leak-in-virgl_resource_att.patch | 49 -----------
...ix-OOB-write-in-virgl_cmd_get_capset.patch | 49 -----------
...dd-pkg-config-handling-for-libgcrypt.patch | 87 ++++---------------
.../qemu/qemu/CVE-2021-3527-1.patch | 42 ---------
.../qemu/qemu/CVE-2021-3527-2.patch | 59 -------------
.../qemu/qemu/CVE-2021-3682.patch | 41 ---------
meta/recipes-devtools/qemu/qemu/cross.patch | 40 +++++----
.../qemu/{qemu_6.0.0.bb => qemu_6.1.0.bb} | 0
21 files changed, 48 insertions(+), 731 deletions(-)
rename meta/recipes-devtools/qemu/{qemu-native_6.0.0.bb => qemu-native_6.1.0.bb} (100%)
rename meta/recipes-devtools/qemu/{qemu-system-native_6.0.0.bb => qemu-system-native_6.1.0.bb} (88%)
delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-configure-fix-detection-of-gdbus-codegen.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-linux-user-Tag-vsx-with-ieee128-fpbits.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-vhost-user-gpu-fix-memory-disclosure-in-virgl_cmd_ge.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0002-vhost-user-gpu-fix-resource-leak-in-vg_resource_crea.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0003-vhost-user-gpu-fix-memory-leak-in-vg_resource_attach.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0004-vhost-user-gpu-fix-memory-leak-while-calling-vg_reso.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0005-vhost-user-gpu-fix-memory-leak-in-virgl_cmd_resource.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0006-vhost-user-gpu-fix-memory-leak-in-virgl_resource_att.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0007-vhost-user-gpu-fix-OOB-write-in-virgl_cmd_get_capset.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3527-1.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3527-2.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3682.patch
rename meta/recipes-devtools/qemu/{qemu_6.0.0.bb => qemu_6.1.0.bb} (100%)meta/conf/distro/include/tcmode-default.inc +1 -1
@@ -22,7 +22,7 @@ BINUVERSION ?= "2.37%" GDBVERSION ?= "10.%" GLIBCVERSION ?= "2.34" LINUXLIBCVERSION ?= "5.13%" -QEMUVERSION ?= "6.0%" +QEMUVERSION ?= "6.1%" 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
meta/recipes-devtools/qemu/qemu-native_6.1.0.bb renamed from meta/recipes-devtools/qemu/qemu-native_6.0.0.bb +0 -0
meta/recipes-devtools/qemu/qemu-system-native_6.1.0.bb renamed from meta/recipes-devtools/qemu/qemu-system-native_6.0.0.bb +2 -1
@@ -25,7 +25,8 @@ do_install:append() { rm -f ${D}${datadir}/qemu/trace-events-all rm -rf ${D}${datadir}/qemu/keymaps rm -rf ${D}${datadir}/icons/ + rm -rf ${D}${includedir}/qemu-plugin.h # Install qmp.py to be used with testimage - install -D ${S}/python/qemu/qmp.py ${D}${PYTHON_SITEPACKAGES_DIR}/qmp.py + install -D ${S}/python/qemu/qmp/__init__.py ${D}${PYTHON_SITEPACKAGES_DIR}/qmp.py }
meta/recipes-devtools/qemu/qemu.inc +4 -15
@@ -19,31 +19,17 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://run-ptest \ file://0001-qemu-Add-missing-wacom-HID-descriptor.patch \ file://0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch \ - file://0004-qemu-disable-Valgrind.patch \ file://0006-chardev-connect-socket-to-a-spawned-command.patch \ file://0007-apic-fixup-fallthrough-to-PIC.patch \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ - file://0001-Add-enable-disable-udev.patch \ file://0001-qemu-Do-not-include-file-if-not-exists.patch \ file://mmap2.patch \ file://determinism.patch \ file://0001-tests-meson.build-use-relative-path-to-refer-to-file.patch \ - file://0001-configure-fix-detection-of-gdbus-codegen.patch \ - file://0001-vhost-user-gpu-fix-memory-disclosure-in-virgl_cmd_ge.patch \ - file://0002-vhost-user-gpu-fix-resource-leak-in-vg_resource_crea.patch \ - file://0003-vhost-user-gpu-fix-memory-leak-in-vg_resource_attach.patch \ - file://0004-vhost-user-gpu-fix-memory-leak-while-calling-vg_reso.patch \ - file://0005-vhost-user-gpu-fix-memory-leak-in-virgl_cmd_resource.patch \ - file://0006-vhost-user-gpu-fix-memory-leak-in-virgl_resource_att.patch \ - file://0007-vhost-user-gpu-fix-OOB-write-in-virgl_cmd_get_capset.patch \ - file://0001-linux-user-Tag-vsx-with-ieee128-fpbits.patch \ - file://CVE-2021-3527-1.patch \ - file://CVE-2021-3527-2.patch \ - file://CVE-2021-3682.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "87bc1a471ca24b97e7005711066007d443423d19aacda3d442558ae032fa30b9" +SRC_URI[sha256sum] = "eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96" SRC_URI:append:class-target = " file://cross.patch" SRC_URI:append:class-nativesdk = " file://cross.patch"
@@ -80,6 +66,9 @@ do_install_ptest() { # Strip the paths from the QEMU variable, we can use PATH sed -i -e "s#^QEMU=.*/qemu-#QEMU=qemu-#g" ${D}${PTEST_PATH}/tests/tcg/*.mak + + # Strip compiler flags as they break reproducibility + sed -i -e "s,CROSS_CC_GUEST=.*,CROSS_CC_GUEST=," ${D}${PTEST_PATH}/tests/tcg/*.mak } # QEMU_TARGETS is overridable variable
meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From b921e5204030845dc7c9d16d5f66d965e8d05367 Mon Sep 17 00:00:00 2001 -From: Jeremy Puhlman <[email protected]> -Date: Thu, 19 Mar 2020 11:54:26 -0700 -Subject: [PATCH] Add enable/disable libudev - -Upstream-Status: Pending -Signed-off-by: Jeremy Puhlman <[email protected]> - -[update patch context] -Signed-off-by: Sakib Sajal <[email protected]> ---- - configure | 4 ++++ - 1 file changed, 4 insertions(+) - -Index: qemu-6.0.0/configure -=================================================================== ---- qemu-6.0.0.orig/configure -+++ qemu-6.0.0/configure -@@ -1565,6 +1565,10 @@ for opt do - ;; - --disable-gio) gio=no - ;; -+ --enable-libudev) libudev="yes" -+ ;; -+ --disable-libudev) libudev="no" -+ ;; - *) - echo "ERROR: unknown option $opt" - echo "Try '$0 --help' for more information"
meta/recipes-devtools/qemu/qemu/0001-configure-fix-detection-of-gdbus-codegen.patch deleted +0 -50
50 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0001-linux-user-Tag-vsx-with-ieee128-fpbits.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From c5844a4cdee37268c9b65a65e6968ee129bb742d Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 14 Jun 2021 10:27:17 -0700 -Subject: [PATCH] linux-user: Tag vsx with ieee128 fpbits - -In OE we need this for ppc64le usermode to work since we generate 128bit -long doubles and glibc 2.34 is now checking for this in hwcaps at -runtime and failing to run the binary if machine does not support 128bit -IEEE fp - -Fixes -Fatal glibc error: CPU lacks float128 support (POWER 9 or later required) - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - linux-user/elfload.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linux-user/elfload.c b/linux-user/elfload.c -index 17ab06f612..e7dd18fd40 100644 ---- a/linux-user/elfload.c -+++ b/linux-user/elfload.c -@@ -830,7 +830,7 @@ static uint32_t get_elf_hwcap2(void) - PPC2_ISA207S), QEMU_PPC_FEATURE2_ARCH_2_07 | - QEMU_PPC_FEATURE2_VEC_CRYPTO); - GET_FEATURE2(PPC2_ISA300, QEMU_PPC_FEATURE2_ARCH_3_00 | -- QEMU_PPC_FEATURE2_DARN); -+ QEMU_PPC_FEATURE2_DARN | QEMU_PPC_FEATURE2_HAS_IEEE128); - - #undef GET_FEATURE - #undef GET_FEATURE2 --- -2.32.0 -
meta/recipes-devtools/qemu/qemu/0001-vhost-user-gpu-fix-memory-disclosure-in-virgl_cmd_ge.patch deleted +0 -43
43 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0002-vhost-user-gpu-fix-resource-leak-in-vg_resource_crea.patch deleted +0 -41
41 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0003-vhost-user-gpu-fix-memory-leak-in-vg_resource_attach.patch deleted +0 -48
48 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 4127296bb1046cdf73994ba69dc913d8c02fd74f Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Tue, 20 Oct 2015 22:19:08 +0100 -Subject: [PATCH] qemu: disable Valgrind - -There isn't an option to enable or disable valgrind support, so disable it to avoid non-deterministic builds. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <[email protected]> - ---- - configure | 9 --------- - 1 file changed, 9 deletions(-) - -Index: qemu-6.0.0/configure -=================================================================== ---- qemu-6.0.0.orig/configure -+++ qemu-6.0.0/configure -@@ -4648,15 +4648,6 @@ fi - # check if we have valgrind/valgrind.h - - valgrind_h=no --cat > $TMPC << EOF --#include <valgrind/valgrind.h> --int main(void) { -- return 0; --} --EOF --if compile_prog "" "" ; then -- valgrind_h=yes --fi - - ######################################## - # check if environ is declared
meta/recipes-devtools/qemu/qemu/0004-vhost-user-gpu-fix-memory-leak-while-calling-vg_reso.patch deleted +0 -50
50 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0005-vhost-user-gpu-fix-memory-leak-in-virgl_cmd_resource.patch deleted +0 -58
58 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0006-vhost-user-gpu-fix-memory-leak-in-virgl_resource_att.patch deleted +0 -49
49 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0007-vhost-user-gpu-fix-OOB-write-in-virgl_cmd_get_capset.patch deleted +0 -49
49 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch +16 -71
94 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/CVE-2021-3527-1.patch deleted +0 -42
42 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/CVE-2021-3527-2.patch deleted +0 -59
59 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/CVE-2021-3682.patch deleted +0 -41
41 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/cross.patch +25 -15
@@ -1,30 +1,40 @@ +From f51ece86f84c877f255746cba22a6745f37d2b7f Mon Sep 17 00:00:00 2001 +From: Richard Purdie <[email protected]> +Date: Tue, 5 Jan 2021 23:00:14 +0000 +Subject: [PATCH] qemu: Upgrade 5.1.0->5.2.0 + We need to be able to trigger configure's cross code but we don't want to set cross_prefix as it does other things we don't want. Patch things so we can do what we need in the target config case. Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?] Signed-off-by: Richard Purdie <[email protected]> +--- + configure | 4 ---- + 1 file changed, 4 deletions(-) - -Index: qemu-6.0.0/configure -=================================================================== ---- qemu-6.0.0.orig/configure -+++ qemu-6.0.0/configure -@@ -6371,7 +6371,6 @@ if has $sdl2_config; then - fi - echo "strip = [$(meson_quote $strip)]" >> $cross - echo "windres = [$(meson_quote $windres)]" >> $cross --if test "$cross_compile" = "yes"; then +diff --git a/configure b/configure +index 9a79a004d..563b7827f 100755 +--- a/configure ++++ b/configure +@@ -5128,7 +5128,6 @@ if test "$skip_meson" = no; then + fi + echo "strip = [$(meson_quote $strip)]" >> $cross + echo "windres = [$(meson_quote $windres)]" >> $cross +- if test "$cross_compile" = "yes"; then cross_arg="--cross-file config-meson.cross" echo "[host_machine]" >> $cross if test "$mingw32" = "yes" ; then -@@ -6403,9 +6402,6 @@ if test "$cross_compile" = "yes"; then +@@ -5160,9 +5159,6 @@ if test "$skip_meson" = no; then else echo "endian = 'little'" >> $cross fi --else +- else - cross_arg="--native-file config-meson.cross" --fi - mv $cross config-meson.cross +- fi + mv $cross config-meson.cross - rm -rf meson-private meson-info meson-logs + rm -rf meson-private meson-info meson-logs +-- +2.17.1 +
meta/recipes-devtools/qemu/qemu_6.1.0.bb renamed from meta/recipes-devtools/qemu/qemu_6.0.0.bb +0 -0
Signature · 1 line
2.31.1
PATCH 11/26 runqemu: correct vga-virtio option to keep virgl enabled
In reply to Alexander Kanavinqemu 6.1 has (perhaps unintentionally) disabled virgl in -vga virtio:
https://gitlab.com/qemu-project/qemu/-/issues/586
--- scripts/runqemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/runqemu +1 -1
@@ -1350,7 +1350,7 @@ class BaseConfig(object): if self.sdl == True or self.gtk == True or self.egl_headless == True: self.set_dri_path() - self.qemu_opt += ' -vga virtio -display ' + self.qemu_opt += ' -device virtio-vga-gl -display ' if self.egl_headless == True: self.qemu_opt += 'egl-headless,' else:
Signature · 1 line
2.31.1
PATCH 12/26 gnupg: update 2.3.1 -> 2.3.2
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop chunk from relocate.patch, the upstream code no longer exists.
---
...-a-custom-value-for-the-location-of-.patch | 6 +--
.../gnupg/gnupg/relocate.patch | 39 +++++++------------
.../gnupg/{gnupg_2.3.1.bb => gnupg_2.3.2.bb} | 2 +-
3 files changed, 19 insertions(+), 28 deletions(-)
rename meta/recipes-support/gnupg/{gnupg_2.3.1.bb => gnupg_2.3.2.bb} (97%)meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +3 -3
@@ -1,4 +1,4 @@ -From 52ba9d34cd9317145ee8a93afd5d73dd0cbf3182 Mon Sep 17 00:00:00 2001 +From c873c85b1ee1c35ebbba0bc80c2352c64787a5fd Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 7a2d410..14a7203 100644 +index d03ea3b..a6dfa19 100644 --- a/configure.ac +++ b/configure.ac -@@ -1841,7 +1841,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1958,7 +1958,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
meta/recipes-support/gnupg/gnupg/relocate.patch +15 -24
@@ -1,4 +1,4 @@ -From d6992692d1c36983b709fe1ff049cc91ef2c408a Mon Sep 17 00:00:00 2001 +From 5a68a37ae2649e0988965cfe3a63a0142f0182a1 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its
@@ -8,23 +8,23 @@ Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Ross Burton <[email protected]> --- - common/homedir.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) + common/homedir.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/homedir.c b/common/homedir.c -index 85e09c4..e1410e2 100644 +index 7969a2c..06b8016 100644 --- a/common/homedir.c +++ b/common/homedir.c -@@ -788,7 +788,7 @@ gnupg_socketdir (void) +@@ -918,7 +918,7 @@ gnupg_socketdir (void) if (!name) { unsigned int dummy; - name = _gnupg_socketdir_internal (0, &dummy); + name = getenv("GNUPG_SOCKETDIR") ?: _gnupg_socketdir_internal (0, &dummy); + gpgrt_annotate_leaked_object (name); } - return name; -@@ -814,7 +814,7 @@ gnupg_sysconfdir (void) +@@ -946,7 +946,7 @@ gnupg_sysconfdir (void) } return name; #else /*!HAVE_W32_SYSTEM*/
@@ -33,7 +33,7 @@ index 85e09c4..e1410e2 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -843,7 +843,7 @@ gnupg_bindir (void) +@@ -978,7 +978,7 @@ gnupg_bindir (void) else return rdir; #else /*!HAVE_W32_SYSTEM*/
@@ -42,7 +42,7 @@ index 85e09c4..e1410e2 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -856,7 +856,7 @@ gnupg_libexecdir (void) +@@ -991,7 +991,7 @@ gnupg_libexecdir (void) #ifdef HAVE_W32_SYSTEM return gnupg_bindir (); #else /*!HAVE_W32_SYSTEM*/
@@ -51,8 +51,8 @@ index 85e09c4..e1410e2 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -870,7 +870,7 @@ gnupg_libdir (void) - name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL); +@@ -1008,7 +1008,7 @@ gnupg_libdir (void) + } return name; #else /*!HAVE_W32_SYSTEM*/ - return GNUPG_LIBDIR;
@@ -60,8 +60,8 @@ index 85e09c4..e1410e2 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -884,7 +884,7 @@ gnupg_datadir (void) - name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL); +@@ -1026,7 +1026,7 @@ gnupg_datadir (void) + } return name; #else /*!HAVE_W32_SYSTEM*/ - return GNUPG_DATADIR;
@@ -69,8 +69,8 @@ index 85e09c4..e1410e2 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -900,7 +900,7 @@ gnupg_localedir (void) - NULL); +@@ -1045,7 +1045,7 @@ gnupg_localedir (void) + } return name; #else /*!HAVE_W32_SYSTEM*/ - return LOCALEDIR;
@@ -78,12 +78,3 @@ index 85e09c4..e1410e2 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -971,7 +971,7 @@ gnupg_cachedir (void) - } - return dir; - #else /*!HAVE_W32_SYSTEM*/ -- return GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME; -+ return getenv("GNUPG_LOCALSTATEDIR") ?: GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME; - #endif /*!HAVE_W32_SYSTEM*/ - } -
meta/recipes-support/gnupg/gnupg_2.3.2.bb renamed from meta/recipes-support/gnupg/gnupg_2.3.1.bb +1 -1
@@ -24,7 +24,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for- file://relocate.patch" SRC_URI:append:class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "c498db346a9b9a4b399e514c8f56dfc0a888ce8f327f10376ff984452cd154ec" +SRC_URI[sha256sum] = "e1d953e0e296072fca284215103ef168885eaac596c4660c5039a36a83e3041b" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \
Signature · 1 line
2.31.1
PATCH 13/26 pinentry: update 1.1.1 -> 1.2.0
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Rebase patches.
---
meta/lib/oeqa/selftest/cases/oescripts.py | 2 +-
.../gpg-error_pkconf.patch | 126 ++++++++++--------
.../libassuan_pkgconf.patch | 0
.../{pinentry_1.1.1.bb => pinentry_1.2.0.bb} | 2 +-
4 files changed, 74 insertions(+), 56 deletions(-)
rename meta/recipes-support/pinentry/{pinentry-1.1.1 => pinentry-1.2.0}/gpg-error_pkconf.patch (57%)
rename meta/recipes-support/pinentry/{pinentry-1.1.1 => pinentry-1.2.0}/libassuan_pkgconf.patch (100%)
rename meta/recipes-support/pinentry/{pinentry_1.1.1.bb => pinentry_1.2.0.bb} (93%)meta/lib/oeqa/selftest/cases/oescripts.py +1 -1
@@ -167,7 +167,7 @@ class OEListPackageconfigTests(OEScriptTests): def test_packageconfig_flags_option_all(self): results = runCmd('%s/contrib/list-packageconfig-flags.py -a' % self.scripts_dir) expected_endlines = [] - expected_endlines.append("pinentry-1.1.1") + expected_endlines.append("pinentry-1.2.0") expected_endlines.append("PACKAGECONFIG ncurses libcap") expected_endlines.append("PACKAGECONFIG[qt] --enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase") expected_endlines.append("PACKAGECONFIG[gtk2] --enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0")
meta/recipes-support/pinentry/pinentry-1.2.0/gpg-error_pkconf.patch renamed from meta/recipes-support/pinentry/pinentry-1.1.1/gpg-error_pkconf.patch +72 -54
164 lines not on this page · raw message
meta/recipes-support/pinentry/pinentry-1.2.0/libassuan_pkgconf.patch renamed from meta/recipes-support/pinentry/pinentry-1.1.1/libassuan_pkgconf.patch +0 -0
meta/recipes-support/pinentry/pinentry_1.2.0.bb renamed from meta/recipes-support/pinentry/pinentry_1.1.1.bb +1 -1
@@ -16,7 +16,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://gpg-error_pkconf.patch \ " -SRC_URI[sha256sum] = "cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f" +SRC_URI[sha256sum] = "10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470" inherit autotools pkgconfig
Signature · 1 line
2.31.1
PATCH 14/26 spirv-tools: update 2021.2 -> 2021.3
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop 0001-fix-strncpy-bound-error.patch; issue fixed upstream.
Bump spirv-headers revision to avoid outdated headers causing build errors.
---
.../files/0001-fix-strncpy-bound-error.patch | 30 -------------------
.../spir/spirv-headers_1.5.4.bb | 2 +-
...-tools_2021.2.bb => spirv-tools_2021.3.bb} | 6 ++--
3 files changed, 3 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-graphics/spir/files/0001-fix-strncpy-bound-error.patch
rename meta/recipes-graphics/spir/{spirv-tools_2021.2.bb => spirv-tools_2021.3.bb} (86%)meta/recipes-graphics/spir/files/0001-fix-strncpy-bound-error.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 1ba007583b83468494c4146bcb7267d863de6a7b Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 26 Feb 2021 23:54:10 -0800 -Subject: [PATCH] fix strncpy bound error - -This patch fixes the following error while using gcc 11 -error: 'char* __builtin_strncpy(char*, const char*, long unsigned int)' specified bound depends on the length of the source argument [-Werror=stringop-overflow=] - -Upstream-Status: Submitted [https://github.com/KhronosGroup/SPIRV-Tools/pull/4151] -Signed-off-by: Khem Raj <[email protected]> ---- - source/diagnostic.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/diagnostic.cpp b/source/diagnostic.cpp -index edc27c8fd..77c29d70c 100644 ---- a/source/diagnostic.cpp -+++ b/source/diagnostic.cpp -@@ -37,7 +37,7 @@ spv_diagnostic spvDiagnosticCreate(const spv_position position, - diagnostic->position = *position; - diagnostic->isTextSource = false; - memset(diagnostic->error, 0, length); -- strncpy(diagnostic->error, message, length); -+ memcpy(diagnostic->error, message, length); - return diagnostic; - } - --- -2.30.1 -
meta/recipes-graphics/spir/spirv-headers_1.5.4.bb +1 -1
@@ -7,7 +7,7 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" -SRCREV = "bcf55210f13a4fa3c3d0963b509ff1070e434c79" +SRCREV = "6cae8216a6ea19ff3f237af01e54378c1ff81fcd" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$" S = "${WORKDIR}/git"
meta/recipes-graphics/spir/spirv-tools_2021.3.bb renamed from meta/recipes-graphics/spir/spirv-tools_2021.2.bb +2 -4
@@ -7,10 +7,8 @@ SECTION = "graphics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "e198c6a785d388db68eb9166b43ac5e5208fd5cc" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git \ - file://0001-fix-strncpy-bound-error.patch \ - " +SRCREV = "1fbed83c8aab8517d821fcb4164c08567951938f" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git" UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
PATCH 15/26 glslang: update 11.5.0 -> 11.6.0
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
---
.../glslang/{glslang_11.5.0.bb => glslang_11.6.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/glslang/{glslang_11.5.0.bb => glslang_11.6.0.bb} (95%)meta/recipes-graphics/glslang/glslang_11.6.0.bb renamed from meta/recipes-graphics/glslang/glslang_11.5.0.bb +1 -1
@@ -8,7 +8,7 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229" -SRCREV = "ae2a562936cc8504c9ef2757cceaff163147834f" +SRCREV = "2fb89a0072ae7316af1c856f22663fde4928128a" SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https \ file://0001-generate-glslang-pkg-config.patch" UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
Signature · 1 line
2.31.1
PATCH 16/26 shaderc: update 2021.1 -> 2021.2
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
---
.../shaderc/{shaderc_2021.1.bb => shaderc_2021.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/shaderc/{shaderc_2021.1.bb => shaderc_2021.2.bb} (95%)meta/recipes-graphics/shaderc/shaderc_2021.2.bb renamed from meta/recipes-graphics/shaderc/shaderc_2021.1.bb +1 -1
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "031a8c9715df5d7c69dcc1ee9d53cbfa35c7b026" +SRCREV = "2c5ef1b8f8b1fdcbe1b22764e82d5caaa1d04ef9" SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ file://0001-cmake-disable-building-external-dependencies.patch \ file://0002-libshaderc_util-fix-glslang-header-file-location.patch \
Signature · 1 line
2.31.1
PATCH 17/26 lttng: update 2.12 -> 2.13.0
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop 0001-tests-regression-disable-the-tools-live-tests.patch (mass-disabling of ptests) and replace that with more targeted fixes:
- a patch that adds explicit sleeps where races due to too tight timings were observed (not a proper fix; upstream needs to figure out how to sync explicitly and reliably)
- LD_LIBRARY_PATH so that helper binaries are able to find their custom libraries they're linked with (we strip rpath from them for reproducibility)
- set pgrep location explicitly as it used unconditionally on target, but auto-detected (incorrectly) on the host
- enable kmod as it is available in target images
- correct various missing scripts, binaries, and inhibit stripping where that is expected.
License-Update: license info consolidated in LICENSE
---
...1-src-common-correct-header-location.patch | 41 +++++++++
...ression-disable-the-tools-live-tests.patch | 55 ------------
...more-before-analysing-traces-or-star.patch | 88 +++++++++++++++++++
.../lttng/lttng-tools/run-ptest | 1 +
...-tools_2.12.4.bb => lttng-tools_2.13.0.bb} | 22 +++--
...-common-link-with-liburcu-explicitly.patch | 25 ++++++
...Makefile.am-Add-install-lib-to-setup.patch | 22 +++--
...ttng-ust_2.12.2.bb => lttng-ust_2.13.0.bb} | 7 +-
8 files changed, 185 insertions(+), 76 deletions(-)
create mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-src-common-correct-header-location.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch
create mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-tests-wait-some-more-before-analysing-traces-or-star.patch
rename meta/recipes-kernel/lttng/{lttng-tools_2.12.4.bb => lttng-tools_2.13.0.bb} (88%)
create mode 100644 meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch
rename meta/recipes-kernel/lttng/{lttng-ust_2.12.2.bb => lttng-ust_2.13.0.bb} (83%)meta/recipes-kernel/lttng/lttng-tools/0001-src-common-correct-header-location.patch new file +41 -0
@@ -0,0 +1,41 @@ +From 790ef313364d1f1efb6f283705bb324eea2979ba Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Sun, 5 Sep 2021 10:13:08 +0200 +Subject: [PATCH] src/common: correct header location + +sys/unistd.h is not guaranteed to exist, and does not with +e.g. musl C library. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/common/kernel-probe.c | 2 +- + src/common/userspace-probe.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/common/kernel-probe.c b/src/common/kernel-probe.c +index 2beb53f..44100bc 100644 +--- a/src/common/kernel-probe.c ++++ b/src/common/kernel-probe.c +@@ -20,7 +20,7 @@ + #include <lttng/kernel-probe.h> + #include <sys/stat.h> + #include <sys/types.h> +-#include <sys/unistd.h> ++#include <unistd.h> + + static + int lttng_kernel_probe_location_address_serialize( +diff --git a/src/common/userspace-probe.c b/src/common/userspace-probe.c +index 67b0ee6..66afc6f 100644 +--- a/src/common/userspace-probe.c ++++ b/src/common/userspace-probe.c +@@ -20,7 +20,7 @@ + #include <lttng/userspace-probe-internal.h> + #include <sys/stat.h> + #include <sys/types.h> +-#include <sys/unistd.h> ++#include <unistd.h> + + static + int lttng_userspace_probe_location_function_set_binary_fd_handle(
meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch deleted +0 -55
55 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-tools/0001-tests-wait-some-more-before-analysing-traces-or-star.patch new file +88 -0
88 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-tools/run-ptest +1 -0
@@ -1,6 +1,7 @@ #!/bin/sh # Without --ignore-exit, the tap harness causes any FAILs within a # test plan to raise ERRORs; this is just noise. +export LD_LIBRARY_PATH=FIXMEPTESTPATH/tests/utils/testapp/userspace-probe-elf-binary/.libs makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=$PWD top_builddir=$PWD" make -k -t all >/dev/null 2>&1 exec make -k -s $makeargs check 2>/dev/null | sed -e 's#/tmp/tmp\...........#/tmp/tmp.XXXXXXXXXX#g'
meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb renamed from meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb +17 -5
@@ -25,7 +25,7 @@ PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \ PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ " -PACKAGECONFIG ??= "${LTTNGUST}" +PACKAGECONFIG ??= "${LTTNGUST} kmod" PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native" PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust" PACKAGECONFIG[kmod] = "--with-kmod, --without-kmod, kmod"
@@ -35,14 +35,17 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://0001-tests-do-not-strip-a-helper-library.patch \ file://run-ptest \ file://lttng-sessiond.service \ - file://0001-tests-regression-disable-the-tools-live-tests.patch \ file://determinism.patch \ + file://0001-src-common-correct-header-location.patch \ + file://0001-tests-wait-some-more-before-analysing-traces-or-star.patch \ " -SRC_URI[sha256sum] = "d729f8c2373a41194f171aeb0da0a9bb35ac181f31afa7e260786d19a500dea1" +SRC_URI[sha256sum] = "8dc894f9a7a840e943c1c344345c75f001a9529daa9157f1a0e6175c081c29e6" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd +CACHED_CONFIGUREVARS = "PGREP=/usr/bin/pgrep" + SYSTEMD_SERVICE:${PN} = "lttng-sessiond.service" SYSTEMD_AUTO_ENABLE = "disable"
@@ -72,14 +75,18 @@ do_install_ptest () { for f in Makefile tests/Makefile tests/utils/utils.sh tests/regression/tools/save-load/*.lttng \ tests/regression/tools/save-load/configuration/load-42*.lttng tests/regression/tools/health/test_health.sh \ tests/regression/tools/metadata/utils.sh tests/regression/tools/rotation/rotate_utils.sh \ + tests/regression/tools/notification/util_event_generator.sh \ tests/regression/tools/base-path/*.lttng; do install -D "${B}/$f" "${D}${PTEST_PATH}/$f" done - for f in config/tap-driver.sh config/test-driver src/common/config/session.xsd src/common/mi-lttng-4.0.xsd; do + for f in tests/utils/tap-driver.sh config/test-driver src/common/config/session.xsd src/common/mi-lttng-4.1.xsd; do install -D "${S}/$f" "${D}${PTEST_PATH}/$f" done + # Patch in the correct path for the custom libraries a helper executable needs + sed -i -e 's!FIXMEPTESTPATH!${PTEST_PATH}!' "${D}${PTEST_PATH}/run-ptest" + # Prevent 'make check' from recursing into non-test subdirectories. sed -i -e 's!^SUBDIRS = .*!SUBDIRS = tests!' "${D}${PTEST_PATH}/Makefile"
@@ -107,7 +114,7 @@ do_install_ptest () { for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f case $f in - *.so) + *.so|userspace-probe-elf-binary) install -d ${D}${PTEST_PATH}/tests/$d/ ln -s ../$f ${D}${PTEST_PATH}/tests/$d/$f # Remove any rpath/runpath to pass QA check.
@@ -175,3 +182,8 @@ do_install_ptest () { esac done } + +INHIBIT_PACKAGE_STRIP_FILES = "\ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/.libs/userspace-probe-elf-binary \ + "
meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 2058584b7e87d6bd9d1765577766e0df7752232c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Sun, 5 Sep 2021 10:44:19 +0200 +Subject: [PATCH] lttng-ust-common: link with liburcu explicitly + +Otherwise linking errors are seen on x86-32. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/lib/lttng-ust-common/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/lttng-ust-common/Makefile.am b/src/lib/lttng-ust-common/Makefile.am +index caeea2b..30febf0 100644 +--- a/src/lib/lttng-ust-common/Makefile.am ++++ b/src/lib/lttng-ust-common/Makefile.am +@@ -15,6 +15,7 @@ liblttng_ust_common_la_SOURCES = \ + + liblttng_ust_common_la_LIBADD = \ + $(top_builddir)/src/common/libcommon.la \ ++ $(URCU_LIBS) \ + $(DL_LIBS) + + liblttng_ust_common_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch +10 -12
@@ -1,4 +1,4 @@ -From f79dac30af9adda12996da7f6aa6667d3b580537 Mon Sep 17 00:00:00 2001 +From dd1fdc841d069dbd4e284f430a88af79de951124 Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected]> Date: Thu, 26 Sep 2019 17:54:00 +0800 Subject: [PATCH] python-lttngust/Makefile.am: Add --install-lib to setup.py
@@ -9,23 +9,21 @@ building. Upstream-Status: Submitted [https://github.com/lttng/lttng-ust/pull/59] Signed-off-by: Robert Yang <[email protected]> + --- - python-lttngust/Makefile.am | 2 +- + src/python-lttngust/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/python-lttngust/Makefile.am b/python-lttngust/Makefile.am -index 6c0d20d..38b51b8 100644 ---- a/python-lttngust/Makefile.am -+++ b/python-lttngust/Makefile.am -@@ -9,7 +9,7 @@ install-exec-local: +diff --git a/src/python-lttngust/Makefile.am b/src/python-lttngust/Makefile.am +index f95482d..f76d95b 100644 +--- a/src/python-lttngust/Makefile.am ++++ b/src/python-lttngust/Makefile.am +@@ -32,7 +32,7 @@ install-exec-local: build-python-bindings.stamp if [ "$(DESTDIR)" != "" ]; then \ opts="$$opts --root=$(DESTDIR)"; \ fi; \ -- $(PYTHON) setup.py install $$opts; -+ $(PYTHON) setup.py install $$opts --install-lib=$(pythondir); +- $(PYTHON) $(builddir)/setup.py install $$opts; ++ $(PYTHON) $(builddir)/setup.py install $$opts --install-lib=$(pythondir); clean-local: rm -rf $(builddir)/build --- -2.7.4 -
meta/recipes-kernel/lttng/lttng-ust_2.13.0.bb renamed from meta/recipes-kernel/lttng/lttng-ust_2.12.2.bb +3 -4
@@ -4,9 +4,7 @@ HOMEPAGE = "http://lttng.org/ust" BUGTRACKER = "https://bugs.lttng.org/projects/lttng-ust" LICENSE = "LGPLv2.1+ & MIT & GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \ - file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \ - file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a46577a38ad0c36ff6ff43ccf40c480f" PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \
@@ -31,9 +29,10 @@ PE = "2" SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ file://0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch \ + file://0001-lttng-ust-common-link-with-liburcu-explicitly.patch \ " -SRC_URI[sha256sum] = "bcd0f064b6ca88c72d84e760eac3472ae5c828411c634435922bee9fce359fc7" +SRC_URI[sha256sum] = "54e4c933679cf6a07971dc5861ce57fc4876ab740ab612407b30b5fc85371750" CVE_PRODUCT = "ust"
Signature · 1 line
2.31.1
PATCH 18/26 core-image-ptest-all: bump RAM requirement to 4G
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
/tmp is half that, and lttng-ptest writes just under 1G there (and just over 1G on aarch64), so let's have a safe margin.
--- meta/recipes-core/images/core-image-ptest-all.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/images/core-image-ptest-all.bb +2 -2
@@ -18,8 +18,8 @@ IMAGE_OVERHEAD_FACTOR = "1.0" IMAGE_ROOTFS_EXTRA_SPACE = "1124288" # ptests need more memory than standard to avoid the OOM killer -# also lttng-tools needs /tmp that has at least 1G -QB_MEM = "-m 2048" +# also lttng-tools needs /tmp that has at least 2G +QB_MEM = "-m 4096" # Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places PTEST_EXPECT_FAILURE = "1"
Signature · 1 line
2.31.1
PATCH 19/26 inetutils: update 2.1 -> 2.2
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
---
...tils-only-check-pam_appl.h-when-pam-enabled.patch | 12 ++++++------
.../inetutils/{inetutils_2.1.bb => inetutils_2.2.bb} | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
rename meta/recipes-connectivity/inetutils/{inetutils_2.1.bb => inetutils_2.2.bb} (99%)meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch +6 -6
@@ -1,4 +1,4 @@ -From 684e45b34a33186bb17bcee0b01814c549a60bf6 Mon Sep 17 00:00:00 2001 +From cc66e842e037fba9f06761f942abe5c4856492b8 Mon Sep 17 00:00:00 2001 From: Kai Kang <[email protected]> Date: Wed, 6 Mar 2019 09:36:11 -0500 Subject: [PATCH] inetutils: Import version 1.9.4
@@ -15,10 +15,10 @@ Signed-off-by: Kai Kang <[email protected]> 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 86136fb..b220319 100644 +index 5e16c3a..18510a8 100644 --- a/configure.ac +++ b/configure.ac -@@ -183,6 +183,19 @@ AC_SUBST(LIBUTIL) +@@ -182,6 +182,19 @@ AC_SUBST(LIBUTIL) # See if we have libpam.a. Investigate PAM versus Linux-PAM. if test "$with_pam" = yes ; then
@@ -38,12 +38,12 @@ index 86136fb..b220319 100644 AC_CHECK_LIB(dl, dlopen, LIBDL=-ldl) AC_CHECK_LIB(pam, pam_authenticate, LIBPAM=-lpam) if test "$ac_cv_lib_pam_pam_authenticate" = yes ; then -@@ -620,7 +633,7 @@ AC_HEADER_DIRENT - AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h errno.h fcntl.h features.h \ +@@ -617,7 +630,7 @@ AC_HEADER_DIRENT + AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h fcntl.h features.h \ glob.h memory.h netinet/ether.h netinet/in_systm.h \ netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \ - security/pam_appl.h shadow.h \ + shadow.h \ - stdarg.h stdlib.h string.h stropts.h sys/tty.h \ + stropts.h sys/tty.h \ sys/utsname.h sys/ptyvar.h sys/msgbuf.h sys/filio.h \ sys/ioctl_compat.h sys/cdefs.h sys/stream.h sys/mkdev.h \
meta/recipes-connectivity/inetutils/inetutils_2.2.bb renamed from meta/recipes-connectivity/inetutils/inetutils_2.1.bb +1 -1
@@ -10,7 +10,7 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7" -SRC_URI[sha256sum] = "01b9a4bc73a47e63f6e8a07b76122d9ad2a2e46ebf14870e9c91d660b5647a22" +SRC_URI[sha256sum] = "d547f69172df73afef691a0f7886280fd781acea28def4ff4b4b212086a89d80" SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.xz \ file://inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch \ file://inetutils-1.8-0003-wchar.patch \
Signature · 1 line
2.31.1
PATCH 20/26 systemd: update 249.3 -> 249.4
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
---
...ystemd-boot_249.3.bb => systemd-boot_249.4.bb} | 0
meta/recipes-core/systemd/systemd.inc | 2 +-
.../0002-don-t-use-glibc-specific-qsort_r.patch | 2 +-
....h-add-__compare_fn_t-and-comparison_fn_.patch | 2 +-
...lback-parse_printf_format-implementation.patch | 2 +-
...sic-missing.h-check-for-missing-strndupa.patch | 2 +-
.../systemd/0006-Include-netinet-if_ether.h.patch | 15 ++++++++-------
...f-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch | 2 +-
.../0008-add-missing-FTW_-macros-for-musl.patch | 2 +-
...of-__register_atfork-for-non-glibc-build.patch | 2 +-
.../0010-Use-uintmax_t-for-handling-rlim_t.patch | 2 +-
...c-Disable-tests-for-missing-typedefs-in-.patch | 4 ++--
...ss-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 2 +-
...-compatible-basename-for-non-glibc-syste.patch | 2 +-
...le-buffering-when-writing-to-oom_score_a.patch | 2 +-
...XSI-compliant-strerror_r-from-GNU-specif.patch | 2 +-
...t_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch | 2 +-
...ng_type.h-add-__compar_d_fn_t-definition.patch | 2 +-
...d-redefinition-of-prctl_mm_map-structure.patch | 2 +-
.../systemd/0019-Handle-missing-LOCK_EX.patch | 2 +-
...mpatible-pointer-type-struct-sockaddr_un.patch | 2 +-
.../systemd/0021-test-json.c-define-M_PIl.patch | 2 +-
...2-do-not-disable-buffer-in-writing-files.patch | 2 +-
.../systemd/0025-Handle-__cpu_mask-usage.patch | 4 ++--
.../systemd/0026-Handle-missing-gshadow.patch | 2 +-
...scall.h-Define-MIPS-ABI-defines-for-musl.patch | 2 +-
.../{systemd_249.3.bb => systemd_249.4.bb} | 0
27 files changed, 34 insertions(+), 33 deletions(-)
rename meta/recipes-core/systemd/{systemd-boot_249.3.bb => systemd-boot_249.4.bb} (100%)
rename meta/recipes-core/systemd/{systemd_249.3.bb => systemd_249.4.bb} (100%)meta/recipes-core/systemd/systemd-boot_249.4.bb renamed from meta/recipes-core/systemd/systemd-boot_249.3.bb +0 -0
meta/recipes-core/systemd/systemd.inc +1 -1
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "090378dcb1de5ca66900503210e85d63075fa70a" +SRCREV = "4d8fd88b9641fce81272f60f556543f713175403" SRCBRANCH = "v249-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \ "
meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +1 -1
@@ -1,4 +1,4 @@ -From 40acdb90031cfeb7140cee5205bce24f8c91d857 Mon Sep 17 00:00:00 2001 +From 0be164b79315998e719971db86ed79128ffb4a0b Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 13:41:41 +0800 Subject: [PATCH] don't use glibc-specific qsort_r
meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch +1 -1
@@ -1,4 +1,4 @@ -From 2a2f95b6dc16d2ea7a8e9349c6b19cc50c34777b Mon Sep 17 00:00:00 2001 +From dfcae6aacf2790bdceac3f25fcabf7c6daee176c Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 13:55:12 +0800 Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t
meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch +1 -1
@@ -1,4 +1,4 @@ -From b19f800e178516d4f4d344457647e4a018bd6855 Mon Sep 17 00:00:00 2001 +From fcac5d47366085b29460590d36efafa87ccfe3b2 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Sat, 22 May 2021 20:26:24 +0200 Subject: [PATCH] add fallback parse_printf_format implementation
meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +1 -1
@@ -1,4 +1,4 @@ -From db6551741a3654d8e75aff93ea00fbff579f7b02 Mon Sep 17 00:00:00 2001 +From 5b90aba2eb7340085d657493bf8ec1a9f0e25108 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 14:18:21 +0800 Subject: [PATCH] src/basic/missing.h: check for missing strndupa
meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch +8 -7
@@ -1,4 +1,4 @@ -From d7ae3aadc70555932e03349907f8be04d03a50ee Mon Sep 17 00:00:00 2001 +From 8983334730df280a4e4dcb08e586b453bc1d53bd Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 26 Oct 2017 22:10:42 -0700 Subject: [PATCH] Include netinet/if_ether.h
@@ -103,7 +103,7 @@ index 5ad396a57e..1dc007fe13 100644 -#endif /* _UAPI_LINUX_IN6_H */ +#endif /* _LINUX_IN6_H */ diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c -index e8c47f429a..359922c1b3 100644 +index f99c12620b..4966d62656 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -5,7 +5,6 @@
@@ -274,12 +274,13 @@ index 2b72b618fc..d0d4cfb384 100644 #include "sd-dhcp6-client.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index 9421ce1aa6..3e37cbcc39 100644 +index d58b700050..bba1ca1cab 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c -@@ -1,8 +1,8 @@ +@@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ + #include <net/if.h> +#include <netinet/if_ether.h> #include <netinet/in.h> #include <linux/if.h>
@@ -299,7 +300,7 @@ index 850b4f449e..6f85d41328 100644 #include <netinet/in.h> #include <linux/netdevice.h> diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c -index 77a93beca9..3bf9ae8837 100644 +index b7852f6eec..72514f6a0d 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -1,5 +1,6 @@
@@ -310,7 +311,7 @@ index 77a93beca9..3bf9ae8837 100644 #include <linux/ipv6_route.h> #include <linux/nexthop.h> diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c -index 10c312c480..e44fbb5c35 100644 +index 13c4cedd10..6558d551ab 100644 --- a/src/network/networkd-setlink.c +++ b/src/network/networkd-setlink.c @@ -1,8 +1,8 @@
@@ -369,7 +370,7 @@ index 8dfe23691b..e269856337 100644 #include <netinet/ether.h> #include <unistd.h> diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c -index d40251331c..89566c05f5 100644 +index 5964e30bf1..52a18d7a7f 100644 --- a/src/udev/udev-builtin-net_setup_link.c +++ b/src/udev/udev-builtin-net_setup_link.c @@ -1,5 +1,6 @@
meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch +1 -1
@@ -1,4 +1,4 @@ -From e2d70a1735fc6b9d3c079814831ab0b1b2a9d1e0 Mon Sep 17 00:00:00 2001 +From ea800e99dba3a6013269853540b5d491c7c18d36 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 14:56:21 +0800 Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined
meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +1 -1
@@ -1,4 +1,4 @@ -From 3410d82c9d07aee3e951fc6ae0b41fc1a594e00d Mon Sep 17 00:00:00 2001 +From c25f3f1324a5961348f8df9c1d0441804604a0ff Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:00:06 +0800 Subject: [PATCH] add missing FTW_ macros for musl
meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch +1 -1
@@ -1,4 +1,4 @@ -From 1e3bc870ded807cff0d3771dd89a850d020df032 Mon Sep 17 00:00:00 2001 +From c6cd600f859960c6e22a7e1c8b3d9ba92021e63a Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:03:47 +0800 Subject: [PATCH] fix missing of __register_atfork for non-glibc builds
meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch +1 -1
@@ -1,4 +1,4 @@ -From eeacb75025d8f537d54c35256c5730c9aab15cde Mon Sep 17 00:00:00 2001 +From a47f363edf31142724b8c8773eee9bbdcacbb389 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:12:41 +0800 Subject: [PATCH] Use uintmax_t for handling rlim_t
meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch +2 -2
@@ -1,4 +1,4 @@ -From fa29a572faaeb6fb9ed0bc6802d17139773e1908 Mon Sep 17 00:00:00 2001 +From 1089bdf56990586e734ecabd53d088011ff58b90 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Wed, 28 Feb 2018 21:25:22 -0800 Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl
@@ -13,7 +13,7 @@ Signed-off-by: Chen Qi <[email protected]> 1 file changed, 4 insertions(+) diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index 3c9dc180fa..e1a59d408c 100644 +index e36bee4e8f..4403c0aa52 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -55,8 +55,10 @@ int main(void) {
meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +1 -1
@@ -1,4 +1,4 @@ -From 88c8922f9e4d221402d9cb2e04b9c82e89125827 Mon Sep 17 00:00:00 2001 +From d95ba8d9a880258d1fc74b19aa8dc13141699efb Mon Sep 17 00:00:00 2001 From: Andre McCurdy <[email protected]> Date: Tue, 10 Oct 2017 14:33:30 -0700 Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat()
meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch +1 -1
@@ -1,4 +1,4 @@ -From e07e9b998ad61b09555bc809aa15de9d2516787a Mon Sep 17 00:00:00 2001 +From c03f527bb1973993a3b446b006f5bad71be30786 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sun, 27 May 2018 08:36:44 -0700 Subject: [PATCH] Define glibc compatible basename() for non-glibc systems
meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +1 -1
@@ -1,4 +1,4 @@ -From 2f048d13e100158320bda248635b3c533ac9717b Mon Sep 17 00:00:00 2001 +From 87387970dfbf07c728a7d11f2ea422bc84de80e8 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Wed, 4 Jul 2018 15:00:44 +0800 Subject: [PATCH] Do not disable buffering when writing to oom_score_adj
meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +1 -1
@@ -1,4 +1,4 @@ -From 45148529792c0cda32fdd61610c8d5a700d541fa Mon Sep 17 00:00:00 2001 +From fb1b946c610a0d4fa464c5cb2c4a0daee1e51cea Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Tue, 10 Jul 2018 15:40:17 +0800 Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi
meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch +1 -1
@@ -1,4 +1,4 @@ -From 02a2772889d6cb08c9ca0561b52e7a9a80e50497 Mon Sep 17 00:00:00 2001 +From a24336f917e1b66160f148722554600ff85ac1b8 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:18:00 +0800 Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP
meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch +1 -1
@@ -1,4 +1,4 @@ -From 47c4ac80689077b1eb86cf05b4326b1ac345aedf Mon Sep 17 00:00:00 2001 +From e0acbce4195c99d876e71a4cc20167681822f177 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:27:54 +0800 Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition
meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch +1 -1
@@ -1,4 +1,4 @@ -From 2cb33d8896a4ad2d3b489fed51f17d5e45dfb4fc Mon Sep 17 00:00:00 2001 +From 7a0435a185e931061a2ee6147347db8966233df4 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:44:54 +0800 Subject: [PATCH] avoid redefinition of prctl_mm_map structure
meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch +1 -1
@@ -1,4 +1,4 @@ -From 200a2a2e4f04a7b7078dd455fafbd6774240e30b Mon Sep 17 00:00:00 2001 +From 0c566970ea4fac0e3e597cfce0479c7b3502cff7 Mon Sep 17 00:00:00 2001 From: Alex Kiernan <[email protected]> Date: Fri, 7 Aug 2020 15:19:27 +0000 Subject: [PATCH] Handle missing LOCK_EX
meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch +1 -1
@@ -1,4 +1,4 @@ -From 6445b7737a89256f35adc56701a5c47b48618ced Mon Sep 17 00:00:00 2001 +From e063abdbe73d38302533c02ce5b82116b909b888 Mon Sep 17 00:00:00 2001 From: Alex Kiernan <[email protected]> Date: Fri, 7 Aug 2020 15:20:17 +0000 Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un *
meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch +1 -1
@@ -1,4 +1,4 @@ -From ae71bf2b97dc9d4760defd83463c1d305f332f22 Mon Sep 17 00:00:00 2001 +From 82f509e29039966e942d1e8eb6283d0828d68b8a Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 16:53:06 +0800 Subject: [PATCH] test-json.c: define M_PIl
meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch +1 -1
@@ -1,4 +1,4 @@ -From 3198690c2dbb4b457a04ef21914dc4d531540273 Mon Sep 17 00:00:00 2001 +From 1f2b7e65dc96d01c84d0f33a7edb776988b28f4f Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Fri, 1 Mar 2019 15:22:15 +0800 Subject: [PATCH] do not disable buffer in writing files
meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch +2 -2
@@ -1,4 +1,4 @@ -From b04518c464b526f8b9adc9ce3c08b1881db47989 Mon Sep 17 00:00:00 2001 +From 6f72861193824c5d170ec252857bca040a72c7ab Mon Sep 17 00:00:00 2001 From: Scott Murray <[email protected]> Date: Fri, 13 Sep 2019 19:26:27 -0400 Subject: [PATCH] Handle __cpu_mask usage
@@ -38,7 +38,7 @@ index 3c63a58826..4c2d4347fc 100644 typedef struct CPUSet { cpu_set_t *set; diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index e1a59d408c..c269ea6e8c 100644 +index 4403c0aa52..e7e4ae112d 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -1,6 +1,5 @@
meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch +1 -1
@@ -1,4 +1,4 @@ -From 0c8935128b39864b07dfee39cfa9d35d48f056aa Mon Sep 17 00:00:00 2001 +From 7fd5621608c312313a3be09f934a713176f739a8 Mon Sep 17 00:00:00 2001 From: Alex Kiernan <[email protected]> Date: Tue, 10 Mar 2020 11:05:20 +0000 Subject: [PATCH] Handle missing gshadow
meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch +1 -1
@@ -1,4 +1,4 @@ -From f5d7fee9620cbcf52be8f8ba477890d28cadfbc8 Mon Sep 17 00:00:00 2001 +From 6690522f5096ec68f4a508242e4432e8b1ef07cc Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 12 Apr 2021 23:44:53 -0700 Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl
meta/recipes-core/systemd/systemd_249.4.bb renamed from meta/recipes-core/systemd/systemd_249.3.bb +0 -0
Signature · 1 line
2.31.1
PATCH 21/26 lsof: update 4.91 -> 4.94.0
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop all custom sourcedir handling as the source is now a standard git checkout.
---
.../files/lsof-remove-host-information.patch | 17 +++++------
.../lsof/{lsof_4.91.bb => lsof_4.94.0.bb} | 28 +++----------------
2 files changed, 13 insertions(+), 32 deletions(-)
rename meta/recipes-extended/lsof/{lsof_4.91.bb => lsof_4.94.0.bb} (53%)meta/recipes-extended/lsof/files/lsof-remove-host-information.patch +9 -8
@@ -1,25 +1,29 @@ -Remove host information from version.h +From 95b8a13c1ea4274f58304bf5c4f7ca3d036b10f3 Mon Sep 17 00:00:00 2001 +From: Li Wang <[email protected]> +Date: Wed, 30 Aug 2017 15:05:16 +0800 +Subject: [PATCH] Remove host information from version.h make lsof not include host information Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Li Wang <[email protected]> + --- - dialects/linux/Makefile | 50 +++++++++-------------------------------------- + dialects/linux/Makefile | 50 ++++++++--------------------------------- 1 file changed, 9 insertions(+), 41 deletions(-) diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile -index 2bea108..792142b 100644 +index 61e8643..5458a0a 100644 --- a/dialects/linux/Makefile +++ b/dialects/linux/Makefile -@@ -76,48 +76,16 @@ version.h: FRC +@@ -95,48 +95,16 @@ version.h: FRC @echo Constructing version.h @rm -f version.h @echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h; - @echo '#define LSOF_CC "${CC}"' >> version.h - @echo '#define LSOF_CCV "${CCV}"' >> version.h -- @echo '#define LSOF_CCDATE "'`date`'"' >> version.h +- @echo '#define LSOF_CCDATE "$(BUILD_DATE)"' >> version.h - @echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h + @echo '#define LSOF_CC ""' >> version.h + @echo '#define LSOF_CCV ""' >> version.h
@@ -71,6 +75,3 @@ index 2bea108..792142b 100644 @sed '/VN/s/.ds VN \(.*\)/#define LSOF_VERSION "\1"/' < version >> version.h FRC: --- -1.7.9.5 -
meta/recipes-extended/lsof/lsof_4.94.0.bb renamed from meta/recipes-extended/lsof/lsof_4.91.bb +4 -24
@@ -11,33 +11,13 @@ LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429 # https://people.freebsd.org/~abe/ ). http://www.mirrorservice.org seems to be # the most commonly used alternative. -SRC_URI = "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2 \ +SRC_URI = "git://github.com/lsof-org/lsof \ file://lsof-remove-host-information.patch \ " -SRC_URI[md5sum] = "148ed410cb52e08c2adc0c60f480f11f" -SRC_URI[sha256sum] = "c9da946a525fbf82ff80090b6d1879c38df090556f3fe0e6d782cb44172450a3" +SRCREV = "005e014e1abdadb2493d8b3ce87b37a2c0a2351d" -UPSTREAM_CHECK_URI = "https://github.com/lsof-org/lsof/releases/" -UPSTREAM_CHECK_REGEX = "lsof_(?P<pver>.*)\.linux\.tar" - -LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar" - -S = "${WORKDIR}/lsof_${PV}_src" - -python do_unpack () { - if not bb.data.inherits_class('externalsrc', d) or not d.getVar('EXTERNALSRC'): - # temporarily change S for unpack of lsof_${PV} - s = d.getVar('S', False) - d.setVar('S', '${WORKDIR}/lsof_${PV}') - bb.build.exec_func('base_do_unpack', d) - # temporarily change SRC_URI for unpack of lsof_${PV}_src - src_uri = d.getVar('SRC_URI', False) - d.setVar('SRC_URI', '${LOCALSRC}') - d.setVar('S', s) - bb.build.exec_func('base_do_unpack', d) - d.setVar('SRC_URI', src_uri) -} +S = "${WORKDIR}/git" export LSOF_INCLUDE = "${STAGING_INCDIR}"
@@ -62,5 +42,5 @@ do_compile () { do_install () { install -d ${D}${sbindir} ${D}${mandir}/man8 install -m 0755 lsof ${D}${sbindir}/lsof - install -m 0644 lsof.8 ${D}${mandir}/man8/lsof.8 + install -m 0644 Lsof.8 ${D}${mandir}/man8/lsof.8 }
Signature · 1 line
2.31.1
PATCH 22/26 libpam: update 1.5.1 -> 1.5.2
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop patches: issues fixed upstream.
Move .pc files to correct place as libpam is instructed to install them in /lib via --libdir.
---
.../0001-Makefile.am-support-usrmage.patch | 28 -------------------
...space-Makefile.am-correctly-install-.patch | 28 -------------------
.../pam/{libpam_1.5.1.bb => libpam_1.5.2.bb} | 7 +++--
3 files changed, 4 insertions(+), 59 deletions(-)
delete mode 100644 meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch
delete mode 100644 meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch
rename meta/recipes-extended/pam/{libpam_1.5.1.bb => libpam_1.5.2.bb} (96%)meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From c09e012590c1ec2d3b622b64f1bfc10a2286c9ea Mon Sep 17 00:00:00 2001 -From: Changqing Li <[email protected]> -Date: Wed, 6 Jan 2021 12:08:20 +0800 -Subject: [PATCH] Makefile.am: support usrmage - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li <[email protected]> ---- - modules/pam_namespace/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am -index ddd5fc0..a1f1bec 100644 ---- a/modules/pam_namespace/Makefile.am -+++ b/modules/pam_namespace/Makefile.am -@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) - securelibdir = $(SECUREDIR) - secureconfdir = $(SCONFIGDIR) - namespaceddir = $(SCONFIGDIR)/namespace.d --servicedir = /lib/systemd/system -+servicedir = $(systemd_system_unitdir) - - AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) --- -2.17.1 -
meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From e2db4082f6b988f1d5803028e9e47aee5f3519ac Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Sun, 27 Dec 2020 00:30:45 +0100 -Subject: [PATCH] modules/pam_namespace/Makefile.am: correctly install systemd - unit file - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <[email protected]> ---- - modules/pam_namespace/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am -index 21e1b33..ddd5fc0 100644 ---- a/modules/pam_namespace/Makefile.am -+++ b/modules/pam_namespace/Makefile.am -@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) - securelibdir = $(SECUREDIR) - secureconfdir = $(SCONFIGDIR) - namespaceddir = $(SCONFIGDIR)/namespace.d --servicedir = $(prefix)/lib/systemd/system -+servicedir = /lib/systemd/system - - AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) --- -2.24.0 -
meta/recipes-extended/pam/libpam_1.5.2.bb renamed from meta/recipes-extended/pam/libpam_1.5.1.bb +4 -3
@@ -21,18 +21,17 @@ SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux file://pam.d/common-session-noninteractive \ file://pam.d/other \ file://libpam-xtests.patch \ - file://0001-modules-pam_namespace-Makefile.am-correctly-install-.patch \ - file://0001-Makefile.am-support-usrmage.patch \ file://run-ptest \ file://pam-volatiles.conf \ " -SRC_URI[sha256sum] = "201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc" +SRC_URI[sha256sum] = "e4ec7131a91da44512574268f493c6d8ca105c87091691b8e9b56ca685d4f94d" DEPENDS = "bison-native flex flex-native cracklib libxml2-native virtual/crypt" EXTRA_OECONF = "--includedir=${includedir}/security \ --libdir=${base_libdir} \ + --with-systemdunitdir=${systemd_system_unitdir} \ --disable-nis \ --disable-regenerate-docu \ --disable-doc \
@@ -148,6 +147,8 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session fi + install -d ${D}/${libdir}/ + mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/ } do_install_ptest() {
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 22/26] libpam: update 1.5.1 -> 1.5.2
Quoted 114 lines · Alexander Kanavin
From: Alexander Kanavin <[email protected]>
Drop patches: issues fixed upstream.
Move .pc files to correct place as libpam is instructed to install them in /lib via --libdir.
Signed-off-by Alexander Kanavin <[email protected]>--- .../0001-Makefile.am-support-usrmage.patch | 28 ------------------- ...space-Makefile.am-correctly-install-.patch | 28 ------------------- .../pam/{libpam_1.5.1.bb => libpam_1.5.2.bb} | 7 +++-- 3 files changed, 4 insertions(+), 59 deletions(-)delete mode 100644
meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patchdelete mode 100644meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patchrename meta/recipes-extended/pam/{libpam_1.5.1.bb => libpam_1.5.2.bb} (96%)meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch deleted +0
-28@@ -1,28 +0,0 @@ -From c09e012590c1ec2d3b622b64f1bfc10a2286c9ea Mon Sep 17 00:00:00 2001 -From: Changqing Li <[email protected]> -Date: Wed, 6 Jan 2021 12:08:20 +0800 -Subject: [PATCH] Makefile.am: support usrmage - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li <[email protected]> ---- - modules/pam_namespace/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am -index ddd5fc0..a1f1bec 100644 ---- a/modules/pam_namespace/Makefile.am -+++ b/modules/pam_namespace/Makefile.am -@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) - securelibdir = $(SECUREDIR) - secureconfdir = $(SCONFIGDIR) - namespaceddir = $(SCONFIGDIR)/namespace.d --servicedir = /lib/systemd/system -+servicedir = $(systemd_system_unitdir) - - AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) --- -2.17.1 -meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch deleted +0
-28@@ -1,28 +0,0 @@ -From e2db4082f6b988f1d5803028e9e47aee5f3519ac Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Sun, 27 Dec 2020 00:30:45 +0100 -Subject: [PATCH] modules/pam_namespace/Makefile.am: correctly install systemd - unit file - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <[email protected]> ---- - modules/pam_namespace/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am -index 21e1b33..ddd5fc0 100644 ---- a/modules/pam_namespace/Makefile.am -+++ b/modules/pam_namespace/Makefile.am -@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) - securelibdir = $(SECUREDIR) - secureconfdir = $(SCONFIGDIR) - namespaceddir = $(SCONFIGDIR)/namespace.d --servicedir = $(prefix)/lib/systemd/system -+servicedir = /lib/systemd/system - - AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) --- -2.24.0 -meta/recipes-extended/pam/libpam_1.5.2.bb renamed from meta/recipes-extended/pam/libpam_1.5.1.bb +2
-3@@ -21,18 +21,17 @@ SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux file://pam.d/common-session-noninteractive \ file://pam.d/other \ file://libpam-xtests.patch \ - file://0001-modules-pam_namespace-Makefile.am-correctly-install-.patch \ - file://0001-Makefile.am-support-usrmage.patch \ file://run-ptest \ file://pam-volatiles.conf \ " -SRC_URI[sha256sum] = "201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc" +SRC_URI[sha256sum] = "e4ec7131a91da44512574268f493c6d8ca105c87091691b8e9b56ca685d4f94d" DEPENDS = "bison-native flex flex-native cracklib libxml2-native virtual/crypt" EXTRA_OECONF = "--includedir=${includedir}/security \ --libdir=${base_libdir} \ + --with-systemdunitdir=${systemd_system_unitdir} \ --disable-nis \ --disable-regenerate-docu \ --disable-doc \
meta/recipes-extended/pam/libpam_1.5.2.bb do_install() { · line 151
Quoted 5 lines
meta/recipes-extended/pam/libpam_1.5.2.bb renamed from meta/recipes-extended/pam/libpam_1.5.1.bb +2
-0@@ -148,6 +147,8 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session fi + install -d ${D}/${libdir}/ + mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
This is broken with DISTRO_FEATURES "usrmerge". mv complains that the src and dest are the same files.
Best regards,
Zoltán Böszörményi
Quoted 8 lines
meta/recipes-extended/pam/libpam_1.5.2.bb renamed from meta/recipes-extended/pam/libpam_1.5.1.bb +0
-0} do_install_ptest() {
PATCH 23/26 libhandy: update 1.2.3 -> 1.4.0
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
---
.../libhandy/{libhandy_1.2.3.bb => libhandy_1.4.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/libhandy/{libhandy_1.2.3.bb => libhandy_1.4.0.bb} (92%)meta/recipes-gnome/libhandy/libhandy_1.4.0.bb renamed from meta/recipes-gnome/libhandy/libhandy_1.2.3.bb +2 -2
@@ -9,8 +9,8 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-2" -SRCREV = "e9ca4ac4b134bbd6ab91b6f916a915192fd3a465" +SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https" +SRCREV = "f8626427acebfa08b2b4ee1166d51e416d3d7407" S = "${WORKDIR}/git" GIR_MESON_ENABLE_FLAG = 'enabled'
Signature · 1 line
2.31.1
PATCH 24/26 rt-tests: update 2.1 -> 2.2
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
--- ...0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch | 6 +++--- meta/recipes-rt/rt-tests/rt-tests.inc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch +3 -3
@@ -1,4 +1,4 @@ -From 7b0ab10370cad38e26c5ffaaa55a1fd77fff0f18 Mon Sep 17 00:00:00 2001 +From 05ccf5045adf4248f29623ad0db2d2a55ae5cd06 Mon Sep 17 00:00:00 2001 From: Randy Witt <[email protected]> Date: Fri, 16 Oct 2020 16:54:30 -0700 Subject: [PATCH] Makefile: Allow for CC and AR to be overridden
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [other] 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 63cd77c..495d6bb 100644 +index ec5d693..ab8a8de 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ - VERSION = 2.1 + VERSION = 2.2 -CC = $(CROSS_COMPILE)gcc -AR = $(CROSS_COMPILE)ar +CC ?= $(CROSS_COMPILE)gcc
meta/recipes-rt/rt-tests/rt-tests.inc +2 -2
@@ -1,5 +1,5 @@ -SRCREV = "667e1aae896f8448615b062d27c818b32cb960ff" -PV = "2.1" +SRCREV = "75c16956e32817dfb0d5cb7379e731061e16593f" +PV = "2.2" PE = "1" SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main"
Signature · 1 line
2.31.1
PATCH 25/26 libgit2: update 1.1.1 -> 1.2.0
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
License-Update: includes portions of openssl headers
https://github.com/libgit2/libgit2/commit/0903cac1d08817e87c556f5a3e6ec881be86c7f2
---
.../libgit2/{libgit2_1.1.1.bb => libgit2_1.2.0.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-support/libgit2/{libgit2_1.1.1.bb => libgit2_1.2.0.bb} (59%)meta/recipes-support/libgit2/libgit2_1.2.0.bb renamed from meta/recipes-support/libgit2/libgit2_1.1.1.bb +4 -4
@@ -1,12 +1,12 @@ SUMMARY = "the Git linkable library" HOMEPAGE = "http://libgit2.github.com/" -LICENSE = "GPL-2.0-with-GCC-exception & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e" +LICENSE = "GPL-2.0-with-GCC-exception & MIT & openssl" +LIC_FILES_CHKSUM = "file://COPYING;md5=73fa96e40ce64f79bab087c7e1deeacd" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.1" -SRCREV = "8a0dc6783c340e61a44c179c48f832165ad2053c" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main" +SRCREV = "4fd32be01c79a5c003bb47674ac1d76d948518b7" S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
PATCH 26/26 libssh2: update 1.9.0 -> 1.10.0
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
0001-configure-Conditionally-undefine-backend-m4-macro.patch no longer needed; code removed upstream.
License-Update: copyright years
---
...nviroment-to-decide-if-a-test-is-bui.patch | 6 +-
...ditionally-undefine-backend-m4-macro.patch | 30 ----
...EC-macro-outside-of-if-check-549-550.patch | 112 ---------------
.../libssh2/files/CVE-2019-17498.patch | 131 ------------------
.../{libssh2_1.9.0.bb => libssh2_1.10.0.bb} | 10 +-
5 files changed, 5 insertions(+), 284 deletions(-)
delete mode 100644 meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch
delete mode 100644 meta/recipes-support/libssh2/files/0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch
delete mode 100644 meta/recipes-support/libssh2/files/CVE-2019-17498.patch
rename meta/recipes-support/libssh2/{libssh2_1.9.0.bb => libssh2_1.10.0.bb} (78%)meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch +2 -4
@@ -1,4 +1,4 @@ -From f9e3e2ee7b18ba5bb8efe083171f3e701eb0a663 Mon Sep 17 00:00:00 2001 +From f6abce5ba41a412a247250dcd80e387e53474466 Mon Sep 17 00:00:00 2001 From: Your Name <[email protected]> Date: Mon, 28 Dec 2020 02:08:03 +0000 Subject: [PATCH] Don't let host enviroment to decide if a test is build
@@ -9,6 +9,7 @@ don't use SSHD on host to decide weither to build a test Upstream-Status: Inappropriate[oe specific] Signed-off-by: Changqing Li <[email protected]> + --- tests/Makefile.am | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
@@ -41,6 +42,3 @@ index dc0922f..6cbc35d 100644 -endif \ No newline at end of file +endif --- -2.20.1 -
meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From efe7101786193eaddb749c0583af6b54aec6f289 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 2 Feb 2021 18:45:16 -0800 -Subject: [PATCH] configure: Conditionally undefine backend m4 macro - -Unlike the M4 builtin, this macro fails if macro is not defined -therefore recover the behavior of the builtin. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index fe5054a..758f8c2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -127,7 +127,7 @@ fi - m4_set_foreach([crypto_backends], [backend], - [AM_CONDITIONAL(m4_toupper(backend), test "$found_crypto" = "backend")] - ) --m4_undefine([backend]) -+m4_ifdef([backend], [m4_undefine([backend])]) - - - # libz --- -2.30.0 -
meta/recipes-support/libssh2/files/0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch deleted +0 -112
112 lines not on this page · raw message
meta/recipes-support/libssh2/files/CVE-2019-17498.patch deleted +0 -131
131 lines not on this page · raw message
meta/recipes-support/libssh2/libssh2_1.10.0.bb renamed from meta/recipes-support/libssh2/libssh2_1.9.0.bb +3 -7
@@ -5,19 +5,15 @@ SECTION = "libs" DEPENDS = "zlib" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" +LIC_FILES_CHKSUM = "file://COPYING;md5=3e089ad0cf27edf1e7f261dfcd06acc7" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ - file://CVE-2019-17498.patch \ - file://0001-configure-Conditionally-undefine-backend-m4-macro.patch \ file://run-ptest \ - file://0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch \ -" + " SRC_URI:append:ptest = " file://0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch" -SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" -SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" +SRC_URI[sha256sum] = "2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51" inherit autotools pkgconfig ptest
Signature · 1 line
2.31.1
-----Original Message-----
Quoted 7 lines
From: [email protected] <openembedded- [email protected]> On Behalf Of Alexander Kanavin
Sent: den 8 september 2021 20:01
To: [email protected]
Cc: Alexander Kanavin <[email protected]>
Subject: [OE-core] [PATCH 01/26] meson: update 0.58.1 -> 0.59.1
Quoted 6 lines
Drop 0003-native_bindir.patch: it doesn't seem to actually define anything where the
use_nativeparameter is set to true.Also, the issue should be solved without invasive, custom patching of the code: via meson.cross, custom .pc files for the items in question or some other configuration mechanism.
We are not using QT, so I do not know what the actual effect of that patch being dropped is. Thus I do not know whether it is correct to drop it or not. However, it seems that the hunks that actually added the use_native=True arguments were dropped from the patch with the update to 0.58.0. In that release, the QT specific functions were moved from mesonbuild/dependencies/ui.py to mesonbuild/dependencies/qt.py and the relevant hunks should probably have been moved along with the code instead of being removed.
//Peter
Quoted 300 lines
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-devtools/meson/meson.inc | 4 +- .../0001-Make-CPU-family-warnings-fatal.patch | 20 ++-- .../meson/meson/0003-native_bindir.patch | 94 ------------------- .../meson/meson/gi-target-dep.patch | 41 -------- .../{meson_0.58.1.bb => meson_0.59.1.bb} | 0 ...on_0.58.1.bb => nativesdk-meson_0.59.1.bb} | 0 6 files changed, 10 insertions(+), 149 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson/0003- native_bindir.patch delete mode 100644 meta/recipes-devtools/meson/meson/gi-target-dep.patch rename meta/recipes-devtools/meson/{meson_0.58.1.bb => meson_0.59.1.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk-meson_0.58.1.bb =>nativesdk-meson_0.59.1.bb} (100%)
meta/recipes- renamed from meta/recipes-devtools/meson/meson.inc +0
-0devtools/meson/meson.inc
indexf1746d2094..c83ea406f0100644meta/recipes-devtools/meson/meson.inc +0
-0@@ -9,15 +9,13 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI=
"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz \ file://0001-gtkdoc-fix-issues-that-arise-when-cross- compiling.patch \ - file://0003-native_bindir.patch \ file://0001-python-module-do-not-manipulate-the-environment- when.patch \ file://disable-rpath-handling.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
meta/recipes-devtools/meson/meson.inc +0
-2- file://gi-target-dep.patch \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ " -SRC_URI[sha256sum] ="
3144a3da662fcf79f1e5602fa929f2821cba4eba28c2c923fe0a7d3e3db04d5d" +SRC_URI[sha256sum] = "db586a451650d46bbe10984a87b79d9bcdc1caebf38d8e189f8848f8d502356d"
UPSTREAM_CHECK_URI= "https://github.com/mesonbuild/meson/releases"UPSTREAM_CHECK_REGEX= "meson-(?P<pver>\d+(\.\d+)+)\.tar"(quoted diff) +0
-0warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU- family-warnings-fatal.patch
indexbcccfabd17..c5be526b10100644
--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings- fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings- fatal.patchmeta/recipes-devtools/meson/meson.inc +6
-6@@ -1,20 +1,21 @@ -From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00 2001 +From 6c4eef1d92e9e42fdbc888365cab3c95fb33c605 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Tue, 3 Jul 2018 13:59:09 +0100 -Subject: [PATCH 1/2] Make CPU family warnings fatal +Subject: [PATCH] Make CPU family warnings fatal Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ross Burton <[email protected]> + --- mesonbuild/envconfig.py | 2 +- mesonbuild/environment.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index c6a4df3..4d58c91 100644 +index 307aac3..66fb7ec 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -266,7 +266,7 @@ class MachineInfo: +@@ -267,7 +267,7 @@ class MachineInfo(HoldableObject): cpu_family = literal['cpu_family'] if cpu_family not in known_cpu_families:@@ -24,20 +25,17 @@ index c6a4df3..4d58c91 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index fc9b703..eea8345 100644 +index 71286a5..179917e 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) ->str:
+@@ -352,9 +352,7 @@ defdetect_cpu_family(compilers: CompilersDict)-> str:
trial = 'ppc64'if trial not in
known_cpu_families:
-- mlog.warning('Unknown CPU family {!r}, please report this at '
+- mlog.warning(f'Unknown CPU family {trial!r}, please report this
at '
- 'https://github.com/mesonbuild/meson/issues/new
with the '
-- 'output ofuname -aand `cat
/proc/cpuinfo`'.format(trial))+- 'output of `uname -a` and `cat /proc/cpuinfo`') + raise EnvironmentException('Unknown CPU family %s, seehttps://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
return trial
---
-2.24.0meta/recipes-devtools/meson/meson.inc +0
-1-meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-13@@ -1,94 +0,0 @@ -From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado <[email protected]> -Date: Wed, 15 Nov 2017 15:05:01 +0100 -Subject: [PATCH] native_bindir - -Some libraries, like QT, have pre-processors that convert their input -files into something that the cross-compiler can process. We find the -path of those pre-processors via pkg-config-native instead of -pkg-config. - -This path forces the use of pkg-config-native for host_bins arguments. - -There are some discussions upstream to merge this patch, but I presonalybelieve
-that is is OE only.
https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-9- -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Ricardo Ribalda Delgado <[email protected]> - ---- - mesonbuild/dependencies/base.py | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/mesonbuild/dependencies/base.py
b/mesonbuild/dependencies/base.pymeta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-8-index 14380d4..d0c443f 100644 ---- a/mesonbuild/dependencies/base.py -+++ b/mesonbuild/dependencies/base.py -@@ -179,7 +179,7 @@ class Dependency: - def get_exe_args(self, compiler): - return [] - -- def get_pkgconfig_variable(self, variable_name: str, kwargs:T.Dict[str, T.Any]) -> str:
-+ def get_pkgconfig_variable(self,variable_name: str, kwargs:
T.Dict[str, T.Any], use_native=False) -> str:
- raise DependencyException(f'{self.name!r} is not a pkgconfig
dependency')meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-7- - def get_configtool_variable(self, variable_name): -@@ -267,7 +267,7 @@ class InternalDependency(Dependency): - return True - return any(d.is_built() for d in self.ext_deps) - -- def get_pkgconfig_variable(self, variable_name: str, kwargs:T.Dict[str, T.Any]) -> str:
-+ def get_pkgconfig_variable(self,variable_name: str, kwargs:
T.Dict[str, T.Any], use_native=False) -> str:
- raise DependencyException('Method "get_pkgconfig_variable()" is
'meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-4- 'invalid for an internal dependency') - -@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency): - return s.format(self.__class__.__name__, self.name,self.is_found,
meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-26- self.version_reqs) - -- def _call_pkgbin_real(self, args, env): -- cmd = self.pkgbin.get_command() + args -+ def _call_pkgbin_real(self, args, env, use_native=False): -+ if use_native: -+ cmd = [self.pkgbin.get_command()[0] + "-native"] + args -+ else: -+ cmd = self.pkgbin.get_command() + args - p, out, err = Popen_safe(cmd, env=env) - rc, out, err = p.returncode, out.strip(), err.strip() - call = ' '.join(cmd) -@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency): - if key.startswith('PKG_'): - mlog.debug(f'env[{key}]: {value}') - -- def _call_pkgbin(self, args, env=None): -+ def _call_pkgbin(self, args, env=None, use_native=False): - # Always copy the environment since we're going to modify it - # with pkg-config variables - if env is None: -@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency): - targs = tuple(args) - cache = PkgConfigDependency.pkgbin_cache - if (self.pkgbin, targs, fenv) not in cache: -- cache[(self.pkgbin, targs, fenv)] =
self._call_pkgbin_real(args, env)
-+ cache[(self.pkgbin, targs, fenv)] =self._call_pkgbin_real(args, env, use_native)meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-6- return cache[(self.pkgbin, targs, fenv)] - - def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: -@@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency): - (self.name, out_raw)) - self.link_args, self.raw_link_args = self._search_libs(out,
out_raw)
-
-- def get_pkgconfig_variable(self,variable_name: str, kwargs:
T.Dict[str, T.Any]) -> str:
-+ def get_pkgconfig_variable(self,variable_name: str, kwargs:
T.Dict[str, T.Any], use_native=False) -> str:meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-6- options = ['--variable=' + variable_name, self.name] - - if 'define_variable' in kwargs: -@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): - - options = ['--define-variable=' + '='.join(definition)] +options
-
-- ret, out, err =self._call_pkgbin(options)
-+ ret, out, err = self._call_pkgbin(options,
use_native=use_native)meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-3- variable = '' - if ret != 0: - if self.required:meta/recipes-devtools/meson/meson/gi-target-dep.patch deleted +0
-1@@ -1,41 +0,0 @@ -When building gobject-introspection we want the *native* binaries (asthey need
-to be executed) but *host* gobject-introspection libraries, as otherwise the
-native pkg-config can be used and the build will try to link native and hostmeta/recipes-devtools/meson/meson/gi-target-dep.patch deleted +0
-11-binaries together. - -Upstream-Status: Backport [589236226856f591c9e8daf0cb7aa1aef8862388] -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index f9660838e..2eefc3fc7 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -84,8 +84,8 @@ class GnomeModule(ExtensionModule): -mlog.bold('https://github.com/mesonbuild/meson/issues/1387'),
meta/recipes-devtools/meson/meson/gi-target-dep.patch deleted +0
-7- once=True) - -- def _get_native_dep(self, state, depname, required=True): -- kwargs = {'native': True, 'required': required} -+ def _get_dep(self, state, depname, native=False, required=True): -+ kwargs = {'native': native, 'required': required} - holder = self.interpreter.func_dependency(state.current_node,[depname], kwargs)
meta/recipes-devtools/meson/meson/gi-target-dep.patch deleted +0
-16- return holder.held_object - -@@ -101,7 +101,7 @@ class GnomeModule(ExtensionModule): - return ExternalProgram.from_entry(name, prog) - - # Check if pkgconfig has a variable -- dep = self._get_native_dep(state, depname, required=False) -+ dep = self._get_dep(state, depname, native=True, required=False) - if dep.found() and dep.type_name == 'pkgconfig': - value = dep.get_pkgconfig_variable(varname, {}) - if value: -@@ -481,7 +481,7 @@ class GnomeModule(ExtensionModule): - - def _get_gir_dep(self, state): - if not self.gir_dep: -- self.gir_dep = self._get_native_dep(state, 'gobject-introspection-1.0')
-+ self.gir_dep = self._get_dep(state, 'gobject-introspection-
1.0')
- self.giscanner = self._get_native_binary(state, 'g-ir-
scanner', 'gobject-introspection-1.0', 'g_ir_scanner')
- self.gicompiler = self._get_native_binary(state, 'g-ir-
compiler', 'gobject-introspection-1.0', 'g_ir_compiler')meta/recipes-devtools/meson/meson/gi-target-dep.patch deleted +0
-1- return self.gir_dep, self.giscanner, self.gicompilermeta/recipes- renamed from meta/recipes-devtools/meson/meson_0.58.1.bb +0
-0devtools/meson/meson_0.59.1.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.58.1.bb rename to meta/recipes-devtools/meson/meson_0.59.1.bbmeta/recipes-devtools/meson/nativesdk-meson_0.59.1.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb +0
-1--2.31.1
Quoted 9 lines · Peter Kjellerstedt
We are not using QT, so I do not know what the actual effect of that patch being dropped is. Thus I do not know whether it is correct to drop it or not. However, it seems that the hunks that actually added the use_native=True arguments were dropped from the patch with the update to 0.58.0. In that release, the QT specific functions were moved from
mesonbuild/dependencies/ui.pytomesonbuild/dependencies/qt.pyand the relevant hunks should probably have been moved along with the code instead of being removed.
Sure, but if the patch does not clearly describe how to reproduce the problem it is aiming to solve, I'm not going
to start digging or guessing. It's been a pain to rebase for a very long time, and I've had enough.
Alex
Quoted 306 lines
//Peter
Quoted 264 lines
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-devtools/meson/meson.inc | 4 +- .../0001-Make-CPU-family-warnings-fatal.patch | 20 ++-- .../meson/meson/0003-native_bindir.patch | 94 ------------------- .../meson/meson/gi-target-dep.patch | 41 -------- .../{meson_0.58.1.bb => meson_0.59.1.bb} | 0 ...on_0.58.1.bb => nativesdk-meson_0.59.1.bb} | 0 6 files changed, 10 insertions(+), 149 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson/0003- native_bindir.patch delete mode 100644 meta/recipes-devtools/meson/meson/gi-target-dep.patch rename meta/recipes-devtools/meson/{meson_0.58.1.bb => meson_0.59.1.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk-meson_0.58.1.bb =>nativesdk-meson_0.59.1.bb} (100%)
meta/recipes- renamed from meta/recipes-devtools/meson/meson.inc +0
-0devtools/meson/meson.inc
indexf1746d2094..c83ea406f0100644meta/recipes-devtools/meson/meson.inc +0
-0@@ -9,15 +9,13 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI=
"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz \ file://0001-gtkdoc-fix-issues-that-arise-when-cross- compiling.patch \ - file://0003-native_bindir.patch \ file://0001-python-module-do-not-manipulate-the-environment- when.patch \ file://disable-rpath-handling.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
meta/recipes-devtools/meson/meson.inc +0
-2- file://gi-target-dep.patch \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ " -SRC_URI[sha256sum] ="
3144a3da662fcf79f1e5602fa929f2821cba4eba28c2c923fe0a7d3e3db04d5d" +SRC_URI[sha256sum] = "db586a451650d46bbe10984a87b79d9bcdc1caebf38d8e189f8848f8d502356d"
UPSTREAM_CHECK_URI= "https://github.com/mesonbuild/meson/releases"UPSTREAM_CHECK_REGEX= "meson-(?P<pver>\d+(\.\d+)+)\.tar"(quoted diff) +0
-0warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU- family-warnings-fatal.patch
indexbcccfabd17..c5be526b10100644
--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings- fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings- fatal.patchmeta/recipes-devtools/meson/meson.inc +6
-6@@ -1,20 +1,21 @@ -From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00 2001 +From 6c4eef1d92e9e42fdbc888365cab3c95fb33c605 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Tue, 3 Jul 2018 13:59:09 +0100 -Subject: [PATCH 1/2] Make CPU family warnings fatal +Subject: [PATCH] Make CPU family warnings fatal Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ross Burton <[email protected]> + --- mesonbuild/envconfig.py | 2 +- mesonbuild/environment.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index c6a4df3..4d58c91 100644 +index 307aac3..66fb7ec 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -266,7 +266,7 @@ class MachineInfo: +@@ -267,7 +267,7 @@ class MachineInfo(HoldableObject): cpu_family = literal['cpu_family'] if cpu_family not in known_cpu_families:@@ -24,20 +25,17 @@ index c6a4df3..4d58c91 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index fc9b703..eea8345 100644 +index 71286a5..179917e 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) ->str:
+@@ -352,9 +352,7 @@ defdetect_cpu_family(compilers: CompilersDict)-> str:
trial = 'ppc64'if trial not in
known_cpu_families:
-- mlog.warning('Unknown CPU family {!r}, please report this at '
+- mlog.warning(f'Unknown CPU family {trial!r}, please report this
at '
- 'https://github.com/mesonbuild/meson/issues/new
with the '
-- 'output ofuname -aand `cat
/proc/cpuinfo`'.format(trial))+- 'output of `uname -a` and `cat /proc/cpuinfo`') + raise EnvironmentException('Unknown CPU family %s, seehttps://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
return trial
---
-2.24.0meta/recipes-devtools/meson/meson.inc +0
-1-meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-13@@ -1,94 +0,0 @@ -From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado <[email protected]> -Date: Wed, 15 Nov 2017 15:05:01 +0100 -Subject: [PATCH] native_bindir - -Some libraries, like QT, have pre-processors that convert their input -files into something that the cross-compiler can process. We find the -path of those pre-processors via pkg-config-native instead of -pkg-config. - -This path forces the use of pkg-config-native for host_bins arguments. - -There are some discussions upstream to merge this patch, but I presonalybelieve
-that is is OE only.
https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-9- -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Ricardo Ribalda Delgado <[email protected]> - ---- - mesonbuild/dependencies/base.py | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/mesonbuild/dependencies/base.py
b/mesonbuild/dependencies/base.pymeta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-8-index 14380d4..d0c443f 100644 ---- a/mesonbuild/dependencies/base.py -+++ b/mesonbuild/dependencies/base.py -@@ -179,7 +179,7 @@ class Dependency: - def get_exe_args(self, compiler): - return [] - -- def get_pkgconfig_variable(self, variable_name: str, kwargs:T.Dict[str, T.Any]) -> str:
-+ def get_pkgconfig_variable(self,variable_name: str, kwargs:
T.Dict[str, T.Any], use_native=False) -> str:
- raise DependencyException(f'{self.name!r} is not a pkgconfig
dependency')meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-7- - def get_configtool_variable(self, variable_name): -@@ -267,7 +267,7 @@ class InternalDependency(Dependency): - return True - return any(d.is_built() for d in self.ext_deps) - -- def get_pkgconfig_variable(self, variable_name: str, kwargs:T.Dict[str, T.Any]) -> str:
-+ def get_pkgconfig_variable(self,variable_name: str, kwargs:
T.Dict[str, T.Any], use_native=False) -> str:
- raise DependencyException('Method "get_pkgconfig_variable()" is
'meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-4- 'invalid for an internal dependency') - -@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency): - return s.format(self.__class__.__name__, self.name,self.is_found,
meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-26- self.version_reqs) - -- def _call_pkgbin_real(self, args, env): -- cmd = self.pkgbin.get_command() + args -+ def _call_pkgbin_real(self, args, env, use_native=False): -+ if use_native: -+ cmd = [self.pkgbin.get_command()[0] + "-native"] + args -+ else: -+ cmd = self.pkgbin.get_command() + args - p, out, err = Popen_safe(cmd, env=env) - rc, out, err = p.returncode, out.strip(), err.strip() - call = ' '.join(cmd) -@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency): - if key.startswith('PKG_'): - mlog.debug(f'env[{key}]: {value}') - -- def _call_pkgbin(self, args, env=None): -+ def _call_pkgbin(self, args, env=None, use_native=False): - # Always copy the environment since we're going to modify it - # with pkg-config variables - if env is None: -@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency): - targs = tuple(args) - cache = PkgConfigDependency.pkgbin_cache - if (self.pkgbin, targs, fenv) not in cache: -- cache[(self.pkgbin, targs, fenv)] =
self._call_pkgbin_real(args, env)
-+ cache[(self.pkgbin, targs, fenv)] =self._call_pkgbin_real(args, env, use_native)meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-6- return cache[(self.pkgbin, targs, fenv)] - - def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: -@@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency): - (self.name, out_raw)) - self.link_args, self.raw_link_args = self._search_libs(out,
out_raw)
-
-- def get_pkgconfig_variable(self,variable_name: str, kwargs:
T.Dict[str, T.Any]) -> str:
-+ def get_pkgconfig_variable(self,variable_name: str, kwargs:
T.Dict[str, T.Any], use_native=False) -> str:meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-6- options = ['--variable=' + variable_name, self.name] - - if 'define_variable' in kwargs: -@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): - - options = ['--define-variable=' + '='.join(definition)] +options
-
-- ret, out, err =self._call_pkgbin(options)
-+ ret, out, err = self._call_pkgbin(options,
use_native=use_native)meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-3- variable = '' - if ret != 0: - if self.required:meta/recipes-devtools/meson/meson/gi-target-dep.patch deleted +0
-1@@ -1,41 +0,0 @@ -When building gobject-introspection we want the *native* binaries (asthey need
-to be executed) but *host* gobject-introspection libraries, as otherwise the
-native pkg-config can be used and the build will try to link native and hostmeta/recipes-devtools/meson/meson/gi-target-dep.patch deleted +0
-11-binaries together. - -Upstream-Status: Backport [589236226856f591c9e8daf0cb7aa1aef8862388] -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index f9660838e..2eefc3fc7 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -84,8 +84,8 @@ class GnomeModule(ExtensionModule): -mlog.bold('https://github.com/mesonbuild/meson/issues/1387'),
meta/recipes-devtools/meson/meson/gi-target-dep.patch deleted +0
-7- once=True) - -- def _get_native_dep(self, state, depname, required=True): -- kwargs = {'native': True, 'required': required} -+ def _get_dep(self, state, depname, native=False, required=True): -+ kwargs = {'native': native, 'required': required} - holder = self.interpreter.func_dependency(state.current_node,[depname], kwargs)
meta/recipes-devtools/meson/meson/gi-target-dep.patch
Quoted 8 lines
meta/recipes-devtools/meson/meson/gi-target-dep.patch deleted +0
-8- return holder.held_object - -@@ -101,7 +101,7 @@ class GnomeModule(ExtensionModule): - return ExternalProgram.from_entry(name, prog) - - # Check if pkgconfig has a variable -- dep = self._get_native_dep(state, depname, required=False) -+ dep = self._get_dep(state, depname, native=True,required=False)
Quoted 28 lines
meta/recipes-devtools/meson/meson/gi-target-dep.patch deleted +0
-8- if dep.found() and dep.type_name == 'pkgconfig': - value = dep.get_pkgconfig_variable(varname, {}) - if value: -@@ -481,7 +481,7 @@ class GnomeModule(ExtensionModule): - - def _get_gir_dep(self, state): - if not self.gir_dep: -- self.gir_dep = self._get_native_dep(state, 'gobject-introspection-1.0')
-+ self.gir_dep = self._get_dep(state, 'gobject-introspection-
1.0')
- self.giscanner = self._get_native_binary(state, 'g-ir-
scanner', 'gobject-introspection-1.0', 'g_ir_scanner')
- self.gicompiler = self._get_native_binary(state, 'g-ir-
compiler', 'gobject-introspection-1.0', 'g_ir_compiler')meta/recipes-devtools/meson/meson/gi-target-dep.patch deleted +0
-1- return self.gir_dep, self.giscanner, self.gicompilermeta/recipes- renamed from meta/recipes-devtools/meson/meson_0.58.1.bb +0
-0devtools/meson/meson_0.59.1.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.58.1.bb rename to meta/recipes-devtools/meson/meson_0.59.1.bbmeta/recipes-devtools/meson/nativesdk-meson_0.59.1.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb +0
-1--2.31.1
Quoted 19 lines · Alexander Kanavin
CAUTION: Email originated externally, do not click links or open attachments unless you recognize the sender and know the content is safe.
Drop 0003-native_bindir.patch: it doesn't seem to actually define anything where the
use_nativeparameter is set to true.Also, the issue should be solved without invasive, custom patching of the code: via meson.cross, custom .pc files for the items in question or some other configuration mechanism.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-devtools/meson/meson.inc | 4 +- .../0001-Make-CPU-family-warnings-fatal.patch | 20 ++-- .../meson/meson/0003-native_bindir.patch | 94 ------------------- .../meson/meson/gi-target-dep.patch | 41 -------- .../{meson_0.58.1.bb => meson_0.59.1.bb} | 0 ...on_0.58.1.bb => nativesdk-meson_0.59.1.bb} | 0 6 files changed, 10 insertions(+), 149 deletions(-)
Quoted 4 lines
delete mode 100644
meta/recipes-devtools/meson/meson/0003-native_bindir.patchdelete mode 100644meta/recipes-devtools/meson/meson/gi-target-dep.patch
rename meta/recipes-devtools/meson/{meson_0.58.1.bb => meson_0.59.1.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk-meson_0.58.1.bb => nativesdk-meson_0.59.1.bb} (100%)
I think we should update the meson.cross.template generated by this ^^^ file.
c_args, c_link_args, cpp_args, cpp_link_args have been moved to the '[built-in options]' section. Also we need an native-file here. That is what06b4910c3ada5398faf9369d686b82eee441bb19 has done for OE itself.
Quoted 239 lines
meta/recipes-devtools/meson/meson.inc +1
-3@@ -9,15 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_mesonbuild_meson_releases_download_-24-257BPV-257D_meson-2D-24-257BPV-257D.tar.gz&d=DwIDAg&c=7dfBJ8cXbWjhc0BhImu8wQ&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=gNJ7fQTAkVT-8n-Ph62ngFvOrjzapJ1INbXHP6rg2xU&s=5dqRty1dyk5ogg5-EgVkgg4YPUEY5-3UME8k0bWkEv4&e= \ file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch \ - file://0003-native_bindir.patch \ file://0001-python-module-do-not-manipulate-the-environment-when.patch \ file://disable-rpath-handling.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ - file://gi-target-dep.patch \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ " -SRC_URI[sha256sum] = "3144a3da662fcf79f1e5602fa929f2821cba4eba28c2c923fe0a7d3e3db04d5d" +SRC_URI[sha256sum] = "db586a451650d46bbe10984a87b79d9bcdc1caebf38d8e189f8848f8d502356d" UPSTREAM_CHECK_URI = "https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_mesonbuild_meson_releases&d=DwIDAg&c=7dfBJ8cXbWjhc0BhImu8wQ&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=gNJ7fQTAkVT-8n-Ph62ngFvOrjzapJ1INbXHP6rg2xU&s=O7nZ0g946ut7YnoPv_FaabmxnkHPuAKY-r8ztXYdtT4&e= " UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +9
-11@@ -1,20 +1,21 @@ -From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00 2001 +From 6c4eef1d92e9e42fdbc888365cab3c95fb33c605 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Tue, 3 Jul 2018 13:59:09 +0100 -Subject: [PATCH 1/2] Make CPU family warnings fatal +Subject: [PATCH] Make CPU family warnings fatal Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ross Burton <[email protected]> + --- mesonbuild/envconfig.py | 2 +- mesonbuild/environment.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index c6a4df3..4d58c91 100644 +index 307aac3..66fb7ec 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -266,7 +266,7 @@ class MachineInfo: +@@ -267,7 +267,7 @@ class MachineInfo(HoldableObject): cpu_family = literal['cpu_family'] if cpu_family not in known_cpu_families:@@ -24,20 +25,17 @@ index c6a4df3..4d58c91 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index fc9b703..eea8345 100644 +index 71286a5..179917e 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +@@ -352,9 +352,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: trial = 'ppc64' if trial not in known_cpu_families: -- mlog.warning('Unknown CPU family {!r}, please report this at ' +- mlog.warning(f'Unknown CPU family {trial!r}, please report this at ' - 'https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_mesonbuild_meson_issues_new&d=DwIDAg&c=7dfBJ8cXbWjhc0BhImu8wQ&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=gNJ7fQTAkVT-8n-Ph62ngFvOrjzapJ1INbXHP6rg2xU&s=E6p11_8xxyyW5xmKHE5K7_iKGL15ydVn4LzjxYHhyaw&e= with the ' -- 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) +- 'output of `uname -a` and `cat /proc/cpuinfo`') + raise EnvironmentException('Unknown CPU family %s, see https://urldefense.proofpoint.com/v2/url?u=https-3A__wiki.yoctoproject.org_wiki_Meson_UnknownCPU&d=DwIDAg&c=7dfBJ8cXbWjhc0BhImu8wQ&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=gNJ7fQTAkVT-8n-Ph62ngFvOrjzapJ1INbXHP6rg2xU&s=LluHbSsMmrwW57hP78ICwNrhaI_HYzqgsK9MAnx37ho&e= for directions.' % trial) return trial --- -2.24.0 -meta/recipes-devtools/meson/meson/0003-native_bindir.patch deleted +0
-94@@ -1,94 +0,0 @@ -From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado <[email protected]> -Date: Wed, 15 Nov 2017 15:05:01 +0100 -Subject: [PATCH] native_bindir - -Some libraries, like QT, have pre-processors that convert their input -files into something that the cross-compiler can process. We find the -path of those pre-processors via pkg-config-native instead of -pkg-config. - -This path forces the use of pkg-config-native for host_bins arguments. - -There are some discussions upstream to merge this patch, but I presonaly believe -that is is OE only. https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_mesonbuild_meson_issues_1849-23issuecomment-2D303730323&d=DwIDAg&c=7dfBJ8cXbWjhc0BhImu8wQ&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=gNJ7fQTAkVT-8n-Ph62ngFvOrjzapJ1INbXHP6rg2xU&s=IApmoQBXk9DnxLOwc7ZqQvK3y6eYJzND5r08-dht6wE&e= - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Ricardo Ribalda Delgado <[email protected]> - ---- - mesonbuild/dependencies/base.py | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 14380d4..d0c443f 100644 ---- a/mesonbuild/dependencies/base.py -+++ b/mesonbuild/dependencies/base.py -@@ -179,7 +179,7 @@ class Dependency: - def get_exe_args(self, compiler): - return [] - -- def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str: -+ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str: - raise DependencyException(f'{self.name!r} is not a pkgconfig dependency') - - def get_configtool_variable(self, variable_name): -@@ -267,7 +267,7 @@ class InternalDependency(Dependency): - return True - return any(d.is_built() for d in self.ext_deps) - -- def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str: -+ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str: - raise DependencyException('Method "get_pkgconfig_variable()" is ' - 'invalid for an internal dependency') - -@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency): - return s.format(self.__class__.__name__, self.name, self.is_found, - self.version_reqs) - -- def _call_pkgbin_real(self, args, env): -- cmd = self.pkgbin.get_command() + args -+ def _call_pkgbin_real(self, args, env, use_native=False): -+ if use_native: -+ cmd = [self.pkgbin.get_command()[0] + "-native"] + args -+ else: -+ cmd = self.pkgbin.get_command() + args - p, out, err = Popen_safe(cmd, env=env) - rc, out, err = p.returncode, out.strip(), err.strip() - call = ' '.join(cmd) -@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency): - if key.startswith('PKG_'): - mlog.debug(f'env[{key}]: {value}') - -- def _call_pkgbin(self, args, env=None): -+ def _call_pkgbin(self, args, env=None, use_native=False): - # Always copy the environment since we're going to modify it - # with pkg-config variables - if env is None: -@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency): - targs = tuple(args) - cache = PkgConfigDependency.pkgbin_cache - if (self.pkgbin, targs, fenv) not in cache: -- cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env) -+ cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) - return cache[(self.pkgbin, targs, fenv)] - - def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: -@@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency): - (self.name, out_raw)) - self.link_args, self.raw_link_args = self._search_libs(out, out_raw) - -- def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str: -+ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str: - options = ['--variable=' + variable_name, self.name] - - if 'define_variable' in kwargs: -@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): - - options = ['--define-variable=' + '='.join(definition)] + options - -- ret, out, err = self._call_pkgbin(options) -+ ret, out, err = self._call_pkgbin(options, use_native=use_native) - variable = '' - if ret != 0: - if self.required:meta/recipes-devtools/meson/meson/gi-target-dep.patch deleted +0
-41@@ -1,41 +0,0 @@ -When building gobject-introspection we want the *native* binaries (as they need -to be executed) but *host* gobject-introspection libraries, as otherwise the -native pkg-config can be used and the build will try to link native and host -binaries together. - -Upstream-Status: Backport [589236226856f591c9e8daf0cb7aa1aef8862388] -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index f9660838e..2eefc3fc7 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -84,8 +84,8 @@ class GnomeModule(ExtensionModule): - mlog.bold('https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_mesonbuild_meson_issues_1387&d=DwIDAg&c=7dfBJ8cXbWjhc0BhImu8wQ&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=gNJ7fQTAkVT-8n-Ph62ngFvOrjzapJ1INbXHP6rg2xU&s=IN-Sy6yGBdhGjdLP8A2fUqMEAFSx_84xWoeH1jIeb7Q&e= '), - once=True) - -- def _get_native_dep(self, state, depname, required=True): -- kwargs = {'native': True, 'required': required} -+ def _get_dep(self, state, depname, native=False, required=True): -+ kwargs = {'native': native, 'required': required} - holder = self.interpreter.func_dependency(state.current_node, [depname], kwargs) - return holder.held_object - -@@ -101,7 +101,7 @@ class GnomeModule(ExtensionModule): - return ExternalProgram.from_entry(name, prog) - - # Check if pkgconfig has a variable -- dep = self._get_native_dep(state, depname, required=False) -+ dep = self._get_dep(state, depname, native=True, required=False) - if dep.found() and dep.type_name == 'pkgconfig': - value = dep.get_pkgconfig_variable(varname, {}) - if value: -@@ -481,7 +481,7 @@ class GnomeModule(ExtensionModule): - - def _get_gir_dep(self, state): - if not self.gir_dep: -- self.gir_dep = self._get_native_dep(state, 'gobject-introspection-1.0') -+ self.gir_dep = self._get_dep(state, 'gobject-introspection-1.0') - self.giscanner = self._get_native_binary(state, 'g-ir-scanner', 'gobject-introspection-1.0', 'g_ir_scanner') - self.gicompiler = self._get_native_binary(state, 'g-ir-compiler', 'gobject-introspection-1.0', 'g_ir_compiler') - return self.gir_dep, self.giscanner, self.gicompilermeta/recipes-devtools/meson/meson_0.59.1.bb renamed from meta/recipes-devtools/meson/meson_0.58.1.bb +0
-0meta/recipes-devtools/meson/nativesdk-meson_0.59.1.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb +0
-1--2.31.1
Signature · 1 line
Hsia-Jun(Randy) Li
Quoted 8 lines · Hsia-Jun Li
I think we should update the meson.cross.template generated by this ^^^ file.
c_args, c_link_args, cpp_args,
cpp_link_argshave been moved to the '[built-in options]' section. Also we need an native-file here. That is what06b4910c3ada5398faf9369d686b82eee441bb19has done for OE itself.
Can you send a patch please?
Alex