| Message ID | 20231031084943.3105056-10-Quirin.Gylstorff@siemens.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | cleanup of customizations | expand |
On Tue, 2023-10-31 at 09:37 +0100, Quirin Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > This ensures that all images are build reproducible. > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > conf/layer.conf | 2 ++ > kas/opt/reproducible.yml | 1 - > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/conf/layer.conf b/conf/layer.conf > index 2c888b2..82b4084 100644 > --- a/conf/layer.conf > +++ b/conf/layer.conf > @@ -24,3 +24,5 @@ LAYERDIR_cip-core = "${LAYERDIR}" > LAYERDIR_cip-core[vardepvalue] = "isar-cip-core" > > IMAGE_CLASSES += "squashfs verity swupdate" > + > +SOURCE_DATE_EPOCH := "${@bb.process.run("git -C ${LAYERDIR_cip-core} This change needs to be reverted, as it is too invasive. The layer.conf is read after the local conf. By that, there is no way for a downstream user to set it to a different value. In fact, all downstream images now have a SDE based on the commit date of CIP. @Jan: please revert. Felix > log -1 --pretty=%ct | tr -d '\n'")[0]}" > diff --git a/kas/opt/reproducible.yml b/kas/opt/reproducible.yml > index 5d6a896..bc71f28 100644 > --- a/kas/opt/reproducible.yml > +++ b/kas/opt/reproducible.yml > @@ -13,5 +13,4 @@ header: > > local_conf_header: > reproducible-builds: | > - SOURCE_DATE_EPOCH := "${@bb.process.run("git -C ${LAYERDIR_cip- > core} log -1 --pretty=%ct | tr -d '\n'")[0]}" > WIC_DEPLOY_PARTITIONS = "1"
diff --git a/conf/layer.conf b/conf/layer.conf index 2c888b2..82b4084 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -24,3 +24,5 @@ LAYERDIR_cip-core = "${LAYERDIR}" LAYERDIR_cip-core[vardepvalue] = "isar-cip-core" IMAGE_CLASSES += "squashfs verity swupdate" + +SOURCE_DATE_EPOCH := "${@bb.process.run("git -C ${LAYERDIR_cip-core} log -1 --pretty=%ct | tr -d '\n'")[0]}" diff --git a/kas/opt/reproducible.yml b/kas/opt/reproducible.yml index 5d6a896..bc71f28 100644 --- a/kas/opt/reproducible.yml +++ b/kas/opt/reproducible.yml @@ -13,5 +13,4 @@ header: local_conf_header: reproducible-builds: | - SOURCE_DATE_EPOCH := "${@bb.process.run("git -C ${LAYERDIR_cip-core} log -1 --pretty=%ct | tr -d '\n'")[0]}" WIC_DEPLOY_PARTITIONS = "1"