Accepting request 618475 from home:oliver_gtze:branches:Base:System

update to version 36

OBS-URL: https://build.opensuse.org/request/show/618475
OBS-URL: https://build.opensuse.org/package/show/Base:System/efivar?expand=0&rev=32
This commit is contained in:
Marcus Meissner 2018-06-26 08:33:14 +00:00 committed by Git OBS Bridge
parent 90e8a92b63
commit 0118d649b9
5 changed files with 41 additions and 59 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d891958a5a762a43371987c46ca112ba506a26312d4969e6871d77acb5ea787e
size 82404

3
efivar-36.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:94bfccc20889440978a85f08d5af4619040ee199001b62588d47d676f58c0d33
size 105928

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jun 20 15:03:30 UTC 2018 - oliver@getspam.de
- Update to version 36
- adjust libefiboot-export-disk_get_partition_info.patch to fit
new version
-------------------------------------------------------------------
Thu Mar 23 15:32:57 UTC 2017 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
#
# spec file for package efivar
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,10 +28,10 @@
%define major 1
Name: efivar
Version: 31
Version: 36
Release: 0
Summary: Tools to manage UEFI variables
License: LGPL-2.1
License: LGPL-2.1-only
Group: Development/Libraries/C and C++
Url: https://github.com/rhinstaller/efivar
Source: https://github.com/rhinstaller/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2

View File

@ -1,26 +1,8 @@
From: Raymund Will <rw@suse.com>
Date: Fri, 3 Mar 2017 18:36:30 +0100
Subject: [PATCH] libefiboot: export disk_get_partition_info()
References: bsc#870211, bsc#945705
This is necessary to extend to functionality of 'efibootmgr --delete'
beyond a mere '--bootnum'-usage.
Signed-off-by: Raymund Will <rw@suse.com>
---
src/disk.c | 27 +++++++++++++++++++++++++++
src/include/efivar/efiboot-disk.h | 32 ++++++++++++++++++++++++++++++++
src/include/efivar/efiboot.h | 1 +
src/libefiboot.map.in | 4 ++++
5 files changed, 67 insertions(+), 2 deletions(-)
create mode 100644 src/include/efivar/efiboot-disk.h
diff --git a/src/disk.c b/src/disk.c
index 91d636d..df8066b 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -247,6 +247,33 @@ get_partition_info(int fd, uint32_t options,
return rc;
diff -ruN efivar-36.orig/src/disk.c efivar-36/src/disk.c
--- efivar-36.orig/src/disk.c 2018-06-20 15:11:14.775975508 +0200
+++ efivar-36/src/disk.c 2018-06-20 16:45:26.191953950 +0200
@@ -256,6 +256,33 @@
return true;
}
+/*
@ -50,14 +32,12 @@ index 91d636d..df8066b 100644
+ start, size, signature, mbr_type, signature_type);
+}
+
ssize_t
__attribute__((__visibility__ ("hidden")))
_make_hd_dn(uint8_t *buf, ssize_t size, int fd, uint32_t partition,
diff --git a/src/include/efivar/efiboot-disk.h b/src/include/efivar/efiboot-disk.h
new file mode 100644
index 0000000..50ae862
--- /dev/null
+++ b/src/include/efivar/efiboot-disk.h
ssize_t HIDDEN
_make_hd_dn(uint8_t *buf, ssize_t size, int fd, int32_t partition,
uint32_t options)
diff -ruN efivar-36.orig/src/include/efivar/efiboot-disk.h efivar-36/src/include/efivar/efiboot-disk.h
--- efivar-36.orig/src/include/efivar/efiboot-disk.h 1970-01-01 01:00:00.000000000 +0100
+++ efivar-36/src/include/efivar/efiboot-disk.h 2018-06-20 16:47:47.111953412 +0200
@@ -0,0 +1,32 @@
+/*
+ * libefiboot - library for the manipulation of EFI boot variables
@ -91,22 +71,20 @@ index 0000000..50ae862
+ __attribute__((__visibility__ ("default")));
+
+#endif /* _EFIBOOT_BOOT_H */
diff --git a/src/include/efivar/efiboot.h b/src/include/efivar/efiboot.h
index 9a4b450..a2512b0 100644
--- a/src/include/efivar/efiboot.h
+++ b/src/include/efivar/efiboot.h
diff -ruN efivar-36.orig/src/include/efivar/efiboot.h efivar-36/src/include/efivar/efiboot.h
--- efivar-36.orig/src/include/efivar/efiboot.h 2018-06-20 15:11:14.779975508 +0200
+++ efivar-36/src/include/efivar/efiboot.h 2018-06-20 16:49:20.599953055 +0200
@@ -34,5 +34,6 @@
#include <efiboot-creator.h>
#include <efiboot-loadopt.h>
+#include <efiboot-disk.h>
#include <efivar/efiboot-creator.h>
#include <efivar/efiboot-loadopt.h>
+#include <efivar/efiboot-disk.h>
#endif /* EFIBOOT_H */
diff --git a/src/libefiboot.map.in b/src/libefiboot.map.in
index cb19d65..15970d9 100644
--- a/src/libefiboot.map.in
+++ b/src/libefiboot.map.in
@@ -33,3 +33,7 @@ LIBEFIBOOT_1.29 {
diff -ruN efivar-36.orig/src/libefiboot.map.in efivar-36/src/libefiboot.map.in
--- efivar-36.orig/src/libefiboot.map.in 2018-06-20 15:11:14.779975508 +0200
+++ efivar-36/src/libefiboot.map.in 2018-06-21 18:32:07.615999484 +0200
@@ -33,3 +33,7 @@
LIBEFIBOOT_1.30 {
} LIBEFIBOOT_1.29;
@ -114,6 +92,3 @@ index cb19d65..15970d9 100644
+LIBEFIBOOT_1.31 {
+ global: efi_disk_get_partition_info;
+} LIBEFIBOOT_1.30;
--
2.6.6