wok-4.x rev 8196

imported patch toolchain/linux-api-headers.patch
author Antoine Bodin <gokhlayeh@slitaz.org>
date Thu Jan 27 00:20:50 2011 +0100 (2011-01-27)
parents 38286698e49d
children ef358edbf01d
files linux-api-headers/receipt linux-api-headers/stuff/scsi.patch
line diff
     1.1 --- a/linux-api-headers/receipt	Thu Jan 27 00:20:50 2011 +0100
     1.2 +++ b/linux-api-headers/receipt	Thu Jan 27 00:20:50 2011 +0100
     1.3 @@ -1,27 +1,34 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="linux-api-headers"
     1.7 -VERSION="2.6.34"
     1.8 +VERSION="2.6.37"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="Kernel headers sanitized for use in userspace."
    1.11  MAINTAINER="devel@slitaz.org"
    1.12  SOURCE="linux"
    1.13  TARBALL="$SOURCE-$VERSION.tar.bz2"
    1.14 -BUILD_DEPENDS="perl"
    1.15  WEB_SITE="http://www.kernel.org/"
    1.16  WGET_URL="http://www.eu.kernel.org/pub/linux/kernel/v${VERSION:0:3}/$TARBALL"
    1.17  
    1.18 +# Rules to compile & install the temporary toolchain.
    1.19 +cook_tmp_toolchain()
    1.20 +{
    1.21 +	cd $src
    1.22 +
    1.23 +	make mrproper &&
    1.24 +	make headers_check &&
    1.25 +	make INSTALL_HDR_PATH=dest headers_install &&
    1.26 +	cp -r dest/include/* /tools/include
    1.27 +}
    1.28 +
    1.29  # Rules to configure and make the package.
    1.30  compile_rules()
    1.31  {
    1.32  	cd $src
    1.33  
    1.34 -	# fix issues with transition of scsi.h from glibc
    1.35 -	patch -Np1 -i ../stuff/scsi.patch
    1.36 -
    1.37 -	make mrproper
    1.38 -	make headers_check
    1.39 -	make INSTALL_HDR_PATH=$PWD/_pkg/usr headers_install
    1.40 +	make mrproper &&
    1.41 +	make headers_check &&
    1.42 +	make INSTALL_HDR_PATH=$DESTDIR/usr headers_install
    1.43  }
    1.44  
    1.45  # Rules to gen a SliTaz package suitable for Tazpkg.
     2.1 --- a/linux-api-headers/stuff/scsi.patch	Thu Jan 27 00:20:50 2011 +0100
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,42 +0,0 @@
     2.4 -diff -Naur linux-2.6.32-old/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h
     2.5 ---- linux-2.6.32-old/include/scsi/scsi.h	2009-12-03 13:51:21.000000000 +1000
     2.6 -+++ linux-2.6.32/include/scsi/scsi.h	2009-12-12 10:43:11.000000000 +1000
     2.7 -@@ -145,14 +145,15 @@
     2.8 - 
     2.9 - /* defined in T10 SCSI Primary Commands-2 (SPC2) */
    2.10 - struct scsi_varlen_cdb_hdr {
    2.11 --	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
    2.12 --	u8 control;
    2.13 --	u8 misc[5];
    2.14 --	u8 additional_cdb_length;         /* total cdb length - 8 */
    2.15 -+	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
    2.16 -+	__u8 control;
    2.17 -+	__u8 misc[5];
    2.18 -+	__u8 additional_cdb_length;         /* total cdb length - 8 */
    2.19 - 	__be16 service_action;
    2.20 - 	/* service specific data follows */
    2.21 - };
    2.22 - 
    2.23 -+#ifdef __KERNEL__
    2.24 - static inline unsigned
    2.25 - scsi_varlen_cdb_length(const void *hdr)
    2.26 - {
    2.27 -@@ -168,6 +169,7 @@
    2.28 - 	return (cmnd[0] == VARIABLE_LENGTH_CMD) ?
    2.29 - 		scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]);
    2.30 - }
    2.31 -+#endif
    2.32 - 
    2.33 - /*
    2.34 -  *  SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
    2.35 -@@ -284,8 +286,10 @@
    2.36 - 	SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */
    2.37 - };
    2.38 - 
    2.39 -+#ifdef __KERNEL__
    2.40 - /* Returns a human-readable name for the device */
    2.41 - extern const char * scsi_device_type(unsigned type);
    2.42 -+#endif
    2.43 - 
    2.44 - /*
    2.45 -  * standard mode-select header prepended to all mode-select commands