From a13f491d896b1f6188dace9b6c576e11ce261360 Mon Sep 17 00:00:00 2001 From: Reuben Miller Date: Thu, 14 Nov 2024 23:56:47 +0100 Subject: [PATCH 1/4] add docker to images --- projects/config/tedge-docker.yaml | 10 ++++++++++ projects/tedge-bin-rauc.lock.yaml | 6 +++++- projects/tedge-bin-rauc.yaml | 12 +++++++++++- projects/tedge-mender-qemu.lock.yaml | 8 ++++++-- projects/tedge-mender-qemu.yaml | 10 ++++++++++ projects/tedge-mender.lock.yaml | 6 +++++- projects/tedge-mender.yaml | 11 +++++++++++ projects/tedge-rauc.lock.yaml | 6 +++++- projects/tedge-rauc.yaml | 11 +++++++++++ 9 files changed, 74 insertions(+), 6 deletions(-) create mode 100644 projects/config/tedge-docker.yaml diff --git a/projects/config/tedge-docker.yaml b/projects/config/tedge-docker.yaml new file mode 100644 index 0000000..9e2f76a --- /dev/null +++ b/projects/config/tedge-docker.yaml @@ -0,0 +1,10 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/66261547b75885786777a0b9c8a4400ab81d432e/kas/schema-kas.json +header: + version: 14 + +local_conf_header: + meta-tedge-container-plugin: | + DISTRO_FEATURES:append = " virtualization" + IMAGE_INSTALL:append = " docker-ce" + IMAGE_INSTALL:append = " docker-compose" + IMAGE_INSTALL:append = " tedge-container-plugin" diff --git a/projects/tedge-bin-rauc.lock.yaml b/projects/tedge-bin-rauc.lock.yaml index 336a5df..d8a4621 100644 --- a/projects/tedge-bin-rauc.lock.yaml +++ b/projects/tedge-bin-rauc.lock.yaml @@ -2,6 +2,8 @@ header: version: 14 overrides: repos: + meta-lts-mixins-go: + commit: 7b4c22b4114c5789a6cb7d8b0b7c7078cd9f0dc9 meta-openembedded: commit: 4ad41baed6236d499804cbfc4f174042d84fce97 meta-raspberrypi: @@ -11,6 +13,8 @@ overrides: meta-rauc-community: commit: c3f3ab4c587f51a74a76546ce2813c8be7c6d128 meta-tedge: - commit: 89ce3d130cf1be529edf58c3a876d38afcbe8757 + commit: 841ce6e2ec732a34b3d8b999949ee75b205905fb + meta-virtualization: + commit: c996df33763f292da5e7513c574272d7de23eafc poky: commit: 51bd4260cb9592af4b63059a30f4f977e0a2fad6 diff --git a/projects/tedge-bin-rauc.yaml b/projects/tedge-bin-rauc.yaml index afb0d97..f259591 100644 --- a/projects/tedge-bin-rauc.yaml +++ b/projects/tedge-bin-rauc.yaml @@ -6,7 +6,7 @@ header: - config/raspberrypi.yaml - config/rauc-raspberrypi.yaml - config/package-management.yaml - - config/read-only.yaml + - config/tedge-docker.yaml machine: raspberrypi4-64 distro: poky @@ -40,6 +40,7 @@ repos: meta-python: meta-networking: meta-multimedia: + meta-filesystems: meta-rauc: url: "https://github.com/rauc/meta-rauc.git" @@ -55,3 +56,12 @@ repos: meta-tedge-bin: meta-tedge-common: meta-tedge-rauc: + meta-tedge-extras: + meta-raspberrypi: + + meta-lts-mixins-go: + url: "https://github.com/moto-timo/meta-lts-mixins.git" + branch: kirkstone/go + + meta-virtualization: + url: "https://git.yoctoproject.org/meta-virtualization" diff --git a/projects/tedge-mender-qemu.lock.yaml b/projects/tedge-mender-qemu.lock.yaml index 72d0065..d543f73 100644 --- a/projects/tedge-mender-qemu.lock.yaml +++ b/projects/tedge-mender-qemu.lock.yaml @@ -2,13 +2,17 @@ header: version: 14 overrides: repos: + meta-lts-mixins-go: + commit: 7b4c22b4114c5789a6cb7d8b0b7c7078cd9f0dc9 meta-mender: commit: 9efa9409684e303472ed9dae749ab663909eb689 meta-openembedded: commit: 4ad41baed6236d499804cbfc4f174042d84fce97 meta-rust: - commit: a5136be2ba408af1cc8afcde1c8e3d787dadd934 + commit: 6750e846ebcaef9783e11fc6341888235738d238 meta-tedge: - commit: 89ce3d130cf1be529edf58c3a876d38afcbe8757 + commit: 841ce6e2ec732a34b3d8b999949ee75b205905fb + meta-virtualization: + commit: c996df33763f292da5e7513c574272d7de23eafc poky: commit: 51bd4260cb9592af4b63059a30f4f977e0a2fad6 diff --git a/projects/tedge-mender-qemu.yaml b/projects/tedge-mender-qemu.yaml index c97294d..1aacab4 100644 --- a/projects/tedge-mender-qemu.yaml +++ b/projects/tedge-mender-qemu.yaml @@ -5,6 +5,7 @@ header: - config/common.yaml - config/mender-qemu.yaml - config/package-management.yaml + - config/tedge-docker.yaml machine: qemux86-64 distro: poky @@ -33,6 +34,7 @@ repos: meta-python: meta-networking: meta-multimedia: + meta-filesystems: meta-mender: url: "https://github.com/mendersoftware/meta-mender" @@ -50,3 +52,11 @@ repos: meta-tedge: meta-tedge-common: meta-tedge-mender: + meta-tedge-extras: + + meta-lts-mixins-go: + url: "https://github.com/moto-timo/meta-lts-mixins.git" + branch: kirkstone/go + + meta-virtualization: + url: "https://git.yoctoproject.org/meta-virtualization" diff --git a/projects/tedge-mender.lock.yaml b/projects/tedge-mender.lock.yaml index 094f2c6..63fa4a2 100644 --- a/projects/tedge-mender.lock.yaml +++ b/projects/tedge-mender.lock.yaml @@ -2,6 +2,8 @@ header: version: 14 overrides: repos: + meta-lts-mixins-go: + commit: 7b4c22b4114c5789a6cb7d8b0b7c7078cd9f0dc9 meta-mender: commit: 9efa9409684e303472ed9dae749ab663909eb689 meta-openembedded: @@ -11,6 +13,8 @@ overrides: meta-rust: commit: a5136be2ba408af1cc8afcde1c8e3d787dadd934 meta-tedge: - commit: 89ce3d130cf1be529edf58c3a876d38afcbe8757 + commit: 841ce6e2ec732a34b3d8b999949ee75b205905fb + meta-virtualization: + commit: c996df33763f292da5e7513c574272d7de23eafc poky: commit: 51bd4260cb9592af4b63059a30f4f977e0a2fad6 diff --git a/projects/tedge-mender.yaml b/projects/tedge-mender.yaml index c9e1f54..ec89426 100644 --- a/projects/tedge-mender.yaml +++ b/projects/tedge-mender.yaml @@ -6,6 +6,7 @@ header: - config/raspberrypi.yaml - config/mender-raspberrypi.yaml - config/package-management.yaml + - config/tedge-docker.yaml machine: raspberrypi4-64 distro: poky @@ -37,6 +38,7 @@ repos: meta-python: meta-networking: meta-multimedia: + meta-filesystems: meta-mender: url: "https://github.com/mendersoftware/meta-mender" @@ -54,3 +56,12 @@ repos: meta-tedge: meta-tedge-common: meta-tedge-mender: + meta-tedge-extras: + meta-raspberrypi: + + meta-lts-mixins-go: + url: "https://github.com/moto-timo/meta-lts-mixins.git" + branch: kirkstone/go + + meta-virtualization: + url: "https://git.yoctoproject.org/meta-virtualization" diff --git a/projects/tedge-rauc.lock.yaml b/projects/tedge-rauc.lock.yaml index 586dccf..15307cf 100644 --- a/projects/tedge-rauc.lock.yaml +++ b/projects/tedge-rauc.lock.yaml @@ -2,6 +2,8 @@ header: version: 14 overrides: repos: + meta-lts-mixins-go: + commit: 7b4c22b4114c5789a6cb7d8b0b7c7078cd9f0dc9 meta-openembedded: commit: 4ad41baed6236d499804cbfc4f174042d84fce97 meta-raspberrypi: @@ -13,6 +15,8 @@ overrides: meta-rust: commit: a5136be2ba408af1cc8afcde1c8e3d787dadd934 meta-tedge: - commit: 89ce3d130cf1be529edf58c3a876d38afcbe8757 + commit: 841ce6e2ec732a34b3d8b999949ee75b205905fb + meta-virtualization: + commit: c996df33763f292da5e7513c574272d7de23eafc poky: commit: 51bd4260cb9592af4b63059a30f4f977e0a2fad6 diff --git a/projects/tedge-rauc.yaml b/projects/tedge-rauc.yaml index dd44ebd..ce941ac 100644 --- a/projects/tedge-rauc.yaml +++ b/projects/tedge-rauc.yaml @@ -6,6 +6,7 @@ header: - config/raspberrypi.yaml - config/rauc-raspberrypi.yaml - config/package-management.yaml + - config/tedge-docker.yaml machine: raspberrypi4-64 distro: poky @@ -39,6 +40,7 @@ repos: meta-python: meta-networking: meta-multimedia: + meta-filesystems: meta-rauc: url: "https://github.com/rauc/meta-rauc.git" @@ -58,3 +60,12 @@ repos: meta-tedge: meta-tedge-common: meta-tedge-rauc: + meta-tedge-extras: + meta-raspberrypi: + + meta-lts-mixins-go: + url: "https://github.com/moto-timo/meta-lts-mixins.git" + branch: kirkstone/go + + meta-virtualization: + url: "https://git.yoctoproject.org/meta-virtualization" From 2c81dd3bcde8c19e5167dd7b1b441ae7e2b66c6b Mon Sep 17 00:00:00 2001 From: Reuben Miller Date: Thu, 14 Nov 2024 23:57:04 +0100 Subject: [PATCH 2/4] increase default size of mender partitions --- projects/config/mender-raspberrypi.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/config/mender-raspberrypi.yaml b/projects/config/mender-raspberrypi.yaml index dcc3366..5a75cb8 100644 --- a/projects/config/mender-raspberrypi.yaml +++ b/projects/config/mender-raspberrypi.yaml @@ -11,7 +11,11 @@ local_conf_header: IMAGE_INSTALL:append = " kernel-image kernel-devicetree" IMAGE_FSTYPES:remove = " rpi-sdimg" SDIMG_ROOTFS_TYPE = "ext4" + + MENDER_STORAGE_TOTAL_SIZE_MB = "2048" MENDER_BOOT_PART_SIZE_MB = "64" + IMAGE_OVERHEAD_FACTOR = "1.0" + MENDER_DATA_PART_SIZE_MB ?= "512" # Disable mender systemd dependency MENDER_FEATURES_DISABLE:append = " mender-systemd" From bf0a5c3033f0acd6193dd8db2d6c29ee09a59829 Mon Sep 17 00:00:00 2001 From: Reuben Miller Date: Fri, 15 Nov 2024 11:52:43 +0100 Subject: [PATCH 3/4] fix mender data partition expansion --- projects/config/mender-raspberrypi.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/projects/config/mender-raspberrypi.yaml b/projects/config/mender-raspberrypi.yaml index 5a75cb8..536bddc 100644 --- a/projects/config/mender-raspberrypi.yaml +++ b/projects/config/mender-raspberrypi.yaml @@ -12,14 +12,10 @@ local_conf_header: IMAGE_FSTYPES:remove = " rpi-sdimg" SDIMG_ROOTFS_TYPE = "ext4" - MENDER_STORAGE_TOTAL_SIZE_MB = "2048" - MENDER_BOOT_PART_SIZE_MB = "64" - IMAGE_OVERHEAD_FACTOR = "1.0" + MENDER_STORAGE_TOTAL_SIZE_MB ?= "2048" + MENDER_BOOT_PART_SIZE_MB ?= "64" MENDER_DATA_PART_SIZE_MB ?= "512" - # Disable mender systemd dependency - MENDER_FEATURES_DISABLE:append = " mender-systemd" - # mender golang client 3.x #PREFERRED_PROVIDER_mender-native = "mender-client-native" #PREFERRED_RPROVIDER_mender-auth = "mender-client" From b95fc88c533e4bac7f4bbc982f2ac4575d61b99d Mon Sep 17 00:00:00 2001 From: Reuben Miller Date: Fri, 15 Nov 2024 23:39:04 +0100 Subject: [PATCH 4/4] update rauc partition layout --- projects/config/rauc-raspberrypi.yaml | 2 +- projects/tedge-bin-rauc.lock.yaml | 4 ++-- projects/tedge-bin-rauc.yaml | 3 ++- projects/tedge-mender-qemu.lock.yaml | 2 +- projects/tedge-mender.lock.yaml | 2 +- projects/tedge-rauc.lock.yaml | 4 ++-- projects/tedge-rauc.yaml | 3 ++- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/projects/config/rauc-raspberrypi.yaml b/projects/config/rauc-raspberrypi.yaml index fc8bf35..b3f2097 100644 --- a/projects/config/rauc-raspberrypi.yaml +++ b/projects/config/rauc-raspberrypi.yaml @@ -14,4 +14,4 @@ local_conf_header: SDIMG_ROOTFS_TYPE = "ext4" # Note: Image must be a multiple of 4096 for adaptive updates to work! IMAGE_ROOTFS_EXTRA_SPACE:append = " + 409600" - WKS_FILE = "sdimage-dual-raspberrypi-custom.wks.in" + WKS_FILE = "sdimage-dual-raspberrypi.wks.in" diff --git a/projects/tedge-bin-rauc.lock.yaml b/projects/tedge-bin-rauc.lock.yaml index d8a4621..a277118 100644 --- a/projects/tedge-bin-rauc.lock.yaml +++ b/projects/tedge-bin-rauc.lock.yaml @@ -11,9 +11,9 @@ overrides: meta-rauc: commit: b27b59e2f9a3a7446f740b10560462076ef07009 meta-rauc-community: - commit: c3f3ab4c587f51a74a76546ce2813c8be7c6d128 + commit: fdaccecf6f950ccc21628aa2d8a5d7f9557eaabc meta-tedge: - commit: 841ce6e2ec732a34b3d8b999949ee75b205905fb + commit: 4e562b91e8b1a44b9e19d9669208dd1a184bc820 meta-virtualization: commit: c996df33763f292da5e7513c574272d7de23eafc poky: diff --git a/projects/tedge-bin-rauc.yaml b/projects/tedge-bin-rauc.yaml index f259591..fc4fbd8 100644 --- a/projects/tedge-bin-rauc.yaml +++ b/projects/tedge-bin-rauc.yaml @@ -46,7 +46,8 @@ repos: url: "https://github.com/rauc/meta-rauc.git" meta-rauc-community: - url: "https://github.com/rauc/meta-rauc-community" + url: "https://github.com/thin-edge/meta-rauc-community" + branch: kirkstone-fork layers: meta-rauc-raspberrypi: diff --git a/projects/tedge-mender-qemu.lock.yaml b/projects/tedge-mender-qemu.lock.yaml index d543f73..07da91f 100644 --- a/projects/tedge-mender-qemu.lock.yaml +++ b/projects/tedge-mender-qemu.lock.yaml @@ -11,7 +11,7 @@ overrides: meta-rust: commit: 6750e846ebcaef9783e11fc6341888235738d238 meta-tedge: - commit: 841ce6e2ec732a34b3d8b999949ee75b205905fb + commit: 4e562b91e8b1a44b9e19d9669208dd1a184bc820 meta-virtualization: commit: c996df33763f292da5e7513c574272d7de23eafc poky: diff --git a/projects/tedge-mender.lock.yaml b/projects/tedge-mender.lock.yaml index 63fa4a2..bb4d918 100644 --- a/projects/tedge-mender.lock.yaml +++ b/projects/tedge-mender.lock.yaml @@ -13,7 +13,7 @@ overrides: meta-rust: commit: a5136be2ba408af1cc8afcde1c8e3d787dadd934 meta-tedge: - commit: 841ce6e2ec732a34b3d8b999949ee75b205905fb + commit: 4e562b91e8b1a44b9e19d9669208dd1a184bc820 meta-virtualization: commit: c996df33763f292da5e7513c574272d7de23eafc poky: diff --git a/projects/tedge-rauc.lock.yaml b/projects/tedge-rauc.lock.yaml index 15307cf..9ba639a 100644 --- a/projects/tedge-rauc.lock.yaml +++ b/projects/tedge-rauc.lock.yaml @@ -11,11 +11,11 @@ overrides: meta-rauc: commit: b27b59e2f9a3a7446f740b10560462076ef07009 meta-rauc-community: - commit: c3f3ab4c587f51a74a76546ce2813c8be7c6d128 + commit: fdaccecf6f950ccc21628aa2d8a5d7f9557eaabc meta-rust: commit: a5136be2ba408af1cc8afcde1c8e3d787dadd934 meta-tedge: - commit: 841ce6e2ec732a34b3d8b999949ee75b205905fb + commit: 4e562b91e8b1a44b9e19d9669208dd1a184bc820 meta-virtualization: commit: c996df33763f292da5e7513c574272d7de23eafc poky: diff --git a/projects/tedge-rauc.yaml b/projects/tedge-rauc.yaml index ce941ac..9cebda4 100644 --- a/projects/tedge-rauc.yaml +++ b/projects/tedge-rauc.yaml @@ -46,7 +46,8 @@ repos: url: "https://github.com/rauc/meta-rauc.git" meta-rauc-community: - url: "https://github.com/rauc/meta-rauc-community" + url: "https://github.com/thin-edge/meta-rauc-community" + branch: kirkstone-fork layers: meta-rauc-raspberrypi: