Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> --- ...mak.uname-do-not-force-RHEL-7-specific-build-.patch | 4 ++-- meta/recipes-devtools/git/git/fixsort.patch | 10 +++++----- .../git/{git_2.47.1.bb => git_2.48.1.bb} | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) rename meta/recipes-devtools/git/{git_2.47.1.bb => git_2.48.1.bb} (98%)
diff --git a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch b/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch index e5135928f09..cbe9a32fa1b 100644 --- a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch +++ b/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch @@ -1,4 +1,4 @@ -From 348811a6f818408a31551d0830dcfe31c55d06a8 Mon Sep 17 00:00:00 2001 +From 2a97f61c558a03282c7d81797f1cd8b594f953dc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <a...@linutronix.de> Date: Mon, 7 Feb 2022 10:13:15 +0100 Subject: [PATCH] config.mak.uname: do not force RHEL-7 specific build settings @@ -17,7 +17,7 @@ Signed-off-by: Robert Yang <liezhi.y...@windriver.com> 1 file changed, 4 deletions(-) diff --git a/config.mak.uname b/config.mak.uname -index d511216..3144228 100644 +index b12d4e1..b5b8d82 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -63,10 +63,6 @@ ifeq ($(uname_S),Linux) diff --git a/meta/recipes-devtools/git/git/fixsort.patch b/meta/recipes-devtools/git/git/fixsort.patch index d9a3672f1d6..e01953e324e 100644 --- a/meta/recipes-devtools/git/git/fixsort.patch +++ b/meta/recipes-devtools/git/git/fixsort.patch @@ -1,7 +1,7 @@ -From 83ae059943d3efd824978a759bcfd894ce5085d4 Mon Sep 17 00:00:00 2001 +From 0ada98b8e1de3fe835b439777303dfaf9ac65a08 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.pur...@linuxfoundation.org> Date: Wed, 17 Feb 2021 17:57:13 +0000 -Subject: [PATCH] [PATCH] generate-configlist.sh: Fix determinism issue +Subject: [PATCH] generate-configlist.sh: Fix determinism issue Currently git binaries are not entirely reproducible, at least partly due to config-list.h differing in order depending on the system's @@ -23,12 +23,12 @@ Upstream-Status: Submitted [https://public-inbox.org/git/f029a942dd3d50d85e60bd3 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-configlist.sh b/generate-configlist.sh -index 8692fe5..e67ccac 100755 +index 5794226..6b0b939 100755 --- a/generate-configlist.sh +++ b/generate-configlist.sh -@@ -9,7 +9,7 @@ static const char *config_name_list[] = { +@@ -15,7 +15,7 @@ static const char *config_name_list[] = { EOF - grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt Documentation/config/*.txt | + grep -h '^[a-zA-Z].*\..*::$' "$SOURCE_DIR"/Documentation/*config.txt "$SOURCE_DIR"/Documentation/config/*.txt | sed '/deprecated/d; s/::$//; s/, */\n/g' | - sort | + LC_ALL=C sort | diff --git a/meta/recipes-devtools/git/git_2.47.1.bb b/meta/recipes-devtools/git/git_2.48.1.bb similarity index 98% rename from meta/recipes-devtools/git/git_2.47.1.bb rename to meta/recipes-devtools/git/git_2.48.1.bb index 8b5bfecd6aa..e0df23eb477 100644 --- a/meta/recipes-devtools/git/git_2.47.1.bb +++ b/meta/recipes-devtools/git/git_2.48.1.bb @@ -164,4 +164,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "f4c4e98667800585d218dfdf415eb72f73baa7abcac4569e2ce497970f8d6665" +SRC_URI[tarball.sha256sum] = "51b4d03b1e311ba673591210f94f24a4c5781453e1eb188822e3d9cdc04c2212"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#210678): https://lists.openembedded.org/g/openembedded-core/message/210678 Mute This Topic: https://lists.openembedded.org/mt/110974420/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-