kumquat-buildroot/board/pc/post-build.sh

#!/bin/sh

set -e

BOARD_DIR=$(dirname "$0")

# Detect boot strategy, EFI or BIOS
if [ -d "$BINARIES_DIR/efi-part/" ]; then
    cp -f "$BOARD_DIR/grub-efi.cfg" "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg"
else
    cp -f "$BOARD_DIR/grub-bios.cfg" "$TARGET_DIR/boot/grub/grub.cfg"

    # Copy grub 1st stage to binaries, required for genimage
    cp -f "$TARGET_DIR/lib/grub/i386-pc/boot.img" "$BINARIES_DIR"
fi
board/pc: ensure grub.cfg is copied to target filesystem Before this commit, the grub configuration file was copied to the TARGET_DIR in a post-image hook, after the filesystem has been generated. It was kinda working because the board/pc's grub configuration and the default one are the same and the later was copied during the build process of the grub2 package. This commit ensures the custom board/pc grub configuration is copied at the right time. Signed-off-by: Grégoire Delattre <gregoire.delattre@gmail.com> Reviewed-by: Matt Weber <matthew.weber@rockwellcollin.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> 2018-10-12 00:24:45 +02:00			`#!/bin/sh`

			`set -e`

			`BOARD_DIR=$(dirname "$0")`

configs/pc_x86_64_efi: use genimage GPT partition table support Thanks to the introduction of GPT partition table support in genimage, this commit improves the pc_x86_64_efi_defconfig to remove the use of the custom script creating the image. Tested in QEMU, not on a physical device. So: - revert commit fee29b05bb7db25e37c8a5175ce00dc712554edf[1] - add GPT support - tweak shell script to add the correct UUID in genimage config. [1]: https://git.buildroot.net/buildroot/commit/?id=fee29b05bb7db25e37c8a5175ce00dc712554edf [2]: https://git.buildroot.net/buildroot/commit/?id=79b8540d624ac4846ba341b1b9691eccacf0bc05 Signed-off-by: Alexandre PAYEN <alexandre.payen@smile.fr> Cc: Carlos Santos <casantos@datacom.com.br> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> [Thomas: - drop commented code in post-build.sh - take into account comments made by Carlos Santos in http://patchwork.ozlabs.org/patch/1143502/] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> 2019-08-07 15:54:57 +02:00			`# Detect boot strategy, EFI or BIOS`
board, boot, package: remove usage of startup.nsh in EFI partition The startup.nsh file is useless to boot EFI payloads. We just need to follow the naming detection specified in the UEFI spec. The EFI payload need to be placed in the boot/efi folder in the EFI partition and follow the architecture naming as described below: 32bit : bootia32.efi x64 : bootx64.efi aarch32 : bootarm.efi aarch64 : bootaa64.efi This naming is already right in the packages involved (systemd, grub2, gummiboot), therefore we just need to drop the generation of the startup.nsh file. The usage of the startup.nsh in genimage is also dropped to avoid errors in the image generation. Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> Tested-by: Erico Nunes <nunes.erico@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> 2021-09-23 17:57:20 +02:00			`if [ -d "$BINARIES_DIR/efi-part/" ]; then`
configs/pc_x86_64_efi: use genimage GPT partition table support Thanks to the introduction of GPT partition table support in genimage, this commit improves the pc_x86_64_efi_defconfig to remove the use of the custom script creating the image. Tested in QEMU, not on a physical device. So: - revert commit fee29b05bb7db25e37c8a5175ce00dc712554edf[1] - add GPT support - tweak shell script to add the correct UUID in genimage config. [1]: https://git.buildroot.net/buildroot/commit/?id=fee29b05bb7db25e37c8a5175ce00dc712554edf [2]: https://git.buildroot.net/buildroot/commit/?id=79b8540d624ac4846ba341b1b9691eccacf0bc05 Signed-off-by: Alexandre PAYEN <alexandre.payen@smile.fr> Cc: Carlos Santos <casantos@datacom.com.br> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> [Thomas: - drop commented code in post-build.sh - take into account comments made by Carlos Santos in http://patchwork.ozlabs.org/patch/1143502/] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> 2019-08-07 15:54:57 +02:00			`cp -f "$BOARD_DIR/grub-efi.cfg" "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg"`
			`else`
			`cp -f "$BOARD_DIR/grub-bios.cfg" "$TARGET_DIR/boot/grub/grub.cfg"`

			`# Copy grub 1st stage to binaries, required for genimage`
configs/pc_x86_64_bios_defconfig: fix image generation after grub2 rework Commit 82d1e8c628cc (boot/grub2: use none platform when building for host) changed host-grub2 to only install the tools, not the actual bootloader or its modules, as they are of no use on the host. It so happened that, when not instructed to built for a specific platform, the grub2 buildsystem would default to build the legacy bios platform (at least when the build happens on an x86 or x86_64 host). However, because the host is more often than not an x86 or x86_64, when the target was also an x68 or x86_64, the modules built for the host could be re-used for the target, and this is what was done for our pc_x86_64_bios_defconfig. But now that we explicitly tell the grub2 buildsystem to not build any platform when we build host-grub2, we no longer have access to the grub2 modules from the host directory, and the build fails when assembling the final image. We fix that in two ways: First, we ensure that individual modules from the target grub2 get installed in target/; we can only do that if the target grub2 tools are also installed, so we enable that in the configuration. Second, we fix the post-build script to look in target/ rather than in host/. All that, just for the 512-byte boot.img bootstrap, which pulls in all the other modules (4.3MiB), the tools (8.8MiB)... But we are not going to cherry-pick individual modules; this is error prone and unmaintainable... Reported-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Köry Maincent <kory.maincent@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> 2021-12-05 11:09:42 +01:00			`cp -f "$TARGET_DIR/lib/grub/i386-pc/boot.img" "$BINARIES_DIR"`
configs/pc_x86_64_efi: use genimage GPT partition table support Thanks to the introduction of GPT partition table support in genimage, this commit improves the pc_x86_64_efi_defconfig to remove the use of the custom script creating the image. Tested in QEMU, not on a physical device. So: - revert commit fee29b05bb7db25e37c8a5175ce00dc712554edf[1] - add GPT support - tweak shell script to add the correct UUID in genimage config. [1]: https://git.buildroot.net/buildroot/commit/?id=fee29b05bb7db25e37c8a5175ce00dc712554edf [2]: https://git.buildroot.net/buildroot/commit/?id=79b8540d624ac4846ba341b1b9691eccacf0bc05 Signed-off-by: Alexandre PAYEN <alexandre.payen@smile.fr> Cc: Carlos Santos <casantos@datacom.com.br> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> [Thomas: - drop commented code in post-build.sh - take into account comments made by Carlos Santos in http://patchwork.ozlabs.org/patch/1143502/] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> 2019-08-07 15:54:57 +02:00			`fi`