diff options
| -rw-r--r-- | abs/core/linux-api-headers/PKGBUILD | 23 | ||||
| l--------- | abs/core/linux-api-headers/linux-api-headers-2.6.34-1-i686.pkg.tar.gz | 1 | ||||
| -rw-r--r-- | abs/core/linux-api-headers/scsi.patch | 42 |
3 files changed, 9 insertions, 57 deletions
diff --git a/abs/core/linux-api-headers/PKGBUILD b/abs/core/linux-api-headers/PKGBUILD index 7090df8..27dfd88 100644 --- a/abs/core/linux-api-headers/PKGBUILD +++ b/abs/core/linux-api-headers/PKGBUILD @@ -1,32 +1,26 @@ -# $Id: PKGBUILD 80778 2010-05-22 07:55:08Z allan $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 106756 2011-01-19 00:34:07Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # 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.37 +_basever=2.6.37 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') +source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_basever}.tar.bz2) + #http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2) +md5sums=('c8ee37b4fdccdb651e0603d35350b434') 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 make mrproper make headers_check @@ -39,5 +33,6 @@ package() { # use headers from libdrm rm -rf ${pkgdir}/usr/include/drm - rm -f $(find ${pkgdir} -name .install -or -name ..install.cmd) + # clean-up unnecessary files generated during install + find ${pkgdir} -name .install -or -name ..install.cmd | xargs rm -f } diff --git a/abs/core/linux-api-headers/linux-api-headers-2.6.34-1-i686.pkg.tar.gz b/abs/core/linux-api-headers/linux-api-headers-2.6.34-1-i686.pkg.tar.gz deleted file mode 120000 index 2e2ed4c..0000000 --- a/abs/core/linux-api-headers/linux-api-headers-2.6.34-1-i686.pkg.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/linux-api-headers-2.6.34-1-i686.pkg.tar.gz
\ No newline at end of file diff --git a/abs/core/linux-api-headers/scsi.patch b/abs/core/linux-api-headers/scsi.patch deleted file mode 100644 index f85a3b7..0000000 --- a/abs/core/linux-api-headers/scsi.patch +++ /dev/null @@ -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 |