From f679fbd359c584cf5da52724ff7884605520c8ef Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Thu, 25 Aug 2022 15:00:51 +0300 Subject: u-boot-libre: Fix reproducability issue due to timezone The checksums in tests/u-boot-libre.sha512 do not match the tarballs generated by this script when ran on a different timezone, e.g. UTC+3. Explicitly specify a timezone for the tar command that makes the tarballs match the checksums. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/release/u-boot-libre | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'resources/scripts/build/release') diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre index a871aab7..dc4f0c68 100755 --- a/resources/scripts/build/release/u-boot-libre +++ b/resources/scripts/build/release/u-boot-libre @@ -5,6 +5,7 @@ # # Copyright (C) 2020,2021 Leah Rowe # Copyright (C) 2022 Denis 'GNUtoo' Carikli +# Copyright (C) 2022 Alper Nebi Yasak # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -112,7 +113,7 @@ release_deblobbed_uboot() --format=gnu \ --sort=name \ --owner=0 --group=0 --numeric-owner \ - --mtime="1970-01-01" \ + --mtime="1970-01-01 UTC+01:00" \ lzip -9 --keep -vv "${tarball}" xz -9 --keep -vv "${tarball}" -- cgit v1.2.1 From 89a4c2c61f00034ee031b62811c8a8cf4ba009b9 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Wed, 27 Jul 2022 18:35:02 +0200 Subject: u-boot-libre: remove nonfree firmware in drivers/dma/MCD_tasks.c This firmware lack corresponding source code. Signed-off-by: Denis 'GNUtoo' Carikli --- resources/scripts/build/release/u-boot-libre | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources/scripts/build/release') diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre index dc4f0c68..6f724178 100755 --- a/resources/scripts/build/release/u-boot-libre +++ b/resources/scripts/build/release/u-boot-libre @@ -24,7 +24,7 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e -revision="r1" +revision="r2" supported_uboot_versions=" \ 2021.07 \ -- cgit v1.2.1 From 01f61263f8933caa26a8f8e44900fb0f00fb5164 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Thu, 25 Aug 2022 19:21:12 +0300 Subject: u-boot-libre: Fix releasing blob list as deblob script The u-boot-libre release script copies the blobs list into the release as the deblob script, presumably due to a copy-paste error. Fix it to correctly copy the generated deblob script. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/release/u-boot-libre | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources/scripts/build/release') diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre index 6f724178..63940dc2 100755 --- a/resources/scripts/build/release/u-boot-libre +++ b/resources/scripts/build/release/u-boot-libre @@ -171,7 +171,7 @@ release_uboot_deblob_script() "${destination}.xz" install -m 755 -d "${release_version_dir}" - install -m 644 -T "${blobs_list}" "${destination}" + install -m 644 -T "${deblob_script}" "${destination}" lzip -9 --keep -vv "${destination}" xz -9 --keep -vv "${destination}" -- cgit v1.2.1 From 22b1db6980a7398dbd257265891944ecd4a4c8da Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Thu, 25 Aug 2022 21:38:05 +0300 Subject: u-boot-libre: Set tar mtime to SOURCE_DATE_EPOCH or @0 The u-boot-libre tarball contents' mtimes are an unconventional value due to timezone confusion. For reproducibility, timestamps like these are usually set by a SOURCE_DATE_EPOCH which is respected by both coreboot and U-Boot. Use it in the u-boot-libre release script as well, and properly set the mtimes to the Unix epoch when it's not defined. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/release/u-boot-libre | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources/scripts/build/release') diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre index 63940dc2..3a6aaca6 100755 --- a/resources/scripts/build/release/u-boot-libre +++ b/resources/scripts/build/release/u-boot-libre @@ -113,7 +113,7 @@ release_deblobbed_uboot() --format=gnu \ --sort=name \ --owner=0 --group=0 --numeric-owner \ - --mtime="1970-01-01 UTC+01:00" \ + --mtime="@${SOURCE_DATE_EPOCH:-0}" \ lzip -9 --keep -vv "${tarball}" xz -9 --keep -vv "${tarball}" -- cgit v1.2.1 From 8dd1a24504ac438e9a8a0826b531976d9bc72067 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Thu, 25 Aug 2022 18:33:23 +0300 Subject: download/u-boot: Prepare files per board instead of per revision The U-Boot download script is designed to help with releasing u-boot-libre and it can only prepare a generic U-Boot v2021.07 tree. However, we will need to build board-specific versions of U-Boot to be able to use it as a coreboot payload effectively. As a first step toward that, make the download script prepare per-board copies of U-Boot v2021.07. Then, add a 'v2021.07' pseudo-board for the u-boot-libre release script to work on. The u-boot-libre deblob script hash ends up chaning due to copying my author attribution from the download script, update its hash. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/release/u-boot-libre | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources/scripts/build/release') diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre index 3a6aaca6..39767bc5 100755 --- a/resources/scripts/build/release/u-boot-libre +++ b/resources/scripts/build/release/u-boot-libre @@ -102,7 +102,7 @@ release_deblobbed_uboot() "${tarball}.xz" mkdir -p "$(dirname ${tmpdir})" - cp -R "u-boot/u-boot/" "${tmpdir}" + cp -R "u-boot/v${version}/" "${tmpdir}" rm -rf ${tmpdir}/.git ${tmpdir}/.gitignore make -C ${tmpdir} distclean -- cgit v1.2.1 From 764a439a8cbad7d55455494f025f3e77c9fa52c0 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Thu, 25 Aug 2022 21:59:16 +0300 Subject: u-boot-libre: Add support for deblobbing U-Boot v2022.07 Add a 'v2022.07' pseudo-board for the U-Boot download script with the default blobs list, and mark the version as supported in u-boot-libre release script. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/release/u-boot-libre | 1 + 1 file changed, 1 insertion(+) (limited to 'resources/scripts/build/release') diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre index 39767bc5..8e0ce17c 100755 --- a/resources/scripts/build/release/u-boot-libre +++ b/resources/scripts/build/release/u-boot-libre @@ -28,6 +28,7 @@ revision="r2" supported_uboot_versions=" \ 2021.07 \ + 2022.07 \ " topdir="$(realpath $(dirname $(realpath $0))/../../../../)" -- cgit v1.2.1