wok-6.x rev 6293
Added squashfs_lzma to kernel config. Added some more options to aufs in kernel. Added all missing modules into packages. Added scsi.patch to fix linux-headers scsi.h file to be compatible with glibc scsi.h. Up: aufs-utils to 20100916.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Thu Sep 16 13:04:44 2010 +0000 (2010-09-16) |
parents | 73522e2845cd |
children | 8b731dd8536d |
files | aufs-utils/receipt linux-mmc/receipt linux-wireless/receipt linux/receipt linux/stuff/linux-2.6.34-slitaz.config linux/stuff/modules-2.6.34.list linux/stuff/scsi.patch |
line diff
1.1 --- a/aufs-utils/receipt Wed Sep 15 20:18:09 2010 +0000 1.2 +++ b/aufs-utils/receipt Thu Sep 16 13:04:44 2010 +0000 1.3 @@ -1,11 +1,12 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="aufs-utils" 1.7 -VERSION="20090928" 1.8 +VERSION="20100916" 1.9 CATEGORY="system-tools" 1.10 SHORT_DESC="The aufs utils." 1.11 MAINTAINER="pankso@slitaz.org" 1.12 DEPENDS="linux-aufs" 1.13 +BUILD_DEPENDS="git" 1.14 WEB_SITE="http://aufs.sourceforge.net/" 1.15 1.16 # Rules to configure and make the package.
2.1 --- a/linux-mmc/receipt Wed Sep 15 20:18:09 2010 +0000 2.2 +++ b/linux-mmc/receipt Thu Sep 16 13:04:44 2010 +0000 2.3 @@ -17,7 +17,7 @@ 2.4 mkdir -p $fs/$path 2.5 export src 2.6 export _pkg 2.7 - $src/slitaz/list_modules.sh drivers/mmc drivers/misc/tifm_7xx1.ko.gz | \ 2.8 + $src/slitaz/list_modules.sh drivers/mmc drivers/misc/tifm_7xx1.ko.gz drivers/misc/iwmc3200top/iwmc3200top.ko.gz| \ 2.9 while read module; do 2.10 dir=$path/$(dirname $module) 2.11 [ -d $fs/$dir ] || mkdir -p $fs/$dir
3.1 --- a/linux-wireless/receipt Wed Sep 15 20:18:09 2010 +0000 3.2 +++ b/linux-wireless/receipt Thu Sep 16 13:04:44 2010 +0000 3.3 @@ -24,7 +24,7 @@ 3.4 drivers/leds net/wireless net/mac80211 drivers/staging/rtl8192e/r8192e_pci.ko.gz \ 3.5 drivers/staging/rtl8192su/r8192s_usb.ko.gz drivers/staging/rtl8187se/r8187se.ko.gz \ 3.6 drivers/staging/rtl8192u/r8192u_usb.ko.gz drivers/staging/crystalhd/crystalhd.ko.gz \ 3.7 - drivers/staging/netwave/netwave_cs.ko.gz | while read module; do 3.8 + drivers/staging/netwave/netwave_cs.ko.gz drivers/staging/sm7xx/sm7xx.ko.gz | while read module; do 3.9 dir=$path/$(dirname $module) 3.10 [ -d $fs/$dir ] || mkdir -p $fs/$dir 3.11 cp -a $_pkg/$path/$module $fs/$dir
4.1 --- a/linux/receipt Wed Sep 15 20:18:09 2010 +0000 4.2 +++ b/linux/receipt Thu Sep 16 13:04:44 2010 +0000 4.3 @@ -52,6 +52,7 @@ 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/linux-2.6.34-slitaz.config Wed Sep 15 20:18:09 2010 +0000 5.2 +++ b/linux/stuff/linux-2.6.34-slitaz.config Thu Sep 16 13:04:44 2010 +0000 5.3 @@ -1,7 +1,7 @@ 5.4 # 5.5 # Automatically generated make config: don't edit 5.6 # Linux kernel version: 2.6.34 5.7 -# Sat Jun 5 11:33:53 2010 5.8 +# Thu Sep 16 01:49:49 2010 5.9 # 5.10 # CONFIG_64BIT is not set 5.11 CONFIG_X86_32=y 5.12 @@ -3180,6 +3180,7 @@ 5.13 CONFIG_LOGFS=m 5.14 CONFIG_CRAMFS=m 5.15 CONFIG_SQUASHFS=m 5.16 +CONFIG_SQUASHFS_LZMA=y 5.17 # CONFIG_SQUASHFS_EMBEDDED is not set 5.18 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 5.19 # CONFIG_VXFS_FS is not set 5.20 @@ -3191,16 +3192,18 @@ 5.21 # CONFIG_SYSV_FS is not set 5.22 # CONFIG_UFS_FS is not set 5.23 CONFIG_AUFS_FS=m 5.24 -CONFIG_AUFS_BRANCH_MAX_127=y 5.25 +# CONFIG_AUFS_BRANCH_MAX_127 is not set 5.26 # CONFIG_AUFS_BRANCH_MAX_511 is not set 5.27 -# CONFIG_AUFS_BRANCH_MAX_1023 is not set 5.28 +CONFIG_AUFS_BRANCH_MAX_1023=y 5.29 # CONFIG_AUFS_BRANCH_MAX_32767 is not set 5.30 -# CONFIG_AUFS_HNOTIFY is not set 5.31 +CONFIG_AUFS_HNOTIFY=y 5.32 +CONFIG_AUFS_HFSNOTIFY=y 5.33 +# CONFIG_AUFS_HINOTIFY is not set 5.34 # CONFIG_AUFS_EXPORT is not set 5.35 # CONFIG_AUFS_RDU is not set 5.36 # CONFIG_AUFS_SP_IATTR is not set 5.37 -# CONFIG_AUFS_SHWH is not set 5.38 -# CONFIG_AUFS_BR_RAMFS is not set 5.39 +CONFIG_AUFS_SHWH=y 5.40 +CONFIG_AUFS_BR_RAMFS=y 5.41 # CONFIG_AUFS_BR_FUSE is not set 5.42 # CONFIG_AUFS_BR_HFSPLUS is not set 5.43 CONFIG_AUFS_BDEV_LOOP=y 5.44 @@ -3522,6 +3525,7 @@ 5.45 CONFIG_DECOMPRESS_GZIP=y 5.46 CONFIG_DECOMPRESS_BZIP2=y 5.47 CONFIG_DECOMPRESS_LZMA=y 5.48 +CONFIG_DECOMPRESS_LZMA_NEEDED=y 5.49 CONFIG_DECOMPRESS_LZO=y 5.50 CONFIG_TEXTSEARCH=y 5.51 CONFIG_TEXTSEARCH_KMP=m
6.1 --- a/linux/stuff/modules-2.6.34.list Wed Sep 15 20:18:09 2010 +0000 6.2 +++ b/linux/stuff/modules-2.6.34.list Thu Sep 16 13:04:44 2010 +0000 6.3 @@ -1,4 +1,5 @@ 6.4 drivers/char/genrtc.ko.gz 6.5 +drivers/char/i8k.ko.gz 6.6 drivers/char/lp.ko.gz 6.7 drivers/char/rtc.ko.gz 6.8 drivers/hwmon/coretemp.ko.gz 6.9 @@ -115,6 +116,9 @@ 6.10 drivers/input/mouse/sermouse.ko.gz 6.11 fs/binfmt_misc.ko.gz 6.12 fs/fat/msdos.ko.gz 6.13 +fs/fuse/cuse.ko.gz 6.14 net/ipv4/netfilter/ipt_REJECT.ko.gz 6.15 net/netfilter/nfnetlink.ko.gz 6.16 net/netfilter/nfnetlink_log.ko.gz 6.17 +lib/crc7.ko.gz 6.18 +drivers/misc/cb710/cb710.ko.gz 6.19 \ No newline at end of file
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/linux/stuff/scsi.patch Thu Sep 16 13:04:44 2010 +0000 7.3 @@ -0,0 +1,42 @@ 7.4 +diff -Naur linux-2.6.32-old/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h 7.5 +--- linux-2.6.32-old/include/scsi/scsi.h 2009-12-03 13:51:21.000000000 +1000 7.6 ++++ linux-2.6.32/include/scsi/scsi.h 2009-12-12 10:43:11.000000000 +1000 7.7 +@@ -145,14 +145,15 @@ 7.8 + 7.9 + /* defined in T10 SCSI Primary Commands-2 (SPC2) */ 7.10 + struct scsi_varlen_cdb_hdr { 7.11 +- u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ 7.12 +- u8 control; 7.13 +- u8 misc[5]; 7.14 +- u8 additional_cdb_length; /* total cdb length - 8 */ 7.15 ++ __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ 7.16 ++ __u8 control; 7.17 ++ __u8 misc[5]; 7.18 ++ __u8 additional_cdb_length; /* total cdb length - 8 */ 7.19 + __be16 service_action; 7.20 + /* service specific data follows */ 7.21 + }; 7.22 + 7.23 ++#ifdef __KERNEL__ 7.24 + static inline unsigned 7.25 + scsi_varlen_cdb_length(const void *hdr) 7.26 + { 7.27 +@@ -168,6 +169,7 @@ 7.28 + return (cmnd[0] == VARIABLE_LENGTH_CMD) ? 7.29 + scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]); 7.30 + } 7.31 ++#endif 7.32 + 7.33 + /* 7.34 + * SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft 7.35 +@@ -284,8 +286,10 @@ 7.36 + SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */ 7.37 + }; 7.38 + 7.39 ++#ifdef __KERNEL__ 7.40 + /* Returns a human-readable name for the device */ 7.41 + extern const char * scsi_device_type(unsigned type); 7.42 ++#endif 7.43 + 7.44 + /* 7.45 + * standard mode-select header prepended to all mode-select commands