summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2026-02-17 15:36:38 +0100
committerAndreas Enge <andreas@enge.fr>2026-02-17 16:52:31 +0100
commitc56a48a317ff79946a3036034f288d73357d10fa (patch)
tree8e3e4adb51548c1d0b370ff17eb1f26282b39e8a /gnu/packages
parent51af666373542f0d55ff515b1243258c9b4f018f (diff)
gnu: Remove vboot-utils.
* gnu/packages/bootloaders.scm (vboot-utils): Delete variable. * gnu/packages/patches/vboot-utils-fix-format-load-address.patch, gnu/packages/patches/vboot-utils-fix-tests-show-contents.patch, gnu/packages/patches/vboot-utils-skip-test-workbuf.patch: Remove files. * gnu/local.mk (dist_patch_DATA): Unregister files. Fixes: guix/guix#5667 Change-Id: If37bea70477f5a03e4c5c05f5e151d3bbef6ecbe
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/bootloaders.scm89
-rw-r--r--gnu/packages/patches/vboot-utils-fix-format-load-address.patch33
-rw-r--r--gnu/packages/patches/vboot-utils-fix-tests-show-contents.patch142
-rw-r--r--gnu/packages/patches/vboot-utils-skip-test-workbuf.patch21
4 files changed, 0 insertions, 285 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 1d3e73326bf..17527c4dfb2 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1801,95 +1801,6 @@ For more information, refer to
1801 (("DEFAULT_FDT_FILE") 1801 (("DEFAULT_FDT_FILE")
1802 "imx6q-ts7970.dtb"))))))))))) 1802 "imx6q-ts7970.dtb")))))))))))
1803 1803
1804(define-public vboot-utils
1805 (package
1806 (name "vboot-utils")
1807 (version "R63-10032.B")
1808 (source (origin
1809 ;; XXX: Snapshots are available but changes timestamps every download.
1810 (method git-fetch)
1811 (uri (git-reference
1812 (url (string-append "https://chromium.googlesource.com"
1813 "/chromiumos/platform/vboot_reference"))
1814 (commit (string-append "release-" version))))
1815 (file-name (string-append name "-" version "-checkout"))
1816 (sha256
1817 (base32
1818 "0h0m3l69vp9dr6xrs1p6y7ilkq3jq8jraw2z20kqfv7lvc9l1lxj"))
1819 (patches
1820 (search-patches "vboot-utils-skip-test-workbuf.patch"
1821 "vboot-utils-fix-tests-show-contents.patch"
1822 "vboot-utils-fix-format-load-address.patch"))))
1823 (build-system gnu-build-system)
1824 (arguments
1825 `(#:make-flags (list "CC=gcc"
1826 ;; On ARM, we must pass "HOST_ARCH=arm" so that the
1827 ;; ${HOST_ARCH} and ${ARCH} variables in the makefile
1828 ;; match. Otherwise, ${HOST_ARCH} will be assigned
1829 ;; "armv7l", the value of `uname -m`, and will not
1830 ;; match ${ARCH}, which will make the tests require
1831 ;; QEMU for testing.
1832 ,@(if (string-prefix? "arm"
1833 (or (%current-target-system)
1834 (%current-system)))
1835 '("HOST_ARCH=arm")
1836 '())
1837 (string-append "DESTDIR=" (assoc-ref %outputs "out")))
1838 #:phases (modify-phases %standard-phases
1839 (add-after 'unpack 'patch-hard-coded-paths
1840 (lambda* (#:key inputs outputs #:allow-other-keys)
1841 (let ((coreutils (assoc-ref inputs "coreutils"))
1842 (diffutils (assoc-ref inputs "diffutils")))
1843 (substitute* "futility/misc.c"
1844 (("/bin/cp") (string-append coreutils "/bin/cp")))
1845 (substitute* "tests/bitmaps/TestBmpBlock.py"
1846 (("/usr/bin/cmp") (string-append diffutils "/bin/cmp")))
1847 (substitute* "vboot_host.pc.in"
1848 (("prefix=/usr")
1849 (string-append "prefix=" (assoc-ref outputs "out"))))
1850 #t)))
1851 (delete 'configure)
1852 (add-before 'check 'patch-tests
1853 (lambda _
1854 ;; These tests compare diffs against known-good values.
1855 ;; Patch the paths to match those in the build container.
1856 (substitute* (find-files "tests/futility/expect_output")
1857 (("/mnt/host/source/src/platform/vboot_reference")
1858 (string-append "/tmp/guix-build-" ,name "-" ,version
1859 ".drv-0/source")))
1860 ;; Tests require write permissions to many of these files.
1861 (for-each make-file-writable (find-files "tests/futility"))
1862 #t))
1863 (add-after 'install 'install-devkeys
1864 (lambda* (#:key outputs #:allow-other-keys)
1865 (let* ((out (assoc-ref outputs "out"))
1866 (share (string-append out "/share/vboot-utils")))
1867 (copy-recursively "tests/devkeys"
1868 (string-append share "/devkeys"))
1869 #t))))
1870 #:test-target "runtests"))
1871 (native-inputs
1872 `(("pkg-config" ,pkg-config)
1873
1874 ;; For tests.
1875 ("diffutils" ,diffutils)
1876 ("python@2" ,python-2)))
1877 (inputs
1878 `(("coreutils" ,coreutils)
1879 ("libyaml" ,libyaml)
1880 ("openssl" ,openssl)
1881 ("openssl:static" ,openssl "static")
1882 ("util-linux" ,util-linux "lib")))
1883 (home-page
1884 "https://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot")
1885 (synopsis "ChromiumOS verified boot utilities")
1886 (description
1887 "vboot-utils is a collection of tools to facilitate booting of
1888Chrome-branded devices. This includes the @command{cgpt} partitioning
1889program, the @command{futility} and @command{crossystem} firmware management
1890tools, and more.")
1891 (license license:bsd-3)))
1892
1893(define-public os-prober 1804(define-public os-prober
1894 (package 1805 (package
1895 (name "os-prober") 1806 (name "os-prober")
diff --git a/gnu/packages/patches/vboot-utils-fix-format-load-address.patch b/gnu/packages/patches/vboot-utils-fix-format-load-address.patch
deleted file mode 100644
index 899531e40ee..00000000000
--- a/gnu/packages/patches/vboot-utils-fix-format-load-address.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1This patch was copied from Debian.
2
3Description: Fix format load_address for 32 bits architectures
4 The offset and load_address are 64bits integers
5 On 32bits we have to use strtoull (instead of strtoul) to parse number
6 into 64bits unsigned integers. Without this the parsed numbers are
7 truncated to 2^32-1.
8Author: Sophie Brun <sophie@freexian.com>
9Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=881997
10Forwarded: https://bugs.chromium.org/p/chromium/issues/detail?id=786969
11Last-Update: 2017-11-20
12---
13This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
14--- a/futility/cmd_bdb.c
15+++ b/futility/cmd_bdb.c
16@@ -637,7 +637,7 @@ static int do_bdb(int argc, char *argv[]
17 }
18 break;
19 case OPT_OFFSET:
20- offset = strtoul(optarg, &e, 0);
21+ offset = strtoull(optarg, &e, 0);
22 if (!*optarg || (e && *e)) {
23 fprintf(stderr, "Invalid --offset\n");
24 parse_error = 1;
25@@ -658,7 +658,7 @@ static int do_bdb(int argc, char *argv[]
26 }
27 break;
28 case OPT_LOAD_ADDRESS:
29- load_address = strtoul(optarg, &e, 0);
30+ load_address = strtoull(optarg, &e, 0);
31 if (!*optarg || (e && *e)) {
32 fprintf(stderr, "Invalid --load_address\n");
33 parse_error = 1;
diff --git a/gnu/packages/patches/vboot-utils-fix-tests-show-contents.patch b/gnu/packages/patches/vboot-utils-fix-tests-show-contents.patch
deleted file mode 100644
index 8e0c691a22c..00000000000
--- a/gnu/packages/patches/vboot-utils-fix-tests-show-contents.patch
+++ /dev/null
@@ -1,142 +0,0 @@
1This patch was copied from Debian.
2
3Description: Fix tests/futility/test_show_contents.sh
4 Tests compare generated files containing the file path and upstream files
5 ("expected output") containing path like
6 "/mnt/host/source/src/platform/vboot_reference/tests/". They can't
7 match. Drop these lines mentioning paths in the generated files and in
8 the upstream provided files to avoid failures.
9Author: Sophie Brun <sophie@freexian.com>
10Last-Update: 2017-11-14
11---
12This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
13--- a/tests/futility/expect_output/show.tests_devkeys_kernel.keyblock
14+++ b/tests/futility/expect_output/show.tests_devkeys_kernel.keyblock
15@@ -1,4 +1,3 @@
16-Key block: /mnt/host/source/src/platform/vboot_reference/tests/devkeys/kernel.keyblock
17 Signature: ignored
18 Size: 0x4b8
19 Flags: 7 !DEV DEV !REC
20--- a/tests/futility/expect_output/show.tests_devkeys_root_key.vbprivk
21+++ b/tests/futility/expect_output/show.tests_devkeys_root_key.vbprivk
22@@ -1,4 +1,3 @@
23-Private Key file: /mnt/host/source/src/platform/vboot_reference/tests/devkeys/root_key.vbprivk
24 Vboot API: 1.0
25 Algorithm: 11 RSA8192 SHA512
26 Key sha1sum: b11d74edd286c144e1135b49e7f0bc20cf041f10
27--- a/tests/futility/expect_output/show.tests_devkeys_root_key.vbpubk
28+++ b/tests/futility/expect_output/show.tests_devkeys_root_key.vbpubk
29@@ -1,4 +1,3 @@
30-Public Key file: /mnt/host/source/src/platform/vboot_reference/tests/devkeys/root_key.vbpubk
31 Vboot API: 1.0
32 Algorithm: 11 RSA8192 SHA512
33 Key Version: 1
34--- a/tests/futility/expect_output/show.tests_futility_data_bios_mario_mp.bin
35+++ b/tests/futility/expect_output/show.tests_futility_data_bios_mario_mp.bin
36@@ -1,4 +1,3 @@
37-BIOS: /mnt/host/source/src/platform/vboot_reference/tests/futility/data/bios_mario_mp.bin
38 GBB header: GBB Area
39 Version: 1.0
40 Flags: 0x00000000
41--- a/tests/futility/expect_output/show.tests_futility_data_bios_zgb_mp.bin
42+++ b/tests/futility/expect_output/show.tests_futility_data_bios_zgb_mp.bin
43@@ -1,4 +1,3 @@
44-BIOS: /mnt/host/source/src/platform/vboot_reference/tests/futility/data/bios_zgb_mp.bin
45 GBB header: GBB
46 Version: 1.0
47 Flags: 0x00000000
48--- a/tests/futility/expect_output/show.tests_futility_data_fw_gbb.bin
49+++ b/tests/futility/expect_output/show.tests_futility_data_fw_gbb.bin
50@@ -1,4 +1,3 @@
51-GBB header: /mnt/host/source/src/platform/vboot_reference/tests/futility/data/fw_gbb.bin
52 Version: 1.1
53 Flags: 0x00000039
54 Regions: offset size
55--- a/tests/futility/expect_output/show.tests_futility_data_fw_vblock.bin
56+++ b/tests/futility/expect_output/show.tests_futility_data_fw_vblock.bin
57@@ -1,4 +1,3 @@
58-Key block: /mnt/host/source/src/platform/vboot_reference/tests/futility/data/fw_vblock.bin
59 Signature: ignored
60 Size: 0x8b8
61 Flags: 7 !DEV DEV !REC
62--- a/tests/futility/expect_output/show.tests_futility_data_kern_preamble.bin
63+++ b/tests/futility/expect_output/show.tests_futility_data_kern_preamble.bin
64@@ -1,4 +1,3 @@
65-Kernel partition: /mnt/host/source/src/platform/vboot_reference/tests/futility/data/kern_preamble.bin
66 Key block:
67 Signature: ignored
68 Size: 0x5b8
69--- a/tests/futility/expect_output/show.tests_futility_data_sample.vbprik2
70+++ b/tests/futility/expect_output/show.tests_futility_data_sample.vbprik2
71@@ -1,4 +1,3 @@
72-Private key file: /mnt/host/source/src/platform/vboot_reference/tests/futility/data/sample.vbprik2
73 Vboot API: 2.1
74 Desc: "sample vb21 keypair"
75 Signature Algorithm: 5 RSA8192
76--- a/tests/futility/expect_output/show.tests_futility_data_sample.vbpubk2
77+++ b/tests/futility/expect_output/show.tests_futility_data_sample.vbpubk2
78@@ -1,4 +1,3 @@
79-Public Key file: /mnt/host/source/src/platform/vboot_reference/tests/futility/data/sample.vbpubk2
80 Vboot API: 2.1
81 Desc: "sample vb21 keypair"
82 Signature Algorithm: 5 RSA8192
83--- a/tests/futility/expect_output/show.tests_testkeys_key_rsa2048.pem
84+++ b/tests/futility/expect_output/show.tests_testkeys_key_rsa2048.pem
85@@ -1,3 +1,2 @@
86-Private Key file: /mnt/host/source/src/platform/vboot_reference/tests/testkeys/key_rsa2048.pem
87 Key length: 2048
88 Key sha1sum: bfb2fa9188a87bf766dd7c313ea6802553b646b6
89--- a/tests/futility/expect_output/show.tests_testkeys_key_rsa8192.pub.pem
90+++ b/tests/futility/expect_output/show.tests_testkeys_key_rsa8192.pub.pem
91@@ -1,3 +1,2 @@
92-Public Key file: /mnt/host/source/src/platform/vboot_reference/tests/testkeys/key_rsa8192.pub.pem
93 Key length: 8192
94 Key sha1sum: f1afa44a1aed0d0e9ff630579df920a725e9de5e
95--- a/tests/futility/test_show_contents.sh
96+++ b/tests/futility/test_show_contents.sh
97@@ -29,7 +29,7 @@ for file in $SHOW_FILES; do
98 outfile="show.${file//\//_}"
99 gotfile="${OUTDIR}/${outfile}"
100 wantfile="${SRCDIR}/tests/futility/expect_output/${outfile}"
101- ${FUTILITY} show "${SRCDIR}/${file}" | tee "${gotfile}"
102+ ${FUTILITY} show "${SRCDIR}/${file}" | grep -v "tests/" | tee "${gotfile}"
103
104 # Uncomment this to update the expected output
105 #cp ${gotfile} ${wantfile}
106@@ -48,7 +48,7 @@ for file in $VBUTIL_KEY_FILES; do
107 outfile="vbutil_key.${file//\//_}"
108 gotfile="${OUTDIR}/${outfile}"
109 wantfile="${SRCDIR}/tests/futility/expect_output/${outfile}"
110- ${FUTILITY} vbutil_key --unpack "${SRCDIR}/${file}" | tee "${gotfile}"
111+ ${FUTILITY} vbutil_key --unpack "${SRCDIR}/${file}" | grep -v "tests/" | tee "${gotfile}"
112
113 # Uncomment this to update the expected output
114 #cp ${gotfile} ${wantfile}
115@@ -64,7 +64,7 @@ gotfile="${OUTDIR}/${outfile}"
116 wantfile="${SRCDIR}/tests/futility/expect_output/${outfile}"
117 ${FUTILITY} vbutil_keyblock --unpack "${SRCDIR}/${file}" \
118 --signpubkey "${SRCDIR}/tests/devkeys/kernel_subkey.vbpubk" \
119- | tee "${gotfile}"
120+ | grep -v "tests/" | tee "${gotfile}"
121
122 # Uncomment this to update the expected output
123 #cp ${gotfile} ${wantfile}
124--- a/tests/futility/expect_output/vbutil_key.tests_devkeys_root_key.vbprivk
125+++ b/tests/futility/expect_output/vbutil_key.tests_devkeys_root_key.vbprivk
126@@ -1,2 +1 @@
127-Private Key file: /mnt/host/source/src/platform/vboot_reference/tests/devkeys/root_key.vbprivk
128 Algorithm: 11 RSA8192 SHA512
129--- a/tests/futility/expect_output/vbutil_keyblock.tests_devkeys_kernel.keyblock
130+++ b/tests/futility/expect_output/vbutil_keyblock.tests_devkeys_kernel.keyblock
131@@ -1,4 +1,3 @@
132-Key block file: /mnt/host/source/src/platform/vboot_reference/tests/devkeys/kernel.keyblock
133 Signature valid
134 Flags: 7 !DEV DEV !REC
135 Data key algorithm: 4 RSA2048 SHA256
136--- a/tests/futility/expect_output/vbutil_key.tests_devkeys_root_key.vbpubk
137+++ b/tests/futility/expect_output/vbutil_key.tests_devkeys_root_key.vbpubk
138@@ -1,4 +1,3 @@
139-Public Key file: /mnt/host/source/src/platform/vboot_reference/tests/devkeys/root_key.vbpubk
140 Algorithm: 11 RSA8192 SHA512
141 Key Version: 1
142 Key sha1sum: b11d74edd286c144e1135b49e7f0bc20cf041f10
diff --git a/gnu/packages/patches/vboot-utils-skip-test-workbuf.patch b/gnu/packages/patches/vboot-utils-skip-test-workbuf.patch
deleted file mode 100644
index 9618c76f83b..00000000000
--- a/gnu/packages/patches/vboot-utils-skip-test-workbuf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1This patch was copied from Debian.
2
3Description: skip the workbuf test if VB2_WORKBUF_ALIGN different from 16
4Author: Sophie Brun <sophie@freexian.com>
5Last-Update: 2015-12-03
6---
7This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
8--- a/tests/vb2_common_tests.c
9+++ b/tests/vb2_common_tests.c
10@@ -70,6 +70,11 @@ static void test_workbuf(void)
11 /* NOTE: There are several magic numbers below which assume that
12 * VB2_WORKBUF_ALIGN == 16 */
13
14+ /* Skip the tests if VB2_WORKBUF_ALIGN != 16 */
15+ if (VB2_WORKBUF_ALIGN != 16) {
16+ return;
17+ }
18+
19 /* Init */
20 vb2_workbuf_init(&wb, p0, 64);
21 TEST_EQ(vb2_offset_of(p0, wb.buf), 0, "Workbuf init aligned");
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 09:27:48 +0000