Merge pull request #36 from thin-edge/feat-container-plugin

feat: support container engines and tedge-container-plugin
thin-edge · Nov 16, 2024 · 298059d · 298059d
2 parents 96bf6f0 + b95fc88
commit 298059d
Show file tree

Hide file tree

Showing 11 changed files with 84 additions and 14 deletions.
diff --git a/projects/config/mender-raspberrypi.yaml b/projects/config/mender-raspberrypi.yaml
@@ -11,10 +11,10 @@ local_conf_header:
     IMAGE_INSTALL:append = " kernel-image kernel-devicetree"
     IMAGE_FSTYPES:remove = " rpi-sdimg"
     SDIMG_ROOTFS_TYPE = "ext4"
-    MENDER_BOOT_PART_SIZE_MB = "64"
 
-    # Disable mender systemd dependency
-    MENDER_FEATURES_DISABLE:append = " mender-systemd"
+    MENDER_STORAGE_TOTAL_SIZE_MB ?= "2048"
+    MENDER_BOOT_PART_SIZE_MB ?= "64"
+    MENDER_DATA_PART_SIZE_MB ?= "512"
 
     # mender golang client 3.x
     #PREFERRED_PROVIDER_mender-native = "mender-client-native"

diff --git 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/config/tedge-docker.yaml 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
@@ -2,15 +2,19 @@ header:
     version: 14
 overrides:
     repos:
+        meta-lts-mixins-go:
+            commit: 7b4c22b4114c5789a6cb7d8b0b7c7078cd9f0dc9
         meta-openembedded:
             commit: 4ad41baed6236d499804cbfc4f174042d84fce97
         meta-raspberrypi:
             commit: d7544f35756d87834e8b4bf3e3e733c771d380ae
         meta-rauc:
             commit: b27b59e2f9a3a7446f740b10560462076ef07009
         meta-rauc-community:
-            commit: c3f3ab4c587f51a74a76546ce2813c8be7c6d128
+            commit: fdaccecf6f950ccc21628aa2d8a5d7f9557eaabc
         meta-tedge:
-            commit: 89ce3d130cf1be529edf58c3a876d38afcbe8757
+            commit: 4e562b91e8b1a44b9e19d9669208dd1a184bc820
+        meta-virtualization:
+            commit: c996df33763f292da5e7513c574272d7de23eafc
         poky:
             commit: 51bd4260cb9592af4b63059a30f4f977e0a2fad6
diff --git 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,12 +40,14 @@ repos:
       meta-python:
       meta-networking:
       meta-multimedia:
+      meta-filesystems:
 
   meta-rauc:
     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:
 
@@ -55,3 +57,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
@@ -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: 4e562b91e8b1a44b9e19d9669208dd1a184bc820
+        meta-virtualization:
+            commit: c996df33763f292da5e7513c574272d7de23eafc
         poky:
             commit: 51bd4260cb9592af4b63059a30f4f977e0a2fad6
diff --git 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
@@ -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: 4e562b91e8b1a44b9e19d9669208dd1a184bc820
+        meta-virtualization:
+            commit: c996df33763f292da5e7513c574272d7de23eafc
         poky:
             commit: 51bd4260cb9592af4b63059a30f4f977e0a2fad6
diff --git 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
@@ -2,17 +2,21 @@ header:
     version: 14
 overrides:
     repos:
+        meta-lts-mixins-go:
+            commit: 7b4c22b4114c5789a6cb7d8b0b7c7078cd9f0dc9
         meta-openembedded:
             commit: 4ad41baed6236d499804cbfc4f174042d84fce97
         meta-raspberrypi:
             commit: d7544f35756d87834e8b4bf3e3e733c771d380ae
         meta-rauc:
             commit: b27b59e2f9a3a7446f740b10560462076ef07009
         meta-rauc-community:
-            commit: c3f3ab4c587f51a74a76546ce2813c8be7c6d128
+            commit: fdaccecf6f950ccc21628aa2d8a5d7f9557eaabc
         meta-rust:
             commit: a5136be2ba408af1cc8afcde1c8e3d787dadd934
         meta-tedge:
-            commit: 89ce3d130cf1be529edf58c3a876d38afcbe8757
+            commit: 4e562b91e8b1a44b9e19d9669208dd1a184bc820
+        meta-virtualization:
+            commit: c996df33763f292da5e7513c574272d7de23eafc
         poky:
             commit: 51bd4260cb9592af4b63059a30f4f977e0a2fad6
diff --git 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,12 +40,14 @@ repos:
       meta-python:
       meta-networking:
       meta-multimedia:
+      meta-filesystems:
 
   meta-rauc:
     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:
 
@@ -58,3 +61,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"