GNUBoot/gnuboot
GNUBoot
/
gnuboot
mirror of https://git.savannah.gnu.org/git/gnuboot.git
2
1
Fork 0
Code Issues Releases Activity

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 857afa42a8
("Switch to packages structure.").

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
This commit is contained in:
Denis 'GNUtoo' Carikli 2023-12-09 22:04:32 +01:00 committed by Adrien 'neox' Bourmault
parent fcccaee8a5
commit 5b9dd7adba
Signed by: neox
GPG Key ID: 2974E1D5F25DFCC8
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -34,7 +34,7 @@ modules:
./build module all
ich9m-descriptors:
./build descriptors ich9m
./build build descriptors
payloads:
./build payload all

1
build
View File

@ -36,7 +36,6 @@ tasks="\
boot \
clean \
dependencies \
descriptors \
distclean \
install \
module \

4
resources/packages/roms_helper/boot
View File

@ -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

2
site/docs/install/ich9utils.md
View File

@ -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.