[packages/efivar.git] / efivar-build.patch

--- efivar-0.23/src/linux.c.orig	2016-06-23 20:56:40.006600643 +0200
+++ efivar-0.23/src/linux.c	2016-06-23 20:56:49.526548896 +0200
@@ -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>
--- efivar-0.23/src/Makefile.orig	2016-06-23 21:04:59.510561274 +0200
+++ efivar-0.23/src/Makefile	2016-06-23 21:08:25.262779936 +0200
@@ -60,6 +60,7 @@
 libefiboot.a : $(patsubst %.o,%.static.o,$(LIBEFIBOOT_OBJECTS))
 
 libefiboot.so : $(LIBEFIBOOT_OBJECTS)
+libefiboot.so : LIBS=efivar
 
 deps :: $(ALL_SOURCES)
 	$(MAKE) -f $(SRCDIR)/Make.deps deps SOURCES="$(ALL_SOURCES)"
Commit	Line	Data
6ae92608 JB	1	--- efivar-0.23/src/linux.c.orig 2016-06-23 20:56:40.006600643 +0200
	2	+++ efivar-0.23/src/linux.c 2016-06-23 20:56:49.526548896 +0200
	3	@@ -22,7 +22,12 @@
	4	#include <inttypes.h>
	5	#include <limits.h>
	6	#include <linux/ethtool.h>
	7	+#include <linux/version.h>
	8	+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
	9	+#include <linux/nvme_ioctl.h>
	10	+#else
	11	#include <linux/nvme.h>
	12	+#endif
	13	#include <linux/sockios.h>
	14	#include <net/if.h>
	15	#include <scsi/scsi.h>
	16	--- efivar-0.23/src/Makefile.orig 2016-06-23 21:04:59.510561274 +0200
	17	+++ efivar-0.23/src/Makefile 2016-06-23 21:08:25.262779936 +0200
	18	@@ -60,6 +60,7 @@
	19	libefiboot.a : $(patsubst %.o,%.static.o,$(LIBEFIBOOT_OBJECTS))
	20
	21	libefiboot.so : $(LIBEFIBOOT_OBJECTS)
	22	+libefiboot.so : LIBS=efivar
	23
	24	deps :: $(ALL_SOURCES)
	25	$(MAKE) -f $(SRCDIR)/Make.deps deps SOURCES="$(ALL_SOURCES)"