[PATCH] kernel-devsrc: improve reproducibility for arm64

[PATCH] kernel-devsrc: improve reproducibility for arm64

[Denys Zagorui -X (dzagorui - GLOBALLOGIC INC@Cisco)]

.vdso-offsets.h.cmd contains command that was used to produce vdso-offsets.h.
It breaks reproducibility because it has an absolute path in it. There is no
any value to package such files so it can be dropped.

Signed-off-by: Denys Zagorui <dzagorui@cisco.com>
---
 meta/recipes-kernel/linux/kernel-devsrc.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index aa8e162f4f..f8c750beaa 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -113,6 +113,10 @@ do_install() {
 	# but without this file, we get a forced syncconfig run in v5.8+, which prompts and
 	# breaks workflows.
 	cp -a --parents include/generated/autoconf.h $kerneldir/build 2>/dev/null || :
+
+	if [ -e $kerneldir/include/generated/.vdso-offsets.h.cmd ]; then
+	    rm $kerneldir/include/generated/.vdso-offsets.h.cmd
+	fi
     )
 
     # now grab the chunks from the source tree that we need
-- 
2.19.0.dirty

Re: [OE-core] [PATCH] kernel-devsrc: improve reproducibility for arm64

[Bruce Ashfield]

On Thu, Oct 29, 2020 at 7:41 AM Denys Zagorui -X (dzagorui -
GLOBALLOGIC INC@Cisco) via lists.openembedded.org
<dzagorui=cisco.com@lists.openembedded.org> wrote:
>
> .vdso-offsets.h.cmd contains command that was used to produce vdso-offsets.h.
> It breaks reproducibility because it has an absolute path in it. There is no
> any value to package such files so it can be dropped.
>

Have you confirmed that an on-target 'make scripts prepare' property
regenerates the file without triggering and oldconfig ?

Otherwise, the change looks fine to me.

Bruce

> Signed-off-by: Denys Zagorui <dzagorui@cisco.com>
> ---
>  meta/recipes-kernel/linux/kernel-devsrc.bb | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
> index aa8e162f4f..f8c750beaa 100644
> --- a/meta/recipes-kernel/linux/kernel-devsrc.bb
> +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
> @@ -113,6 +113,10 @@ do_install() {
>         # but without this file, we get a forced syncconfig run in v5.8+, which prompts and
>         # breaks workflows.
>         cp -a --parents include/generated/autoconf.h $kerneldir/build 2>/dev/null || :
> +
> +       if [ -e $kerneldir/include/generated/.vdso-offsets.h.cmd ]; then
> +           rm $kerneldir/include/generated/.vdso-offsets.h.cmd
> +       fi
>      )
>
>      # now grab the chunks from the source tree that we need
> --
> 2.19.0.dirty
>
>
> 
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Re: [OE-core] [PATCH] kernel-devsrc: improve reproducibility for arm64

[Denys Zagorui -X (dzagorui - GLOBALLOGIC INC@Cisco)]

> > .vdso-offsets.h.cmd contains command that was used to produce vdso-offsets.h.
> > It breaks reproducibility because it has an absolute path in it. There is no
> > any value to package such files so it can be dropped.
> >
> 
> Have you confirmed that an on-target 'make scripts prepare' property
> regenerates the file without triggering and oldconfig ?
> 
> Otherwise, the change looks fine to me.
> 
> Bruce

Yes, confirmed that oldconfig wont be triggered.

Thanks,
Denys

> 
> > Signed-off-by: Denys Zagorui <dzagorui@cisco.com>
> > ---
> > meta/recipes-kernel/linux/kernel-devsrc.bb | 4 ++++
> >  1 file changed, 4 insertions(+)
> >
> > diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
> > index aa8e162f4f..f8c750beaa 100644
> > --- a/meta/recipes-kernel/linux/kernel-devsrc.bb
> > +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
> > @@ -113,6 +113,10 @@ do_install() {
> >         # but without this file, we get a forced syncconfig run in v5.8+, which prompts and
> >         # breaks workflows.
> >         cp -a --parents include/generated/autoconf.h $kerneldir/build 2>/dev/null || :
> > +
> > +       if [ -e $kerneldir/include/generated/.vdso-offsets.h.cmd ]; then
> > +           rm $kerneldir/include/generated/.vdso-offsets.h.cmd
> > +       fi
> >      )
> >
> >      # now grab the chunks from the source tree that we need
> > --
> > 2.19.0.dirty
> >
> >
> >
> >


--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Re: [OE-core] [PATCH] kernel-devsrc: improve reproducibility for arm64

[Denys Zagorui -X (dzagorui - GLOBALLOGIC INC@Cisco)]

> > > .vdso-offsets.h.cmd contains command that was used to produce vdso-offsets.h.
> > > It breaks reproducibility because it has an absolute path in it. There is no
> > > any value to package such files so it can be dropped.
> > >
> >
> > Have you confirmed that an on-target 'make scripts prepare' property
> > regenerates the file without triggering and oldconfig ?
> >
> > Otherwise, the change looks fine to me.
> >
> > Bruce
>
> Yes, confirmed that oldconfig wont be triggered.
>
> Thanks,
> Denys

ping

>
> >
> > > Signed-off-by: Denys Zagorui <dzagorui@cisco.com>
> > > ---
> > > meta/recipes-kernel/linux/kernel-devsrc.bb | 4 ++++
> > >  1 file changed, 4 insertions(+)
> > >
> > > diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
> > > index aa8e162f4f..f8c750beaa 100644
> > > --- a/meta/recipes-kernel/linux/kernel-devsrc.bb
> > > +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
> > > @@ -113,6 +113,10 @@ do_install() {
> > >         # but without this file, we get a forced syncconfig run in v5.8+, which prompts and
> > >         # breaks workflows.
> > >         cp -a --parents include/generated/autoconf.h $kerneldir/build 2>/dev/null || :
> > > +
> > > +       if [ -e $kerneldir/include/generated/.vdso-offsets.h.cmd ]; then
> > > +           rm $kerneldir/include/generated/.vdso-offsets.h.cmd
> > > +       fi
> > >      )
> > >
> > >      # now grab the chunks from the source tree that we need
> > > --
> > > 2.19.0.dirty
> > >
> > >
> > >
> > >
> >
> >
> > --
> > - Thou shalt not follow the NULL pointer, for chaos and madness await
> > thee at its end
> > - "Use the force Harry" - Gandalf, Star Trek II
> >

Re: [OE-core] [PATCH] kernel-devsrc: improve reproducibility for arm64

[Denys Zagorui -X (dzagorui - GLOBALLOGIC INC@Cisco)]

> > > .vdso-offsets.h.cmd contains command that was used to produce vdso-offsets.h.
> > > It breaks reproducibility because it has an absolute path in it. There is no
> > > any value to package such files so it can be dropped.
> > >
> >
> > Have you confirmed that an on-target 'make scripts prepare' property
> > regenerates the file without triggering and oldconfig ?
> >
> > Otherwise, the change looks fine to me.
> >
> > Bruce
>
> Yes, confirmed that oldconfig wont be triggered.
>
> Thanks,
> Denys

ping

Re: [OE-core] [PATCH] kernel-devsrc: improve reproducibility for arm64

[Bruce Ashfield]

[-- Attachment #1: Type: text/plain, Size: 1145 bytes --]

On Mon, Nov 16, 2020 at 10:14 AM Denys Zagorui -X (dzagorui - GLOBALLOGIC
INC at Cisco) <dzagorui@cisco.com> wrote:

>
> > > > .vdso-offsets.h.cmd contains command that was used to produce
> vdso-offsets.h.
> > > > It breaks reproducibility because it has an absolute path in it.
> There is no
> > > > any value to package such files so it can be dropped.
> > > >
> > >
> > > Have you confirmed that an on-target 'make scripts prepare' property
> > > regenerates the file without triggering and oldconfig ?
> > >
> > > Otherwise, the change looks fine to me.
> > >
> > > Bruce
> >
> > Yes, confirmed that oldconfig wont be triggered.
> >
> > Thanks,
> > Denys
>
> ping
>
I expected that this would have been picked up after I acked it, but there
was a release to do in the middle of it being submitted and now .. so
things have been a bit slower.

I'll put it in my local queue, that way if it doesn't get picked up, I'll
send it with my next pull request.

Bruce



-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II

[-- Attachment #2: Type: text/html, Size: 2089 bytes --]

Re: [OE-core] [PATCH] kernel-devsrc: improve reproducibility for arm64

[Denys Zagorui -X (dzagorui - GLOBALLOGIC INC@Cisco)]

[-- Attachment #1: Type: text/plain, Size: 335 bytes --]

> I expected that this would have been picked up after I acked it, but there was a release to do in the middle of it being submitted and now .. so things have been a bit slower.
>
> I'll put it in my local queue, that way if it doesn't get picked up, I'll send it with my next pull request.
>
> Bruce

I see

Thanks,
Denys


[-- Attachment #2: Type: text/html, Size: 1204 bytes --]