Date: Thursday, December 16, 2010 @ 19:51:31 Author: allan Revision: 103260
binutils-2.21 toolchain rebuild, bump to latest upstream, scsi.h moves back to glibc Modified: linux-api-headers/trunk/PKGBUILD Deleted: linux-api-headers/trunk/scsi.patch ------------+ PKGBUILD | 20 ++++++++------------ scsi.patch | 42 ------------------------------------------ 2 files changed, 8 insertions(+), 54 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-12-17 00:03:59 UTC (rev 103259) +++ PKGBUILD 2010-12-17 00:51:31 UTC (rev 103260) @@ -1,32 +1,27 @@ # $Id$ -# Maintainer: Jan de Groot <[email protected]> # Maintainer: Allan McRae <[email protected]> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-api-headers -pkgver=2.6.34 -_basever=2.6.34 +pkgver=2.6.36.2 +_basever=2.6.36 pkgrel=1 pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc"; license=('GPL2') provides=("kernel-headers=${pkgver}") -conflicts=("glibc<=2.10.1-4" 'kernel-headers') +conflicts=('kernel-headers') replaces=('kernel-headers') 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.patch) -md5sums=('10eebcb0178fb4540e2165bfd7efc7ad' - 'b6d05566fcfe07770d9386f0588f8758') + http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2) +md5sums=('61f3739a73afb6914cb007f37fb09b62' + '4b01c5f9657a9587b262df5f8d784116') build() { cd ${srcdir}/linux-${_basever} - #patch -Np1 -i ${srcdir}/patch-${pkgver} - - # fix issues with transition of scsi.h from glibc - patch -Np1 -i ${srcdir}/scsi.patch + patch -Np1 -i ${srcdir}/patch-${pkgver} make mrproper make headers_check @@ -39,5 +34,6 @@ # use headers from libdrm rm -rf ${pkgdir}/usr/include/drm + # clean-up unnecessary files generated during install rm -f $(find ${pkgdir} -name .install -or -name ..install.cmd) } Deleted: scsi.patch =================================================================== --- scsi.patch 2010-12-17 00:03:59 UTC (rev 103259) +++ scsi.patch 2010-12-17 00:51:31 UTC (rev 103260) @@ -1,42 +0,0 @@ -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
