Skip to contentSkip to conversation

poky.conf: do not write current date into distro version

PATCH In review Alexander Kanavin 2 participants 3 messages Dec 3, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 poky.conf: do not write current date into distro version

This leaks into target installs of items like os-release, and makes them non-reproducible.

---
 meta-poky/conf/distro/poky.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-poky/conf/distro/poky.conf +1 -1
index 31dc110bf6..20e258714a 100644
@@ -1,6 +1,6 @@
 DISTRO = "poky"
 DISTRO_NAME = "Poky (Yocto Project Reference Distro)"
-DISTRO_VERSION = "3.2+snapshot-${DATE}"
+DISTRO_VERSION = "3.2+snapshot${@oe.utils.ifelse(d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1', '', '-${DATE}')}"
 DISTRO_CODENAME = "master"
 SDK_VENDOR = "-pokysdk"
 SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}"
Signature · 1 line
2.29.2
#1 lore raw
Quoted 13 lines · Alexander Kanavin

This leaks into target installs of items like os-release, and makes them non-reproducible.

---
 meta-poky/conf/distro/poky.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-poky/conf/distro/poky.conf +0 -0
index 31dc110bf6..20e258714a 100644

meta-poky/conf/distro/poky.conf line 6

Quoted 7 lines
meta-poky/conf/distro/poky.conf +1 -1
@@ -1,6 +1,6 @@
 DISTRO = "poky"
 DISTRO_NAME = "Poky (Yocto Project Reference Distro)"
-DISTRO_VERSION = "3.2+snapshot-${DATE}"
+DISTRO_VERSION = "3.2+snapshot${@oe.utils.ifelse(d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1', '', '-${DATE}')}"
 DISTRO_CODENAME = "master"
 SDK_VENDOR = "-pokysdk"
 SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}"

Perhaps we should replace this with the current poky git hash?

Cheers,

Richard

#2 lore raw
Quoted 21 lines · Richard Purdie

Review

Quoted 9 lines · Alexander Kanavin

This leaks into target installs of items like os-release, and makes them non-reproducible.

---
 meta-poky/conf/distro/poky.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/meta-poky/conf/distro/poky.conf

meta-poky/conf/distro/poky.conf line 3

Quoted 8 lines

index 31dc110bf6..20e258714a 100644

meta-poky/conf/distro/poky.conf +1 -1
@@ -1,6 +1,6 @@
 DISTRO = "poky"
 DISTRO_NAME = "Poky (Yocto Project Reference Distro)"
-DISTRO_VERSION = "3.2+snapshot-${DATE}"
+DISTRO_VERSION =

"3.2+snapshot${@oe.utils.ifelse(d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1', '', '-${DATE}')}"

Quoted 7 lines

meta-poky/conf/distro/poky.conf

Quoted 3 lines
meta-poky/conf/distro/poky.conf +0 -0
 DISTRO_CODENAME = "master"
 SDK_VENDOR = "-pokysdk"
 SDK_VERSION =

"${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}"

Perhaps we should replace this with the current poky git hash?

Sure, I sent an adjusted patch now.

Alex