From patchwork Tue Oct 8 09:49:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "alexander.heinisch" X-Patchwork-Id: 3855 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 08 Oct 2024 11:49:53 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f62.google.com (mail-oo1-f62.google.com [209.85.161.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4989npO2023070 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 8 Oct 2024 11:49:52 +0200 Received: by mail-oo1-f62.google.com with SMTP id 006d021491bc7-5dc96240f1dsf3901529eaf.0 for ; Tue, 08 Oct 2024 02:49:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1728380986; cv=pass; d=google.com; s=arc-20240605; b=lKE326Z2SvMbMfaMCMb1pUG5ybeTIUL+ZA7QPSRkBOtodB3wxJAtL1a8tW6fBUSie4 tHIw74Bmn4XKQdhrSLTIGyynEu7UYNaUiWtYb8l2m8V1XWORxyEeFN6XBdxSTT8o+bw2 zuMpxDhkde1kpIZalC7xDRYKgwM0zOTpveCjrLuwWCo4LKT3Z8nZEuvZrYCNYKU4NAad haoK5c7hDCP1iW+m1B0p6tgYYl93yp81FegykTA/P9+L5Sx0ET0Su8zVy/+eSmDLro7Q iNabFogsc/zJRWJchG13T5AeD2IlNuOQOh0O8xD9IEdW0n1tOZy1B8CyjZ5ns15OgytT dmFA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=c5EY7SVaAOBj4SqpwJeThnmH7y6ERTNKLkzP8U1Qblg=; fh=B3OlmtDTyZvnZ+a4zq79iHFmlqyk8MPc00290hxkTNE=; b=fFQIM50DRzROCtdvjw0K56srPWWB/Y3BS++5bUVMShtZG9AhyqxWG4z6gY+DT9lVLm UbyrDKFKosTiKsDOSIKHG6Fz8XbtxZv6vx1pEnSFthYDeh4W3GxDVs0QHkudSE8yllfn i3kPXxJMaw1GMearx8vkFnkCEAoSH4pnHIUM3fZyQ/GlfTCBhzvWxU6wZPmQtK7/Tu+e ddbjm87glbFsZBEC+WXtzpPE3v+vjrSLOkVNWnBxXxUpFxPAjK2FM5LQObfYudS9zFyd zlVRqIBXDz4eVnL7WY9tdF3wx2Dg6VXvd1RgXuLxUEgfkfUMc7i5UBdndbQhgFEYJO12 1Rzw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=QbEJjRtH; spf=pass (google.com: domain of fm-1326448-2024100809494355e4ec71bbd53ed5d9-fms3c_@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1326448-2024100809494355e4ec71bbd53ed5d9-Fms3C_@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1728380986; x=1728985786; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=c5EY7SVaAOBj4SqpwJeThnmH7y6ERTNKLkzP8U1Qblg=; b=T6Fimy4BQrtaVTrZ2UckrgvFB3TwSbh7DIyI6UP1BkvHTAHVzCRK8DYtE7mCxtMDcl fWjLxhNHO0Dmd2Q1pDT1bAoED5QBzu+skC1NpAJ/35X8UGtPq+7D/SGh1UlmjymKJ5hl jGIhMnw7XzfUq4kDL0py205EWVs9MQGbdpvYfbOPRDuPUBFgcd/tM7ZNZFKh9p3BLPK5 H7cXH9kxjw3//T0QbyYW2D9xCBL3ajz5uZ9u/dc5RZrKrSldzhGfb5JtzfF2AZQ3oKNA UZ4mrRpTNLqDyAmmsglAKr86u3SeWA8Hin2u/+UjEqL3kY4Zq61RDmCRBrCID1j6NFce icgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728380986; x=1728985786; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=c5EY7SVaAOBj4SqpwJeThnmH7y6ERTNKLkzP8U1Qblg=; b=EZ9LL8+aS5lumZvkmazGx2lUA703Z6CLebx/DLDgeyJTtbOzGKhG/o7YjJ6dZEPyqp TmmjDdNRk9JXCs9AU+ZvSQeRBKT65Hym6H/TYD7njlRC2foPoQ/ZSqN+lAlgqQQiv8YU S24dGNjMkYpmZf0eHyYOQcnaWEuh2zOKG9/5BnV1J2GpjU7WexMuXNfeIsDkH9p1i0qy xaN4llEZ0ptZqS32sZkXXxGQ05muNKNIFA6NT4TiKooU9/NLmBsFM67V62wjCohWqnpq WLXbn7LRPYsng2eeM34KSQoIkFglxKy5CJDPwTKXRqEfLG10JjvuM34qkprAiD+7W8EE bWAw== X-Forwarded-Encrypted: i=2; AJvYcCWc6nUTWkUZ46GpioHyKFt+WQuNuGGsmHolwRE+dRDJWEhjQ+LV+UpfA9n1n5fahju5oOH7zik=@isar-build.org X-Gm-Message-State: AOJu0Ywe13APsbkhaYRb7tvJsL9S+5oPsg22Ktd14jk9thY7dQV2nmfn vJHdhDdRAV73X/TVihG8Wos6Kui2X7U/IJWP55U0OkJh2583Jd2Y X-Google-Smtp-Source: AGHT+IE/yLFsc5LL1REwL6bHMY3GfeMvMJRFtYQ94ZDsI7fhAtvA4SgDXISqXKNa3NXJmp3hG25Hnw== X-Received: by 2002:a05:6820:168a:b0:5e1:eba9:8fe7 with SMTP id 006d021491bc7-5e7cc06a4e9mr10531351eaf.3.1728380986050; Tue, 08 Oct 2024 02:49:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6820:1d03:b0:5ba:c07d:d1e3 with SMTP id 006d021491bc7-5e7bd72238fls2662141eaf.1.-pod-prod-03-us; Tue, 08 Oct 2024 02:49:45 -0700 (PDT) X-Received: by 2002:a05:6830:3486:b0:710:f1fe:241b with SMTP id 46e09a7af769-7154e8038b8mr10811984a34.6.1728380985069; Tue, 08 Oct 2024 02:49:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728380985; cv=none; d=google.com; s=arc-20240605; b=SN9dPKfe6Fn3HKvmLvvKeoeA5cWuReHvzc+lfCh17HJ4/P0yltaFNiIMLCtWUM2Bs5 NC/xLuQm10HByWSbR7I/Me/5Zm/Hb82X5TlUEcKDCFW68e7ghkXyK/Y1RBxSiNghoJGU UuJAaQeDNznF7tgx2zYky+pjdGqXrj1fczhD9tGQMAp6+tbah/mII7ky+1yfplMq1PtH 8ymUhPRsPvgb5a34CMlTi6u5IojgedbwkWSYjP1NBGZMZuozQwtDO02m3zyV30s0ygnF 1FLDbKbup4r9MCJnaC6kKo38i0hxY/40RWX7gHKc9DFwefsdFdOGeaPfW+qavFG/weOm XGYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=ogZXvXsldR42xRIv4MfBBuL26GYJFb6CBzArZLw8vVg=; fh=jXKJ4NXmcq9ft/CXyj8cp7qMr3n5EHnvR/LYDuogm+g=; b=CeS/zpKhi4xzg3icvxewwDLHYSi1zHcDwGy6l7eGQ8WadhxkDkgsBXXAFeRl7WE9Op mBxg1iuH7gCc14LWRGNkFEqlGe3DGr4BKRLnIRNjlqkNvToQASoVRX/E1X7OLaan6LmX zZdnSlp3+xn4ygd4cqciZJcxrk7/hcaREl5N10OsL+mMR9ZwQObaxAXJLK9r6Pd0UM8B dcHBnWXENSqSTRRcBlfa9t+IBCWnk5pFcI50ryCBUMVK9qb3l2W+j4eEXQC48AbZWH21 2wzJP+WZUpkTAhUIcey7vWKDMuEOWLaboDCf0bJj3g/fmm4i52cz95Y9JeVOUPORY33Z JXvg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=QbEJjRtH; spf=pass (google.com: domain of fm-1326448-2024100809494355e4ec71bbd53ed5d9-fms3c_@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1326448-2024100809494355e4ec71bbd53ed5d9-Fms3C_@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 46e09a7af769-715568906a9si295594a34.3.2024.10.08.02.49.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Oct 2024 02:49:45 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1326448-2024100809494355e4ec71bbd53ed5d9-fms3c_@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 2024100809494355e4ec71bbd53ed5d9 for ; Tue, 08 Oct 2024 11:49:43 +0200 X-Patchwork-Original-From: "alexander.heinisch via isar-users" From: "alexander.heinisch" To: isar-users@googlegroups.com Cc: quirin.gylstorff@siemens.com, Alexander Heinisch Subject: [PATCH 1/1] meta-isar: Split deploy image script and deploy image service. Date: Tue, 8 Oct 2024 11:49:02 +0200 Message-ID: <20241008094902.24179-2-alexander.heinisch@siemens.com> In-Reply-To: <20241008094902.24179-1-alexander.heinisch@siemens.com> References: <20241008094902.24179-1-alexander.heinisch@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1326448:519-21489:flowmailer X-Original-Sender: alexander.heinisch@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=QbEJjRtH; spf=pass (google.com: domain of fm-1326448-2024100809494355e4ec71bbd53ed5d9-fms3c_@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1326448-2024100809494355e4ec71bbd53ed5d9-Fms3C_@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: alexander.heinisch@siemens.com Reply-To: alexander.heinisch@siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Alexander Heinisch Separate deploy image script from deploy image service. Increasing reuse of deploy-image.sh script. Signed-off-by: Alexander Heinisch --- .../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 }