From 5b9dd7adba9f0acc0faf14fe723e1f72e3afbec4 Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Sat, 9 Dec 2023 22:04:32 +0100
Subject: [PATCH] packages: fix calls to build descriptors.

Without that fix building images with make release or './build release
all' results in the following error:
    [...]
    Built lenovo/t400 (ThinkPad R400)
    make[1]: Leaving directory '/home/gnutoo/gnuboot/coreboot/default'

    Creating new ROM image: bin/r400_16mb/seabios_withgrub_r400_16mb_libgfxinit_corebootfb_colemak.rom
    Usage:
            ./build <TASK> <PACKAGE>
            ./build --help
    [...]
    Refer to the gnuboot documentation for more information.
    Error: Invalid task 'descriptors'.
    Error:  See './build --help'.
    Error: build/roms: something went wrong
    make: *** [Makefile:47: release] Error 1

This was broken by the commit 857afa42a8ade870115391b09d712b110e6a1066
("Switch to packages structure.").

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
---
 Makefile                            | 2 +-
 build                               | 1 -
 resources/packages/roms_helper/boot | 4 ++--
 site/docs/install/ich9utils.md      | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 219a940..049c16e 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ modules:
 	./build module all
 
 ich9m-descriptors:
-	./build descriptors ich9m
+	./build build descriptors
 
 payloads:
 	./build payload all
diff --git a/build b/build
index 67f6f92..a6c56a3 100755
--- a/build
+++ b/build
@@ -36,7 +36,6 @@ tasks="\
 	boot \
 	clean \
 	dependencies \
-	descriptors \
 	distclean \
 	install \
 	module \
diff --git a/resources/packages/roms_helper/boot b/resources/packages/roms_helper/boot
index 4aa6c96..db393e0 100755
--- a/resources/packages/roms_helper/boot
+++ b/resources/packages/roms_helper/boot
@@ -241,13 +241,13 @@ moverom() {
 	for romsize in 4 8 16; do
 		if [ "${cuttype}" = "${romsize}MiB ICH9 IFD NOR flash" ]; then
 			if [ ! -f "descriptors/ich9m/ich9fdgbe_${romsize}m.bin" ]; then
-				./build descriptors ich9m
+				./build build descriptors
 			fi
 			dd if=descriptors/ich9m/ich9fdgbe_${romsize}m.bin of=${newrompath} bs=1 count=12k conv=notrunc
 		fi
 		if [ "${cuttype}" = "${romsize}MiB ICH9 IFD NOGBE NOR flash" ]; then
 			if [ ! -f "descriptors/ich9m/ich9fdnogbe_${romsize}m.bin" ]; then
-				./build descriptors ich9m
+				./build build descriptors
 			fi
 			dd if=descriptors/ich9m/ich9fdnogbe_${romsize}m.bin of=${newrompath} bs=1 count=4k conv=notrunc
 		fi
diff --git a/site/docs/install/ich9utils.md b/site/docs/install/ich9utils.md
index 74aadcc..bac1b6a 100644
--- a/site/docs/install/ich9utils.md
+++ b/site/docs/install/ich9utils.md
@@ -63,7 +63,7 @@ You can also find it in the source code tar archives, on Libreboot releases.
 
 In `lbmk`, you can use the following command to generate descriptors:
 
-    ./build descriptors ich9m
+    ./build build descriptors
 
 The Libreboot build system will use the descriptors under `descriptors/ich9m`
 when building ROM images for these machines.