From: Alexander Kanavin <[email protected]> License-Update: drop BSL-1.0 as sub-component that used it is no longer in source tree.
Disable building items written in rust (until now, git would quetly fall back to C by default, as of this version it no longer does). At some point rust code will have to be enabled; for now it's optional. Signed-off-by: Alexander Kanavin <[email protected]> --- ...-do-not-force-RHEL-7-specific-build-.patch | 33 ------------------- meta/recipes-devtools/git/git/fixsort.patch | 2 +- .../git/{git_2.54.0.bb => git_2.55.0.bb} | 8 ++--- 3 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch rename meta/recipes-devtools/git/{git_2.54.0.bb => git_2.55.0.bb} (94%) 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 deleted file mode 100644 index b0c8e652aa..0000000000 --- a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d73b4c666aa12452a26c3fac83371a707e6f13c0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 7 Feb 2022 10:13:15 +0100 -Subject: [PATCH] config.mak.uname: do not force RHEL-7 specific build settings - -This breaks reproducibility as git builds on centos 7 use -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 5feb582..060cd29 100644 ---- a/config.mak.uname -+++ b/config.mak.uname -@@ -63,10 +63,6 @@ ifeq ($(uname_S),Linux) - PROCFS_EXECUTABLE_PATH = /proc/self/exe - 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)),) -- BASIC_CFLAGS += -std=c99 -- endif - LINK_FUZZ_PROGRAMS = YesPlease - endif - ifeq ($(uname_S),GNU/kFreeBSD) diff --git a/meta/recipes-devtools/git/git/fixsort.patch b/meta/recipes-devtools/git/git/fixsort.patch index 046d09160a..86b41fd819 100644 --- a/meta/recipes-devtools/git/git/fixsort.patch +++ b/meta/recipes-devtools/git/git/fixsort.patch @@ -1,4 +1,4 @@ -From f928abf16841e42bfd49ccaabc164318f61e842a Mon Sep 17 00:00:00 2001 +From e3bdf5adc50b12d8625e70415c81402e0e938b68 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 17 Feb 2021 17:57:13 +0000 Subject: [PATCH] generate-configlist.sh: Fix determinism issue diff --git a/meta/recipes-devtools/git/git_2.54.0.bb b/meta/recipes-devtools/git/git_2.55.0.bb similarity index 94% rename from meta/recipes-devtools/git/git_2.54.0.bb rename to meta/recipes-devtools/git/git_2.55.0.bb index 80c535a726..9198bb06c9 100644 --- a/meta/recipes-devtools/git/git_2.54.0.bb +++ b/meta/recipes-devtools/git/git_2.55.0.bb @@ -2,14 +2,13 @@ SUMMARY = "Distributed version control system" HOMEPAGE = "http://git-scm.com"; DESCRIPTION = "Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency." SECTION = "console/utils" -LICENSE = "GPL-2.0-only & GPL-2.0-or-later & BSD-3-Clause & MIT & BSL-1.0 & LGPL-2.1-or-later" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & BSD-3-Clause & MIT & LGPL-2.1-or-later" DEPENDS = "openssl zlib" PROVIDES:append:class-native = " git-replacement-native" SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ file://fixsort.patch \ - file://0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch \ " SRC_URI:append:class-nativesdk = " \ @@ -22,7 +21,6 @@ LIC_FILES_CHKSUM = "\ file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1 \ file://reftable/LICENSE;md5=1a6424cafc4c9c88c689848e165af33b \ file://sha1dc/LICENSE.txt;md5=9bbe4c990a9e98ea4b98ef5d3bcb8a7a \ - file://compat/nedmalloc/License.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ file://compat/inet_ntop.c;md5=76593c6f74e8ced5b24520175688d59b;endline=16 \ file://compat/obstack.h;md5=08ad25fee5428cd879ceef451ce3a22e;endline=18 \ file://compat/poll/poll.h;md5=9fc00170a53b8e3e52157c91ac688dd1;endline=19 \ @@ -48,7 +46,7 @@ EXTRA_OECONF:append:class-native = " --with-gitconfig=/etc/gitconfig " # Needs brokensep as this doesn't use automake inherit autotools-brokensep perlnative bash-completion manpages -EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" +EXTRA_OEMAKE = "NO_RUST=1 NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" EXTRA_OEMAKE += "'PERL_PATH=/usr/bin/env perl'" EXTRA_OEMAKE += "COMPUTE_HEADER_DEPENDENCIES=no" EXTRA_OEMAKE:append:class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1" @@ -170,7 +168,7 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "45e8107643a44e3ce46f5665beb35af3932fb0d70017687905ab5d4e3aafa8eb" +SRC_URI[tarball.sha256sum] = "0842dc384a23ac33ba3e570c4f3a8ded85963ee4713b1cd21153c3db41813d1e" CVE_STATUS[CVE-2024-32002] = "fixed-version: fixed since v2.46.0" CVE_STATUS[CVE-2024-50349] = "fixed-version: fixed since v2.49.0" -- 2.47.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#240297): https://lists.openembedded.org/g/openembedded-core/message/240297 Mute This Topic: https://lists.openembedded.org/mt/120143431/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
