Skip to contentSkip to conversation

virglrenderer: explicitly depend on libgbm

PATCH In review Alexander Kanavin 2 participants 14 messages Jun 4, 2021 – Jun 17, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/11 virglrenderer: explicitly depend on libgbm

virtual/gl may not necessarily be mesa, and virgl needs specifically the gbm part of mesa.

There's also hope nvidia will support gbm somehow, someday.

---
 meta/recipes-graphics/virglrenderer/virglrenderer_0.9.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/virglrenderer/virglrenderer_0.9.1.bb +1 -1
index 3991895823..65bd1af942 100644
@@ -8,7 +8,7 @@ HOMEPAGE = "https://virgil3d.github.io/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10"
 
-DEPENDS = "libdrm virtual/libgl libepoxy"
+DEPENDS = "libdrm virtual/libgl virtual/libgbm libepoxy"
 SRCREV = "363915595e05fb252e70d6514be2f0c0b5ca312b"
 SRC_URI = "git://anongit.freedesktop.org/virglrenderer;branch=branch-0.9.1 \
            file://0001-meson.build-use-python3-directly-for-python.patch \
Signature · 1 line
2.31.1
#1 lore raw

PATCH 2/11 elfutils: update 0.183 -> 0.185

0001-add-support-for-ipkg-to-debuginfod.cxx.patch merged upstream.

0001-debuginfod-debuginfod-client.c-correct-string-format.patch rebased.

---
 .../{elfutils_0.183.bb => elfutils_0.185.bb}  |  3 +-
 ...d-support-for-ipkg-to-debuginfod.cxx.patch | 33 ----------
 ...infod-client.c-correct-string-format.patch | 61 ++++++++-----------
 .../elfutils/files/0002-musl-libs.patch       |  4 +-
 .../elfutils/files/0003-musl-utils.patch      |  8 +--
 .../files/0004-Fix-error-on-musl.patch        |  4 +-
 .../0015-config-eu.am-do-not-use-Werror.patch | 16 ++---
 7 files changed, 42 insertions(+), 87 deletions(-)
 rename meta/recipes-devtools/elfutils/{elfutils_0.183.bb => elfutils_0.185.bb} (97%)
 delete mode 100644 meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch
meta/recipes-devtools/elfutils/elfutils_0.185.bb renamed from meta/recipes-devtools/elfutils/elfutils_0.183.bb +1 -2
similarity index 97%
rename from meta/recipes-devtools/elfutils/elfutils_0.183.bb
rename to meta/recipes-devtools/elfutils/elfutils_0.185.bb
index 7aebaf1b6d..b1ffbc18bf 100644
@@ -21,7 +21,6 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
            file://run-ptest \
            file://ptest.patch \
            file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \
-           file://0001-add-support-for-ipkg-to-debuginfod.cxx.patch \
            file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \
            "
 SRC_URI_append_libc-musl = " \
@@ -30,7 +29,7 @@ SRC_URI_append_libc-musl = " \
            file://0004-Fix-error-on-musl.patch \
            file://0015-config-eu.am-do-not-use-Werror.patch \
            "
-SRC_URI[sha256sum] = "c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5"
+SRC_URI[sha256sum] = "dc8d3e74ab209465e7f568e1b3bb9a5a142f8656e2b57d10049a73da2ae6b5a6"
 
 inherit autotools gettext ptest pkgconfig
 
meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch deleted +0 -33
deleted file mode 100644
index 5f82afef0c..0000000000
@@ -1,33 +0,0 @@
-From 571416bf5b5ef319df6d9c79e46680920487e4a7 Mon Sep 17 00:00:00 2001
-From: dorindabassey <[email protected]>
-Date: Sat, 19 Dec 2020 01:11:46 +0100
-Subject: [PATCH] add support for ipkg to debuginfod.cxx
-
-added support for ipkg to the debuginfod scanner. 0.182 only supports RPM and scan .debs, with this patch, debuginfod scanner would be able to scan .ipk
-
-Upstream-status: Submitted [https://sourceware.org/pipermail/elfutils-devel/2020q4/003357.html]
-
-Signed-off-by: dorindabassey <[email protected]>
-
----
- debuginfod/debuginfod.cxx | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
-index b34eacc..a8915f2 100644
---- a/debuginfod/debuginfod.cxx
-+++ b/debuginfod/debuginfod.cxx
-@@ -484,11 +484,13 @@ parse_opt (int key, char *arg,
-         {
-           scan_archives[".deb"]="dpkg-deb --fsys-tarfile";
-           scan_archives[".ddeb"]="dpkg-deb --fsys-tarfile";
-+          scan_archives[".ipk"]="dpkg-deb --fsys-tarfile";
-         }
-       else
-         {
-           scan_archives[".deb"]="(bsdtar -O -x -f - data.tar.xz)<";
-           scan_archives[".ddeb"]="(bsdtar -O -x -f - data.tar.xz)<";
-+          scan_archives[".ipk"]="(bsdtar -O -x -f - data.tar.xz)<";
-         }
-       // .udeb too?
-       break;
meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch +25 -36

84 lines not on this page · raw message

meta/recipes-devtools/elfutils/files/0002-musl-libs.patch +2 -2
index b373940d37..c7360da7a7 100644
@@ -1,4 +1,4 @@
-From 18c527991deee93170a887b6da622560d5606913 Mon Sep 17 00:00:00 2001
+From 0f4667f0bb4b000d74ade07e90bd690b7217a19d Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Fri, 23 Aug 2019 10:18:47 +0800
 Subject: [PATCH] musl-libs
@@ -82,7 +82,7 @@ index ecb4d01..edc85e3 100644
  #include <stdint.h>
  
 diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
-index 6edb27f..f331e3c 100644
+index c0f8dfa..aa78033 100644
 --- a/libdwfl/linux-kernel-modules.c
 +++ b/libdwfl/linux-kernel-modules.c
 @@ -50,6 +50,7 @@
meta/recipes-devtools/elfutils/files/0003-musl-utils.patch +4 -4
index 65593be32f..2e379cdba6 100644
@@ -1,4 +1,4 @@
-From 2dab1a02a3cfd80629f3e0f380805a5e58dd0ac3 Mon Sep 17 00:00:00 2001
+From 2f94d488bf3daaa6a8548ee77120fc2506a9bbe3 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Fri, 23 Aug 2019 10:19:48 +0800
 Subject: [PATCH] musl-utils
@@ -39,7 +39,7 @@ index e117166..8326f6c 100644
  /* State of -D/-U flags.  */
  extern bool arlib_deterministic_output;
 diff --git a/src/elfcompress.c b/src/elfcompress.c
-index 1b5b1e3..21c9024 100644
+index 2c6d91b..608646e 100644
 --- a/src/elfcompress.c
 +++ b/src/elfcompress.c
 @@ -37,6 +37,13 @@
@@ -57,7 +57,7 @@ index 1b5b1e3..21c9024 100644
  ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
  
 diff --git a/src/strip.c b/src/strip.c
-index 7a5d4e4..81a0d57 100644
+index 70fc8c0..d035d9e 100644
 --- a/src/strip.c
 +++ b/src/strip.c
 @@ -46,6 +46,13 @@
@@ -75,7 +75,7 @@ index 7a5d4e4..81a0d57 100644
  
  /* Name and version of program.  */
 diff --git a/src/unstrip.c b/src/unstrip.c
-index 8580329..d547487 100644
+index e488e81..0e44456 100644
 --- a/src/unstrip.c
 +++ b/src/unstrip.c
 @@ -52,6 +52,15 @@
meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch +2 -2
index 8e1e97041f..2fa60c333c 100644
@@ -1,4 +1,4 @@
-From ce3b1403bd88261b5461a9dcb7d6d6be9185703e Mon Sep 17 00:00:00 2001
+From 72819106d0e5666d172d39c24c19e4e7a3b8be0e Mon Sep 17 00:00:00 2001
 From: Richard Purdie <[email protected]>
 Date: Wed, 1 May 2019 22:15:03 +0100
 Subject: [PATCH] Fix error on musl:
@@ -19,7 +19,7 @@ Signed-off-by: Richard Purdie <[email protected]>
  1 file changed, 5 insertions(+)
 
 diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c
-index abbdf3f..bd90f4d 100644
+index 197c6a5..3683672 100644
 --- a/tests/elfstrmerge.c
 +++ b/tests/elfstrmerge.c
 @@ -33,6 +33,11 @@
meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch +8 -8
index 205362626d..5cd6fffc27 100644
@@ -1,4 +1,4 @@
-From dfe11e043cd8ea0b0f0252bcff9f5a6b98c0ecd3 Mon Sep 17 00:00:00 2001
+From cfced441d4a6f2eca51d29c52240275bd6f54e49 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 22 Jun 2020 21:35:16 +0000
 Subject: [PATCH] config/eu.am: do not use -Werror
@@ -16,22 +16,22 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 2 deletions(-)
 
 diff --git a/config/eu.am b/config/eu.am
-index 6c3c444..3bc0dc9 100644
+index 2c3e457..8fb0411 100644
 --- a/config/eu.am
 +++ b/config/eu.am
-@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
- 	    -Wold-style-definition -Wstrict-prototypes -Wtrampolines \
+@@ -89,7 +89,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
+ 	    -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \
  	    $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
  	    $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
 -	    $(if $($(*F)_no_Werror),,-Werror) \
  	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
  	    $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
- 	    $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \
-@@ -83,7 +82,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
- 	   -Wtrampolines \
+ 	    $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
+@@ -99,7 +98,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
+ 	   $(TRAMPOLINES_WARNING) \
  	   $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
  	   $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
 -	   $(if $($(*F)_no_Werror),,-Werror) \
  	   $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
  	   $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
- 	   $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \
+ 	   $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
Signature · 1 line
2.31.1
#2 lore raw

PATCH 3/11 libcap: update 2.49 -> 2.50

In reply to Alexander Kanavin
---
 ...-tests-do-not-statically-link-a-test.patch | 20 +++++++++----------
 .../libcap/{libcap_2.49.bb => libcap_2.50.bb} |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)
 rename meta/recipes-support/libcap/{libcap_2.49.bb => libcap_2.50.bb} (95%)
meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch +9 -11
index d2653afb75..414e45a6f4 100644
@@ -1,4 +1,4 @@
-From 6aa15fe548e5b1d6ca3b373779beb7521ea95ba9 Mon Sep 17 00:00:00 2001
+From 897900f3f9084c5542097851323bba3f2691df20 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 15 Jan 2020 17:16:28 +0100
 Subject: [PATCH] tests: do not statically link a test
@@ -7,26 +7,27 @@ This fails on e.g. centos 7
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
  progs/Makefile | 2 +-
  tests/Makefile | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/progs/Makefile b/progs/Makefile
-index 1d7fc7a..37db8f7 100644
+index 289186e..071a285 100644
 --- a/progs/Makefile
 +++ b/progs/Makefile
-@@ -42,7 +42,7 @@ endif
- test: $(PROGS)
+@@ -49,7 +49,7 @@ capsh: capsh.c capshdoc.h.cf $(DEPS)
+ 	$(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
  
- tcapsh-static: capsh.c $(DEPS)
+ tcapsh-static: capsh.c capshdoc.h.cf $(DEPS)
 -	$(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static
 +	$(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
  
  sudotest: test tcapsh-static
  	sudo $(LDPATH) ./quicktest.sh
 diff --git a/tests/Makefile b/tests/Makefile
-index 01f7589..094ec57 100644
+index 4a5f2f9..4266d86 100644
 --- a/tests/Makefile
 +++ b/tests/Makefile
 @@ -22,7 +22,7 @@ ifeq ($(PTHREADS),yes)
@@ -38,7 +39,7 @@ index 01f7589..094ec57 100644
  DEPS=../libcap/libcap.a
  ifeq ($(PTHREADS),yes)
  DEPS +=  ../libcap/libpsx.a
-@@ -106,7 +106,7 @@ noexploit: exploit.o $(DEPS)
+@@ -113,7 +113,7 @@ noexploit: exploit.o $(DEPS)
  
  # This one runs in a chroot with no shared library files.
  noop: noop.c
@@ -46,7 +47,4 @@ index 01f7589..094ec57 100644
 +	$(CC) $(CFLAGS) $< -o $@
  
  clean:
- 	rm -f psx_test libcap_psx_test libcap_launch_test *~
--- 
-2.17.1
-
+ 	rm -f psx_test libcap_psx_test libcap_launch_test uns_test *~
meta/recipes-support/libcap/libcap_2.50.bb renamed from meta/recipes-support/libcap/libcap_2.49.bb +1 -1
similarity index 95%
rename from meta/recipes-support/libcap/libcap_2.49.bb
rename to meta/recipes-support/libcap/libcap_2.50.bb
index eb9fc5b4b3..15137f0ac0 100644
@@ -14,7 +14,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] = "e98bc4d93645082ec787730b0fd1a712b38882465c505777de17c338831ee181"
+SRC_URI[sha256sum] = "47a57b8bd238b84c93c921a9b4ff82337551dbcb0cca071316aadf3e23b19261"
 
 UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
 
Signature · 1 line
2.31.1
#3 lore raw

PATCH 4/11 cmake: update 3.20.2 -> 3.20.3

In reply to Alexander Kanavin
---
 .../cmake/{cmake-native_3.20.2.bb => cmake-native_3.20.3.bb}    | 0
 meta/recipes-devtools/cmake/cmake.inc                           | 2 +-
 .../recipes-devtools/cmake/{cmake_3.20.2.bb => cmake_3.20.3.bb} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/cmake/{cmake-native_3.20.2.bb => cmake-native_3.20.3.bb} (100%)
 rename meta/recipes-devtools/cmake/{cmake_3.20.2.bb => cmake_3.20.3.bb} (100%)
meta/recipes-devtools/cmake/cmake-native_3.20.3.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.20.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.20.2.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.20.3.bb
meta/recipes-devtools/cmake/cmake.inc +1 -1
index be43760628..0987c01c87 100644
@@ -21,7 +21,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
            file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \
 "
 
-SRC_URI[sha256sum] = "aecf6ecb975179eb3bb6a4a50cae192d41e92b9372b02300f9e8f1d5f559544e"
+SRC_URI[sha256sum] = "4d008ac3461e271fcfac26a05936f77fc7ab64402156fb371d41284851a651b8"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
meta/recipes-devtools/cmake/cmake_3.20.3.bb renamed from meta/recipes-devtools/cmake/cmake_3.20.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.20.2.bb
rename to meta/recipes-devtools/cmake/cmake_3.20.3.bb
Signature · 1 line
2.31.1
#4 lore raw

PATCH 5/11 perl: split perl-cross into its own recipe

In reply to Alexander Kanavin

As perl and perl-cross need to be updated (and patches rebased) in lockstep, devtool upgrade (and therefore AUH) can't cope with it. Manually updating is still possible, but painful.

Split determinism.patch into perl and perl-cross parts, move the rest of the perl-cross patches.

---
 meta/conf/distro/include/maintainers.inc      |  1 +
 ...h-do-not-hardcode-prefix-lib-as-libr.patch |  0
 ...h-do-not-quote-the-argument-to-comma.patch |  0
 ...oss-add-LDFLAGS-when-linking-libperl.patch |  0
 .../perl-cross/files/README.md                | 29 ++++++++++++
 .../perl-cross/files/determinism.patch        | 46 +++++++++++++++++++
 .../perl-cross/perlcross_1.3.5.bb             | 36 +++++++++++++++
 .../perl/files/determinism.patch              | 23 ----------
 meta/recipes-devtools/perl/perl_5.32.1.bb     | 17 ++-----
 9 files changed, 116 insertions(+), 36 deletions(-)
 rename meta/recipes-devtools/{perl => perl-cross}/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch (100%)
 rename meta/recipes-devtools/{perl => perl-cross}/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch (100%)
 rename meta/recipes-devtools/{perl => perl-cross}/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch (100%)
 create mode 100644 meta/recipes-devtools/perl-cross/files/README.md
 create mode 100644 meta/recipes-devtools/perl-cross/files/determinism.patch
 create mode 100644 meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb
meta/conf/distro/include/maintainers.inc +1 -0
index ee118209db..6024d57717 100644
@@ -558,6 +558,7 @@ RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-perl = "Alexander Kanavin <[email protected]>"
+RECIPE_MAINTAINER_pn-perl-cross = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-piglit = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-pigz = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-pinentry = "Armin Kuster <[email protected]>"
meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch renamed from meta/recipes-devtools/perl/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/perl/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch
rename to meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch
meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch renamed from meta/recipes-devtools/perl/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/perl/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch
rename to meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch
meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch renamed from meta/recipes-devtools/perl/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/perl/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch
rename to meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch
meta/recipes-devtools/perl-cross/files/README.md new file +29 -0
new file mode 100644
index 0000000000..93217245c8
@@ -0,0 +1,29 @@
+**perl-cross** provides configure script, top-level Makefile
+and some auxiliary files for [perl](http://www.perl.org),  
+with the primary emphasis on cross-compiling the source.  
+
+    # Get perl and perl-cross sources
+    curl -L -O http://www.cpan.org/src/5.0/perl-5.24.1.tar.gz
+    curl -L -O https://github.com/arsv/perl-cross/releases/download/1.1.3/perl-cross-1.1.3.tar.gz
+
+    # Unpack perl-cross over perl, overwriting Makefile
+    tar -zxf perl-5.24.1.tar.gz
+    cd perl-5.24.1
+    tar --strip-components=1 -zxf ../perl-cross-1.1.3.tar.gz
+
+    # Proceed as usual with most autoconfed packages
+    ./configure --target=arm-linux-gnueabi --prefix=/usr -Duseshrplib
+    make -j4
+    make DESTDIR=/path/to/staging/dir install
+
+Unlike mainline Perl, this configure never runs any target executables,  
+relying solely on compile/link tests and pre-defined hints.  
+On the flip side, it is only meant to run on resonably sane modern unix systems.  
+
+Check [project pages](http://arsv.github.io/perl-cross/) for more info.  
+In particular, [configure usage](http://arsv.github.io/perl-cross/usage.html)
+lists available configure options.
+
+Perl-cross is a free software licensed under the same terms
+as the original perl source.  
+See LICENSE, Copying and Artistic files.
meta/recipes-devtools/perl-cross/files/determinism.patch new file +46 -0

46 lines not on this page · raw message

meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb new file +36 -0
new file mode 100644
index 0000000000..9509313b86
@@ -0,0 +1,36 @@
+SUMMARY = "Perl-cross build system"
+HOMEPAGE = "https://github.com/arsv/perl-cross"
+DESCRIPTION = "perl-cross provides configure script, top-level Makefile and some auxiliary files for perl, \
+with the primary emphasis on cross-compiling the source."
+SECTION = "devel"
+LICENSE = "Artistic-1.0 | GPL-1.0+"
+# README.md is taken from https://github.com/arsv/perl-cross/blob/master/README.md
+# but is not provided inside the release tarballs
+LIC_FILES_CHKSUM = "file://${WORKDIR}/README.md;md5=252fcce2026b765fee1ad74d2fb07a3b"
+
+SRC_URI = "https://github.com/arsv/perl-cross/releases/download/${PV}/perl-cross-${PV}.tar.gz;name=perl-cross \
+           file://README.md \
+           file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \
+           file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \
+           file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \
+           file://determinism.patch \
+"
+UPSTREAM_CHECK_URI = "https://github.com/arsv/perl-cross/releases/"
+
+SRC_URI[perl-cross.sha256sum] = "91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"
+
+S = "${WORKDIR}/perl-cross-${PV}"
+
+do_configure () {
+}
+
+do_compile () {
+}
+
+do_install() {
+    mkdir -p ${D}/${datadir}/perl-cross/
+    cp -rfp ${S}/* ${D}/${datadir}/perl-cross/
+}
+
+BBCLASSEXTEND = "native"
+
meta/recipes-devtools/perl/files/determinism.patch +0 -23
index ccdd52a0d0..aa85ccef10 100644
@@ -21,19 +21,6 @@ RP 2020/2/7
 Upstream-Status: Pending [75% submitted]
 Signed-off-by: Richard Purdie <[email protected]
 
-Index: perl-5.30.1/cnf/configure_mods.sh
-===================================================================
---- perl-5.30.1.orig/cnf/configure_mods.sh
-+++ perl-5.30.1/cnf/configure_mods.sh
-@@ -82,7 +82,7 @@ extonlyif() {
- }
- 
- definetrimspaces() {
--	v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'`
-+	v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs`
- 	define $1 "$v"
- }
- 
 Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL
 ===================================================================
 --- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL
@@ -56,13 +43,3 @@ Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL
      {
          print FILELIST $self->catfile($dir,$file) . "\n";
      }
-Index: perl-5.30.1/cnf/configure
-===================================================================
---- perl-5.30.1.orig/cnf/configure
-+++ perl-5.30.1/cnf/configure
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- base=${0%/*}; test -z "$base" && base=.
- 
meta/recipes-devtools/perl/perl_5.32.1.bb +4 -13
index b28040c7fb..01db924a73 100644
@@ -9,18 +9,14 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
 
 
 SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
-           https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.tar.gz;name=perl-cross \
            file://perl-rdepends.txt \
-           file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \
            file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \
            file://0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch \
            file://errno_ver.diff \
            file://native-perlinc.patch \
-           file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \
            file://perl-dynloader.patch \
-           file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \
            file://0002-Constant-Fix-up-shebang.patch \
-           file://determinism.patch  \
+           file://determinism.patch \
            "
 SRC_URI_append_class-native = " \
            file://perl-configpm-switch.patch \
@@ -30,13 +26,12 @@ SRC_URI_append_class-target = " \
 "
 
 SRC_URI[perl.sha256sum] = "03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c"
-SRC_URI[perl-cross.sha256sum] = "91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"
 
 S = "${WORKDIR}/perl-${PV}"
 
 inherit upstream-version-is-even update-alternatives
 
-DEPENDS += "zlib virtual/crypt"
+DEPENDS += "perlcross-native zlib virtual/crypt"
 
 PERL_LIB_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}.0"
 
@@ -47,12 +42,8 @@ PACKAGECONFIG[gdbm] = ",-Ui_gdbm,gdbm"
 # Don't generate comments in enc2xs output files. They are not reproducible
 export ENC2XS_NO_COMMENTS = "1"
 
-do_unpack_append() {
-    bb.build.exec_func('do_copy_perlcross', d)
-}
-
-do_copy_perlcross() {
-    cp -rfp ${WORKDIR}/perl-cross*/* ${S}
+do_configure_prepend() {
+    cp -rfp ${STAGING_DATADIR_NATIVE}/perl-cross/* ${S}
 }
 
 do_configure_class-target() {
Signature · 1 line
2.31.1
#5 lore raw

Re: [OE-core] [PATCH 05/11] perl: split perl-cross into its own recipe

Hi Alex,

After this change, there comes below failure such as below:

$ bitbake perl-native

Make a change as below

$ git diff
meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb +1 -0
index b77bbd1fd4..4c5e35ab80 100644
@@ -33,6 +33,7 @@ do_compile () {
 do_install_class-native() {
     mkdir -p ${D}/${datadir}/perl-cross/
     cp -rf ${S}/* ${D}/${datadir}/perl-cross/
+    echo "test" > ${D}/${datadir}/perl-cross/testfile
 }
 
$ bitbake perl-native
| NOTE: make -j 48
| make crosspatch
| make[1]: Entering directory '/buildarea1/myu2/wr_build/wr1021_20210616_perl/build/tmp-glibc/work/x86_64-linux/perl-native/5.34.0-r0/perl-5.34.0'
| patch -p1 -i cnf/diffs/perl5-5.34.0/time-hires.patch && touch cnf/diffs/perl5-5.34.0/time-hires.applied
| patch -p1 -i cnf/diffs/perl5-5.34.0/xconfig.patch && touch cnf/diffs/perl5-5.34.0/xconfig.applied
| patch -p1 -i cnf/diffs/perl5-5.34.0/posix-makefile.patch && touch cnf/diffs/perl5-5.34.0/posix-makefile.applied
| File dist/Time-HiRes/Makefile.PL is read-only; trying to patch anyway
| patching file dist/Time-HiRes/Makefile.PL
| Reversed (or previously applied) patch detected!  Assume -R? [n]
| Apply anyway? [n]
| Skipping patch.
| 4 out of 4 hunks ignored -- saving rejects to file dist/Time-HiRes/Makefile.PL.rej
| patch -p1 -i cnf/diffs/perl5-5.34.0/test-commonsense.patch && touch cnf/diffs/perl5-5.34.0/test-commonsense.applied
| File perl.h is read-only; trying to patch anyway
| patching file perl.h
| Reversed (or previously applied) patch detected!  Assume -R? [n]
| Apply anyway? [n]
| Skipping patch.
| 1 out of 1 hunk ignored -- saving rejects to file perl.h.rej
| make[1]: *** [Makefile:64: cnf/diffs/perl5-5.34.0/time-hires.applied] Error 1
[snip]

Thanks,

Quoted 280 lines · Alexander Kanavin

[Please note: This e-mail is from an EXTERNAL e-mail address]

As perl and perl-cross need to be updated (and patches rebased) in lockstep, devtool upgrade (and therefore AUH) can't cope with it. Manually updating is still possible, but painful.

Split determinism.patch into perl and perl-cross parts, move the rest of the perl-cross patches.

---
  meta/conf/distro/include/maintainers.inc      |  1 +
  ...h-do-not-hardcode-prefix-lib-as-libr.patch |  0
  ...h-do-not-quote-the-argument-to-comma.patch |  0
  ...oss-add-LDFLAGS-when-linking-libperl.patch |  0
  .../perl-cross/files/README.md                | 29 ++++++++++++
  .../perl-cross/files/determinism.patch        | 46 +++++++++++++++++++
  .../perl-cross/perlcross_1.3.5.bb             | 36 +++++++++++++++
  .../perl/files/determinism.patch              | 23 ----------
  meta/recipes-devtools/perl/perl_5.32.1.bb     | 17 ++-----
  9 files changed, 116 insertions(+), 36 deletions(-)

rename meta/recipes-devtools/{perl => perl-cross}/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch (100%) rename meta/recipes-devtools/{perl => perl-cross}/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch (100%) rename meta/recipes-devtools/{perl => perl-cross}/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch (100%) create mode 100644 meta/recipes-devtools/perl-cross/files/README.md
create mode 100644 meta/recipes-devtools/perl-cross/files/determinism.patch
create mode 100644 meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb

meta/conf/distro/include/maintainers.inc +1 -0
index ee118209db..6024d57717 100644
@@ -558,6 +558,7 @@ RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <[email protected]>"
  RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <[email protected]>"
  RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <[email protected]>"
  RECIPE_MAINTAINER_pn-perl = "Alexander Kanavin <[email protected]>"
+RECIPE_MAINTAINER_pn-perl-cross = "Alexander Kanavin <[email protected]>"
  RECIPE_MAINTAINER_pn-piglit = "Ross Burton <[email protected]>"
  RECIPE_MAINTAINER_pn-pigz = "Hongxu Jia <[email protected]>"
  RECIPE_MAINTAINER_pn-pinentry = "Armin Kuster <[email protected]>"
meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch renamed from meta/recipes-devtools/perl/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/perl/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch
rename to meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch
meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch renamed from meta/recipes-devtools/perl/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/perl/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch
rename to meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch
meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch renamed from meta/recipes-devtools/perl/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/perl/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch
rename to meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch
meta/recipes-devtools/perl-cross/files/README.md new file +29 -0
new file mode 100644
index 0000000000..93217245c8
@@ -0,0 +1,29 @@
+**perl-cross** provides configure script, top-level Makefile
+and some auxiliary files for [perl](http://www.perl.org),
+with the primary emphasis on cross-compiling the source.
+
+    # Get perl and perl-cross sources
+    curl -L -O http://www.cpan.org/src/5.0/perl-5.24.1.tar.gz
+    curl -L -O https://github.com/arsv/perl-cross/releases/download/1.1.3/perl-cross-1.1.3.tar.gz
+
+    # Unpack perl-cross over perl, overwriting Makefile
+    tar -zxf perl-5.24.1.tar.gz
+    cd perl-5.24.1
+    tar --strip-components=1 -zxf ../perl-cross-1.1.3.tar.gz
+
+    # Proceed as usual with most autoconfed packages
+    ./configure --target=arm-linux-gnueabi --prefix=/usr -Duseshrplib
+    make -j4
+    make DESTDIR=/path/to/staging/dir install
+
+Unlike mainline Perl, this configure never runs any target executables,
+relying solely on compile/link tests and pre-defined hints.
+On the flip side, it is only meant to run on resonably sane modern unix systems.
+
+Check [project pages](http://arsv.github.io/perl-cross/) for more info.
+In particular, [configure usage](http://arsv.github.io/perl-cross/usage.html)
+lists available configure options.
+
+Perl-cross is a free software licensed under the same terms
+as the original perl source.
+See LICENSE, Copying and Artistic files.
meta/recipes-devtools/perl-cross/files/determinism.patch new file +46 -0
new file mode 100644
index 0000000000..e9bf752bcb
@@ -0,0 +1,46 @@
+Fixes to make the perl build reproducible:
+
+a) Remove the \n from configure_attr.sh since it gets quoted differently depending on
+   whether the shell is bash or dash which can cause the test result to be incorrect.
+   Reported upstream: https://github.com/arsv/perl-cross/issues/87
+
+b) Sort the order of the module lists from configure_mods.sh since otherwise
+   the result isn't the same leading to makefile differences.
+   Reported upstream: https://github.com/arsv/perl-cross/issues/88
+
+c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst
+   there for good measure)
+   This needs to go to upstream perl (not done)
+
+d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash
+   and "" with dash
+   Reported upstream: https://github.com/arsv/perl-cross/issues/87
+
+RP 2020/2/7
+
+Upstream-Status: Pending [75% submitted]
+Signed-off-by: Richard Purdie <[email protected]
+
+Index: perl-5.30.1/cnf/configure_mods.sh
+===================================================================
+--- perl-5.30.1.orig/cnf/configure_mods.sh
++++ perl-5.30.1/cnf/configure_mods.sh
+@@ -82,7 +82,7 @@ extonlyif() {
+ }
+
+ definetrimspaces() {
+-      v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'`
++      v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs`
+       define $1 "$v"
+ }
+
+Index: perl-5.30.1/cnf/configure
+===================================================================
+--- perl-5.30.1.orig/cnf/configure
++++ perl-5.30.1/cnf/configure
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ base=${0%/*}; test -z "$base" && base=.
+
meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb new file +36 -0
new file mode 100644
index 0000000000..9509313b86
@@ -0,0 +1,36 @@
+SUMMARY = "Perl-cross build system"
+HOMEPAGE = "https://github.com/arsv/perl-cross"
+DESCRIPTION = "perl-cross provides configure script, top-level Makefile and some auxiliary files for perl, \
+with the primary emphasis on cross-compiling the source."
+SECTION = "devel"
+LICENSE = "Artistic-1.0 | GPL-1.0+"
+# README.md is taken from https://github.com/arsv/perl-cross/blob/master/README.md
+# but is not provided inside the release tarballs
+LIC_FILES_CHKSUM = "file://${WORKDIR}/README.md;md5=252fcce2026b765fee1ad74d2fb07a3b"
+
+SRC_URI = "https://github.com/arsv/perl-cross/releases/download/${PV}/perl-cross-${PV}.tar.gz;name=perl-cross \
+           file://README.md \
+           file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \
+           file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \
+           file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \
+           file://determinism.patch \
+"
+UPSTREAM_CHECK_URI = "https://github.com/arsv/perl-cross/releases/"
+
+SRC_URI[perl-cross.sha256sum] = "91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"
+
+S = "${WORKDIR}/perl-cross-${PV}"
+
+do_configure () {
+}
+
+do_compile () {
+}
+
+do_install() {
+    mkdir -p ${D}/${datadir}/perl-cross/
+    cp -rfp ${S}/* ${D}/${datadir}/perl-cross/
+}
+
+BBCLASSEXTEND = "native"
+
meta/recipes-devtools/perl/files/determinism.patch +0 -23
index ccdd52a0d0..aa85ccef10 100644
@@ -21,19 +21,6 @@ RP 2020/2/7
  Upstream-Status: Pending [75% submitted]
  Signed-off-by: Richard Purdie <[email protected]
 
-Index: perl-5.30.1/cnf/configure_mods.sh
-===================================================================
---- perl-5.30.1.orig/cnf/configure_mods.sh
-+++ perl-5.30.1/cnf/configure_mods.sh
-@@ -82,7 +82,7 @@ extonlyif() {
- }
-
- definetrimspaces() {
--      v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'`
-+      v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs`
-       define $1 "$v"
- }
-
  Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL
  ===================================================================
  --- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL
@@ -56,13 +43,3 @@ Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL
       {
           print FILELIST $self->catfile($dir,$file) . "\n";
       }
-Index: perl-5.30.1/cnf/configure
-===================================================================
---- perl-5.30.1.orig/cnf/configure
-+++ perl-5.30.1/cnf/configure
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- base=${0%/*}; test -z "$base" && base=.
-
meta/recipes-devtools/perl/perl_5.32.1.bb +4 -14
index b28040c7fb..01db924a73 100644
@@ -9,18 +9,14 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
 
 
  SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
-           https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.tar.gz;name=perl-cross \
             file://perl-rdepends.txt \
-           file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \
             file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \
             file://0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch \
             file://errno_ver.diff \
             file://native-perlinc.patch \
-           file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \
             file://perl-dynloader.patch \
-           file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \
             file://0002-Constant-Fix-up-shebang.patch \
-           file://determinism.patch  \
+           file://determinism.patch \
             "
  SRC_URI_append_class-native = " \
             file://perl-configpm-switch.patch \
@@ -30,13 +26,12 @@ SRC_URI_append_class-target = " \
  "
 
  SRC_URI[perl.sha256sum] = "03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c"
-SRC_URI[perl-cross.sha256sum] = "91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"
 
  S = "${WORKDIR}/perl-${PV}"
 
  inherit upstream-version-is-even update-alternatives
 
-DEPENDS += "zlib virtual/crypt"
+DEPENDS += "perlcross-native zlib virtual/crypt"
 
  PERL_LIB_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}.0"
 
@@ -47,12 +42,8 @@ PACKAGECONFIG[gdbm] = ",-Ui_gdbm,gdbm"
  # Don't generate comments in enc2xs output files. They are not reproducible
  export ENC2XS_NO_COMMENTS = "1"
 
-do_unpack_append() {
-    bb.build.exec_func('do_copy_perlcross', d)
-}
-
-do_copy_perlcross() {
-    cp -rfp ${WORKDIR}/perl-cross*/* ${S}
+do_configure_prepend() {
+    cp -rfp ${STAGING_DATADIR_NATIVE}/perl-cross/* ${S}
  }
 
  do_configure_class-target() {
--

2.31.1

#6 lore raw

Re: [OE-core] [PATCH 05/11] perl: split perl-cross into its own recipe

You need to bitbake clean the perl directory, so that perl isn't patched twice. There might be ways to fix this, but it's not really a pressing issue.

Alex

Quoted 394 lines · Mingli

Hi Alex,

After this change, there comes below failure such as below:

$ bitbake perl-native

Make a change as below

$ git diff
meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb +1 -0
index b77bbd1fd4..4c5e35ab80 100644
@@ -33,6 +33,7 @@ do_compile () {
  do_install_class-native() {
      mkdir -p ${D}/${datadir}/perl-cross/
      cp -rf ${S}/* ${D}/${datadir}/perl-cross/
+    echo "test" > ${D}/${datadir}/perl-cross/testfile
  }
 
$ bitbake perl-native
| NOTE: make -j 48
| make crosspatch
| make[1]: Entering directory

'/buildarea1/myu2/wr_build/wr1021_20210616_perl/build/tmp-glibc/work/x86_64-linux/perl-native/5.34.0-r0/perl-5.34.0' | patch -p1 -i cnf/diffs/perl5-5.34.0/time-hires.patch && touch cnf/diffs/perl5-5.34.0/time-hires.applied
| patch -p1 -i cnf/diffs/perl5-5.34.0/xconfig.patch && touch cnf/diffs/perl5-5.34.0/xconfig.applied
| patch -p1 -i cnf/diffs/perl5-5.34.0/posix-makefile.patch && touch cnf/diffs/perl5-5.34.0/posix-makefile.applied

| File dist/Time-HiRes/Makefile.PL is read-only; trying to patch anyway
| patching file dist/Time-HiRes/Makefile.PL
| Reversed (or previously applied) patch detected!  Assume -R? [n]
| Apply anyway? [n]
| Skipping patch.
| 4 out of 4 hunks ignored -- saving rejects to file
dist/Time-HiRes/Makefile.PL.rej
| patch -p1 -i cnf/diffs/perl5-5.34.0/test-commonsense.patch && touch
cnf/diffs/perl5-5.34.0/test-commonsense.applied
| File perl.h is read-only; trying to patch anyway
| patching file perl.h
| Reversed (or previously applied) patch detected!  Assume -R? [n]
| Apply anyway? [n]
| Skipping patch.
| 1 out of 1 hunk ignored -- saving rejects to file perl.h.rej
| make[1]: *** [Makefile:64: cnf/diffs/perl5-5.34.0/time-hires.applied]

Error 1
[snip]

Thanks,

Quoted 21 lines · Alexander Kanavin

[Please note: This e-mail is from an EXTERNAL e-mail address]

As perl and perl-cross need to be updated (and patches rebased) in lockstep, devtool upgrade (and therefore AUH) can't cope with it. Manually updating is still possible, but painful.

Split determinism.patch into perl and perl-cross parts, move the rest of the perl-cross patches.

---
  meta/conf/distro/include/maintainers.inc      |  1 +
  ...h-do-not-hardcode-prefix-lib-as-libr.patch |  0
  ...h-do-not-quote-the-argument-to-comma.patch |  0
  ...oss-add-LDFLAGS-when-linking-libperl.patch |  0
  .../perl-cross/files/README.md                | 29 ++++++++++++
  .../perl-cross/files/determinism.patch        | 46 +++++++++++++++++++
  .../perl-cross/perlcross_1.3.5.bb             | 36 +++++++++++++++
  .../perl/files/determinism.patch              | 23 ----------
  meta/recipes-devtools/perl/perl_5.32.1.bb     | 17 ++-----
  9 files changed, 116 insertions(+), 36 deletions(-)
Quoted 1 line

rename meta/recipes-devtools/{perl =>

perl-cross}/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch (100%)

Quoted 1 line

rename meta/recipes-devtools/{perl =>

perl-cross}/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch (100%)

Quoted 1 line

rename meta/recipes-devtools/{perl =>

perl-cross}/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch (100%)

Quoted 2 lines

create mode 100644 meta/recipes-devtools/perl-cross/files/README.md create mode 100644

meta/recipes-devtools/perl-cross/files/determinism.patch

Review

Quoted 3 lines

create mode 100644 meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb

(quoted diff) +0 -0

b/meta/conf/distro/include/maintainers.inc

meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <

Quoted 4 lines

index ee118209db..6024d57717 100644

meta/conf/distro/include/maintainers.inc +0 -0
@@ -558,6 +558,7 @@ RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <

[email protected]>"

meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-pciutils = "Chen Qi < · line 558

Quoted 1 line
meta/conf/distro/include/maintainers.inc +0 -0
  RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <

[email protected]>"

Quoted 5 lines
meta/conf/distro/include/maintainers.inc +0 -0
  RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <[email protected]

"
RECIPE_MAINTAINER_pn-perl = "Alexander Kanavin <[email protected]
"
+RECIPE_MAINTAINER_pn-perl-cross = "Alexander Kanavin <

[email protected]>"

Quoted 4 lines

RECIPE_MAINTAINER_pn-piglit = "Ross Burton <[email protected]>" RECIPE_MAINTAINER_pn-pigz = "Hongxu Jia <[email protected]>" RECIPE_MAINTAINER_pn-pinentry = "Armin Kuster <[email protected]>"
diff --git

a/meta/recipes-devtools/perl/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch b/meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch

Quoted 2 lines

similarity index 100%
rename from

meta/recipes-devtools/perl/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch

Quoted 1 line

rename to

meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch

Quoted 1 line

diff --git

a/meta/recipes-devtools/perl/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch b/meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch

Quoted 2 lines

similarity index 100%
rename from

meta/recipes-devtools/perl/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch

Quoted 1 line

rename to

meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch

Quoted 1 line

diff --git

a/meta/recipes-devtools/perl/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch b/meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch

Quoted 2 lines

similarity index 100%
rename from

meta/recipes-devtools/perl/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch

Quoted 1 line

rename to

meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch

Review

Quoted 1 line
(quoted diff) +0 -0

b/meta/recipes-devtools/perl-cross/files/README.md

meta/recipes-devtools/perl-cross/files/README.md line 7

Quoted 12 lines

new file mode 100644
index 0000000000..93217245c8

meta/recipes-devtools/perl-cross/files/README.md new file +7 -0
@@ -0,0 +1,29 @@
+**perl-cross** provides configure script, top-level Makefile
+and some auxiliary files for [perl](http://www.perl.org),
+with the primary emphasis on cross-compiling the source.
+
+    # Get perl and perl-cross sources
+    curl -L -O http://www.cpan.org/src/5.0/perl-5.24.1.tar.gz
+    curl -L -O

https://github.com/arsv/perl-cross/releases/download/1.1.3/perl-cross-1.1.3.tar.gz

Quoted 4 lines
meta/recipes-devtools/perl-cross/files/README.md new file +4 -0
+
+    # Unpack perl-cross over perl, overwriting Makefile
+    tar -zxf perl-5.24.1.tar.gz
+    cd perl-5.24.1

meta/recipes-devtools/perl-cross/files/README.md line 21

Quoted 10 lines
meta/recipes-devtools/perl-cross/files/README.md new file +10 -0
+    tar --strip-components=1 -zxf ../perl-cross-1.1.3.tar.gz
+
+    # Proceed as usual with most autoconfed packages
+    ./configure --target=arm-linux-gnueabi --prefix=/usr -Duseshrplib
+    make -j4
+    make DESTDIR=/path/to/staging/dir install
+
+Unlike mainline Perl, this configure never runs any target executables,
+relying solely on compile/link tests and pre-defined hints.
+On the flip side, it is only meant to run on resonably sane modern unix

systems.

meta/recipes-devtools/perl-cross/files/README.md line 24

Quoted 3 lines
meta/recipes-devtools/perl-cross/files/README.md new file +3 -0
+
+Check [project pages](http://arsv.github.io/perl-cross/) for more info.
+In particular, [configure usage](

http://arsv.github.io/perl-cross/usage.html)

Review

Quoted 6 lines
meta/recipes-devtools/perl-cross/files/README.md new file +5 -0
+lists available configure options.
+
+Perl-cross is a free software licensed under the same terms
+as the original perl source.
+See LICENSE, Copying and Artistic files.
(quoted diff) +0 -0

b/meta/recipes-devtools/perl-cross/files/determinism.patch

meta/recipes-devtools/perl-cross/files/determinism.patch line 3

Quoted 8 lines

new file mode 100644
index 0000000000..e9bf752bcb

meta/recipes-devtools/perl-cross/files/determinism.patch new file +3 -0
@@ -0,0 +1,46 @@
+Fixes to make the perl build reproducible:
+
+a) Remove the \n from configure_attr.sh since it gets quoted

differently depending on

meta/recipes-devtools/perl-cross/files/determinism.patch line 4

Quoted 1 line
meta/recipes-devtools/perl-cross/files/determinism.patch new file +1 -0
+   whether the shell is bash or dash which can cause the test result to

be incorrect.

meta/recipes-devtools/perl-cross/files/determinism.patch line 7

Quoted 3 lines
meta/recipes-devtools/perl-cross/files/determinism.patch new file +3 -0
+   Reported upstream: https://github.com/arsv/perl-cross/issues/87
+
+b) Sort the order of the module lists from configure_mods.sh since

otherwise

meta/recipes-devtools/perl-cross/files/determinism.patch line 11

Quoted 4 lines
meta/recipes-devtools/perl-cross/files/determinism.patch new file +4 -0
+   the result isn't the same leading to makefile differences.
+   Reported upstream: https://github.com/arsv/perl-cross/issues/88
+
+c) Sort the Encode::Byte byte_t.fnm file output (and the makefile

depends whilst

meta/recipes-devtools/perl-cross/files/determinism.patch line 15

Quoted 4 lines
meta/recipes-devtools/perl-cross/files/determinism.patch new file +4 -0
+   there for good measure)
+   This needs to go to upstream perl (not done)
+
+d) Use bash for perl-cross configure since otherwise trnl gets set to

"\n" with bash

Quoted 8 lines
meta/recipes-devtools/perl-cross/files/determinism.patch new file +8 -0
+   and "" with dash
+   Reported upstream: https://github.com/arsv/perl-cross/issues/87
+
+RP 2020/2/7
+
+Upstream-Status: Pending [75% submitted]
+Signed-off-by: Richard Purdie <[email protected]
+

meta/recipes-devtools/perl-cross/files/determinism.patch line 33

Quoted 10 lines
meta/recipes-devtools/perl-cross/files/determinism.patch new file +10 -0
+Index: perl-5.30.1/cnf/configure_mods.sh
+===================================================================
+--- perl-5.30.1.orig/cnf/configure_mods.sh
++++ perl-5.30.1/cnf/configure_mods.sh
+@@ -82,7 +82,7 @@ extonlyif() {
+ }
+
+ definetrimspaces() {
+-      v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'`
++      v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'
| xargs -n1 | LANG=C sort | xargs`
> +       define $1 "$v"

Review

Quoted 13 lines
meta/recipes-devtools/perl-cross/files/determinism.patch new file +12 -0
+ }
+
+Index: perl-5.30.1/cnf/configure
+===================================================================
+--- perl-5.30.1.orig/cnf/configure
++++ perl-5.30.1/cnf/configure
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ base=${0%/*}; test -z "$base" && base=.
+
(quoted diff) +0 -0

b/meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb

meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb line 3

Quoted 8 lines

new file mode 100644
index 0000000000..9509313b86

meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb new file +3 -0
@@ -0,0 +1,36 @@
+SUMMARY = "Perl-cross build system"
+HOMEPAGE = "https://github.com/arsv/perl-cross"
+DESCRIPTION = "perl-cross provides configure script, top-level Makefile

and some auxiliary files for perl, \

meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb line 7

Quoted 4 lines
meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb new file +4 -0
+with the primary emphasis on cross-compiling the source."
+SECTION = "devel"
+LICENSE = "Artistic-1.0 | GPL-1.0+"
+# README.md is taken from

https://github.com/arsv/perl-cross/blob/master/README.md

meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb line 9

Quoted 2 lines
meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb new file +2 -0
+# but is not provided inside the release tarballs
+LIC_FILES_CHKSUM =

"file://${WORKDIR}/README.md;md5=252fcce2026b765fee1ad74d2fb07a3b"

meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb line 11

Quoted 2 lines
meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb new file +2 -0
+
+SRC_URI = "

https://github.com/arsv/perl-cross/releases/download/${PV}/perl-cross-${PV}.tar.gz;name=perl-cross
\

meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb line 13

Quoted 2 lines
meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb new file +2 -0
+           file://README.md \
+

file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \

meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb line 14

Quoted 1 line
meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb new file +1 -0
+

file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \

meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb line 15

Quoted 1 line
meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb new file +1 -0
+

file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \

meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb line 20

Quoted 5 lines
meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb new file +5 -0
+           file://determinism.patch \
+"
+UPSTREAM_CHECK_URI = "https://github.com/arsv/perl-cross/releases/"
+
+SRC_URI[perl-cross.sha256sum] =

"91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"

Review

Quoted 17 lines
meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb new file +16 -0
+
+S = "${WORKDIR}/perl-cross-${PV}"
+
+do_configure () {
+}
+
+do_compile () {
+}
+
+do_install() {
+    mkdir -p ${D}/${datadir}/perl-cross/
+    cp -rfp ${S}/* ${D}/${datadir}/perl-cross/
+}
+
+BBCLASSEXTEND = "native"
+
(quoted diff) +0 -0

b/meta/recipes-devtools/perl/files/determinism.patch

Quoted 7 lines

index ccdd52a0d0..aa85ccef10 100644

meta/recipes-devtools/perl/files/determinism.patch +0 -0
@@ -21,19 +21,6 @@ RP 2020/2/7
  Upstream-Status: Pending [75% submitted]
  Signed-off-by: Richard Purdie <[email protected]
 

meta/recipes-devtools/perl/files/determinism.patch RP 2020/2/7 · line 33

Quoted 10 lines
meta/recipes-devtools/perl/files/determinism.patch +0 -10
-Index: perl-5.30.1/cnf/configure_mods.sh
-===================================================================
---- perl-5.30.1.orig/cnf/configure_mods.sh
-+++ perl-5.30.1/cnf/configure_mods.sh
-@@ -82,7 +82,7 @@ extonlyif() {
- }
-
- definetrimspaces() {
--      v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'`
-+      v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'
| xargs -n1 | LANG=C sort | xargs`
> -       define $1 "$v"

Review

Quoted 20 lines
meta/recipes-devtools/perl/files/determinism.patch +0 -12
- }
-
  Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL
  ===================================================================
  --- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL
@@ -56,13 +43,3 @@ Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL
       {
           print FILELIST $self->catfile($dir,$file) . "\n";
       }
-Index: perl-5.30.1/cnf/configure
-===================================================================
---- perl-5.30.1.orig/cnf/configure
-+++ perl-5.30.1/cnf/configure
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- base=${0%/*}; test -z "$base" && base=.
-
(quoted diff) +0 -0

b/meta/recipes-devtools/perl/perl_5.32.1.bb

meta/recipes-devtools/perl/perl_5.32.1.bb LIC_FILES_CHKSUM =

Quoted 4 lines

index b28040c7fb..01db924a73 100644

meta/recipes-devtools/perl/perl_5.32.1.bb +0 -0
@@ -9,18 +9,14 @@ LIC_FILES_CHKSUM =

"file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \

meta/recipes-devtools/perl/perl_5.32.1.bb LIC_FILES_CHKSUM = · line 10

Quoted 4 lines
meta/recipes-devtools/perl/perl_5.32.1.bb +0 -1
  SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
-

https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.tar.gz;name=perl-cross
\

meta/recipes-devtools/perl/perl_5.32.1.bb LIC_FILES_CHKSUM = · line 12

Quoted 2 lines
meta/recipes-devtools/perl/perl_5.32.1.bb +0 -1
             file://perl-rdepends.txt \
-

file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \

Quoted 1 line

file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \

Quoted 1 line

file://0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch \

Quoted 3 lines
             file://errno_ver.diff \
             file://native-perlinc.patch \

-

file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \

Quoted 2 lines
             file://perl-dynloader.patch \

-

file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \

meta/recipes-devtools/perl/perl_5.32.1.bb SRC_URI_append_class-target = " \ · line 28

Quoted 10 lines
             file://0002-Constant-Fix-up-shebang.patch \
meta/recipes-devtools/perl/perl_5.32.1.bb +1 -1
-           file://determinism.patch  \
+           file://determinism.patch \
             "
  SRC_URI_append_class-native = " \
             file://perl-configpm-switch.patch \
@@ -30,13 +26,12 @@ SRC_URI_append_class-target = " \
  "
 
  SRC_URI[perl.sha256sum] =

"03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c"

meta/recipes-devtools/perl/perl_5.32.1.bb SRC_URI_append_class-target = " \ · line 33

Quoted 1 line
meta/recipes-devtools/perl/perl_5.32.1.bb +0 -1
-SRC_URI[perl-cross.sha256sum] =

"91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"

meta/recipes-devtools/perl/perl_5.32.1.bb PACKAGECONFIG[gdbm] = ",-Ui_gdbm,gdbm" · line 42

Quoted 12 lines
meta/recipes-devtools/perl/perl_5.32.1.bb +1 -1
  S = "${WORKDIR}/perl-${PV}"
 
  inherit upstream-version-is-even update-alternatives
 
-DEPENDS += "zlib virtual/crypt"
+DEPENDS += "perlcross-native zlib virtual/crypt"
 
  PERL_LIB_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}.0"
 
@@ -47,12 +42,8 @@ PACKAGECONFIG[gdbm] = ",-Ui_gdbm,gdbm"
  # Don't generate comments in enc2xs output files. They are not

reproducible

Quoted 20 lines
meta/recipes-devtools/perl/perl_5.32.1.bb +2 -7
  export ENC2XS_NO_COMMENTS = "1"
 
-do_unpack_append() {
-    bb.build.exec_func('do_copy_perlcross', d)
-}
-
-do_copy_perlcross() {
-    cp -rfp ${WORKDIR}/perl-cross*/* ${S}
+do_configure_prepend() {
+    cp -rfp ${STAGING_DATADIR_NATIVE}/perl-cross/* ${S}
  }
 
  do_configure_class-target() {
--

2.31.1

#7 lore raw

PATCH 6/11 perl-cross: 1.3.5 -> 1.3.6

In reply to Alexander Kanavin
---
 .../perl-cross/{perlcross_1.3.5.bb => perlcross_1.3.6.bb}       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/perl-cross/{perlcross_1.3.5.bb => perlcross_1.3.6.bb} (92%)
meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb renamed from meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb +1 -1
similarity index 92%
rename from meta/recipes-devtools/perl-cross/perlcross_1.3.5.bb
rename to meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb
index 9509313b86..83b7b415af 100644
@@ -17,7 +17,7 @@ SRC_URI = "https://github.com/arsv/perl-cross/releases/download/${PV}/perl-cross
 "
 UPSTREAM_CHECK_URI = "https://github.com/arsv/perl-cross/releases/"
 
-SRC_URI[perl-cross.sha256sum] = "91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"
+SRC_URI[perl-cross.sha256sum] = "4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5"
 
 S = "${WORKDIR}/perl-cross-${PV}"
 
Signature · 1 line
2.31.1
#8 lore raw

PATCH 7/11 perl: update 5.32.1 -> 5.34.0

In reply to Alexander Kanavin
---
 meta/recipes-devtools/perl/{perl_5.32.1.bb => perl_5.34.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/perl/{perl_5.32.1.bb => perl_5.34.0.bb} (99%)
meta/recipes-devtools/perl/perl_5.34.0.bb renamed from meta/recipes-devtools/perl/perl_5.32.1.bb +1 -1
similarity index 99%
rename from meta/recipes-devtools/perl/perl_5.32.1.bb
rename to meta/recipes-devtools/perl/perl_5.34.0.bb
index 01db924a73..7935a58723 100644
@@ -25,7 +25,7 @@ SRC_URI_append_class-target = " \
            file://encodefix.patch \
 "
 
-SRC_URI[perl.sha256sum] = "03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c"
+SRC_URI[perl.sha256sum] = "551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a"
 
 S = "${WORKDIR}/perl-${PV}"
 
Signature · 1 line
2.31.1
#9 lore raw

PATCH 8/11 libgcrypt: upgrade 1.9.2 -> 1.9.3

In reply to Alexander Kanavin

License-Update: added terms for cipher/cipher-gcm-ppc.c, still under GPL

---
 .../libgcrypt/{libgcrypt_1.9.2.bb => libgcrypt_1.9.3.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libgcrypt/{libgcrypt_1.9.2.bb => libgcrypt_1.9.3.bb} (93%)
meta/recipes-support/libgcrypt/libgcrypt_1.9.3.bb renamed from meta/recipes-support/libgcrypt/libgcrypt_1.9.2.bb +2 -2
similarity index 93%
rename from meta/recipes-support/libgcrypt/libgcrypt_1.9.2.bb
rename to meta/recipes-support/libgcrypt/libgcrypt_1.9.3.bb
index 34735ea5d7..fd3d8e09f2 100644
@@ -14,7 +14,7 @@ LICENSE_dumpsexp-dev = "GPLv3+"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
-                    file://LICENSES;md5=2dae15d91a37cfde72fe9eae75f8ea14 \
+                    file://LICENSES;md5=42fa35a25e138166cc40588387f9159d \
                     "
 
 DEPENDS = "libgpg-error"
@@ -27,7 +27,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
            file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
            file://0001-Makefile.am-add-a-missing-space.patch \
            "
-SRC_URI[sha256sum] = "b2c10d091513b271e47177274607b1ffba3d95b188bbfa8797f948aec9053c5a"
+SRC_URI[sha256sum] = "97ebe4f94e2f7e35b752194ce15a0f3c66324e0ff6af26659bbfb5ff2ec328fd"
 
 # Below whitelisted CVEs are disputed and not affecting crypto libraries for any distro.
 CVE_CHECK_WHITELIST += "CVE-2018-12433 CVE-2018-12438"
Signature · 1 line
2.31.1
#10 lore raw

PATCH 9/11 xf86-input-libinput: update 0.30.0 -> 1.0.1

In reply to Alexander Kanavin

License-Update: formatting

---
 .../xorg-driver/xf86-input-libinput_0.30.0.bb         | 11 -----------
 .../xorg-driver/xf86-input-libinput_1.0.1.bb          | 10 ++++++++++
 2 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.30.0.bb
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.0.1.bb
meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.30.0.bb deleted +0 -11
deleted file mode 100644
index d02988caa4..0000000000
@@ -1,11 +0,0 @@
-require xorg-driver-input.inc
-
-SUMMARY = "Generic input driver for the X.Org server based on libinput"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5e6b20ea2ef94a998145f0ea3f788ee0"
-
-DEPENDS += "libinput"
-
-SRC_URI[md5sum] = "11dcfa2cc39f790731a9545fcdeea717"
-SRC_URI[sha256sum] = "f9c7f9fd41ae14061e0e9c3bd45fa170e5e21027a2bc5810034e1e748db996c0"
-
-FILES_${PN} += "${datadir}/X11/xorg.conf.d"
meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.0.1.bb new file +10 -0
new file mode 100644
index 0000000000..8da47eaa43
@@ -0,0 +1,10 @@
+require xorg-driver-input.inc
+
+SUMMARY = "Generic input driver for the X.Org server based on libinput"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a22925127bd3c827c384cedd23ed2309"
+
+DEPENDS += "libinput"
+
+SRC_URI[sha256sum] = "fddec49c115591918475155bf16aaf23017d7f814cee7823a0c11f867aca245b"
+
+FILES_${PN} += "${datadir}/X11/xorg.conf.d"
Signature · 1 line
2.31.1
#11 lore raw

PATCH 10/11 erofs-utils: correct upstream version check

In reply to Alexander Kanavin
---
 meta/recipes-devtools/erofs-utils/erofs-utils_1.2.1.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-devtools/erofs-utils/erofs-utils_1.2.1.bb +2 -0
index 6435fea68c..5ab4bf2816 100644
@@ -7,6 +7,8 @@ HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.gi
 SRCREV = "d1f4953edfcf4f51c71ba91586e21fc6ce9f6db9"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
 
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))"
+
 S = "${WORKDIR}/git"
 
 DEPENDS = "util-linux-libuuid"
Signature · 1 line
2.31.1
#12 lore raw

PATCH 11/11 perlcross fix

In reply to Alexander Kanavin
---
 meta/conf/distro/include/maintainers.inc            | 2 +-
 meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
meta/conf/distro/include/maintainers.inc +1 -1
index 6024d57717..89dec1f86a 100644
@@ -558,7 +558,7 @@ RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-perl = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-perl-cross = "Alexander Kanavin <[email protected]>"
+RECIPE_MAINTAINER_pn-perlcross = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-piglit = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-pigz = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-pinentry = "Armin Kuster <[email protected]>"
meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb +4 -2
index 83b7b415af..339075f0c4 100644
@@ -8,6 +8,8 @@ LICENSE = "Artistic-1.0 | GPL-1.0+"
 # but is not provided inside the release tarballs
 LIC_FILES_CHKSUM = "file://${WORKDIR}/README.md;md5=252fcce2026b765fee1ad74d2fb07a3b"
 
+inherit allarch
+
 SRC_URI = "https://github.com/arsv/perl-cross/releases/download/${PV}/perl-cross-${PV}.tar.gz;name=perl-cross \
            file://README.md \
            file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \
@@ -27,9 +29,9 @@ do_configure () {
 do_compile () {
 }
 
-do_install() {
+do_install_class-native() {
     mkdir -p ${D}/${datadir}/perl-cross/
-    cp -rfp ${S}/* ${D}/${datadir}/perl-cross/
+    cp -rf ${S}/* ${D}/${datadir}/perl-cross/
 }
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.31.1
#13 lore raw

Re: [PATCH 11/11] perlcross fix

Whooops, too hasty! Will resend the set.

Alex

Quoted 58 lines · Alexander Kanavin
---
 meta/conf/distro/include/maintainers.inc            | 2 +-
 meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
meta/conf/distro/include/maintainers.inc +0 -0
index 6024d57717..89dec1f86a 100644
@@ -558,7 +558,7 @@ RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <

[email protected]>"
RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <[email protected]

Quoted 1 line

"

RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <[email protected]>" RECIPE_MAINTAINER_pn-perl = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-perl-cross = "Alexander Kanavin < [email protected]>"
+RECIPE_MAINTAINER_pn-perlcross = "Alexander Kanavin < [email protected]>"
RECIPE_MAINTAINER_pn-piglit = "Ross Burton <[email protected]>" RECIPE_MAINTAINER_pn-pigz = "Hongxu Jia <[email protected]>" RECIPE_MAINTAINER_pn-pinentry = "Armin Kuster <[email protected]>"

meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb +0 -0
index 83b7b415af..339075f0c4 100644
@@ -8,6 +8,8 @@ LICENSE = "Artistic-1.0 | GPL-1.0+"
 # but is not provided inside the release tarballs
 LIC_FILES_CHKSUM =

"file://${WORKDIR}/README.md;md5=252fcce2026b765fee1ad74d2fb07a3b"

meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb +2 -0
+inherit allarch
+
 SRC_URI = "

https://github.com/arsv/perl-cross/releases/download/${PV}/perl-cross-${PV}.tar.gz;name=perl-cross

\
            file://README.md \

file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \

meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb +2 -3
@@ -27,9 +29,9 @@ do_configure () {
 do_compile () {
 }
 
-do_install() {
+do_install_class-native() {
     mkdir -p ${D}/${datadir}/perl-cross/
-    cp -rfp ${S}/* ${D}/${datadir}/perl-cross/
+    cp -rf ${S}/* ${D}/${datadir}/perl-cross/
 }
 
 BBCLASSEXTEND = "native"
--

2.31.1