From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7003689951757860864 X-Received: by 2002:adf:804a:: with SMTP id 68mr4008929wrk.236.1630673639886; Fri, 03 Sep 2021 05:53:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:f614:: with SMTP id w20ls2711382wmc.2.canary-gmail; Fri, 03 Sep 2021 05:53:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymdtKqb+MmxWrJ/+oUDu5ThysOyxVTlmZjyBPVEaH0mjZubeWYPBv6UsD+eUnnYYsSJdoe X-Received: by 2002:a05:600c:4f13:: with SMTP id l19mr216442wmq.39.1630673638912; Fri, 03 Sep 2021 05:53:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630673638; cv=none; d=google.com; s=arc-20160816; b=BDcO1OPBHlkj6akR+CNCuUpt2RzqC/ImlfVQaAUbShNoNNw5etoWrezXhUnkndDvo8 DR8MEriI3fRarlWvrJRvFCbd3fEjSVFwWdiKUV2Kcerf1xLvsNetDlGrK5yLiudhxpbM wuvDKuhzeJMVbO6v0At3BkklnoQgKAfKw8hEAluvbxvcg6rzUCFA7zuXjT4j4vVUDD1x zWp0TFITeJTFo+n16uPBqp0dUAfJWvzXVlmmTXPAhK22S+y2LIHbCvKtiT8/2iJa58c+ qQPvyM+0bcJ0HzvY+mJlI+cSxqSGjlFOOycek17gvw1xLi6I+tDZKPRxc/JLak4btHAu pkLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=VFOwcPyxAKWZCBgjOpC7hgp8jnZxlinLbPyb1v61ZE8=; b=FvtRK4xFrn4gP3SM/kf61mmX2YGedOfqyBnukZCxJ8FT0c/6G3kA7SHhfccU2dk3yz 8QEVCZ3xtHWyjTN3XQ2PVewAVYFAkDxQfW9pqi5kxhhBISknkn3x96VUx/dnQRF0V73A uXGY2JJk+L1PSVg2HJDlDFCL9ogADjiMMq24lOIyoM8aeqWWPt7ABC4ePTNFTFlGmN8V pt02I7wd4sQVFcU/LwNi2HiEgUGB0J1kZFTuRdm0sN4dpCVvk93ibjr5p/ZxsWRZgfq/ FeUNgoEYYDKndn5WD3KHGGQXfcks9DDz29/ECixSssBfqiQSy9IgIcM2OGUFcWfG4xLA joOQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id u2si306421wro.0.2021.09.03.05.53.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Sep 2021 05:53:58 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 183CrwAC005869 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 3 Sep 2021 14:53:58 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 183CrvB0029234; Fri, 3 Sep 2021 14:53:58 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Florian Bezdeka , Vijai Kumar K , jan.kiszka@siemens.com, Henning Schild Subject: [PATCH v2 2/7] wic: add utility library for common bits of isar plugins Date: Fri, 3 Sep 2021 14:53:50 +0200 Message-Id: <20210903125355.12279-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210903125355.12279-1-henning.schild@siemens.com> References: <20210903125355.12279-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: YyuELwYFrd6E Signed-off-by: Henning Schild --- .../scripts/lib/wic/plugins/isarpluginbase.py | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 meta/scripts/lib/wic/plugins/isarpluginbase.py diff --git a/meta/scripts/lib/wic/plugins/isarpluginbase.py b/meta/scripts/lib/wic/plugins/isarpluginbase.py new file mode 100644 index 000000000000..185e2ea14fc7 --- /dev/null +++ b/meta/scripts/lib/wic/plugins/isarpluginbase.py @@ -0,0 +1,39 @@ +# +# Copyright (c) Siemens AG, 2021 +# +# SPDX-License-Identifier: MIT +# +# DESCRIPTION +# This implements a few utility functions to be used in isar-specific plugins. + +import os + +def isar_populate_boot_cmd(rootfs_dir, hdddir): + # copy all files from rootfs/boot into boot partition + # no not copy symlinks (ubuntu places them here) because targetfs is fat + return "find %s/boot -type f -exec cp -a {} %s ;" % (rootfs_dir, hdddir) + +def isar_get_filenames(rootfs_dir): + # figure out the real filename in /boot by following debian symlinks + for kernel_symlink in ["vmlinuz", "vmlinux" ]: + kernel_file_abs = os.path.join(rootfs_dir, kernel_symlink) + if os.path.isfile(kernel_file_abs): + break + # in ubuntu those symlinks could be in /boot + kernel_file_abs = os.path.join(rootfs_dir, "boot", kernel_symlink) + if os.path.isfile(kernel_file_abs): + break + + kernel = os.path.basename(os.path.realpath(kernel_file_abs)) + initrd = "initrd.img" + kernel_parts = kernel.split("-") + kernel_suffix = "-".join(kernel_parts[1:]) + if kernel_suffix: + initrd += "-%s" % kernel_suffix + + if not os.path.isfile(os.path.join(rootfs_dir, "boot", kernel)): + raise WicError("kernel %s not found" % (os.path.join(rootfs_dir, "boot", kernel))) + if not os.path.isfile(os.path.join(rootfs_dir, "boot", initrd)): + raise WicError("initrd %s not found" % (os.path.join(rootfs_dir, "boot", initrd))) + + return kernel, initrd -- 2.32.0