Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1463 from alihanozturk/master

Browse Source 
efivar:update
This commit is contained in:
Ertuğrul Erata
2016-03-30 13:04:45 +03:00
parent f81b83d393 927ad669f4
commit 065ab00833
4 changed files with 66 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/boot/efivar/actions.py
+2 -1
View File
@@ -12,7 +12,8 @@ from pisi.actionsapi import get
def build():
shelltools.export("CFLAGS", "-Os")
pisitools.dosed("Make.defaults","-O0","-Os")
autotools.make("libdir=/usr/lib bindir=/usr/bin")
pisitools.dosed("src/test/Makefile","-rpath=$(TOPDIR)/src/","-rpath=$(libdir)|g")
autotools.make("libdir=/usr/lib bindir=/usr/bin includedir=/usr/include/ V=1 -j1")
def install():
autotools.rawInstall("DESTDIR=%s libdir=/usr/lib/" % get.installDIR())
system/boot/efivar/files/0001-Workaround-rename-of-linux-nvme.h.patch
+29
View File
@@ -0,0 +1,29 @@
From 3a0ae7189fe96355d64dc2daf91cf85282773c66 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Thu, 14 Jan 2016 17:02:31 -0500
Subject: [PATCH] Workaround rename of linux/nvme.h
Bug: https://bugs.gentoo.org/571548
---
src/linux.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/linux.c b/src/linux.c
index b618cfd..9388cd3 100644
--- a/src/linux.c
+++ b/src/linux.c
@@ -22,7 +22,12 @@
#include <inttypes.h>
#include <limits.h>
#include <linux/ethtool.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
+#include <linux/nvme_ioctl.h>
+#else
#include <linux/nvme.h>
+#endif
#include <linux/sockios.h>
#include <net/if.h>
#include <scsi/scsi.h>
--
2.7.2
system/boot/efivar/files/efivar-no-static.patch
+25
View File
@@ -0,0 +1,25 @@
From d084645fdc9bf805b39b0fb3ff7ec315661884be Mon Sep 17 00:00:00 2001
From: Gary Lin <glin@suse.com>
Date: Wed, 9 Mar 2016 12:19:26 +0800
Subject: [PATCH] Remove efivar-static since it requires static libs
Signed-off-by: Gary Lin <glin@suse.com>
---
src/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile b/src/Makefile
index 5fc7887..e1c1ccd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/Make.defaults
LIBTARGETS=libefivar.so libefiboot.so
STATICLIBTARGETS=libefivar.a libefiboot.a
-BINTARGETS=efivar efivar-static
+BINTARGETS=efivar
PCTARGETS=efivar.pc efiboot.pc
TARGETS=$(LIBTARGETS) $(STATICLIBTARGETS) $(BINTARGETS) $(PCTARGETS)
--
2.7.2
system/boot/efivar/pspec.xml
+10 -4
View File
@@ -1,4 +1,3 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
@@ -13,14 +12,21 @@
<IsA>app:console</IsA>
<Summary>Tools and library to manipulate EFI variables</Summary>
<Description>Tools and library to manipulate EFI variables.</Description>
<Archive sha1sum="db9553acd4ac3fc39ed2bb3078da17348646d8ea" type="tarbz2">https://github.com/rhinstaller/efivar/releases/download/0.15/efivar-0.15.tar.bz2</Archive>
<Archive sha1sum="680a648e5e36a2b4b012fb7705b3e6610bcd42a2" type="tarbz2">https://github.com/rhinstaller/efivar/releases/download/0.23/efivar-0.23.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">efivar-no-static.patch</Patch>
</Patches>
</Source>
<Package>
<Name>efivar</Name>
<RuntimeDependencies>
<Dependency>popt</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
@@ -37,8 +43,8 @@
<History>
<Update release="1">
<Date>2015-02-21</Date>
<Version>0.15</Version>
<Date>2016-03-29</Date>
<Version>0.23</Version>
<Comment>First release</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>