* [PATCH 1/1] meta-isar: Split deploy image script and deploy image service.
2024-10-08 9:49 [PATCH 0/1] meta-isar: Split deploy image script and deploy image in preparation for a target-bootstrapper alexander.heinisch via isar-users
@ 2024-10-08 9:49 ` alexander.heinisch via isar-users
2024-10-14 17:28 ` [PATCH 0/1] meta-isar: Split deploy image script and deploy image in preparation for a target-bootstrapper Uladzimir Bely
1 sibling, 0 replies; 3+ messages in thread
From: alexander.heinisch via isar-users @ 2024-10-08 9:49 UTC (permalink / raw)
To: isar-users; +Cc: quirin.gylstorff, Alexander Heinisch
From: Alexander Heinisch <alexander.heinisch@siemens.com>
Separate deploy image script from deploy image service.
Increasing reuse of deploy-image.sh script.
Signed-off-by: Alexander Heinisch <alexander.heinisch@siemens.com>
---
.../images/isar-image-installer.bb | 2 +-
.../deploy-image-service.bb | 21 +++++++++++++++++++
.../files/install.override.conf | 0
.../deploy-image/deploy-image_0.1.bb | 8 ++-----
4 files changed, 24 insertions(+), 7 deletions(-)
create mode 100644 meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb
rename meta-isar/recipes-installer/{deploy-image => deploy-image-service}/files/install.override.conf (100%)
diff --git a/meta-isar/recipes-core/images/isar-image-installer.bb b/meta-isar/recipes-core/images/isar-image-installer.bb
index 34fb5daf..e16716d5 100644
--- a/meta-isar/recipes-core/images/isar-image-installer.bb
+++ b/meta-isar/recipes-core/images/isar-image-installer.bb
@@ -12,6 +12,6 @@ INSTALLER_WKS_FILE ??= "installer-efi.wks.in"
WKS_FILE = "${INSTALLER_WKS_FILE}"
IMAGER_INSTALL:wic:append = " systemd-boot"
-IMAGE_INSTALL += "deploy-image"
+IMAGE_INSTALL += "deploy-image-service"
IMAGE_INSTALL:remove = "expand-on-first-boot"
diff --git a/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb b/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb
new file mode 100644
index 00000000..0fa3dcf3
--- /dev/null
+++ b/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb
@@ -0,0 +1,21 @@
+# This software is a part of ISAR.
+# Copyright (C) Siemens AG, 2024
+#
+# SPDX-License-Identifier: MIT
+
+DESCRIPTION = "systemd service to add target image to rootfs"
+
+
+inherit dpkg-raw
+
+SRC_URI = "file://install.override.conf \
+ "
+DEPENDS += " deploy-image"
+DEBIAN_DEPENDS = "deploy-image"
+
+do_install[cleandirs] = "${D}/usr/lib/systemd/system/getty@tty1.service.d/ \
+ ${D}/usr/lib/systemd/system/serial-getty@ttyS0.service.d/"
+do_install() {
+ install -m 0600 ${WORKDIR}/install.override.conf ${D}/usr/lib/systemd/system/getty@tty1.service.d/override.conf
+ install -m 0600 ${WORKDIR}/install.override.conf ${D}/usr/lib/systemd/system/serial-getty@ttyS0.service.d/override.conf
+}
diff --git a/meta-isar/recipes-installer/deploy-image/files/install.override.conf b/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf
similarity index 100%
rename from meta-isar/recipes-installer/deploy-image/files/install.override.conf
rename to meta-isar/recipes-installer/deploy-image-service/files/install.override.conf
diff --git a/meta-isar/recipes-installer/deploy-image/deploy-image_0.1.bb b/meta-isar/recipes-installer/deploy-image/deploy-image_0.1.bb
index 3f34424f..fe524e52 100644
--- a/meta-isar/recipes-installer/deploy-image/deploy-image_0.1.bb
+++ b/meta-isar/recipes-installer/deploy-image/deploy-image_0.1.bb
@@ -8,14 +8,10 @@ DESCRIPTION = "Install image to device"
inherit dpkg-raw
SRC_URI = "file://deploy-image-wic.sh \
- file://install.override.conf \
"
DEBIAN_DEPENDS = "bmap-tools, pv, dialog, util-linux, parted, fdisk, gdisk, pigz, xz-utils, pbzip2, zstd"
do_install[cleandirs] = "${D}/usr/bin/ \
- ${D}/usr/lib/systemd/system/getty@tty1.service.d/ \
- ${D}/usr/lib/systemd/system/serial-getty@ttyS0.service.d/"
+ "
do_install() {
- install -m 0755 ${WORKDIR}/deploy-image-wic.sh ${D}/usr/bin/deploy-image-wic.sh
- install -m 0600 ${WORKDIR}/install.override.conf ${D}/usr/lib/systemd/system/getty@tty1.service.d/override.conf
- install -m 0600 ${WORKDIR}/install.override.conf ${D}/usr/lib/systemd/system/serial-getty@ttyS0.service.d/override.conf
+ install -m 0755 ${WORKDIR}/deploy-image-wic.sh ${D}/usr/bin/deploy-image-wic.sh
}
--
2.43.0
--
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20241008094902.24179-2-alexander.heinisch%40siemens.com.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 0/1] meta-isar: Split deploy image script and deploy image in preparation for a target-bootstrapper
2024-10-08 9:49 [PATCH 0/1] meta-isar: Split deploy image script and deploy image in preparation for a target-bootstrapper alexander.heinisch via isar-users
2024-10-08 9:49 ` [PATCH 1/1] meta-isar: Split deploy image script and deploy image service alexander.heinisch via isar-users
@ 2024-10-14 17:28 ` Uladzimir Bely
1 sibling, 0 replies; 3+ messages in thread
From: Uladzimir Bely @ 2024-10-14 17:28 UTC (permalink / raw)
To: alexander.heinisch, isar-users
On Tue, 2024-10-08 at 11:49 +0200, alexander.heinisch via isar-users
wrote:
> From: Alexander Heinisch <alexander.heinisch@siemens.com>
>
> We are working on a target-bootstrapper to solve some of the issues
> stated here: https://groups.google.com/g/isar-users/c/ta0G_KGS_yU
> For downstream projects, this enables to not only copy the image to
> the target, but
> increases flexibility to certain comissioning tasks like:
> - Downloading images from a server/S3/...
> - Encryption of devices after image deployment
> - Enrollment of secure boot keys
> - Generating and uploading commissioning reports.
> - "offline" device onboarding
>
> The target-bootstrapper itself is not included here, and will be
> submitted separately, once matured enough!
>
> Still to bring more flexibility to downstream projects it is valuable
> to separate the
> actual deploy image logic from the service itself.
>
>
> Alexander Heinisch (1):
> meta-isar: Split deploy image script and deploy image service.
>
> .../images/isar-image-installer.bb | 2 +-
> .../deploy-image-service.bb | 21
> +++++++++++++++++++
> .../files/install.override.conf | 0
> .../deploy-image/deploy-image_0.1.bb | 8 ++-----
> 4 files changed, 24 insertions(+), 7 deletions(-)
> create mode 100644 meta-isar/recipes-installer/deploy-image-
> service/deploy-image-service.bb
> rename meta-isar/recipes-installer/{deploy-image => deploy-image-
> service}/files/install.override.conf (100%)
>
> --
> 2.43.0
>
Applied to next, thanks.
--
Best regards,
Uladzimir.
--
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/9a76939b11c17cff0c75ffed15ec5c5965dbb4a8.camel%40ilbers.de.
^ permalink raw reply [flat|nested] 3+ messages in thread