From 64aeaf9e6d25770d0882a9afa06bea7825a4babc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= <ertugrulerata@gmail.com>
Date: Sat, 9 Dec 2017 22:56:49 +0300
Subject: [PATCH] efivar and efibootmgr update

---
 system/boot/efibootmgr/actions.py |  8 ++------
 system/boot/efibootmgr/pspec.xml  | 16 ++++++++++++++--
 system/boot/efivar/pspec.xml      | 15 +++++++++++++--
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/system/boot/efibootmgr/actions.py b/system/boot/efibootmgr/actions.py
index 065cb84029..4b253ac6e0 100644
--- a/system/boot/efibootmgr/actions.py
+++ b/system/boot/efibootmgr/actions.py
@@ -11,17 +11,13 @@ from pisi.actionsapi import get
 
 def build():
     shelltools.export("CFLAGS", "-Os")
-    autotools.make("all")
+    autotools.make("EFIDIR='/boot/EFI'")
 
 def install():
-    pisitools.dosed("Makefile","BINDIR := /usr/sbin","BINDIR := %s/usr/sbin" % get.installDIR())
-    
     shelltools.makedirs("%s/usr/sbin" % get.installDIR())
-    #shelltools.makedirs("%s/usr/lib" % get.installDIR())
     shelltools.makedirs("%s/usr/share/man" % get.installDIR())
     shelltools.makedirs("%s/usr/include" % get.installDIR())
     
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    # pisitools.insinto("/usr/lib", "src/lib/*.o")
+    autotools.rawInstall("EFIDIR='/boot/EFI' DESTDIR=%s" % get.installDIR())
     pisitools.insinto("/usr/share/man", "src/*.8")
     pisitools.insinto("/usr/include", "src/include/*.h")
diff --git a/system/boot/efibootmgr/pspec.xml b/system/boot/efibootmgr/pspec.xml
index 2f16e55f4d..b44538e259 100644
--- a/system/boot/efibootmgr/pspec.xml
+++ b/system/boot/efibootmgr/pspec.xml
@@ -12,13 +12,12 @@
         <IsA>app:console</IsA>
         <Summary>Tool to modify UEFI Firmware Boot Manager Variables</Summary>
         <Description>a Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager.</Description>
-        <Archive sha1sum="96abfdad3140ed5b9f034668b0f0a951cdafdec1" type="tarbz2">https://github.com/rhinstaller/efibootmgr/releases/download/14/efibootmgr-14.tar.bz2</Archive>
+        <Archive sha1sum="9dc7ca7b14a47fc178a5bb7b9c0a79cc05e2b272" type="tarbz2">https://github.com/rhinstaller/efibootmgr/releases/download/15/efibootmgr-15.tar.bz2</Archive>
         <BuildDependencies>
            <Dependency>pciutils-devel</Dependency>
            <Dependency>zlib-devel</Dependency>
            <Dependency>popt-devel</Dependency>
            <Dependency>efivar-devel</Dependency>
-           <Dependency>efivar</Dependency>
         </BuildDependencies>        
     </Source>
 
@@ -26,6 +25,7 @@
         <Name>efibootmgr</Name>
         <RuntimeDependencies>
             <Dependency>efivar</Dependency>
+            <Dependency>popt</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/sbin</Path>
@@ -35,12 +35,24 @@
     </Package>
     <Package>
         <Name>efibootmgr-devel</Name>
+        <RuntimeDependencies>
+            <Dependency>popt-devel</Dependency>
+            <Dependency>efivar-devel</Dependency>
+            <Dependency release="current">efibootmgr</Dependency>
+        </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
         </Files>
     </Package>
 
     <History>
+        <Update release="8">
+            <Date>2017-12-09</Date>
+            <Version>15</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="7">
             <Date>2017-02-14</Date>
             <Version>14</Version>
diff --git a/system/boot/efivar/pspec.xml b/system/boot/efivar/pspec.xml
index 133fd3be12..508993c570 100644
--- a/system/boot/efivar/pspec.xml
+++ b/system/boot/efivar/pspec.xml
@@ -12,14 +12,14 @@
         <IsA>app:console</IsA>
         <Summary>Tools and library to manipulate EFI variables</Summary>
         <Description>Tools and library to manipulate EFI variables.</Description>
-        <Archive sha1sum="952cec04ed9968c2a23c04a55ee7d0481c7c4ced" type="tarbz2">https://github.com/rhinstaller/efivar/releases/download/26/efivar-26.tar.bz2</Archive>
+        <Archive sha1sum="ae5b4c3aeb29fe0ef5212142b0a21d6f003dd266" type="tarbz2">https://github.com/rhinstaller/efivar/releases/download/31/efivar-31.tar.bz2</Archive>
         <BuildDependencies>
            <Dependency>popt-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <!--<Patch level="1">0001-Workaround-rename-of-linux-nvme.h.patch</Patch>-->
             <!--<Patch level="1">deprecated-readdir_r.patch</Patch>-->
-            <Patch level="1">efivar-no-static.patch</Patch>
+            <!--Patch level="1">efivar-no-static.patch</Patch-->
         </Patches>
     </Source>
 
@@ -36,6 +36,10 @@
     </Package>
     <Package>
         <Name>efivar-devel</Name>
+        <RuntimeDependencies>
+            <Dependency>popt-devel</Dependency>
+            <Dependency release="current">efivar</Dependency>
+        </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="data">/usr/lib/pkgconfig</Path>
@@ -43,6 +47,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2017-12-09</Date>
+            <Version>31</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2017-01-24</Date>
             <Version>26</Version>