* [OE-core] [PATCH] cmake: upgrade 3.20.2 -> 3.20.3
@ 2021-06-03 7:13 wangmy
2021-06-03 7:13 ` [OE-core] [PATCH] m4: upgrade 1.4.18 -> 1.4.19 wangmy
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: wangmy @ 2021-06-03 7:13 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
.../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%)
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.20.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.20.3.bb
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
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index be43760628..0987c01c87 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -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"
diff --git a/meta/recipes-devtools/cmake/cmake_3.20.2.bb b/meta/recipes-devtools/cmake/cmake_3.20.3.bb
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
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [OE-core] [PATCH] m4: upgrade 1.4.18 -> 1.4.19
2021-06-03 7:13 [OE-core] [PATCH] cmake: upgrade 3.20.2 -> 3.20.3 wangmy
@ 2021-06-03 7:13 ` wangmy
2021-06-04 6:22 ` Richard Purdie
2021-06-03 7:13 ` [OE-core] [PATCH] mtools: upgrade 4.0.27 -> 4.0.29 wangmy
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: wangmy @ 2021-06-03 7:13 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
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
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
.../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%)
diff --git a/meta/recipes-devtools/m4/m4-1.4.18.inc b/meta/recipes-devtools/m4/m4-1.4.19.inc
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
--- a/meta/recipes-devtools/m4/m4-1.4.18.inc
+++ b/meta/recipes-devtools/m4/m4-1.4.19.inc
@@ -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
diff --git a/meta/recipes-devtools/m4/m4-native_1.4.18.bb b/meta/recipes-devtools/m4/m4-native_1.4.19.bb
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
diff --git a/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch
deleted file mode 100644
index ba1a4bab4c..0000000000
--- a/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
- 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
-
diff --git a/meta/recipes-devtools/m4/m4/0001-c-stack-stop-using-SIGSTKSZ.patch b/meta/recipes-devtools/m4/m4/0001-c-stack-stop-using-SIGSTKSZ.patch
deleted file mode 100644
index 883b8a2075..0000000000
--- a/meta/recipes-devtools/m4/m4/0001-c-stack-stop-using-SIGSTKSZ.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 69238f15129f35eb4756ad8e2004e0d7907cb175 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 30 Apr 2021 17:40:36 -0700
-Subject: [PATCH] c-stack: stop using SIGSTKSZ
-
-This patch is required with glibc 2.34+
-based on gnulib [1]
-
-[1] https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=f9e2b20a12a230efa30f1d479563ae07d276a94b
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/c-stack.c | 22 +++++++++++++---------
- 1 file changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/lib/c-stack.c b/lib/c-stack.c
-index 5353c08..863f764 100644
---- a/lib/c-stack.c
-+++ b/lib/c-stack.c
-@@ -51,13 +51,14 @@
- typedef struct sigaltstack stack_t;
- #endif
- #ifndef SIGSTKSZ
--# define SIGSTKSZ 16384
--#elif HAVE_LIBSIGSEGV && SIGSTKSZ < 16384
-+#define get_sigstksz() (16384)
-+#elif HAVE_LIBSIGSEGV
- /* libsigsegv 2.6 through 2.8 have a bug where some architectures use
- more than the Linux default of an 8k alternate stack when deciding
- if a fault was caused by stack overflow. */
--# undef SIGSTKSZ
--# define SIGSTKSZ 16384
-+#define get_sigstksz() ((SIGSTKSZ) < 16384 ? 16384 : (SIGSTKSZ))
-+#else
-+#define get_sigstksz() ((SIGSTKSZ))
- #endif
-
- #include <stdlib.h>
-@@ -131,7 +132,8 @@ die (int signo)
- /* Storage for the alternate signal stack. */
- static union
- {
-- char buffer[SIGSTKSZ];
-+ /* allocate buffer with size from get_sigstksz() */
-+ char *buffer;
-
- /* These other members are for proper alignment. There's no
- standard way to guarantee stack alignment, but this seems enough
-@@ -203,10 +205,11 @@ c_stack_action (void (*action) (int))
- program_error_message = _("program error");
- stack_overflow_message = _("stack overflow");
-
-+ alternate_signal_stack.buffer = malloc(get_sigstksz());
- /* Always install the overflow handler. */
- if (stackoverflow_install_handler (overflow_handler,
- alternate_signal_stack.buffer,
-- sizeof alternate_signal_stack.buffer))
-+ get_sigstksz()))
- {
- errno = ENOTSUP;
- return -1;
-@@ -279,14 +282,15 @@ c_stack_action (void (*action) (int))
- stack_t st;
- struct sigaction act;
- st.ss_flags = 0;
-+ alternate_signal_stack.buffer = malloc(get_sigstksz());
- # if SIGALTSTACK_SS_REVERSED
- /* Irix mistakenly treats ss_sp as the upper bound, rather than
- lower bound, of the alternate stack. */
-- st.ss_sp = alternate_signal_stack.buffer + SIGSTKSZ - sizeof (void *);
-- st.ss_size = sizeof alternate_signal_stack.buffer - sizeof (void *);
-+ st.ss_sp = alternate_signal_stack.buffer + get_sigstksz() - sizeof (void *);
-+ st.ss_size = get_sigstksz() - sizeof (void *);
- # else
- st.ss_sp = alternate_signal_stack.buffer;
-- st.ss_size = sizeof alternate_signal_stack.buffer;
-+ st.ss_size = get_sigstksz();
- # endif
- r = sigaltstack (&st, NULL);
- if (r != 0)
---
-2.31.1
-
diff --git a/meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch b/meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch
deleted file mode 100644
index 11508ee0e2..0000000000
--- a/meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 75bea7c72a919859674f493548653de88f96c798 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Mon, 22 Apr 2019 10:36:13 +0800
-Subject: [PATCH] test-getopt-posix fix
-
-fix below problem:
-test-getopt.h:754: assertion 'strcmp (argv[1], "donald") == 0' failed
-
-get this patch from
-https://github.com/habitat-sh/core-plans/blob/master/m4/fix-test-getopt-posix-with-glibc-2.26.patch
-
-Upstream-Status: Pending
-
-have report this bug to m4-discuss@gnu.org
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- tests/test-getopt-posix.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/tests/test-getopt-posix.c b/tests/test-getopt-posix.c
-index 5532271..2a3d511 100644
---- a/tests/test-getopt-posix.c
-+++ b/tests/test-getopt-posix.c
-@@ -22,6 +22,13 @@
- ftell link warning if we are not using the gnulib ftell module. */
- #define _GL_NO_LARGE_FILES
-
-+/*
-+ * Glibc 2.26 does hard include bits/getopt_posix.h which causes the system
-+ * to use glibc's getopt but the tests expect gnulib behavior. Until a better
-+ * fix is available this avoids that mis-resolution.
-+ */
-+#include <getopt.h>
-+
- /* POSIX and glibc provide the getopt() function in <unistd.h>, see
- http://pubs.opengroup.org/onlinepubs/9699919799/functions/getopt.html
- https://www.gnu.org/software/libc/manual/html_node/Using-Getopt.html
---
-2.7.4
-
diff --git a/meta/recipes-devtools/m4/m4/ac_config_links.patch b/meta/recipes-devtools/m4/m4/ac_config_links.patch
index 71edf59512..39fcd91896 100644
--- a/meta/recipes-devtools/m4/m4/ac_config_links.patch
+++ b/meta/recipes-devtools/m4/m4/ac_config_links.patch
@@ -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 <eha@doredevelopment.dk>
+2009-11-10 Esben Haabendal <eha@doredevelopment.dk>
+---
+ 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
+
diff --git a/meta/recipes-devtools/m4/m4/m4-1.4.18-glibc-change-work-around.patch b/meta/recipes-devtools/m4/m4/m4-1.4.18-glibc-change-work-around.patch
deleted file mode 100644
index c10bcbf693..0000000000
--- a/meta/recipes-devtools/m4/m4/m4-1.4.18-glibc-change-work-around.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-update for glibc libio.h removal in 2.28+
-
-see
-https://src.fedoraproject.org/rpms/m4/c/814d592134fad36df757f9a61422d164ea2c6c9b?branch=master
-
-Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4af4a4a718]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: m4-1.4.18/lib/fflush.c
-===================================================================
---- m4-1.4.18.orig/lib/fflush.c
-+++ m4-1.4.18/lib/fflush.c
-@@ -33,7 +33,7 @@
- #undef fflush
-
-
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-
- /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
- static void
-@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
-
- #endif
-
--#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
-+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
-
- # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
-@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
- if (stream == NULL || ! freading (stream))
- return fflush (stream);
-
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-
- clear_ungetc_buffer_preserving_position (stream);
-
-Index: m4-1.4.18/lib/fpending.c
-===================================================================
---- m4-1.4.18.orig/lib/fpending.c
-+++ m4-1.4.18/lib/fpending.c
-@@ -32,7 +32,7 @@ __fpending (FILE *fp)
- /* Most systems provide FILE as a struct and the necessary bitmask in
- <stdio.h>, because they need it for implementing getc() and putc() as
- fast macros. */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- return fp->_IO_write_ptr - fp->_IO_write_base;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
-Index: m4-1.4.18/lib/fpurge.c
-===================================================================
---- m4-1.4.18.orig/lib/fpurge.c
-+++ m4-1.4.18/lib/fpurge.c
-@@ -62,7 +62,7 @@ fpurge (FILE *fp)
- /* Most systems provide FILE as a struct and the necessary bitmask in
- <stdio.h>, because they need it for implementing getc() and putc() as
- fast macros. */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- fp->_IO_read_end = fp->_IO_read_ptr;
- fp->_IO_write_ptr = fp->_IO_write_base;
- /* Avoid memory leak when there is an active ungetc buffer. */
-Index: m4-1.4.18/lib/freadahead.c
-===================================================================
---- m4-1.4.18.orig/lib/freadahead.c
-+++ m4-1.4.18/lib/freadahead.c
-@@ -25,7 +25,7 @@
- size_t
- freadahead (FILE *fp)
- {
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- if (fp->_IO_write_ptr > fp->_IO_write_base)
- return 0;
- return (fp->_IO_read_end - fp->_IO_read_ptr)
-Index: m4-1.4.18/lib/freading.c
-===================================================================
---- m4-1.4.18.orig/lib/freading.c
-+++ m4-1.4.18/lib/freading.c
-@@ -31,7 +31,7 @@ freading (FILE *fp)
- /* Most systems provide FILE as a struct and the necessary bitmask in
- <stdio.h>, because they need it for implementing getc() and putc() as
- fast macros. */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- return ((fp->_flags & _IO_NO_WRITES) != 0
- || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
- && fp->_IO_read_base != NULL));
-Index: m4-1.4.18/lib/fseeko.c
-===================================================================
---- m4-1.4.18.orig/lib/fseeko.c
-+++ m4-1.4.18/lib/fseeko.c
-@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when
- #endif
-
- /* These tests are based on fpurge.c. */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- if (fp->_IO_read_end == fp->_IO_read_ptr
- && fp->_IO_write_ptr == fp->_IO_write_base
- && fp->_IO_save_base == NULL)
-@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when
- return -1;
- }
-
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- fp->_flags &= ~_IO_EOF_SEEN;
- fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-Index: m4-1.4.18/lib/stdio-impl.h
-===================================================================
---- m4-1.4.18.orig/lib/stdio-impl.h
-+++ m4-1.4.18/lib/stdio-impl.h
-@@ -18,6 +18,12 @@
- the same implementation of stdio extension API, except that some fields
- have different naming conventions, or their access requires some casts. */
-
-+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
-+ problem by defining it ourselves. FIXME: Do not rely on glibc
-+ internals. */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
-
- /* BSD stdio derived implementations. */
-
diff --git a/meta/recipes-devtools/m4/m4_1.4.18.bb b/meta/recipes-devtools/m4/m4_1.4.19.bb
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
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [OE-core] [PATCH] mtools: upgrade 4.0.27 -> 4.0.29
2021-06-03 7:13 [OE-core] [PATCH] cmake: upgrade 3.20.2 -> 3.20.3 wangmy
2021-06-03 7:13 ` [OE-core] [PATCH] m4: upgrade 1.4.18 -> 1.4.19 wangmy
@ 2021-06-03 7:13 ` wangmy
2021-06-03 7:13 ` [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37 wangmy
2021-06-03 7:13 ` [OE-core] [PATCH] python3-magic: upgrade 0.4.22 -> 0.4.23 wangmy
3 siblings, 0 replies; 10+ messages in thread
From: wangmy @ 2021-06-03 7:13 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
.../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%)
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.27.bb b/meta/recipes-devtools/mtools/mtools_4.0.29.bb
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
--- a/meta/recipes-devtools/mtools/mtools_4.0.27.bb
+++ b/meta/recipes-devtools/mtools/mtools_4.0.29.bb
@@ -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 \
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37
2021-06-03 7:13 [OE-core] [PATCH] cmake: upgrade 3.20.2 -> 3.20.3 wangmy
2021-06-03 7:13 ` [OE-core] [PATCH] m4: upgrade 1.4.18 -> 1.4.19 wangmy
2021-06-03 7:13 ` [OE-core] [PATCH] mtools: upgrade 4.0.27 -> 4.0.29 wangmy
@ 2021-06-03 7:13 ` wangmy
2021-06-03 22:54 ` Richard Purdie
2021-06-03 7:13 ` [OE-core] [PATCH] python3-magic: upgrade 0.4.22 -> 0.4.23 wangmy
3 siblings, 1 reply; 10+ messages in thread
From: wangmy @ 2021-06-03 7:13 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
avoid_parallel_tests.patch
Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch
removed since they are included in 2.37
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
...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%)
diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.36.2.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb
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
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index cbf6102ee0..8e33e6ca01 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -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"
diff --git a/meta/recipes-core/util-linux/util-linux/Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch b/meta/recipes-core/util-linux/util-linux/Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch
deleted file mode 100644
index 272518914e..0000000000
--- a/meta/recipes-core/util-linux/util-linux/Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Author: Luca Boccassi <luca.boccassi@microsoft.com>
-Description: Automake: use EXTRA_LTLIBRARIES instead of noinst_LTLIBRARIES
- noinst_LTLIBRARIES causes the libraries to be always built
- unconditionally. EXTRA_LTLIBRARIES causes them to be built
- only if other build target needs them.
- In other words, avoid building libcommon.a and libtcolors.a
- unless they are needed by another library/executable and
- save some build time.
-Upstream-Status: backport, commit:c65953d72bbc7412f32e566d9fa6e780d84f0696
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -39,7 +39,7 @@ bashcompletiondir = @bashcompletiondir@
-
- dist_noinst_HEADERS =
- noinst_PROGRAMS =
--noinst_LTLIBRARIES =
-+EXTRA_LTLIBRARIES =
- usrbin_exec_PROGRAMS =
- usrsbin_exec_PROGRAMS =
- dist_man_MANS =
-@@ -169,7 +169,7 @@ else
- edit_cmd += -e 's|@vendordir[@]||g'
- endif
-
--CLEANFILES += $(PATHFILES)
-+CLEANFILES += $(PATHFILES) $(EXTRA_LTLIBRARIES)
- EXTRA_DIST += $(PATHFILES:=.in)
-
- $(PATHFILES): Makefile
---- a/lib/Makemodule.am
-+++ b/lib/Makemodule.am
-@@ -9,7 +9,7 @@
- # Note that you need "make install-strip" (or proper rpm / Debian build)
- # to generate binaries with only relevant stuff.
- #
--noinst_LTLIBRARIES += libcommon.la
-+EXTRA_LTLIBRARIES += libcommon.la
- libcommon_la_CFLAGS = $(AM_CFLAGS)
- libcommon_la_SOURCES = \
- lib/blkdev.c \
-@@ -59,7 +59,7 @@ libcommon_la_SOURCES += lib/sysfs.c
- endif
- endif
-
--noinst_LTLIBRARIES += libtcolors.la
-+EXTRA_LTLIBRARIES += libtcolors.la
- libtcolors_la_CFLAGS = $(AM_CFLAGS)
- libtcolors_la_SOURCES = lib/colors.c lib/color-names.c include/colors.h include/color-names.h
- libtcolors_la_LIBADD =
diff --git a/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch b/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch
deleted file mode 100644
index 748b6ef096..0000000000
--- a/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch
+++ /dev/null
@@ -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 <tudor.florea@enea.com>
-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])])
diff --git a/meta/recipes-core/util-linux/util-linux_2.36.2.bb b/meta/recipes-core/util-linux/util-linux_2.37.bb
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
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [OE-core] [PATCH] python3-magic: upgrade 0.4.22 -> 0.4.23
2021-06-03 7:13 [OE-core] [PATCH] cmake: upgrade 3.20.2 -> 3.20.3 wangmy
` (2 preceding siblings ...)
2021-06-03 7:13 ` [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37 wangmy
@ 2021-06-03 7:13 ` wangmy
3 siblings, 0 replies; 10+ messages in thread
From: wangmy @ 2021-06-03 7:13 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
.../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%)
diff --git a/meta/recipes-devtools/python/python3-magic_0.4.22.bb b/meta/recipes-devtools/python/python3-magic_0.4.23.bb
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
--- a/meta/recipes-devtools/python/python3-magic_0.4.22.bb
+++ b/meta/recipes-devtools/python/python3-magic_0.4.23.bb
@@ -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 \
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37
2021-06-03 7:13 ` [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37 wangmy
@ 2021-06-03 22:54 ` Richard Purdie
2021-06-14 12:07 ` Alexander Kanavin
0 siblings, 1 reply; 10+ messages in thread
From: Richard Purdie @ 2021-06-03 22:54 UTC (permalink / raw)
To: wangmy, openembedded-core
On Thu, 2021-06-03 at 15:13 +0800, wangmy wrote:
> avoid_parallel_tests.patch
> Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch
> removed since they are included in 2.37
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
> ...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%)
This threw warnings on the autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/15/builds/3794
I aborted the build run.
Cheers,
Richard
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [OE-core] [PATCH] m4: upgrade 1.4.18 -> 1.4.19
2021-06-03 7:13 ` [OE-core] [PATCH] m4: upgrade 1.4.18 -> 1.4.19 wangmy
@ 2021-06-04 6:22 ` Richard Purdie
0 siblings, 0 replies; 10+ messages in thread
From: Richard Purdie @ 2021-06-04 6:22 UTC (permalink / raw)
To: wangmy, openembedded-core
On Thu, 2021-06-03 at 15:13 +0800, wangmy wrote:
> 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
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
> .../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%)
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37
2021-06-03 22:54 ` Richard Purdie
@ 2021-06-14 12:07 ` Alexander Kanavin
2021-06-15 1:42 ` wangmy
0 siblings, 1 reply; 10+ messages in thread
From: Alexander Kanavin @ 2021-06-14 12:07 UTC (permalink / raw)
To: wangmy; +Cc: OE-core, Richard Purdie
[-- Attachment #1: Type: text/plain, Size: 1630 bytes --]
On Fri, 4 Jun 2021 at 00:55, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:
> On Thu, 2021-06-03 at 15:13 +0800, wangmy wrote:
> > avoid_parallel_tests.patch
> > Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch
> > removed since they are included in 2.37
> >
> > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> > ---
> > ...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%)
>
> 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
[-- Attachment #2: Type: text/html, Size: 2910 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37
2021-06-14 12:07 ` Alexander Kanavin
@ 2021-06-15 1:42 ` wangmy
2021-06-15 7:45 ` Alexander Kanavin
0 siblings, 1 reply; 10+ messages in thread
From: wangmy @ 2021-06-15 1:42 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core, Richard Purdie
[-- Attachment #1: Type: text/plain, Size: 2897 bytes --]
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: wangmy@fujitsu.com<mailto:wangmy@fujitsu.com>
http://www.fujitsu.com/cn/fnst/
From: Alexander Kanavin <alex.kanavin@gmail.com>
Sent: Monday, June 14, 2021 8:07 PM
To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>
Cc: OE-core <openembedded-core@lists.openembedded.org>; Richard Purdie <richard.purdie@linuxfoundation.org>
Subject: Re: [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37
On Fri, 4 Jun 2021 at 00:55, Richard Purdie <richard.purdie@linuxfoundation.org<mailto:richard.purdie@linuxfoundation.org>> wrote:
On Thu, 2021-06-03 at 15:13 +0800, wangmy wrote:
> avoid_parallel_tests.patch
> Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch
> removed since they are included in 2.37
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com<mailto:wangmy@fujitsu.com>>
> ---
> ...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
[-- Attachment #2: Type: text/html, Size: 9751 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37
2021-06-15 1:42 ` wangmy
@ 2021-06-15 7:45 ` Alexander Kanavin
0 siblings, 0 replies; 10+ messages in thread
From: Alexander Kanavin @ 2021-06-15 7:45 UTC (permalink / raw)
To: wangmy; +Cc: OE-core, Richard Purdie
[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]
On Tue, 15 Jun 2021 at 03:42, wangmy@fujitsu.com <wangmy@fujitsu.com> 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
[-- Attachment #2: Type: text/html, Size: 2396 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-06-15 7:45 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-03 7:13 [OE-core] [PATCH] cmake: upgrade 3.20.2 -> 3.20.3 wangmy
2021-06-03 7:13 ` [OE-core] [PATCH] m4: upgrade 1.4.18 -> 1.4.19 wangmy
2021-06-04 6:22 ` Richard Purdie
2021-06-03 7:13 ` [OE-core] [PATCH] mtools: upgrade 4.0.27 -> 4.0.29 wangmy
2021-06-03 7:13 ` [OE-core] [PATCH] util-linux: upgrade 2.36.2 -> 2.37 wangmy
2021-06-03 22:54 ` Richard Purdie
2021-06-14 12:07 ` Alexander Kanavin
2021-06-15 1:42 ` wangmy
2021-06-15 7:45 ` Alexander Kanavin
2021-06-03 7:13 ` [OE-core] [PATCH] python3-magic: upgrade 0.4.22 -> 0.4.23 wangmy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.