aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-01-06 10:46:29 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-01-06 10:46:29 +0000
commit1596e9266586fb64e63dbcf3a9bcacbe3b49391c (patch)
tree2a42ebe6c063af44ca38cfc6e52be9bd3fd4fdff /main
parent3c9381442cb2cf40402d98e863cfe19ccb83d1a0 (diff)
downloadaports-1596e9266586fb64e63dbcf3a9bcacbe3b49391c.tar.bz2
aports-1596e9266586fb64e63dbcf3a9bcacbe3b49391c.tar.xz
main/linux-headers: fix issues with transition of scsi.h
Diffstat (limited to 'main')
-rw-r--r--main/linux-headers/APKBUILD7
-rw-r--r--main/linux-headers/scsi.patch42
2 files changed, 47 insertions, 2 deletions
diff --git a/main/linux-headers/APKBUILD b/main/linux-headers/APKBUILD
index fce56c754e..2dce290148 100644
--- a/main/linux-headers/APKBUILD
+++ b/main/linux-headers/APKBUILD
@@ -2,7 +2,7 @@
pkgname=linux-headers
pkgver=2.6.32.2
_kernver=2.6.32
-pkgrel=0
+pkgrel=1
pkgdesc="Linux system headers"
url="http://kernel.org"
license='GPL-2'
@@ -11,6 +11,7 @@ replaces="uclibc-dev"
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
"
build() {
@@ -18,6 +19,7 @@ build() {
if [ "$_kernver" != "$pkgver" ]; then
bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 || return 1
fi
+ patch -p1 -i "$srcdir"/scsi.patch || return 1
mkdir -p "$pkgdir/usr"
make headers_install INSTALL_HDR_PATH="$pkgdir/usr"
@@ -30,4 +32,5 @@ build() {
}
md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
-924b7aa0fcd6e54c12ecc9b3c3082f59 patch-2.6.32.2.bz2"
+924b7aa0fcd6e54c12ecc9b3c3082f59 patch-2.6.32.2.bz2
+b6d05566fcfe07770d9386f0588f8758 scsi.patch"
diff --git a/main/linux-headers/scsi.patch b/main/linux-headers/scsi.patch
new file mode 100644
index 0000000000..f85a3b7501
--- /dev/null
+++ b/main/linux-headers/scsi.patch
@@ -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