From 3d4d8a5416cbb3861213c3d595e4062b7e60996e Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Wed, 31 May 2023 17:25:52 +0200 Subject: [PATCH 1/3] Bump Grub and config Signed-off-by: Mauro Morales --- tools-image/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools-image/Dockerfile b/tools-image/Dockerfile index b1c1f47..cad36cd 100644 --- 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 From 00fb90cc4b1e93cf6bd2d417fc5c27417c8b7c06 Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Thu, 1 Jun 2023 14:45:36 +0200 Subject: [PATCH 2/3] install fonts in default location Signed-off-by: Mauro Morales --- tools-image/build-arm-image.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools-image/build-arm-image.sh b/tools-image/build-arm-image.sh index ad5c369..5f4bd72 100755 --- 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 From 54f67aa09181f7e26b4e2a99ce790f4a4456a115 Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Thu, 1 Jun 2023 15:37:00 +0200 Subject: [PATCH 3/3] add changes to prepare arm images too Signed-off-by: Mauro Morales --- tools-image/prepare_arm_images.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools-image/prepare_arm_images.sh b/tools-image/prepare_arm_images.sh index 1fc0381..21a5a21 100755 --- 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