From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7156423422897029120 X-Received: by 2002:a17:907:9605:b0:6f5:c66:7c13 with SMTP id gb5-20020a170907960500b006f50c667c13mr9462091ejc.66.1666234671081; Wed, 19 Oct 2022 19:57:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:10cc:b0:78d:14b3:67b2 with SMTP id rv12-20020a17090710cc00b0078d14b367b2ls10264174ejb.7.-pod-prod-gmail; Wed, 19 Oct 2022 19:57:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5XT0MAc1Nxf/yqH/mBocHok51kPh+JBh0zP8C51Y9Kk19e+AhPpLnQfopvipb8oxagZrXU X-Received: by 2002:a17:906:5dd8:b0:78d:efa7:f78d with SMTP id p24-20020a1709065dd800b0078defa7f78dmr9283674ejv.641.1666234669554; Wed, 19 Oct 2022 19:57:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666234669; cv=none; d=google.com; s=arc-20160816; b=IjDP+kWeFTb7cCymlzNLAXzw9IYawt0r1Euu/9C/Sl+tmMCqn/GPBcO+LEd8RhOAPn uS4guVzInJSfThQs0I1ROdrE8yenLrbusZIWtVxlcT5Mz/UnMzOOogqAEE4yNNGgppl+ Hwo5K9XAqmuC3s/Jc4VkCqJU9VxIpTZ9A8CoJ6n/KLEIO+sJk3Etcd5jfbVy1jY51MIq j4N2KgVK+qi/eltgeqgqSYh9Ag0U8idF0ewMI7S7HQKXvxoGXAmm2tZYb2hOmFHz45i2 UBeam0Cd1xV/V6Mm4qXHgaXWHnimj5fcHN2tNo1Bb7f5bJSRMV25CFZYC67cZsjvglcc ppRQ== 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:message-id:date :subject:cc:to:from:dkim-signature; bh=vF0xKe4OMoJw74rgsnWplEiIYikHW9oSDI1mpCGUO74=; b=0HbitYMUR5mKkIJkX13Qmk+rQ26HollVInsSEyAlVkjanLdmQjKY/485CEuqxq/2ie hLi5dlV6nkhmoZcthLvEcHQhCrfWOWKvzt2hB1C4+QnH1gpmnIa81t2XRuMbWVf8N0ou +T8Eg8+mzECyOuvEp0hfS0Anb+yrATvEXUyxq6qDDtHi/uiS1W3br7Y2IdVWflDV5kwh LgFcUtu9eMD6LOO1EBMCGXARDaSHGP6qz0rNobhI2uhZ2MNvEovW8ysQW73zM5HfTsea +v1odcj1lkJNl8wH1lTy1X6cBVB9KIvgyPp9BFd5b26iNkIZqNieAYOb4Xqakv+m0Ccs OJcw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=WFI+SjU0; spf=pass (google.com: domain of fm-72506-20221020025749430759eca1c64ce5ba-fhlpjo@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20221020025749430759eca1c64ce5ba-fHLPjO@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id j11-20020aa7c40b000000b0045bcf2bacbasi628073edq.2.2022.10.19.19.57.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Oct 2022 19:57:49 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20221020025749430759eca1c64ce5ba-fhlpjo@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=WFI+SjU0; spf=pass (google.com: domain of fm-72506-20221020025749430759eca1c64ce5ba-fhlpjo@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20221020025749430759eca1c64ce5ba-fHLPjO@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20221020025749430759eca1c64ce5ba for ; Thu, 20 Oct 2022 04:57:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc; bh=vF0xKe4OMoJw74rgsnWplEiIYikHW9oSDI1mpCGUO74=; b=WFI+SjU0nehTJtuBC8L7OLupYrqZXCub9KxN+Dl69sYSDiAcu/aBEDLNoW0qiU4ZZYa0vY QCOJp2wQ1OlpOvgWJeu3RJqfMnCvBdjIr2SVwAiaD4HNlvD8Wms45dhmn+qK2GQnm8CwChvG KDlI/ba6XY76IxsHMqelCJrC3DrAM=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH] fix systemd-boot for non x64 targets Date: Thu, 20 Oct 2022 04:56:57 +0200 Message-Id: <20221020025657.1458548-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: NnuJcbI6sFoy With the recently introduced cross-imaging, all imager dependencies are installed for the build architecture but not the target / distro architecture. This is correct for tools, but not for architecture specific files that are copied into the target rootfs. By that, arm64 targets got bootx64.efi loaders installed, making it impossible to boot the image. For grub, we already have architecture specific support based on package names. This patch introduces the same for systemd-boot. Here, the architecture is not encoded in the package name, but in the architecture field. To avoid conflicts with other packages in the buildchroot-host, from bookworm on, we only depend on systemd-boot-efi, as this package provides the efi stubs and is co-installable for multiple architectures. For older releases, this is not possible but depending on systemd works as well. In theory this could conflict with a build-arch systemd installed into the buildchroot-host, but as almost all dependencies are now installed using sbuilder and schroot, this case is very unlikely. In this case, a user still can disable cross for the imaging. 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 a2c23cb4..c18eebc2 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_INSTALL = "systemd" -SYSTEMD_BOOTLOADER_INSTALL_debian-bookworm = "systemd-boot" -SYSTEMD_BOOTLOADER_INSTALL_debian-sid-ports = "systemd-boot" +SYSTEMD_BOOTLOADER_INSTALL = "systemd:${DISTRO_ARCH}" +SYSTEMD_BOOTLOADER_INSTALL_debian-bookworm = "systemd-boot-efi:${DISTRO_ARCH}" +SYSTEMD_BOOTLOADER_INSTALL_debian-sid-ports = "systemd-boot-efi:${DISTRO_ARCH}" COMPAT_DISTRO_ARCH_amd64 = "i386" COMPAT_DISTRO_ARCH_arm64 = "armhf" -- 2.30.2