Fix up to work with IVI kernel-headers

diff --git a/packaging/aligned_u64_error.patch b/packaging/aligned_u64_error.patch
new file mode 100644 (file)
index 0000000..e878140
--- /dev/null
+++ b/packaging/aligned_u64_error.patch
@@ -0,0 +1,24 @@
+From 8cbd7db4c0e085c39ff5ec44ef07627a21857353 Mon Sep 17 00:00:00 2001
+From: "Graydon, Tracy" <tracy.graydon@intel.com>
+Date: Fri, 8 Feb 2013 15:48:04 -0800
+Subject: [PATCH] Fix expected specifier-qualifier-list before __aligned_u64
+ error
+
+---
+ include/linux/types.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/linux/types.h b/include/linux/types.h
+index 8b483c8..3f738ec 100644
+--- a/include/linux/types.h
++++ b/include/linux/types.h
+@@ -1,5 +1,6 @@
+ #ifndef _LINUX_TYPES_H
+ #define _LINUX_TYPES_H
++#define __aligned_u64 __u64 __attribute__((aligned(8)))
+ 
+ #include <asm/types.h>
+ 
+-- 
+1.7.11.7
+

diff --git a/packaging/iptables.changes b/packaging/iptables.changes
index 91d7caa..e4c369a 100644 (file)
--- a/packaging/iptables.changes
+++ b/packaging/iptables.changes
@@ -1,3 +1,6 @@
+* Fri Feb  8 23:53:56 UTC 2013 - tracy.graydon@intel.com
+- Fix aligned_u64_error (type.h)
+
 * Fri Feb  8 23:18:03 UTC 2013 - tracy.graydon@intel.com
 - Fork for IVI to fix for updated kernel-headers 
 

diff --git a/packaging/iptables.spec b/packaging/iptables.spec
index 30df5e3..c4cd8ad 100644 (file)
--- a/packaging/iptables.spec
+++ b/packaging/iptables.spec
@@ -8,6 +8,8 @@ URL: http://www.netfilter.org/
 License: GPLv2
 BuildRequires: kernel-headers
 Conflicts: kernel < 2.4.20
+Patch1:        aligned_u64_error.patch
+
 
 %description
 These are the user-space administration tools for the Linux
@@ -44,6 +46,7 @@ user-space packet queuing library.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %autogen