diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-17 22:30:27 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-17 22:30:27 +0100 |
| commit | 138f0238a83167d440339a901056618e7a8d0236 (patch) | |
| tree | e727c8836775a15fc7997270abd9b7b3e62d9162 | |
| parent | f9011c1275b13f39e4ab4552173bfb91b2ffae56 (diff) | |
add fallback for autoconf
| -rwxr-xr-x | scripts/autoconf | 6 | ||||
| -rwxr-xr-x | scripts/autoreconf | 6 | ||||
| -rw-r--r-- | toolchain/kernel-headers/patches/scsi-header.patch | 41 |
3 files changed, 53 insertions, 0 deletions
diff --git a/scripts/autoconf b/scripts/autoconf index 85f9bd0b4..ce75759cf 100755 --- a/scripts/autoconf +++ b/scripts/autoconf @@ -17,4 +17,10 @@ elif [ ! -z "$ac261" -a -x "$ac261" ];then else AUTOCONF_VERSION=2.61 /usr/local/bin/autoconf "$@" fi +else + if [ -x /usr/bin/autoconf ];then + /usr/bin/autoconf "$@" + else + /usr/local/bin/autoconf "$@" + fi fi diff --git a/scripts/autoreconf b/scripts/autoreconf index ce2aa1120..844ecd157 100755 --- a/scripts/autoreconf +++ b/scripts/autoreconf @@ -29,4 +29,10 @@ elif [ ! -z "$ac261" -a -x "$ac261" ];then AUTOCONF_VERSION=2.61 \ /usr/local/bin/autoreconf "$@" fi +else + if [ -x /usr/bin/autoreconf ];then + /usr/bin/autoreconf "$@" + else + /usr/local/bin/autoreconf "$@" + fi fi diff --git a/toolchain/kernel-headers/patches/scsi-header.patch b/toolchain/kernel-headers/patches/scsi-header.patch new file mode 100644 index 000000000..9173b242d --- /dev/null +++ b/toolchain/kernel-headers/patches/scsi-header.patch @@ -0,0 +1,41 @@ +diff -Nur linux-2.6.32.orig/include/scsi/Kbuild linux-2.6.32/include/scsi/Kbuild +--- linux-2.6.32.orig/include/scsi/Kbuild 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/include/scsi/Kbuild 2009-12-03 19:46:03.000000000 +0100 +@@ -1,3 +1,5 @@ ++header-y += sg.h ++header-y += scsi_ioctl.h + header-y += scsi.h + header-y += scsi_netlink.h + header-y += scsi_netlink_fc.h +diff -Nur linux-2.6.32.orig/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h +--- linux-2.6.32.orig/include/scsi/scsi.h 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/include/scsi/scsi.h 2009-12-03 19:47:49.000000000 +0100 +@@ -143,6 +143,8 @@ + + #define SCSI_MAX_VARLEN_CDB_SIZE 260 + ++#ifdef __KERNEL__ ++ + /* defined in T10 SCSI Primary Commands-2 (SPC2) */ + struct scsi_varlen_cdb_hdr { + u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ +@@ -169,6 +171,8 @@ + scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]); + } + ++#endif ++ + /* + * SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft + * T10/1561-D Revision 4 Draft dated 7th November 2002. +@@ -284,8 +288,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 |