diff options
author | James Meyer <james.meyer@operamail.com> | 2010-09-08 07:33:44 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2010-09-08 07:33:44 (GMT) |
commit | 525753e4a1a139e088d8ac120b19fbab6c0aaaa6 (patch) | |
tree | 35cef28abb613da4f58e83f6abbe4bd4cfa244bf /abs/core-testing/kernel-headers | |
parent | 592e3cad43ef12c53f523145d0fd981b54f2a049 (diff) | |
parent | b172f79fadb565ecfbcec9508f9377d8618a4f4c (diff) | |
download | linhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.zip linhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.tar.gz linhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.tar.bz2 |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/core-testing/kernel-headers')
-rw-r--r-- | abs/core-testing/kernel-headers/PKGBUILD | 30 | ||||
-rw-r--r-- | abs/core-testing/kernel-headers/netfilter-includes.patch | 91 | ||||
-rw-r--r-- | abs/core-testing/kernel-headers/serial.diff | 13 |
3 files changed, 0 insertions, 134 deletions
diff --git a/abs/core-testing/kernel-headers/PKGBUILD b/abs/core-testing/kernel-headers/PKGBUILD deleted file mode 100644 index d928a77..0000000 --- a/abs/core-testing/kernel-headers/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 19341 2008-11-20 14:48:13Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=kernel-headers -pkgver=2.6.28.5 -_basever=2.6.28 -pkgrel=1 -pkgdesc="Kernel headers sanitized for use in userspace" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnu.org/software/libc" -groups=('base') -source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${_basever}.tar.bz2 - http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2 serial.diff) -md5sums=('d351e44709c9810b85e29b877f50968a' - '7a062fcdec46cec78c3fedbf558e334b' - 'd66b5cc1e1c2ce40d06d77167f36dfd9') - -build() { - cd ${srcdir}/linux-${_basever} - patch -Np1 -i ${srcdir}/patch-${pkgver} || return 1 -# patch -p0 < ../../serial.diff - - make mrproper - make headers_check || return 1 - make INSTALL_HDR_PATH=${pkgdir}/usr headers_install - - rm -rf ${pkgdir}/usr/include/drm -} diff --git a/abs/core-testing/kernel-headers/netfilter-includes.patch b/abs/core-testing/kernel-headers/netfilter-includes.patch deleted file mode 100644 index b39a4dd..0000000 --- a/abs/core-testing/kernel-headers/netfilter-includes.patch +++ /dev/null @@ -1,91 +0,0 @@ -From: Patrick McHardy <kaber@trash.net> -Date: Wed, 21 May 2008 21:08:38 +0000 (-0700) -Subject: netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__ -X-Git-Tag: v2.6.26-rc4~7^2~9 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7 - -netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__ - -Greg Steuck <greg@nest.cx> points out that some of the netfilter -headers can't be used in userspace without including linux/types.h -first. The headers include their own linux/types.h include statements, -these are stripped by make headers-install because they are inside -#ifdef __KERNEL__ however. Move them out to fix this. - -Reported and Tested by Greg Steuck. - -Signed-off-by: Patrick McHardy <kaber@trash.net> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - -diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h -index e4c6659..0c5eb7e 100644 ---- a/include/linux/netfilter.h -+++ b/include/linux/netfilter.h -@@ -3,7 +3,6 @@ - - #ifdef __KERNEL__ - #include <linux/init.h> --#include <linux/types.h> - #include <linux/skbuff.h> - #include <linux/net.h> - #include <linux/netdevice.h> -@@ -14,6 +13,7 @@ - #include <linux/list.h> - #include <net/net_namespace.h> - #endif -+#include <linux/types.h> - #include <linux/compiler.h> - - /* Responses from hook functions. */ -diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h -index dd9c97f..590ac3d 100644 ---- a/include/linux/netfilter_arp/arp_tables.h -+++ b/include/linux/netfilter_arp/arp_tables.h -@@ -11,11 +11,11 @@ - - #ifdef __KERNEL__ - #include <linux/if.h> --#include <linux/types.h> - #include <linux/in.h> - #include <linux/if_arp.h> - #include <linux/skbuff.h> - #endif -+#include <linux/types.h> - #include <linux/compiler.h> - #include <linux/netfilter_arp.h> - -diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h -index bfc889f..092bd50 100644 ---- a/include/linux/netfilter_ipv4/ip_tables.h -+++ b/include/linux/netfilter_ipv4/ip_tables.h -@@ -17,11 +17,11 @@ - - #ifdef __KERNEL__ - #include <linux/if.h> --#include <linux/types.h> - #include <linux/in.h> - #include <linux/ip.h> - #include <linux/skbuff.h> - #endif -+#include <linux/types.h> - #include <linux/compiler.h> - #include <linux/netfilter_ipv4.h> - -diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h -index f2507dc..1089e33 100644 ---- a/include/linux/netfilter_ipv6/ip6_tables.h -+++ b/include/linux/netfilter_ipv6/ip6_tables.h -@@ -17,11 +17,11 @@ - - #ifdef __KERNEL__ - #include <linux/if.h> --#include <linux/types.h> - #include <linux/in6.h> - #include <linux/ipv6.h> - #include <linux/skbuff.h> - #endif -+#include <linux/types.h> - #include <linux/compiler.h> - #include <linux/netfilter_ipv6.h> - diff --git a/abs/core-testing/kernel-headers/serial.diff b/abs/core-testing/kernel-headers/serial.diff deleted file mode 100644 index 9b53e48..0000000 --- a/abs/core-testing/kernel-headers/serial.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- include/linux/serial.h.orig 2009-02-11 05:59:28.000000000 +0000 -+++ include/linux/serial.h 2009-02-11 06:09:24.000000000 +0000 -@@ -10,8 +10,9 @@ - #ifndef _LINUX_SERIAL_H - #define _LINUX_SERIAL_H - --#ifdef __KERNEL__ - #include <linux/types.h> -+ -+#ifdef __KERNEL__ - #include <asm/page.h> - - /* |