update ISAR to latest version
PATCH 1/1 update ISAR to latest version
Update the isar to get the latest changes into cip-core. One of the changes is DEBIAN_PROVIDES, which is required to resolve the duplicate Provides problem in secure-boot-secrets to ensure that the build process completes successfully.
--- kas-cip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kas-cip.yml +1 -1
@@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - commit: 9dc362cd7115074c0f60843e687ed89db5c9339a + commit: 3327e66994e1a487eb1b609902c12f383faa3b3a layers: meta:
Signature · 1 line
2.39.2
Quoted 15 lines · Rakesh Kumar
Update the isar to get the latest changes into cip-core. One of the changes is
DEBIAN_PROVIDES, which is required to resolve the duplicate Provides problem in secure-boot-secrets to ensure that the build process completes successfully.Signed-off-by Rakesh Kumar <[email protected]>--- kas-cip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kas-cip.yml +0
-0
kas-cip.yml repos: · line 25
Quoted 5 lines
kas-cip.yml +1
-1@@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - commit: 9dc362cd7115074c0f60843e687ed89db5c9339a + commit: 3327e66994e1a487eb1b609902c12f383faa3b3a
This is current master. I suppose we could even include current next to have Felix' snapshot changes for reproducibility available as well.
Jan
Signature · 2 lines
Siemens AG, Technology Linux Expert Center
PATCH 1/1 update ISAR to latest version
One of the changes is DEBIAN_PROVIDES, which is required to resolve the duplicate Provides problem in secure-boot-secrets to ensure that the build process completes successfully.
--- kas-cip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kas-cip.yml +1 -1
@@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - commit: 9dc362cd7115074c0f60843e687ed89db5c9339a + commit: 55833bb33a04fc93eec1c325ee72c298b5bbb802 layers: meta:
Signature · 1 line
2.39.2
Jan Kiszka
AppliedQuoted 14 lines · Rakesh Kumar
One of the changes is
DEBIAN_PROVIDES, which is required to resolve the duplicate Provides problem in secure-boot-secrets to ensure that the build process completes successfully.Signed-off-by Rakesh Kumar <[email protected]>--- kas-cip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kas-cip.yml +0
-0
kas-cip.yml repos: · line 28
Quoted 8 lines
kas-cip.yml +1
-1@@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - commit: 9dc362cd7115074c0f60843e687ed89db5c9339a + commit: 55833bb33a04fc93eec1c325ee72c298b5bbb802 layers: meta:
I guess you meant "PATCH v2" ;)
Thanks, applied.
Jan
Signature · 2 lines
Siemens AG, Technology Linux Expert Center
Quoted 26 lines · Jan Kiszka
Quoted 14 lines · Rakesh Kumar
One of the changes is
DEBIAN_PROVIDES, which is required to resolve the duplicate Provides problem in secure-boot-secrets to ensure that the build process completes successfully.Signed-off-by Rakesh Kumar <[email protected]>--- kas-cip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kas-cip.yml +0
-0kas-cip.yml repos: · line 28
Quoted 8 lines
kas-cip.yml +1
-1@@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - commit: 9dc362cd7115074c0f60843e687ed89db5c9339a + commit: 55833bb33a04fc93eec1c325ee72c298b5bbb802 layers: meta:I guess you meant "PATCH v2" ;)
Quoted 2 lines
Thanks, applied.
Dropped again - we need to resolve the duplicate provides in lock-step with bumping the isar revision, or the build breaks in between. Please send a corresponding patch.
Jan
Signature · 2 lines
Siemens AG, Technology Linux Expert Center
PATCH v3 1/1 update ISAR to latest version
In reply to Jan KiszkaOne of the changes is DEBIAN_PROVIDES, which is required to resolve the duplicate Provides problem in secure-boot-secrets to ensure that the build process completes successfully.
--- kas-cip.yml | 2 +- recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc | 4 +--- .../swupdate-certificates/swupdate-certificates-key.inc | 4 +--- .../swupdate-certificates/swupdate-certificates.inc | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-)
kas-cip.yml +1 -1
@@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - commit: 9dc362cd7115074c0f60843e687ed89db5c9339a + commit: 36c711e4ed6d5ca3c8ab71ffb4a51e78615aa1f0 layers: meta:
recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc +1 -3
@@ -14,6 +14,7 @@ inherit dpkg-raw DPKG_ARCH = "all" DEBIAN_MULTI_ARCH = "foreign" PROVIDES += "secure-boot-secrets" +DEBIAN_PROVIDES = "${PROVIDES}" SB_KEY ??= "" SB_CERT ??= ""
@@ -31,6 +32,3 @@ do_install() { install -m 0700 ${WORKDIR}/${SB_CERT} ${TARGET}/secure-boot.pem } -do_prepare_build:append() { - echo "Provides: secure-boot-secrets" >> ${S}/debian/control -}
recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc +1 -3
@@ -15,6 +15,7 @@ FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" DPKG_ARCH = "all" PROVIDES += "swupdate-certificates-key" +DEBIAN_PROVIDES = "${PROVIDES}" SWU_SIGN_KEY ??= "" SWU_SIGN_SCRIPT ??= "sign-swu-cms"
@@ -35,6 +36,3 @@ do_install() { install -m 0600 ${WORKDIR}/${SWU_SIGN_KEY} ${TARGET}/swupdate-sign.key } -do_prepare_build:append() { - echo "Provides: swupdate-certificates-key" >> ${S}/debian/control -}
recipes-devtools/swupdate-certificates/swupdate-certificates.inc +1 -3
@@ -16,6 +16,7 @@ FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" DPKG_ARCH = "all" DEBIAN_MULTI_ARCH = "foreign" PROVIDES += "swupdate-certificates" +DEBIAN_PROVIDES = "${PROVIDES}" SWU_SIGN_CERT ??= ""
@@ -30,6 +31,3 @@ do_install() { install -m 0700 ${WORKDIR}/${SWU_SIGN_CERT} ${TARGET}/swupdate-sign.crt } -do_prepare_build:append() { - echo "Provides: swupdate-certificates" >> ${S}/debian/control -}
Signature · 1 line
2.39.2
Quoted 17 lines · Rakesh Kumar
One of the changes is
DEBIAN_PROVIDES, which is required to resolve the duplicate Provides problem in secure-boot-secrets to ensure that the build process completes successfully.Signed-off-by Rakesh Kumar <[email protected]>--- kas-cip.yml | 2 +- recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc | 4 +--- .../swupdate-certificates/swupdate-certificates-key.inc | 4 +--- .../swupdate-certificates/swupdate-certificates.inc | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-)kas-cip.yml +0
-0
kas-cip.yml repos: · line 25
Quoted 5 lines
kas-cip.yml +1
-1@@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - commit: 9dc362cd7115074c0f60843e687ed89db5c9339a + commit: 36c711e4ed6d5ca3c8ab71ffb4a51e78615aa1f0
This requires also SOURCE_DATE_EPOCHE-related changes:
| FATAL ERROR: SOURCE_DATE_EPOCH and command line options can't be used at the same time to set timestamp(s)
NOTE: recipe cip-core-image-1.0-r0: task do_image_squashfs: Failed
I suspect we can simply drop the source_epoch block from kas-cip.yml now. Felix?
recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc inherit dpkg-raw · line 17
Quoted 12 lines
kas-cip.yml +0
-0layers: meta:recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc +1
-0@@ -14,6 +14,7 @@ inherit dpkg-raw DPKG_ARCH = "all" DEBIAN_MULTI_ARCH = "foreign" PROVIDES += "secure-boot-secrets" +DEBIAN_PROVIDES = "${PROVIDES}"
This statement is not equivalent to the original code - and it is broken. PROVIDES also contains the -native variants that make no sense to Debian, and the separator would also be wrong. I missed this while reviewing but you should have found it while testing. Which configurations did you actually test?
Quoted 42 lines
recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc +0
-3SB_KEY ??= "" SB_CERT ??= ""@@ -31,6 +32,3 @@ do_install() { install -m 0700 ${WORKDIR}/${SB_CERT} ${TARGET}/secure-boot.pem } -do_prepare_build:append() { - echo "Provides: secure-boot-secrets" >> ${S}/debian/control -}recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc +1
-3@@ -15,6 +15,7 @@ FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" DPKG_ARCH = "all" PROVIDES += "swupdate-certificates-key" +DEBIAN_PROVIDES = "${PROVIDES}" SWU_SIGN_KEY ??= "" SWU_SIGN_SCRIPT ??= "sign-swu-cms"@@ -35,6 +36,3 @@ do_install() { install -m 0600 ${WORKDIR}/${SWU_SIGN_KEY} ${TARGET}/swupdate-sign.key } -do_prepare_build:append() { - echo "Provides: swupdate-certificates-key" >> ${S}/debian/control -}recipes-devtools/swupdate-certificates/swupdate-certificates.inc +1
-0@@ -16,6 +16,7 @@ FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" DPKG_ARCH = "all" DEBIAN_MULTI_ARCH = "foreign" PROVIDES += "swupdate-certificates" +DEBIAN_PROVIDES = "${PROVIDES}" SWU_SIGN_CERT ??= ""
recipes-devtools/swupdate-certificates/swupdate-certificates.inc do_install() { · line 35
Quoted 6 lines
recipes-devtools/swupdate-certificates/swupdate-certificates.inc +0
-3@@ -30,6 +31,3 @@ do_install() { install -m 0700 ${WORKDIR}/${SWU_SIGN_CERT} ${TARGET}/swupdate-sign.crt } -do_prepare_build:append() { - echo "Provides: swupdate-certificates" >> ${S}/debian/control -}
Jan
Signature · 2 lines
Siemens AG, Technology Linux Expert Center
Quoted 26 lines · Jan Kiszka
Quoted 17 lines · Rakesh Kumar
One of the changes is
DEBIAN_PROVIDES, which is required to resolve the duplicate Provides problem in secure-boot-secrets to ensure that the build process completes successfully.Signed-off-by Rakesh Kumar <[email protected]>--- kas-cip.yml | 2 +- recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc | 4 +--- .../swupdate-certificates/swupdate-certificates-key.inc | 4 +--- .../swupdate-certificates/swupdate-certificates.inc | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-)kas-cip.yml +0
-0kas-cip.yml repos: · line 25
Quoted 5 lines
kas-cip.yml +1
-1@@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - commit: 9dc362cd7115074c0f60843e687ed89db5c9339a + commit: 36c711e4ed6d5ca3c8ab71ffb4a51e78615aa1f0This requires also SOURCE_DATE_EPOCHE-related changes:
Quoted 6 lines
| FATAL ERROR:
SOURCE_DATE_EPOCHand command line options can't be used at the same time to set timestamp(s)
NOTE: recipe cip-core-image-1.0-r0: taskdo_image_squashfs: FailedI suspect we can simply drop the
source_epochblock from kas-cip.yml now. Felix?
That error above is from squashfs.bbclass. IIUC, we no longer need the command line options for reproducibility, thus:
classes/squashfs.bbclass +0 -6
@@ -31,12 +31,6 @@ SQUASHFS_MEMLIMIT ?= "${@int(get_free_mem() * 3/4)}" SQUASHFS_CREATION_LIMITS = "-mem ${SQUASHFS_MEMLIMIT} -processors ${SQUASHFS_THREADS}" python __anonymous() { - # Set file timestamps for reproducible builds - source_date_epoch = d.getVar('SOURCE_DATE_EPOCH') - if source_date_epoch: - args = " -fstime {time}".format(time=source_date_epoch) - d.appendVar('SQUASHFS_CREATION_ARGS', args) - exclude_directories = d.getVar('SQUASHFS_EXCLUDE_DIRS').split() if len(exclude_directories) == 0: return
Jan
Signature · 2 lines
Siemens AG, Technology Linux Expert Center
Quoted 31 lines · Jan Kiszka
Quoted 30 lines · Jan Kiszka
Quoted 21 lines · Rakesh Kumar
One of the changes is
DEBIAN_PROVIDES, which is required to resolve the duplicate Provides problem in secure-boot-secrets to ensure that the build process completes successfully.Signed-off-by Rakesh Kumar <[email protected]>---
kas-cip.yml | 2 +- recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc | 4 +--- .../swupdate-certificates/swupdate-certificates-key.inc | 4 +--- .../swupdate-certificates/swupdate-certificates.inc | 4 +---4 files changed, 4 insertions(+), 10 deletions(-)kas-cip.yml +0
-0@@ -22,7 +22,7 @@ repos:Quoted 5 lines
isar:
url: https://github.com/ilbers/isar.git
- commit:9dc362cd7115074c0f60843e687ed89db5c9339a+ commit:36c711e4ed6d5ca3c8ab71ffb4a51e78615aa1f0This requires also SOURCE_DATE_EPOCHE-related changes:
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines
FATAL ERROR:
SOURCE_DATE_EPOCHand command line options can't be used at the same time to set timestamp(s)NOTE: recipe cip-core-image-1.0-r0: task
do_image_squashfs: FailedI suspect we can simply drop the
source_epochblock from kas- cip.yml
now. Felix?
Hi, as described in the RECIPE-API-CHANGELOG, we better just rename that to SOURCE_DATE_EPOCH_FALLBACK. While we have good ways to (heuristically) compute the SDE for packages, we don't have this for the rootfs. That's why we need a proper fallback there.
To be frank, the whole reproducible story only makes sense when also building against a snapshot mirror. This now can easily be enabled by setting ISAR_USE_APT_SNAPSHOT="1". At least for the repro test we should do that.
Quoted 14 lines
Quoted 1 line
That error above is from squashfs.bbclass. IIUC, we no longer need the
command line options for reproducibility, thus:classes/squashfs.bbclass +0
-0@@ -31,12 +31,6 @@ SQUASHFS_MEMLIMIT ?= "${@int(get_free_mem() *3/4)}"
SQUASHFS_CREATION_LIMITS = "-mem ${SQUASHFS_MEMLIMIT} -processors ${SQUASHFS_THREADS}"
Quoted 8 lines
python__anonymous(){
- # Set file timestamps for reproducible builds
-source_date_epoch=d.getVar('SOURCE_DATE_EPOCH')- ifsource_date_epoch:
- args = " -fstime {time}".format(time=source_date_epoch) -d.appendVar('SQUASHFS_CREATION_ARGS', args)
-
Yes, this part can be removed.
Felix
Quoted 6 lines
exclude_directories= d.getVar('SQUASHFS_EXCLUDE_DIRS').split() iflen(exclude_directories)== 0:
returnJan
Signature · 2 lines
Siemens AG, Technology Linux Expert Center
Quoted 4 lines · Rakesh Kumar
One of the changes is
DEBIAN_PROVIDES, which is required to resolve the duplicate Provides problem in secure-boot-secrets to ensure that the build process completes successfully.
We will also have to wait for
https://patchwork.isar-build.org/project/isar/patch/[email protected]/
or carry this as isar patch.
Jan
Signature · 2 lines
Siemens AG, Technology Linux Expert Center
PATCH v3 1/1 update ISAR to latest version
From: [email protected]
Yes, I think we can wait for the mentioned patch.
https://patchwork.isar-build.org/project/isar/patch/[email protected]/
Regards,
Rakesh