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

#!/bin/sh

set -e

BOARD_DIR=$(dirname "$0")

# Detect boot strategy, EFI or BIOS
if [ -f "$BINARIES_DIR/efi-part/startup.nsh" ]; 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 "$HOST_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`
			`if [ -f "$BINARIES_DIR/efi-part/startup.nsh" ]; 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`
board/pc/post-build.sh: fix typo in grub boot.img path Commit 3468ef16fa55610bae3bacefaf816231a20cfab0 ("configs/pc_x86_64_efi: use genimage GPT partition table support") had a small typo on the path to grub boot.img file: i387-pc instead of i386-pc, which causes a build failure. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/378314412 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Alexandre PAYEN <alexandre.payen@smile.fr> Cc: Carlos Santos <casantos@datacom.com.br> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> 2019-12-16 10:31:18 +01:00			`cp -f "$HOST_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`