[arch-commits] CVS update of core/base/kernel-headers (PKGBUILD if_addrlabel.h.patch)

[Jan de Groot]

    Date: Thursday, March 6, 2008 @ 17:14:05
  Author: jgc
    Path: /home/cvs-core/core/base/kernel-headers

   Added: if_addrlabel.h.patch (1.1)
Modified: PKGBUILD (1.14 -> 1.15)

upgpkg: kernel-headers 2.6.24.3-1
    Update to 2.6.24, prepare for gcc 4.3. Remove SCSI patch as that header is no longer included


----------------------+
 PKGBUILD             |   20 +++++++++++---------
 if_addrlabel.h.patch |   25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 9 deletions(-)


Index: core/base/kernel-headers/PKGBUILD
diff -u core/base/kernel-headers/PKGBUILD:1.14 core/base/kernel-headers/PKGBUILD:1.15
--- core/base/kernel-headers/PKGBUILD:1.14	Thu Nov 15 18:53:17 2007
+++ core/base/kernel-headers/PKGBUILD	Thu Mar  6 17:14:05 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.14 2007/11/15 23:53:17 daniel Exp $
+# $Id: PKGBUILD,v 1.15 2008/03/06 22:14:05 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=kernel-headers
-pkgver=2.6.23.1
-_basever=2.6.23
-pkgrel=2
+pkgver=2.6.24.3
+_basever=2.6.24
+pkgrel=1
 pkgdesc="Kernel headers sanitized for use in userspace"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -11,15 +11,17 @@
 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
-	scsi-sg.h.patch)
-md5sums=('2cc2fd4d521dc5d7cfce0d8a9d1b3472'
-         '896c5d4e7fd68d37b8c16e5d2842563b'
-         '07cd1edfdda7fe89718459aad2244c45')
+	if_addrlabel.h.patch)
+md5sums=('3f23ad4b69d0a552042d1ed0f4399857'
+         '4c42be33a7d98f280588c9d28478cdfd'
+	 '1f27d84eeb9857c462af1bd3f966d71f')
 
 build() {
   cd ${startdir}/src/linux-${_basever}
   patch -Np1 -i ${startdir}/src/patch-${pkgver} || return 1
-  patch -Np0 -i ${startdir}/src/scsi-sg.h.patch || return 1
+  patch -Np1 -R -i ${startdir}/src/if_addrlabel.h.patch || return 1
 
+  make mrproper
+  make headers_check || return 1
   make INSTALL_HDR_PATH=${startdir}/pkg/usr headers_install
 }
Index: core/base/kernel-headers/if_addrlabel.h.patch
diff -u /dev/null core/base/kernel-headers/if_addrlabel.h.patch:1.1
--- /dev/null	Thu Mar  6 17:14:05 2008
+++ core/base/kernel-headers/if_addrlabel.h.patch	Thu Mar  6 17:14:05 2008
@@ -0,0 +1,25 @@
+From: Stephen Hemminger <stephen.hemminger at vyatta.com>
+Date: Tue, 5 Feb 2008 11:18:51 +0000 (-0800)
+Subject: [NET]: Add if_addrlabel.h to sanitized headers.
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-2.6.24.y.git;a=commitdiff_plain;h=dded91611a728d65721cdab3dd41d801a356fa15
+
+[NET]: Add if_addrlabel.h to sanitized headers.
+
+if_addrlabel.h is needed for iproute2 usage.
+
+Signed-off-by: Stephen Hemminger <stephen.hemminger at vyatta.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+
+diff --git a/include/linux/Kbuild b/include/linux/Kbuild
+index c0f9bb7..9363122 100644
+--- a/include/linux/Kbuild
++++ b/include/linux/Kbuild
+@@ -219,6 +219,7 @@ unifdef-y += i2c-dev.h
+ unifdef-y += icmp.h
+ unifdef-y += icmpv6.h
+ unifdef-y += if_addr.h
++unifdef-y += if_addrlabel.h
+ unifdef-y += if_arp.h
+ unifdef-y += if_bridge.h
+ unifdef-y += if_ec.h