Merge pull request #58 from kairos-io/bump-grub-static

Bump Grub and config
add changes to prepare arm images too
2025-12-25 04:42:52 +00:00 · 2023-06-01 16:46:42 +02:00 · 2023-06-01 15:37:04 +02:00 · 2023-06-01 14:45:36 +02:00 · 2023-05-31 17:25:52 +02:00
3 changed files with 7 additions and 5 deletions
--- a/tools-image/Dockerfile
+++ b/tools-image/Dockerfile
@@ -32,9 +32,9 @@ FROM quay.io/kairos/packages:raspberrypi-firmware-dt-firmware-2021.03.15-2.1 AS
 FROM quay.io/kairos/packages:u-boot-rockchip-arm-vendor-blob-0.1 AS pinebook-u-boot

 ## Generic ARM artifacts
-FROM quay.io/kairos/packages-arm64:grub-efi-static-0.1  AS grub-efi
-FROM quay.io/kairos/packages-arm64:grub-config-static-0.1  AS grub-config
-FROM quay.io/kairos/packages-arm64:grub-artifacts-static-0.1   AS grub-artifacts
+FROM quay.io/kairos/packages-arm64:grub-efi-static-0.2  AS grub-efi
+FROM quay.io/kairos/packages-arm64:grub-config-static-0.3  AS grub-config
+FROM quay.io/kairos/packages-arm64:grub-artifacts-static-0.2   AS grub-artifacts

 ## RAW images
 FROM quay.io/kairos/packages:grub-efi-static-0.1  AS grub-raw-efi
--- a/tools-image/build-arm-image.sh
+++ b/tools-image/build-arm-image.sh
@@ -320,8 +320,9 @@ tune2fs -L ${SYSTEM_LABEL} ${RECOVERY}/cOS/recovery.img

 # Install real grub config to recovery
 cp -rfv /arm/grub/config/* $RECOVERY
-mkdir -p $RECOVERY/grub2
+mkdir -p $RECOVERY/grub2/fonts
 cp -rfv /arm/grub/artifacts/* $RECOVERY/grub2
+mv $RECOVERY/grub2/*pf2 $RECOVERY/grub2/fonts

 sync

--- a/tools-image/prepare_arm_images.sh
+++ b/tools-image/prepare_arm_images.sh
@@ -94,8 +94,9 @@ tune2fs -L ${SYSTEM_LABEL} ${RECOVERY}/cOS/recovery.img

 # Install real grub config to recovery
 cp -rfv /arm/grub/config/* $RECOVERY
-mkdir -p $RECOVERY/grub2
+mkdir -p $RECOVERY/grub2/fonts
 cp -rfv /arm/grub/artifacts/* $RECOVERY/grub2
+mv $RECOVERY/grub2/*pf2 $RECOVERY/grub2/fonts

 dd if=/dev/zero of=recovery_partition.img bs=1M count=$recovery_size
 dd if=/dev/zero of=state_partition.img bs=1M count=$state_size
Author	SHA1	Message	Date
Mauro Morales	53a74136d6	Merge pull request #58 from kairos-io/bump-grub-static Bump Grub and config	2023-06-01 16:46:42 +02:00
Mauro Morales	54f67aa091	add changes to prepare arm images too Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>	2023-06-01 15:37:04 +02:00
Mauro Morales	00fb90cc4b	install fonts in default location Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>	2023-06-01 14:45:36 +02:00
Mauro Morales	3d4d8a5416	Bump Grub and config Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>	2023-05-31 17:25:52 +02:00