From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6563939828686127104 X-Received: by 2002:a2e:9a19:: with SMTP id o25-v6mr151499lji.35.1528381861301; Thu, 07 Jun 2018 07:31:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:97cd:: with SMTP id m13-v6ls209382ljj.8.gmail; Thu, 07 Jun 2018 07:31:00 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJM+JJe6Wp7UyVqGTkHCfucs89zOjMfU0QdhezSSLOZkw79HU13Rbh+9kiQUqbJOK2IGTX2 X-Received: by 2002:a2e:9c09:: with SMTP id s9-v6mr153581lji.20.1528381860616; Thu, 07 Jun 2018 07:31:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528381860; cv=none; d=google.com; s=arc-20160816; b=CkmW4PnRVp7Xx6+d4+fuY2Qa6YKO46KXp/OK3mDaiy5FR/cg6C/sF/Qwk/Q+OXFc/4 AldmxI4hLMAaU4lTTgwtalbkvf5qEbHniujzFJobq305eRJwpG93GM/3OCcM3IHcII7R wAsAfsZXBQpGdjg3xXmUK1/KYANEKnjs5NsJ1TTzCvQAO/izkBIl3AGmNtw64htda/SK WeAP4CApAjAXHoynEA7P7fOlIq256vE91Bfp+0mPmzth9zXLhkMat+kg542c4bzvDZvM fncR2pczvJH4eTDGaRYGWcNQik8vIxIByymfDXCW0V0DIlJ+tR2xBE/hD+FPRDH9uaBz kv2A== 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=ohD5fMkRfQokQvUWM9/a/7rZRmixVw87VplJBw45Rdi1sVsGLvykuVxmYcn1aRjnk/ +hK/VuKgs/FHgaaabENN3P5BKM5kCdhtODR6QExeEPhJkhj+7Fpm4+JFhtRpgiNjsjJl Bu8jRWByAUwcHJ3T3sDm3fi1rowYnFo9p9S6Z64oMCKyNyvgZJbhBzUacMtbmBD2//Dj SOnDPAa55lRbRkGXSisUxewkWTXrU6aBbJwoK4ESIJDL+PdTm7SL8dZpIz38vMOH6Wnl NIIGKjtxrAQiznF7KiaMsJBGG5HaXfrFInrfdz+LuYAthPNrpxpOOxFvwGV4ZSeKvX5v KEHQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id y20-v6si471511ljh.2.2018.06.07.07.31.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 07:31:00 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@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 jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w57EUx2E008595 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 7 Jun 2018 16:30:59 +0200 Received: from md1f2u6c.ad001.siemens.net (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id w57EUxNT019240 for ; Thu, 7 Jun 2018 16:30:59 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v2 2/6] buildchroot: Break up wic build deps into common and arch-specific ones Date: Thu, 7 Jun 2018 16:30:55 +0200 Message-Id: <4cbde25d8d3dade584f84791899d2b9e354bcdd0.1528381858.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.13.7 In-Reply-To: References: In-Reply-To: References: X-TUID: V6U6HEXqmhW2 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