From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7130878582899867648 X-Received: by 2002:a05:6402:1681:b0:43d:2e92:63d with SMTP id a1-20020a056402168100b0043d2e92063dmr2333659edv.253.1660287055735; Thu, 11 Aug 2022 23:50:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:d8a1:b0:726:d068:52af with SMTP id qc1-20020a170906d8a100b00726d06852afls327940ejb.1.-pod-prod-gmail; Thu, 11 Aug 2022 23:50:54 -0700 (PDT) X-Google-Smtp-Source: AA6agR7LTSnXY/oqBLIVQCM/T5I3x1ac8A96lTgObow72aiu9z8lr8eNa99BeF36CAK8iNQwRmME X-Received: by 2002:a17:906:7950:b0:730:f098:86ce with SMTP id l16-20020a170906795000b00730f09886cemr1695221ejo.390.1660287054379; Thu, 11 Aug 2022 23:50:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660287054; cv=none; d=google.com; s=arc-20160816; b=sUiEPLAXe1u5XtYCGQ3LCquox38KngtBz+LLTsfRckhQaxP6XO88QfpRxU9+mNYhsm bc5XrPsfHeDzQVwzmNQSt6x6IBfZNibFFMIqJXxuTzbST1k0rwfiN9gOBmrj4SFBstnA p5tqfG3a6kP1YnaHTpNJUop2Zlxu0108oDE/5TqPzllrX7KnJJZgVcGUlRkkjBv8QAah fH1oYhsjQxb+i21G3kKw82Dxcx6qV6/NV5DIdEDBaBBL23KtgXBgTsnOXbiLeQvNzasb aAvEGFG1NXWIwPLFsqvhE4/H5+WlO2Gz9CrdmCI9KNkpW668vf51NnkUreD19F0LjRhx Pgig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=PhKoho1sK4xhDoHsjJ73RBsATNArwtvrZhFIKmjFxOM=; b=movXKAolnb8nQg2mRF2Uk9XwhxNJDZ/QZW6iRfPq8BebZzyPMSJaMul13GmAR8issD kfACfjrELMcIkDXUu3wCpH+gh9OJ2uXkbbNLORyw1qBQAgHgXFNsd8sSpWRn4mJOY7Bz 7WrqOB8dvypL9zybfPSZolQjHUlMofq1gnRjGYayOykZ0LVbCZDEA026HUhF3ZJLm0Xk +eihCg+BXSDephHNDdMRQdc3nkvO3mM7iT1h9zD/z6O90vJiHc+LwN87wCey4P34j9uG MvW44XYGtV1UaBy3Zw7j+2EmR8quSA8a2EMWY/PYEOymszzizQTOQxLe653HadqiS/s6 Bvvg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Az3WAv4X; spf=pass (google.com: domain of fm-72506-20220812065054214e476beeb609c7b4-knxnal@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20220812065054214e476beeb609c7b4-knxnAL@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: 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 q19-20020aa7d453000000b0043a8ea6fc8dsi74478edr.4.2022.08.11.23.50.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Aug 2022 23:50:54 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20220812065054214e476beeb609c7b4-knxnal@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Az3WAv4X; spf=pass (google.com: domain of fm-72506-20220812065054214e476beeb609c7b4-knxnal@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20220812065054214e476beeb609c7b4-knxnAL@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20220812065054214e476beeb609c7b4 for ; Fri, 12 Aug 2022 08:50:54 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=PhKoho1sK4xhDoHsjJ73RBsATNArwtvrZhFIKmjFxOM=; b=Az3WAv4XN4qhNNx4GZWM2PBjPRH27QCER1bHvrdLOwhStl0jMWveS98PysoGRgpLknZtk4 hyazcaha7brGss2sx3SVI//+HZw1Id9djQ7MGsoq0S+Cl/uNEcpVWuydDdTlWxkQvcyTGM3I iLLjMCfUHeRIuEzKCqpjWycraiw3U=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: amikan@ilbers.de, henning.schild@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 2/3] Rework imager support for systemd-boot Date: Fri, 12 Aug 2022 08:50:38 +0200 Message-Id: <20220812065040.1580962-3-felix.moessbauer@siemens.com> In-Reply-To: <20220812065040.1580962-1-felix.moessbauer@siemens.com> References: <20220812065040.1580962-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: vsDWmwdsk63a This is an addendum to a1e441. As the imager now reads the systemd-boot files from the buildchroot, we install the systemd-boot deps there (instead of installing into the target image). By that, use SYSTEMD_BOOTLOADER_INSTALL together with IMAGER_INSTALL in configs. Signed-off-by: Felix Moessbauer --- meta/conf/distro/debian-common.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf index 9203b34b..a2c23cb4 100644 --- a/meta/conf/distro/debian-common.conf +++ b/meta/conf/distro/debian-common.conf @@ -28,9 +28,9 @@ GRUB_BOOTLOADER_INSTALL_arm64 = "grub-efi-arm64-bin" SYSLINUX_BOOTLOADER_INSTALL = "syslinux syslinux-common" -SYSTEMD_BOOTLOADER_PREINSTALL = "systemd" -SYSTEMD_BOOTLOADER_PREINSTALL_debian-bookworm = "systemd-boot" -SYSTEMD_BOOTLOADER_PREINSTALL_debian-sid-ports = "systemd-boot" +SYSTEMD_BOOTLOADER_INSTALL = "systemd" +SYSTEMD_BOOTLOADER_INSTALL_debian-bookworm = "systemd-boot" +SYSTEMD_BOOTLOADER_INSTALL_debian-sid-ports = "systemd-boot" COMPAT_DISTRO_ARCH_amd64 = "i386" COMPAT_DISTRO_ARCH_arm64 = "armhf" -- 2.30.2