dtc: improve reproducibility
PATCH 1/1 dtc: improve reproducibility
Makefile override CFLAGS, so -fmacro/debug-prefix-map optiions was omitted and binaries contains absolute patch to sources.
--- meta/recipes-kernel/dtc/dtc.inc | 10 +++++- ...-Makefile-to-add-CFLAGS-not-override.patch | 36 +++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/dtc/dtc/0001-dtc-Fix-Makefile-to-add-CFLAGS-not-override.patch
meta/recipes-kernel/dtc/dtc.inc +8 -0
@@ -8,6 +8,14 @@ DEPENDS = "flex-native bison-native" SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \ file://make_install.patch \ " + +def get_reproducibility_patches(d): + if bb.data.inherits_class("reproducible_build", d): + return "file://0001-dtc-Fix-Makefile-to-add-CFLAGS-not-override.patch" + return "" + +SRC_URI += "${@get_reproducibility_patches(d)}" + UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" EXTRA_OEMAKE='NO_PYTHON=1 PREFIX="${prefix}" LIBDIR="${libdir}" DESTDIR="${D}"'
meta/recipes-kernel/dtc/dtc/0001-dtc-Fix-Makefile-to-add-CFLAGS-not-override.patch new file +36 -0
@@ -0,0 +1,36 @@ +From d684b031967ee7055d5719476ef578fe2c37401c Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <[email protected]> +Date: Thu, 24 Sep 2020 05:12:42 -0700 +Subject: [PATCH] dtc: Fix Makefile to add CFLAGS not override + +Makefile override CFLAGS not extend them, so some of them +missing. Sources builds out of kernel tree and probably not all +options could be used (?). We need at least -fmacro-prefix-map/ +debug-prefix-map to eliminate absolute path in binaries. + +Upstream-Status: Pending +Signed-off-by: Oleksiy Obitotskyy <[email protected]> +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index f729bf6..bb51a92 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,10 +16,10 @@ EXTRAVERSION = + LOCAL_VERSION = + CONFIG_LOCALVERSION = + +-CPPFLAGS = -I libfdt -I . ++CPPFLAGS += -I libfdt -I . + WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ + -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow +-CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS) ++CFLAGS += -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS) + + BISON = bison + LEX = flex +-- +2.19.0.dirty +
Signature · 1 line
2.26.2.Cisco
Quoted 27 lines · Oleksiy Obitotskyy via lists.openembedded.org
Makefileoverride CFLAGS, so -fmacro/debug-prefix-map optiions was omitted and binaries contains absolute patch to sources.Signed-off-by Oleksiy Obitotskyy <[email protected]>---
meta/recipes-kernel/dtc/dtc.inc | 10 +++++-
...-Makefile-to-add-CFLAGS-not-override.patch | 36 +++++++++++++++++++2 files changed, 45 insertions(+), 1 deletion(-)create mode 100644
meta/recipes-kernel/dtc/dtc/0001-dtc-Fix-Makefile-to-add-CFLAGS-not-override.patchmeta/recipes-kernel/dtc/dtc.inc +0
-0@@ -8,6 +8,14 @@ DEPENDS = "flex-native bison-native" SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \ file://make_install.patch \"
meta/recipes-kernel/dtc/dtc.inc +8
-0+ +def get_reproducibility_patches(d): + if bb.data.inherits_class("reproducible_build", d): + return "file://0001-dtc-Fix-Makefile-to-add-CFLAGS-not-override.patch" + return "" + +SRC_URI += "${@get_reproducibility_patches(d)}" +
Quoted 1 line
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
Thanks for looking at this, its good to get some of the remaining issues sorted!
Is there a reason we can't always apply this patch?
Cheers,
Richard
Hello,
Em qua., 20 de jan. de 2021 às 15:20, Oleksiy Obitotskyy via lists.openembedded.org <[email protected]> escreveu:
Quoted 10 lines
Makefileoverride CFLAGS, so -fmacro/debug-prefix-map optiions was omitted and binaries contains absolute patch to sources.Signed-off-by Oleksiy Obitotskyy <[email protected]>--- meta/recipes-kernel/dtc/dtc.inc | 10 +++++- ...-Makefile-to-add-CFLAGS-not-override.patch | 36 +++++++++++++++++++...
The patch can be applied unconditionally as it essentially allow new flags to be added and should not harm. In fact, applying it seems to be the correct fix IMO.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
it perhaps should be sent upstream too.
Quoted 28 lines · Otavio Salvador
Hello,
Em qua., 20 de jan. de 2021 às 15:20, Oleksiy Obitotskyy via lists.openembedded.org <[email protected]> escreveu:
Quoted 10 lines
Makefileoverride CFLAGS, so -fmacro/debug-prefix-map optiions was omitted and binaries contains absolute patch to sources.Signed-off-by Oleksiy Obitotskyy <[email protected]>--- meta/recipes-kernel/dtc/dtc.inc | 10 +++++- ...-Makefile-to-add-CFLAGS-not-override.patch | 36 +++++++++++++++++++...
The patch can be applied unconditionally as it essentially allow new flags to be added and should not harm. In fact, applying it seems to be the correct fix IMO.
--
Otavio SalvadorO.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
Hi,
Should I rework (add patch unconditional) and resubmit patch? Or should I try to submit it to the dtc directly?
Regards,
Oleksiy
________________________________
From: Khem Raj <[email protected]>
Sent: Thursday, January 21, 2021 00:17
To: Otavio Salvador <[email protected]>
Cc: Oleksiy Obitotskyi -X (oobitots - GLOBALLOGIC INC at Cisco) <[email protected]>; Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] dtc: improve reproducibility
it perhaps should be sent upstream too.
Quoted 28 lines · Otavio Salvador
Hello,
Em qua., 20 de jan. de 2021 às 15:20, Oleksiy Obitotskyy via lists.openembedded.org <[email protected]> escreveu:
Quoted 10 lines
Makefileoverride CFLAGS, so -fmacro/debug-prefix-map optiions was omitted and binaries contains absolute patch to sources.Signed-off-by Oleksiy Obitotskyy <[email protected]>--- meta/recipes-kernel/dtc/dtc.inc | 10 +++++- ...-Makefile-to-add-CFLAGS-not-override.patch | 36 +++++++++++++++++++...
The patch can be applied unconditionally as it essentially allow new flags to be added and should not harm. In fact, applying it seems to be the correct fix IMO.
--
Otavio SalvadorO.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
Quoted 2 lines · Oleksiy Obitotskyi -X (oobitots - GLOBALLOGIC INC at Cisco)
Should I rework (add patch unconditional) and resubmit patch? Or should I try to submit it to the dtc directly?
Both would be ideal please!
Cheers,
Richard