oasis

commit: d84192da7ee80885b586bae30125cf84a9166bad
parent 506a146fe48ce91e07942e3ff2ea4e7093419ef6
Author: Michael Forney <mforney@mforney.org>
Date:   Thu,  6 Dec 2018 22:54:42 -0800

efivar: Update to 37

Diffstat:
M
.gitmodules
2
+-
A
pkg/efibootmgr/patch/0001-remove-extra-decl.patch
27
+++++++++++++++++++++++++++
M
pkg/efibootmgr/rev
2
+-
M
pkg/efivar/gen.lua
2
+-
D
pkg/efivar/patch/0001-Fix-a-makeguids-building-problem-with-generics.h.patch
34
----------------------------------
M
pkg/efivar/rev
2
+-

6 files changed, 31 insertions(+), 38 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -37,10 +37,10 @@
 [submodule "pkg/efibootmgr/src"]
 	path = pkg/efibootmgr/src
 	url = https://github.com/rhinstaller/efibootmgr
+	ignore = all
 [submodule "pkg/efivar/src"]
 	path = pkg/efivar/src
 	url = https://github.com/rhinstaller/efivar
-	ignore=all
 [submodule "pkg/elfutils/src"]
 	path = pkg/elfutils/src
 	url = git://sourceware.org/git/elfutils.git
diff --git a/pkg/efibootmgr/patch/0001-remove-extra-decl.patch b/pkg/efibootmgr/patch/0001-remove-extra-decl.patch
@@ -0,0 +1,27 @@
+From b60ba776eb8969d7631a6fecafd5040d7331a050 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>
+---
+ 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.19.1
+
diff --git a/pkg/efibootmgr/rev b/pkg/efibootmgr/rev
@@ -1 +1 @@
-5
+6
diff --git a/pkg/efivar/gen.lua b/pkg/efivar/gen.lua
@@ -45,7 +45,7 @@ pkg.deps = {'$outdir/include/efivar/efivar-guids.h'}
 lib('libefiboot.a', [[
 	src/(
 		crc32.c creator.c disk.c gpt.c loadopt.c path-helpers.c linux.c
-		linux-(ata i2o nvme pci pmem sas sata scsi virtblk).c
+		linux-(acpi acpi-root ata emmc i2o md nvme pci pci-root pmem sas sata scsi soc-root virtblk).c
 	)
 ]])
 lib('libefivar.a', [[
diff --git a/pkg/efivar/patch/0001-Fix-a-makeguids-building-problem-with-generics.h.patch b/pkg/efivar/patch/0001-Fix-a-makeguids-building-problem-with-generics.h.patch
@@ -1,34 +0,0 @@
-From ca5794a4c375794c97cf3c185dda27529e5b3961 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Wed, 20 Jun 2018 14:12:42 -0400
-Subject: [PATCH] Fix a makeguids building problem with generics.h.
-
-Guard generics.h with EFIVAR_BUILD_ENVIRONMENT to keep it from
-interfering with the makeguids build if libefivar.so isn't around
-already.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/generics.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/generics.h b/src/generics.h
-index e6af2fa..66be4bd 100644
---- a/src/generics.h
-+++ b/src/generics.h
-@@ -17,6 +17,7 @@
-  *
-  */
- 
-+#ifndef EFIVAR_BUILD_ENVIRONMENT
- #ifndef LIBEFIVAR_GENERIC_NEXT_VARIABLE_NAME_H
- #define LIBEFIVAR_GENERIC_NEXT_VARIABLE_NAME_H 1
- 
-@@ -182,3 +183,4 @@ generic_append_variable(efi_guid_t guid, const char *name,
- }
- 
- #endif /* LIBEFIVAR_GENERIC_NEXT_VARIABLE_NAME_H */
-+#endif /* EFIVAR_BUILD_ENVIRONMENT */
--- 
-2.19.1
-
diff --git a/pkg/efivar/rev b/pkg/efivar/rev
@@ -1 +1 @@
-8
+9