diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-04 06:40:19 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-04 06:40:19 +0000 |
| commit | bb694129212fea36ec7e30034c838599acd14241 (patch) | |
| tree | d776ec633f20c687a11b6b778da378920afb3284 | |
| parent | 96ab7493c1d1d930132a5499f9b7075b188965d5 (diff) | |
| download | aports-bb694129212fea36ec7e30034c838599acd14241.tar.bz2 aports-bb694129212fea36ec7e30034c838599acd14241.tar.xz | |
main/linux-headers: upgrade to 2.6.38.2
| -rw-r--r-- | main/linux-headers/APKBUILD | 17 | ||||
| -rw-r--r-- | main/linux-headers/scsi.patch | 42 |
2 files changed, 7 insertions, 52 deletions
diff --git a/main/linux-headers/APKBUILD b/main/linux-headers/APKBUILD index c70cc40282..536fb7827f 100644 --- a/main/linux-headers/APKBUILD +++ b/main/linux-headers/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=linux-headers -pkgver=2.6.32.2 -_kernver=2.6.32 -pkgrel=4 +pkgver=2.6.38.2 +_kernver=2.6.38 +pkgrel=0 pkgdesc="Linux system headers" url="http://kernel.org" -arch="all" +arch="noarch" license='GPL-2' makedepends="perl" if [ "$ALPINE_LIBC" = "eglibc" ]; then @@ -16,15 +16,13 @@ fi options="!strip !tracedeps" source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 - scsi.patch " prepare() { cd "$srcdir"/linux-$_kernver if [ "$_kernver" != "$pkgver" ]; then - bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 || return 1 + bunzip2 -c < "$srcdir"/patch-$pkgver.bz2 | patch -p1 || return 1 fi - patch -p1 -i "$srcdir"/scsi.patch || return 1 } build() { @@ -44,6 +42,5 @@ package() { rm -rf "$pkgdir"/usr/include/drm } -md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 -924b7aa0fcd6e54c12ecc9b3c3082f59 patch-2.6.32.2.bz2 -b6d05566fcfe07770d9386f0588f8758 scsi.patch" +md5sums="7d471477bfa67546f902da62227fa976 linux-2.6.38.tar.bz2 +599badab31c4920d4122133208c810d7 patch-2.6.38.2.bz2" diff --git a/main/linux-headers/scsi.patch b/main/linux-headers/scsi.patch deleted file mode 100644 index f85a3b7501..0000000000 --- a/main/linux-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 |