wok-4.x rev 6654
Added linux-api-headers. This is like linux-headers but it doesn't depend on linux to be build. Also this means we can update the kernel without rebuild the toolchain.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Mon Oct 11 02:17:02 2010 +0000 (2010-10-11) |
| parents | 5fa2da48d92f |
| children | 85cef93f9bec |
| files | linux-api-headers/receipt linux-api-headers/stuff/scsi.patch linux-headers/receipt linux/receipt linux/stuff/scsi.patch slitaz-dev-pkgs/receipt slitaz-toolchain/receipt |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/linux-api-headers/receipt Mon Oct 11 02:17:02 2010 +0000 1.3 @@ -0,0 +1,41 @@ 1.4 +# SliTaz package receipt. 1.5 + 1.6 +PACKAGE="linux-api-headers" 1.7 +VERSION="2.6.34" 1.8 +CATEGORY="development" 1.9 +SHORT_DESC="Kernel headers sanitized for use in userspace." 1.10 +MAINTAINER="devel@slitaz.org" 1.11 +SOURCE="linux" 1.12 +TARBALL="$SOURCE-$VERSION.tar.bz2" 1.13 +BUILD_DEPENDS="perl" 1.14 +WEB_SITE="http://www.kernel.org/" 1.15 +WGET_URL="http://www.eu.kernel.org/pub/linux/kernel/v${VERSION:0:3}/$TARBALL" 1.16 + 1.17 +# Rules to configure and make the package. 1.18 +compile_rules() 1.19 +{ 1.20 + cd $src 1.21 + 1.22 + # fix issues with transition of scsi.h from glibc 1.23 + patch -Np1 -i ../stuff/scsi.patch 1.24 + 1.25 + make mrproper 1.26 + make headers_check 1.27 + make INSTALL_HDR_PATH=$PWD/_pkg/usr headers_install 1.28 +} 1.29 + 1.30 +# Rules to gen a SliTaz package suitable for Tazpkg. 1.31 +genpkg_rules() 1.32 +{ 1.33 + mkdir -p $fs/usr 1.34 + cp -a $_pkg/usr/include $fs/usr 1.35 + 1.36 + rm -f $(find ${fs} -name .install -or -name ..install.cmd) 1.37 +} 1.38 + 1.39 +# Post install commands for Tazpkg. 1.40 +post_install() 1.41 +{ 1.42 + # Removed old linux-headers 1.43 + rm -rf $1/var/lib/tazpkg/installed/linux-headers 2>/dev/null 1.44 +}
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/linux-api-headers/stuff/scsi.patch Mon Oct 11 02:17:02 2010 +0000 2.3 @@ -0,0 +1,42 @@ 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
3.1 --- a/linux-headers/receipt Mon Oct 11 01:06:19 2010 +0000 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,16 +0,0 @@ 3.4 -# SliTaz package receipt. 3.5 - 3.6 -PACKAGE="linux-headers" 3.7 -VERSION="2.6.34" 3.8 -CATEGORY="development" 3.9 -SHORT_DESC="The Linux Kernel headers files for devel." 3.10 -MAINTAINER="devel@slitaz.org" 3.11 -WANTED="linux" 3.12 -WEB_SITE="http://www.kernel.org/" 3.13 - 3.14 -# Rules to gen a SliTaz package suitable for Tazpkg. 3.15 -genpkg_rules() 3.16 -{ 3.17 - mkdir -p $fs/usr 3.18 - cp -a $_pkg/usr/include $fs/usr 3.19 -}
4.1 --- a/linux/receipt Mon Oct 11 01:06:19 2010 +0000 4.2 +++ b/linux/receipt Mon Oct 11 02:17:02 2010 +0000 4.3 @@ -52,7 +52,6 @@ 4.4 aufs2-standalone.patch 4.5 $PACKAGE-freeinitrd-$VERSION.u 4.6 $PACKAGE-squashfs-lzma-$VERSION.u 4.7 -scsi.patch 4.8 EOT 4.9 make mrproper 4.10 cd Documentation/lguest
5.1 --- a/linux/stuff/scsi.patch Mon Oct 11 01:06:19 2010 +0000 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,42 +0,0 @@ 5.4 -diff -Naur linux-2.6.32-old/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h 5.5 ---- linux-2.6.32-old/include/scsi/scsi.h 2009-12-03 13:51:21.000000000 +1000 5.6 -+++ linux-2.6.32/include/scsi/scsi.h 2009-12-12 10:43:11.000000000 +1000 5.7 -@@ -145,14 +145,15 @@ 5.8 - 5.9 - /* defined in T10 SCSI Primary Commands-2 (SPC2) */ 5.10 - struct scsi_varlen_cdb_hdr { 5.11 -- u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ 5.12 -- u8 control; 5.13 -- u8 misc[5]; 5.14 -- u8 additional_cdb_length; /* total cdb length - 8 */ 5.15 -+ __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ 5.16 -+ __u8 control; 5.17 -+ __u8 misc[5]; 5.18 -+ __u8 additional_cdb_length; /* total cdb length - 8 */ 5.19 - __be16 service_action; 5.20 - /* service specific data follows */ 5.21 - }; 5.22 - 5.23 -+#ifdef __KERNEL__ 5.24 - static inline unsigned 5.25 - scsi_varlen_cdb_length(const void *hdr) 5.26 - { 5.27 -@@ -168,6 +169,7 @@ 5.28 - return (cmnd[0] == VARIABLE_LENGTH_CMD) ? 5.29 - scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]); 5.30 - } 5.31 -+#endif 5.32 - 5.33 - /* 5.34 - * SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft 5.35 -@@ -284,8 +286,10 @@ 5.36 - SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */ 5.37 - }; 5.38 - 5.39 -+#ifdef __KERNEL__ 5.40 - /* Returns a human-readable name for the device */ 5.41 - extern const char * scsi_device_type(unsigned type); 5.42 -+#endif 5.43 - 5.44 - /* 5.45 - * standard mode-select header prepended to all mode-select commands
6.1 --- a/slitaz-dev-pkgs/receipt Mon Oct 11 01:06:19 2010 +0000 6.2 +++ b/slitaz-dev-pkgs/receipt Mon Oct 11 02:17:02 2010 +0000 6.3 @@ -8,7 +8,7 @@ 6.4 WEB_SITE="http://www.slitaz.org/" 6.5 DEPENDS=" 6.6 binutils 6.7 -linux-headers 6.8 +linux-api-headers 6.9 gcc 6.10 make 6.11 bzip2-dev
7.1 --- a/slitaz-toolchain/receipt Mon Oct 11 01:06:19 2010 +0000 7.2 +++ b/slitaz-toolchain/receipt Mon Oct 11 02:17:02 2010 +0000 7.3 @@ -5,7 +5,7 @@ 7.4 CATEGORY="meta" 7.5 SHORT_DESC="SliTaz toolchain meta package for devel." 7.6 MAINTAINER="pankso@slitaz.org" 7.7 -DEPENDS="binutils linux-headers glibc-dev gcc make" 7.8 +DEPENDS="binutils linux-api-headers glibc-dev gcc make" 7.9 WEB_SITE="http://www.slitaz.org/" 7.10 7.11 # Rules to gen a SliTaz package suitable for Tazpkg.