From patchwork Wed Aug 7 05:52:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chin Huat Ang X-Patchwork-Id: 170713 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp6678182ile; Tue, 6 Aug 2019 22:59:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqxE645wLY2k+ahQz9A6E0vYnqo5EJLzVHC+6A6yUoDE5nVKXVENigvq77tdxOKsHMvArdaB X-Received: by 2002:a63:ff0c:: with SMTP id k12mr6025374pgi.186.1565157582529; Tue, 06 Aug 2019 22:59:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565157582; cv=none; d=google.com; s=arc-20160816; b=ERNHtAEeks268ub4qhX6poXR2HTSRIAOgNdtOremOm2ZDI5rvlzvHQZOFI+luMexfH JxbY+nkRe/F0VzigQF0p9svorfxa3Ul0qLwRwCRt345sGbysMNLTued98yssXyGQOLFS 7P9BtINb0OKNtzCbzETnwclobk6g/evtK3CqA6yyUmdk5d4yoboQNtXjVE8TGS2SE1R8 bJIQqAG/pXklXkcRq7oaUAQmMC+LykKZBJZ7O5b9e97xQXxoFsccA3VGSePC8PTlGxR4 sGYuVun53UAdaay1RO0ObFiDUC0jvfnWnTb9NNbp+QcRwaSVFi+2RI8cuZ+B6rUBAShF OpnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=lcoYGWUyUWQgSP2IO84DgSbkHiMfmW/D2tqIpBFIZxs=; b=bB6F2thngTWg9XGRVHAnEiuGc/GvJQCDWGjcbxYxfythtytTc0dz64L4r31G5Oz71K 9YRzaF2sPKNlYp1RisUR+jda5z3Gqe/TcBJNZ4Gp3MeK43PiIrXxt9IDSa61G9K4f3SS 7CqTYOxGNYCq4B5FNn2OQZ581kLqP5Gqh4jjKMbDL0KyVMGYGiSGyEcbVPWD8J/ARjQS XAc0m/zIrCjh7g5TYuoUJOZIIynvc4ZN4RvITLk0aOKDFC7zoxOsgi/rdjTRnSdK5s3K tt7ZKH2VdOfUKTSLYhd2DBvTtb23liGHNCK/QbTv45Zh68cPQd12zcQCtYhqqBCvUXA1 IHWA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g22si48675918pfh.219.2019.08.06.22.59.42; Tue, 06 Aug 2019 22:59:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 708CC7F450; Wed, 7 Aug 2019 05:59:39 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org X-Greylist: delayed 426 seconds by postgrey-1.34 at layers.openembedded.org; Wed, 07 Aug 2019 05:59:37 UTC Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mail.openembedded.org (Postfix) with ESMTP id 9B7937F445 for ; Wed, 7 Aug 2019 05:59:37 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Aug 2019 22:52:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,356,1559545200"; d="scan'208";a="168519878" Received: from andromeda02.png.intel.com ([10.221.183.11]) by orsmga008.jf.intel.com with ESMTP; 06 Aug 2019 22:52:31 -0700 From: Chin Huat Ang To: "openembedded-core@lists.openembedded.org" Date: Wed, 7 Aug 2019 13:52:27 +0800 Message-Id: <1565157150-7729-1-git-send-email-chin.huat.ang@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [OE-core] [warrior][PATCH 1/4] efivar: add X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton This was in meta-oe but EFI is sufficiently wide spread now that we need it in core. The recipe is based on the one in meta-oe but with several updates. (From OE-Core rev: 53fe0133432f62024850e87456292b044d1280ee) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-bsp/efivar/efivar/no-werror.patch | 18 +++++++++++++ meta/recipes-bsp/efivar/efivar_37.bb | 37 ++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 meta/recipes-bsp/efivar/efivar/no-werror.patch create mode 100644 meta/recipes-bsp/efivar/efivar_37.bb -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 950b8e8..7d31e4f 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -161,6 +161,7 @@ RECIPE_MAINTAINER_pn-dtc = "Alexander Kanavin " RECIPE_MAINTAINER_pn-dwarfsrcfiles = "Alexander Kanavin " RECIPE_MAINTAINER_pn-e2fsprogs = "Robert Yang " RECIPE_MAINTAINER_pn-ed = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-efivar = "Ross Burton " RECIPE_MAINTAINER_pn-eglinfo-fb = "Alexander Kanavin " RECIPE_MAINTAINER_pn-eglinfo-x11 = "Alexander Kanavin " RECIPE_MAINTAINER_pn-eglinfo-wayland = "Alexander Kanavin " diff --git a/meta/recipes-bsp/efivar/efivar/no-werror.patch b/meta/recipes-bsp/efivar/efivar/no-werror.patch new file mode 100644 index 0000000..50a0b10 --- /dev/null +++ b/meta/recipes-bsp/efivar/efivar/no-werror.patch @@ -0,0 +1,18 @@ +Don't use -Werror because newer compilers introduce newer warnings. + +Upstream-Status: Inappropriate [https://github.com/rhboot/efivar/issues/131] +Signed-off-by: Ross Burton + +diff --git a/gcc.specs b/gcc.specs +index 45d43d1..1baf11a 100644 +--- a/gcc.specs ++++ b/gcc.specs +@@ -2,7 +2,7 @@ + + -D_GNU_SOURCE + + *efivar_cpp_options: +- -Werror -Wall -std=gnu11 -Wextra ++ -Wall -std=gnu11 -Wextra + + *cpp_options: + + %(efivar_cpp_options) diff --git a/meta/recipes-bsp/efivar/efivar_37.bb b/meta/recipes-bsp/efivar/efivar_37.bb new file mode 100644 index 0000000..c4254c7 --- /dev/null +++ b/meta/recipes-bsp/efivar/efivar_37.bb @@ -0,0 +1,37 @@ +SUMMARY = "Tools to manipulate UEFI variables" +DESCRIPTION = "efivar provides a simple command line interface to the UEFI variable facility" +HOMEPAGE = "https://github.com/rhboot/efivar" + +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393" + +COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" + +SRC_URI = "git://github.com/rhinstaller/efivar.git \ + file://no-werror.patch" +SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10" + +S = "${WORKDIR}/git" + +inherit pkgconfig + +export CCLD_FOR_BUILD = "${BUILD_CCLD}" + +# Upstream uses --add-needed in gcc.specs which gold doesn't support, so +# enforce BFD. +LDFLAGS += "-fuse-ld=bfd" + +do_compile_prepend() { + # Remove when https://github.com/rhboot/efivar/issues/130 is fixed + oe_runmake CFLAGS="${BUILD_CFLAGS}" -C src makeguids +} + +do_install() { + oe_runmake install DESTDIR=${D} +} + +BBCLASSEXTEND = "native" + +RRECOMMENDS_${PN}_class-target = "kernel-module-efivarfs" + +CLEANBROKEN = "1" From patchwork Wed Aug 7 05:52:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chin Huat Ang X-Patchwork-Id: 170714 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp6678263ile; Tue, 6 Aug 2019 22:59:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqwqE7flfVYxKVQj1U1GEVeT35I70kFkMNG7UAaMEezlQ4YAiYgygYwr7kFnEPOPf9cb2f1B X-Received: by 2002:a17:90a:3344:: with SMTP id m62mr6743490pjb.135.1565157589193; Tue, 06 Aug 2019 22:59:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565157589; cv=none; d=google.com; s=arc-20160816; b=A7/HSqx/G4dHAgsteszkxuFVTvXWYUBQm59Saj6a8CuAZHwIe/g/nLtWIYOL+NH4pD C/TbgtuXVKXMV+Kx/d0hyyY9X5HogWZ/koChenWGezDhUajfm1PcA+s7n7VobmvRcBKX 9HbIfrDmPXABvP0wDdrEFyHhpgQf8Lawoo4gl6zQzj6qPzBcys/DgzmViVJmG0D/HUKy mlo71Ej7XmNFL7zc5aIcOV7wXa2iNcJOHruV/tB3I1yeFCH+7ZUUiPBddjVvNDbc5pPS 7g2KjYclJgfY7DUs+PM3HTCYtfoJBv6O+n84DSeteQvefnLHR/6AQdfXoLrKn+ZhO785 dNWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=vvSHOcPnVzmvcDTfNZU7aGB2Bz4JCTnN2iTa3UU4FVg=; b=WCrpmts8VdlSV3YrYMPIjwY7fxcVXzpnCvpyz4sw+esDfFWp2xwl6uSOpBbsb+/cm+ yggYpHlZ6d4jPSMpVugLoF3+d1sobhT4zD49oYVi4wpacSWeJPqnUM6cHjfKOOdVtM+4 MukUTqTJsDtEt7ZL1zmBPDczUrd4oqsqQmCEQ85/c4gwpDP+mPi8jwlEsOJH/hjw08n5 RapXCbRUhohgHodoTti6Z0Be0jOdxsQpS5iXy/zoWLAYn8lNno1CtTeaFaE+J8Yrl0JX 6s5Kesn70YxnBCAkO14Q93q9/GHr5owNvosXch7qOZCk1/ugBukEcfqe1HDO6IjFYjvO Q5NQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v16si50099141pfi.142.2019.08.06.22.59.48; Tue, 06 Aug 2019 22:59:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B477A7F461; Wed, 7 Aug 2019 05:59:45 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mail.openembedded.org (Postfix) with ESMTP id B14547F450 for ; Wed, 7 Aug 2019 05:59:38 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Aug 2019 22:52:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,356,1559545200"; d="scan'208";a="168519884" Received: from andromeda02.png.intel.com ([10.221.183.11]) by orsmga008.jf.intel.com with ESMTP; 06 Aug 2019 22:52:33 -0700 From: Chin Huat Ang To: "openembedded-core@lists.openembedded.org" Date: Wed, 7 Aug 2019 13:52:28 +0800 Message-Id: <1565157150-7729-2-git-send-email-chin.huat.ang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1565157150-7729-1-git-send-email-chin.huat.ang@intel.com> References: <1565157150-7729-1-git-send-email-chin.huat.ang@intel.com> Subject: [OE-core] [warrior][PATCH 2/4] efivar: ensure that target security flags are not used to build native code X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton Also set LDFLAGS=BUILD_LDFLAGS when compiling makeguids to ensure that any target compiler flags are not passed to the native compiler. [ YOCTO #13423 ] (From OE-Core rev: f61e0676aabba9e006c32f0e53c69426368cd4f0) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-bsp/efivar/efivar_37.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-bsp/efivar/efivar_37.bb b/meta/recipes-bsp/efivar/efivar_37.bb index c4254c7..9b95721 100644 --- a/meta/recipes-bsp/efivar/efivar_37.bb +++ b/meta/recipes-bsp/efivar/efivar_37.bb @@ -23,7 +23,10 @@ LDFLAGS += "-fuse-ld=bfd" do_compile_prepend() { # Remove when https://github.com/rhboot/efivar/issues/130 is fixed - oe_runmake CFLAGS="${BUILD_CFLAGS}" -C src makeguids + oe_runmake \ + CFLAGS="${BUILD_CFLAGS}" \ + LDFLAGS="${BUILD_LDFLAGS}" \ + -C src makeguids } do_install() { From patchwork Wed Aug 7 05:52:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chin Huat Ang X-Patchwork-Id: 170715 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp6678350ile; Tue, 6 Aug 2019 22:59:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqyDpeMEkEPXv1JPcKnrCqt3BDqJrlQVxTAKxc9JOvSLlAeBPUXEyikC0vdZlRbWuVicXL4X X-Received: by 2002:a17:902:7b97:: with SMTP id w23mr711645pll.149.1565157596955; Tue, 06 Aug 2019 22:59:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565157596; cv=none; d=google.com; s=arc-20160816; b=VRxjgVBINU18D00q+75tfhTowNOWcyyM0Bkk7FAAp2GUC1VzH1ixNsr3zNwxNX/VsN H8Ap5dAdnObfqUtvMTmgKlPvMU/Z+tFymWPd9VK5zc0qQXdLpvm6SP0rpbNAfRjSr+hx zL70gfCZTrvDiqa62HeQfg1cU48O9R+XdSTIeVgMC/y3vJ4wbvMr+0DFdq3amsc+2Et1 kUvseZCx/iiEJE9PnRuKIlyBG/rTQ8pnwrhuc9b/jWcPE7ABcCOtclHZ+brY+bQAEKbx vRxuvIvAm6kKwAV1w2zKjAfZ1dhAmZtKALCm8X9AWHDVgmCjh0Fvd6f+VcOTEBKNsshX vI1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=HygiJjJbBnUn7UwCSugtuynZad+p61UHsprBYEI547E=; b=VpU8n42ZOYQxFIiXeGPIK7z9edDnLPEbrJ2WNbrm4ek3DGKw2ZdnzOunEIABbU7AGr L+Wo3jcT9l1NVjAb0A1hAPDwWzboXXywpgUyAgIvnPFMWzJB0FvDcwiBSkr7w7KZzWl0 c5pM17DBnn+ztwGAhECt72yBx7shx6kNxqZAuuGykjDaDbzWIDWGzjNnwZBEFXJYTXTU sOuVqkwAcZG68YqaigBP9tcTpNsQr7Vyzd/Va9ERfD1ntxXSewDANy1K9PmktMd4ADlX ln3ByWAhi4z1S+oe8B0MKMocWe3O5pL3ieSzyCBlJUiCv3Iy01DvrmXrKuVH6dc6S/eI T7ow== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id p123si18542481pga.12.2019.08.06.22.59.56; Tue, 06 Aug 2019 22:59:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id DA7CD7F459; Wed, 7 Aug 2019 05:59:50 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mail.openembedded.org (Postfix) with ESMTP id 975337F45A for ; Wed, 7 Aug 2019 05:59:40 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Aug 2019 22:52:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,356,1559545200"; d="scan'208";a="168519893" Received: from andromeda02.png.intel.com ([10.221.183.11]) by orsmga008.jf.intel.com with ESMTP; 06 Aug 2019 22:52:34 -0700 From: Chin Huat Ang To: "openembedded-core@lists.openembedded.org" Date: Wed, 7 Aug 2019 13:52:29 +0800 Message-Id: <1565157150-7729-3-git-send-email-chin.huat.ang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1565157150-7729-1-git-send-email-chin.huat.ang@intel.com> References: <1565157150-7729-1-git-send-email-chin.huat.ang@intel.com> Subject: [OE-core] [warrior][PATCH 3/4] efibootmgr: add X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton This was in meta-oe but EFI is sufficiently widespread now that we need it in core. The recipe is based on the one in meta-oe but with several updates. (From OE-Core rev: 275e5e7ecf4f79b7892ae35a47902188d9905bd0) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + .../efibootmgr/0001-remove-extra-decl.patch | 31 ++++++++++++++++++++ meta/recipes-bsp/efibootmgr/efibootmgr_17.bb | 34 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch create mode 100644 meta/recipes-bsp/efibootmgr/efibootmgr_17.bb -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 7d31e4f..af2c4c3 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -162,6 +162,7 @@ RECIPE_MAINTAINER_pn-dwarfsrcfiles = "Alexander Kanavin RECIPE_MAINTAINER_pn-e2fsprogs = "Robert Yang " RECIPE_MAINTAINER_pn-ed = "Alexander Kanavin " RECIPE_MAINTAINER_pn-efivar = "Ross Burton " +RECIPE_MAINTAINER_pn-efibootmgr = "Ross Burton " RECIPE_MAINTAINER_pn-eglinfo-fb = "Alexander Kanavin " RECIPE_MAINTAINER_pn-eglinfo-x11 = "Alexander Kanavin " RECIPE_MAINTAINER_pn-eglinfo-wayland = "Alexander Kanavin " diff --git a/meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch b/meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch new file mode 100644 index 0000000..42f3a81 --- /dev/null +++ b/meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch @@ -0,0 +1,31 @@ +From 99b578501643377e0b1994b2a068b790d189d5ad Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 13 Jun 2018 09:41:01 -0400 +Subject: [PATCH] remove extra decl + +Signed-off-by: Peter Jones + +Upstream-Status: Backport [git://github.com/rhinstaller/efibootmgr.git] +Signed-off-by: Hongxu Jia + +--- + src/efibootmgr.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/efibootmgr.c b/src/efibootmgr.c +index de38f01..4e1a680 100644 +--- a/src/efibootmgr.c ++++ b/src/efibootmgr.c +@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv) + "invalid numeric value %s\n", + optarg); + } +- /* XXX efivar-36 accidentally doesn't have a public +- * header for this */ +- extern int efi_set_verbose(int verbosity, FILE *errlog); + efi_set_verbose(opts.verbose - 2, stderr); + break; + case 'V': +-- +2.7.4 + diff --git a/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb b/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb new file mode 100644 index 0000000..0e5a81e --- /dev/null +++ b/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Linux user-space application to modify the EFI Boot Manager." +SUMMARY = "EFI Boot Manager" +HOMEPAGE = "https://github.com/rhboot/efibootmgr" +SECTION = "base" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +DEPENDS = "efivar popt" + +COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" + +SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \ + file://0001-remove-extra-decl.patch \ + " +SRCREV = "e067160ecef8208e1944002e5d50b275733211fb" + +S = "${WORKDIR}/git" + +inherit pkgconfig + +# The directory under the ESP that the default bootloader is found in. When +# wic uses a subdirectory, this should use the same one too. +EFIDIR ?= "/" + +EXTRA_OEMAKE += "'EFIDIR=${EFIDIR}'" + +CFLAGS += " -Wno-error" + +do_install () { + oe_runmake install DESTDIR="${D}" +} + +CLEANBROKEN = "1" From patchwork Wed Aug 7 05:52:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chin Huat Ang X-Patchwork-Id: 170716 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp6678478ile; Tue, 6 Aug 2019 23:00:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqx5Og7/7eS64ViVqGtQwg9siYB4SnV7vuq+LTljJkGWe9voN8z37WT7Gj6Yg8BnqdbodHCz X-Received: by 2002:a17:90a:9b8a:: with SMTP id g10mr6627563pjp.66.1565157605269; Tue, 06 Aug 2019 23:00:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565157605; cv=none; d=google.com; s=arc-20160816; b=HXeGfvH7jm7HJzcE+GHazWRZiBEh6Vj6kW59ycggHYEaTUT0xD75CFu6SKSy3kwnrb SVYurGC5jbMBlGbJFRVJL0XroKTgRVDu90xIKz9aKmLxwToGR0T7ywiF4qB44xc6tuWf YQjDiPZaM6uEaiZE6ENdk6bsOciU0M/ZE93HEBnLT8rmNyMtPjDdg2vBelyrfNmOdeW5 r+fOmj7iocB2zKkWpLmHIYxuh36pFT8QJcHav/XPiODVWg8JeHXLYU8fy4onjpe1hsjy QR68g1pa+6kS1E9i4qOUe1nX4pN0EaZXJhVdMJHGIbMGR9l/4ANulgLjiYol+KyQi6x4 /IkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=LXDtYdAivFIn1ayY5DNtaLTEMNMBvrzFUod2SNLUV20=; b=beCPVbBOcjIVhFn2pvr3Rd2G7mLSux6qgUrAw7s9Jlh+N9SawzNgxQknlT5MVT2Rjc prFwHlUNSRX60yllvVRYzYuwqXHW9AFxyYeFf2U6oQg+FBxCh1dMHjao1GZst1FKAyLB mcIkOGUZQqg9yQ9xAiqgitLM5slTMi6nL+iuTOKfQsBF6CdxauBRzKy0BiScJqdyZL7p M5HX3TS+s6Hw3FsdIFUsmC4+3OzRNstoKxhsAVHPrndLifVK16PjeGTVdqLeSobgo+RJ dKfiL87Pcgpu27bINb8L9Itj6M1gvkeBn+Su6M9F9uqhXXJIDuCzxcfsuHvx0Y7UAz7c NSMg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a88si16501562pje.6.2019.08.06.23.00.04; Tue, 06 Aug 2019 23:00:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 183EF7F473; Wed, 7 Aug 2019 05:59:52 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mail.openembedded.org (Postfix) with ESMTP id AAB0B7F45D for ; Wed, 7 Aug 2019 05:59:40 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Aug 2019 22:52:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,356,1559545200"; d="scan'208";a="168519898" Received: from andromeda02.png.intel.com ([10.221.183.11]) by orsmga008.jf.intel.com with ESMTP; 06 Aug 2019 22:52:36 -0700 From: Chin Huat Ang To: "openembedded-core@lists.openembedded.org" Date: Wed, 7 Aug 2019 13:52:30 +0800 Message-Id: <1565157150-7729-4-git-send-email-chin.huat.ang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1565157150-7729-1-git-send-email-chin.huat.ang@intel.com> References: <1565157150-7729-1-git-send-email-chin.huat.ang@intel.com> Subject: [OE-core] [warrior][PATCH 4/4] efibootmgr: Pass correct flags to compiler from pkg-config X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Khem Raj efivar.h is in usr/include/efirvar directory so it should be added to include search path via -I to compiler cmdline to fix make[1]: *** No rule to make target 'efivar.h', needed by 'efibootmgr.o'. Stop. | make[1]: *** Waiting for unfinished jobs.... When running clang to generate dependencies -MM -MG -MF it still parses the compile unit and complains if certain header is not found where as gcc does not do that, hence the compile error is only seen when compiling with clang. (From OE-Core rev: db4fa7e765cb434119d816d86b943eeb62235601) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../97668ae0bce776a36ea2001dea63d376be8274ac.patch | 83 ++++++++++++++++++++++ meta/recipes-bsp/efibootmgr/efibootmgr_17.bb | 1 + 2 files changed, 84 insertions(+) create mode 100644 meta/recipes-bsp/efibootmgr/efibootmgr/97668ae0bce776a36ea2001dea63d376be8274ac.patch -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-bsp/efibootmgr/efibootmgr/97668ae0bce776a36ea2001dea63d376be8274ac.patch b/meta/recipes-bsp/efibootmgr/efibootmgr/97668ae0bce776a36ea2001dea63d376be8274ac.patch new file mode 100644 index 0000000..9525ed8 --- /dev/null +++ b/meta/recipes-bsp/efibootmgr/efibootmgr/97668ae0bce776a36ea2001dea63d376be8274ac.patch @@ -0,0 +1,83 @@ +From 97668ae0bce776a36ea2001dea63d376be8274ac Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 6 Mar 2019 13:08:33 -0500 +Subject: [PATCH] Make sure PKGS= is propogated into the submake for "make + deps" + +When we're doing make deps with "$(CC) -MF", gcc and clang have different +behavior, both broken in different ways, which we're hitting because of a +missing -I argument for libefivar's includes. On clang, when a header can't +be found, it emits a rule with the header as a prerequisite without a path, +such as efivar.h here: + +efibootmgr.o: efibootmgr.c fix_coverity.h efivar.h efiboot.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/list.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/unparse_path.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efibootmgr.h \ + error.h + +Then the build that utilizes that rule will fail to find the +prerequisite and tell you something like: + +make[1]: *** No rule to make target 'efivar.h', needed by 'efibootmgr.o'. Stop. +make[1]: Leaving directory '/home/pjones/devel/github.com/efibootmgr/master/src' + +With gcc, when a header can't be found, it emits a rule without that header +as a prerequisite, as such (again with efivar.h): + +efibootmgr.o: efibootmgr.c fix_coverity.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/list.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/unparse_path.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efibootmgr.h \ + error.h + +And then your build will fail if you haven't adjusted CFLAGS to tell it +where to find the header. + +Both of these would be better just erroring, but at least gcc's doesn't +insert a *wrong* dependency. + +This patch adds "PKGS=efivar efibootmgr popt" for all deps under src/. +Technically that's overkill, as efibootmgr itself doesn't need popt, but it +doesn't hurt anything to have the extra part there. The resulting +.efibootmgr.d file has the prerequisites expressed correctly: + +efibootmgr.o: efibootmgr.c fix_coverity.h /usr/include/efivar/efivar.h \ + /usr/include/efivar/efiboot.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/list.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/unparse_path.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efibootmgr.h \ + error.h + +This fixes the issue described in github PR #96 + +Signed-off-by: Peter Jones +Upstream-Status: Backport [https://github.com/rhboot/efibootmgr/commit/97668ae0bce776a36ea2001dea63d376be8274ac] +--- + src/Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 258bac1..32fa188 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -31,8 +31,13 @@ efibootdump : PKGS=efivar efiboot popt + efibootnext : $(call objects-of,$(EFIBOOTNEXT_SOURCES)) + efibootnext : PKGS=efivar efiboot popt + ++deps : PKGS=efivar efiboot popt + deps : $(ALL_SOURCES) +- $(MAKE) -f $(TOPDIR)/Make.deps deps SOURCES="$(ALL_SOURCES)" SUBDIR_CFLAGS="$(SUBDIR_CFLAGS)" ++ $(MAKE) -f $(TOPDIR)/Make.deps \ ++ SOURCES="$(ALL_SOURCES)" \ ++ SUBDIR_CFLAGS="$(SUBDIR_CFLAGS)" \ ++ PKGS="$(PKGS)" \ ++ deps + + clean : + @rm -rfv *.o *.a *.so $(TARGETS) diff --git a/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb b/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb index 0e5a81e..5d6f200 100644 --- a/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb +++ b/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb @@ -12,6 +12,7 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \ file://0001-remove-extra-decl.patch \ + file://97668ae0bce776a36ea2001dea63d376be8274ac.patch \ " SRCREV = "e067160ecef8208e1944002e5d50b275733211fb"