From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7003689953904295936 X-Received: by 2002:adf:ef0b:: with SMTP id e11mr3987077wro.46.1630673639855; Fri, 03 Sep 2021 05:53:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a314:: with SMTP id c20ls3574677wrb.2.gmail; Fri, 03 Sep 2021 05:53:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwp1e5MHnVi4tSaQ8IgqXGLH628X+NtKjUFACUH8BTiBj0Cilc4pfoR+7w3FvViLiG64SyD X-Received: by 2002:adf:e449:: with SMTP id t9mr3863434wrm.135.1630673638918; 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=J2hOM4COLCM2m/PfNWxLj5bJ1H6Qz24BAaHTxXqQYO9gLKbLQ+o1fbsrQeNtcCkvRR SZEf104mopYAN/UOvRGbtbR9ZCe7/MkHMZ4dYqq9VdszG3T3dMtKW0AxE2PH7ENvKf2F coaW+insEMM/htnqwkC588mgK5yR+BzizO9uUL5LUkppSL8hpE5AUrkUdfRjyPpIDftY k/QrmWtUdH6KifHlgqwAS15oDTEcfjbPxQT3vV9t5ZM9ht+aEkFpTKqVzn8LscenqQdJ iASu518pAKviCj9iRhd23Lk1g/dXURpxAO591wSzJcgzpj52qObOr3n1UaZIyNPq3mza Ar4A== 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=K8Q/RBep5oOXgtuBhVUCU5YIh8bBh6NpZluwdyW3Rrw=; b=xQ1s9dU8YlQa6x+Zov2ImYVDKdy8SUgGiZCpVkMRa0wzTRTnYweUG657NzJJPcWgOF OfWB3pyAXr7Xz+pxQ8m5lpNhlMcsrvCqIWXaU85h9Enfp40dmj0aQ4h6XFRhMfOtjypl cL6zL0ecDCkUjrNK62jAva6+CLLG7eQrcTRnargeCtev6F5N+2FvI3UDhzOEVYRtGEmu apqCPI0rOBVeeUKvoa+TZMpNAnxrplfkvmdlW/2FTyj3wQLIyQkpxVM2wdE/UvAVwgQh BAuDPtexXeuh1C+99b1fMKIdLMVxoiuhd9000P1Ctr5ufRU57Z66JRjwzMNtGapPomJW UVuA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id i4si239987wrc.3.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 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 183CrwaA013624 (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 183CrvB5029234; 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 7/7] meta-isar: use "systemd-boot" for one test target Date: Fri, 3 Sep 2021 14:53:55 +0200 Message-Id: <20210903125355.12279-8-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: x46Mn6/Bs19P An earlier commit changed the efi plugin fork so that its systemd support will also work in isar. This commit introduces a wks file and switches one example target to the alternative efi bootloader. Signed-off-by: Henning Schild --- meta-isar/conf/machine/qemuamd64.conf | 3 +++ meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks | 9 +++++++++ 2 files changed, 12 insertions(+) create mode 100644 meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index 238bc90720ea..dab4f0942a52 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -10,6 +10,9 @@ IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" +WKS_FILE_ubuntu-focal ?= "sdimage-efi-sd" +IMAGER_INSTALL_remove_ubuntu-focal = "${GRUB_BOOTLOADER_INSTALL}" + IMAGE_INSTALL += "sshd-regen-keys" QEMU_ARCH ?= "x86_64" diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks new file mode 100644 index 000000000000..754fbc46f8e4 --- /dev/null +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks @@ -0,0 +1,9 @@ +# short-description: Create an EFI disk image without any swap +# long-description: Creates a partitioned EFI disk image without any swap that +# the user can directly dd to boot media. + +part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --ondisk sda --label efi --part-type EF00 --align 1024 + +part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ + +bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" -- 2.32.0