Skip to contentSkip to conversation

elfutils: upgrade 0.177 -> 0.178

PATCH In review Alexander Kanavin 3 participants 15 messages Dec 20, 2019 – Dec 29, 2019 Arm STM32

lore
Share & tools
lore
#0 lore raw

PATCH 1/11 elfutils: upgrade 0.177 -> 0.178

Remove 0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch as issue fixed upstream.

Rebase other patches.

Adjust ptests, pass rate is now 100% again:

======================
All 206 tests passed
(6 tests were not run)
======================

---
 .../{elfutils_0.177.bb => elfutils_0.178.bb}  | 27 +++---
 .../elfutils/files/0001-dso-link-change.patch | 12 +--
 ...libasm-may-link-with-libbz2-if-found.patch |  8 +-
 ...-fts.patch => 0001-musl-obstack-fts.patch} | 55 ++++++------
 .../{musl-libs.patch => 0002-musl-libs.patch} |  7 +-
 ...musl-utils.patch => 0003-musl-utils.patch} | 19 +++--
 ...sts.patch => 0004-Fix-error-on-musl.patch} | 20 +++--
 ...-where-we-have-str-as-uninitialized-.patch | 42 ---------
 .../elfutils/files/debian/hppa_backend.diff   | 51 ++++++-----
 .../elfutils/files/debian/mips_backend.diff   | 85 ++++++++++---------
 .../elfutils/files/debian/mips_cfi.patch      | 22 +++--
 11 files changed, 162 insertions(+), 186 deletions(-)
 rename meta/recipes-devtools/elfutils/{elfutils_0.177.bb => elfutils_0.178.bb} (87%)
 rename meta/recipes-devtools/elfutils/files/{musl-obstack-fts.patch => 0001-musl-obstack-fts.patch} (78%)
 rename meta/recipes-devtools/elfutils/files/{musl-libs.patch => 0002-musl-libs.patch} (97%)
 rename meta/recipes-devtools/elfutils/files/{musl-utils.patch => 0003-musl-utils.patch} (91%)
 rename meta/recipes-devtools/elfutils/files/{musl-tests.patch => 0004-Fix-error-on-musl.patch} (69%)
 delete mode 100644 meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch
meta/recipes-devtools/elfutils/elfutils_0.178.bb renamed from meta/recipes-devtools/elfutils/elfutils_0.177.bb +16 -11
similarity index 87%
rename from meta/recipes-devtools/elfutils/elfutils_0.177.bb
rename to meta/recipes-devtools/elfutils/elfutils_0.178.bb
index e7740c7fb46..9393628dd13 100644
@@ -13,7 +13,6 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
            file://0003-fixheadercheck.patch \
            file://0004-Disable-the-test-to-convert-euc-jp.patch \
            file://0006-Fix-build-on-aarch64-musl.patch \
-           file://0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch \
            file://0001-libasm-may-link-with-libbz2-if-found.patch \
            file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \
            file://debian/hppa_backend.diff \
@@ -36,17 +35,17 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
            file://ptest.patch \
            "
 SRC_URI_append_libc-musl = " \
-           file://musl-obstack-fts.patch \
-           file://musl-libs.patch \
-           file://musl-utils.patch \
-           file://musl-tests.patch \
+           file://0001-musl-obstack-fts.patch \
+           file://0002-musl-libs.patch \
+           file://0003-musl-utils.patch \
+           file://0004-Fix-error-on-musl.patch \
            "
-SRC_URI[md5sum] = "0b583722f911e1632544718d502aab87"
-SRC_URI[sha256sum] = "fa489deccbcae7d8c920f60d85906124c1989c591196d90e0fd668e3dc05042e"
+SRC_URI[md5sum] = "5480d0b7174446aba13a6adde107287f"
+SRC_URI[sha256sum] = "31e7a00e96d4e9c4bda452e1f2cdac4daf8abd24f5e154dee232131899f3a0f2"
 
-inherit autotools gettext ptest
+inherit autotools gettext ptest pkgconfig
 
-EXTRA_OECONF = "--program-prefix=eu-"
+EXTRA_OECONF = "--program-prefix=eu- --disable-debuginfod"
 
 DEPENDS_BZIP2 = "bzip2-replacement-native"
 DEPENDS_BZIP2_class-target = "bzip2"
@@ -73,10 +72,11 @@ do_compile_ptest() {
 do_install_ptest() {
 	if [ ${PTEST_ENABLED} = "1" ]; then
 		# copy the files which needed by the cases
-		TEST_FILES="strip strip.o addr2line elfcmp objdump readelf size.o nm.o nm elflint"
+		TEST_FILES="strip strip.o addr2line elfcmp objdump readelf size.o nm.o nm elflint elfcompress elfclassify stack unstrip"
 		install -d -m 755                       ${D}${PTEST_PATH}/src
 		install -d -m 755                       ${D}${PTEST_PATH}/libelf
 		install -d -m 755                       ${D}${PTEST_PATH}/libdw
+		install -d -m 755                       ${D}${PTEST_PATH}/libasm
 		for test_file in ${TEST_FILES}; do
 			if [ -f ${B}/src/${test_file} ]; then
 				cp -r ${B}/src/${test_file} ${D}${PTEST_PATH}/src
@@ -84,6 +84,7 @@ do_install_ptest() {
 		done
 		cp ${D}${libdir}/libelf-${PV}.so ${D}${PTEST_PATH}/libelf/libelf.so
 		cp ${D}${libdir}/libdw-${PV}.so ${D}${PTEST_PATH}/libdw/libdw.so
+		cp ${D}${libdir}/libasm-${PV}.so ${D}${PTEST_PATH}/libasm/libasm.so
 		cp -r ${S}/tests/                       ${D}${PTEST_PATH}
 		cp -r ${B}/tests/*                      ${D}${PTEST_PATH}/tests
 		cp -r ${B}/config.h                     ${D}${PTEST_PATH}
@@ -146,10 +147,14 @@ INHIBIT_PACKAGE_STRIP_FILES = "\
     ${PKGD}${PTEST_PATH}/src/readelf \
     ${PKGD}${PTEST_PATH}/src/nm \
     ${PKGD}${PTEST_PATH}/src/elflint \
+    ${PKGD}${PTEST_PATH}/src/elfclassify \
+    ${PKGD}${PTEST_PATH}/src/stack \
+    ${PKGD}${PTEST_PATH}/src/unstrip \
     ${PKGD}${PTEST_PATH}/libelf/libelf.so \
     ${PKGD}${PTEST_PATH}/libdw/libdw.so \
+    ${PKGD}${PTEST_PATH}/libasm/libasm.so \
     ${PKGD}${PTEST_PATH}/backends/libebl_i386.so \
     ${PKGD}${PTEST_PATH}/backends/libebl_x86_64.so \
 "
 
-PRIVATE_LIBS_${PN}-ptest = "libdw.so.1 libelf.so.1"
+PRIVATE_LIBS_${PN}-ptest = "libdw.so.1 libelf.so.1 libasm.so.1"
meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch +6 -6
index af79ef496dd..62031073e31 100644
@@ -1,4 +1,4 @@
-From b99aa12cf879ce200e03d75e543c7ab2dfa5503b Mon Sep 17 00:00:00 2001
+From ec9a7742734aae5417c0ebbffce66ac353e6cae7 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Tue, 15 Aug 2017 17:10:57 +0800
 Subject: [PATCH] dso link change
@@ -23,10 +23,10 @@ Signed-off-by: Hongxu Jia <[email protected]>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 2b1c0dc..9305b84 100644
+index e462e7d..ea1215b 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -44,7 +44,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl
+@@ -45,7 +45,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread
  libelf = ../libelf/libelf.a -lz
  else
  libasm = ../libasm/libasm.so
@@ -34,12 +34,12 @@ index 2b1c0dc..9305b84 100644
 +libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
  libelf = ../libelf/libelf.so
  endif
- libebl = ../libebl/libebl.a
+ libebl = ../libebl/libebl.a ../backends/libebl_backends.a ../libcpu/libcpu.a
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 1b0c7d3..bced19b 100644
+index eab4ae6..f59a01f 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -476,7 +476,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl
+@@ -516,7 +516,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread
  libelf = ../libelf/libelf.a -lz
  libasm = ../libasm/libasm.a
  else
meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch +4 -4
index 0d533c8f10a..73ead6d412f 100644
@@ -1,4 +1,4 @@
-From d7be687c35fa42954874034c82ca9059d28196fe Mon Sep 17 00:00:00 2001
+From 8e5fff8b1d819e0870fb22b27950bb5f10c7a272 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 4 Oct 2017 22:30:46 -0700
 Subject: [PATCH] libasm may link with libbz2 if found
@@ -17,16 +17,16 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 9305b84..9b7e853 100644
+index ea1215b..13d9bda 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -39,11 +39,11 @@ EXTRA_DIST += make-debug-archive.in
+@@ -40,11 +40,11 @@ EXTRA_DIST += make-debug-archive.in
  CLEANFILES += make-debug-archive
  
  if BUILD_STATIC
 -libasm = ../libasm/libasm.a
 +libasm = ../libasm/libasm.a $(zip_LIBS)
- libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl
+ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread
  libelf = ../libelf/libelf.a -lz
  else
 -libasm = ../libasm/libasm.so
meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch renamed from meta/recipes-devtools/elfutils/files/musl-obstack-fts.patch +27 -28

96 lines not on this page · raw message

meta/recipes-devtools/elfutils/files/0002-musl-libs.patch renamed from meta/recipes-devtools/elfutils/files/musl-libs.patch +4 -3
similarity index 97%
rename from meta/recipes-devtools/elfutils/files/musl-libs.patch
rename to meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
index b9b9f120dfa..cf146838645 100644
@@ -1,7 +1,7 @@
-From d5a1651df9884fcf57ed320bc2f866538af2f420 Mon Sep 17 00:00:00 2001
+From ea908c7009de5a208383abf4bec4c6b3d9519ca3 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Fri, 23 Aug 2019 10:18:47 +0800
-Subject: [PATCH 2/3] musl-libs
+Subject: [PATCH 2/4] musl-libs
 
 Collection of fixes needed to compile libelf and other libraries
 provided by elfutils for musl targets
@@ -14,6 +14,7 @@ Upstream-Status: Inappropriate [workaround for musl]
 
 Rebase to 0.177
 Signed-off-by: Hongxu Jia <[email protected]>
+
 ---
  lib/error.h                    | 27 +++++++++++++++++++++++++++
  lib/fixedsizehash.h            |  1 -
@@ -140,5 +141,5 @@ index bed273d..be228e6 100644
 +#endif
  #endif	/* elf.h */
 -- 
-2.7.4
+2.17.1
 
meta/recipes-devtools/elfutils/files/0003-musl-utils.patch renamed from meta/recipes-devtools/elfutils/files/musl-utils.patch +10 -9
similarity index 91%
rename from meta/recipes-devtools/elfutils/files/musl-utils.patch
rename to meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
index a8ad9312364..79c9d9ad578 100644
@@ -1,7 +1,7 @@
-From 7f5e2fd86d54e0a4d195ec65afb9b411829dff9f Mon Sep 17 00:00:00 2001
+From 94028b16e56c8eef1aa02dcc4da268a0e471b4ea Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Fri, 23 Aug 2019 10:19:48 +0800
-Subject: [PATCH 3/3] musl-utils
+Subject: [PATCH 3/4] musl-utils
 
 Provide missing defines which otherwise are available on glibc system headers
 
@@ -13,6 +13,7 @@ Upstream-Status: Inappropriate [workaround for musl]
 
 Rebase to 0.177
 Signed-off-by: Hongxu Jia <[email protected]>
+
 ---
  src/arlib.h       |  6 ++++++
  src/elfcompress.c |  7 +++++++
@@ -57,10 +58,10 @@ index 6ba6af4..0c7674b 100644
  ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
  
 diff --git a/src/readelf.c b/src/readelf.c
-index 5c02a9b..817562d 100644
+index 5994615..f3cc071 100644
 --- a/src/readelf.c
 +++ b/src/readelf.c
-@@ -4813,10 +4813,11 @@ listptr_base (struct listptr *p)
+@@ -4829,10 +4829,11 @@ listptr_base (struct listptr *p)
    return cudie_base (&cu);
  }
  
@@ -74,7 +75,7 @@ index 5c02a9b..817562d 100644
    struct listptr *p1 = (void *) a;
    struct listptr *p2 = (void *) b;
  
-@@ -4832,21 +4833,21 @@ compare_listptr (const void *a, const void *b, void *arg)
+@@ -4848,21 +4849,21 @@ compare_listptr (const void *a, const void *b, void *arg)
  	  p1->warned = p2->warned = true;
  	  error (0, 0,
  		 gettext ("%s %#" PRIx64 " used with different address sizes"),
@@ -99,7 +100,7 @@ index 5c02a9b..817562d 100644
  	}
        if (p1->attr != p2 ->attr)
  	{
-@@ -4854,7 +4855,7 @@ compare_listptr (const void *a, const void *b, void *arg)
+@@ -4870,7 +4871,7 @@ compare_listptr (const void *a, const void *b, void *arg)
  	  error (0, 0,
  		 gettext ("%s %#" PRIx64
  			  " used with different attribute %s and %s"),
@@ -108,7 +109,7 @@ index 5c02a9b..817562d 100644
  		 dwarf_attr_name (p2->attr));
  	}
      }
-@@ -4926,8 +4927,11 @@ static void
+@@ -4942,8 +4943,11 @@ static void
  sort_listptr (struct listptr_table *table, const char *name)
  {
    if (table->n > 0)
@@ -141,7 +142,7 @@ index 4054c2a..d2d2176 100644
  
  /* Name and version of program.  */
 diff --git a/src/unstrip.c b/src/unstrip.c
-index fc87832..21ea6b3 100644
+index 9b8c09a..1fb5063 100644
 --- a/src/unstrip.c
 +++ b/src/unstrip.c
 @@ -56,6 +56,15 @@
@@ -161,5 +162,5 @@ index fc87832..21ea6b3 100644
  ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
  
 -- 
-2.7.4
+2.17.1
 
meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch renamed from meta/recipes-devtools/elfutils/files/musl-tests.patch +15 -5
similarity index 69%
rename from meta/recipes-devtools/elfutils/files/musl-tests.patch
rename to meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
index be35791b1af..1b2f9ed98b2 100644
@@ -1,4 +1,7 @@
-Fix error on musl:
+From 7ff8cbecde7455b530fa7894a78d2326799f2556 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <[email protected]>
+Date: Wed, 1 May 2019 22:15:03 +0100
+Subject: [PATCH 4/4] Fix error on musl:
 
 | ../../elfutils-0.176/tests/elfstrmerge.c: In function 'main':
 | ../../elfutils-0.176/tests/elfstrmerge.c:370:60: error: 'ALLPERMS' undeclared (first use in this function); did you mean 'EPERM'?
@@ -11,10 +14,14 @@ Upstream-Status: Inappropriate [workaround in musl]
 
 Signed-off-by: Richard Purdie <[email protected]>
 
-Index: elfutils-0.176/tests/elfstrmerge.c
-===================================================================
---- elfutils-0.176.orig/tests/elfstrmerge.c
-+++ elfutils-0.176/tests/elfstrmerge.c
+---
+ tests/elfstrmerge.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c
+index ba0d68d..1d2447f 100644
+--- a/tests/elfstrmerge.c
++++ b/tests/elfstrmerge.c
 @@ -33,6 +33,11 @@
  #include ELFUTILS_HEADER(dwelf)
  #include "elf-knowledge.h"
@@ -27,3 +34,6 @@ Index: elfutils-0.176/tests/elfstrmerge.c
  /* The original ELF file.  */
  static int fd = -1;
  static Elf *elf = NULL;
+-- 
+2.17.1
+
meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch deleted +0 -42

42 lines not on this page · raw message

meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff +24 -27

80 lines not on this page · raw message

meta/recipes-devtools/elfutils/files/debian/mips_backend.diff +46 -39

119 lines not on this page · raw message

meta/recipes-devtools/elfutils/files/debian/mips_cfi.patch +10 -12
index fda4f68059e..dd8f88a4542 100644
@@ -1,33 +1,34 @@
-From 96e38289f2887ddb8e6d2fb91ea04bdbdf034ab5 Mon Sep 17 00:00:00 2001
+From 5bf6117a6eaf9007ce80adbb8b66a95ca98047a4 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Wed, 21 Aug 2019 17:00:30 +0800
-Subject: [PATCH 2/2] mips_cfi
+Subject: [PATCH] mips_cfi
 
 Upstream-Status: Pending [from debian]
 
 Rebase to 0.177
 
 Signed-off-by: Hongxu Jia <[email protected]>
+
 ---
  backends/Makefile.am |  2 +-
- backends/mips_cfi.c  | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ backends/mips_cfi.c  | 80 ++++++++++++++++++++++++++++++++++++++++++++
  backends/mips_init.c |  1 +
  3 files changed, 82 insertions(+), 1 deletion(-)
  create mode 100644 backends/mips_cfi.c
 
 diff --git a/backends/Makefile.am b/backends/Makefile.am
-index aba8a4a..6ac0eec 100644
+index 07d45d7..dec3080 100644
 --- a/backends/Makefile.am
 +++ b/backends/Makefile.am
-@@ -145,7 +145,7 @@ csky_SRCS = csky_attrs.c csky_init.c csky_symbol.c csky_cfi.c \
- libebl_csky_pic_a_SOURCES = $(csky_SRCS)
- am_libebl_csky_pic_a_OBJECTS = $(csky_SRCS:.c=.os)
+@@ -100,7 +100,7 @@ riscv_SRCS = riscv_init.c riscv_symbol.c riscv_cfi.c riscv_regs.c \
+ csky_SRCS = csky_attrs.c csky_init.c csky_symbol.c csky_cfi.c \
+ 	    csky_regs.c csky_initreg.c csky_corenote.c
  
 -mips_SRCS = mips_init.c mips_symbol.c mips_regs.c mips_retval.c
 +mips_SRCS = mips_init.c mips_symbol.c mips_regs.c mips_retval.c mips_cfi.c
- libebl_mips_pic_a_SOURCES = $(mips_SRCS)
- am_libebl_mips_pic_a_OBJECTS = $(mips_SRCS:.c=.os)
  
+ libebl_backends_a_SOURCES = $(i386_SRCS) $(sh_SRCS) $(x86_64_SRCS) \
+ 			    $(ia64_SRCS) $(alpha_SRCS) $(arm_SRCS) \
 diff --git a/backends/mips_cfi.c b/backends/mips_cfi.c
 new file mode 100644
 index 0000000..9ffdab5
@@ -126,6 +127,3 @@ index 8482e7f..bce5abe 100644
  
    return MODVERSION;
  }
--- 
-2.7.4
-
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/11 acl/attr: restore the package split

In version upgrade packages were accidentally merged.

---
 meta/recipes-support/attr/acl_2.2.53.bb | 4 ++++
 meta/recipes-support/attr/attr.inc      | 4 ++++
 2 files changed, 8 insertions(+)
meta/recipes-support/attr/acl_2.2.53.bb +4 -0
index c95e0524eb4..6db4d940aae 100644
@@ -21,6 +21,10 @@ SRC_URI[sha256sum] = "06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387
 
 inherit autotools gettext ptest
 
+PACKAGES =+ "lib${BPN}"
+
+FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}"
+
 PTEST_BUILD_HOST_FILES = "builddefs"
 PTEST_BUILD_HOST_PATTERN = "^RPM"
 
meta/recipes-support/attr/attr.inc +4 -0
index 5661301c15a..54b1a81d904 100644
@@ -17,6 +17,10 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \
 
 inherit ptest update-alternatives autotools gettext
 
+PACKAGES =+ "lib${BPN}"
+
+FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}"
+
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE_${PN} = "setfattr"
 ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr"
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/11 recipetool: always use python 3 in recipe creation

In reply to Alexander Kanavin
---
 scripts/lib/recipetool/create_buildsys.py | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)
scripts/lib/recipetool/create_buildsys.py +4 -13
index 3cb02766c87..35a97c93454 100644
@@ -226,9 +226,9 @@ class CmakeRecipeHandler(RecipeHandler):
                         elif pkg == 'PkgConfig':
                             inherits.append('pkgconfig')
                         elif pkg == 'PythonInterp':
-                            inherits.append('pythonnative')
+                            inherits.append('python3native')
                         elif pkg == 'PythonLibs':
-                            inherits.append('python-dir')
+                            inherits.append('python3-dir')
                         else:
                             # Try to map via looking at installed CMake packages in pkgdata
                             dep = find_cmake_package(pkg)
@@ -417,7 +417,7 @@ class AutotoolsRecipeHandler(RecipeHandler):
                 }
         progclassmap = {'gconftool-2': 'gconf',
                 'pkg-config': 'pkgconfig',
-                'python': 'pythonnative',
+                'python': 'python3native',
                 'python3': 'python3native',
                 'perl': 'perlnative',
                 'makeinfo': 'texinfo',
@@ -566,16 +566,7 @@ class AutotoolsRecipeHandler(RecipeHandler):
             elif keyword == 'AX_PROG_XSLTPROC':
                 deps.append('libxslt-native')
             elif keyword in ['AC_PYTHON_DEVEL', 'AX_PYTHON_DEVEL', 'AM_PATH_PYTHON']:
-                pythonclass = 'pythonnative'
-                res = version_re.search(value)
-                if res:
-                    if res.group(1).startswith('3'):
-                        pythonclass = 'python3native'
-                # Avoid replacing python3native with pythonnative
-                if not pythonclass in inherits and not 'python3native' in inherits:
-                    if 'pythonnative' in inherits:
-                        inherits.remove('pythonnative')
-                    inherits.append(pythonclass)
+                pythonclass = 'python3native'
             elif keyword == 'AX_WITH_CURSES':
                 deps.append('ncurses')
             elif keyword == 'AX_PATH_BDB':
Signature · 1 line
2.17.1
#3 lore raw

PATCH 4/11 core-image-testmaster: use Python 3

In reply to Alexander Kanavin
---
 meta/recipes-extended/images/core-image-testmaster.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/images/core-image-testmaster.bb +1 -1
index 78295c5f0a3..0faf18f5a4e 100644
@@ -8,7 +8,7 @@ inherit core-image
 # normal linux utilities not busybox ones
 IMAGE_INSTALL += "\
     bash coreutils util-linux tar gzip bzip2 kmod \
-    python-modules python-misc \
+    python3-modules python3-misc \
     e2fsprogs e2fsprogs-mke2fs parted \
     "
 # we need a particular initramfs for live images
Signature · 1 line
2.17.1
#4 lore raw

PATCH 5/11 ptest-packagelists: drop python 2.x

In reply to Alexander Kanavin

With python 2.x reaching EOL and leaving oe-core soon, there is no need to keep it in ptest lists.

---
 meta/conf/distro/include/ptest-packagelists.inc | 1 -
 1 file changed, 1 deletion(-)
meta/conf/distro/include/ptest-packagelists.inc +0 -1
index bb4724cf528..26b8db5b607 100644
@@ -70,7 +70,6 @@ PTESTS_SLOW = "\
     openssh-ptest \
     openssl-ptest \
     perl-ptest \
-    python-ptest \
     python3-ptest \
     strace-ptest \
     tcl-ptest \
Signature · 1 line
2.17.1
#5 lore raw

PATCH 6/11 ltp: fix build with musl

In reply to Alexander Kanavin
---
 .../ltp/0001-Add-more-musl-exclusions.patch   | 70 +++++++++++++++++++
 meta/recipes-extended/ltp/ltp_20190930.bb     |  1 +
 2 files changed, 71 insertions(+)
 create mode 100644 meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch new file +70 -0
new file mode 100644
index 00000000000..d3af31f34a2
@@ -0,0 +1,70 @@
+From 788c47ceef7f115ab7f7aa17f918e58795f4e6c7 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Fri, 20 Dec 2019 13:06:05 +0100
+Subject: [PATCH] Add more musl exclusions
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ testcases/kernel/syscalls/accept4/Makefile      | 4 ++++
+ testcases/kernel/syscalls/fanotify/Makefile     | 6 ++++++
+ testcases/kernel/syscalls/setxattr/Makefile     | 4 ++++
+ testcases/kernel/syscalls/timer_create/Makefile | 4 ++++
+ 4 files changed, 18 insertions(+)
+
+diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile
+index 504042e11..94db06266 100644
+--- a/testcases/kernel/syscalls/accept4/Makefile
++++ b/testcases/kernel/syscalls/accept4/Makefile
+@@ -20,4 +20,8 @@ top_srcdir		?= ../../../..
+ 
+ include $(top_srcdir)/include/mk/testcases.mk
+ 
++ifeq ($(LIBC),musl)
++FILTER_OUT_MAKE_TARGETS        := accept4_01
++endif
++
+ include $(top_srcdir)/include/mk/generic_leaf_target.mk
+diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile
+index 5d01b4825..0263a6e20 100644
+--- a/testcases/kernel/syscalls/fanotify/Makefile
++++ b/testcases/kernel/syscalls/fanotify/Makefile
+@@ -20,4 +20,10 @@ top_srcdir		?= ../../../..
+ fanotify11: CFLAGS+=-pthread
+ include $(top_srcdir)/include/mk/testcases.mk
+ 
++ifeq ($(LIBC),musl)
++FILTER_OUT_MAKE_TARGETS        := fanotify13 fanotify15
++endif
++
+ include $(top_srcdir)/include/mk/generic_leaf_target.mk
++
++
+diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile
+index 72544c13e..7f20b2780 100644
+--- a/testcases/kernel/syscalls/setxattr/Makefile
++++ b/testcases/kernel/syscalls/setxattr/Makefile
+@@ -20,4 +20,8 @@ top_srcdir		?= ../../../..
+ 
+ include $(top_srcdir)/include/mk/testcases.mk
+ 
++ifeq ($(LIBC),musl)
++FILTER_OUT_MAKE_TARGETS        := setxattr03
++endif
++
+ include $(top_srcdir)/include/mk/generic_leaf_target.mk
+diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile
+index 8de247075..eb240f432 100644
+--- a/testcases/kernel/syscalls/timer_create/Makefile
++++ b/testcases/kernel/syscalls/timer_create/Makefile
+@@ -20,6 +20,10 @@ top_srcdir		?= ../../../..
+ 
+ include $(top_srcdir)/include/mk/testcases.mk
+ 
++ifeq ($(LIBC),musl)
++FILTER_OUT_MAKE_TARGETS        := timer_create01 timer_create03
++endif
++
+ CPPFLAGS		+= -D_GNU_SOURCE -I$(abs_srcdir)/../include
+ 
+ LDLIBS			+= -lpthread -lrt
meta/recipes-extended/ltp/ltp_20190930.bb +1 -0
index 9a436a52303..e56bb575d29 100644
@@ -40,6 +40,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
            file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
            file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \
            file://0001-testcases-fix-an-absent-format-string-issue.patch \
+           file://0001-Add-more-musl-exclusions.patch \
            "
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
#6 lore raw

PATCH 7/11 diffstat: update to 1.63

In reply to Alexander Kanavin
---
 ...clocal.m4-add-missing-header-defines.patch | 24 +++++++++++++++++++
 .../{diffstat_1.62.bb => diffstat_1.63.bb}    |  7 +++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-devtools/diffstat/diffstat/0001-aclocal.m4-add-missing-header-defines.patch
 rename meta/recipes-devtools/diffstat/{diffstat_1.62.bb => diffstat_1.63.bb} (77%)
meta/recipes-devtools/diffstat/diffstat/0001-aclocal.m4-add-missing-header-defines.patch new file +24 -0
new file mode 100644
index 00000000000..5bd94d7de4a
@@ -0,0 +1,24 @@
+From 004bd80d2523f538467b5ada2623eb207b55dad7 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Fri, 20 Dec 2019 15:44:28 +0100
+Subject: [PATCH] aclocal.m4: add missing header defines
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ aclocal.m4 | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 3b19e82..c0c4acb 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1927,3 +1927,8 @@ make an error
+ fi
+ fi # cf_cv_posix_visible
+ ])
++
++AC_DEFINE([HAVE_TCGETATTR], [], [Description])
++AC_DEFINE([HAVE_TCSETATTR], [], [Description])
++AC_DEFINE([HAVE_TERMIOS_H], [], [Description])
++
meta/recipes-devtools/diffstat/diffstat_1.63.bb renamed from meta/recipes-devtools/diffstat/diffstat_1.62.bb +4 -3
similarity index 77%
rename from meta/recipes-devtools/diffstat/diffstat_1.62.bb
rename to meta/recipes-devtools/diffstat/diffstat_1.63.bb
index 93d77797c95..ee0a7e7bd63 100644
@@ -10,10 +10,11 @@ LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0
 SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
            file://run-ptest \
            file://avoid-check-user-break-cc.patch \
-"
+           file://0001-aclocal.m4-add-missing-header-defines.patch \
+           "
 
-SRC_URI[md5sum] = "91e106bb34cb097750db7ddc0ba1d8fc"
-SRC_URI[sha256sum] = "7f09183644ed77a156b15346bbad4e89c93543e140add9dab18747e30522591f"
+SRC_URI[md5sum] = "b9272ec8af6257103261ec3622692991"
+SRC_URI[sha256sum] = "7eddd53401b99b90bac3f7ebf23dd583d7d99c6106e67a4f1161b7a20110dc6f"
 
 S = "${WORKDIR}/diffstat-${PV}"
 
Signature · 1 line
2.17.1
#7 lore raw

PATCH 8/11 prelink: upgrade to latest revision (in the cross_prelink branch)

In reply to Alexander Kanavin
---
 ...check-info-resolvetls-before-use-its.patch | 51 -------------------
 meta/recipes-devtools/prelink/prelink_git.bb  |  5 +-
 2 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 meta/recipes-devtools/prelink/prelink/0001-src-arch-mips.c-check-info-resolvetls-before-use-its.patch
meta/recipes-devtools/prelink/prelink/0001-src-arch-mips.c-check-info-resolvetls-before-use-its.patch deleted +0 -51
deleted file mode 100644
index b1688243afe..00000000000
@@ -1,51 +0,0 @@
-From 2136969e3e196b9cf7f4788340efa4b1d9b39565 Mon Sep 17 00:00:00 2001
-From: Robert Yang <[email protected]>
-Date: Thu, 11 Oct 2018 10:05:52 +0800
-Subject: [PATCH] src/arch-mips.c: check info->resolvetls before use its member
-
-The info->resolvetls might be NULL according to src/prelink.c:
-[snip]
- /* Dynamic linker does not depend on any other library,
-    all symbols resolve to themselves with the exception
-    of SHN_UNDEF symbols which resolve to 0.  */
-if (info->symtab[r_sym].st_shndx == SHN_UNDEF)
-  {
-    info->resolveent = NULL;
-    info->resolvetls = NULL;
-[snip]
-
-So we must check it before use its members, otherwise, there might be
-Segmentation fault error.
-
-Fixed:
-MACHINE = "qemumips"
-IMAGE_INSTALL_append = " qemu"
-$ bitbake core-image-minimal
-[snip]
-| /path/to/qemumips-poky-linux/core-image-minimal/1.0-r0/temp/run.prelink_image.1000: line 111:  1010 Segmentation fault      (core dumped)
-[snip]
-
-Upstream-Status: Submitted [https://lists.yoctoproject.org/pipermail/yocto/2018-October/042812.html]
-
-Signed-off-by: Robert Yang <[email protected]>
----
- src/arch-mips.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/arch-mips.c b/src/arch-mips.c
-index ccb1834..02c608f 100644
---- a/src/arch-mips.c
-+++ b/src/arch-mips.c
-@@ -567,7 +567,8 @@ mips_prelink_reloc (struct prelink_info *info, GElf_Addr r_offset,
-       if (dso->ehdr.e_type == ET_EXEC)
- 	{
- 	  value = info->resolve (info, r_sym, r_type);
--	  value += info->resolvetls->offset - TLS_TP_OFFSET;
-+	  if (info->resolvetls != NULL)
-+	    value += info->resolvetls->offset - TLS_TP_OFFSET;
- 	  if (r_type == R_MIPS_TLS_TPREL32)
- 	    mips_prelink_32bit_reloc (dso, rela, value);
- 	  else
--- 
-2.7.4
-
meta/recipes-devtools/prelink/prelink_git.bb +2 -3
index f0946de2cc1..674f815dbfc 100644
@@ -9,7 +9,7 @@ and executables, so that far fewer relocations need to be resolved at \
 runtime and thus programs come up faster."
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
-SRCREV = "a853a5d715d84eec93aa68e8f2df26b7d860f5b2"
+SRCREV = "f9975537dbfd9ade0fc813bd5cf5fcbe41753a37"
 PV = "1.0+git${SRCPV}"
 
 #
@@ -32,8 +32,7 @@ SRC_URI = "git://git.yoctoproject.org/prelink-cross.git;branch=cross_prelink_sta
            file://prelink.cron.daily \
            file://prelink.default \
            file://macros.prelink \
-           file://0001-src-arch-mips.c-check-info-resolvetls-before-use-its.patch \
-"
+           "
 UPSTREAM_CHECK_COMMITS = "1"
 
 # error: error.h: No such file or directory
Signature · 1 line
2.17.1
#8 lore raw

PATCH 9/11 libxml-parser-perl: update to 2.46

In reply to Alexander Kanavin

License-Update: readme no longer carries a copyright notice, so take it from a source file

---
 ...ot-attempt-to-run-a-cross-executable.patch | 24 +++++++++++++++++++
 ...erl_2.44.bb => libxml-parser-perl_2.46.bb} | 11 +++++----
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-devtools/perl/files/0001-CheckLib.pm-do-not-attempt-to-run-a-cross-executable.patch
 rename meta/recipes-devtools/perl/{libxml-parser-perl_2.44.bb => libxml-parser-perl_2.46.bb} (81%)
meta/recipes-devtools/perl/files/0001-CheckLib.pm-do-not-attempt-to-run-a-cross-executable.patch new file +24 -0
new file mode 100644
index 00000000000..c5bbe7888ed
@@ -0,0 +1,24 @@
+From a033c9ece12b6eead48eed63f106ccdec6159b0c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Fri, 20 Dec 2019 16:26:55 +0100
+Subject: [PATCH] CheckLib.pm: do not attempt to run a cross executable
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ inc/Devel/CheckLib.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/inc/Devel/CheckLib.pm b/inc/Devel/CheckLib.pm
+index 36a451a..b04acc1 100644
+--- a/inc/Devel/CheckLib.pm
++++ b/inc/Devel/CheckLib.pm
+@@ -330,7 +330,7 @@ sub assert_lib {
+         push @missing, $lib if $rv != 0 || !-x $exefile;
+         my $absexefile = File::Spec->rel2abs($exefile);
+         $absexefile = '"' . $absexefile . '"' if $absexefile =~ m/\s/;
+-        push @wrongresult, $lib if $rv == 0 && -x $exefile && system($absexefile) != 0;
++        push @wrongresult, $lib if $rv == 0 && -x $exefile && 0 != 0;
+         unlink $ofile if -e $ofile;
+         _cleanup_exe($exefile);
+     }
meta/recipes-devtools/perl/libxml-parser-perl_2.46.bb renamed from meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb +7 -4
similarity index 81%
rename from meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb
rename to meta/recipes-devtools/perl/libxml-parser-perl_2.46.bb
index 7c9b7696a7a..bc154bbdc50 100644
@@ -2,13 +2,16 @@ SUMMARY = "XML::Parser - A perl module for parsing XML documents"
 HOMEPAGE = "https://libexpat.github.io/"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM = "file://README;beginline=2;endline=6;md5=c8767d7516229f07b26e42d1cf8b51f1"
+LIC_FILES_CHKSUM = "file://Parser.pm;beginline=1;endline=7;md5=d12cc778c80fc4c518f0e5dee29fd5fb"
 
 DEPENDS += "expat"
 
-SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
-SRC_URI[md5sum] = "af4813fe3952362451201ced6fbce379"
-SRC_URI[sha256sum] = "1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216"
+SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz \
+           file://ptest-perl/run-ptest \
+           file://0001-CheckLib.pm-do-not-attempt-to-run-a-cross-executable.patch \
+           "
+SRC_URI[md5sum] = "80bb18a8e6240fcf7ec2f7b57601c170"
+SRC_URI[sha256sum] = "d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d"
 
 S = "${WORKDIR}/XML-Parser-${PV}"
 
Signature · 1 line
2.17.1
#9 lore raw

PATCH 10/11 libcap: update to 2.28

In reply to Alexander Kanavin
---
 ...-tests-do-not-run-target-executables.patch | 32 +++++++++++++++++++
 .../libcap/{libcap_2.27.bb => libcap_2.28.bb} |  5 +--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch
 rename meta/recipes-support/libcap/{libcap_2.27.bb => libcap_2.28.bb} (90%)
meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch new file +32 -0
new file mode 100644
index 00000000000..d6b2ad6f4f8
@@ -0,0 +1,32 @@
+From 05c5f9515d6b26ed0e1eeff72ed618ca6e42c1ba 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
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ tests/Makefile | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/tests/Makefile b/tests/Makefile
+index b16bdcd..2cb510f 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -10,8 +10,6 @@ all: run_psx_test run_libcap_psx_test
+ install: all
+ 
+ run_psx_test: psx_test psx_test_wrap
+-	./psx_test
+-	./psx_test_wrap
+ 
+ psx_test: psx_test.c
+ 	$(CC) $(CFLAGS) $(IPATH) -DNOWRAP $< -o $@ $(LIBPSXLIB)
+@@ -20,7 +18,6 @@ psx_test_wrap: psx_test.c
+ 	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
+ 
+ run_libcap_psx_test: libcap_psx_test
+-	./libcap_psx_test
+ 
+ libcap_psx_test: libcap_psx_test.c
+ 	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
meta/recipes-support/libcap/libcap_2.28.bb renamed from meta/recipes-support/libcap/libcap_2.27.bb +3 -2
similarity index 90%
rename from meta/recipes-support/libcap/libcap_2.27.bb
rename to meta/recipes-support/libcap/libcap_2.28.bb
index 3f64ff76364..781309692e9 100644
@@ -9,9 +9,10 @@ DEPENDS = "hostperl-runtime-native gperf-native"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz \
            file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \
+           file://0002-tests-do-not-run-target-executables.patch \
            "
-SRC_URI[md5sum] = "2e8f9fab32eb5ccb37969fe317fd17aa"
-SRC_URI[sha256sum] = "dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a"
+SRC_URI[md5sum] = "4066ddca53fb7e146f98372c8e43afc4"
+SRC_URI[sha256sum] = "c0e70c3bcce288ada2bfe8d748e816b601590495312222e92e307cf18d6a38aa"
 
 UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
 
Signature · 1 line
2.17.1
#10 lore raw

Re: [PATCH 10/11] libcap: update to 2.28

Quoted 10 lines · Alexander Kanavin
---
 ...-tests-do-not-run-target-executables.patch | 32
+++++++++++++++++++
 .../libcap/{libcap_2.27.bb => libcap_2.28.bb} |  5 +--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/libcap/files/0002-tests-do-
not-run-target-executables.patch
 rename meta/recipes-support/libcap/{libcap_2.27.bb => libcap_2.28.bb

Looks like there may be a native gcc version issue:

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/575

(our friend Centos)

Cheers,

Richard

#11 lore raw

Re: [PATCH 10/11] libcap: update to 2.28

Quoted 7 lines · Richard Purdie

Looks like there may be a native gcc version issue:

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/575

(our friend Centos)

Thanks, this should be relatively easy to fix (when I get back to the build box after new years):
| psx.c:239:5: error: ‘for’ loop initial declarations are only allowed in C99 mode
| for (int i = 0; i < 7; i++) {

Alex

#12 lore raw

PATCH 11/11 kexec-tools: update to 2.0.20

In reply to Alexander Kanavin

Add a patch that restores missing declarations for 32 bit x86 builds.

---
 ...xec-un-break-the-build-on-32-bit-x86.patch | 42 +++++++++++++++++++
 ...-tools_2.0.19.bb => kexec-tools_2.0.20.bb} | 27 ++++++------
 2 files changed, 56 insertions(+), 13 deletions(-)
 create mode 100644 meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch
 rename meta/recipes-kernel/kexec/{kexec-tools_2.0.19.bb => kexec-tools_2.0.20.bb} (78%)
meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch new file +42 -0
new file mode 100644
index 00000000000..b91608e52b5
@@ -0,0 +1,42 @@
+From d294c5039753a36506949ba5dc782a4c0b307b74 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Fri, 20 Dec 2019 17:21:08 +0100
+Subject: [PATCH] kexec: un-break the build on 32 bit x86
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ kexec/arch/i386/Makefile    | 1 +
+ kexec/arch/i386/kexec-x86.h | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile
+index 105cefd..25df57a 100644
+--- a/kexec/arch/i386/Makefile
++++ b/kexec/arch/i386/Makefile
+@@ -11,6 +11,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c
+ i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c
+ i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c
+ i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c
++i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c
+ 
+ dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS)			\
+ 	kexec/arch/i386/crashdump-x86.h					\
+diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h
+index 1b58c3b..d6b10c0 100644
+--- a/kexec/arch/i386/kexec-x86.h
++++ b/kexec/arch/i386/kexec-x86.h
+@@ -56,9 +56,13 @@ struct arch_options_t {
+ };
+ 
+ int multiboot_x86_probe(const char *buf, off_t len);
++int multiboot2_x86_probe(const char *buf, off_t len);
+ int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len,
+ 	struct kexec_info *info);
++int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
++	struct kexec_info *info);
+ void multiboot_x86_usage(void);
++void multiboot2_x86_usage(void);
+ 
+ int elf_x86_probe(const char *buf, off_t len);
+ int elf_x86_load(int argc, char **argv, const char *buf, off_t len,
meta/recipes-kernel/kexec/kexec-tools_2.0.20.bb renamed from meta/recipes-kernel/kexec/kexec-tools_2.0.19.bb +14 -13
similarity index 78%
rename from meta/recipes-kernel/kexec/kexec-tools_2.0.19.bb
rename to meta/recipes-kernel/kexec/kexec-tools_2.0.20.bb
index c3f74359f13..871b36440ff 100644
@@ -10,19 +10,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \
 DEPENDS = "zlib xz"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \
-    file://kdump \
-    file://kdump.conf \
-    file://kdump.service \
-    file://0001-powerpc-change-the-memory-size-limit.patch \
-    file://0002-purgatory-Pass-r-directly-to-linker.patch \
-    file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
-    file://0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch \
-    file://0005-Disable-PIE-during-link.patch \
-    file://0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch \
-"
-
-SRC_URI[md5sum] = "052458f0a35c2a3b0d2302caa3318e9f"
-SRC_URI[sha256sum] = "913c8dee918e5855a4ba60d609371390978144b4c8d15d6446ca0057b7bc5e58"
+           file://kdump \
+           file://kdump.conf \
+           file://kdump.service \
+           file://0001-powerpc-change-the-memory-size-limit.patch \
+           file://0002-purgatory-Pass-r-directly-to-linker.patch \
+           file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
+           file://0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch \
+           file://0005-Disable-PIE-during-link.patch \
+           file://0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch \
+           file://0007-kexec-un-break-the-build-on-32-bit-x86.patch \
+           "
+
+SRC_URI[md5sum] = "46724b67f32501c5d3e778161347cad9"
+SRC_URI[sha256sum] = "cb16d79818e0c9de3bb3e33ede5677c34a1d28c646379c7ab44e0faa3eb57a16"
 
 inherit autotools update-rc.d systemd
 
Signature · 1 line
2.17.1
#13 lore raw

✗ patchtest: failure for "elfutils: upgrade 0.177 -> 0.1..." and 10 more

In reply to Alexander Kanavin

== Series Details ==

Series: "elfutils: upgrade 0.177 -> 0.1..." and 10 more
Revision: 1
URL : https://patchwork.openembedded.org/series/21711/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at d6c62cc030)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
#14 lore raw
In reply to Alexander Kanavin
Quoted 6 lines · Alexander Kanavin

Remove 0007-Fix-control-path-where-we-have-str-as-uninitialized- .patch
as issue fixed upstream.

Rebase other patches.

Quoted 8 lines

Adjust ptests, pass rate is now 100% again:

======================
All 206 tests passed
(6 tests were not run)
======================

I'm guessing a bit but I think somehow this is breaking rpm on musl:

https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1395

(the libdebuginfod.so reference which is new in this version of elfutils)

Cheers,

Richard