diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-02-07 10:16:21 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-08 14:19:32 +0000 |
| commit | edeb2a1a4cfd16706da6815af198d133a94b5ac6 (patch) | |
| tree | ec72366e871c3335b5bb69ef0fb2f0143adcb92b /meta/recipes-devtools/git | |
| parent | 39c10816d5ec9d9c7952d786d7a3f942d25d0c27 (diff) | |
| download | openembedded-core-contrib-edeb2a1a4cfd16706da6815af198d133a94b5ac6.tar.gz | |
git: restore reproducibility on centos 7
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/git')
| -rw-r--r-- | meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-devtools/git/git_2.35.1.bb | 3 |
2 files changed, 32 insertions, 1 deletions
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 new file mode 100644 index 0000000000..e0f702f327 --- /dev/null +++ b/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch @@ -0,0 +1,30 @@ +From 3b2505435bc6f982226eff84bad6bf9a36381573 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +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 <alex@linutronix.de> +--- + config.mak.uname | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/config.mak.uname b/config.mak.uname +index c48db45..9b3e9bf 100644 +--- a/config.mak.uname ++++ b/config.mak.uname +@@ -63,11 +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 +- NO_UNCOMPRESS2 = YesPlease +- endif + endif + ifeq ($(uname_S),GNU/kFreeBSD) + HAVE_ALLOCA_H = YesPlease diff --git a/meta/recipes-devtools/git/git_2.35.1.bb b/meta/recipes-devtools/git/git_2.35.1.bb index 62017b98ef..a333458d5f 100644 --- a/meta/recipes-devtools/git/git_2.35.1.bb +++ b/meta/recipes-devtools/git/git_2.35.1.bb @@ -9,7 +9,8 @@ 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 \ + " S = "${WORKDIR}/git-${PV}" |