[PATCH 1/2] gcc-shared-source: Fix source date epoch handling

[PATCH 1/2] gcc-shared-source: Fix source date epoch handling

[Richard Purdie]

The source date epoch for gcc isn't being transferred from the shared
workdir to the current WORKDIR for the specific recipe. This results in
the clamping code within sstate.bbclass using a value from 2011 which
changes the timestamps of many files. Since this happens part way
through the build, if pieces of gcc haven't built, or build/rebuild
later, we see things rebuilding when they should not and for generated
files, races are possible.

Fix this by copying the SDE from the shared workdir into the recipe
workdir.

[YOCTO #14953]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/gcc/gcc-shared-source.inc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/meta/recipes-devtools/gcc/gcc-shared-source.inc b/meta/recipes-devtools/gcc/gcc-shared-source.inc
index aac4b49313c..cdc27deffdb 100644
--- a/meta/recipes-devtools/gcc/gcc-shared-source.inc
+++ b/meta/recipes-devtools/gcc/gcc-shared-source.inc
@@ -9,3 +9,12 @@ SRC_URI = ""
 
 do_configure[depends] += "gcc-source-${PV}:do_preconfigure"
 do_populate_lic[depends] += "gcc-source-${PV}:do_unpack"
+do_deploy_source_date_epoch[depends] += "gcc-source-${PV}:do_deploy_source_date_epoch"
+
+# Copy the SDE from the shared workdir to the recipe workdir
+do_deploy_source_date_epoch () {
+	mkdir -p ${SDE_DEPLOYDIR}
+	cp -p ${S}/../source-date-epoch/__source_date_epoch.txt ${SDE_DEPLOYDIR}/__source_date_epoch.txt
+	mkdir -p `dirname ${SDE_FILE}`
+	cp -p ${S}/../source-date-epoch/__source_date_epoch.txt ${SDE_FILE}
+}
-- 
2.34.1

[PATCH 2/2] gcc-source: Drop gengtype manipulation

[Richard Purdie]

Whilst we patch gengtype.cc, we don't patch gengtype-lex.cc which would
be the file which would trigger regeneration of files.

The real bug that was likely the cause for this fix is probably SDE issues
with gcc shared workdir so this code can now be dropped.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/gcc/gcc-source.inc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc
index 03837f43811..bf33a4b31ff 100644
--- a/meta/recipes-devtools/gcc/gcc-source.inc
+++ b/meta/recipes-devtools/gcc/gcc-source.inc
@@ -25,8 +25,6 @@ python do_preconfigure () {
     import subprocess
     cmd = d.expand('cd ${S} && PATH=${PATH} gnu-configize')
     subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
-    # See 0044-gengtypes.patch, we need to regenerate this file
-    bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.cc"))
     cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure")
     subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
 
-- 
2.34.1

Re: [OE-core] [PATCH 2/2] gcc-source: Drop gengtype manipulation

[Khem Raj]

On Thu, Nov 3, 2022 at 5:41 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> Whilst we patch gengtype.cc, we don't patch gengtype-lex.cc which would
> be the file which would trigger regeneration of files.
>
> The real bug that was likely the cause for this fix is probably SDE issues
> with gcc shared workdir so this code can now be dropped.
>

good catch. LGTM

> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/recipes-devtools/gcc/gcc-source.inc | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc
> index 03837f43811..bf33a4b31ff 100644
> --- a/meta/recipes-devtools/gcc/gcc-source.inc
> +++ b/meta/recipes-devtools/gcc/gcc-source.inc
> @@ -25,8 +25,6 @@ python do_preconfigure () {
>      import subprocess
>      cmd = d.expand('cd ${S} && PATH=${PATH} gnu-configize')
>      subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
> -    # See 0044-gengtypes.patch, we need to regenerate this file
> -    bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.cc"))
>      cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure")
>      subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
>
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#172627): https://lists.openembedded.org/g/openembedded-core/message/172627
> Mute This Topic: https://lists.openembedded.org/mt/94755300/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

RE: [OE-core] [PATCH 1/2] gcc-shared-source: Fix source date epoch handling

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Richard Purdie
> Sent: den 3 november 2022 13:41
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 1/2] gcc-shared-source: Fix source date epoch handling
> 
> The source date epoch for gcc isn't being transferred from the shared
> workdir to the current WORKDIR for the specific recipe. This results in
> the clamping code within sstate.bbclass using a value from 2011 which
> changes the timestamps of many files. Since this happens part way
> through the build, if pieces of gcc haven't built, or build/rebuild
> later, we see things rebuilding when they should not and for generated
> files, races are possible.
> 
> Fix this by copying the SDE from the shared workdir into the recipe
> workdir.
> 
> [YOCTO #14953]
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/recipes-devtools/gcc/gcc-shared-source.inc | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-shared-source.inc b/meta/recipes-devtools/gcc/gcc-shared-source.inc
> index aac4b49313c..cdc27deffdb 100644
> --- a/meta/recipes-devtools/gcc/gcc-shared-source.inc
> +++ b/meta/recipes-devtools/gcc/gcc-shared-source.inc
> @@ -9,3 +9,12 @@ SRC_URI = ""
> 
>  do_configure[depends] += "gcc-source-${PV}:do_preconfigure"
>  do_populate_lic[depends] += "gcc-source-${PV}:do_unpack"
> +do_deploy_source_date_epoch[depends] += "gcc-source-${PV}:do_deploy_source_date_epoch"
> +
> +# Copy the SDE from the shared workdir to the recipe workdir
> +do_deploy_source_date_epoch () {
> +	mkdir -p ${SDE_DEPLOYDIR}
> +	cp -p ${S}/../source-date-epoch/__source_date_epoch.txt ${SDE_DEPLOYDIR}/__source_date_epoch.txt
> +	mkdir -p `dirname ${SDE_FILE}`
> +	cp -p ${S}/../source-date-epoch/__source_date_epoch.txt ${SDE_FILE}

Even though I doubt the name of the epoch file is likely to change 
any time soon, I think it is better to avoid hardcoding it here.
Thus I suggest the following instead:

	sde_file=${SDE_FILE}
	sde_file=${sde_file#${WORKDIR}/}
	mkdir -p ${SDE_DEPLOYDIR} $(dirname ${SDE_FILE})
	cp -p ${S}/../$sde_file ${SDE_DEPLOYDIR}
	cp -p ${S}/../$sde_file ${SDE_FILE}

> +}
> --
> 2.34.1

//Peter