From 4cc6adc525e4b383e1b9752673d97a3819378587 Mon Sep 17 00:00:00 2001 From: Alexandru Costache Date: Mon, 30 Oct 2023 09:44:13 +0100 Subject: [PATCH 1/5] u-boot: Pin SRC_REV to the one present at the integration date Upstream uses AUTOREV and this causes two problems: - we don't know which revision has been used by which balenaOS release - automated Jenkins builds sometimes break when upstream performs changes and we can't easily determine the window in which the changes have been performed We thus pin the SRC_REV to the revision used when the device has been integrated with balenaOS, as per the upstream relese tag xml Changelog-entry: u-boot: Pin SRC_REV to the one present at the integration date Signed-off-by: Alexandru Costache --- .../recipes-bsp/u-boot/u-boot-compulab_%.bbappend | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/layers/meta-balena-imx9/recipes-bsp/u-boot/u-boot-compulab_%.bbappend b/layers/meta-balena-imx9/recipes-bsp/u-boot/u-boot-compulab_%.bbappend index 02027f0d..02384d19 100644 --- a/layers/meta-balena-imx9/recipes-bsp/u-boot/u-boot-compulab_%.bbappend +++ b/layers/meta-balena-imx9/recipes-bsp/u-boot/u-boot-compulab_%.bbappend @@ -12,6 +12,13 @@ SRC_URI:append = " \ BALENA_DEVICE_FDT_ADDR_VAR = "fdt_addr_r" BALENA_UBOOT_DEVICE_TYPES = "usb mmc" +# Upstream uses AUTOREV, but we need to track +# the stable release as per the release notes, +# at the date of the present commit, +# otherwise we won't know which exact +# revision is used by which balenaOS release +SRCREV="34382c7df25560904a521d3f62bf5768899c55a2" + # Bring in configure step from poky # to make sure the merge_config script is called # appropriately, otherwise the build will fail From 75053d28cb90818def33ea6a72538fb1fa4b473c Mon Sep 17 00:00:00 2001 From: Alexandru Costache Date: Mon, 30 Oct 2023 09:55:16 +0100 Subject: [PATCH 2/5] linux-compulab: Pin SRC_REV to the one present at the integration date Upstream uses AUTOREV and this causes two problems: - we don't know which revision has been used by which balenaOS release - automated Jenkins builds sometimes break when upstream performs changes and we can't easily determine the window in which the changes have been performed We thus pin the SRC_REV to the revision used when the device has been integrated with balenaOS, as per the upstream relese tag xml and will update it when necessary or when we update the BSP to another stable version. Signed-off-by: Alexandru Costache --- .../recipes-kernel/linux/linux-compulab_%.bbappend | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/layers/meta-balena-imx9/recipes-kernel/linux/linux-compulab_%.bbappend b/layers/meta-balena-imx9/recipes-kernel/linux/linux-compulab_%.bbappend index e00faa13..194a4189 100644 --- a/layers/meta-balena-imx9/recipes-kernel/linux/linux-compulab_%.bbappend +++ b/layers/meta-balena-imx9/recipes-kernel/linux/linux-compulab_%.bbappend @@ -5,6 +5,13 @@ DEPENDS += "rsync-native" SRC_URI:append = "file://0001-fix-kernel-build.patch" +# Upstream uses AUTOREV, but we need to track +# the stable release as per the release notes, +# at the date of the present commit, +# otherwise we won't know which exact kernel +# revision is used by which balenaOS release +SRCREV="77c117ac5747ea5c1afbdde8dcc5ca8b8b231e13" + # Fixes issue where cryptodev module is installed # along with the kernel image in the initramfs KERNEL_PACKAGE_NAME="kernel" From ab3bfcde342031930927011bbb0928b61f1f7f9d Mon Sep 17 00:00:00 2001 From: Alexandru Costache Date: Mon, 30 Oct 2023 16:11:22 +0100 Subject: [PATCH 3/5] layers/meta-balena: Update to v4.0.29 Changelog-entry: layers/meta-balena: Update to v4.0.29 Signed-off-by: Alexandru Costache --- layers/meta-balena | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/meta-balena b/layers/meta-balena index 2afcf8f6..c1ed98a9 160000 --- a/layers/meta-balena +++ b/layers/meta-balena @@ -1 +1 @@ -Subproject commit 2afcf8f6657947fea0ddc5a34fc7c8773b1cfb24 +Subproject commit c1ed98a9e945d0f1ba684204c2fc10d3fdf59072 From 3fadcc201a16b87a68230f04dce5470ca948679e Mon Sep 17 00:00:00 2001 From: Alexandru Costache Date: Tue, 31 Oct 2023 19:00:55 +0200 Subject: [PATCH 4/5] balena-image: Shrink rootfs size for Autokit testing purposes Signed-off-by: Alexandru Costache --- layers/meta-balena-imx9/recipes-core/images/balena-image.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/meta-balena-imx9/recipes-core/images/balena-image.inc b/layers/meta-balena-imx9/recipes-core/images/balena-image.inc index 5c780759..ee23c52c 100644 --- a/layers/meta-balena-imx9/recipes-core/images/balena-image.inc +++ b/layers/meta-balena-imx9/recipes-core/images/balena-image.inc @@ -24,5 +24,5 @@ IMAGE_INSTALL:remove = "jailhouse" CORE_IMAGE_EXTRA_INSTALL:remove = " gpsd gps-utils connman wvdial ppp modemmanager " # THe eMMC has 64GB, let's ensure there's sufficient space for the rootfs in the future -IMAGE_ROOTFS_SIZE = "983040" +IMAGE_ROOTFS_SIZE = "733184" unset ROOTFS_SIZE From 397009b7a8c4c0a19d887eeb98cdb86369925cb6 Mon Sep 17 00:00:00 2001 From: Alexandru Costache Date: Wed, 1 Nov 2023 10:59:42 +0200 Subject: [PATCH 5/5] Revert "balena-image: Shrink rootfs size for Autokit testing purposes" This reverts commit 3fadcc201a16b87a68230f04dce5470ca948679e. because Autokit tests passed with the smaller rootfs size and the timeout can now be investigated and tackled in leviathan. Signed-off-by: Alexandru Costache --- layers/meta-balena-imx9/recipes-core/images/balena-image.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/meta-balena-imx9/recipes-core/images/balena-image.inc b/layers/meta-balena-imx9/recipes-core/images/balena-image.inc index ee23c52c..5c780759 100644 --- a/layers/meta-balena-imx9/recipes-core/images/balena-image.inc +++ b/layers/meta-balena-imx9/recipes-core/images/balena-image.inc @@ -24,5 +24,5 @@ IMAGE_INSTALL:remove = "jailhouse" CORE_IMAGE_EXTRA_INSTALL:remove = " gpsd gps-utils connman wvdial ppp modemmanager " # THe eMMC has 64GB, let's ensure there's sufficient space for the rootfs in the future -IMAGE_ROOTFS_SIZE = "733184" +IMAGE_ROOTFS_SIZE = "983040" unset ROOTFS_SIZE