# HG changeset patch # User Antoine Bodin # Date 1296084050 -3600 # Node ID 0989070c1c4e8fb0edaf40bb9ea4fc8676fca37c # Parent 38286698e49d734e5fed50e4b714a9cda4f4deb8 imported patch toolchain/linux-api-headers.patch diff -r 38286698e49d -r 0989070c1c4e linux-api-headers/receipt --- a/linux-api-headers/receipt Thu Jan 27 00:20:50 2011 +0100 +++ b/linux-api-headers/receipt Thu Jan 27 00:20:50 2011 +0100 @@ -1,27 +1,34 @@ # SliTaz package receipt. PACKAGE="linux-api-headers" -VERSION="2.6.34" +VERSION="2.6.37" CATEGORY="development" SHORT_DESC="Kernel headers sanitized for use in userspace." MAINTAINER="devel@slitaz.org" SOURCE="linux" TARBALL="$SOURCE-$VERSION.tar.bz2" -BUILD_DEPENDS="perl" WEB_SITE="http://www.kernel.org/" WGET_URL="http://www.eu.kernel.org/pub/linux/kernel/v${VERSION:0:3}/$TARBALL" +# Rules to compile & install the temporary toolchain. +cook_tmp_toolchain() +{ + cd $src + + make mrproper && + make headers_check && + make INSTALL_HDR_PATH=dest headers_install && + cp -r dest/include/* /tools/include +} + # Rules to configure and make the package. compile_rules() { cd $src - # fix issues with transition of scsi.h from glibc - patch -Np1 -i ../stuff/scsi.patch - - make mrproper - make headers_check - make INSTALL_HDR_PATH=$PWD/_pkg/usr headers_install + make mrproper && + make headers_check && + make INSTALL_HDR_PATH=$DESTDIR/usr headers_install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 38286698e49d -r 0989070c1c4e linux-api-headers/stuff/scsi.patch --- a/linux-api-headers/stuff/scsi.patch Thu Jan 27 00:20:50 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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