Skip to contentSkip to conversation

cmake: upgrade 3.20.2 -> 3.20.3

PATCH New wangmy 3 participants 10 messages Jun 3, 2021 – Jun 15, 2021

lore
Share & tools
lore

wangmy

author
#0 lore raw

PATCH 1/1 cmake: upgrade 3.20.2 -> 3.20.3

---
 .../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.25.1
author
#1 lore raw

PATCH 1/1 m4: upgrade 1.4.18 -> 1.4.19

0001-Unset-need_charset_alias-when-building-for-musl.patch 0001-c-stack-stop-using-SIGSTKSZ.patch 0001-test-getopt-posix-fix.patch m4-1.4.18-glibc-change-work-around.patch
deleted since they are included in 1.4.19

refresh ac_config_links.patch

License-update: URL of license changed

---
 .../m4/{m4-1.4.18.inc => m4-1.4.19.inc}       |  14 +-
 ...4-native_1.4.18.bb => m4-native_1.4.19.bb} |   0
 ...charset_alias-when-building-for-musl.patch |  33 -----
 .../m4/0001-c-stack-stop-using-SIGSTKSZ.patch |  84 -----------
 .../m4/m4/0001-test-getopt-posix-fix.patch    |  41 ------
 .../m4/m4/ac_config_links.patch               |  24 ++--
 .../m4-1.4.18-glibc-change-work-around.patch  | 130 ------------------
 .../m4/{m4_1.4.18.bb => m4_1.4.19.bb}         |   0
 8 files changed, 20 insertions(+), 306 deletions(-)
 rename meta/recipes-devtools/m4/{m4-1.4.18.inc => m4-1.4.19.inc} (79%)
 rename meta/recipes-devtools/m4/{m4-native_1.4.18.bb => m4-native_1.4.19.bb} (100%)
 delete mode 100644 meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch
 delete mode 100644 meta/recipes-devtools/m4/m4/0001-c-stack-stop-using-SIGSTKSZ.patch
 delete mode 100644 meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch
 delete mode 100644 meta/recipes-devtools/m4/m4/m4-1.4.18-glibc-change-work-around.patch
 rename meta/recipes-devtools/m4/{m4_1.4.18.bb => m4_1.4.19.bb} (100%)
meta/recipes-devtools/m4/m4-1.4.19.inc renamed from meta/recipes-devtools/m4/m4-1.4.18.inc +5 -9
similarity index 79%
rename from meta/recipes-devtools/m4/m4-1.4.18.inc
rename to meta/recipes-devtools/m4/m4-1.4.19.inc
index 6475b02f8b..c28e301d50 100644
@@ -4,25 +4,21 @@ DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro process
 compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \
 GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
 
-inherit autotools texinfo ptest
+inherit autotools texinfo ptest gettext
 
 SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
            file://ac_config_links.patch \
-           file://m4-1.4.18-glibc-change-work-around.patch \
-           file://0001-c-stack-stop-using-SIGSTKSZ.patch \
            "
-SRC_URI_append_class-target = " file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
-                                file://run-ptest \
+SRC_URI_append_class-target = " file://run-ptest \
                                 file://serial-tests-config.patch \
-                                file://0001-test-getopt-posix-fix.patch \
                               "
 
-SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28"
-SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab"
+SRC_URI[md5sum] = "f4a2b0284d80353b995f8ef2385ed73c"
+SRC_URI[sha256sum] = "3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70"
 
 LICENSE = "GPLv3"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464\
 	            file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede"
 
 # Fix "Argument list too long" error when len(TMPDIR) = 410
meta/recipes-devtools/m4/m4-native_1.4.19.bb renamed from meta/recipes-devtools/m4/m4-native_1.4.18.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/m4/m4-native_1.4.18.bb
rename to meta/recipes-devtools/m4/m4-native_1.4.19.bb
meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted +0 -33
deleted file mode 100644
index ba1a4bab4c..0000000000
@@ -1,33 +0,0 @@
-From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 13 Apr 2015 17:02:13 -0700
-Subject: [PATCH] Unset need_charset_alias when building for musl
-
-localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
-which actually shoudl be fixed in gnulib and then all downstream
-projects will get it eventually. For now we apply the fix to
-coreutils
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
----
- lib/gnulib.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/gnulib.mk b/lib/gnulib.mk
-index e1d74db..c0e92dd 100644
---- a/lib/gnulib.mk
-+++ b/lib/gnulib.mk
-@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local
- 	  case '$(host_os)' in \
- 	    darwin[56]*) \
- 	      need_charset_alias=true ;; \
--	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+	    darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
- 	      need_charset_alias=false ;; \
- 	    *) \
- 	      need_charset_alias=true ;; \
--- 
-2.1.4
-
meta/recipes-devtools/m4/m4/0001-c-stack-stop-using-SIGSTKSZ.patch deleted +0 -84

84 lines not on this page · raw message

meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch deleted +0 -41

41 lines not on this page · raw message

meta/recipes-devtools/m4/m4/ac_config_links.patch +15 -9
index 71edf59512..39fcd91896 100644
@@ -12,20 +12,26 @@ source, and what we want is to is to not touch it.
 
 Tested on x86_64_linux (Ubuntu 8.04 and 9.10).
 
-2009-11-10	Esben Haabendal	    <[email protected]>
+2009-11-10      Esben Haabendal     <[email protected]>
+---
+ configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: m4-1.4.18/configure
-===================================================================
---- m4-1.4.18.orig/configure
-+++ m4-1.4.18/configure
-@@ -24415,8 +24415,8 @@ $as_echo "#define GNULIB_TEST_GETTIMEOFD
+diff --git a/configure b/configure
+index 883336a..6343a34 100755
+--- a/configure
++++ b/configure
+@@ -37061,8 +37061,8 @@ printf "%s\n" "#define GNULIB_TEST_GETRANDOM 1" >>confdefs.h
    # only, it does not matter if we skip the link with older autoconf.
    # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
    # builds, so use a shell variable to bypass this.
 -  GNUmakefile=GNUmakefile
 -  ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile"
-+ # GNUmakefile=GNUmakefile
-+ # ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile"
++#  GNUmakefile=GNUmakefile
++#  ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile"
  
  
-   :
+   LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL"
+-- 
+2.25.1
+
meta/recipes-devtools/m4/m4/m4-1.4.18-glibc-change-work-around.patch deleted +0 -130

130 lines not on this page · raw message

meta/recipes-devtools/m4/m4_1.4.19.bb renamed from meta/recipes-devtools/m4/m4_1.4.18.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/m4/m4_1.4.18.bb
rename to meta/recipes-devtools/m4/m4_1.4.19.bb
Signature · 1 line
2.25.1
#2 lore raw

Re: [OE-core] [PATCH] m4: upgrade 1.4.18 -> 1.4.19

Quoted 21 lines · wangmy

0001-Unset-need_charset_alias-when-building-for-musl.patch 0001-c-stack-stop-using-SIGSTKSZ.patch 0001-test-getopt-posix-fix.patch m4-1.4.18-glibc-change-work-around.patch
deleted since they are included in 1.4.19

refresh ac_config_links.patch

License-update: URL of license changed

---

 .../m4/{m4-1.4.18.inc => m4-1.4.19.inc}       |  14 +-
 ...4-native_1.4.18.bb => m4-native_1.4.19.bb} |   0
 ...charset_alias-when-building-for-musl.patch |  33 -----
 .../m4/0001-c-stack-stop-using-SIGSTKSZ.patch |  84 -----------
 .../m4/m4/0001-test-getopt-posix-fix.patch    |  41 ------
 .../m4/m4/ac_config_links.patch               |  24 ++--
 .../m4-1.4.18-glibc-change-work-around.patch  | 130 ------------------
 .../m4/{m4_1.4.18.bb => m4_1.4.19.bb}         |   0
 8 files changed, 20 insertions(+), 306 deletions(-)
Quoted 7 lines

 rename meta/recipes-devtools/m4/{m4-1.4.18.inc => m4-1.4.19.inc} (79%)
 rename meta/recipes-devtools/m4/{m4-native_1.4.18.bb => m4-native_1.4.19.bb} (100%) delete mode 100644 meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch delete mode 100644 meta/recipes-devtools/m4/m4/0001-c-stack-stop-using-SIGSTKSZ.patch delete mode 100644 meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch
 delete mode 100644 meta/recipes-devtools/m4/m4/m4-1.4.18-glibc-change-work-around.patch rename meta/recipes-devtools/m4/{m4_1.4.18.bb => m4_1.4.19.bb} (100%)

m4's ptests don't work after this upgrade:

https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/1865/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/2156/steps/13/logs/stdio

Cheers,

Richard

author
#3 lore raw

PATCH 1/1 mtools: upgrade 4.0.27 -> 4.0.29

In reply to wangmy
---
 .../mtools/{mtools_4.0.27.bb => mtools_4.0.29.bb}               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/mtools/{mtools_4.0.27.bb => mtools_4.0.29.bb} (93%)
meta/recipes-devtools/mtools/mtools_4.0.29.bb renamed from meta/recipes-devtools/mtools/mtools_4.0.27.bb +1 -1
similarity index 93%
rename from meta/recipes-devtools/mtools/mtools_4.0.27.bb
rename to meta/recipes-devtools/mtools/mtools_4.0.29.bb
index c6fa02ebdf..38de1dd923 100644
@@ -24,7 +24,7 @@ RRECOMMENDS_${PN}_libc-glibc = "\
 	glibc-gconv-ibm866 \
 	glibc-gconv-ibm869 \
 	"
-SRC_URI[sha256sum] = "9c88c8d9244e54768e40b92c005e61ec4e084ea7c070df9184caf1a6408838b3"
+SRC_URI[sha256sum] = "c6b50b4603e7afe54ba0109094669373028db9af743f5c541bca4b7664aefec7"
 
 SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
            file://mtools-makeinfo.patch \
Signature · 1 line
2.25.1
author
#4 lore raw

PATCH 1/1 util-linux: upgrade 2.36.2 -> 2.37

In reply to wangmy

avoid_parallel_tests.patch Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch removed since they are included in 2.37

---
 ...d_2.36.2.bb => util-linux-libuuid_2.37.bb} |  0
 meta/recipes-core/util-linux/util-linux.inc   |  4 +-
 ...RA_LTLIBRARIES-instead-of-noinst_LTL.patch | 49 -------------------
 .../util-linux/avoid_parallel_tests.patch     | 20 --------
 ...til-linux_2.36.2.bb => util-linux_2.37.bb} |  0
 5 files changed, 1 insertion(+), 72 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux-libuuid_2.36.2.bb => util-linux-libuuid_2.37.bb} (100%)
 delete mode 100644 meta/recipes-core/util-linux/util-linux/Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch
 delete mode 100644 meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch
 rename meta/recipes-core/util-linux/{util-linux_2.36.2.bb => util-linux_2.37.bb} (100%)
meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb renamed from meta/recipes-core/util-linux/util-linux-libuuid_2.36.2.bb +0 -0
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-libuuid_2.36.2.bb
rename to meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb
meta/recipes-core/util-linux/util-linux.inc +1 -3
index cbf6102ee0..8e33e6ca01 100644
@@ -35,7 +35,5 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz
            file://ptest.patch \
            file://run-ptest \
            file://display_testname_for_subtest.patch \
-           file://avoid_parallel_tests.patch \
-           file://Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch \
            "
-SRC_URI[sha256sum] = "f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f"
+SRC_URI[sha256sum] = "bd07b7e98839e0359842110525a3032fdb8eaf3a90bedde3dd1652d32d15cce5"
meta/recipes-core/util-linux/util-linux/Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch deleted +0 -49

49 lines not on this page · raw message

meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch deleted +0 -20
deleted file mode 100644
index 748b6ef096..0000000000
@@ -1,20 +0,0 @@
-Ptest needs buildtest-TESTS and runtest-TESTS targets.
-serial-tests is required to generate those targets.
-Revert run.sh script accordingly to serialize running tests 
-
-Signed-off-by: Tudor Florea  <[email protected]>
-Upstream-Status: Inappropriate 
-
-Index: util-linux-2.32/configure.ac
-===================================================================
---- util-linux-2.32.orig/configure.ac
-+++ util-linux-2.32/configure.ac
-@@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR([m4])
- dnl AC_USE_SYSTEM_EXTENSIONS must be called before any macros that run
- dnl the compiler (like AC_PROG_LIBTOOL) to avoid autoconf errors.
- AC_USE_SYSTEM_EXTENSIONS
--AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax no-dist-gzip dist-xz subdir-objects])
-+AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax no-dist-gzip dist-xz subdir-objects serial-tests])
- 
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
- 			    [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
meta/recipes-core/util-linux/util-linux_2.37.bb renamed from meta/recipes-core/util-linux/util-linux_2.36.2.bb +0 -0
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux_2.36.2.bb
rename to meta/recipes-core/util-linux/util-linux_2.37.bb
Signature · 1 line
2.25.1
#5 lore raw

Re: [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37

Quoted 12 lines · wangmy

avoid_parallel_tests.patch Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch removed since they are included in 2.37

---

 ...d_2.36.2.bb => util-linux-libuuid_2.37.bb} |  0
 meta/recipes-core/util-linux/util-linux.inc   |  4 +-
 ...RA_LTLIBRARIES-instead-of-noinst_LTL.patch | 49 -------------------
 .../util-linux/avoid_parallel_tests.patch     | 20 --------
 ...til-linux_2.36.2.bb => util-linux_2.37.bb} |  0
 5 files changed, 1 insertion(+), 72 deletions(-)
Quoted 4 lines

 rename meta/recipes-core/util-linux/{util-linux-libuuid_2.36.2.bb => util-linux-libuuid_2.37.bb} (100%) delete mode 100644 meta/recipes-core/util-linux/util-linux/Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch delete mode 100644 meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch
 rename meta/recipes-core/util-linux/{util-linux_2.36.2.bb => util-linux_2.37.bb} (100%)

This threw warnings on the autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/15/builds/3794

I aborted the build run.

Cheers,

Richard

#6 lore raw

Re: [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37

Quoted 19 lines · Richard Purdie
Quoted 5 lines · wangmy

avoid_parallel_tests.patch Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch removed since they are included in 2.37

Quoted 8 lines
---
 ...d_2.36.2.bb => util-linux-libuuid_2.37.bb} |  0
 meta/recipes-core/util-linux/util-linux.inc   |  4 +-
 ...RA_LTLIBRARIES-instead-of-noinst_LTL.patch | 49 -------------------
 .../util-linux/avoid_parallel_tests.patch     | 20 --------
 ...til-linux_2.36.2.bb => util-linux_2.37.bb} |  0
 5 files changed, 1 insertion(+), 72 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux-libuuid_2.36.2.bb =>

util-linux-libuuid_2.37.bb} (100%)

Quoted 1 line
 delete mode 100644

meta/recipes-core/util-linux/util-linux/Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch

Quoted 1 line
 delete mode 100644

meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch

Quoted 9 lines
Quoted 1 line
 rename meta/recipes-core/util-linux/{util-linux_2.36.2.bb =>

util-linux_2.37.bb} (100%)

This threw warnings on the autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/15/builds/3794

I aborted the build run.

I have to once again note that the best way to avoid patch fuzz and incorrect rebasing (in this case, avoid_parallel_tests.patch was dropped even though it is *not* included in 2.37) is to use 'devtool upgrade'. Can you please explain why you are doing manual work instead which causes those issues?

Alex

author
#7 lore raw

Re: [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37

I used devtool upgrade util-linux and generated the directory of util-linux under the build directory. However, because it’s failed to apply the patch, it only modified SRC_URI[sha256sum] in the final recipe. Therefore, when I encounter OSS that cannot be automatically updated, I modify the patch manually. Is my usage of devtool upgrade wrong?

--
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: [email protected]<mailto:[email protected]>
http://www.fujitsu.com/cn/fnst/

From: Alexander Kanavin <[email protected]>
Sent: Monday, June 14, 2021 8:07 PM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>
Cc: OE-core <[email protected]>; Richard Purdie <[email protected]>
Subject: Re: [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37

On Fri, 4 Jun 2021 at 00:55, Richard Purdie <[email protected]<mailto:[email protected]>> wrote:

Quoted 5 lines · wangmy

avoid_parallel_tests.patch Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch removed since they are included in 2.37

Quoted 11 lines
---
 ...d_2.36.2.bb<http://d_2.36.2.bb> => util-linux-libuuid_2.37.bb<http://util-linux-libuuid_2.37.bb>} |  0
 meta/recipes-core/util-linux/util-linux.inc   |  4 +-
 ...RA_LTLIBRARIES-instead-of-noinst_LTL.patch | 49 -------------------
 .../util-linux/avoid_parallel_tests.patch     | 20 --------
 ...til-linux_2.36.2.bb<http://til-linux_2.36.2.bb> => util-linux_2.37.bb<http://util-linux_2.37.bb>} |  0
 5 files changed, 1 insertion(+), 72 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux-libuuid_2.36.2.bb<http://util-linux-libuuid_2.36.2.bb> => util-linux-libuuid_2.37.bb<http://util-linux-libuuid_2.37.bb>} (100%)
 delete mode 100644 meta/recipes-core/util-linux/util-linux/Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch
 delete mode 100644 meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch
 rename meta/recipes-core/util-linux/{util-linux_2.36.2.bb<http://util-linux_2.36.2.bb> => util-linux_2.37.bb<http://util-linux_2.37.bb>} (100%)

This threw warnings on the autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/15/builds/3794

I aborted the build run.

I have to once again note that the best way to avoid patch fuzz and incorrect rebasing (in this case, avoid_parallel_tests.patch was dropped even though it is *not* included in 2.37) is to use 'devtool upgrade'. Can you please explain why you are doing manual work instead which causes those issues?

Alex

#8 lore raw

Re: [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37

Quoted 12 lines · On Tue, 15 Jun 2021 at 03:42, [email protected] <[email protected]> wrote:

I used devtool upgrade util-linux and generated the directory of util-linux under the build directory.

However, because it’s failed to apply the patch, it only modified SRC_URI[sha256sum] in the final recipe.

Therefore, when I encounter OSS that cannot be automatically updated, I modify the patch manually.

Is my usage of devtool upgrade wrong?

The workflow actually consists of three or four steps:
1. 'devtool upgrade util-linux'
2. If devtool tells you it couldn't rebase the patches, you need to complete the job. Change to workspace/source/util-linux, and resolve the conflicts by editing the files where they happened (git rebase leaves conflict markers in the files), then 'git rebase --continue' until rebase completes.
3. At this point you might want to run 'bitbake util-linux' to quickly check that the new version builds correctly out of that external source tree.
4. This is the important step you've been missing: 'devtool finish util-linux path/to/poky/meta'. This puts the updated recipe and patches back into the layer, and you can then make a commit out of it, if it looks ok.

Please try this now.

Alex

author
#9 lore raw

PATCH 1/1 python3-magic: upgrade 0.4.22 -> 0.4.23

In reply to wangmy
---
 .../python/{python3-magic_0.4.22.bb => python3-magic_0.4.23.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-magic_0.4.22.bb => python3-magic_0.4.23.bb} (88%)
meta/recipes-devtools/python/python3-magic_0.4.23.bb renamed from meta/recipes-devtools/python/python3-magic_0.4.22.bb +1 -1
similarity index 88%
rename from meta/recipes-devtools/python/python3-magic_0.4.22.bb
rename to meta/recipes-devtools/python/python3-magic_0.4.23.bb
index b828927599..4ebae32569 100644
@@ -11,7 +11,7 @@ PYPI_PACKAGE = "python-magic"
 
 inherit pypi setuptools3
 
-SRC_URI[sha256sum] = "ca884349f2c92ce830e3f498c5b7c7051fe2942c3ee4332f65213b8ebff15a62"
+SRC_URI[sha256sum] = "88f71d04fde4318da32fa03930362f1c6127caa833614563fd53a0fd3438cc3e"
 
 RDEPENDS_${PN} += "file \
                    ${PYTHON_PN}-ctypes \
Signature · 1 line
2.25.1