Skip to contentSkip to conversation

netbase: use git fetcher

PATCH Superseded Yu, Mingli 2 participants 6 messages Jun 29, 2020 – Jul 6, 2020 1 message not in the archive

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Yu, Mingli

author
#0 lore raw

PATCH v2 1/1 netbase: use git fetcher

From: Mingli Yu <[email protected]>

Use git repo as the the previous URL only stores
the latest source file and fails to locate the
source tar file if we don't upgrade timely.

---
 meta/recipes-core/netbase/netbase_6.1.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/netbase/netbase_6.1.bb +3 -3
index bc0049c020..c13685e8ad 100644
@@ -6,10 +6,10 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
 PE = "1"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz"
+SRC_URI = "git://salsa.debian.org/md/netbase.git;protocol=https"
+SRCREV = "0fc1e4ce39328f7388badace0aaf7b7294d5ed61"
 
-SRC_URI[md5sum] = "e5871a3a5c8390557b8033cf19316a55"
-SRC_URI[sha256sum] = "084d743bd84d4d9380bac4c71c51e57406dce44f5a69289bb823c903e9b035d8"
+S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/"
 do_install () {
Signature · 1 line
2.26.2
#1 lore raw
Quoted 19 lines · Mingli

From: Mingli Yu <[email protected]>

Use git repo as the the previous URL only stores
the latest source file and fails to locate the
source tar file if we don't upgrade timely.

---
 meta/recipes-core/netbase/netbase_6.1.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/netbase/netbase_6.1.bb +0 -0
index bc0049c020..c13685e8ad 100644
@@ -6,10 +6,10 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
 PE = "1"
 

meta/recipes-core/netbase/netbase_6.1.bb LICENSE = "GPLv2" · line 15

Quoted 10 lines
meta/recipes-core/netbase/netbase_6.1.bb +3 -3
-SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz"
+SRC_URI = "git://salsa.debian.org/md/netbase.git;protocol=https"
+SRCREV = "0fc1e4ce39328f7388badace0aaf7b7294d5ed61"
 
-SRC_URI[md5sum] = "e5871a3a5c8390557b8033cf19316a55"
-SRC_URI[sha256sum] = "084d743bd84d4d9380bac4c71c51e57406dce44f5a69289bb823c903e9b035d8"
+S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/"
 do_install () {

This still breaks all oe-selftest:

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1095
https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/1087
https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/1083
https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/1098

oe-selftest -r reproducible.ReproducibleTests.test_reproducible_builds

should reproduce but regardless, this *must* be fixed before this can merge.

Cheers,

Richard

author
#2 lore raw
Quoted 33 lines · Richard Purdie
Quoted 19 lines · Mingli

From: Mingli Yu <[email protected]>

Use git repo as the the previous URL only stores
the latest source file and fails to locate the
source tar file if we don't upgrade timely.

---
  meta/recipes-core/netbase/netbase_6.1.bb | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/netbase/netbase_6.1.bb +0 -0
index bc0049c020..c13685e8ad 100644
@@ -6,10 +6,10 @@ LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
  PE = "1"
 

meta/recipes-core/netbase/netbase_6.1.bb LICENSE = "GPLv2" · line 15

Quoted 10 lines
meta/recipes-core/netbase/netbase_6.1.bb +3 -3
-SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz"
+SRC_URI = "git://salsa.debian.org/md/netbase.git;protocol=https"
+SRCREV = "0fc1e4ce39328f7388badace0aaf7b7294d5ed61"
 
-SRC_URI[md5sum] = "e5871a3a5c8390557b8033cf19316a55"
-SRC_URI[sha256sum] = "084d743bd84d4d9380bac4c71c51e57406dce44f5a69289bb823c903e9b035d8"
+S = "${WORKDIR}/git"
 
  UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/"
  do_install () {

This still breaks all oe-selftest:

Quoted 6 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1095
https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/1087
https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/1083
https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/1098

oe-selftest -r reproducible.ReproducibleTests.test_reproducible_builds

It's weird, I did run reproducible build locally with "oe-selftest -r reproducible.ReproducibleTests.test_reproducible_builds" and It succeeds at my side.

BTW, the netbase only introduces 3 files as below:

# rpm -ql netbase

/etc

/etc/protocols

/etc/rpc

/etc/services

And I did the three files' checksum and the checksum turns out to be the same when with the commit and without the commit.

Anyway, I will investigate the issue again.

Thanks,

Quoted 8 lines

should reproduce but regardless, this *must* be fixed before this can merge.

Cheers,

Richard

#3 lore raw
Quoted 53 lines · Mingli
Quoted 33 lines · Richard Purdie
Quoted 19 lines · Mingli

From: Mingli Yu <[email protected]>

Use git repo as the the previous URL only stores
the latest source file and fails to locate the
source tar file if we don't upgrade timely.

---
  meta/recipes-core/netbase/netbase_6.1.bb | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/netbase/netbase_6.1.bb +0 -0
index bc0049c020..c13685e8ad 100644
@@ -6,10 +6,10 @@ LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
  PE = "1"
 

meta/recipes-core/netbase/netbase_6.1.bb LICENSE = "GPLv2" · line 15

Quoted 10 lines
meta/recipes-core/netbase/netbase_6.1.bb +3 -3
-SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz"
+SRC_URI = "git://salsa.debian.org/md/netbase.git;protocol=https"
+SRCREV = "0fc1e4ce39328f7388badace0aaf7b7294d5ed61"
 
-SRC_URI[md5sum] = "e5871a3a5c8390557b8033cf19316a55"
-SRC_URI[sha256sum] = "084d743bd84d4d9380bac4c71c51e57406dce44f5a69289bb823c903e9b035d8"
+S = "${WORKDIR}/git"
 
  UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/"
  do_install () {

This still breaks all oe-selftest:

Quoted 6 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1095
https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/1087
https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/1083
https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/1098

oe-selftest -r reproducible.ReproducibleTests.test_reproducible_builds

It's weird, I did run reproducible build locally with "oe-selftest -r reproducible.ReproducibleTests.test_reproducible_builds" and It succeeds at my side.

BTW, the netbase only introduces 3 files as below:

# rpm -ql netbase

/etc

/etc/protocols

Quoted 8 lines

/etc/rpc

/etc/services

And I did the three files' checksum and the checksum turns out to be the same when with the commit and without the commit.

Anyway, I will investigate the issue again.

This is the diffstat output on the result:

https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200630-_jn1koza/packages/diff-html/

It shows this is a timestamp problem, the timestamps aren't always the same. It should be using SOURCE_DATE_EPOCH.

Cheers,

Richard

author
#4 lore raw
Quoted 61 lines · Richard Purdie
Quoted 60 lines · Mingli
Quoted 33 lines · Richard Purdie
Quoted 19 lines · Mingli

From: Mingli Yu <[email protected]>

Use git repo as the the previous URL only stores
the latest source file and fails to locate the
source tar file if we don't upgrade timely.

---
   meta/recipes-core/netbase/netbase_6.1.bb | 6 +++---
   1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/netbase/netbase_6.1.bb +0 -0
index bc0049c020..c13685e8ad 100644
@@ -6,10 +6,10 @@ LICENSE = "GPLv2"
   LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
   PE = "1"
 

meta/recipes-core/netbase/netbase_6.1.bb LICENSE = "GPLv2" · line 15

Quoted 10 lines
meta/recipes-core/netbase/netbase_6.1.bb +3 -3
-SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz"
+SRC_URI = "git://salsa.debian.org/md/netbase.git;protocol=https"
+SRCREV = "0fc1e4ce39328f7388badace0aaf7b7294d5ed61"
 
-SRC_URI[md5sum] = "e5871a3a5c8390557b8033cf19316a55"
-SRC_URI[sha256sum] = "084d743bd84d4d9380bac4c71c51e57406dce44f5a69289bb823c903e9b035d8"
+S = "${WORKDIR}/git"
 
   UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/"
   do_install () {

This still breaks all oe-selftest:

Quoted 6 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1095
https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/1087
https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/1083
https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/1098

oe-selftest -r reproducible.ReproducibleTests.test_reproducible_builds

It's weird, I did run reproducible build locally with "oe-selftest -r reproducible.ReproducibleTests.test_reproducible_builds" and It succeeds at my side.

BTW, the netbase only introduces 3 files as below:

# rpm -ql netbase

/etc

/etc/protocols

/etc/rpc

/etc/services

And I did the three files' checksum and the checksum turns out to be the same when with the commit and without the commit.

Quoted 8 lines
Quoted 1 line

Anyway, I will investigate the issue again.

This is the diffstat output on the result:

https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200630-_jn1koza/packages/diff-html/

It shows this is a timestamp problem, the timestamps aren't always the same. It should be using SOURCE_DATE_EPOCH.

Hi RP,

Many thanks your hints!

But I still don't understand why the reproducible test succeeds at my side and the corresponding SOURCE_DATE_EPOCH in my env as below:

$ cat /builda/yocto/builds/poky-build6-st/reproducibleA/tmp/work/cortexa57-poky-linux/netbase/1_6.1-r0/source-date-epoch/__source_date_epoch.txt
1581895519
$ cat /build/yocto/builds/poky-build6-st/reproducibleB/tmp/work/cortexa57-poky-linux/netbase/1_6.1-r0/s-epoch/__source_date_epoch.txt
1581895519

Thanks,

Quoted 5 lines

Cheers,

Richard

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

author
#6 lore raw
Quoted 78 lines · Mingli
Quoted 61 lines · Richard Purdie
Quoted 51 lines · Mingli
Quoted 31 lines · Richard Purdie
Quoted 23 lines · Mingli

From: Mingli Yu <[email protected]>

Use git repo as the the previous URL only stores
the latest source file and fails to locate the
source tar file if we don't upgrade timely.

---
   meta/recipes-core/netbase/netbase_6.1.bb | 6 +++---

   1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/netbase/netbase_6.1.bb +0 -0
index bc0049c020..c13685e8ad 100644
@@ -6,10 +6,10 @@ LICENSE = "GPLv2"

   LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab" PE = "1"

meta/recipes-core/netbase/netbase_6.1.bb +2 -3
-SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz"
+SRC_URI = "git://salsa.debian.org/md/netbase.git;protocol=https"
+SRCREV = "0fc1e4ce39328f7388badace0aaf7b7294d5ed61"
-SRC_URI[md5sum] = "e5871a3a5c8390557b8033cf19316a55"
-SRC_URI[sha256sum] = 
Quoted 4 lines

"084d743bd84d4d9380bac4c71c51e57406dce44f5a69289bb823c903e9b035d8" +S = "${WORKDIR}/git"
   UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/" do_install () {

This still breaks all oe-selftest:

Quoted 6 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1095
https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/1087
https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/1083
https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/1098

oe-selftest -r reproducible.ReproducibleTests.test_reproducible_builds

It's weird, I did run reproducible build locally with "oe-selftest -r reproducible.ReproducibleTests.test_reproducible_builds" and It succeeds at my side.

BTW, the netbase only introduces 3 files as below:

# rpm -ql netbase

/etc

/etc/protocols

Quoted 8 lines

/etc/rpc

/etc/services

And I did the three files' checksum and the checksum turns out to be the same when with the commit and without the commit.

Anyway, I will investigate the issue again.

Quoted 7 lines

This is the diffstat output on the result:

https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200630-_jn1koza/packages/diff-html/

It shows this is a timestamp problem, the timestamps aren't always the same. It should be using SOURCE_DATE_EPOCH.

Hi RP,

Many thanks your hints!

But I still don't understand why the reproducible test succeeds at my side and the corresponding SOURCE_DATE_EPOCH in my env as below:

Quoted 11 lines
$ cat /builda/yocto/builds/poky-build6-st/reproducibleA/tmp/work/cortexa57-poky-linux/netbase/1_6.1-r0/source-date-epoch/__source_date_epoch.txt 

1581895519

$ cat /build/yocto/builds/poky-build6-st/reproducibleB/tmp/work/cortexa57-poky-linux/netbase/1_6.1-r0/s-epoch/__source_date_epoch.txt 

1581895519

Quoted 3 lines
Quoted 3 lines

import time

time.ctime(1581895519)

'Sun Feb 16 23:25:19 2020'

That's to say, both reproducibleA and reproducibleB build in my env has the timestamp 2020-​02-​16·​23:​25:​19.​000000 with your reproducibleB build as https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200630-_jn1koza/packages/diff-html/ which you pasted.

Thanks,

Quoted 11 lines

Thanks,

Quoted 5 lines

Cheers,

Richard