[arch-commits] Commit in kernel-headers/trunk (PKGBUILD scsi.patch)

[Allan McRae]

    Date: Saturday, December 12, 2009 @ 02:40:59
  Author: allan
Revision: 61099

upgpkg: kernel-headers 2.6.32-1
    glibc-2.11.1 rebuild, update to latest upstream, fix scsi.h (FS#17408)

Modified:
  kernel-headers/trunk/PKGBUILD
  kernel-headers/trunk/scsi.patch

------------+
 PKGBUILD   |   13 ++++++-------
 scsi.patch |   33 ++++++++++++++++++++++++++++-----
 2 files changed, 34 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-12-12 07:04:55 UTC (rev 61098)
+++ PKGBUILD	2009-12-12 07:40:59 UTC (rev 61099)
@@ -5,8 +5,8 @@
 # toolchain build order: kernel-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=kernel-headers
-pkgver=2.6.31.5
-_basever=2.6.31
+pkgver=2.6.32
+_basever=2.6.32
 pkgrel=1
 pkgdesc="Kernel headers sanitized for use in userspace"
 arch=('i686' 'x86_64')
@@ -15,15 +15,14 @@
 groups=('base')
 conflicts=("glibc<=2.10.1-4")
 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
+	#http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2
 	scsi.patch)
-md5sums=('84c077a37684e4cbfa67b18154390d8a'
-         '6cac5e59d5562b591cdda485941204d5'
-         '08204edc45279cfb845208fde9894b9f')
+md5sums=('260551284ac224c3a43c4adac7df4879'
+         'b6d05566fcfe07770d9386f0588f8758')
 
 build() {
   cd ${srcdir}/linux-${_basever}
-  patch -Np1 -i ${srcdir}/patch-${pkgver} || return 1
+  #patch -Np1 -i ${srcdir}/patch-${pkgver} || return 1
   
   # fix issues with transition of scsi.h from glibc
   patch -Np1 -i ${srcdir}/scsi.patch || return 1

Modified: scsi.patch
===================================================================
--- scsi.patch	2009-12-12 07:04:55 UTC (rev 61098)
+++ scsi.patch	2009-12-12 07:40:59 UTC (rev 61099)
@@ -1,8 +1,7 @@
-diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
-index 084478e..dfcfaab 100644
---- a/include/scsi/scsi.h
-+++ b/include/scsi/scsi.h
-@@ -142,10 +142,10 @@ struct scsi_cmnd;
+diff -Naur linux-2.6.32-old/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h
+--- linux-2.6.32-old/include/scsi/scsi.h	2009-12-03 13:51:21.000000000 +1000
++++ linux-2.6.32/include/scsi/scsi.h	2009-12-12 10:43:11.000000000 +1000
+@@ -145,14 +145,15 @@
  
  /* defined in T10 SCSI Primary Commands-2 (SPC2) */
  struct scsi_varlen_cdb_hdr {
@@ -17,3 +16,27 @@
  	__be16 service_action;
  	/* service specific data follows */
  };
+ 
++#ifdef __KERNEL__
+ static inline unsigned
+ scsi_varlen_cdb_length(const void *hdr)
+ {
+@@ -168,6 +169,7 @@
+ 	return (cmnd[0] == VARIABLE_LENGTH_CMD) ?
+ 		scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]);
+ }
++#endif
+ 
+ /*
+  *  SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
+@@ -284,8 +286,10 @@
+ 	SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */
+ };
+ 
++#ifdef __KERNEL__
+ /* Returns a human-readable name for the device */
+ extern const char * scsi_device_type(unsigned type);
++#endif
+ 
+ /*
+  * standard mode-select header prepended to all mode-select commands