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"