# HG changeset patch # User Christopher Rogers # Date 1284642284 0 # Node ID ce1a465271d97312795b33f77a300b2823792088 # Parent 73522e2845cdc429fe7f1c95a06d0a3442028275 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. diff -r 73522e2845cd -r ce1a465271d9 aufs-utils/receipt --- a/aufs-utils/receipt Wed Sep 15 20:18:09 2010 +0000 +++ b/aufs-utils/receipt Thu Sep 16 13:04:44 2010 +0000 @@ -1,11 +1,12 @@ # SliTaz package receipt. PACKAGE="aufs-utils" -VERSION="20090928" +VERSION="20100916" CATEGORY="system-tools" SHORT_DESC="The aufs utils." MAINTAINER="pankso@slitaz.org" DEPENDS="linux-aufs" +BUILD_DEPENDS="git" WEB_SITE="http://aufs.sourceforge.net/" # Rules to configure and make the package. diff -r 73522e2845cd -r ce1a465271d9 linux-mmc/receipt --- a/linux-mmc/receipt Wed Sep 15 20:18:09 2010 +0000 +++ b/linux-mmc/receipt Thu Sep 16 13:04:44 2010 +0000 @@ -17,7 +17,7 @@ mkdir -p $fs/$path export src export _pkg - $src/slitaz/list_modules.sh drivers/mmc drivers/misc/tifm_7xx1.ko.gz | \ + $src/slitaz/list_modules.sh drivers/mmc drivers/misc/tifm_7xx1.ko.gz drivers/misc/iwmc3200top/iwmc3200top.ko.gz| \ while read module; do dir=$path/$(dirname $module) [ -d $fs/$dir ] || mkdir -p $fs/$dir diff -r 73522e2845cd -r ce1a465271d9 linux-wireless/receipt --- a/linux-wireless/receipt Wed Sep 15 20:18:09 2010 +0000 +++ b/linux-wireless/receipt Thu Sep 16 13:04:44 2010 +0000 @@ -24,7 +24,7 @@ drivers/leds net/wireless net/mac80211 drivers/staging/rtl8192e/r8192e_pci.ko.gz \ drivers/staging/rtl8192su/r8192s_usb.ko.gz drivers/staging/rtl8187se/r8187se.ko.gz \ drivers/staging/rtl8192u/r8192u_usb.ko.gz drivers/staging/crystalhd/crystalhd.ko.gz \ - drivers/staging/netwave/netwave_cs.ko.gz | while read module; do + drivers/staging/netwave/netwave_cs.ko.gz drivers/staging/sm7xx/sm7xx.ko.gz | while read module; do dir=$path/$(dirname $module) [ -d $fs/$dir ] || mkdir -p $fs/$dir cp -a $_pkg/$path/$module $fs/$dir diff -r 73522e2845cd -r ce1a465271d9 linux/receipt --- a/linux/receipt Wed Sep 15 20:18:09 2010 +0000 +++ b/linux/receipt Thu Sep 16 13:04:44 2010 +0000 @@ -52,6 +52,7 @@ aufs2-standalone.patch $PACKAGE-freeinitrd-$VERSION.u $PACKAGE-squashfs-lzma-$VERSION.u +scsi.patch EOT make mrproper cd Documentation/lguest diff -r 73522e2845cd -r ce1a465271d9 linux/stuff/linux-2.6.34-slitaz.config --- a/linux/stuff/linux-2.6.34-slitaz.config Wed Sep 15 20:18:09 2010 +0000 +++ b/linux/stuff/linux-2.6.34-slitaz.config Thu Sep 16 13:04:44 2010 +0000 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.34 -# Sat Jun 5 11:33:53 2010 +# Thu Sep 16 01:49:49 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3180,6 +3180,7 @@ CONFIG_LOGFS=m CONFIG_CRAMFS=m CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_LZMA=y # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set @@ -3191,16 +3192,18 @@ # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_AUFS_FS=m -CONFIG_AUFS_BRANCH_MAX_127=y +# CONFIG_AUFS_BRANCH_MAX_127 is not set # CONFIG_AUFS_BRANCH_MAX_511 is not set -# CONFIG_AUFS_BRANCH_MAX_1023 is not set +CONFIG_AUFS_BRANCH_MAX_1023=y # CONFIG_AUFS_BRANCH_MAX_32767 is not set -# CONFIG_AUFS_HNOTIFY is not set +CONFIG_AUFS_HNOTIFY=y +CONFIG_AUFS_HFSNOTIFY=y +# CONFIG_AUFS_HINOTIFY is not set # CONFIG_AUFS_EXPORT is not set # CONFIG_AUFS_RDU is not set # CONFIG_AUFS_SP_IATTR is not set -# CONFIG_AUFS_SHWH is not set -# CONFIG_AUFS_BR_RAMFS is not set +CONFIG_AUFS_SHWH=y +CONFIG_AUFS_BR_RAMFS=y # CONFIG_AUFS_BR_FUSE is not set # CONFIG_AUFS_BR_HFSPLUS is not set CONFIG_AUFS_BDEV_LOOP=y @@ -3522,6 +3525,7 @@ CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_LZMA_NEEDED=y CONFIG_DECOMPRESS_LZO=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m diff -r 73522e2845cd -r ce1a465271d9 linux/stuff/modules-2.6.34.list --- a/linux/stuff/modules-2.6.34.list Wed Sep 15 20:18:09 2010 +0000 +++ b/linux/stuff/modules-2.6.34.list Thu Sep 16 13:04:44 2010 +0000 @@ -1,4 +1,5 @@ drivers/char/genrtc.ko.gz +drivers/char/i8k.ko.gz drivers/char/lp.ko.gz drivers/char/rtc.ko.gz drivers/hwmon/coretemp.ko.gz @@ -115,6 +116,9 @@ drivers/input/mouse/sermouse.ko.gz fs/binfmt_misc.ko.gz fs/fat/msdos.ko.gz +fs/fuse/cuse.ko.gz net/ipv4/netfilter/ipt_REJECT.ko.gz net/netfilter/nfnetlink.ko.gz net/netfilter/nfnetlink_log.ko.gz +lib/crc7.ko.gz +drivers/misc/cb710/cb710.ko.gz \ No newline at end of file diff -r 73522e2845cd -r ce1a465271d9 linux/stuff/scsi.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/linux/stuff/scsi.patch Thu Sep 16 13:04:44 2010 +0000 @@ -0,0 +1,42 @@ +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