Merge pull request #37 from thin-edge/feat-update-meta-tedge-layer

thin-edge · Nov 16, 2024 · 860ec23 · 860ec23
2 parents 298059d + 005361c
commit 860ec23
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 5 deletions.
diff --git a/projects/config/common.yaml b/projects/config/common.yaml
@@ -19,3 +19,12 @@ local_conf_header:
     IMAGE_BUILDINFO_VARS:append = " DATETIME DISTRO_NAME IMAGE_BASENAME IMAGE_NAME IMAGE_NAME_SUFFIX MACHINE TUNE_PKGARCH" 
     IMAGE_BUILDINFO_VARS:append = " MACHINE_FEATURES DISTRO_FEATURES COMMON_FEATURES IMAGE_FEATURES"
     IMAGE_BUILDINFO_VARS:append = " TUNE_FEATURES TARGET_FPU"
+
+    # Don't enable service by default as they will need to be bootstrapped first, though
+    # this may change in the future. But bootstrapping works anyway if the services are already enabled
+    # but they do consume more resources until it is bootstrapped
+    SYSTEMD_AUTO_ENABLE:tedge-agent = "disable"
+    SYSTEMD_AUTO_ENABLE:tedge-mapper-c8y = "disable"
+    SYSTEMD_AUTO_ENABLE:tedge-mapper-aws = "disable"
+    SYSTEMD_AUTO_ENABLE:tedge-mapper-az = "disable"
+    SYSTEMD_AUTO_ENABLE:tedge-mapper-collectd = "disable"
diff --git a/projects/config/rauc-raspberrypi.yaml b/projects/config/rauc-raspberrypi.yaml
@@ -7,7 +7,6 @@ local_conf_header:
     RPI_USE_U_BOOT = "1"
     IMAGE_INSTALL:append = " rauc rauc-grow-data-part"
     DISTRO_FEATURES:append = " rauc"
-    PACKAGE_EXCLUDE:append = " rauc-mark-good"
     IMAGE_INSTALL:append = " kernel-image kernel-devicetree"
     PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
     IMAGE_FSTYPES = " tar.bz2 ext4 wic.bz2 wic.bmap"

diff --git a/projects/config/read-only.yaml b/projects/config/read-only.yaml
@@ -12,6 +12,13 @@ local_conf_header:
     TEDGE_CONFIG_SYMLINK = "/etc/tedge"
     TEDGE_CONFIG_SYMLINK_SRC = "/data/tedge"
 
+    # Enable services by default as services can't be enabled at runtime with a read-only rootfs
+    SYSTEMD_AUTO_ENABLE:tedge-agent = "enable"
+    SYSTEMD_AUTO_ENABLE:tedge-mapper-c8y = "enable"
+    SYSTEMD_AUTO_ENABLE:tedge-mapper-aws = "disable"
+    SYSTEMD_AUTO_ENABLE:tedge-mapper-az = "disable"
+    SYSTEMD_AUTO_ENABLE:tedge-mapper-collectd = "disable"
+
     # `has_journal` interferes with the checksum of the image when viewed from the block device. Oddly
     # enough it is not present on disk, IOW, when the image is mounted readonly, the physical checksum
     # on disk, and the checksum of the corresponding block device, are not the same. Work around this by

diff --git a/projects/tedge-bin-rauc.lock.yaml b/projects/tedge-bin-rauc.lock.yaml
@@ -13,7 +13,7 @@ overrides:
         meta-rauc-community:
             commit: fdaccecf6f950ccc21628aa2d8a5d7f9557eaabc
         meta-tedge:
-            commit: 4e562b91e8b1a44b9e19d9669208dd1a184bc820
+            commit: 25b85a87e0a9f9e76afcff74a2b187e1c6eb33b9
         meta-virtualization:
             commit: c996df33763f292da5e7513c574272d7de23eafc
         poky:

diff --git 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: 4e562b91e8b1a44b9e19d9669208dd1a184bc820
+            commit: 25b85a87e0a9f9e76afcff74a2b187e1c6eb33b9
         meta-virtualization:
             commit: c996df33763f292da5e7513c574272d7de23eafc
         poky:

diff --git a/projects/tedge-mender.lock.yaml b/projects/tedge-mender.lock.yaml
@@ -13,7 +13,7 @@ overrides:
         meta-rust:
             commit: a5136be2ba408af1cc8afcde1c8e3d787dadd934
         meta-tedge:
-            commit: 4e562b91e8b1a44b9e19d9669208dd1a184bc820
+            commit: 25b85a87e0a9f9e76afcff74a2b187e1c6eb33b9
         meta-virtualization:
             commit: c996df33763f292da5e7513c574272d7de23eafc
         poky:

diff --git a/projects/tedge-rauc.lock.yaml b/projects/tedge-rauc.lock.yaml
@@ -15,7 +15,7 @@ overrides:
         meta-rust:
             commit: a5136be2ba408af1cc8afcde1c8e3d787dadd934
         meta-tedge:
-            commit: 4e562b91e8b1a44b9e19d9669208dd1a184bc820
+            commit: 25b85a87e0a9f9e76afcff74a2b187e1c6eb33b9
         meta-virtualization:
             commit: c996df33763f292da5e7513c574272d7de23eafc
         poky: