Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
678
Issues
678
List
Boards
Labels
Service Desk
Milestones
Merge Requests
213
Merge Requests
213
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
bb694129
Commit
bb694129
authored
Apr 04, 2011
by
Natanael Copa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/linux-headers: upgrade to 2.6.38.2
parent
96ab7493
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
52 deletions
+7
-52
main/linux-headers/APKBUILD
main/linux-headers/APKBUILD
+7
-10
main/linux-headers/scsi.patch
main/linux-headers/scsi.patch
+0
-42
No files found.
main/linux-headers/APKBUILD
View file @
bb694129
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
linux-headers
pkgver
=
2.6.3
2
.2
_kernver
=
2.6.3
2
pkgrel
=
4
pkgver
=
2.6.3
8
.2
_kernver
=
2.6.3
8
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"
main/linux-headers/scsi.patch
deleted
100644 → 0
View file @
96ab7493
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment