Skip to contentSkip to conversation

sysvinit: update 2.96 -> 2.97

PATCH In review Alexander Kanavin 2 participants 19 messages Aug 1, 2020 – Aug 5, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/13 sysvinit: update 2.96 -> 2.97

---
 .../sysvinit/sysvinit/crypt-lib.patch            | 16 +++++++++-------
 .../recipes-core/sysvinit/sysvinit/install.patch |  7 ++++---
 .../{sysvinit_2.96.bb => sysvinit_2.97.bb}       |  3 +--
 3 files changed, 14 insertions(+), 12 deletions(-)
 rename meta/recipes-core/sysvinit/{sysvinit_2.96.bb => sysvinit_2.97.bb} (96%)
meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch +9 -7
index bd4444b81b..5c39fb001b 100644
@@ -1,4 +1,4 @@
-From 7276275d9a08d5ae268fb263027bbc60bc0ab2e8 Mon Sep 17 00:00:00 2001
+From c3a068cf24a22bea7349849ec111ae8d91a54db4 Mon Sep 17 00:00:00 2001
 From: Jeff Dike <jdike@x86_64.user-mode-linux.org>
 Date: Wed, 14 Jul 2010 14:35:52 -0400
 Subject: [PATCH] sysvinit - Remove sulogin dependency on /usr/lib*/libcrypt.a
@@ -11,24 +11,26 @@ Upstream-Status: Inappropriate [configuration]
 # - [email protected]
 
 ---
- src/Makefile | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
+ src/Makefile | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index 1380d7f..628e77f 100644
+index 5b1a5a2..b686394 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -97,13 +97,8 @@ else
+@@ -97,15 +97,8 @@ else
  endif
  
  # Additional libs for GNU libc.
--ifneq ($(wildcard /usr/lib*/libcrypt.*),)
+-ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),)
 -  SULOGINLIBS	+= -lcrypt
 -endif
 -
 -# Additional libs for GNU libc / multiarch on Debian based systems.
--ifneq ($(wildcard /usr/lib/*/libcrypt.*),)
+-ifneq ($(wildcard $(ROOT)/usr/lib/*/libcrypt.*),)
+-ifneq ($(findstring -lcrypt, $(SULOGINLIBS)), -lcrypt)
 -  SULOGINLIBS	+= -lcrypt
+-endif
 +ifneq ($(LCRYPT),)
 +  SULOGINLIBS	+= $(LCRYPT)
  endif
meta/recipes-core/sysvinit/sysvinit/install.patch +4 -3
index 2930fb0195..90563a6294 100644
@@ -1,4 +1,4 @@
-From b6cc66ab245ceb6bca0116dff7a41f6d7677b96a Mon Sep 17 00:00:00 2001
+From 5e35aa105e7a2e85db2a89fee4114090b1ac55be Mon Sep 17 00:00:00 2001
 From: Qing He <[email protected]>
 Date: Fri, 18 Jun 2010 09:40:30 +0800
 Subject: [PATCH] sysvinit: upgrade to version 2.88dsf
@@ -10,7 +10,7 @@ Upstream-Status: Pending
  1 file changed, 30 insertions(+), 23 deletions(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index 9f9f09e..1380d7f 100644
+index 1b368dc..5b1a5a2 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -77,7 +77,14 @@ else
@@ -29,7 +29,7 @@ index 9f9f09e..1380d7f 100644
  
  ifeq ($(WITH_SELINUX),yes)
    SELINUX_DEF	=  -DWITH_SELINUX
-@@ -189,42 +196,42 @@ clobber:	cleanobjs
+@@ -191,43 +198,43 @@ clobber:	cleanobjs
  distclean:	clobber
  
  install:	all
@@ -50,6 +50,7 @@ index 9f9f09e..1380d7f 100644
 +			$(INSTALL_EXEC) $$i $(ROOT)$(bindir)/ ; \
  		done
  		# $(INSTALL_DIR) $(ROOT)/etc/
+ 		$(INSTALL_DIR) $(ROOT)/etc/inittab.d
  		# $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/
 -		ln -sf halt $(ROOT)/sbin/reboot
 -		ln -sf halt $(ROOT)/sbin/poweroff
meta/recipes-core/sysvinit/sysvinit_2.97.bb renamed from meta/recipes-core/sysvinit/sysvinit_2.96.bb +1 -2
similarity index 96%
rename from meta/recipes-core/sysvinit/sysvinit_2.96.bb
rename to meta/recipes-core/sysvinit/sysvinit_2.97.bb
index d2b85ed9c0..80ab9d70e7 100644
@@ -21,8 +21,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \
            file://bootlogd.init \
            file://01_bootlogd \
            "
-SRC_URI[md5sum] = "48cebffebf2a96ab09bec14bf9976016"
-SRC_URI[sha256sum] = "2a2e26b72aa235a23ab1c8471005f890309ce1196c83fbc9413c57b9ab62b587"
+SRC_URI[sha256sum] = "2d5996857519bfd8634d2e1debabb3238fb38440f65fbfdc46420ee8bdf25110"
 
 S = "${WORKDIR}/sysvinit-${PV}"
 B = "${S}/src"
Signature · 1 line
2.27.0
#1 lore raw

PATCH 2/13 kbd: update 2.2.0 -> 2.3.0

Drop ptest support: upstream has rewritten the tests in GNU autotest, which is another m4 monstrosity entirely incompatible with the idea of installing tests to the target system.

All dropped patches are either merged upstream, or made for ptest.

---
 .../distro/include/ptest-packagelists.inc     |  1 -
 ...append-i386-to-fix-libkbdfile-test08.patch | 45 ---------
 ...-analyze.l-add-missing-string-format.patch | 24 -----
 meta/recipes-core/kbd/kbd/fix_cflags.patch    | 25 -----
 meta/recipes-core/kbd/kbd/run-ptest           |  4 -
 .../kbd/set-proper-path-of-resources.patch    | 99 -------------------
 meta/recipes-core/kbd/kbd_2.2.0.bb            | 72 --------------
 meta/recipes-core/kbd/kbd_2.3.0.bb            | 38 +++++++
 8 files changed, 38 insertions(+), 270 deletions(-)
 delete mode 100644 meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
 delete mode 100644 meta/recipes-core/kbd/kbd/0001-analyze.l-add-missing-string-format.patch
 delete mode 100644 meta/recipes-core/kbd/kbd/fix_cflags.patch
 delete mode 100644 meta/recipes-core/kbd/kbd/run-ptest
 delete mode 100644 meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch
 delete mode 100644 meta/recipes-core/kbd/kbd_2.2.0.bb
 create mode 100644 meta/recipes-core/kbd/kbd_2.3.0.bb
meta/conf/distro/include/ptest-packagelists.inc +0 -1
index 1e99d4fa42..ce13368c2e 100644
@@ -21,7 +21,6 @@ PTESTS_FAST = "\
     gettext-ptest \
     gzip-ptest \
     json-glib-ptest \
-    kbd-ptest \
     libconvert-asn1-perl-ptest \
     liberror-perl-ptest \
     libmodule-build-perl-ptest \
meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch deleted +0 -45

45 lines not on this page · raw message

meta/recipes-core/kbd/kbd/0001-analyze.l-add-missing-string-format.patch deleted +0 -24
deleted file mode 100644
index 8916fd9f5e..0000000000
@@ -1,24 +0,0 @@
-From dc6bf2ae0835c6569b270e8e1f26a3173f3927d9 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Wed, 4 Dec 2019 13:14:01 +0100
-Subject: [PATCH] analyze.l: add missing string format
-
-Upstream-Status: Submitted [https://github.com/legionus/kbd/pull/35]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- src/libkeymap/analyze.l | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libkeymap/analyze.l b/src/libkeymap/analyze.l
-index e32ace6..de62f46 100644
---- a/src/libkeymap/analyze.l
-+++ b/src/libkeymap/analyze.l
-@@ -463,7 +463,7 @@ To                      to|To|TO
- 
- 					strerror_r(errno, buf, sizeof(buf));
- 
--					ERR(yyextra, buf);
-+					ERR(yyextra, "%s", buf);
- 					return(ERROR);
- 				}
- 
meta/recipes-core/kbd/kbd/fix_cflags.patch deleted +0 -25
deleted file mode 100644
index 37220960ab..0000000000
@@ -1,25 +0,0 @@
-We need to ensure our CFLAGS are preserved as well as whatever tweak configure
-tries to make. Without these, the debug prefix changes get lost and we lose
-build reproducibility, likely with other side effects.
-
-Signed-off-by: Richard Purdie <[email protected]>
-Upstream-Status: Pending
-2020/1/27
-
-Index: kbd-2.2.0/configure.ac
-===================================================================
---- kbd-2.2.0.orig/configure.ac
-+++ kbd-2.2.0/configure.ac
-@@ -72,9 +72,9 @@ if test "$enable_code_coverage" = yes; t
- fi
- 
- case "$GCC,$ac_cv_prog_cc_g" in
--	yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE" ;;
--	yes,)    CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE" ;;
--	   ,yes) CFLAGS="-g" ;;
-+	yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;;
-+	yes,)    CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;;
-+	   ,yes) CFLAGS="-g $CFLAGS" ;;
- esac
- 
- CC_CHECK_CFLAGS_APPEND([\
meta/recipes-core/kbd/kbd/run-ptest deleted +0 -4
deleted file mode 100644
index 7a2d205f54..0000000000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-CURDIR=$(dirname `readlink -f $0`)
-make -k -C ${CURDIR}/tests check-TESTS
meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch deleted +0 -99

99 lines not on this page · raw message

meta/recipes-core/kbd/kbd_2.2.0.bb deleted +0 -72

72 lines not on this page · raw message

meta/recipes-core/kbd/kbd_2.3.0.bb new file +38 -0
new file mode 100644
index 0000000000..529f49bef4
@@ -0,0 +1,38 @@
+SUMMARY = "Keytable files and keyboard utilities"
+HOMEPAGE = "http://www.kbd-project.org/"
+# everything minus console-fonts is GPLv2+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
+
+inherit autotools gettext pkgconfig
+
+DEPENDS += "flex-native"
+
+RREPLACES_${PN} = "console-tools"
+RPROVIDES_${PN} = "console-tools"
+RCONFLICTS_${PN} = "console-tools"
+
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
+           "
+
+SRC_URI[sha256sum] = "685056143cb8effd0a1d44b5c391eb50d80dcfd014b1a4d6e2650a28d61cb82a"
+
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
+                  "
+
+PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
+
+PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
+
+FILES_${PN}-consolefonts = "${datadir}/consolefonts"
+FILES_${PN}-consoletrans = "${datadir}/consoletrans"
+FILES_${PN}-keymaps = "${datadir}/keymaps"
+FILES_${PN}-unimaps = "${datadir}/unimaps"
+
+inherit update-alternatives
+
+ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \
+                     ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}"
+ALTERNATIVE_PRIORITY = "100"
+
+BBCLASSEXTEND = "native"
Signature · 1 line
2.27.0
#2 lore raw

Re: [OE-core] [PATCH 02/13] kbd: update 2.2.0 -> 2.3.0

Quoted 4 lines · Alexander Kanavin

Drop ptest support: upstream has rewritten the tests in GNU autotest, which is another m4 monstrosity entirely incompatible with the idea of installing tests to the target system.

it uses dejaGNU I think, which is also used by Gcc and binutils+gdb for testing, it does support cross platform execution, It would be good to open a tracker bug to address dejaGNU perhaps.

Quoted 386 lines

All dropped patches are either merged upstream, or made for ptest.

---
  .../distro/include/ptest-packagelists.inc     |  1 -
  ...append-i386-to-fix-libkbdfile-test08.patch | 45 ---------
  ...-analyze.l-add-missing-string-format.patch | 24 -----
  meta/recipes-core/kbd/kbd/fix_cflags.patch    | 25 -----
  meta/recipes-core/kbd/kbd/run-ptest           |  4 -
  .../kbd/set-proper-path-of-resources.patch    | 99 -------------------
  meta/recipes-core/kbd/kbd_2.2.0.bb            | 72 --------------
  meta/recipes-core/kbd/kbd_2.3.0.bb            | 38 +++++++
  8 files changed, 38 insertions(+), 270 deletions(-)

delete mode 100644 meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch delete mode 100644 meta/recipes-core/kbd/kbd/0001-analyze.l-add-missing-string-format.patch delete mode 100644 meta/recipes-core/kbd/kbd/fix_cflags.patch
delete mode 100644 meta/recipes-core/kbd/kbd/run-ptest
delete mode 100644 meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch
delete mode 100644 meta/recipes-core/kbd/kbd_2.2.0.bb
create mode 100644 meta/recipes-core/kbd/kbd_2.3.0.bb

meta/conf/distro/include/ptest-packagelists.inc +0 -1
index 1e99d4fa42..ce13368c2e 100644
@@ -21,7 +21,6 @@ PTESTS_FAST = "\
      gettext-ptest \
      gzip-ptest \
      json-glib-ptest \
-    kbd-ptest \
      libconvert-asn1-perl-ptest \
      liberror-perl-ptest \
      libmodule-build-perl-ptest \
meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch deleted +0 -45
deleted file mode 100644
index dc5236063b..0000000000
@@ -1,45 +0,0 @@
-From 4c12f76f4177cfd560cf708a16774ebfadbd41a5 Mon Sep 17 00:00:00 2001
-From: "Mingde (Matthew) Zeng" <[email protected]>
-Date: Wed, 22 Jan 2020 11:02:17 -0500
-Subject: [PATCH] Use DATADIR and append i386 to fix libkbdfile-test08 ptest
- failure
-
-Replace ABS_DATADIR with DATADIR and append i386 to dirpath.
-
-Upstream-Status: Inappropriate [OE specific]
-
-This OE specific patch applies to kbd v2.2.0 for now, the upstream
-made drastic changes since v2.2.0, in fact they got rid of ABS_DATADIR
-in commit 5b6df5c along with a series of other commits which may or
-may not fix this issue. We will find out in future releases.
-
-Signed-off-by: Matthew Zeng<[email protected]>
----
- tests/libkbdfile-test08.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/libkbdfile-test08.c b/tests/libkbdfile-test08.c
-index bf41707..5e287f1 100644
---- a/tests/libkbdfile-test08.c
-+++ b/tests/libkbdfile-test08.c
-@@ -14,14 +14,14 @@ main(int __attribute__((unused)) argc, char **argv)
- 	if (!fp)
- 		kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile");
-
--	const char *const dirpath[]  = { "", DATADIR "/findfile/test_0/keymaps/**", 0 };
-+	const char *const dirpath[]  = { "", DATADIR "/findfile/test_0/keymaps/i386/**", 0 };
- 	const char *const suffixes[] = { "", ".map", ".kmap", 0 };
-
--	const char *expect = ABS_DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0.map";
-+	const char *expect = DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0.map";
-
- 	int rc = 0;
-
--	rc = kbdfile_find((char *)(ABS_DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0"), (char **) dirpath, (char **) suffixes, fp);
-+	rc = kbdfile_find((char *)"test0", (char **) dirpath, (char **) suffixes, fp);
-
- 	if (rc != 0)
- 		kbd_error(EXIT_FAILURE, 0, "unable to find file");
---
-2.24.1
-
meta/recipes-core/kbd/kbd/0001-analyze.l-add-missing-string-format.patch deleted +0 -24
deleted file mode 100644
index 8916fd9f5e..0000000000
@@ -1,24 +0,0 @@
-From dc6bf2ae0835c6569b270e8e1f26a3173f3927d9 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Wed, 4 Dec 2019 13:14:01 +0100
-Subject: [PATCH] analyze.l: add missing string format
-
-Upstream-Status: Submitted [https://github.com/legionus/kbd/pull/35]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- src/libkeymap/analyze.l | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libkeymap/analyze.l b/src/libkeymap/analyze.l
-index e32ace6..de62f46 100644
---- a/src/libkeymap/analyze.l
-+++ b/src/libkeymap/analyze.l
-@@ -463,7 +463,7 @@ To                      to|To|TO
-
- 					strerror_r(errno, buf, sizeof(buf));
-
--					ERR(yyextra, buf);
-+					ERR(yyextra, "%s", buf);
- 					return(ERROR);
- 				}
-
meta/recipes-core/kbd/kbd/fix_cflags.patch deleted +0 -25
deleted file mode 100644
index 37220960ab..0000000000
@@ -1,25 +0,0 @@
-We need to ensure our CFLAGS are preserved as well as whatever tweak configure
-tries to make. Without these, the debug prefix changes get lost and we lose
-build reproducibility, likely with other side effects.
-
-Signed-off-by: Richard Purdie <[email protected]>
-Upstream-Status: Pending
-2020/1/27
-
-Index: kbd-2.2.0/configure.ac
-===================================================================
---- kbd-2.2.0.orig/configure.ac
-+++ kbd-2.2.0/configure.ac
-@@ -72,9 +72,9 @@ if test "$enable_code_coverage" = yes; t
- fi
-
- case "$GCC,$ac_cv_prog_cc_g" in
--	yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE" ;;
--	yes,)    CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE" ;;
--	   ,yes) CFLAGS="-g" ;;
-+	yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;;
-+	yes,)    CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;;
-+	   ,yes) CFLAGS="-g $CFLAGS" ;;
- esac
-
- CC_CHECK_CFLAGS_APPEND([\
meta/recipes-core/kbd/kbd/run-ptest deleted +0 -4
deleted file mode 100644
index 7a2d205f54..0000000000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-CURDIR=$(dirname `readlink -f $0`)
-make -k -C ${CURDIR}/tests check-TESTS
meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch deleted +0 -99
deleted file mode 100644
index 4b1e5b8eeb..0000000000
@@ -1,99 +0,0 @@
-From cb3af8fb072f8999dbb5160bdc95a102b02fd37a Mon Sep 17 00:00:00 2001
-From: Kai Kang <[email protected]>
-Date: Fri, 30 Sep 2016 16:49:55 +0800
-Subject: [PATCH] kbd: create ptest sub-package
-
-Upstream-Status: Inappropriate [embedded specific]
-
-kbd is out of source built, then the value of $(srcdir) is relative path of
-${S}/tests to ${B}/tests. Macro DATADIR is defined with $(srcdir) and replaced
-in .c files by compiler, and string @DATADIR@ is replaced with $(srdir) by rule
-"%: %.in" in Makefile.
-
-But kbd-ptest puts test cases and resource files in same directory, then some
-ptest cases fail to find resources.
-
-Replace DATADIR and @DATADIR@ with current directory(dot) to make test cases
-run as expected.
-
-Signed-off-by: Kai Kang <[email protected]>
-
----
- tests/Makefile.am           | 4 ++--
- tests/alt-is-meta.in        | 2 +-
- tests/dumpkeys-bkeymap.in   | 4 ++--
- tests/dumpkeys-fulltable.in | 2 +-
- tests/dumpkeys-mktable.in   | 4 ++--
- 5 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 8d0ab69..5147c28 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -7,8 +7,8 @@ AM_CPPFLAGS = \
- 	-I$(builddir)/../src/libkeymap \
- 	-I$(srcdir)/../src/libkbdfile \
- 	-I$(builddir)/../src/libkbdfile \
--	-DDATADIR=\"$(srcdir)\" \
--	-DABS_DATADIR=\"$(realpath $(srcdir))\" \
-+	-DDATADIR=\".\" \
-+	-DABS_DATADIR=\"/usr/lib/kbd/ptest/tests\" \
- 	-DBUILDDIR=\"$(builddir)\"
-
- AM_CFLAGS = $(CHECK_CFLAGS) $(CODE_COVERAGE_CFLAGS)
-diff --git a/tests/alt-is-meta.in b/tests/alt-is-meta.in
-index 3a1441f..d829f2e 100755
---- a/tests/alt-is-meta.in
-+++ b/tests/alt-is-meta.in
-@@ -7,7 +7,7 @@ cd "$cwd"
- rc=0
- temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")"
-
--datadir="@DATADIR@/data/alt-is-meta"
-+datadir="./data/alt-is-meta"
-
- ./libkeymap-showmaps "$datadir"/alt-is-meta.map > "$temp" || rc=$?
- cmp -s "$datadir/alt-is-meta.output" "$temp" || rc=$?
-diff --git a/tests/dumpkeys-bkeymap.in b/tests/dumpkeys-bkeymap.in
-index 03d4ca2..d1d0e26 100755
---- a/tests/dumpkeys-bkeymap.in
-+++ b/tests/dumpkeys-bkeymap.in
-@@ -9,8 +9,8 @@ temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")"
-
- datadir="@DATADIR@"
-
--./libkeymap-bkeymap "$datadir/"../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$?
--cmp -s "$datadir/data/dumpkeys-bkeymap/bkeymap.bin" "$temp" || rc=$?
-+./libkeymap-bkeymap ../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$?
-+cmp -s "./data/dumpkeys-bkeymap/bkeymap.bin" "$temp" || rc=$?
-
- if [ "$rc" != 0 ]; then
- 	printf 'failed\n'
-diff --git a/tests/dumpkeys-fulltable.in b/tests/dumpkeys-fulltable.in
-index a3a5ece..67a73ef 100755
---- a/tests/dumpkeys-fulltable.in
-+++ b/tests/dumpkeys-fulltable.in
-@@ -5,7 +5,7 @@ cwd="$(readlink -ev "${0%/*}")"
- cd "$cwd"
-
- BUILDDIR="@BUILDDIR@"
--DATADIR="@DATADIR@"
-+DATADIR="."
-
- check_keymap() {
- 	local kmap temp rc
-diff --git a/tests/dumpkeys-mktable.in b/tests/dumpkeys-mktable.in
-index 0f17c40..7e5161d 100755
---- a/tests/dumpkeys-mktable.in
-+++ b/tests/dumpkeys-mktable.in
-@@ -7,8 +7,8 @@ cd "$cwd"
- rc=0
- temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")"
-
--./libkeymap-mktable "@DATADIR@/"../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$?
--cmp -s "@DATADIR@/data/dumpkeys-mktable/defkeymap.c" "$temp" || rc=$?
-+./libkeymap-mktable ../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$?
-+cmp -s "./data/dumpkeys-mktable/defkeymap.c" "$temp" || rc=$?
-
- if [ "$rc" != 0 ]; then
- 	printf 'failed\n'
meta/recipes-core/kbd/kbd_2.2.0.bb deleted +0 -72
deleted file mode 100644
index e5700ff57f..0000000000
@@ -1,72 +0,0 @@
-SUMMARY = "Keytable files and keyboard utilities"
-HOMEPAGE = "http://www.kbd-project.org/"
-# everything minus console-fonts is GPLv2+
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
-
-inherit autotools gettext ptest pkgconfig
-
-DEPENDS += "flex-native"
-
-RREPLACES_${PN} = "console-tools"
-RPROVIDES_${PN} = "console-tools"
-RCONFLICTS_${PN} = "console-tools"
-
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
-           file://run-ptest \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://set-proper-path-of-resources.patch', '', d)} \
-           file://0001-analyze.l-add-missing-string-format.patch \
-           file://0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch \
-           file://fix_cflags.patch \
-           "
-
-SRC_URI[md5sum] = "d1d7ae0b5fb875dc082731e09cd0c8bc"
-SRC_URI[sha256sum] = "21a1bc5f6fb3b18ce9fdd717e4533368060a3182a39c7155eaf7ec0f5f83e9f7"
-
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
-                  ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests','', d)} \
-                  "
-
-PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
-PACKAGECONFIG[tests] = "--enable-tests, --disable-tests, libcheck"
-
-do_compile_ptest() {
-    oe_runmake -C ${B}/tests alt-is-meta dumpkeys-bkeymap dumpkeys-fulltable dumpkeys-mktable
-}
-
-do_install_ptest() {
-    install -D ${B}/tests/Makefile ${D}${PTEST_PATH}/tests/Makefile
-    sed -i -e '/Makefile:/,/^$/d' -e '/%: %.in/,/^$/d' \
-	-e 's:--sysroot=${STAGING_DIR_TARGET}::g' \
-	-e 's:${DEBUG_PREFIX_MAP}::g' \
-	-e 's:${HOSTTOOLS_DIR}/::g' \
-	-e 's:${RECIPE_SYSROOT_NATIVE}::g' \
-	-e 's:${RECIPE_SYSROOT}::g' \
-	-e 's:${S}/config/missing::g' \
-	-e 's:${WORKDIR}::g' \
-	-e '/^lib.*_SOURCES =/d' -e '/$(EXEEXT):/,/^$/d' ${D}${PTEST_PATH}/tests/Makefile
-
-    find ${B}/tests -executable -exec install {} ${D}${PTEST_PATH}/tests \;
-    cp -rf ${S}/tests/data ${D}${PTEST_PATH}/tests
-    cp -rf ${S}/tests/findfile ${D}${PTEST_PATH}/tests
-    cp -rf ${S}/data ${D}${PTEST_PATH}
-
-    install -D -m 755 ${S}/config/test-driver ${D}${PTEST_PATH}/config/test-driver
-}
-
-PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
-
-FILES_${PN}-consolefonts = "${datadir}/consolefonts"
-FILES_${PN}-consoletrans = "${datadir}/consoletrans"
-FILES_${PN}-keymaps = "${datadir}/keymaps"
-FILES_${PN}-unimaps = "${datadir}/unimaps"
-
-RDEPENDS_${PN}-ptest = "make"
-
-inherit update-alternatives
-
-ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \
-                     ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}"
-ALTERNATIVE_PRIORITY = "100"
-
-BBCLASSEXTEND = "native"
meta/recipes-core/kbd/kbd_2.3.0.bb new file +38 -0
new file mode 100644
index 0000000000..529f49bef4
@@ -0,0 +1,38 @@
+SUMMARY = "Keytable files and keyboard utilities"
+HOMEPAGE = "http://www.kbd-project.org/"
+# everything minus console-fonts is GPLv2+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
+
+inherit autotools gettext pkgconfig
+
+DEPENDS += "flex-native"
+
+RREPLACES_${PN} = "console-tools"
+RPROVIDES_${PN} = "console-tools"
+RCONFLICTS_${PN} = "console-tools"
+
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
+           "
+
+SRC_URI[sha256sum] = "685056143cb8effd0a1d44b5c391eb50d80dcfd014b1a4d6e2650a28d61cb82a"
+
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
+                  "
+
+PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
+
+PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
+
+FILES_${PN}-consolefonts = "${datadir}/consolefonts"
+FILES_${PN}-consoletrans = "${datadir}/consoletrans"
+FILES_${PN}-keymaps = "${datadir}/keymaps"
+FILES_${PN}-unimaps = "${datadir}/unimaps"
+
+inherit update-alternatives
+
+ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \
+                     ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}"
+ALTERNATIVE_PRIORITY = "100"
+
+BBCLASSEXTEND = "native"
#3 lore raw

PATCH 3/13 gnu-config: update to latest revision

In reply to Alexander Kanavin
---
 meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/gnu-config/gnu-config_git.bb +2 -2
index 54eb5e48a1..200b1f1856 100644
@@ -8,8 +8,8 @@ DEPENDS_class-native = "hostperl-runtime-native"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-SRCREV = "696cd4a4eab1ee9fefbb7e38dbab291d741d0c5a"
-PV = "20200621+git${SRCPV}"
+SRCREV = "2593751ef276497e312d7c4ce7fd049614c7bf80"
+PV = "20200721+git${SRCPV}"
 
 SRC_URI = "git://git.savannah.gnu.org/config.git \
            file://gnu-configize.in"
Signature · 1 line
2.27.0
#4 lore raw

PATCH 4/13 go: update 1.14.4 -> 1.14.6

In reply to Alexander Kanavin
---
 meta/recipes-devtools/go/go-1.14.inc                          | 4 ++--
 ...{go-binary-native_1.14.4.bb => go-binary-native_1.14.6.bb} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/go/{go-binary-native_1.14.4.bb => go-binary-native_1.14.6.bb} (83%)
meta/recipes-devtools/go/go-1.14.inc +2 -2
index 1050116950..64c2768f7e 100644
@@ -1,7 +1,7 @@
 require go-common.inc
 
 GO_BASEVERSION = "1.14"
-GO_MINOR = ".4"
+GO_MINOR = ".6"
 PV .= "${GO_MINOR}"
 FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
 
@@ -18,4 +18,4 @@ SRC_URI += "\
     file://0008-use-GOBUILDMODE-to-set-buildmode.patch \
 "
 SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"
-SRC_URI[main.sha256sum] = "7011af3bbc2ac108d1b82ea8abb87b2e63f78844f0259be20cde4d42c5c40584"
+SRC_URI[main.sha256sum] = "73fc9d781815d411928eccb92bf20d5b4264797be69410eac854babe44c94c09"
meta/recipes-devtools/go/go-binary-native_1.14.6.bb renamed from meta/recipes-devtools/go/go-binary-native_1.14.4.bb +2 -2
similarity index 83%
rename from meta/recipes-devtools/go/go-binary-native_1.14.4.bb
rename to meta/recipes-devtools/go/go-binary-native_1.14.6.bb
index 72c988944f..694c597a72 100644
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
 PROVIDES = "go-native"
 
 SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}"
-SRC_URI[go_linux_amd64.sha256sum] = "aed845e4185a0b2a3c3d5e1d0a35491702c55889192bb9c30e67a3de6849c067"
-SRC_URI[go_linux_arm64.sha256sum] = "05dc46ada4e23a1f58e72349f7c366aae2e9c7a7f1e7653095538bc5bba5e077"
+SRC_URI[go_linux_amd64.sha256sum] = "5c566ddc2e0bcfc25c26a5dc44a440fcc0177f7350c1f01952b34d5989a0d287"
+SRC_URI[go_linux_arm64.sha256sum] = "291bccfd7d7f1915599bbcc90e49d9fccfcb0004b7c62a2f5cdf0f96a09d6a3e"
 
 UPSTREAM_CHECK_URI = "https://golang.org/dl/"
 UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
Signature · 1 line
2.27.0
#5 lore raw

PATCH 5/13 meson: update 0.54.3 -> 0.55.0

In reply to Alexander Kanavin

Rebase patches.

---
 meta/recipes-devtools/meson/meson.inc         |  2 +-
 .../0001-Make-CPU-family-warnings-fatal.patch | 19 ++++----
 ...g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch | 48 +++++++++----------
 ...y-do-not-substitute-python-s-install.patch | 11 +++--
 ...pport-building-allarch-recipes-again.patch |  4 +-
 .../meson/meson/disable-rpath-handling.patch  | 10 ++--
 .../{meson_0.54.3.bb => meson_0.55.0.bb}      |  0
 ...on_0.54.3.bb => nativesdk-meson_0.55.0.bb} |  0
 8 files changed, 47 insertions(+), 47 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.54.3.bb => meson_0.55.0.bb} (100%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.54.3.bb => nativesdk-meson_0.55.0.bb} (100%)
meta/recipes-devtools/meson/meson.inc +1 -1
index ffa17b3061..607093a152 100644
@@ -16,7 +16,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
            file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \
            "
-SRC_URI[sha256sum] = "f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662"
+SRC_URI[sha256sum] = "0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35"
 
 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +11 -8
index 1be94a9b19..ceb2fde342 100644
@@ -1,7 +1,7 @@
-From 62c415eedb62905de76e2e0bbd156a947705cab2 Mon Sep 17 00:00:00 2001
+From 5624b5835af747b601780ad14646f9c1fb854931 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
-Subject: [PATCH] Make CPU family warnings fatal
+Subject: [PATCH 1/2] Make CPU family warnings fatal
 
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Ross Burton <[email protected]>
@@ -12,23 +12,23 @@ Signed-off-by: Ross Burton <[email protected]>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 17058df..18bbf86 100644
+index 219b62e..d1be65b 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
-@@ -225,7 +225,7 @@ class MachineInfo:
+@@ -199,7 +199,7 @@ class MachineInfo:
  
          cpu_family = literal['cpu_family']
          if cpu_family not in known_cpu_families:
--            mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % cpu_family)
-+            raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % cpu_family)
+-            mlog.warning('Unknown CPU family {}, please report this at https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
++            raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))
  
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index a2f78a4..59fcb07 100644
+index bf09a88..8eabe78 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -364,9 +364,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+@@ -375,9 +375,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
          trial = 'parisc'
  
      if trial not in known_cpu_families:
@@ -39,3 +39,6 @@ index a2f78a4..59fcb07 100644
  
      return trial
  
+-- 
+2.24.0
+
meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch +22 -26

59 lines not on this page · raw message

meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch +6 -5
index a25c392270..c0ad01e9d3 100644
@@ -1,4 +1,4 @@
-From 1d178fb2928d325e339b15972890ceced863d3ec Mon Sep 17 00:00:00 2001
+From 214e559d394491b1376e4cc370f75151117a3f83 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 18 Apr 2019 17:36:11 +0200
 Subject: [PATCH] modules/python.py: do not substitute python's install prefix
@@ -10,15 +10,16 @@ b) shouldn't be necessary as Python's prefix ought to be correct in the first pl
 
 Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
  mesonbuild/modules/python.py | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
-index 6e2c63b..f5a37ac 100644
+index 2f0c644..d2aa565 100644
 --- a/mesonbuild/modules/python.py
 +++ b/mesonbuild/modules/python.py
-@@ -254,7 +254,7 @@ import sysconfig
+@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig
  import json
  import sys
  
@@ -27,8 +28,8 @@ index 6e2c63b..f5a37ac 100644
  
  def links_against_libpython():
      from distutils.core import Distribution, Extension
-@@ -279,12 +279,11 @@ class PythonInstallation(ExternalProgramHolder):
-         ExternalProgramHolder.__init__(self, python)
+@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder):
+         ExternalProgramHolder.__init__(self, python, interpreter.subproject)
          self.interpreter = interpreter
          self.subproject = self.interpreter.subproject
 -        prefix = self.interpreter.environment.coredata.get_builtin_option('prefix')
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +2 -2
index b5b463e68e..7a3b01262e 100644
@@ -1,4 +1,4 @@
-From d976d5a8abd6d42edf794d2a4c211fc6697fb14c Mon Sep 17 00:00:00 2001
+From 4b283d545152092fec12b9d80219161d11002c72 Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <[email protected]>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
 Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 18bbf86..e76315e 100644
+index dc20616..f54adcd 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -36,6 +36,7 @@ _T = T.TypeVar('_T')
meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +5 -5
index 38e50d72f4..4653a72a20 100644
@@ -1,4 +1,4 @@
-From 3af10fa8cd4e97181288d72227dea712290fd5e6 Mon Sep 17 00:00:00 2001
+From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <[email protected]>
 Date: Fri, 23 Nov 2018 15:28:28 +0000
 Subject: [PATCH] meson: Disable rpath stripping at install time
@@ -16,17 +16,17 @@ Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
-index ace0569..85bd8df 100644
+index 0be01fe..5406cab 100644
 --- a/mesonbuild/minstall.py
 +++ b/mesonbuild/minstall.py
-@@ -508,8 +508,11 @@ class Installer:
+@@ -512,8 +512,11 @@ class Installer:
              if file_copied:
                  self.did_install_something = True
                  try:
--                    depfixer.fix_rpath(outname, install_rpath, final_path,
+-                    depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
 -                                       install_name_mappings, verbose=False)
 +                    if install_rpath:
-+                        depfixer.fix_rpath(outname, install_rpath, final_path,
++                        depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
 +                                           install_name_mappings, verbose=False)
 +                    else:
 +                        print("RPATH changes at install time disabled")
meta/recipes-devtools/meson/meson_0.55.0.bb renamed from meta/recipes-devtools/meson/meson_0.54.3.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.54.3.bb
rename to meta/recipes-devtools/meson/meson_0.55.0.bb
meta/recipes-devtools/meson/nativesdk-meson_0.55.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.54.3.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.54.3.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.55.0.bb
Signature · 1 line
2.27.0
#6 lore raw

Re: [OE-core] [PATCH 05/13] meson: update 0.54.3 -> 0.55.0

I wonder if this failure is related to this can you check

http://errors.yoctoproject.org/Errors/Details/427901/

Quoted 249 lines · Alexander Kanavin

Rebase patches.

---
 meta/recipes-devtools/meson/meson.inc         |  2 +-
 .../0001-Make-CPU-family-warnings-fatal.patch | 19 ++++----
 ...g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch | 48 +++++++++----------
 ...y-do-not-substitute-python-s-install.patch | 11 +++--
 ...pport-building-allarch-recipes-again.patch |  4 +-
 .../meson/meson/disable-rpath-handling.patch  | 10 ++--
 .../{meson_0.54.3.bb => meson_0.55.0.bb}      |  0
 ...on_0.54.3.bb => nativesdk-meson_0.55.0.bb} |  0
 8 files changed, 47 insertions(+), 47 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.54.3.bb => meson_0.55.0.bb} (100%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.54.3.bb => nativesdk-meson_0.55.0.bb} (100%)
meta/recipes-devtools/meson/meson.inc +1 -1
index ffa17b3061..607093a152 100644
@@ -16,7 +16,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
            file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \
            "
-SRC_URI[sha256sum] = "f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662"
+SRC_URI[sha256sum] = "0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35"
 
 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +11 -8
index 1be94a9b19..ceb2fde342 100644
@@ -1,7 +1,7 @@
-From 62c415eedb62905de76e2e0bbd156a947705cab2 Mon Sep 17 00:00:00 2001
+From 5624b5835af747b601780ad14646f9c1fb854931 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
-Subject: [PATCH] Make CPU family warnings fatal
+Subject: [PATCH 1/2] Make CPU family warnings fatal
 
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Ross Burton <[email protected]>
@@ -12,23 +12,23 @@ Signed-off-by: Ross Burton <[email protected]>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 17058df..18bbf86 100644
+index 219b62e..d1be65b 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
-@@ -225,7 +225,7 @@ class MachineInfo:
+@@ -199,7 +199,7 @@ class MachineInfo:
 
          cpu_family = literal['cpu_family']
          if cpu_family not in known_cpu_families:
--            mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % cpu_family)
-+            raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % cpu_family)
+-            mlog.warning('Unknown CPU family {}, please report this at https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
++            raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))
 
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index a2f78a4..59fcb07 100644
+index bf09a88..8eabe78 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -364,9 +364,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+@@ -375,9 +375,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
          trial = 'parisc'
 
      if trial not in known_cpu_families:
@@ -39,3 +39,6 @@ index a2f78a4..59fcb07 100644
 
      return trial
 
+--
+2.24.0
+
meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch +22 -26
index 35c18f0785..a1f8422d44 100644
@@ -1,4 +1,4 @@
-From 7be634fa9705d0367f48a91305f9acb642ff0a11 Mon Sep 17 00:00:00 2001
+From 64aa6718c290e150dafd8da83f31cb08af00af0e Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 27 May 2020 16:43:05 +0000
 Subject: [PATCH] gnome.py: prefix g-i paths with PKG_CONFIG_SYSROOT_DIR
@@ -9,33 +9,29 @@ determine when a custom variable is a path)
 
 Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
- mesonbuild/modules/gnome.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ mesonbuild/modules/gnome.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index 89d5d5d..d75f2e5 100644
+index 52016f4..2b72ee4 100644
 --- a/mesonbuild/modules/gnome.py
 +++ b/mesonbuild/modules/gnome.py
-@@ -739,17 +739,17 @@ class GnomeModule(ExtensionModule):
-         if giscanner.found():
-             giscanner_path = giscanner.get_command()[0]
-             if not any(x in giscanner_path for x in gi_util_dirs_check):
--                giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
-+                giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
-         else:
--            giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
-+            giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
-
-         gicompiler = self.interpreter.find_program_impl('g-ir-compiler')
-         if gicompiler.found():
-             gicompiler_path = gicompiler.get_command()[0]
-             if not any(x in gicompiler_path for x in gi_util_dirs_check):
--                gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
-+                gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
-         else:
--            gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
-+            gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
-
-         ns = kwargs.pop('namespace')
-         nsversion = kwargs.pop('nsversion')
+@@ -410,14 +410,14 @@ class GnomeModule(ExtensionModule):
+             if giscanner is not None:
+                 self.giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner)
+             elif self.gir_dep.type_name == 'pkgconfig':
+-                self.giscanner = ExternalProgram('g_ir_scanner', self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}))
++                self.giscanner = ExternalProgram('g_ir_scanner', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}))
+             else:
+                 self.giscanner = self.interpreter.find_program_impl('g-ir-scanner')
+             gicompiler = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler')
+             if gicompiler is not None:
+                 self.gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler)
+             elif self.gir_dep.type_name == 'pkgconfig':
+-                self.gicompiler = ExternalProgram('g_ir_compiler', self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}))
++                self.gicompiler = ExternalProgram('g_ir_compiler', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}))
+             else:
+                 self.gicompiler = self.interpreter.find_program_impl('g-ir-compiler')
+         return self.gir_dep, self.giscanner, self.gicompiler
meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch +6 -5
index a25c392270..c0ad01e9d3 100644
@@ -1,4 +1,4 @@
-From 1d178fb2928d325e339b15972890ceced863d3ec Mon Sep 17 00:00:00 2001
+From 214e559d394491b1376e4cc370f75151117a3f83 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 18 Apr 2019 17:36:11 +0200
 Subject: [PATCH] modules/python.py: do not substitute python's install prefix
@@ -10,15 +10,16 @@ b) shouldn't be necessary as Python's prefix ought to be correct in the first pl
 
 Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
  mesonbuild/modules/python.py | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
-index 6e2c63b..f5a37ac 100644
+index 2f0c644..d2aa565 100644
 --- a/mesonbuild/modules/python.py
 +++ b/mesonbuild/modules/python.py
-@@ -254,7 +254,7 @@ import sysconfig
+@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig
  import json
  import sys
 
@@ -27,8 +28,8 @@ index 6e2c63b..f5a37ac 100644
 
  def links_against_libpython():
      from distutils.core import Distribution, Extension
-@@ -279,12 +279,11 @@ class PythonInstallation(ExternalProgramHolder):
-         ExternalProgramHolder.__init__(self, python)
+@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder):
+         ExternalProgramHolder.__init__(self, python, interpreter.subproject)
          self.interpreter = interpreter
          self.subproject = self.interpreter.subproject
 -        prefix = self.interpreter.environment.coredata.get_builtin_option('prefix')
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +2 -2
index b5b463e68e..7a3b01262e 100644
@@ -1,4 +1,4 @@
-From d976d5a8abd6d42edf794d2a4c211fc6697fb14c Mon Sep 17 00:00:00 2001
+From 4b283d545152092fec12b9d80219161d11002c72 Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <[email protected]>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
 Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 18bbf86..e76315e 100644
+index dc20616..f54adcd 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -36,6 +36,7 @@ _T = T.TypeVar('_T')
meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +5 -5
index 38e50d72f4..4653a72a20 100644
@@ -1,4 +1,4 @@
-From 3af10fa8cd4e97181288d72227dea712290fd5e6 Mon Sep 17 00:00:00 2001
+From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <[email protected]>
 Date: Fri, 23 Nov 2018 15:28:28 +0000
 Subject: [PATCH] meson: Disable rpath stripping at install time
@@ -16,17 +16,17 @@ Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
-index ace0569..85bd8df 100644
+index 0be01fe..5406cab 100644
 --- a/mesonbuild/minstall.py
 +++ b/mesonbuild/minstall.py
-@@ -508,8 +508,11 @@ class Installer:
+@@ -512,8 +512,11 @@ class Installer:
              if file_copied:
                  self.did_install_something = True
                  try:
--                    depfixer.fix_rpath(outname, install_rpath, final_path,
+-                    depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
 -                                       install_name_mappings, verbose=False)
 +                    if install_rpath:
-+                        depfixer.fix_rpath(outname, install_rpath, final_path,
++                        depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
 +                                           install_name_mappings, verbose=False)
 +                    else:
 +                        print("RPATH changes at install time disabled")
meta/recipes-devtools/meson/meson_0.55.0.bb renamed from meta/recipes-devtools/meson/meson_0.54.3.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.54.3.bb
rename to meta/recipes-devtools/meson/meson_0.55.0.bb
meta/recipes-devtools/meson/nativesdk-meson_0.55.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.54.3.bb +0 -1
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.54.3.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.55.0.bb
--

2.27.0

#7 lore raw

Re: [OE-core] [PATCH 05/13] meson: update 0.54.3 -> 0.55.0

It is related; I have just sent a patch (to oe-core) to correct this.

Alex

Quoted 326 lines · Khem Raj

I wonder if this failure is related to this can you check

http://errors.yoctoproject.org/Errors/Details/427901/

Quoted 4 lines · Alexander Kanavin

Rebase patches.

Quoted 11 lines
---
 meta/recipes-devtools/meson/meson.inc         |  2 +-
 .../0001-Make-CPU-family-warnings-fatal.patch | 19 ++++----
 ...g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch | 48 +++++++++----------
 ...y-do-not-substitute-python-s-install.patch | 11 +++--
 ...pport-building-allarch-recipes-again.patch |  4 +-
 .../meson/meson/disable-rpath-handling.patch  | 10 ++--
 .../{meson_0.54.3.bb => meson_0.55.0.bb}      |  0
 ...on_0.54.3.bb => nativesdk-meson_0.55.0.bb} |  0
 8 files changed, 47 insertions(+), 47 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.54.3.bb => meson_0.55.0.bb}

(100%)

Quoted 1 line
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.54.3.bb =>

nativesdk-meson_0.55.0.bb} (100%)

Review

Quoted 2 lines
(quoted diff) +0 -0

b/meta/recipes-devtools/meson/meson.inc

meta/recipes-devtools/meson/meson.inc SRC_URI = "

Quoted 4 lines

index ffa17b3061..607093a152 100644

meta/recipes-devtools/meson/meson.inc +0 -0
@@ -16,7 +16,7 @@ SRC_URI = "

https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P

Quoted 1 line

file://0001-modules-python.py-do-not-substitute-python-s-install.patch \

Quoted 1 line

file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \

Quoted 2 lines
            "

-SRC_URI[sha256sum] =

"f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662"

Quoted 1 line

+SRC_URI[sha256sum] =

"0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35"

Quoted 4 lines
 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \

diff --git

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.patch

Quoted 2 lines

index 1be94a9b19..ceb2fde342 100644
---

a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch

Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch

Quoted 14 lines
meta/recipes-devtools/meson/meson.inc +2 -2
@@ -1,7 +1,7 @@
-From 62c415eedb62905de76e2e0bbd156a947705cab2 Mon Sep 17 00:00:00 2001
+From 5624b5835af747b601780ad14646f9c1fb854931 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
-Subject: [PATCH] Make CPU family warnings fatal
+Subject: [PATCH 1/2] Make CPU family warnings fatal
 
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Ross Burton <[email protected]>
@@ -12,23 +12,23 @@ Signed-off-by: Ross Burton <[email protected]>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py

meta/recipes-devtools/meson/meson.inc Signed-off-by: Ross Burton <[email protected]> · line 22

Quoted 10 lines
meta/recipes-devtools/meson/meson.inc +2 -3
-index 17058df..18bbf86 100644
+index 219b62e..d1be65b 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
-@@ -225,7 +225,7 @@ class MachineInfo:
+@@ -199,7 +199,7 @@ class MachineInfo:
 
          cpu_family = literal['cpu_family']
          if cpu_family not in known_cpu_families:
--            mlog.warning('Unknown CPU family %s, please report this at

https://github.com/mesonbuild/meson/issues/new' % cpu_family)

meta/recipes-devtools/meson/meson.inc Signed-off-by: Ross Burton <[email protected]> · line 23

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -1
-+            raise EnvironmentException('Unknown CPU family %s, see

https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % cpu_family)

meta/recipes-devtools/meson/meson.inc Signed-off-by: Ross Burton <[email protected]> · line 22

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+-            mlog.warning('Unknown CPU family {}, please report this at

https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))

meta/recipes-devtools/meson/meson.inc Signed-off-by: Ross Burton <[email protected]> · line 23

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
++            raise EnvironmentException('Unknown CPU family {}, see

https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))

meta/recipes-devtools/meson/meson.inc Signed-off-by: Ross Burton <[email protected]> · line 30

Quoted 9 lines
meta/recipes-devtools/meson/meson.inc +1 -2
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index a2f78a4..59fcb07 100644
+index bf09a88..8eabe78 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -364,9 +364,7 @@ def detect_cpu_family(compilers: CompilersDict) ->

str:

meta/recipes-devtools/meson/meson.inc Signed-off-by: Ross Burton <[email protected]> · line 30

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+@@ -375,9 +375,7 @@ def detect_cpu_family(compilers: CompilersDict) ->

str:

Quoted 11 lines
meta/recipes-devtools/meson/meson.inc +3 -0
          trial = 'parisc'
 
      if trial not in known_cpu_families:
@@ -39,3 +39,6 @@ index a2f78a4..59fcb07 100644
 
      return trial
 
+--
+2.24.0
+

diff --git

a/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch b/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch

Quoted 2 lines

index 35c18f0785..a1f8422d44 100644
---

a/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch

Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch

Quoted 16 lines
meta/recipes-devtools/meson/meson.inc +4 -3
@@ -1,4 +1,4 @@
-From 7be634fa9705d0367f48a91305f9acb642ff0a11 Mon Sep 17 00:00:00 2001
+From 64aa6718c290e150dafd8da83f31cb08af00af0e Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 27 May 2020 16:43:05 +0000
 Subject: [PATCH] gnome.py: prefix g-i paths with PKG_CONFIG_SYSROOT_DIR
@@ -9,33 +9,29 @@ determine when a custom variable is a path)
 
 Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
- mesonbuild/modules/gnome.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ mesonbuild/modules/gnome.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 23

Quoted 10 lines
meta/recipes-devtools/meson/meson.inc +1 -5
 
 diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index 89d5d5d..d75f2e5 100644
+index 52016f4..2b72ee4 100644
 --- a/mesonbuild/modules/gnome.py
 +++ b/mesonbuild/modules/gnome.py
-@@ -739,17 +739,17 @@ class GnomeModule(ExtensionModule):
-         if giscanner.found():
-             giscanner_path = giscanner.get_command()[0]
-             if not any(x in giscanner_path for x in

gi_util_dirs_check):

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 24

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -1
--                giscanner =

self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 25

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -1
-+                giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] +

self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 27

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +0 -2
-         else:
--            giscanner =

self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 28

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -1
-+            giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] +

self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 30

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +0 -2
-
-         gicompiler =

self.interpreter.find_program_impl('g-ir-compiler')

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 33

Quoted 3 lines
meta/recipes-devtools/meson/meson.inc +0 -3
-         if gicompiler.found():
-             gicompiler_path = gicompiler.get_command()[0]
-             if not any(x in gicompiler_path for x in

gi_util_dirs_check):

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 34

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -1
--                gicompiler =

self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 35

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -1
-+                gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] +

self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 37

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +0 -2
-         else:
--            gicompiler =

self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 38

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -1
-+            gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] +

self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 23

Quoted 6 lines
meta/recipes-devtools/meson/meson.inc +3 -3
-
-         ns = kwargs.pop('namespace')
-         nsversion = kwargs.pop('nsversion')
+@@ -410,14 +410,14 @@ class GnomeModule(ExtensionModule):
+             if giscanner is not None:
+                 self.giscanner =

ExternalProgram.from_entry('g-ir-scanner', giscanner)

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 25

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +2 -0
+             elif self.gir_dep.type_name == 'pkgconfig':
+-                self.giscanner = ExternalProgram('g_ir_scanner',

self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}))

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 26

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
++                self.giscanner = ExternalProgram('g_ir_scanner',

os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}))

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 28

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +2 -0
+             else:
+                 self.giscanner =

self.interpreter.find_program_impl('g-ir-scanner')

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 29

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+             gicompiler =

state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler')

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 31

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +2 -0
+             if gicompiler is not None:
+                 self.gicompiler =

ExternalProgram.from_entry('g-ir-compiler', gicompiler)

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 33

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +2 -0
+             elif self.gir_dep.type_name == 'pkgconfig':
+-                self.gicompiler = ExternalProgram('g_ir_compiler',

self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}))

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 34

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
++                self.gicompiler = ExternalProgram('g_ir_compiler',

os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}))

meta/recipes-devtools/meson/meson.inc determine when a custom variable is a path) · line 36

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +2 -0
+             else:
+                 self.gicompiler =

self.interpreter.find_program_impl('g-ir-compiler')

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +1 -0
+         return self.gir_dep, self.giscanner, self.gicompiler

diff --git

a/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch b/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch

Quoted 2 lines

index a25c392270..c0ad01e9d3 100644
---

a/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch

Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch

meta/recipes-devtools/meson/meson.inc line 4

Quoted 6 lines
meta/recipes-devtools/meson/meson.inc +1 -1
@@ -1,4 +1,4 @@
-From 1d178fb2928d325e339b15972890ceced863d3ec Mon Sep 17 00:00:00 2001
+From 214e559d394491b1376e4cc370f75151117a3f83 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 18 Apr 2019 17:36:11 +0200
 Subject: [PATCH] modules/python.py: do not substitute python's install

prefix

meta/recipes-devtools/meson/meson.inc b) shouldn't be necessary as Python's prefix ought

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -0
@@ -10,15 +10,16 @@ b) shouldn't be necessary as Python's prefix ought

to be correct in the first pl

Quoted 19 lines
meta/recipes-devtools/meson/meson.inc +3 -2
 Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
  mesonbuild/modules/python.py | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
-index 6e2c63b..f5a37ac 100644
+index 2f0c644..d2aa565 100644
 --- a/mesonbuild/modules/python.py
 +++ b/mesonbuild/modules/python.py
-@@ -254,7 +254,7 @@ import sysconfig
+@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig
  import json
  import sys
 

meta/recipes-devtools/meson/meson.inc index 6e2c63b..f5a37ac 100644 · line 32

Quoted 7 lines
meta/recipes-devtools/meson/meson.inc +2 -2
@@ -27,8 +28,8 @@ index 6e2c63b..f5a37ac 100644
 
  def links_against_libpython():
      from distutils.core import Distribution, Extension
-@@ -279,12 +279,11 @@ class PythonInstallation(ExternalProgramHolder):
-         ExternalProgramHolder.__init__(self, python)
+@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder):
+         ExternalProgramHolder.__init__(self, python,

interpreter.subproject)

meta/recipes-devtools/meson/meson.inc index 6e2c63b..f5a37ac 100644 · line 35

Quoted 3 lines
meta/recipes-devtools/meson/meson.inc +0 -0
          self.interpreter = interpreter
          self.subproject = self.interpreter.subproject
 -        prefix =

self.interpreter.environment.coredata.get_builtin_option('prefix')

Quoted 1 line

diff --git

a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch

Quoted 2 lines

index b5b463e68e..7a3b01262e 100644
---

a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch

Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch

meta/recipes-devtools/meson/meson.inc Signed-off-by: Peter Kjellerstedt <

Quoted 7 lines
meta/recipes-devtools/meson/meson.inc +1 -1
@@ -1,4 +1,4 @@
-From d976d5a8abd6d42edf794d2a4c211fc6697fb14c Mon Sep 17 00:00:00 2001
+From 4b283d545152092fec12b9d80219161d11002c72 Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <[email protected]>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
 Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <

[email protected]>

Quoted 9 lines
meta/recipes-devtools/meson/meson.inc +1 -1
  1 file changed, 1 insertion(+)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 18bbf86..e76315e 100644
+index dc20616..f54adcd 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -36,6 +36,7 @@ _T = T.TypeVar('_T')

diff --git

a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch

meta/recipes-devtools/meson/meson/disable-rpath-handling.patch Upstream-Status: Submitted [

Quoted 10 lines

index 38e50d72f4..4653a72a20 100644

meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +1 -1
@@ -1,4 +1,4 @@
-From 3af10fa8cd4e97181288d72227dea712290fd5e6 Mon Sep 17 00:00:00 2001
+From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <[email protected]>
 Date: Fri, 23 Nov 2018 15:28:28 +0000
 Subject: [PATCH] meson: Disable rpath stripping at install time
@@ -16,17 +16,17 @@ Upstream-Status: Submitted [

https://github.com/mesonbuild/meson/issues/2567]

meta/recipes-devtools/meson/meson/disable-rpath-handling.patch Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]

Quoted 13 lines
meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +2 -3
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
-index ace0569..85bd8df 100644
+index 0be01fe..5406cab 100644
 --- a/mesonbuild/minstall.py
 +++ b/mesonbuild/minstall.py
-@@ -508,8 +508,11 @@ class Installer:
+@@ -512,8 +512,11 @@ class Installer:
              if file_copied:
                  self.did_install_something = True
                  try:
--                    depfixer.fix_rpath(outname, install_rpath,

final_path,

meta/recipes-devtools/meson/meson/disable-rpath-handling.patch Upstream-Status: Submitted [ · line 26

Quoted 1 line
meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +1 -0
+-                    depfixer.fix_rpath(outname,

t.rpath_dirs_to_remove, install_rpath, final_path,

meta/recipes-devtools/meson/meson/disable-rpath-handling.patch Upstream-Status: Submitted [ · line 27

Quoted 1 line
meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +0 -0
 -                                       install_name_mappings,

verbose=False)

meta/recipes-devtools/meson/meson/disable-rpath-handling.patch Upstream-Status: Submitted [ · line 29

Quoted 2 lines
meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +0 -1
 +                    if install_rpath:
-+                        depfixer.fix_rpath(outname, install_rpath,

final_path,

meta/recipes-devtools/meson/meson/disable-rpath-handling.patch Upstream-Status: Submitted [ · line 29

Quoted 1 line
meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +1 -0
++                        depfixer.fix_rpath(outname,

t.rpath_dirs_to_remove, install_rpath, final_path,

meta/recipes-devtools/meson/meson/disable-rpath-handling.patch Upstream-Status: Submitted [ · line 30

Quoted 1 line
meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +0 -0
 +                                           install_name_mappings,

verbose=False)

Review

Quoted 3 lines
meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +0 -0
 +                    else:
 +                        print("RPATH changes at install time disabled")
(quoted diff) +0 -0

b/meta/recipes-devtools/meson/meson_0.55.0.bb

Review

Quoted 4 lines

similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.54.3.bb rename to meta/recipes-devtools/meson/meson_0.55.0.bb

(quoted diff) +0 -0

b/meta/recipes-devtools/meson/nativesdk-meson_0.55.0.bb

Quoted 7 lines

similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.54.3.bb rename to meta/recipes-devtools/meson/nativesdk-meson_0.55.0.bb --
2.27.0

#8 lore raw

Re: [OE-core] [PATCH 05/13] meson: update 0.54.3 -> 0.55.0

Thanks for quick turnaround Alex, I validated the fix you sent for meson and it fixed this issue

Quoted 261 lines · Alexander Kanavin

It is related; I have just sent a patch (to oe-core) to correct this.

Alex

Quoted 255 lines · Khem Raj

I wonder if this failure is related to this can you check

http://errors.yoctoproject.org/Errors/Details/427901/

Quoted 249 lines · Alexander Kanavin

Rebase patches.

---
 meta/recipes-devtools/meson/meson.inc         |  2 +-
 .../0001-Make-CPU-family-warnings-fatal.patch | 19 ++++----
 ...g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch | 48 +++++++++----------
 ...y-do-not-substitute-python-s-install.patch | 11 +++--
 ...pport-building-allarch-recipes-again.patch |  4 +-
 .../meson/meson/disable-rpath-handling.patch  | 10 ++--
 .../{meson_0.54.3.bb => meson_0.55.0.bb}      |  0
 ...on_0.54.3.bb => nativesdk-meson_0.55.0.bb} |  0
 8 files changed, 47 insertions(+), 47 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.54.3.bb => meson_0.55.0.bb} (100%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.54.3.bb => nativesdk-meson_0.55.0.bb} (100%)
meta/recipes-devtools/meson/meson.inc +1 -1
index ffa17b3061..607093a152 100644
@@ -16,7 +16,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
            file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \
            "
-SRC_URI[sha256sum] = "f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662"
+SRC_URI[sha256sum] = "0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35"
 
 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +11 -8
index 1be94a9b19..ceb2fde342 100644
@@ -1,7 +1,7 @@
-From 62c415eedb62905de76e2e0bbd156a947705cab2 Mon Sep 17 00:00:00 2001
+From 5624b5835af747b601780ad14646f9c1fb854931 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
-Subject: [PATCH] Make CPU family warnings fatal
+Subject: [PATCH 1/2] Make CPU family warnings fatal
 
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Ross Burton <[email protected]>
@@ -12,23 +12,23 @@ Signed-off-by: Ross Burton <[email protected]>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 17058df..18bbf86 100644
+index 219b62e..d1be65b 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
-@@ -225,7 +225,7 @@ class MachineInfo:
+@@ -199,7 +199,7 @@ class MachineInfo:
 
          cpu_family = literal['cpu_family']
          if cpu_family not in known_cpu_families:
--            mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % cpu_family)
-+            raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % cpu_family)
+-            mlog.warning('Unknown CPU family {}, please report this at https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
++            raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))
 
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index a2f78a4..59fcb07 100644
+index bf09a88..8eabe78 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -364,9 +364,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+@@ -375,9 +375,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
          trial = 'parisc'
 
      if trial not in known_cpu_families:
@@ -39,3 +39,6 @@ index a2f78a4..59fcb07 100644
 
      return trial
 
+--
+2.24.0
+
meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch +22 -26
index 35c18f0785..a1f8422d44 100644
@@ -1,4 +1,4 @@
-From 7be634fa9705d0367f48a91305f9acb642ff0a11 Mon Sep 17 00:00:00 2001
+From 64aa6718c290e150dafd8da83f31cb08af00af0e Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 27 May 2020 16:43:05 +0000
 Subject: [PATCH] gnome.py: prefix g-i paths with PKG_CONFIG_SYSROOT_DIR
@@ -9,33 +9,29 @@ determine when a custom variable is a path)
 
 Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
- mesonbuild/modules/gnome.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ mesonbuild/modules/gnome.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index 89d5d5d..d75f2e5 100644
+index 52016f4..2b72ee4 100644
 --- a/mesonbuild/modules/gnome.py
 +++ b/mesonbuild/modules/gnome.py
-@@ -739,17 +739,17 @@ class GnomeModule(ExtensionModule):
-         if giscanner.found():
-             giscanner_path = giscanner.get_command()[0]
-             if not any(x in giscanner_path for x in gi_util_dirs_check):
--                giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
-+                giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
-         else:
--            giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
-+            giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
-
-         gicompiler = self.interpreter.find_program_impl('g-ir-compiler')
-         if gicompiler.found():
-             gicompiler_path = gicompiler.get_command()[0]
-             if not any(x in gicompiler_path for x in gi_util_dirs_check):
--                gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
-+                gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
-         else:
--            gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
-+            gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
-
-         ns = kwargs.pop('namespace')
-         nsversion = kwargs.pop('nsversion')
+@@ -410,14 +410,14 @@ class GnomeModule(ExtensionModule):
+             if giscanner is not None:
+                 self.giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner)
+             elif self.gir_dep.type_name == 'pkgconfig':
+-                self.giscanner = ExternalProgram('g_ir_scanner', self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}))
++                self.giscanner = ExternalProgram('g_ir_scanner', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}))
+             else:
+                 self.giscanner = self.interpreter.find_program_impl('g-ir-scanner')
+             gicompiler = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler')
+             if gicompiler is not None:
+                 self.gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler)
+             elif self.gir_dep.type_name == 'pkgconfig':
+-                self.gicompiler = ExternalProgram('g_ir_compiler', self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}))
++                self.gicompiler = ExternalProgram('g_ir_compiler', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}))
+             else:
+                 self.gicompiler = self.interpreter.find_program_impl('g-ir-compiler')
+         return self.gir_dep, self.giscanner, self.gicompiler
meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch +6 -5
index a25c392270..c0ad01e9d3 100644
@@ -1,4 +1,4 @@
-From 1d178fb2928d325e339b15972890ceced863d3ec Mon Sep 17 00:00:00 2001
+From 214e559d394491b1376e4cc370f75151117a3f83 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 18 Apr 2019 17:36:11 +0200
 Subject: [PATCH] modules/python.py: do not substitute python's install prefix
@@ -10,15 +10,16 @@ b) shouldn't be necessary as Python's prefix ought to be correct in the first pl
 
 Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
  mesonbuild/modules/python.py | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
-index 6e2c63b..f5a37ac 100644
+index 2f0c644..d2aa565 100644
 --- a/mesonbuild/modules/python.py
 +++ b/mesonbuild/modules/python.py
-@@ -254,7 +254,7 @@ import sysconfig
+@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig
  import json
  import sys
 
@@ -27,8 +28,8 @@ index 6e2c63b..f5a37ac 100644
 
  def links_against_libpython():
      from distutils.core import Distribution, Extension
-@@ -279,12 +279,11 @@ class PythonInstallation(ExternalProgramHolder):
-         ExternalProgramHolder.__init__(self, python)
+@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder):
+         ExternalProgramHolder.__init__(self, python, interpreter.subproject)
          self.interpreter = interpreter
          self.subproject = self.interpreter.subproject
 -        prefix = self.interpreter.environment.coredata.get_builtin_option('prefix')
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +2 -2
index b5b463e68e..7a3b01262e 100644
@@ -1,4 +1,4 @@
-From d976d5a8abd6d42edf794d2a4c211fc6697fb14c Mon Sep 17 00:00:00 2001
+From 4b283d545152092fec12b9d80219161d11002c72 Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <[email protected]>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
 Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 18bbf86..e76315e 100644
+index dc20616..f54adcd 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -36,6 +36,7 @@ _T = T.TypeVar('_T')
meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +5 -5
index 38e50d72f4..4653a72a20 100644
@@ -1,4 +1,4 @@
-From 3af10fa8cd4e97181288d72227dea712290fd5e6 Mon Sep 17 00:00:00 2001
+From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <[email protected]>
 Date: Fri, 23 Nov 2018 15:28:28 +0000
 Subject: [PATCH] meson: Disable rpath stripping at install time
@@ -16,17 +16,17 @@ Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
-index ace0569..85bd8df 100644
+index 0be01fe..5406cab 100644
 --- a/mesonbuild/minstall.py
 +++ b/mesonbuild/minstall.py
-@@ -508,8 +508,11 @@ class Installer:
+@@ -512,8 +512,11 @@ class Installer:
              if file_copied:
                  self.did_install_something = True
                  try:
--                    depfixer.fix_rpath(outname, install_rpath, final_path,
+-                    depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
 -                                       install_name_mappings, verbose=False)
 +                    if install_rpath:
-+                        depfixer.fix_rpath(outname, install_rpath, final_path,
++                        depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
 +                                           install_name_mappings, verbose=False)
 +                    else:
 +                        print("RPATH changes at install time disabled")
meta/recipes-devtools/meson/meson_0.55.0.bb renamed from meta/recipes-devtools/meson/meson_0.54.3.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.54.3.bb
rename to meta/recipes-devtools/meson/meson_0.55.0.bb
meta/recipes-devtools/meson/nativesdk-meson_0.55.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.54.3.bb +0 -1
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.54.3.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.55.0.bb
--

2.27.0

#9 lore raw

PATCH 6/13 nasm: update 2.14.02 -> 2.15.03

In reply to Alexander Kanavin

Remove backported patches, rebase the rest.

Switch to using (mostly) standard autotools build.

---
 ...rs.m4-for-development-versions-of-au.patch |  28 ----
 .../nasm/nasm/0001-stdlib-Add-strlcat.patch   |  28 ++--
 .../0002-Add-debug-prefix-map-option.patch    | 129 +++++++-----------
 .../nasm/nasm/CVE-2018-19755.patch            | 116 ----------------
 .../nasm/nasm/CVE-2019-14248.patch            |  43 ------
 .../nasm/{nasm_2.14.02.bb => nasm_2.15.03.bb} |  11 +-
 6 files changed, 66 insertions(+), 289 deletions(-)
 delete mode 100644 meta/recipes-devtools/nasm/nasm/0001-fix-pa_add_headers.m4-for-development-versions-of-au.patch
 delete mode 100644 meta/recipes-devtools/nasm/nasm/CVE-2018-19755.patch
 delete mode 100644 meta/recipes-devtools/nasm/nasm/CVE-2019-14248.patch
 rename meta/recipes-devtools/nasm/{nasm_2.14.02.bb => nasm_2.15.03.bb} (51%)
meta/recipes-devtools/nasm/nasm/0001-fix-pa_add_headers.m4-for-development-versions-of-au.patch deleted +0 -28
deleted file mode 100644
index b52dc5ba7b..0000000000
@@ -1,28 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 287964d54b64bed833adba307e1d920f8fcf0cbc Mon Sep 17 00:00:00 2001
-From: Ozkan Sezer <[email protected]>
-Date: Wed, 7 Aug 2019 15:50:50 +0300
-Subject: [PATCH] fix pa_add_headers.m4 for development versions of autoconf
- (bug 3392471)
-
-Signed-off-by: H. Peter Anvin (Intel) <[email protected]>
----
- autoconf/m4/pa_add_headers.m4 | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 1af2dd5d..6ce3e6c1 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -169,7 +169,8 @@ dnl --------------------------------------------------------------------------
- AC_DEFUN(_PA_ADD_HEADER,
- [AC_CHECK_HEADERS([$1],[ac_includes_default="$ac_includes_default
- #include <$1>"
--])])
-+])
-+])
- 
- AC_DEFUN(PA_ADD_HEADERS,
- [m4_map_args_w([$1],[_PA_ADD_HEADER(],[)])])
meta/recipes-devtools/nasm/nasm/0001-stdlib-Add-strlcat.patch +13 -15
index d94fd3290e..0ede8a8328 100644
@@ -1,12 +1,13 @@
-From 8a204171004fa0d7d21389530c744d215e99efb0 Mon Sep 17 00:00:00 2001
+From 1c5023002bad3a5b0bbc181fdb324160beace733 Mon Sep 17 00:00:00 2001
 From: Joshua Watt <[email protected]>
 Date: Tue, 19 Nov 2019 12:47:30 -0600
-Subject: [PATCH 1/2] stdlib: Add strlcat
+Subject: [PATCH] stdlib: Add strlcat
 
 Adds strlcat which can be used to safely concatenate strings
 
 Upstream-Status: Submitted [https://bugzilla.nasm.us/show_bug.cgi?id=3392635]
 Signed-off-by: Joshua Watt <[email protected]>
+
 ---
  Makefile.in        |  2 +-
  configure.ac       |  2 ++
@@ -16,10 +17,10 @@ Signed-off-by: Joshua Watt <[email protected]>
  create mode 100644 stdlib/strlcat.c
 
 diff --git a/Makefile.in b/Makefile.in
-index 32ef3d91..ff7eb447 100644
+index bfae1f8..156dc4c 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -93,7 +93,7 @@ NASM =	asm/nasm.$(O)
+@@ -101,7 +101,7 @@ NASM =	asm/nasm.$(O)
  NDISASM = disasm/ndisasm.$(O)
  
  LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
@@ -27,20 +28,20 @@ index 32ef3d91..ff7eb447 100644
 +	stdlib/strnlen.$(O) stdlib/strrchrnul.$(O) stdlib/strlcat.$(O) \
  	\
  	nasmlib/ver.$(O) \
- 	nasmlib/crc64.$(O) nasmlib/malloc.$(O) nasmlib/errfile.$(O) \
+ 	nasmlib/alloc.$(O) nasmlib/asprintf.$(O) nasmlib/errfile.$(O) \
 diff --git a/configure.ac b/configure.ac
-index 38b3b596..b4e88778 100644
+index 7b72769..14fd033 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -152,6 +152,7 @@ AC_CHECK_FUNCS([vsnprintf _vsnprintf])
- AC_CHECK_FUNCS([snprintf _snprintf])
+@@ -234,6 +234,7 @@ PA_FUNC_SNPRINTF
+ PA_FUNC_VSNPRINTF
  AC_CHECK_FUNCS([strlcpy])
  AC_CHECK_FUNCS([strrchrnul])
 +AC_CHECK_FUNCS([strlcat])
  
  dnl These types are POSIX-specific, and Windows does it differently...
  AC_CHECK_TYPES([struct _stati64])
-@@ -170,6 +171,7 @@ AC_CHECK_DECLS(strsep)
+@@ -253,6 +254,7 @@ AC_CHECK_DECLS(strsep)
  AC_CHECK_DECLS(strlcpy)
  AC_CHECK_DECLS(strnlen)
  AC_CHECK_DECLS(strrchrnul)
@@ -49,10 +50,10 @@ index 38b3b596..b4e88778 100644
  dnl Check for missing types
  AC_TYPE_UINTPTR_T
 diff --git a/include/compiler.h b/include/compiler.h
-index 4178c98e..8153d297 100644
+index b4fd3a8..7fb4821 100644
 --- a/include/compiler.h
 +++ b/include/compiler.h
-@@ -159,6 +159,10 @@ size_t strlcpy(char *, const char *, size_t);
+@@ -169,6 +169,10 @@ size_t strlcpy(char *, const char *, size_t);
  char *strrchrnul(const char *, int);
  #endif
  
@@ -65,7 +66,7 @@ index 4178c98e..8153d297 100644
  #  include <stdbool.h>
 diff --git a/stdlib/strlcat.c b/stdlib/strlcat.c
 new file mode 100644
-index 00000000..7084d460
+index 0000000..7084d46
 --- /dev/null
 +++ b/stdlib/strlcat.c
 @@ -0,0 +1,43 @@
@@ -112,6 +113,3 @@ index 00000000..7084d460
 +
 +#endif
 +
--- 
-2.23.0
-
meta/recipes-devtools/nasm/nasm/0002-Add-debug-prefix-map-option.patch +50 -79

254 lines not on this page · raw message

meta/recipes-devtools/nasm/nasm/CVE-2018-19755.patch deleted +0 -116

116 lines not on this page · raw message

meta/recipes-devtools/nasm/nasm/CVE-2019-14248.patch deleted +0 -43

43 lines not on this page · raw message

meta/recipes-devtools/nasm/nasm_2.15.03.bb renamed from meta/recipes-devtools/nasm/nasm_2.14.02.bb +3 -8
similarity index 51%
rename from meta/recipes-devtools/nasm/nasm_2.14.02.bb
rename to meta/recipes-devtools/nasm/nasm_2.15.03.bb
index c40be8fbbf..5c4e28de06 100644
@@ -4,20 +4,15 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=90904486f8fbf1861cf42752e1a39efe"
 
 SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 \
-           file://CVE-2018-19755.patch \
-           file://CVE-2019-14248.patch \
            file://0001-stdlib-Add-strlcat.patch \
            file://0002-Add-debug-prefix-map-option.patch \
-           file://0001-fix-pa_add_headers.m4-for-development-versions-of-au.patch \
            "
 
-SRC_URI[md5sum] = "3f489aa48ad2aa1f967dc5e293bbd06f"
-SRC_URI[sha256sum] = "34fd26c70a277a9fdd54cb5ecf389badedaf48047b269d1008fbc819b24e80bc"
+SRC_URI[sha256sum] = "04e7343d9bf112bffa9fda86f6c7c8b120c2ccd700b882e2db9f57484b1bd778"
 
-# brokensep since this uses autoconf but not automake
-inherit autotools-brokensep
+EXTRA_AUTORECONF_append = " -I autoconf/m4"
 
-EXTRA_AUTORECONF += "--exclude=aclocal"
+inherit autotools
 
 BBCLASSEXTEND = "native"
 
Signature · 1 line
2.27.0
#10 lore raw

PATCH 7/13 glib-2.0: correct build with latest meson

In reply to Alexander Kanavin
---
 meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-linux | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-linux +1 -1
index 83596e0efb..adad7e62ee 100644
@@ -2,4 +2,4 @@
 have_proc_self_cmdline = true
 
 [binaries]
-env = "/usr/bin/env"
+env = '/usr/bin/env'
Signature · 1 line
2.27.0
#11 lore raw

Re: [OE-core] [PATCH 07/13] glib-2.0: correct build with latest meson

Quoted 10 lines · Alexander Kanavin
---
  meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-linux | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-linux +0 -0
index 83596e0efb..adad7e62ee 100644

meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-linux line 5

Quoted 5 lines
meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-linux +1 -1
@@ -2,4 +2,4 @@
  have_proc_self_cmdline = true
 
  [binaries]
-env = "/usr/bin/env"
+env = '/usr/bin/env'

is meson finicky quoting style? If so, perhaps it would be good to call it out in commit msg

Quoted 4 lines
#12 lore raw

PATCH 8/13 rsync: update 3.2.1 -> 3.2.2

In reply to Alexander Kanavin
---
 .../rsync/files/makefile-no-rebuild.patch          | 14 +++++++++-----
 .../rsync/{rsync_3.2.1.bb => rsync_3.2.2.bb}       |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)
 rename meta/recipes-devtools/rsync/{rsync_3.2.1.bb => rsync_3.2.2.bb} (95%)
meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch +9 -5
index 038a672095..4ba7665280 100644
@@ -1,4 +1,4 @@
-From 5ae38baadd40a996da3d19a147f37e7f1f3355bf Mon Sep 17 00:00:00 2001
+From 1f29584e57f5fda09970c66f3b94f4720e09c1bb Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 12 Apr 2016 15:51:54 +0100
 Subject: [PATCH] rsync: remove upstream's rebuild logic
@@ -10,14 +10,14 @@ Upstream-Status: Inappropriate
 Signed-off-by: Ross Burton <[email protected]>
 
 ---
- Makefile.in | 50 --------------------------------------------------
- 1 file changed, 50 deletions(-)
+ Makefile.in | 54 -----------------------------------------------------
+ 1 file changed, 54 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 31ddc43..41c9a93 100644
+index 672fcc4..c12d8d4 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -167,56 +167,6 @@ gen: conf proto.h man
+@@ -168,60 +168,6 @@ gen: conf proto.h man
  gensend: gen
  	rsync -aic $(GENFILES) $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/
  
@@ -56,6 +56,10 @@ index 31ddc43..41c9a93 100644
 -	./config.status --recheck
 -	./config.status
 -
+-.PHONY: restatus
+-restatus:
+-	./config.status
+-
 -Makefile: Makefile.in config.status configure.sh config.h.in
 -	@if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
 -	@./config.status
meta/recipes-devtools/rsync/rsync_3.2.2.bb renamed from meta/recipes-devtools/rsync/rsync_3.2.1.bb +1 -1
similarity index 95%
rename from meta/recipes-devtools/rsync/rsync_3.2.1.bb
rename to meta/recipes-devtools/rsync/rsync_3.2.2.bb
index ea6b1ce38f..182628f4b4 100644
@@ -14,7 +14,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \
            file://makefile-no-rebuild.patch \
            "
 
-SRC_URI[sha256sum] = "95f2dd62979b500a99b34c1a6453a0787ada0330e4bec7fcffad37b9062d58d3"
+SRC_URI[sha256sum] = "644bd3841779507665211fd7db8359c8a10670c57e305b4aab61b4e40037afa8"
 
 # -16548 required for v3.1.3pre1. Already in v3.1.3.
 CVE_CHECK_WHITELIST += " CVE-2017-16548 "
Signature · 1 line
2.27.0
#13 lore raw

PATCH 9/13 vala: update 0.48.6 -> 0.48.7

In reply to Alexander Kanavin

Remove patch, as issue fixed upstream.

---
 ...don-t-append-dirty-if-we-re-not-in-g.patch | 55 -------------------
 meta/recipes-devtools/vala/vala_0.48.6.bb     |  7 ---
 meta/recipes-devtools/vala/vala_0.48.7.bb     |  5 ++
 3 files changed, 5 insertions(+), 62 deletions(-)
 delete mode 100644 meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
 delete mode 100644 meta/recipes-devtools/vala/vala_0.48.6.bb
 create mode 100644 meta/recipes-devtools/vala/vala_0.48.7.bb
meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch deleted +0 -55
deleted file mode 100644
index ac9dc8c83a..0000000000
@@ -1,55 +0,0 @@
-From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Tue, 21 Feb 2012 17:12:50 +0100
-Subject: [PATCH] git-version-gen: don't append -dirty if we're not in git
- repo
-
-* for example if we have some dirty directory and we unpack clean vala tarball in it, then it will append -dirty
-
-Signed-off-by: Martin Jansa <[email protected]>
-
-Upstream-Status: Inappropriate [OE-Specific]
----
- build-aux/git-version-gen |   25 ++++++++++++++-----------
- 1 files changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
-index 0fa6faa..1d1f9d2 100755
---- a/build-aux/git-version-gen
-+++ b/build-aux/git-version-gen
-@@ -126,18 +126,21 @@ fi
- 
- v=`echo "$v" |sed 's/^v//'`
- 
--# Don't declare a version "dirty" merely because a time stamp has changed.
--git status > /dev/null 2>&1
-+if test -d .git
-+then
-+	# Don't declare a version "dirty" merely because a time stamp has changed.
-+	git status > /dev/null 2>&1
- 
--dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
--case "$dirty" in
--    '') ;;
--    *) # Append the suffix only if there isn't one already.
--	case $v in
--	  *-dirty) ;;
--	  *) v="$v-dirty" ;;
--	esac ;;
--esac
-+	dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
-+	case "$dirty" in
-+	    '') ;;
-+	    *) # Append the suffix only if there isn't one already.
-+		case $v in
-+		  *-dirty) ;;
-+		  *) v="$v-dirty" ;;
-+		esac ;;
-+	esac
-+fi
- 
- # Omit the trailing newline, so that m4_esyscmd can use the result directly.
- echo "$v" | tr -d '\012'
--- 
-1.7.8.4
-
meta/recipes-devtools/vala/vala_0.48.6.bb deleted +0 -7
deleted file mode 100644
index 9dace1348c..0000000000
@@ -1,7 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
-           file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
-           "
-
-SRC_URI[sha256sum] = "d18d08ed030ce0e0f044f4c15c9df3c25b15beaf8700e45e43b736a6debf9707"
meta/recipes-devtools/vala/vala_0.48.7.bb new file +5 -0
new file mode 100644
index 0000000000..2e61db1052
@@ -0,0 +1,5 @@
+require ${BPN}.inc
+
+SRC_URI += " file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch"
+
+SRC_URI[sha256sum] = "28de33e28da24500cc1675c3a6ced1301c9a6a5e6dd06193569001f9ce9a5c53"
Signature · 1 line
2.27.0
#14 lore raw

Re: [OE-core] [PATCH 09/13] vala: update 0.48.6 -> 0.48.7

Quoted 92 lines · Alexander Kanavin

Remove patch, as issue fixed upstream.

---
  ...don-t-append-dirty-if-we-re-not-in-g.patch | 55 -------------------
  meta/recipes-devtools/vala/vala_0.48.6.bb     |  7 ---
  meta/recipes-devtools/vala/vala_0.48.7.bb     |  5 ++
  3 files changed, 5 insertions(+), 62 deletions(-)

delete mode 100644 meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch delete mode 100644 meta/recipes-devtools/vala/vala_0.48.6.bb
create mode 100644 meta/recipes-devtools/vala/vala_0.48.7.bb

meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch deleted +0 -55
deleted file mode 100644
index ac9dc8c83a..0000000000
@@ -1,55 +0,0 @@
-From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Tue, 21 Feb 2012 17:12:50 +0100
-Subject: [PATCH] git-version-gen: don't append -dirty if we're not in git
- repo
-
-* for example if we have some dirty directory and we unpack clean vala tarball in it, then it will append -dirty
-
-Signed-off-by: Martin Jansa <[email protected]>
-
-Upstream-Status: Inappropriate [OE-Specific]
----
- build-aux/git-version-gen |   25 ++++++++++++++-----------
- 1 files changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
-index 0fa6faa..1d1f9d2 100755
---- a/build-aux/git-version-gen
-+++ b/build-aux/git-version-gen
-@@ -126,18 +126,21 @@ fi
-
- v=`echo "$v" |sed 's/^v//'`
-
--# Don't declare a version "dirty" merely because a time stamp has changed.
--git status > /dev/null 2>&1
-+if test -d .git
-+then
-+	# Don't declare a version "dirty" merely because a time stamp has changed.
-+	git status > /dev/null 2>&1
-
--dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
--case "$dirty" in
--    '') ;;
--    *) # Append the suffix only if there isn't one already.
--	case $v in
--	  *-dirty) ;;
--	  *) v="$v-dirty" ;;
--	esac ;;
--esac
-+	dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
-+	case "$dirty" in
-+	    '') ;;
-+	    *) # Append the suffix only if there isn't one already.
-+		case $v in
-+		  *-dirty) ;;
-+		  *) v="$v-dirty" ;;
-+		esac ;;
-+	esac
-+fi
-
- # Omit the trailing newline, so that m4_esyscmd can use the result directly.
- echo "$v" | tr -d '\012'
---
-1.7.8.4
-
meta/recipes-devtools/vala/vala_0.48.6.bb deleted +0 -7
deleted file mode 100644
index 9dace1348c..0000000000
@@ -1,7 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
-           file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
-           "
-
-SRC_URI[sha256sum] = "d18d08ed030ce0e0f044f4c15c9df3c25b15beaf8700e45e43b736a6debf9707"
meta/recipes-devtools/vala/vala_0.48.7.bb new file +0 -0
new file mode 100644
index 0000000000..2e61db1052

meta/recipes-devtools/vala/vala_0.48.7.bb line 1

Quoted 1 line
meta/recipes-devtools/vala/vala_0.48.7.bb new file +1 -0
@@ -0,0 +1,5 @@
+require ${BPN}.inc

I wonder if this .inc file should be merged into .bb while you are here

Quoted 8 lines
meta/recipes-devtools/vala/vala_0.48.7.bb new file +4 -0
+
+SRC_URI += " file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch"
+
+SRC_URI[sha256sum] = "28de33e28da24500cc1675c3a6ced1301c9a6a5e6dd06193569001f9ce9a5c53"
#15 lore raw

PATCH 10/13 logrotate: update 3.16.0 -> 3.17.0

In reply to Alexander Kanavin
---
 .../logrotate/act-as-mv-when-rotate.patch     | 22 +++++++++----------
 .../disable-check-different-filesystems.patch |  8 +++----
 ...ogrotate_3.16.0.bb => logrotate_3.17.0.bb} |  3 +--
 3 files changed, 16 insertions(+), 17 deletions(-)
 rename meta/recipes-extended/logrotate/{logrotate_3.16.0.bb => logrotate_3.17.0.bb} (96%)
meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch +11 -11
index acef5ccbe9..671fce4ac8 100644
@@ -1,4 +1,4 @@
-From ef1ea905831c5bcd63e04149571c10d75ff8f028 Mon Sep 17 00:00:00 2001
+From 17d57a2a923a4af53c8910a9999aebeab3f5d83a Mon Sep 17 00:00:00 2001
 From: Robert Yang <[email protected]>
 Date: Tue, 17 Feb 2015 21:08:07 -0800
 Subject: [PATCH] Act as the "mv" command when rotate log
@@ -15,10 +15,10 @@ Signed-off-by: Robert Yang <[email protected]>
  1 file changed, 59 insertions(+), 12 deletions(-)
 
 diff --git a/logrotate.c b/logrotate.c
-index 25902bc..afa1a90 100644
+index 45b3eb6..231371a 100644
 --- a/logrotate.c
 +++ b/logrotate.c
-@@ -1434,6 +1434,53 @@ static int findNeedRotating(struct logInfo *log, int logNum, int force)
+@@ -1463,6 +1463,53 @@ static int findNeedRotating(const struct logInfo *log, unsigned logNum, int forc
      return 0;
  }
  
@@ -72,7 +72,7 @@ index 25902bc..afa1a90 100644
  /* find the rotated file with the highest index */
  static int findLastRotated(const struct logNames *rotNames,
                             const char *fileext, const char *compext)
-@@ -1911,15 +1958,15 @@ static int prerotateSingleLog(struct logInfo *log, int logNum,
+@@ -1958,15 +2005,15 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
              }
  
              message(MESS_DEBUG,
@@ -91,7 +91,7 @@ index 25902bc..afa1a90 100644
                              oldName, newName, strerror(errno));
                      hasErrors = 1;
                  }
-@@ -2002,10 +2049,10 @@ static int rotateSingleLog(struct logInfo *log, int logNum,
+@@ -2051,10 +2098,10 @@ static int rotateSingleLog(const struct logInfo *log, unsigned logNum,
                      return 1;
                  }
  
@@ -105,7 +105,7 @@ index 25902bc..afa1a90 100644
                              log->files[logNum], tmpFilename,
                              strerror(errno));
                      hasErrors = 1;
-@@ -2014,11 +2061,11 @@ static int rotateSingleLog(struct logInfo *log, int logNum,
+@@ -2063,11 +2110,11 @@ static int rotateSingleLog(const struct logInfo *log, unsigned logNum,
                  free(tmpFilename);
              }
              else {
@@ -120,7 +120,7 @@ index 25902bc..afa1a90 100644
                              log->files[logNum], rotNames->finalName,
                              strerror(errno));
                      hasErrors = 1;
-@@ -2424,7 +2471,7 @@ static int rotateLogSet(struct logInfo *log, int force)
+@@ -2480,7 +2527,7 @@ static int rotateLogSet(const struct logInfo *log, int force)
      return hasErrors;
  }
  
@@ -129,16 +129,16 @@ index 25902bc..afa1a90 100644
  {
      struct logState *p;
      FILE *f;
-@@ -2629,7 +2676,7 @@ static int writeState(const char *stateFilename)
+@@ -2659,7 +2706,7 @@ static int writeState(const char *stateFilename)
          fclose(f);
  
      if (error == 0) {
 -        if (rename(tmpFilename, stateFilename)) {
 +        if (mvFile(tmpFilename, stateFilename, log, prev_acl)) {
+             message(MESS_ERROR, "error renaming temp state file %s to %s: %s\n",
+                     tmpFilename, stateFilename, strerror(errno));
              unlink(tmpFilename);
-             error = 1;
-             message(MESS_ERROR, "error renaming temp state file %s to %s\n",
-@@ -2987,7 +3034,7 @@ int main(int argc, const char **argv)
+@@ -3073,7 +3120,7 @@ int main(int argc, const char **argv)
          rc |= rotateLogSet(log, force);
  
      if (!debug)
meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch +4 -4
index 9ba531f815..d7f9a02cc8 100644
@@ -1,4 +1,4 @@
-From a3fdf3dbdd6ecc0f2550a765dcb9bb274bce8ea8 Mon Sep 17 00:00:00 2001
+From 16c1833ade4c036b30b8761d2c4a5bd85cc65c44 Mon Sep 17 00:00:00 2001
 From: Robert Yang <[email protected]>
 Date: Tue, 8 Jan 2019 06:27:06 +0000
 Subject: [PATCH] Disable the check for different filesystems
@@ -15,10 +15,10 @@ Signed-off-by: Robert Yang <[email protected]>
  1 file changed, 9 deletions(-)
 
 diff --git a/config.c b/config.c
-index f027c7e..026136c 100644
+index d2488f1..1de3745 100644
 --- a/config.c
 +++ b/config.c
-@@ -1873,15 +1873,6 @@ duperror:
+@@ -1902,15 +1902,6 @@ duperror:
                              }
  
                              free(ld);
@@ -28,7 +28,7 @@ index f027c7e..026136c 100644
 -                                message(MESS_ERROR,
 -                                        "%s:%d olddir %s and log file %s "
 -                                        "are on different devices\n", configFile,
--                                        lineNum, newlog->oldDir, newlog->files[i]);
+-                                        lineNum, newlog->oldDir, newlog->files[j]);
 -                                goto error;
 -                            }
                          }
meta/recipes-extended/logrotate/logrotate_3.17.0.bb renamed from meta/recipes-extended/logrotate/logrotate_3.16.0.bb +1 -2
similarity index 96%
rename from meta/recipes-extended/logrotate/logrotate_3.16.0.bb
rename to meta/recipes-extended/logrotate/logrotate_3.17.0.bb
index 1c9df5a3ca..08001f38e5 100644
@@ -18,8 +18,7 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz
             file://disable-check-different-filesystems.patch \
             "
 
-SRC_URI[md5sum] = "faf729e0e24bfaafaa677bc6deb46ed8"
-SRC_URI[sha256sum] = "442f6fdf61c349eeae5f76799878b88fe45a11c8863a38b618bac6988f4a7ce5"
+SRC_URI[sha256sum] = "58cc2178ff57faa3c0490181cce041345aeca6cff18dba1c5cd1398bf1c19294"
 
 PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}"
 
Signature · 1 line
2.27.0
#16 lore raw

PATCH 11/13 mesa: update 20.1.2 -> 20.1.4

In reply to Alexander Kanavin
---
 .../files/0002-meson.build-make-TLS-ELF-optional.patch    | 8 ++++----
 .../mesa/{mesa-gl_20.1.2.bb => mesa-gl_20.1.4.bb}         | 0
 meta/recipes-graphics/mesa/mesa.inc                       | 2 +-
 .../mesa/{mesa_20.1.2.bb => mesa_20.1.4.bb}               | 0
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-gl_20.1.2.bb => mesa-gl_20.1.4.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_20.1.2.bb => mesa_20.1.4.bb} (100%)
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +4 -4
index 91e59d14ed..ee171ad1c8 100644
@@ -1,4 +1,4 @@
-From dd1d15c75f6ff8ee96cf1e7b74e582bff3183ef6 Mon Sep 17 00:00:00 2001
+From 65857eaee12a21a631750ffcd9e64e0afbbc3af0 Mon Sep 17 00:00:00 2001
 From: Alistair Francis <[email protected]>
 Date: Thu, 14 Nov 2019 13:08:31 -0800
 Subject: [PATCH] meson.build: make TLS ELF optional
@@ -15,15 +15,15 @@ Signed-off-by: Alistair Francis <[email protected]>
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 261b588..311436e 100644
+index c51dde9..c16f78f 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -392,7 +392,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
  endif
  
  # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
--if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29)
-+if (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls')
+-if not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
++if not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls')
    pre_args += '-DUSE_ELF_TLS'
  endif
  
meta/recipes-graphics/mesa/mesa-gl_20.1.4.bb renamed from meta/recipes-graphics/mesa/mesa-gl_20.1.2.bb +0 -0
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_20.1.2.bb
rename to meta/recipes-graphics/mesa/mesa-gl_20.1.4.bb
meta/recipes-graphics/mesa/mesa.inc +1 -1
index 6fd92035f0..8d8e5288a9 100644
@@ -23,7 +23,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
            "
 
-SRC_URI[sha256sum] = "283dff72814c8a80ce1ff8271e3f055895d26f4da3f4362acc49193e635780cb"
+SRC_URI[sha256sum] = "6800271c2be2a0447510eb4e9b67edd9521859a4d565310617c4b359eb6799fe"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
meta/recipes-graphics/mesa/mesa_20.1.4.bb renamed from meta/recipes-graphics/mesa/mesa_20.1.2.bb +0 -0
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_20.1.2.bb
rename to meta/recipes-graphics/mesa/mesa_20.1.4.bb
Signature · 1 line
2.27.0
#17 lore raw

PATCH 12/13 libcap: update 2.36 -> 2.41

In reply to Alexander Kanavin
---
 ...0001-tests-do-not-statically-link-a-test.patch |  8 ++++----
 ...0002-tests-do-not-run-target-executables.patch | 15 ++++++---------
 .../libcap/{libcap_2.36.bb => libcap_2.41.bb}     |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)
 rename meta/recipes-support/libcap/{libcap_2.36.bb => libcap_2.41.bb} (96%)
meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch +4 -4
index 912f33f165..81fdd2a15c 100644
@@ -1,4 +1,4 @@
-From 24d59c99bcba065f1f40f49f870a5f6483b4b078 Mon Sep 17 00:00:00 2001
+From e4fe6890e07821d60f01f000a95f7944f3d68139 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
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/tests/Makefile b/tests/Makefile
-index f9cec56..aa0d09b 100644
+index 876a8b9..93a0e3a 100644
 --- a/tests/Makefile
 +++ b/tests/Makefile
-@@ -29,23 +29,23 @@ psx_test_wrap: psx_test.c $(DEPS)
+@@ -26,23 +26,23 @@ psx_test: psx_test.c $(DEPS)
  run_libcap_psx_test: libcap_psx_test
  
  libcap_psx_test: libcap_psx_test.c $(DEPS)
@@ -43,4 +43,4 @@ index f9cec56..aa0d09b 100644
 +	$(CC) $(CFLAGS) $< -o $@
  
  clean:
- 	rm -f psx_test psx_test_wrap libcap_psx_test libcap_launch_test *~
+ 	rm -f psx_test libcap_psx_test libcap_launch_test *~
meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch +6 -9
index 26d108c209..e8f1df98c1 100644
@@ -1,4 +1,4 @@
-From 6309554225e05e76167eda4e0df383fb3d1a62c3 Mon Sep 17 00:00:00 2001
+From 5583b48c04d5bf50b56473d88d990c3f0bc45c14 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
@@ -7,23 +7,20 @@ Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <[email protected]>
 
 ---
- tests/Makefile | 3 ---
- 1 file changed, 3 deletions(-)
+ tests/Makefile | 2 --
+ 1 file changed, 2 deletions(-)
 
 diff --git a/tests/Makefile b/tests/Makefile
-index 95e4ca6..7162cf0 100644
+index bfedbc2..876a8b9 100644
 --- a/tests/Makefile
 +++ b/tests/Makefile
-@@ -19,8 +19,6 @@ sudotest: test
+@@ -19,13 +19,11 @@ sudotest: test run_libcap_launch_test run_libcap_launch_test
  install: all
  
- run_psx_test: psx_test psx_test_wrap
+ run_psx_test: psx_test
 -	./psx_test
--	./psx_test_wrap
  
  psx_test: psx_test.c $(DEPS)
- 	$(CC) $(CFLAGS) $(IPATH) -DNOWRAP $< -o $@ $(LIBPSXLIB)
-@@ -29,7 +27,6 @@ psx_test_wrap: psx_test.c $(DEPS)
  	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
  
  run_libcap_psx_test: libcap_psx_test
meta/recipes-support/libcap/libcap_2.41.bb renamed from meta/recipes-support/libcap/libcap_2.36.bb +1 -1
similarity index 96%
rename from meta/recipes-support/libcap/libcap_2.36.bb
rename to meta/recipes-support/libcap/libcap_2.41.bb
index 2c98db6eeb..52d2f13e16 100644
@@ -12,7 +12,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${
            file://0002-tests-do-not-run-target-executables.patch \
            file://0001-tests-do-not-statically-link-a-test.patch \
            "
-SRC_URI[sha256sum] = "5048c849bdbbe24d2ca59463142cb279abec5edf3ab6731ab35a596bcf538a49"
+SRC_URI[sha256sum] = "880dac4f97795bf5bd0d77ae6476d8c6a854601eb0c461d5a5b91f07d8e60834"
 
 UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
 
Signature · 1 line
2.27.0
#18 lore raw

PATCH 13/13 net-tools: fix upstream version check

In reply to Alexander Kanavin

There is no tag other than ancient 1.60, so bypass the check for now.

---
 meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb +2 -0
index dcc2218e48..e97731073e 100644
@@ -16,6 +16,8 @@ SRC_URI = "git://git.code.sf.net/p/net-tools/code;protocol=https \
     file://Bug_541172-netstat.c-exit-codes.patch \
 "
 
+UPSTREAM_VERSION_UNKNOWN = "1"
+
 S = "${WORKDIR}/git"
 
 inherit gettext
Signature · 1 line
2.27.0