Upgrade strace quilt and git
cover Upgrade strace quilt and git
From: Robert Yang <[email protected]>
The following changes since commit 50f78cb9de68cd4317f34321dfdb06d72ce5d3c6:
useradd-example: Fix S = WORKDIR reference (2024-05-23 11:25:27 +0100)
are available in the Git repository at:
https://github.com/robertlinux/yocto rbt/upgrade
https://github.com/robertlinux/yocto/tree/rbt/upgrade
Robert Yang (3):
strace: upgrade 6.8 -> 6.9
quilt: 0.67 -> 0.68
git: 2.44.0 -> 2.45.1
...-do-not-force-RHEL-7-specific-build-.patch | 10 +-
.../git/{git_2.44.0.bb => git_2.45.1.bb} | 2 +-
...lt-native_0.67.bb => quilt-native_0.68.bb} | 0
meta/recipes-devtools/quilt/quilt.inc | 5 +-
...t-Fix-a-race-condition-in-merge.test.patch | 48 ------
.../quilt/quilt/faildiff-order.patch | 41 -----
.../quilt/quilt/fix-grep-3.8.patch | 144 ------------------
.../quilt/{quilt_0.67.bb => quilt_0.68.bb} | 0
...toconf-macro-to-detect-largefile-sup.patch | 6 +-
...001-strace-fix-reproducibilty-issues.patch | 9 +-
...002-tests-Replace-off64_t-with-off_t.patch | 35 +++--
.../strace/strace/Makefile-ptest.patch | 9 +-
.../strace/strace/ptest-spacesave.patch | 7 +-
.../strace/strace/skip-load.patch | 9 +-
.../strace/strace/update-gawk-paths.patch | 70 ++++-----
.../strace/{strace_6.8.bb => strace_6.9.bb} | 2 +-
16 files changed, 85 insertions(+), 312 deletions(-)
rename meta/recipes-devtools/git/{git_2.44.0.bb => git_2.45.1.bb} (98%)
rename meta/recipes-devtools/quilt/{quilt-native_0.67.bb => quilt-native_0.68.bb} (100%)
delete mode 100644 meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch
delete mode 100644 meta/recipes-devtools/quilt/quilt/faildiff-order.patch
delete mode 100644 meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch
rename meta/recipes-devtools/quilt/{quilt_0.67.bb => quilt_0.68.bb} (100%)
rename meta/recipes-devtools/strace/{strace_6.8.bb => strace_6.9.bb} (96%)Signature · 1 line
2.45.1
PATCH 1/3 strace: upgrade 6.8 -> 6.9
From: Robert Yang <[email protected]>
This patch is made by AUH and rebased the following patches:
0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch 0001-strace-fix-reproducibilty-issues.patch 0002-tests-Replace-off64_t-with-off_t.patch Makefile-ptest.patch
ptest-spacesave.patch
skip-load.patch
update-gawk-paths.patch
---
...toconf-macro-to-detect-largefile-sup.patch | 6 +-
...001-strace-fix-reproducibilty-issues.patch | 9 +--
...002-tests-Replace-off64_t-with-off_t.patch | 35 ++++++----
.../strace/strace/Makefile-ptest.patch | 9 ++-
.../strace/strace/ptest-spacesave.patch | 7 +-
.../strace/strace/skip-load.patch | 9 +--
.../strace/strace/update-gawk-paths.patch | 70 ++++++++++---------
.../strace/{strace_6.8.bb => strace_6.9.bb} | 2 +-
8 files changed, 76 insertions(+), 71 deletions(-)
rename meta/recipes-devtools/strace/{strace_6.8.bb => strace_6.9.bb} (96%)meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch +3 -3
@@ -1,4 +1,4 @@ -From 470399f3636c412b74f9daf6ae430b13c3126f02 Mon Sep 17 00:00:00 2001 +From ec543417b8e1df7c71dfc4728313849d9ab669a6 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 15 Dec 2022 15:54:27 -0800 Subject: [PATCH] configure: Use autoconf macro to detect largefile support
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac -index 4797b42dd..7d57fb254 100644 +index 36fff90..9e40ab5 100644 --- a/configure.ac +++ b/configure.ac -@@ -43,6 +43,8 @@ AC_PROG_INSTALL +@@ -42,6 +42,8 @@ AC_PROG_INSTALL AC_PROG_RANLIB AC_PROG_LN_S
meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch +3 -6
@@ -1,4 +1,4 @@ -From 6309792c49ca900cec6a7f1dc5b51bf75b629e11 Mon Sep 17 00:00:00 2001 +From d5f681c2de834110de260f4d071c7bc1fb0d7564 Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <[email protected]> Date: Wed, 11 Mar 2020 19:56:55 +0000 Subject: [PATCH] strace: fix reproducibilty issues
@@ -13,7 +13,7 @@ Signed-off-by: Jeremy Puhlman <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh -index 5e1e7c9..1e65eac 100755 +index 8f47651..65267db 100755 --- a/tests/gen_tests.sh +++ b/tests/gen_tests.sh @@ -46,7 +46,7 @@ while read -r name arg0 args; do {
@@ -25,7 +25,7 @@ index 5e1e7c9..1e65eac 100755 case "$arg0" in +*) -@@ -80,7 +80,7 @@ while read -r name arg0 args; do { +@@ -91,7 +91,7 @@ while read -r name arg0 args; do { if [ -n "$names" ]; then {
@@ -34,6 +34,3 @@ index 5e1e7c9..1e65eac 100755 printf 'GEN_TESTS =' printf ' %s.gen.test' $names echo --- -2.24.1 -
meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch +21 -14
@@ -1,4 +1,4 @@ -From 579b2ebe52d4b97f954e6188df2d07e137820075 Mon Sep 17 00:00:00 2001 +From 1891db87da3b204c512f47155aaa4e692008f1bf Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 15 Dec 2022 15:56:13 -0800 Subject: [PATCH] tests: Replace off64_t with off_t
@@ -10,9 +10,12 @@ Upstream-Status: Submitted [https://github.com/strace/strace/pull/230] Signed-off-by: Khem Raj <[email protected]> --- tests/readahead.c | 2 +- + tests/sync_file_range.c | 4 ++-- tests/sync_file_range2.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + 3 files changed, 5 insertions(+), 5 deletions(-) +diff --git a/tests/readahead.c b/tests/readahead.c +index 1072378..b9597e6 100644 --- a/tests/readahead.c +++ b/tests/readahead.c @@ -42,7 +42,7 @@ static const int fds[] = {
@@ -24,29 +27,33 @@ Signed-off-by: Khem Raj <[email protected]> -0x8000000000000000LL, -0x5060708090a0b0c0LL, -1LL, ---- a/tests/sync_file_range2.c -+++ b/tests/sync_file_range2.c +diff --git a/tests/sync_file_range.c b/tests/sync_file_range.c +index e93ab6c..dc76865 100644 +--- a/tests/sync_file_range.c ++++ b/tests/sync_file_range.c @@ -20,8 +20,8 @@ int main(void) { const int fd = -1; -- const off64_t offset = 0xdeadbeefbadc0ded; -- const off64_t nbytes = 0xfacefeedcafef00d; -+ const off_t offset = 0xdeadbeefbadc0ded; -+ const off_t nbytes = 0xfacefeedcafef00d; +- const off64_t offset = 0xdeadbeefbadc0dedULL; +- const off64_t nbytes = 0xfacefeedcafef00dULL; ++ const off_t offset = 0xdeadbeefbadc0dedULL; ++ const off_t nbytes = 0xfacefeedcafef00dULL; const unsigned int flags = -1; int rc = sync_file_range(fd, offset, nbytes, flags); ---- a/tests/sync_file_range.c -+++ b/tests/sync_file_range.c +diff --git a/tests/sync_file_range2.c b/tests/sync_file_range2.c +index b8dc712..e4b003c 100644 +--- a/tests/sync_file_range2.c ++++ b/tests/sync_file_range2.c @@ -20,8 +20,8 @@ int main(void) { const int fd = -1; -- const off64_t offset = 0xdeadbeefbadc0dedULL; -- const off64_t nbytes = 0xfacefeedcafef00dULL; -+ const off_t offset = 0xdeadbeefbadc0dedULL; -+ const off_t nbytes = 0xfacefeedcafef00dULL; +- const off64_t offset = 0xdeadbeefbadc0ded; +- const off64_t nbytes = 0xfacefeedcafef00d; ++ const off_t offset = 0xdeadbeefbadc0ded; ++ const off_t nbytes = 0xfacefeedcafef00d; const unsigned int flags = -1; int rc = sync_file_range(fd, offset, nbytes, flags);
meta/recipes-devtools/strace/strace/Makefile-ptest.patch +4 -5
@@ -1,4 +1,4 @@ -From 1f50e0a09d828be8f5b1f28db9af0b12492a1553 Mon Sep 17 00:00:00 2001 +From 245f6322cf64e562d3227dfac26ce93c905b0380 Mon Sep 17 00:00:00 2001 From: Gabriel Barbu <[email protected]> Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest
@@ -8,16 +8,15 @@ Upstream-Status: Inappropriate Signed-off-by: Gabriel Barbu <[email protected]> Signed-off-by: Chong Lu <[email protected]> Signed-off-by: Anuj Mittal <[email protected]> - --- tests/Makefile.am | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 55566ee..a7ae6f9 100644 +index ef68898..735b73d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -16,6 +16,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ +@@ -18,6 +18,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ MPERS_NAME = MPERS_CC_FLAGS = ARCH_MFLAGS =
@@ -25,7 +24,7 @@ index 55566ee..a7ae6f9 100644 AM_CFLAGS = $(WARN_CFLAGS) bundled_CPPFLAGS = if USE_BUNDLED_HEADERS -@@ -703,3 +704,22 @@ BUILT_SOURCES = ksysent.h +@@ -889,3 +890,22 @@ BUILT_SOURCES = ksysent.h CLEANFILES = ksysent.h include ../src/scno.am
meta/recipes-devtools/strace/strace/ptest-spacesave.patch +3 -4
@@ -1,4 +1,4 @@ -From 3fad4821d90cd264d1b94253b9cf4fdf5d4034b8 Mon Sep 17 00:00:00 2001 +From cf77d301faf96cc892c6df0e19fccbf5853f249d Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 29 May 2019 00:10:32 +0100 Subject: [PATCH] strace: Tweak ptest disk space management
@@ -9,16 +9,15 @@ using around 600MB of disk space and running our ptest images out of space. RP 2019/5/29 Upstream-Status: Inappropriate [specific to OE image space issues] - --- tests/gen_tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh -index 3540204..5e1e7c9 100755 +index ce1467e..8f47651 100755 --- a/tests/gen_tests.sh +++ b/tests/gen_tests.sh -@@ -62,6 +62,7 @@ while read -r name arg0 args; do { +@@ -73,6 +73,7 @@ while read -r name arg0 args; do { $hdr . "\${srcdir=.}/init.sh" run_strace_match_diff $arg0 $args
meta/recipes-devtools/strace/strace/skip-load.patch +5 -4
@@ -1,9 +1,13 @@ +From 3af7272a3435fc79e5da729155480a346ccf2d44 Mon Sep 17 00:00:00 2001 +From: Ross Burton <[email protected]> +Date: Mon, 31 Jan 2022 17:40:13 +0000 +Subject: [PATCH] strace: skip a number of load-sensitive tests + Skip tests which are known to be unreliable under load, typically because they care about timing. Upstream-Status: Inappropriate Signed-off-by: Ross Burton <[email protected]> - --- tests/clock_nanosleep.gen.test | 1 + tests/delay.test | 1 +
@@ -44,6 +48,3 @@ index 8299737..d89c7df 100755 r_opt="${1:--r}" --- -2.25.1 -
meta/recipes-devtools/strace/strace/update-gawk-paths.patch +36 -34
113 lines not on this page · raw message
meta/recipes-devtools/strace/strace_6.9.bb renamed from meta/recipes-devtools/strace/strace_6.8.bb +1 -1
@@ -15,7 +15,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ file://0002-tests-Replace-off64_t-with-off_t.patch \ " -SRC_URI[sha256sum] = "ba6950a96824cdf93a584fa04f0a733896d2a6bc5f0ad9ffe505d9b41e970149" +SRC_URI[sha256sum] = "da189e990a82e3ca3a5a4631012f7ecfd489dab459854d82d8caf6a865c1356a" inherit autotools ptest
Signature · 1 line
2.45.1
PATCH 2/3 quilt: 0.67 -> 0.68
In reply to [email protected]From: Robert Yang <[email protected]>
* Remove backported patches:
fix-grep-3.8.patch.
faildiff-order.patch 0001-test-Fix-a-race-condition-in-merge.test.patch
---
...lt-native_0.67.bb => quilt-native_0.68.bb} | 0
meta/recipes-devtools/quilt/quilt.inc | 5 +-
...t-Fix-a-race-condition-in-merge.test.patch | 48 ------
.../quilt/quilt/faildiff-order.patch | 41 -----
.../quilt/quilt/fix-grep-3.8.patch | 144 ------------------
.../quilt/{quilt_0.67.bb => quilt_0.68.bb} | 0
6 files changed, 1 insertion(+), 237 deletions(-)
rename meta/recipes-devtools/quilt/{quilt-native_0.67.bb => quilt-native_0.68.bb} (100%)
delete mode 100644 meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch
delete mode 100644 meta/recipes-devtools/quilt/quilt/faildiff-order.patch
delete mode 100644 meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch
rename meta/recipes-devtools/quilt/{quilt_0.67.bb => quilt_0.68.bb} (100%)meta/recipes-devtools/quilt/quilt-native_0.68.bb renamed from meta/recipes-devtools/quilt/quilt-native_0.67.bb +0 -0
meta/recipes-devtools/quilt/quilt.inc +1 -4
@@ -11,14 +11,11 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ file://run-ptest \ file://test.sh \ file://0001-tests-Allow-different-output-from-mv.patch \ - file://fix-grep-3.8.patch \ - file://faildiff-order.patch \ - file://0001-test-Fix-a-race-condition-in-merge.test.patch \ " SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" -SRC_URI[sha256sum] = "3be3be0987e72a6c364678bb827e3e1fcc10322b56bc5f02b576698f55013cc2" +SRC_URI[sha256sum] = "fe8c09de03c106e85b3737c8f03ade147c956b79ed7af485a1c8a3858db38426" inherit autotools-brokensep ptest
meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch deleted +0 -48
48 lines not on this page · raw message
meta/recipes-devtools/quilt/quilt/faildiff-order.patch deleted +0 -41
41 lines not on this page · raw message
meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch deleted +0 -144
144 lines not on this page · raw message
meta/recipes-devtools/quilt/quilt_0.68.bb renamed from meta/recipes-devtools/quilt/quilt_0.67.bb +0 -0
Signature · 1 line
2.45.1
Re: [OE-core] [PATCH 2/3] quilt: 0.67 -> 0.68
Quoted 15 lines · Robert Yang via lists.openembedded.org
From: Robert Yang <[email protected]>
* Remove backported patches:
fix-grep-3.8.patch.
faildiff-order.patch 0001-test-Fix-a-race-condition-in-merge.test.patchSigned-off-by Robert Yang <[email protected]>---
...lt-native_0.67.bb => quilt-native_0.68.bb} | 0 meta/recipes-devtools/quilt/quilt.inc | 5 +- ...t-Fix-a-race-condition-in-merge.test.patch | 48 ------ .../quilt/quilt/faildiff-order.patch | 41 ----- .../quilt/quilt/fix-grep-3.8.patch | 144 ------------------ .../quilt/{quilt_0.67.bb => quilt_0.68.bb} | 0
Quoted 6 lines
6 files changed, 1 insertion(+), 237 deletions(-)rename meta/recipes-devtools/quilt/{quilt-native_0.67.bb => quilt-native_0.68.bb} (100%) delete mode 100644
meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patchdelete mode 100644meta/recipes-devtools/quilt/quilt/faildiff-order.patch
delete mode 100644meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch
rename meta/recipes-devtools/quilt/{quilt_0.67.bb => quilt_0.68.bb} (100%)
The quilt ptests fail after the upgrade unfortunately:
https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/6454/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/6645/steps/12/logs/stdio
Cheers,
Richard
Re: [OE-core] [PATCH 2/3] quilt: 0.67 -> 0.68
Quoted 23 lines · Richard Purdie
Quoted 16 lines · Robert Yang via lists.openembedded.org
From: Robert Yang <[email protected]>
* Remove backported patches:
fix-grep-3.8.patch.
faildiff-order.patch 0001-test-Fix-a-race-condition-in-merge.test.patchSigned-off-by Robert Yang <[email protected]>--- ...lt-native_0.67.bb => quilt-native_0.68.bb} | 0 meta/recipes-devtools/quilt/quilt.inc | 5 +- ...t-Fix-a-race-condition-in-merge.test.patch | 48 ------ .../quilt/quilt/faildiff-order.patch | 41 ----- .../quilt/quilt/fix-grep-3.8.patch | 144 ------------------ .../quilt/{quilt_0.67.bb => quilt_0.68.bb} | 0 6 files changed, 1 insertion(+), 237 deletions(-)Quoted 5 lines
rename meta/recipes-devtools/quilt/{quilt-native_0.67.bb => quilt-native_0.68.bb} (100%) delete mode 100644
meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patchdelete mode 100644meta/recipes-devtools/quilt/quilt/faildiff-order.patch
delete mode 100644meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch
rename meta/recipes-devtools/quilt/{quilt_0.67.bb => quilt_0.68.bb} (100%)
Quoted 4 lines
The quilt ptests fail after the upgrade unfortunately:
https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/6454/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/6645/steps/12/logs/stdio
Sorry, it is because quilt-ptest requires coreutils' ln, I will send a V2 for it.
// Robert
Quoted 6 lines
Cheers,
Richard
PATCH 3/3 git: 2.44.0 -> 2.45.1
In reply to [email protected]From: Robert Yang <[email protected]>
Rebased 0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch
---
...mak.uname-do-not-force-RHEL-7-specific-build-.patch | 10 +++++++---
.../git/{git_2.44.0.bb => git_2.45.1.bb} | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/git/{git_2.44.0.bb => git_2.45.1.bb} (98%)meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch +7 -3
@@ -9,12 +9,16 @@ different flags than git builds on other host distros. Upstream-Status: Inappropriate [upstream needs to check compiler and component versions properly] Signed-off-by: Alexander Kanavin <[email protected]> +Rebased for 2.45.1. + +Signed-off-by: Robert Yang <[email protected]> + --- config.mak.uname | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config.mak.uname b/config.mak.uname -index 259d151..136ae3b 100644 +index a7607a5..251057e 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux)
@@ -22,9 +26,9 @@ index 259d151..136ae3b 100644 HAVE_PLATFORM_PROCINFO = YesPlease COMPAT_OBJS += compat/linux/procinfo.o - # centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7. -- ifneq ($(findstring .el7.,$(uname_R)),) +- ifneq ($(findstring .el7.,$(uname_R)),) - BASIC_CFLAGS += -std=c99 -- endif +- endif endif ifeq ($(uname_S),GNU/kFreeBSD) HAVE_ALLOCA_H = YesPlease
meta/recipes-devtools/git/git_2.45.1.bb renamed from meta/recipes-devtools/git/git_2.44.0.bb +1 -1
@@ -164,4 +164,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "f9e36f085458fe9688fbbe7846b8c4770b13d161fcd8953655f36b2b85f06b76" +SRC_URI[tarball.sha256sum] = "10acb581993061e616be9c5674469335922025a666318e0748cb8306079fef24"
Signature · 1 line
2.45.1