Skip to contentSkip to conversation

kernel-devsrc: improve reproducibility for arm64

PATCH In review Denys Zagorui -X (dzagorui - GLOBALLOGIC INC@Cisco) 2 participants 7 messages Oct 29, 2020 – Nov 16, 2020 2 messages not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel-devsrc: improve reproducibility for arm64

.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.

---
 meta/recipes-kernel/linux/kernel-devsrc.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-kernel/linux/kernel-devsrc.bb +4 -0
index aa8e162f4f..f8c750beaa 100644
@@ -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
Signature · 1 line
2.19.0.dirty
#1 lore raw
Quoted 5 lines · On Thu, Oct 29, 2020 at 7:41 AM Denys Zagorui -X (dzagorui - GLOBALLOGIC…

.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

Quoted 26 lines
---
 meta/recipes-kernel/linux/kernel-devsrc.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-kernel/linux/kernel-devsrc.bb +4 -1
index aa8e162f4f..f8c750beaa 100644
@@ -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

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#2 lore raw
Quoted 11 lines
Quoted 4 lines

.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

Quoted 20 lines
Quoted 20 lines

---
meta/recipes-kernel/linux/kernel-devsrc.bb | 4 ++++

 1 file changed, 4 insertions(+)
meta/recipes-kernel/linux/kernel-devsrc.bb +4 -0
index aa8e162f4f..f8c750beaa 100644
@@ -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
     )
 
Quoted 7 lines
Quoted 7 lines
meta/recipes-kernel/linux/kernel-devsrc.bb +0 -1
     # 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

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines

.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 ?

Quoted 8 lines
Quoted 3 lines

Otherwise, the change looks fine to me.

Bruce

Yes, confirmed that oldconfig wont be triggered.

Thanks,
Denys

ping

Quoted 35 lines
Quoted 35 lines
Quoted 23 lines

---
meta/recipes-kernel/linux/kernel-devsrc.bb | 4 ++++

 1 file changed, 4 insertions(+)
meta/recipes-kernel/linux/kernel-devsrc.bb +4 -1
index aa8e162f4f..f8c750beaa 100644
@@ -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
--
Quoted 5 lines

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

A message that is not in the archive (sent off-list or not yet received): [email protected]

#6 lore raw
Quoted 9 lines
Quoted 9 lines
Quoted 5 lines

.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 ?

Quoted 8 lines
Quoted 3 lines

Otherwise, the change looks fine to me.

Bruce

Yes, confirmed that oldconfig wont be triggered.

Thanks,
Denys

ping

#7 lore raw
Quoted 13 lines · Denys Zagorui -X (dzagorui - GLOBALLOGIC INC at Cisco)
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

.vdso-offsets.h.cmd contains command that was used to produce

vdso-offsets.h.

Quoted 1 line
Quoted 1 line
Quoted 1 line

It breaks reproducibility because it has an absolute path in it.

There is no

Quoted 8 lines
Quoted 8 lines
Quoted 2 lines

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.

Quoted 9 lines
Quoted 6 lines
Quoted 1 line

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

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
#8 lore raw
Quoted 5 lines

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