From c12792d450ec2ea5548af851b32d99905406873f Mon Sep 17 00:00:00 2001 From: Josef Holzmayr Date: Mon, 31 Jul 2023 11:40:07 +0200 Subject: [PATCH 1/4] feat: kas: add intel-based boards Add build configurations for the following board (types): - intel-corei7-64 - intel-corei7-64-sdcard - intel-nuc-ssd Those differ only in their default setting for the MENDER_STORAGE_DEVICE variable, and should be easy to adapt for other UEFI-based x86 boards. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr --- .github/workflows/build.yml | 5 ++++- kas/intel-corei7-64-sdcard.yml | 12 ++++++++++++ kas/intel-corei7-64.yml | 22 ++++++++++++++++++++++ kas/intel-nuc-ssd.yml | 12 ++++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 kas/intel-corei7-64-sdcard.yml create mode 100644 kas/intel-corei7-64.yml create mode 100644 kas/intel-nuc-ssd.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94ca4611..cb2a79fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,10 @@ jobs: verdin-imx8mp, imx8mm-var-dart, sama5d27-som1-ek-sd, - sama5d3-xplained + sama5d3-xplained, + intel-corei7-64, + intel-corei7-64-sdcard, + intel-nuc-ssd, ] experimental: [false] include: diff --git a/kas/intel-corei7-64-sdcard.yml b/kas/intel-corei7-64-sdcard.yml new file mode 100644 index 00000000..0ce22b09 --- /dev/null +++ b/kas/intel-corei7-64-sdcard.yml @@ -0,0 +1,12 @@ +header: + version: 11 + includes: + - kas/intel-corei7-64.yml + +local_conf_header: + intel-corei7-64-sdcard: | + # Note that this setting has been verified for booting from a SD card. + # You might need to change the setting if you are planning to boot from + # a different storage medium. + MENDER_STORAGE_DEVICE = "/dev/mmcblk2" + diff --git a/kas/intel-corei7-64.yml b/kas/intel-corei7-64.yml new file mode 100644 index 00000000..f64f5a2f --- /dev/null +++ b/kas/intel-corei7-64.yml @@ -0,0 +1,22 @@ +header: + version: 11 + includes: + - kas/include/mender-full.yml + +repos: + meta-intel: + url: https://git.yoctoproject.org/meta-intel + refspec: 1aacdb4ed1e639cc6e19c541b058264eb17eb093 + +local_conf_header: + intel-corei7-64: | + # The size of core-image-base is 936 MB, meaning that if one tries to build + # that specific image you get an build error saying that it does not fit in the + # allocated part. This is because the default *total size* is set to 1024MB in + # mender-setup.bbclass, this value is used to calculate IMAGE_ROOTFS_MAXSIZE + # + # Lets increase the total storage as the core-image-base target is quite + # common and is the only image type that fully supports target device hardware. + MENDER_STORAGE_TOTAL_SIZE_MB_DEFAULT = "4096" + +machine: intel-corei7-64 diff --git a/kas/intel-nuc-ssd.yml b/kas/intel-nuc-ssd.yml new file mode 100644 index 00000000..2ec6b0db --- /dev/null +++ b/kas/intel-nuc-ssd.yml @@ -0,0 +1,12 @@ +header: + version: 11 + includes: + - kas/intel-corei7-64.yml + +local_conf_header: + intel-corei7-64-sdcard: | + # Note that this setting has been verified for booting from a SD card. + # You might need to change the setting if you are planning to boot from + # a different storage medium. + MENDER_STORAGE_DEVICE = "/dev/sda" + From 1fff653b20ea41d5da901504e4edc8caeed65d9b Mon Sep 17 00:00:00 2001 From: Josef Holzmayr Date: Mon, 31 Jul 2023 11:44:20 +0200 Subject: [PATCH 2/4] fix: kas: move boards out of experimental After repeated passing builds, move the following boards out of experimental state: - cubox-i - rock-pi-e - apalis-im8, - apalis-imx8-boot2qt Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr --- .github/workflows/build.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb2a79fe..262668c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,21 +78,17 @@ jobs: intel-corei7-64, intel-corei7-64-sdcard, intel-nuc-ssd, + cubox-i, + rock-pi-e, + apalis-imx8, + apalis-imx8-boot2qt ] experimental: [false] include: - - board: cubox-i - experimental: true - board: apalis-imx6 experimental: true - - board: apalis-imx8 - experimental: true - - board: apalis-imx8-boot2qt - experimental: true - board: stm32mp15-disco experimental: true - - board: rock-pi-e - experimental: true runs-on: [self-hosted, linux, x64] container: From 29b42ee86289e71d1f80997b0184b1415172d426 Mon Sep 17 00:00:00 2001 From: Josef Holzmayr Date: Mon, 31 Jul 2023 11:53:18 +0200 Subject: [PATCH 3/4] fix: kas: move colibri-imx6ull to experimental After repeated failed builds, move the colibri-imx6ull board to experimental state. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 262668c6..9f0f0bb6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,6 @@ jobs: qemux86-64, vexpress-qemu, vexpress-qemu-flash, - colibri-imx6ull, colibri-imx8x, verdin-imx8mm, verdin-imx8mp, @@ -87,6 +86,8 @@ jobs: include: - board: apalis-imx6 experimental: true + - board: colibri-imx6ull, + experimental: true - board: stm32mp15-disco experimental: true From 168c9f01e46dce0d098b093b823c2add78f37806 Mon Sep 17 00:00:00 2001 From: Josef Holzmayr Date: Mon, 31 Jul 2023 13:27:53 +0200 Subject: [PATCH 4/4] chore: bump layer revisions in mender-base.yml Update the base layers - openembedded-core - bitbake - meta-openembedded - meta-mender to their latest kirkstone commits. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr --- kas/include/mender-base.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kas/include/mender-base.yml b/kas/include/mender-base.yml index 11df923a..114e854b 100644 --- a/kas/include/mender-base.yml +++ b/kas/include/mender-base.yml @@ -6,26 +6,26 @@ distro: "" repos: openembedded-core: url: http://git.openembedded.org/openembedded-core - refspec: b67e714b367a08fdeeeff68c2d9495ec9bc07304 + refspec: e7d3e02a624f7ce23d012bb11ad1df2049066b37 layers: meta: bitbake: url: http://git.openembedded.org/bitbake - refspec: 2802adb572eb73a3eb2725a74a9bbdaafc543fa7 + refspec: 907416ee1062f87f5844ab0638b54616abfc1a22 path: "openembedded-core/bitbake" layers: bitbake: excluded meta-openembedded: url: https://git.openembedded.org/meta-openembedded - refspec: 571e36e20e9d1f27af0eb4545291beeb64f280e2 + refspec: 346753705e49a2486867dc150181a1c7f4d69377 layers: meta-oe: meta-mender: url: https://github.com/mendersoftware/meta-mender.git - refspec: 73a5d1098282d968901ee581c85f28cfbe928242 + refspec: c0f539ffedba6070963abe64c67c4c5d8b1ec872 layers: meta-mender-core: