diff mbox series

[1/1] meta-isar: Split deploy image script and deploy image service.

Message ID 20241008094902.24179-2-alexander.heinisch@siemens.com
State Accepted, archived
Headers show
Series meta-isar: Split deploy image script and deploy image in preparation for a target-bootstrapper | expand

Commit Message

alexander.heinisch Oct. 8, 2024, 9:49 a.m. UTC 
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 mbox series

Patch

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
 }