From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6563939828311785472 X-Received: by 2002:a2e:4612:: with SMTP id t18-v6mr158274lja.12.1528286335497; Wed, 06 Jun 2018 04:58:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9903:: with SMTP id v3-v6ls147352lji.5.gmail; Wed, 06 Jun 2018 04:58:54 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKbKXxbeGh1XoHqPz14aRIGnttNFpo4KCOTPoBuZ9U9gx8ptHJ/9njQ+ZOVaCVgdPr2u7CM X-Received: by 2002:a2e:9e83:: with SMTP id f3-v6mr147870ljk.16.1528286334916; Wed, 06 Jun 2018 04:58:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528286334; cv=none; d=google.com; s=arc-20160816; b=Zorq4fMnK31hou6gxckwEXXTYXQYwVif331wnmG7Nl8mUiJHeYgQHQKhGRXuDL9zwR /mYx14cF/9ZhlpKhVJ0HF0FIedLRnhjN8qI5mNFBbTGExGD9sLxq4oZAaUTo68J6JW1m lxwcMkQSqs8JG20VfMs0EuWwhLC/5unr2LsZlOdcfH1/FZzEJFmkGcuHjHrrcOIQeuVW EbDBeyOuvzfx+cT/PF6e+VUbilaIojHVaToiZXM9YjTH/hSjEuyrQlGSZkC8T7fNolnU jqUJT6TxIIfJpifGjDDSsR/w4HV1fKjY5ome7cpKi+1a2SKVI1M1LdnPCVaS+wlU2Gg/ Iszg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from:arc-authentication-results; bh=0arqhnFuxNVGp1sJs3ddE3zUEEgpg7aFOwaLMt9P4Wo=; b=HjqcD7ipvpTIuzIb65Uw9npsPNvBBfVB+rrbb+dtM7c3+cwcRjkTr9myD7jHvWVoin NhlaS8OHpNF/Y0TwALgReOMA2UMFqQJWuKyUN2u0AF+wGziQodGMJNwULu3cWMLr+tV+ 9wfpx2usHbDAWf4rIdFRjWJI2ZMPFNytIMbU/Ctuk3GZyzlpuACvwx8Xj8xa7nSTAhIa 4lD3IcCBut7fUhMi7AdBn9c5iDKFCAUNsAFIxxwIUb3qIr7hQEehTFJrd8EQTwzl6l3C vtUoDoIkjqTfH4SXApv7xzMwtDXpzlwwK52NW3rNu67qiqllNJtzmVhN+12LtPnLOg99 5giA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id v11-v6si262082ljg.4.2018.06.06.04.58.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jun 2018 04:58:54 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w56Bwsev025113 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Jun 2018 13:58:54 +0200 Received: from md1f2u6c.ad001.siemens.net (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w56Bwr28002525 for ; Wed, 6 Jun 2018 13:58:53 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 2/5] buildchroot: Break up wic build deps into common and arch-specific ones Date: Wed, 6 Jun 2018 13:58:49 +0200 Message-Id: <4cbde25d8d3dade584f84791899d2b9e354bcdd0.1528286332.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.13.7 In-Reply-To: References: In-Reply-To: References: X-TUID: JX9NHbJX0bET From: Jan Kiszka wic is currently not usable on non-x86 archs because of naturally unresolvable dependencies on x86 grub-efi packages. Fix this by factoring our a common dependency core and a set of arch-specific ones. This should also allow to build EFI images for armhf and arm64 (Tianocore firmware or U-boot in EFI mode). But primarily, it allows to build non-EFI images on non-x86 archs via wic. Note that we should probably consider replacing the Isar-proprietary BUILDCHROOT_PREINSTALL_WIC variable with the OE standard WIC_FILE_DEPENDS*. Signed-off-by: Jan Kiszka --- meta/recipes-devtools/buildchroot/buildchroot.bb | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb index cec42c3..e405509 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -32,15 +32,27 @@ BUILDCHROOT_PREINSTALL_WIC = " \ parted \ gdisk \ util-linux \ - syslinux \ - syslinux-common \ dosfstools \ mtools \ e2fsprogs \ - grub-efi-amd64-bin \ - grub-efi-ia32-bin \ python3" +BUILDCHROOT_PREINSTALL_WIC_append_amd64 = " \ + syslinux \ + syslinux-common \ + grub-efi-amd64-bin" + +BUILDCHROOT_PREINSTALL_WIC_append_armhf = " \ + grub-efi-arm-bin" + +BUILDCHROOT_PREINSTALL_WIC_append_arm64 = " \ + grub-efi-arm64-bin" + +BUILDCHROOT_PREINSTALL_WIC_append_i386 = " \ + syslinux \ + syslinux-common \ + grub-efi-ia32-bin" + python () { if d.getVar('IMAGE_TYPE', True) == 'wic-img': d.appendVar('BUILDCHROOT_PREINSTALL', -- 2.13.7