Date: Monday, January 25, 2010 @ 22:23:53 Author: allan Revision: 65259
upgpkg: linux-api-headers 2.6.32.5-2 no arch=any, commit patch Added: linux-api-headers/trunk/scsi.patch Modified: linux-api-headers/trunk/PKGBUILD ------------+ PKGBUILD | 6 +++--- scsi.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-01-26 03:21:26 UTC (rev 65258) +++ PKGBUILD 2010-01-26 03:23:53 UTC (rev 65259) @@ -7,13 +7,13 @@ pkgname=linux-api-headers pkgver=2.6.32.5 _basever=2.6.32 -pkgrel=1 +pkgrel=2 pkgdesc="Kernel headers sanitized for use in userspace" -arch=('any') +arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" license=('GPL') groups=('base') -provides=('kernel-headers') +provides=("kernel-headers=${pkgver}") conflicts=("glibc<=2.10.1-4" 'kernel-headers') replaces=('kernel-headers') source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${_basever}.tar.bz2 Added: scsi.patch =================================================================== --- scsi.patch (rev 0) +++ scsi.patch 2010-01-26 03:23:53 UTC (rev 65259) @@ -0,0 +1,42 @@ +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 { +- u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ +- u8 control; +- u8 misc[5]; +- u8 additional_cdb_length; /* total cdb length - 8 */ ++ __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ ++ __u8 control; ++ __u8 misc[5]; ++ __u8 additional_cdb_length; /* total cdb length - 8 */ + __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