From patchwork Fri Jul 7 14:15:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Pyla X-Patchwork-Id: 13304981 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FB72C001DF for ; Fri, 7 Jul 2023 14:16:10 +0000 (UTC) Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.158]) by mx.groups.io with SMTP id smtpd.web11.13565.1688739360968936443 for ; Fri, 07 Jul 2023 07:16:01 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: toshiba-tsip.com, ip: 210.130.202.158, mailfrom: venkata.pyla@toshiba-tsip.com) Received: by mo-csw.securemx.jp (mx-mo-csw1122) id 367EFvKj1368931; Fri, 7 Jul 2023 23:15:58 +0900 X-Iguazu-Qid: 2rWhQ1EpXpMK0x3Onh X-Iguazu-QSIG: v=2; s=0; t=1688739357; q=2rWhQ1EpXpMK0x3Onh; m=i8LC+jntaBN0K4OxxPTNJpBpgWQo5m/1/hDIhUy5mOA= Received: from imx2-a.toshiba.co.jp (imx2-a.toshiba.co.jp [106.186.93.35]) by relay.securemx.jp (mx-mr1121) id 367EFuUT1303710 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 7 Jul 2023 23:15:57 +0900 From: venkata.pyla@toshiba-tsip.com To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Cc: venkata pyla , dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp Subject: [isar-cip-core v3 1/8] .reproducible-check-ci.yml: Include swupdate artifacts in reproducible check Date: Fri, 7 Jul 2023 19:45:43 +0530 X-TSB-HOP2: ON Message-Id: <20230707141550.27805-2-venkata.pyla@toshiba-tsip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <176E5CF032D87010.7887@lists.cip-project.org> References: <176E5CF032D87010.7887@lists.cip-project.org> MIME-Version: 1.0 X-OriginalArrivalTime: 07 Jul 2023 14:15:54.0230 (UTC) FILETIME=[8A83E160:01D9B0DD] List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Jul 2023 14:16:10 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/12265 From: venkata pyla Till now minimal images are verified against the reproducible build checks, now extend the verification to swupdate feature. Signed-off-by: venkata pyla --- .reproducible-check-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.reproducible-check-ci.yml b/.reproducible-check-ci.yml index d8bfb40..f4250ce 100644 --- a/.reproducible-check-ci.yml +++ b/.reproducible-check-ci.yml @@ -69,18 +69,24 @@ build:qemu-amd64-base-repro-build: - .repro-build variables: target: qemu-amd64 + extension: ebg-swu + wic_targz: enable build:qemu-arm64-base-repro-build: extends: - .repro-build variables: target: qemu-arm64 + extension: ebg-swu + wic_targz: enable build:qemu-arm-base-repro-build: extends: - .repro-build variables: target: qemu-arm + extension: ebg-swu + wic_targz: enable # repro build test test:qemu-amd64-base-repro-test: From patchwork Fri Jul 7 14:15:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Pyla X-Patchwork-Id: 13304983 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41BF4C001E0 for ; Fri, 7 Jul 2023 14:16:10 +0000 (UTC) Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.132]) by mx.groups.io with SMTP id smtpd.web11.13567.1688739361717570349 for ; Fri, 07 Jul 2023 07:16:01 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: toshiba-tsip.com, ip: 210.130.202.132, mailfrom: venkata.pyla@toshiba-tsip.com) Received: by mo-csw.securemx.jp (mx-mo-csw1121) id 367EG0Yb1354922; Fri, 7 Jul 2023 23:16:00 +0900 X-Iguazu-Qid: 2rWhJyZQYC149c8XjN X-Iguazu-QSIG: v=2; s=0; t=1688739359; q=2rWhJyZQYC149c8XjN; m=E3pTSjC4sRYum0CDC21WLH6YlxY5OP17mnQg7meDVh0= Received: from imx12-a.toshiba.co.jp ([38.106.60.135]) by relay.securemx.jp (mx-mr1122) id 367EFuog1298407 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 7 Jul 2023 23:15:59 +0900 From: venkata.pyla@toshiba-tsip.com To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Cc: venkata pyla , dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp Subject: [isar-cip-core v3 2/8] .reproducible-check-ci.yml: Drop 'base' in job names Date: Fri, 7 Jul 2023 19:45:44 +0530 X-TSB-HOP2: ON Message-Id: <20230707141550.27805-3-venkata.pyla@toshiba-tsip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <176E5CF032D87010.7887@lists.cip-project.org> References: <176E5CF032D87010.7887@lists.cip-project.org> MIME-Version: 1.0 X-OriginalArrivalTime: 07 Jul 2023 14:15:54.0230 (UTC) FILETIME=[8A83E160:01D9B0DD] List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Jul 2023 14:16:10 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/12268 From: venkata pyla Now the reproducible check is not restricted to minimal(base) image but also it include other features like swupdate, secureboot, and security extensions, so drop the name 'base' in the job names to avoid confusion. Signed-off-by: venkata pyla --- .reproducible-check-ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.reproducible-check-ci.yml b/.reproducible-check-ci.yml index f4250ce..a9e3996 100644 --- a/.reproducible-check-ci.yml +++ b/.reproducible-check-ci.yml @@ -64,7 +64,7 @@ # repro build -build:qemu-amd64-base-repro-build: +build:qemu-amd64-repro-build: extends: - .repro-build variables: @@ -72,7 +72,7 @@ build:qemu-amd64-base-repro-build: extension: ebg-swu wic_targz: enable -build:qemu-arm64-base-repro-build: +build:qemu-arm64-repro-build: extends: - .repro-build variables: @@ -80,7 +80,7 @@ build:qemu-arm64-base-repro-build: extension: ebg-swu wic_targz: enable -build:qemu-arm-base-repro-build: +build:qemu-arm-repro-build: extends: - .repro-build variables: @@ -89,26 +89,26 @@ build:qemu-arm-base-repro-build: wic_targz: enable # repro build test -test:qemu-amd64-base-repro-test: +test:qemu-amd64-repro-test: extends: - .repro-test variables: target: qemu-amd64 dependencies: - - build:qemu-amd64-base-repro-build + - build:qemu-amd64-repro-build -test:qemu-arm64-base-repro-test: +test:qemu-arm64-repro-test: extends: - .repro-test variables: target: qemu-arm64 dependencies: - - build:qemu-arm64-base-repro-build + - build:qemu-arm64-repro-build -test:qemu-arm-base-repro-test: +test:qemu-arm-repro-test: extends: - .repro-test variables: target: qemu-arm dependencies: - - build:qemu-arm-base-repro-build + - build:qemu-arm-repro-build From patchwork Fri Jul 7 14:15:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Pyla X-Patchwork-Id: 13304985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58F24C04A6A for ; Fri, 7 Jul 2023 14:16:10 +0000 (UTC) Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.158]) by mx.groups.io with SMTP id smtpd.web11.13566.1688739361013637516 for ; Fri, 07 Jul 2023 07:16:01 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: toshiba-tsip.com, ip: 210.130.202.158, mailfrom: venkata.pyla@toshiba-tsip.com) Received: by mo-csw.securemx.jp (mx-mo-csw1122) id 367EFxJT1368958; Fri, 7 Jul 2023 23:15:59 +0900 X-Iguazu-Qid: 2rWhDvohsKQ5nijhmy X-Iguazu-QSIG: v=2; s=0; t=1688739358; q=2rWhDvohsKQ5nijhmy; m=sWqtZ0O8Y9SmFxzS7rbJOkgukWjgGbf84vm6VJCEqq0= Received: from imx2-a.toshiba.co.jp (imx2-a.toshiba.co.jp [106.186.93.35]) by relay.securemx.jp (mx-mr1120) id 367EFv6b1727332 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 7 Jul 2023 23:15:58 +0900 From: venkata.pyla@toshiba-tsip.com To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Cc: venkata pyla , dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp Subject: [isar-cip-core v3 3/8] .reproducible-check-ci.yml: Include only files required for RB check Date: Fri, 7 Jul 2023 19:45:45 +0530 X-TSB-HOP2: ON Message-Id: <20230707141550.27805-4-venkata.pyla@toshiba-tsip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <176E5CF032D87010.7887@lists.cip-project.org> References: <176E5CF032D87010.7887@lists.cip-project.org> MIME-Version: 1.0 X-OriginalArrivalTime: 07 Jul 2023 14:15:54.0387 (UTC) FILETIME=[8A9BD630:01D9B0DD] List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Jul 2023 14:16:10 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/12266 From: venkata pyla artifacts folder contains many other files like dpkg_status, manifest, etc, which are not verified in reproducible check, so include only the files are used in reproducible check. Signed-off-by: venkata pyla --- .reproducible-check-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.reproducible-check-ci.yml b/.reproducible-check-ci.yml index a9e3996..079b53d 100644 --- a/.reproducible-check-ci.yml +++ b/.reproducible-check-ci.yml @@ -39,8 +39,12 @@ expire_in: 1 day paths: - scripts/repro-tests.sh - - image1 - - image2 + - image*/*initrd.img + - image*/*-vmlinu* + - image*/*.tar.gz + - image*/*.squashfs + - image*/*.swu + - image*/linux.efi .repro-test: image: From patchwork Fri Jul 7 14:15:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Pyla X-Patchwork-Id: 13304982 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CF0DC001DE for ; Fri, 7 Jul 2023 14:16:10 +0000 (UTC) Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.158]) by mx.groups.io with SMTP id smtpd.web10.13305.1688739361772338442 for ; Fri, 07 Jul 2023 07:16:02 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: toshiba-tsip.com, ip: 210.130.202.158, mailfrom: venkata.pyla@toshiba-tsip.com) Received: by mo-csw.securemx.jp (mx-mo-csw1122) id 367EFxr31368970; Fri, 7 Jul 2023 23:16:00 +0900 X-Iguazu-Qid: 2rWhi9UHc3a4xkG6KG X-Iguazu-QSIG: v=2; s=0; t=1688739359; q=2rWhi9UHc3a4xkG6KG; m=KaDWAZD8gMdpFHnJw5/dUy5qSKtgeUEJ44K/PjscXls= Received: from imx12-a.toshiba.co.jp ([38.106.60.135]) by relay.securemx.jp (mx-mr1120) id 367EFwvn1727333 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 7 Jul 2023 23:15:59 +0900 From: venkata.pyla@toshiba-tsip.com To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Cc: venkata pyla , dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp Subject: [isar-cip-core v3 4/8] repro-tests.sh: Enable html output in diffoscope Date: Fri, 7 Jul 2023 19:45:46 +0530 X-TSB-HOP2: ON Message-Id: <20230707141550.27805-5-venkata.pyla@toshiba-tsip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <176E5CF032D87010.7887@lists.cip-project.org> References: <176E5CF032D87010.7887@lists.cip-project.org> MIME-Version: 1.0 X-OriginalArrivalTime: 07 Jul 2023 14:15:54.0465 (UTC) FILETIME=[8AA7BD10:01D9B0DD] List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Jul 2023 14:16:10 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/12269 From: venkata pyla diffoscope generates output in html format that will be helpful to easily view the non-reproducible differences in the browser. Signed-off-by: venkata pyla --- .reproducible-check-ci.yml | 3 ++- scripts/repro-tests.sh | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.reproducible-check-ci.yml b/.reproducible-check-ci.yml index 079b53d..4d38e0a 100644 --- a/.reproducible-check-ci.yml +++ b/.reproducible-check-ci.yml @@ -64,7 +64,8 @@ when: always expire_in: 1 day paths: - - "./*diffoscope_output.txt" + - "diffoscope_output" + - "./*diffoscope_output.*" # repro build diff --git a/scripts/repro-tests.sh b/scripts/repro-tests.sh index b37c15e..94de950 100755 --- a/scripts/repro-tests.sh +++ b/scripts/repro-tests.sh @@ -78,6 +78,8 @@ res=0 for file in "$@"; do if [ -f "${artifacts1}/${file}" ] && [ -f "${artifacts1}/${file}" ]; then if $DIFFOSCOPE --text "${file}.diffoscope_output.txt" \ + --html-dir diffoscope_output \ + --html "${file}.diffoscope_output.html" \ "${artifacts1}/${file}" \ "${artifacts2}/${file}" > /dev/null 2>&1; then echo "${file}: ${GREEN}Reproducible${NC}" | tee -a diffoscope_output.txt From patchwork Fri Jul 7 14:15:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Pyla X-Patchwork-Id: 13304984 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58F76C04E69 for ; Fri, 7 Jul 2023 14:16:10 +0000 (UTC) Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.132]) by mx.groups.io with SMTP id smtpd.web10.13304.1688739361454230637 for ; Fri, 07 Jul 2023 07:16:01 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: toshiba-tsip.com, ip: 210.130.202.132, mailfrom: venkata.pyla@toshiba-tsip.com) Received: by mo-csw.securemx.jp (mx-mo-csw1121) id 367EG0Qd1354923; Fri, 7 Jul 2023 23:16:00 +0900 X-Iguazu-Qid: 2rWhc6jYwBz6gXWVZx X-Iguazu-QSIG: v=2; s=0; t=1688739359; q=2rWhc6jYwBz6gXWVZx; m=bDZMK8NKGIc1alMYe2/+c5nz94ppiejuxxahUmgtwsI= Received: from imx2-a.toshiba.co.jp (imx2-a.toshiba.co.jp [106.186.93.35]) by relay.securemx.jp (mx-mr1122) id 367EFwnS1298415 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 7 Jul 2023 23:15:59 +0900 From: venkata.pyla@toshiba-tsip.com To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Cc: venkata pyla , dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp Subject: [isar-cip-core v3 5/8] squashfs.bbclass: Fix file timestamps are not reproducible in squashfs image Date: Fri, 7 Jul 2023 19:45:47 +0530 X-TSB-HOP2: ON Message-Id: <20230707141550.27805-6-venkata.pyla@toshiba-tsip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <176E5CF032D87010.7887@lists.cip-project.org> References: <176E5CF032D87010.7887@lists.cip-project.org> MIME-Version: 1.0 X-OriginalArrivalTime: 07 Jul 2023 14:15:54.0558 (UTC) FILETIME=[8AB5EDE0:01D9B0DD] List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Jul 2023 14:16:10 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/12267 From: venkata pyla The generated squashfs image contains non-reproducible file timestamps, so set with value in SOURCE_DATE_EPOCH variable if it is set. Closes: #68 Signed-off-by: venkata pyla --- classes/squashfs.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/classes/squashfs.bbclass b/classes/squashfs.bbclass index b39be0c..bf72133 100644 --- a/classes/squashfs.bbclass +++ b/classes/squashfs.bbclass @@ -31,6 +31,12 @@ 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 From patchwork Fri Jul 7 14:15:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Pyla X-Patchwork-Id: 13304980 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DAA4C00528 for ; Fri, 7 Jul 2023 14:16:10 +0000 (UTC) Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.158]) by mx.groups.io with SMTP id smtpd.web11.13569.1688739362404946411 for ; Fri, 07 Jul 2023 07:16:02 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: toshiba-tsip.com, ip: 210.130.202.158, mailfrom: venkata.pyla@toshiba-tsip.com) Received: by mo-csw.securemx.jp (mx-mo-csw1122) id 367EG0sk1368985; Fri, 7 Jul 2023 23:16:00 +0900 X-Iguazu-Qid: 2rWhW3wiOEgeNQSSi8 X-Iguazu-QSIG: v=2; s=0; t=1688739360; q=2rWhW3wiOEgeNQSSi8; m=ccmTjAMKYR0S8GghYcEBdpySsuAKBOrvIuWWiJ9RCJA= Received: from imx12-a.toshiba.co.jp ([38.106.60.135]) by relay.securemx.jp (mx-mr1120) id 367EFxtb1727345 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 7 Jul 2023 23:16:00 +0900 From: venkata.pyla@toshiba-tsip.com To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Cc: venkata pyla , dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp Subject: [isar-cip-core v3 6/8] swupdate.bbclass: Fix file timestamps are not reproducible in swu file Date: Fri, 7 Jul 2023 19:45:48 +0530 X-TSB-HOP2: ON Message-Id: <20230707141550.27805-7-venkata.pyla@toshiba-tsip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <176E5CF032D87010.7887@lists.cip-project.org> References: <176E5CF032D87010.7887@lists.cip-project.org> MIME-Version: 1.0 X-OriginalArrivalTime: 07 Jul 2023 14:15:54.0558 (UTC) FILETIME=[8AB5EDE0:01D9B0DD] List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Jul 2023 14:16:10 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/12270 From: venkata pyla The generated .swu file is not reproducible due to its file contents are copied with its build time stamps, so set all file timestamps to SOURCE_DATE_EPOCH value if it is set. Closes #69 Signed-off-by: venkata pyla --- classes/swupdate.bbclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass index ac59c00..3d2b5f0 100644 --- a/classes/swupdate.bbclass +++ b/classes/swupdate.bbclass @@ -115,6 +115,10 @@ IMAGE_CMD:swu() { done cd "${PP_WORK}/swu" for file in "${SWU_DESCRIPTION_FILE}" ${SWU_ADDITIONAL_FILES}; do + # Set file timestamps for reproducible builds + if [ -n "${SOURCE_DATE_EPOCH}" ]; then + touch -d@"${SOURCE_DATE_EPOCH}" "$file" + fi echo "$file" if [ -n "$sign" -a "${SWU_DESCRIPTION_FILE}" = "$file" ]; then if [ "${SWU_SIGNATURE_TYPE}" = "rsa" ]; then @@ -129,9 +133,13 @@ IMAGE_CMD:swu() { -inkey "${PP_WORK}/dev.key" \ -outform DER -nosmimecap -binary fi + # Set file timestamps for reproducible builds + if [ -n "${SOURCE_DATE_EPOCH}" ]; then + touch -d@"${SOURCE_DATE_EPOCH}" "$file.${SWU_SIGNATURE_EXT}" + fi echo "$file.${SWU_SIGNATURE_EXT}" fi - done | cpio -ovL -H crc > "${SWU_BUILDCHROOT_IMAGE_FILE}"' + done | cpio -ovL --reproducible -H crc > "${SWU_BUILDCHROOT_IMAGE_FILE}"' } python do_check_swu_partition_uuids() { From patchwork Fri Jul 7 14:15:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Pyla X-Patchwork-Id: 13304979 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DFD8C001B0 for ; Fri, 7 Jul 2023 14:16:10 +0000 (UTC) Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.131]) by mx.groups.io with SMTP id smtpd.web10.13308.1688739362882775709 for ; Fri, 07 Jul 2023 07:16:03 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: toshiba-tsip.com, ip: 210.130.202.131, mailfrom: venkata.pyla@toshiba-tsip.com) Received: by mo-csw.securemx.jp (mx-mo-csw1120) id 367EG1PU1360928; Fri, 7 Jul 2023 23:16:01 +0900 X-Iguazu-Qid: 2rWhoCDaNC2jJvf3Fg X-Iguazu-QSIG: v=2; s=0; t=1688739361; q=2rWhoCDaNC2jJvf3Fg; m=wARAyfGPHoSvfQNckTFSTNkKyYRCNs4P6BcJXkxbfho= Received: from imx12-a.toshiba.co.jp ([38.106.60.135]) by relay.securemx.jp (mx-mr1121) id 367EG0Kt1303739 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 7 Jul 2023 23:16:01 +0900 From: venkata.pyla@toshiba-tsip.com To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Cc: venkata pyla , dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp Subject: [isar-cip-core v3 7/8] .reproducible-check-ci.yml: Enable reproudicble check on bookworm Date: Fri, 7 Jul 2023 19:45:49 +0530 X-TSB-HOP2: ON Message-Id: <20230707141550.27805-8-venkata.pyla@toshiba-tsip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <176E5CF032D87010.7887@lists.cip-project.org> References: <176E5CF032D87010.7887@lists.cip-project.org> MIME-Version: 1.0 X-OriginalArrivalTime: 07 Jul 2023 14:15:54.0652 (UTC) FILETIME=[8AC445C0:01D9B0DD] List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Jul 2023 14:16:10 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/12271 From: venkata pyla Generating squashfs image reproducibly is enabled from bookworm version. Signed-off-by: venkata pyla --- .reproducible-check-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.reproducible-check-ci.yml b/.reproducible-check-ci.yml index 4d38e0a..6782eea 100644 --- a/.reproducible-check-ci.yml +++ b/.reproducible-check-ci.yml @@ -19,6 +19,7 @@ deploy_kernelci: disable artifact_suffix: ".tar.gz" base_yaml: "kas-cip.yml:kas/board/${target}.yml" + release: bookworm stage: build tags: - large @@ -56,6 +57,7 @@ - schedules variables: GIT_STRATEGY: none + release: bookworm before_script: - apt update && DEBIAN_FRONTEND=noninteractive apt install -y diffoscope script: From patchwork Fri Jul 7 14:15:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Pyla X-Patchwork-Id: 13304978 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C59FEB64DA for ; Fri, 7 Jul 2023 14:16:10 +0000 (UTC) Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.158]) by mx.groups.io with SMTP id smtpd.web11.13572.1688739364379396865 for ; Fri, 07 Jul 2023 07:16:04 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: toshiba-tsip.com, ip: 210.130.202.158, mailfrom: venkata.pyla@toshiba-tsip.com) Received: by mo-csw.securemx.jp (mx-mo-csw1122) id 367EG3gA1369033; Fri, 7 Jul 2023 23:16:03 +0900 X-Iguazu-Qid: 2rWhuF4KgeSZyVshaV X-Iguazu-QSIG: v=2; s=0; t=1688739362; q=2rWhuF4KgeSZyVshaV; m=x7OR3ZD9mSxdg9W5ASz+Ku53wpGAn7hWhiG5OXKnfq0= Received: from imx2-a.toshiba.co.jp (imx2-a.toshiba.co.jp [106.186.93.35]) by relay.securemx.jp (mx-mr1120) id 367EG1mE1727357 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 7 Jul 2023 23:16:02 +0900 From: venkata.pyla@toshiba-tsip.com To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Cc: venkata pyla , dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp Subject: [isar-cip-core v3 8/8] kas-cip.yml: Update isar reference Date: Fri, 7 Jul 2023 19:45:50 +0530 X-TSB-HOP2: ON Message-Id: <20230707141550.27805-9-venkata.pyla@toshiba-tsip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <176E5CF032D87010.7887@lists.cip-project.org> References: <176E5CF032D87010.7887@lists.cip-project.org> MIME-Version: 1.0 X-OriginalArrivalTime: 07 Jul 2023 14:15:54.0730 (UTC) FILETIME=[8AD02CA0:01D9B0DD] List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Jul 2023 14:16:10 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/12272 From: venkata pyla It brings the fix for arm linux files are not build reproducibly Signed-off-by: venkata pyla --- kas-cip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kas-cip.yml b/kas-cip.yml index b6a3ded..ffaf04a 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - refspec: f95f69d3b83cc28976ef81eeefb5ec5dd17e544f + refspec: 478f3c324f50eca0d082cd1c8f23ef50e28071fb layers: meta: