[v2,2/2] efibootmgr: add

Submitted by Ross Burton on June 12, 2019, 8:35 p.m. | Patch ID: 162155

Details

Message ID 20190612203536.32162-2-ross.burton@intel.com
State Master Next
Commit 5c01e72cca6d94f28de7f12477065b92ee1014f7
Headers show

Commit Message

Ross Burton June 12, 2019, 8:35 p.m.
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../efibootmgr/0001-remove-extra-decl.patch        | 31 ++++++++++++++++++++
 meta/recipes-bsp/efibootmgr/efibootmgr_17.bb       | 34 ++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch
 create mode 100644 meta/recipes-bsp/efibootmgr/efibootmgr_17.bb

Patch hide | download patch | download mbox

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 00000000000..42f3a8182df
--- /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 <pjones@redhat.com>
+Date: Wed, 13 Jun 2018 09:41:01 -0400
+Subject: [PATCH] remove extra decl
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+
+Upstream-Status: Backport [git://github.com/rhinstaller/efibootmgr.git]
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
+---
+ 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 00000000000..0e5a81e3166
--- /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"

Comments

Anuj Mittal June 13, 2019, 5:41 a.m.
These would need an entry in maintainers.inc as well.

https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/519/steps/7/logs/step2d

Thanks,

Anuj

On Wed, 2019-06-12 at 21:35 +0100, Ross Burton wrote:
> 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.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  .../efibootmgr/0001-remove-extra-decl.patch        | 31
> ++++++++++++++++++++
>  meta/recipes-bsp/efibootmgr/efibootmgr_17.bb       | 34
> ++++++++++++++++++++++
>  2 files changed, 65 insertions(+)
>  create mode 100644 meta/recipes-bsp/efibootmgr/efibootmgr/0001-
> remove-extra-decl.patch
>  create mode 100644 meta/recipes-bsp/efibootmgr/efibootmgr_17.bb
> 
> 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 00000000000..42f3a8182df
> --- /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 <pjones@redhat.com>
> +Date: Wed, 13 Jun 2018 09:41:01 -0400
> +Subject: [PATCH] remove extra decl
> +
> +Signed-off-by: Peter Jones <pjones@redhat.com>
> +
> +Upstream-Status: Backport
> [git://github.com/rhinstaller/efibootmgr.git]
> +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> +
> +---
> + 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 00000000000..0e5a81e3166
> --- /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"
> -- 
> 2.11.0
>