# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1390985767 -3600
# Node ID db5b03f42dd957a81f95e7337ae3f246081f6743
# Parent  83f5a10c4dd7397e52e578b930fefda31f906b4c
New kernel config and huge receipt clean up

diff -r 83f5a10c4dd7 -r db5b03f42dd9 aufs/receipt
--- a/aufs/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/aufs/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -4,14 +4,13 @@
 VERSION="20130311"
 CATEGORY="base-system"
 SHORT_DESC="aufs3 kernel module"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="godane@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://aufs.sf.net/"
 PROVIDE="linux-aufs"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="git|git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git"
 BRANCH="origin/${PACKAGE}3.2"
-COOK_OPT="!remove_src"
 
 DEPENDS="linux"
 BUILD_DEPENDS="linux-module-headers git xz"
@@ -19,27 +18,17 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-
-	sed -i 's|CONFIG_AUFS_BRANCH_MAX_127 =.*|CONFIG_AUFS_BRANCH_MAX_127 =|' \
-		config.mk || return 1
-	sed -i 's|#CONFIG_AUFS_BRANCH_MAX_32767 =.*|CONFIG_AUFS_BRANCH_MAX_32767 = y|' \
-		config.mk || return 1
-	sed -i 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y|' \
-		config.mk || return 1
-	sed -i 's|CONFIG_AUFS_HFSNOTIFY =.*|CONFIG_AUFS_HFSNOTIFY = y|' \
-		config.mk || return 1
-	sed -i 's|CONFIG_AUFS_EXPORT =.*|CONFIG_AUFS_EXPORT = y|' \
-		config.mk || return 1
-	sed -i 's|CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \
-		config.mk || return 1
-	sed -i 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y|' \
-		config.mk || return 1
-	sed -i 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \
-		config.mk || return 1
-	sed -i 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' \
-		config.mk || return 1
-
+	sed -i \
+		-e 's|CONFIG_AUFS_BRANCH_MAX_127 =.*|CONFIG_AUFS_BRANCH_MAX_127 =|' \		
+		-e 's|#CONFIG_AUFS_BRANCH_MAX_32767 =.*|CONFIG_AUFS_BRANCH_MAX_32767 = y|' \
+		-e 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y|' \
+		-e 's|CONFIG_AUFS_HFSNOTIFY =.*|CONFIG_AUFS_HFSNOTIFY = y|' \
+		-e 's|CONFIG_AUFS_EXPORT =.*|CONFIG_AUFS_EXPORT = y|' \
+		-e 's|CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \
+		-e 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y|' \
+		-e 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \
+		-e 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' config.mk
+		
 	# The sed fixes are from gentoo portage build.
 	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile
 	sed -i "s:__user::g" include/linux/aufs_type.h
@@ -50,25 +39,23 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
-	BASEVER=${KERNEL_VERSION:0:3}
-	EXTRAVERSION=_$BASEVER
-	mkdir -p $fs/lib/modules/$BASEVER-slitaz/kernel/fs/aufs
-	cp $src/fs/aufs/aufs.ko.xz $fs/lib/modules/$BASEVER-slitaz/kernel/fs/aufs/
-	chown root $fs/lib/modules/$BASEVER-slitaz/kernel/fs/aufs/aufs.ko.xz
-	chmod 0644 $fs/lib/modules/$BASEVER-slitaz/kernel/fs/aufs/aufs.ko.xz
-	install -D -m 644 $src/include/linux/aufs_type.h \
+	EXTRAVERSION=_${kvers}
+	mkdir -p $fs/lib/modules/${kvers}-slitaz/kernel/fs/aufs
+	install -o root -m 0644 $src/fs/aufs/aufs.ko.xz \
+		$fs/lib/modules/${kvers}-slitaz/kernel/fs/aufs/aufs.ko.xz
+	install -D -o root -m 0644 $src/include/linux/aufs_type.h \
 		$fs/usr/include/linux/aufs_type.h
 }
 
+# Post install/remove commands for Tazpkg.
 post_install()
 {
 	echo "Processing post-install commands..."
-	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
+	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
 }
 
 post_remove()
 {
 	echo "Processing post-remove commands..."
-	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
+	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
 }
diff -r 83f5a10c4dd7 -r db5b03f42dd9 broadcom-wl/receipt
--- a/broadcom-wl/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/broadcom-wl/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -27,26 +27,22 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
-	EXTRAVERSION=_$KERNEL_VERSION
-	
-	mkdir -p $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/wireless
-	
+	EXTRAVERSION=_${kvers}
+	mkdir -p $fs/lib/modules/${kvers}-slitaz/kernel/drivers/net/wireless
 	# Compress and install module
-	cp $src/wl.ko.xz $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/wireless/
-	chown root $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/wireless/wl.ko.xz
-	chmod 0644 $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/wireless/wl.ko.xz
+	install -o root -m 0644 $src/wl.ko.xz \
+		$fs/lib/modules/${kvers}-slitaz/kernel/drivers/net/wireless/wl.ko.xz
 }
 
 # Post install/remove commands for Tazpkg.
 post_install()
 {
 	echo "Processing post-install commands..."
-	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
+	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
 }
 
 post_remove()
 {
 	echo "Processing post-remove commands..."
-	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
+	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
 }
diff -r 83f5a10c4dd7 -r db5b03f42dd9 dahdi-linux-dev/receipt
--- a/dahdi-linux-dev/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/dahdi-linux-dev/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -12,7 +12,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	EXTRAVERSION="$(ls $install/lib/modules | sed 's|\(.*\)-slitaz|_\1|')"
+	EXTRAVERSION=${kvers}
 	mkdir -p $fs/usr
 	cp -a $install/usr/include $fs/usr
 }
diff -r 83f5a10c4dd7 -r db5b03f42dd9 dahdi-linux/receipt
--- a/dahdi-linux/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/dahdi-linux/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -21,13 +21,7 @@
 	sed -i 's/tar -xof/tar -xf/' drivers/dahdi/firmware/Makefile
 	find -type f | xargs sed -i -e 's/DECLARE_MUTEX/DEFINE_SEMAPHORE/g' \
 		-e 's/init_MUTEX\([^)]*\)/sema_init\1, 1/g'
-	if [ ! -d $WOK/linux/taz ]; then
-		if [ -x /usr/bin/cook ]; then
-			cook linux
-		else
-			tazwok cook linux
-		fi
-	fi
+	[ ! -d $WOK/linux/taz ] && cook linux
 	make KVERS=$kvers KSRC=$WOK/linux/source/$(ls $WOK/linux/taz) \
 		install 2>&1 | grep -v 'slitaz/modules'
 }
@@ -35,17 +29,18 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	EXTRAVERSION=_${kvers%.*}
+	EXTRAVERSION=_${kvers}
 	cp -a $install/* $fs
+	rm -rf $fs/usr/include
 }
 
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
+	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
+	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
 }
diff -r 83f5a10c4dd7 -r db5b03f42dd9 iptables-dev/receipt
--- a/iptables-dev/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/iptables-dev/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -5,7 +5,7 @@
 CATEGORY="development"
 SHORT_DESC="Packet filtering framework (Firewall) - dev files"
 WEB_SITE="http://www.netfilter.org/"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WANTED="iptables"
 
@@ -14,6 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
+	EXTRAVERSION=_${kvers}
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/include $fs/usr
 	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
diff -r 83f5a10c4dd7 -r db5b03f42dd9 iptables/receipt
--- a/iptables/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/iptables/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -31,7 +31,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	EXTRAVERSION=_${kvers%.*}
+	EXTRAVERSION=_${kvers}
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/sbin        $fs/usr
 	cp -a $install/usr/lib/lib*    $fs/usr/lib
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-acpi/receipt
--- a/linux-acpi/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-acpi/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-acpi"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel acpi modules."
 DEPENDS="linux"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/acpi drivers/platform/x86 | \
     while read module; do
     	dir=$path/$(dirname $module)
@@ -28,19 +26,19 @@
 
     for i in $(cat $wanted_stuff/modules.list); do
         if [ -f $fs/$path/$i ]; then
-	    rm -f $fs/$path/$i
-	fi
+			rm -f $fs/$path/$i
+		fi
     done
 }
 
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-agp/receipt
--- a/linux-agp/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-agp/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-agp"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel AGP modules."
 MAINTAINER="erjo@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/char/agp | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -35,11 +33,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-aoe/receipt
--- a/linux-aoe/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-aoe/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-aoe"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel ATA over Ethernet modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/block/aoe/aoe.ko.xz | \
     while read module; do
     	dir=$path/$(dirname $module)
@@ -30,11 +28,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-appletalk/receipt
--- a/linux-appletalk/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-appletalk/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-appletalk"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel appletalk modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,11 +14,10 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
     
-    export src
-    export _pkg
+    export src install
     
     $wanted_stuff/list_modules.sh drivers/net/appletalk net/appletalk \
 	net/802/p8022.ko.xz | while read module; do
@@ -38,11 +36,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-arcnet/receipt
--- a/linux-arcnet/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-arcnet/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-arcnet"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="arcnet kernel modules"
 MAINTAINER="slaxemulator@gmail.com"
@@ -15,11 +14,10 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
     
-    export src
-    export _pkg
+    export src install
     
     $wanted_stuff/list_modules.sh drivers/net/arcnet drivers/net/arcnet/arcnet.ko.xz \
     drivers/net/arcnet/com90xx.ko.xz drivers/net/arcnet/rfc1051.ko.xz | while read module; do
@@ -38,10 +36,10 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-autofs/receipt
--- a/linux-autofs/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-autofs/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-autofs"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel automounter module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/autofs4 | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -33,12 +31,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-bluetooth/receipt
--- a/linux-bluetooth/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-bluetooth/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-bluetooth"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel bluetooth modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/bluetooth net/bluetooth | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -35,11 +33,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-bridge/receipt
--- a/linux-bridge/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-bridge/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-bridge"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel bridge modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh net/bridge | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -35,11 +33,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-cifs/receipt
--- a/linux-cifs/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-cifs/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-cifs"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel cifs module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/cifs | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -33,12 +31,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-coda/receipt
--- a/linux-coda/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-coda/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-coda"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel coda module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/coda | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -33,12 +31,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-configfs/receipt
--- a/linux-configfs/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-configfs/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-configfs"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel configfs module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/${PACKAGE#*-} | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -33,12 +31,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-cpufreq/receipt
--- a/linux-cpufreq/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-cpufreq/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-cpufreq"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel cpufreq modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/cpufreq | \
     while read module; do
     	dir=$path/$(dirname $module)
@@ -30,11 +28,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-cramfs/receipt
--- a/linux-cramfs/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-cramfs/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-cramfs"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel cramfs module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/cramfs | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -33,12 +31,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-crypto/receipt
--- a/linux-crypto/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-crypto/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-crypto"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel crypto modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh arch/x86/crypto crypto drivers/crypto | \
     while read module; do
     	dir=$path/$(dirname $module)
@@ -36,11 +34,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-cryptoloop/receipt
--- a/linux-cryptoloop/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-cryptoloop/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-cryptoloop"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel cryptoloop modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/block/cryptoloop.ko.xz | \
     while read module; do
     	dir=$path/$(dirname $module)
@@ -30,11 +28,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-dialup/receipt
--- a/linux-dialup/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-dialup/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-dialup"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel dial-up modules."
 MAINTAINER="domcox@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/tty/serial/serial_cs.ko.xz \
 	drivers/usb/serial drivers/net/usb/hso.ko.xz | \
 	while read module; do
@@ -37,11 +35,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-dlm/receipt
--- a/linux-dlm/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-dlm/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-dlm"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel dlmfs module."
 MAINTAINER="devel@slitaz.org"
@@ -13,7 +12,7 @@
 CONFIG_FILES="/etc/filesystems"
 
 # Modules paths and list
-MOD_PATH="lib/modules/$BASEVER-slitaz/kernel"
+MOD_PATH="lib/modules/$VERSION-slitaz/kernel"
 MODULES="fs/dlm/dlm.ko.xz"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -34,12 +33,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-drm/receipt
--- a/linux-drm/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-drm/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-drm"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel drm module."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
 	local path
-	path=lib/modules/$BASEVER-slitaz/kernel
+	path=lib/modules/$VERSION-slitaz/kernel
 	mkdir -p $fs/$path
-	export src
-	export _pkg
+	export src install
 	$wanted_stuff/list_modules.sh drivers/gpu/drm | while read module; do
 		dir=$path/$(dirname $module)
 		[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -31,7 +29,7 @@
 	fi
     done
 
-    # remove drivers/char/agp kernel modules cause there in linux-agp package
+    # Remove drivers/char/agp kernel modules cause there in linux-agp package
     if [ -d $fs/$path/drivers/char/agp ]; then
         rm -rf $fs/$path/drivers/char/agp
     fi
@@ -40,11 +38,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-firewire/receipt
--- a/linux-firewire/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-firewire/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-firewire"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel firewire modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/firewire | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -29,11 +27,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-firmware/receipt
--- a/linux-firmware/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-firmware/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-firmware"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="non-free"
 SHORT_DESC="Firmware thats compiled from linux source code."
 MAINTAINER="slaxemulator@gmail.com"
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-gfs2/receipt
--- a/linux-gfs2/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-gfs2/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-gfs2"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel gfs2 module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/gfs2 | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -33,12 +31,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-hfs/receipt
--- a/linux-hfs/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-hfs/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-hfs"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel hfs module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/${PACKAGE#*-} | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -33,12 +31,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-hfsplus/receipt
--- a/linux-hfsplus/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-hfsplus/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-hfsplus"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel hfsplus module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/hfsplus | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -33,11 +31,11 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-hwmon/receipt
--- a/linux-hwmon/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-hwmon/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-hwmon"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel hwmon modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/hwmon | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -35,11 +33,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-input-misc/receipt
--- a/linux-input-misc/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-input-misc/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-input-misc"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel misc. input drivers, including the ATI RemoteWonders."
 MAINTAINER="rcx@zoominternet.net"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/input/misc | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -35,11 +33,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-input-tablet/receipt
--- a/linux-input-tablet/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-input-tablet/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-input-tablet"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel tablet input drivers."
 MAINTAINER="rcx@zoominternet.net"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/input/tablet | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -30,11 +28,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-input-touchscreen/receipt
--- a/linux-input-touchscreen/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-input-touchscreen/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-input-touchscreen"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel touchscreen input drivers."
 MAINTAINER="jozee@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/input/touchscreen | \
     while read module; do
     	dir=$path/$(dirname $module)
@@ -36,11 +34,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-ipv6/receipt
--- a/linux-ipv6/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-ipv6/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-ipv6"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel ipv6 modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh net/ipv6 | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -35,11 +33,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-irda/receipt
--- a/linux-irda/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-irda/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-irda"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel irda modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,11 +14,10 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
     
-    export src
-    export _pkg
+    export src install
     
     $wanted_stuff/list_modules.sh drivers/net/irda net/irda | while read module; do
     	dir=$path/$(dirname $module)
@@ -31,11 +29,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-isdn/receipt
--- a/linux-isdn/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-isdn/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-isdn"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel isdn modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/isdn | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -35,11 +33,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-jfs/receipt
--- a/linux-jfs/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-jfs/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-jfs"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel jfs module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/jfs | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -33,11 +31,11 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-joystick/receipt
--- a/linux-joystick/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-joystick/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-joystick"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel joystick modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/input/joystick drivers/input/gameport \
 	drivers/input/input-polldev.ko.xz | \
 	while read module; do
@@ -37,11 +35,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-kvm/receipt
--- a/linux-kvm/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-kvm/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-kvm"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel kvm and virtio modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh arch/x86/kvm drivers/virtio drivers/lguest \
     drivers/char/hw_random/virtio-rng.ko.xz \
     drivers/net/virtio_net.ko.xz drivers/block/virtio_blk.ko.xz | \
@@ -32,11 +30,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-logfs/receipt
--- a/linux-logfs/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-logfs/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-logfs"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel logfs module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/${PACKAGE#*-} | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -33,12 +31,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-md/receipt
--- a/linux-md/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-md/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-md"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel md modules."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/md | while read module; do
     	case "$module" in
 	crypto/*) continue;;
@@ -39,11 +37,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-media/receipt
--- a/linux-media/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-media/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-media"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel media modules."
 MAINTAINER="slaxemulator@gmail.com"
@@ -12,7 +11,7 @@
 WEB_SITE="http://kernel.org"
 
 # Modules paths and list
-MOD_PATH="lib/modules/$BASEVER-slitaz/kernel"
+MOD_PATH="lib/modules/$VERSION-slitaz/kernel"
 MODULES="drivers/media drivers/mfd"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -36,10 +35,10 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-memstick/receipt
--- a/linux-memstick/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-memstick/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-memstick"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel sony memory stick modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,11 +14,10 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
     
-    export src
-    export _pkg
+    export src install
     
     $wanted_stuff/list_modules.sh drivers/memstick | while read module; do
     	dir=$path/$(dirname $module)
@@ -37,11 +35,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-minix/receipt
--- a/linux-minix/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-minix/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-minix"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel minix module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/${PACKAGE#*-} | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -33,12 +31,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-mmc/receipt
--- a/linux-mmc/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-mmc/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-mmc"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel mmc modules (card reader)."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/mmc drivers/misc/tifm_7xx1.ko.xz drivers/misc/iwmc3200top/iwmc3200top.ko.xz| \
 	while read module; do
     	dir=$path/$(dirname $module)
@@ -36,11 +34,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-module-headers/receipt
--- a/linux-module-headers/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-module-headers/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-module-headers"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="development"
 SHORT_DESC="Header files and scripts for building modules for linux kernel."
 MAINTAINER="devel@slitaz.org"
@@ -10,14 +9,14 @@
 DEPENDS="slitaz-toolchain"
 WANTED="linux"
 WEB_SITE="http://kernel.org/"
-KVERSION=$BASEVER-slitaz
+KVERSION=$VERSION-slitaz
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	local path
-	_AUFSVER=`grep  ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
-	AUFSDIR="$WOK/$WANTED/aufs-${_AUFSVER}"
+	AUFSVER=$(grep  ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g')
+	AUFSDIR="$WOK/$WANTED/aufs-${AUFSVER}"
 	path=usr/src/linux-$KVERSION
 	mkdir -p $fs/lib/modules/$KVERSION
 	ln -sf /$path $fs/lib/modules/$KVERSION/build
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-mwave/receipt
--- a/linux-mwave/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-mwave/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-mwave"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel ACP Modem driver module (for IBM Thinkpad)"
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/char/mwave | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -29,11 +27,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-nbd/receipt
--- a/linux-nbd/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-nbd/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-nbd"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel network block device modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/block/nbd.ko.xz \
     drivers/block/drbd/drbd.ko.xz | \
     while read module; do
@@ -31,11 +29,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-ncpfs/receipt
--- a/linux-ncpfs/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-ncpfs/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-ncpfs"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel ncpfs module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/ncpfs | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -33,12 +31,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-netfilter/receipt
--- a/linux-netfilter/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-netfilter/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-netfilter"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel netfilter modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,11 +14,10 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
     
-    export src
-    export _pkg
+    export src install
     
     $wanted_stuff/list_modules.sh net/netfilter net/ipv4/netfilter net/8021q | \
     while read module; do
@@ -39,11 +37,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-nfsd/receipt
--- a/linux-nfsd/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-nfsd/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-nfsd"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel NFS server module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/nfsd | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -33,12 +31,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-ocfs2/receipt
--- a/linux-ocfs2/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-ocfs2/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-ocfs2"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="ocfs2 filesystem"
 MAINTAINER="slaxemulator@gmail.com"
@@ -15,11 +14,10 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
     
-    export src
-    export _pkg
+    export src install
     
     $wanted_stuff/list_modules.sh fs/ocfs2 | while read module; do
     	dir=$path/$(dirname $module)
@@ -37,10 +35,10 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-radio/receipt
--- a/linux-radio/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-radio/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-radio"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel radio modules."
 MAINTAINER="slaxemulator@gmail.com"
@@ -15,11 +14,10 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
     
-    export src
-    export _pkg
+    export src install
     
     $wanted_stuff/list_modules.sh  drivers/media/radio | while read module; do
     	dir=$path/$(dirname $module)
@@ -38,11 +36,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-reiserfs/receipt
--- a/linux-reiserfs/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-reiserfs/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-reiserfs"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel reiserfs module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/reiserfs | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -33,12 +31,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-sched/receipt
--- a/linux-sched/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-sched/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-sched"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel sched modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,11 +14,10 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
     
-    export src
-    export _pkg
+    export src install
     
     $wanted_stuff/list_modules.sh net/sched | while read module; do
     	dir=$path/$(dirname $module)
@@ -31,11 +29,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-scsi/receipt
--- a/linux-scsi/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-scsi/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-scsi"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel scsi modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/scsi | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -29,11 +27,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-sound/receipt
--- a/linux-sound/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-sound/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-sound"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel sound modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,15 +14,16 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh sound | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $install/$path/$module $fs/$dir
     done
+    
+    # Firmware
 	mkdir $fs/lib/firmware
 	for i in ess korg sun yamaha; do
 		cp -a $install/lib/firmware/$i $fs/lib/firmware
@@ -31,8 +31,8 @@
 
     for i in $(cat $wanted_stuff/modules.list); do
         if [ -f $fs/$path/$i ]; then
-	    rm -f $fs/$path/$i
-	fi
+			rm -f $fs/$path/$i
+		fi
     done
 
 }
@@ -40,11 +40,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-source/receipt
--- a/linux-source/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-source/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,14 +2,13 @@
 
 PACKAGE="linux-source"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="development"
 SHORT_DESC="The Linux kernel source files."
 MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WANTED="linux"
 WEB_SITE="http://www.kernel.org/"
-DEPENDS="linux slitaz-toolchain ncurses-dev perl busybox-boot"
+DEPENDS="linux slitaz-toolchain ncurses-dev perl"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -17,7 +16,7 @@
 	local _AUFSVER=`grep  ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
 	local AUFSDIR="aufs-${_AUFSVER}"
 	mkdir -p $fs/usr/src/kernel-patches \
-			$fs/lib/modules/$BASEVER-slitaz \
+			$fs/lib/modules/$VERSION-slitaz \
 			$fs/usr/bin $fs/usr/sbin
 	cp -a $WOK/$WANTED/source/slitaz $fs/usr/src/kernel-patches
 	cp -a $stuff/buildtaz $fs/usr/src/kernel-patches/slitaz
@@ -36,5 +35,5 @@
 			$fs/usr/src/kernel-patches/slitaz/aufs2
 	fi
 	ln -s /usr/src/linux-$VERSION \
-		$fs/lib/modules/$BASEVER-slitaz/source
+		$fs/lib/modules/$VERSION-slitaz/source
 }
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-source/stuff/get-linux-source
--- a/linux-source/stuff/get-linux-source	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-source/stuff/get-linux-source	Wed Jan 29 09:56:07 2014 +0100
@@ -41,7 +41,6 @@
 fi
 
 cd /usr/src/linux-$VERSION
-cp /usr/share/boot/initrd initrd.cpio
 while read patch_file; do
 	echo "Apply $patch_file"
 	patch -p1 < slitaz/$patch_file
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-speakup/receipt
--- a/linux-speakup/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-speakup/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-speakup"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel Speakup modules."
 MAINTAINER="erjo@slitaz.org"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/staging/speakup | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -35,11 +33,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-squashfs/receipt
--- a/linux-squashfs/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-squashfs/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-squashfs"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel squashfs module."
 MAINTAINER="devel@slitaz.org"
@@ -17,10 +16,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path $fs/etc
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh fs/squashfs | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -34,12 +32,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-staging/receipt
--- a/linux-staging/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-staging/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-staging"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="staging kernel modules"
 MAINTAINER="slaxemulator@gmail.com"
@@ -15,11 +14,10 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
     
-    export src
-    export _pkg
+    export src install
     
     $wanted_stuff/list_modules.sh drivers/staging | while read module; do
     	dir=$path/$(dirname $module)
@@ -37,10 +35,10 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-toshiba/receipt
--- a/linux-toshiba/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-toshiba/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-toshiba"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel toshiba module."
 MAINTAINER="devel@slitaz.org"
@@ -12,7 +11,7 @@
 WEB_SITE="http://www.kernel.org/"
 
 # Modules paths and list
-MOD_PATH="lib/modules/$BASEVER-slitaz/kernel"
+MOD_PATH="lib/modules/$VERSION-slitaz/kernel"
 MODULES="drivers/char/toshiba.ko.xz"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -30,10 +29,10 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-usb-misc/receipt
--- a/linux-usb-misc/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-usb-misc/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-usb-misc"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel misc. USB drivers, including the Lego USB tower."
 MAINTAINER="rcx@zoominternet.net"
@@ -15,10 +14,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/usb/misc | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -30,11 +28,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-usbdsl/receipt
--- a/linux-usbdsl/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-usbdsl/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-usbdsl"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel usb dsl modem modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,11 +14,10 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
     
-    export src
-    export _pkg
+    export src install
     
     $wanted_stuff/list_modules.sh drivers/usb/atm net/atm | \
     while read module; do
@@ -32,11 +30,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-usbip/receipt
--- a/linux-usbip/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-usbip/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-usbip"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel usbip module."
 MAINTAINER="devel@slitaz.org"
@@ -16,10 +15,9 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
-    export src
-    export _pkg
+    export src install
     $wanted_stuff/list_modules.sh drivers/staging/usbip | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -32,12 +30,12 @@
 {
 	grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \
 		echo "${PACKAGE#*-}" >> $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
 	sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-uwb/receipt
--- a/linux-uwb/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-uwb/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-uwb"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel uwb modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,11 +14,10 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
     
-    export src
-    export _pkg
+    export src install
     
     $wanted_stuff/list_modules.sh drivers/uwb drivers/usb/wusbcore \
     drivers/usb/host/whci | while read module; do
@@ -32,11 +30,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-video/receipt
--- a/linux-video/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-video/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-video"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel video modules."
 MAINTAINER="devel@slitaz.org"
@@ -12,7 +11,7 @@
 WEB_SITE="http://www.kernel.org/"
 
 # Modules paths and list
-MOD_PATH="lib/modules/$BASEVER-slitaz/kernel"
+MOD_PATH="lib/modules/$VERSION-slitaz/kernel"
 MODULES="drivers/video/backlight"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -30,11 +29,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-wan/receipt
--- a/linux-wan/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-wan/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-wan"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="Wide Area Networks (WANs) kernel modules"
 MAINTAINER="slaxemulator@gmail.com"
@@ -15,11 +14,10 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
     
-    export src
-    export _pkg
+    export src install
     
     $wanted_stuff/list_modules.sh drivers/net/wan | while read module; do
     	dir=$path/$(dirname $module)
@@ -37,10 +35,10 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-wimax/receipt
--- a/linux-wimax/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-wimax/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-wimax"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel wimax modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,11 +14,10 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
     
-    export src
-    export _pkg
+    export src install
     
     $wanted_stuff/list_modules.sh drivers/net/wimax net/wimax | while read module; do
     	dir=$path/$(dirname $module)
@@ -37,11 +35,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-wireless/receipt
--- a/linux-wireless/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-wireless/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-wireless"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel wireless modules."
 MAINTAINER="devel@slitaz.org"
@@ -15,11 +14,10 @@
 genpkg_rules()
 {
     local path
-    path=lib/modules/$BASEVER-slitaz/kernel
+    path=lib/modules/$VERSION-slitaz/kernel
     mkdir -p $fs/$path
     
-    export src
-    export _pkg
+    export src install
     
     $wanted_stuff/list_modules.sh drivers/net/wireless drivers/staging/wlan-ng \
     drivers/staging/echo drivers/leds net/wireless net/mac80211 \
@@ -42,11 +40,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-without-modules/receipt
--- a/linux-without-modules/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-without-modules/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-without-modules"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel without module support."
 MAINTAINER="devel@slitaz.org"
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux-zram/receipt
--- a/linux-zram/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux-zram/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 
 PACKAGE="linux-zram"
 VERSION="3.2.53"
-BASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="Compressed caching"
 MAINTAINER="devel@slitaz.org"
@@ -17,10 +16,9 @@
 genpkg_rules()
 {
 	local path
-	path=lib/modules/$BASEVER-slitaz/kernel
+	path=lib/modules/$VERSION-slitaz/kernel
 	mkdir -p $fs/$path $fs/etc/init.d
-	export src
-	export _pkg
+	export src install
 	$wanted_stuff/list_modules.sh drivers/staging/zram | \
 	while read module; do
 		dir=$path/$(dirname $module)
@@ -34,11 +32,11 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
 post_remove()
 {
-	chroot "$1/" depmod -a $BASEVER-slitaz
+	chroot "$root/" depmod -a $VERSION-slitaz
 }
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/receipt
--- a/linux/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -2,40 +2,45 @@
 
 PACKAGE="linux"
 VERSION="3.2.53"
-KBASEVER="${VERSION:0:3}"
 CATEGORY="base-system"
 SHORT_DESC="The Linux kernel and modules."
 MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-TARBALL="$PACKAGE-$KBASEVER.tar.xz"
+TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://www.kernel.org/"
 WGET_URL="ftp://ftp.kernel.org/pub/linux/kernel/v3.0/$TARBALL"
 HOST_ARCH="i486 arm x86_64"
 
-DEPENDS=""
-BUILD_DEPENDS="slitaz-toolchain perl git xz lzma patch \
+DEPENDS="kmod"
+BUILD_DEPENDS="slitaz-toolchain perl git xz lzma patch kmod \
 uclibc-cross-compiler-x86_64 busybox-boot"
 
-# Use version patch so we dont dl full kernel source on each minor update
-[ "$KBASEVER" != "$VERSION" ] && 
-PATCH="$(dirname $WGET_URL)/patch-$VERSION.xz" &&
-EXTRA_SOURCE_FILES="$(basename $PATCH)"
+#
+# The Linux receipt handle cross compilation. For x86_64 we actually use
+# the uclibc-cross-compiler-x86_64 and for ARM we use a real cross env.
+# Please discuss any change and keep it simple, dont play with VERSION
+# string or Kernel SUBLEVEL because depmod and Pankso dont like that!
+#
+# The receipt also handle some cook options for faster build: 
+# --nox64    : Skip the x86_64 cross compilation
+# --nonomods : Skip bzImage without modules build
+#
 
 # Aufs enable chroot
 AUFS_NOT_RAMFS="uclibc-cross-compiler-x86_64 is not compatible with aufs+tmpfs 8("
 
-# This will save/restore modules.dep but we want to regenerate it on
-# install or upgrade.
-#CONFIG_FILES="/lib/modules/$KBASEVER-slitaz/modules.dep"
-
 # Handle multiarch compilation. Less bdeps when cross-compiling for ARM
 case "$ARCH" in
-	arm) BUILD_DEPENDS="xz" TARBALL="$PACKAGE-$VERSION.tar.bz2" ;;
+	arm) BUILD_DEPENDS="xz" ;;
 	x86_64) BUILD_DEPENDS="xz" ;;
 esac
 
-# TODO: slitaz.conf provide SLITAZ_ARCH and must be handled by tazpkg/spk
-[ -f "$root/etc/slitaz/slitaz.conf" ] && . $root/etc/slitaz/slitaz.conf
+# Handle multiarch installation. ARM use Busybox modutils, so avoid any
+# deps on kmod. SLITAZ_ARCH can have also custom post_install commands
+. $root/etc/slitaz/slitaz.conf || exit 1
+case "$SLITAZ_ARCH" in
+	arm) DEPENDS="" ;;
+esac
 
 # Rules to configure and make the package.
 compile_rules()
@@ -43,28 +48,14 @@
 	cd $src
 	cp /usr/share/boot/initrd initrd.cpio
 
-	if [ "$KBASEVER" != "$VERSION" ]; then
-		[ -s $SRC/$(basename $PATCH) ] ||
-		wget $PATCH -O $SRC/$(basename $PATCH)
-		xzcat $SRC/$(basename $PATCH) | patch -Np1
-		touch done.patch-$VERSION
-	fi
-
+	# Handle cross compilation
 	case "$ARCH" in
 		arm)
-			echo "Compiling: ARM Kernel"
-			if [ ! -s $SRC/$(basename $PATCH) ]; then
-				wget $PATCH -O $SRC/$(basename $PATCH)
-			fi
+			echo "Compiling: $ARCH Kernel"
 			make mrproper
-			# Buggy: we got kernel panic about module not tinted 3.2.14
-			#echo "Applying patch: $(basename $PATCH)"
-			#xzcat $SRC/$(basename $PATCH) | patch -Np1 >/dev/null
 			patch -Np1 < $stuff/$ARCH/linux-arm.patch || exit 1
 			cp -f $stuff/$ARCH/linux-arm.config .config
-			echo "Configure $ARCH kernel..."
 			yes '' | make ARCH=$ARCH oldconfig
-			echo "Build $ARCH kernel..."
 			make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- bzImage &&
 			make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- modules &&
 			make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- \
@@ -79,34 +70,25 @@
 			return 0 ;;
 	esac
 
-	[ ! -x /usr/bin/cook ] && report open-bloc
-
-	# Check for Aufs and cook it if unbuilt.
+	# Check for Aufs and get source/patches if needed
 	echo "Checking for Aufs packages..."
-	_AUFSVER=`grep ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
-	if [ -x /usr/bin/cook ]; then
-		# Give info an redirect to /dev/null since aufs got it own log.
-		AUFSDIR=$WOK/aufs/source/aufs-${_AUFSVER}
-		[ -d "$AUFSDIR" ] && rm -rf $AUFSDIR
-		#echo "Cook: aufs $_AUFSVER"
-		cook aufs --getsrc
+	AUFSVER=$(grep ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g')
+	AUFSDIR="$WOK/aufs/source/aufs-${AUFSVER}"
+	if [ ! -d "$AUFSDIR" ]; then
+		[ ! -f "$SRC/aufs-${AUFSVER}.tar.bz2" ] && cook aufs --getsrc
 		mkdir -p $WOK/aufs/source/
-		tar xjf $SRC/aufs-${_AUFSVER}.tar.bz2 -C $WOK/aufs/source/
-	elif [ -x /usr/bin/tazwok ]; then
-		# we just need aufs source. Also cooking now is a bad idea since it
-		# needs linux-module-headers. The one your cooking not the one from the web.
-		AUFSDIR=$WOK/aufs/aufs-${_AUFSVER}
-		[ -d "$AUFSDIR" ] && rm -rf $AUFSDIR
-		tazwok get-src aufs --target=$AUFSDIR || { report close-bloc; return 1; }
+		echo "Extracting: aufs-${AUFSVER}.tar.bz2"
+		tar xjf $SRC/aufs-${AUFSVER}.tar.bz2 -C $WOK/aufs/source/
 	fi
+	
 	echo "cook:linux" > $command
 
 	echo "Copying Aufs files and patches..."
 	cp -a $AUFSDIR/Documentation $AUFSDIR/fs $AUFSDIR/include $src
 	cp -a $AUFSDIR/aufs3-*.patch $stuff
 
-	# SliTaz db
-	[ -d $WOK/$PACKAGE/source/slitaz ] && rm -rf $WOK/$PACKAGE/source/slitaz 2> /dev/null
+	# SliTaz db stuff
+	[ -d $WOK/$PACKAGE/source/slitaz ] && rm -rf $WOK/$PACKAGE/source/slitaz
 	mkdir -p $WOK/$PACKAGE/source/slitaz
 	echo "$WGET_URL" > $WOK/$PACKAGE/source/slitaz/url
 	cp $stuff/gztazmod.sh $stuff/list_modules.sh $WOK/$PACKAGE/source/slitaz
@@ -118,15 +100,10 @@
 		echo "$patch_file" >> $WOK/$PACKAGE/source/slitaz/patches
 		cp $stuff/$patch_file $WOK/$PACKAGE/source/slitaz
 		if [ -f done.$patch_file ]; then
-			echo "Skipping $patch_file"
-			continue
+			echo "Skipping $patch_file" && continue
 		fi
 		echo "Apply $patch_file"
-		if [ -x /usr/bin/cook ]; then
-			patch -p1 < $WOK/$PACKAGE/source/slitaz/$patch_file || return 1
-		elif [ -x /usr/bin/tazwok ]; then
-			patch -p1 < $WOK/$PACKAGE/source/slitaz/$patch_file || { report close-bloc; return 1; }
-		fi
+		patch -p1 < $WOK/$PACKAGE/source/slitaz/$patch_file || return 1
 		touch done.$patch_file
 	done <<EOT
 $PACKAGE-diff.u
@@ -141,129 +118,103 @@
 channel-negative-one-maxim.patch
 mac80211.compat08082009.wl_frag+ack_v1.patch
 EOT
-
-	sed -i 's|SUBLEVEL =.*|SUBLEVEL =|g' Makefile
-
-	[ ! -x /usr/bin/cook ] && report step "Make kernel proper and then build lguest"
-	[ -x /usr/bin/cook ] && echo "Make kernel proper and then build lguest"
+	
+	# Mrproper and lguest
+	echo "Make kernel proper and then build lguest..."
 	make mrproper
 	cd Documentation/virtual/lguest
-	if [ -x /usr/bin/cook ]; then
-		make lguest || return 1
-	elif [ -x /usr/bin/tazwok ]; then
-		make lguest || { report close-bloc; return 1; }
+	make lguest || return 1
+	cd $src
+	
+	#
+	# Arch x86_64: TODO have a real cross environment
+	#
+	if [ ! "nox64" ]; then
+		echo "Compiling: x86_64 Kernel"
+		
+		# Build bzImage64 without modules first
+		if [ ! "nonomods" ]; then
+			cp -f $stuff/$PACKAGE-slitaz.config64 .config
+			sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config
+			# We can't keep every driver in staging ???
+			sed -i -e 's/^CONFIG_RTL8192/#&/' \
+				-e 's/^CONFIG_R8187SE/#&/' \
+				-e 's/^CONFIG_RT2870/#&/' .config
+			echo -e "\n* Configure bzImage64 without modules...\n"
+			yes '' | make ARCH=x86_64 oldconfig
+			echo -e "\n* Building bzImage64 without modules...\n"
+			make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage || exit 1
+			[ -d $DESTDIR ] || mkdir -p $DESTDIR/linux64
+			mv arch/x86/boot/bzImage $DESTDIR/linux64
+			mv System.map System.map-without-modules64
+		fi
+		
+		# Build bzImage64 with modules
+		cp -f $stuff/$PACKAGE-slitaz.config64 .config
+		echo -e "\n* Configure bzImage64 with modules...\n"
+		yes '' | make ARCH=x86_64 oldconfig
+		echo -e "\n* Building bzImage64 with modules...\n"
+		make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage &&
+		make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- modules &&
+		make ARCH=x86_64 INSTALL_MOD_PATH=$DESTDIR/linux64 modules_install &&
+		make ARCH=x86_64 INSTALL_HDR_PATH=$DESTDIR/linux64/usr headers_install &&
+		ln .config $WOK/$PACKAGE/source/slitaz/config64
+		[ -s arch/x86/boot/bzImage ] || return 1
+		mkdir -p $DESTDIR/linux64/boot 2> /dev/null
+		mv arch/x86/boot/bzImage $DESTDIR/linux64/boot/vmlinuz-$VERSION-slitaz
+		ln System.map System.map-modules64
+		ln Module.symvers Module.symvers-modules64
+	else
+		echo "* Skipping: x86_64 Kernel..."
 	fi
-	cd $src
-
-	case "$opt" in
-	*--no64*);;
-	*)
+	
 	#
-	# Arch x86_64
+	# Linux Arch i386 - GCC arch i486
 	#
-	[ ! -x /usr/bin/cook ] && report step "Make bzImage64 without modules first"
-	[ -x /usr/bin/cook ] && echo "Building x86_64 Kernel"
-
-	# Build bzImage64 without modules first
-	cp -f $stuff/$PACKAGE-slitaz.config64 .config
-	sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config
-
-	# We can't keep every driver in staging
-	sed -i -e 's/^CONFIG_RTL8192/#&/' \
-	       -e 's/^CONFIG_R8187SE/#&/' \
-	       -e 's/^CONFIG_RT2870/#&/' .config
-	echo "Configure bzImage64 without modules..."
-	yes '' | make ARCH=x86_64 oldconfig
-	echo "Build bzImage64 without modules..."
-	if [ -x /usr/bin/cook ]; then
-		make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage || exit 1
-	elif [ -x /usr/bin/tazwok ]; then
-		make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage || { report close-bloc; return 1; }
-	fi
-	[ -d $DESTDIR ] || mkdir -p $DESTDIR/linux64
-	mv arch/x86/boot/bzImage $DESTDIR/linux64
-	mv System.map System.map-without-modules64
-
-	[ ! -x /usr/bin/cook ] && report step "Now build bzImage64 with modules"
-
-	# Build bzImage64 with modules
-	cp -f $stuff/$PACKAGE-slitaz.config64 .config
-	echo "Configure bzImage64 with modules..."
-	yes '' | make ARCH=x86_64 oldconfig
-	echo "Build bzImage64 with modules..."
-	make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage &&
-	make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- modules &&
-	make ARCH=x86_64 INSTALL_MOD_PATH=$DESTDIR/linux64 modules_install &&
-	make ARCH=x86_64 INSTALL_HDR_PATH=$DESTDIR/linux64/usr headers_install &&
-	ln .config $WOK/$PACKAGE/source/slitaz/config64
-	if [ -x /usr/bin/cook ]; then
-		[ -s arch/x86/boot/bzImage ] || return 1
-	elif [ -x /usr/bin/tazwok ]; then
-		[ -s arch/x86/boot/bzImage ] || { report close-bloc; return 1; }
-	fi
-	mkdir -p $DESTDIR/linux64/boot 2> /dev/null
-	mv arch/x86/boot/bzImage $DESTDIR/linux64/boot/vmlinuz-$VERSION-slitaz
-	ln System.map System.map-modules64
-	ln Module.symvers Module.symvers-modules64
-	esac
-
-	#
-	# Standard kernel
-	#
-	[ ! -x /usr/bin/cook ] && report step "Make bzImage without modules first"
-	[ -x /usr/bin/cook ] && echo "Building standard kernel..."
+	echo "Compiling: i386 Kernel..."
 
 	# Build bzImage without modules first
-	cp -f $stuff/$PACKAGE-slitaz.config .config
-	sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config
-
-	# We can't keep every driver in staging
-	sed -i -e 's/^CONFIG_RTL8192/#&/' \
-	       -e 's/^CONFIG_R8187SE/#&/' \
-	       -e 's/^CONFIG_RT2870/#&/' .config
-	echo "Configure bzImage without modules..."
-	yes '' | make ARCH=i386 oldconfig
-	echo "Build bzImage without modules..."
-	if [ -x /usr/bin/cook ]; then
+	if [ ! "nonomods" ]; then
+		cp -f $stuff/$PACKAGE-slitaz.config .config
+		sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config
+		# We can't keep every driver in staging ???
+		sed -i -e 's/^CONFIG_RTL8192/#&/' \
+			-e 's/^CONFIG_R8187SE/#&/' \
+			-e 's/^CONFIG_RT2870/#&/' .config
+		echo -e "\n* Configure bzImage without modules...\n"
+		yes '' | make ARCH=i386 oldconfig
+		echo -e "\n* Building bzImage without modules...\n"
 		make ARCH=i386 -j 4 bzImage || exit 1
-	elif [ -x /usr/bin/tazwok ]; then
-		make ARCH=i386 -j 4 bzImage || { report close-bloc; return 1; }
+		[ -d $DESTDIR ] || mkdir -p $DESTDIR
+		mv arch/x86/boot/bzImage $DESTDIR
+		mv System.map System.map-without-modules
 	fi
-	[ -d $DESTDIR ] || mkdir -p $DESTDIR
-	mv arch/x86/boot/bzImage $DESTDIR
-	mv System.map System.map-without-modules
-
-	[ ! -x /usr/bin/cook ] && report step "Now build bzImage with modules"
-
+	
 	# Build bzImage with modules
 	cp -f $stuff/$PACKAGE-slitaz.config .config
-	echo "Configure bzImage with modules..."
+	echo -e "\n* Configure bzImage with modules...\n"
 	yes '' | make ARCH=i386 oldconfig
 	ln .config $WOK/$PACKAGE/source/slitaz/config
-	echo "Build bzImage with modules..."
+	echo -e "\n* Building bzImage with modules...\n"
 	make ARCH=i386 -j 4 bzImage &&
 	make ARCH=i386 -j 4 modules &&
 	make ARCH=i386 INSTALL_MOD_PATH=$DESTDIR modules_install &&
 	make ARCH=i386 INSTALL_HDR_PATH=$DESTDIR/usr headers_install &&
-	if [ -x /usr/bin/cook ]; then
-		[ -s arch/x86/boot/bzImage ] || return 1
-	elif [ -x /usr/bin/tazwok ]; then
-		[ -s arch/x86/boot/bzImage ] || { report close-bloc; return 1; }
-	fi
+	[ -s arch/x86/boot/bzImage ] || return 1
 	mkdir -p $DESTDIR/boot 2> /dev/null
 	mv arch/x86/boot/bzImage $DESTDIR/boot/vmlinuz-$VERSION-slitaz
-
-	[ ! -x /usr/bin/cook ] && report step "Compressing all modules"
-
+	
 	# Compress all modules.
-	$stuff/gztazmod.sh $DESTDIR/lib/modules/$KBASEVER-slitaz
-	$stuff/gztazmod.sh $DESTDIR/linux64/lib/modules/$KBASEVER-slitaz
+	if [ -d "$DESTDIR/lib/modules/$VERSION-slitaz" ]; then
+		$stuff/gztazmod.sh $DESTDIR/lib/modules/$VERSION-slitaz
+	else
+		return 1
+	fi
+	if [ -d "$DESTDIR/linux64/lib/modules/$VERSION-slitaz" ]; then
+		$stuff/gztazmod.sh $DESTDIR/linux64/lib/modules/$VERSION-slitaz
+	fi
 	ln System.map System.map-modules
 	ln Module.symvers Module.symvers-modules
-
-	if [ ! -x /usr/bin/cook ]; then
-		report close-bloc
-	fi
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -283,70 +234,78 @@
     export PACKAGE VERSION
     local path
     cp -a $install/boot $fs
+    
     # Compress all modules.
-    path=$fs/lib/modules/$KBASEVER-slitaz/kernel
+    path=$fs/lib/modules/$VERSION-slitaz/kernel
     mkdir -p $path
-    cp -a $install/lib/modules/$KBASEVER-slitaz/mo* \
-		$fs/lib/modules/$KBASEVER-slitaz
-    [ "$KBASEVER" != "$VERSION" ] &&
-	ln -s $KBASEVER-slitaz $fs/lib/modules/$VERSION-slitaz
+	
     # Get the base modules
-    export src
-    export _pkg
+    export src install
     mkdir -p $WOK/$PACKAGE/source/tmp
     # Warning stuff/list_modules.sh must find the generated modules.list
     $stuff/list_modules.sh \
-	$(cat $stuff/modules.list) > $WOK/$PACKAGE/source/tmp/modules.list
+		$(cat $stuff/modules.list) > $WOK/$PACKAGE/source/tmp/modules.list
     while read module; do
     	dir=$(dirname $module)
     	[ -d $path/$dir ] || mkdir -p $path/$dir
-        cp -a $install/lib/modules/$KBASEVER-slitaz/kernel/$module $path/$dir
+        cp -a $install/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir
     done < $WOK/$PACKAGE/source/tmp/modules.list
+    
     # Remove unresolved links
-    rm -f $fs/lib/modules/$KBASEVER-slitaz/build
-    rm -f $fs/lib/modules/$KBASEVER-slitaz/source
-    # Cook all packages with a kernel module
-    for i in $(cd $WOK; grep -l 'cook linux$' */receipt)
+    rm -f $fs/lib/modules/$VERSION-slitaz/build
+    rm -f $fs/lib/modules/$VERSION-slitaz/source
+    
+    # We only need module.{order,builtin} because other map files are 
+    # generated by depmod in post_install
+    cp -a $install/lib/modules/$VERSION-slitaz/modules.order \
+		$install/lib/modules/$VERSION-slitaz/modules.builtin \
+		$fs/lib/modules/$VERSION-slitaz
+    
+    # Pack all packages with a kernel module
+    for i in $(cd $WOK; grep -l '^WANTED="linux"' */receipt)
     do
-    	echo cook ${i%/receipt}
+		[ ! -d "$install/lib/modules/$VERSION-slitaz" ] && return 1
+		cook ${i%/receipt}
     done
-    # Fixed modules.dep to use right path
-    # saves 100kb of space too
-    sed -i "s|$_pkg||g" $fs/lib/modules/$KBASEVER-slitaz/modules.dep
-    sed -i "s|99.98.$KBASEVER-slitaz|$KBASEVER-slitaz|g" $fs/lib/modules/$KBASEVER-slitaz/modules.dep
-    # Check and echo any module in kernel .config that's not added to
-    # one of linux-* pkgs
-    $stuff/check_modules.sh
+	
+	# Check any module in kernel .config that's not added to a linux-* pkgs
+	# and remove aufs patches: we dont need them in HG wok.
+	$stuff/check_modules.sh
+	rm -f $stuff/aufs3-*
 }
 
 # Pre and post install commands for Tazpkg.
 post_install()
 {
     echo "Processing post-install commands..."
-    case "$ARCH" in
+    chroot "$root/" depmod -a $VERSION-slitaz
+    
+    # Handle multiarch installation
+    case "$SLITAZ_ARCH" in
 		arm)
 			echo "Kernel : /boot/linux-$VERSION-slitaz-$ARCH"
 			echo "Modules: /lib/modules/$VERSION-slitaz"
 			return 0 ;;
 	esac
-    chroot "$1/" depmod -a $KBASEVER-slitaz
-    # GRUB stuff.
-    if [ -f "$1/boot/grub/menu.lst" ]; then
-    	root_dev="/dev/`lsblk | grep '/$'| grep -o '[a-z]d[a-z][0-9]*'`" # current root device
-    	grub_part="$(( `echo $root_dev | grep -o '[0-9]*$'`-1 ))"
-    	grub_dev="`grep $(echo $root_dev | grep -o  '^/dev/.d.' ) $1/boot/grub/device.map |\
-    	cut -f1 | sed "s/)$/.$grub_part)/g"`" # use device.map to find grub device number
+	
+	# GRUB stuff.
+	if [ -f "$1/boot/grub/menu.lst" ]; then
+		# Current root device
+		root_dev="/dev/$(lsblk | grep '/$'| grep -o '[a-z]d[a-z][0-9]*')"
+		grub_part="$(( $(echo $root_dev | grep -o '[0-9]*$')-1 ))"
+		# Use device.map to find grub device number
+		grub_dev="$(grep $(echo $root_dev | grep -o  '^/dev/.d.' ) \
+			$1/boot/grub/device.map | cut -f1 | sed "s/)$/.$grub_part)/g")" 
     	
-	# Add and clean kernel entrys in case of upgrade for installed system.
-	if ! grep -q vmlinuz-$VERSION-slitaz $1/boot/grub/menu.lst; then
+		# Add and clean kernel entries in case of upgrade for installed system.
+		if ! grep -q vmlinuz-$VERSION-slitaz $1/boot/grub/menu.lst; then
 		
-		#clean the old entry
-		# TODO somewhere, the old vmlinuz file is removed.
-		#      but the entry is still there. this cause a grub error:15 when selected
-		# see http://bugs.slitaz.org/?id=74
+			# Clean the old entry
+			# TODO: old vmlinuz file is removed but the entry is still there.
+			# So grub error:15 when selected: http://bugs.slitaz.org/?id=74
 
-		#add the new
-		cat >> $1/boot/grub/menu.lst << EOT
+			# Add the new entry
+			cat >> $1/boot/grub/menu.lst << EOT
 
 title SliTaz GNU/Linux (Kernel $VERSION-slitaz)
 $grub_dev 
@@ -356,8 +315,9 @@
 			last_entry=$(( $(grep -c '^title' $1/boot/grub/menu.lst)-1 ))
 			sed -e "s/^default.*/default $last_entry/g" -i $1/boot/grub/menu.lst
 		fi
+		
 		# Display information message.
-			cat <<EOT
+		cat <<EOT
 ----
 GRUB is installed, these tree lines must be in your /boot/grub/menu.lst:
 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/aufs2-base.patch
--- a/linux/stuff/aufs2-base.patch	Tue Jan 28 05:56:16 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-aufs2.1 base patch for linux-2.6.
-
-diff --git a/fs/namei.c b/fs/namei.c
-index 5c867dd..95978ec 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -1692,7 +1692,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
-  * needs parent already locked. Doesn't follow mounts.
-  * SMP-safe.
-  */
--static struct dentry *lookup_hash(struct nameidata *nd)
-+struct dentry *lookup_hash(struct nameidata *nd)
- {
- 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
- }
-diff --git a/fs/splice.c b/fs/splice.c
-index aa866d3..19afec6 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
- /*
-  * Attempt to initiate a splice from pipe to file.
-  */
--static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
--			   loff_t *ppos, size_t len, unsigned int flags)
-+long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+		    loff_t *ppos, size_t len, unsigned int flags)
- {
- 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
- 				loff_t *, size_t, unsigned int);
-@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
- /*
-  * Attempt to initiate a splice from a file to a pipe.
-  */
--static long do_splice_to(struct file *in, loff_t *ppos,
--			 struct pipe_inode_info *pipe, size_t len,
--			 unsigned int flags)
-+long do_splice_to(struct file *in, loff_t *ppos,
-+		  struct pipe_inode_info *pipe, size_t len,
-+		  unsigned int flags)
- {
- 	ssize_t (*splice_read)(struct file *, loff_t *,
- 			       struct pipe_inode_info *, size_t, unsigned int);
-diff --git a/include/linux/namei.h b/include/linux/namei.h
-index eba45ea..21ed6c9 100644
---- a/include/linux/namei.h
-+++ b/include/linux/namei.h
-@@ -82,6 +82,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
- extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
- 		int (*open)(struct inode *, struct file *));
- 
-+extern struct dentry *lookup_hash(struct nameidata *nd);
- extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
- 
- extern int follow_down_one(struct path *);
-diff --git a/include/linux/splice.h b/include/linux/splice.h
-index 997c3b4..be9a153 100644
---- a/include/linux/splice.h
-+++ b/include/linux/splice.h
-@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
- extern void splice_shrink_spd(struct pipe_inode_info *,
- 				struct splice_pipe_desc *);
- 
-+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+			   loff_t *ppos, size_t len, unsigned int flags);
-+extern long do_splice_to(struct file *in, loff_t *ppos,
-+			 struct pipe_inode_info *pipe, size_t len,
-+			 unsigned int flags);
-+
- #endif
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/aufs2-kbuild.patch
--- a/linux/stuff/aufs2-kbuild.patch	Tue Jan 28 05:56:16 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-aufs2.1 kbuild patch for linux-2.6.
-
-diff --git a/fs/Kconfig b/fs/Kconfig
-index 19891aa..b660b64 100644
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -208,6 +208,7 @@ source "fs/pstore/Kconfig"
- source "fs/sysv/Kconfig"
- source "fs/ufs/Kconfig"
- source "fs/exofs/Kconfig"
-+source "fs/aufs/Kconfig"
- 
- endif # MISC_FILESYSTEMS
- 
-diff --git a/fs/Makefile b/fs/Makefile
-index fb68c2b..c031a85 100644
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -124,3 +124,4 @@ obj-$(CONFIG_GFS2_FS)           += gfs2/
- obj-$(CONFIG_EXOFS_FS)          += exofs/
- obj-$(CONFIG_CEPH_FS)		+= ceph/
- obj-$(CONFIG_PSTORE)		+= pstore/
-+obj-$(CONFIG_AUFS_FS)           += aufs/
-diff --git a/include/linux/Kbuild b/include/linux/Kbuild
-index 01f6362..8b3b9f1 100644
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -65,6 +65,7 @@ header-y += atmppp.h
- header-y += atmsap.h
- header-y += atmsvc.h
- header-y += audit.h
-+header-y += aufs_type.h
- header-y += auto_fs.h
- header-y += auto_fs4.h
- header-y += auxvec.h
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/aufs2-standalone.patch
--- a/linux/stuff/aufs2-standalone.patch	Tue Jan 28 05:56:16 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,257 +0,0 @@
-aufs2.1 standalone patch for linux-2.6.
-
-diff --git a/fs/file_table.c b/fs/file_table.c
-index 01e4c1e..0e800e2 100644
---- a/fs/file_table.c
-+++ b/fs/file_table.c
-@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file)
- 	}
- }
- 
-+EXPORT_SYMBOL(file_sb_list_del);
-+
- #ifdef CONFIG_SMP
- 
- /*
-diff --git a/fs/inode.c b/fs/inode.c
-index 43566d1..4291eae 100644
---- a/fs/inode.c
-+++ b/fs/inode.c
-@@ -69,6 +69,7 @@ static DEFINE_SPINLOCK(inode_lru_lock);
- 
- __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
- __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_wb_list_lock);
-+EXPORT_SYMBOL(inode_sb_list_lock);
- 
- /*
-  * iprune_sem provides exclusion between the icache shrinking and the
-diff --git a/fs/namei.c b/fs/namei.c
-index 95978ec..f86d670 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -365,6 +365,7 @@ int deny_write_access(struct file * file)
- 
- 	return 0;
- }
-+EXPORT_SYMBOL(deny_write_access);
- 
- /**
-  * path_get - get a reference to a path
-@@ -1696,6 +1697,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
- {
- 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
- }
-+EXPORT_SYMBOL(lookup_hash);
- 
- /**
-  * lookup_one_len - filesystem helper to lookup single pathname component
-diff --git a/fs/namespace.c b/fs/namespace.c
-index fe59bd1..7d3843f 100644
---- a/fs/namespace.c
-+++ b/fs/namespace.c
-@@ -1508,6 +1508,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
- 	}
- 	return 0;
- }
-+EXPORT_SYMBOL(iterate_mounts);
- 
- static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end)
- {
-diff --git a/fs/notify/group.c b/fs/notify/group.c
-index d309f38..f0e9568 100644
---- a/fs/notify/group.c
-+++ b/fs/notify/group.c
-@@ -22,6 +22,7 @@
- #include <linux/srcu.h>
- #include <linux/rculist.h>
- #include <linux/wait.h>
-+#include <linux/module.h>
- 
- #include <linux/fsnotify_backend.h>
- #include "fsnotify.h"
-@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
- 	if (atomic_dec_and_test(&group->refcnt))
- 		fsnotify_destroy_group(group);
- }
-+EXPORT_SYMBOL(fsnotify_put_group);
- 
- /*
-  * Create a new fsnotify_group and hold a reference for the group returned.
-@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
- 
- 	return group;
- }
-+EXPORT_SYMBOL(fsnotify_alloc_group);
-diff --git a/fs/notify/mark.c b/fs/notify/mark.c
-index 252ab1f..2199b9b 100644
---- a/fs/notify/mark.c
-+++ b/fs/notify/mark.c
-@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
- 	if (atomic_dec_and_test(&mark->refcnt))
- 		mark->free_mark(mark);
- }
-+EXPORT_SYMBOL(fsnotify_put_mark);
- 
- /*
-  * Any time a mark is getting freed we end up here.
-@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
- 	if (unlikely(atomic_dec_and_test(&group->num_marks)))
- 		fsnotify_final_destroy_group(group);
- }
-+EXPORT_SYMBOL(fsnotify_destroy_mark);
- 
- void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
- {
-@@ -276,6 +278,7 @@ err:
- 
- 	return ret;
- }
-+EXPORT_SYMBOL(fsnotify_add_mark);
- 
- /*
-  * clear any marks in a group in which mark->flags & flags is true
-@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
- 	atomic_set(&mark->refcnt, 1);
- 	mark->free_mark = free_mark;
- }
-+EXPORT_SYMBOL(fsnotify_init_mark);
- 
- static int fsnotify_mark_destroy(void *ignored)
- {
-diff --git a/fs/open.c b/fs/open.c
-index b52cf01..c1b341c 100644
---- a/fs/open.c
-+++ b/fs/open.c
-@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
- 	mutex_unlock(&dentry->d_inode->i_mutex);
- 	return ret;
- }
-+EXPORT_SYMBOL(do_truncate);
- 
- static long do_sys_truncate(const char __user *pathname, loff_t length)
- {
-diff --git a/fs/splice.c b/fs/splice.c
-index 19afec6..11f07f8 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
- 
- 	return splice_write(pipe, out, ppos, len, flags);
- }
-+EXPORT_SYMBOL(do_splice_from);
- 
- /*
-  * Attempt to initiate a splice from a file to a pipe.
-@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
- 
- 	return splice_read(in, ppos, pipe, len, flags);
- }
-+EXPORT_SYMBOL(do_splice_to);
- 
- /**
-  * splice_direct_to_actor - splices data directly between two non-pipes
-diff --git a/security/commoncap.c b/security/commoncap.c
-index a93b3b7..024282c 100644
---- a/security/commoncap.c
-+++ b/security/commoncap.c
-@@ -971,3 +971,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(cap_file_mmap);
-diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index 1be6826..215278c 100644
---- a/security/device_cgroup.c
-+++ b/security/device_cgroup.c
-@@ -508,6 +508,7 @@ found:
- 
- 	return -EPERM;
- }
-+EXPORT_SYMBOL(__devcgroup_inode_permission);
- 
- int devcgroup_inode_mknod(int mode, dev_t dev)
- {
-diff --git a/security/security.c b/security/security.c
-index 4ba6d4c..9f64bb8 100644
---- a/security/security.c
-+++ b/security/security.c
-@@ -373,6 +373,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
- 		return 0;
- 	return security_ops->path_rmdir(dir, dentry);
- }
-+EXPORT_SYMBOL(security_path_rmdir);
- 
- int security_path_unlink(struct path *dir, struct dentry *dentry)
- {
-@@ -389,6 +390,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
- 		return 0;
- 	return security_ops->path_symlink(dir, dentry, old_name);
- }
-+EXPORT_SYMBOL(security_path_symlink);
- 
- int security_path_link(struct dentry *old_dentry, struct path *new_dir,
- 		       struct dentry *new_dentry)
-@@ -397,6 +399,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
- 		return 0;
- 	return security_ops->path_link(old_dentry, new_dir, new_dentry);
- }
-+EXPORT_SYMBOL(security_path_link);
- 
- int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
- 			 struct path *new_dir, struct dentry *new_dentry)
-@@ -415,6 +418,7 @@ int security_path_truncate(struct path *path)
- 		return 0;
- 	return security_ops->path_truncate(path);
- }
-+EXPORT_SYMBOL(security_path_truncate);
- 
- int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
- 			mode_t mode)
-@@ -423,6 +427,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
- 		return 0;
- 	return security_ops->path_chmod(dentry, mnt, mode);
- }
-+EXPORT_SYMBOL(security_path_chmod);
- 
- int security_path_chown(struct path *path, uid_t uid, gid_t gid)
- {
-@@ -430,6 +435,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
- 		return 0;
- 	return security_ops->path_chown(path, uid, gid);
- }
-+EXPORT_SYMBOL(security_path_chown);
- 
- int security_path_chroot(struct path *path)
- {
-@@ -506,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry)
- 		return 0;
- 	return security_ops->inode_readlink(dentry);
- }
-+EXPORT_SYMBOL(security_inode_readlink);
- 
- int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
- {
-@@ -520,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask)
- 		return 0;
- 	return security_ops->inode_permission(inode, mask, 0);
- }
-+EXPORT_SYMBOL(security_inode_permission);
- 
- int security_inode_exec_permission(struct inode *inode, unsigned int flags)
- {
-@@ -626,6 +634,7 @@ int security_file_permission(struct file *file, int mask)
- 
- 	return fsnotify_perm(file, mask);
- }
-+EXPORT_SYMBOL(security_file_permission);
- 
- int security_file_alloc(struct file *file)
- {
-@@ -653,6 +662,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
- 		return ret;
- 	return ima_file_mmap(file, prot);
- }
-+EXPORT_SYMBOL(security_file_mmap);
- 
- int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
- 			    unsigned long prot)
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/aufs3-base.patch
--- a/linux/stuff/aufs3-base.patch	Tue Jan 28 05:56:16 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-aufs3.2 base patch
-
-diff --git a/fs/namei.c b/fs/namei.c
-index 5008f01..4cc94cf 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -1755,7 +1755,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
-  * needs parent already locked. Doesn't follow mounts.
-  * SMP-safe.
-  */
--static struct dentry *lookup_hash(struct nameidata *nd)
-+struct dentry *lookup_hash(struct nameidata *nd)
- {
- 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
- }
-diff --git a/fs/splice.c b/fs/splice.c
-index fa2defa..e3569b0 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -1094,8 +1094,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
- /*
-  * Attempt to initiate a splice from pipe to file.
-  */
--static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
--			   loff_t *ppos, size_t len, unsigned int flags)
-+long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+		    loff_t *ppos, size_t len, unsigned int flags)
- {
- 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
- 				loff_t *, size_t, unsigned int);
-@@ -1122,9 +1122,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
- /*
-  * Attempt to initiate a splice from a file to a pipe.
-  */
--static long do_splice_to(struct file *in, loff_t *ppos,
--			 struct pipe_inode_info *pipe, size_t len,
--			 unsigned int flags)
-+long do_splice_to(struct file *in, loff_t *ppos,
-+		  struct pipe_inode_info *pipe, size_t len,
-+		  unsigned int flags)
- {
- 	ssize_t (*splice_read)(struct file *, loff_t *,
- 			       struct pipe_inode_info *, size_t, unsigned int);
-diff --git a/include/linux/namei.h b/include/linux/namei.h
-index ffc0213..ef35a31 100644
---- a/include/linux/namei.h
-+++ b/include/linux/namei.h
-@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
- extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
- 		int (*open)(struct inode *, struct file *));
- 
-+extern struct dentry *lookup_hash(struct nameidata *nd);
- extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
- 
- extern int follow_down_one(struct path *);
-diff --git a/include/linux/splice.h b/include/linux/splice.h
-index 26e5b61..3ffef2f 100644
---- a/include/linux/splice.h
-+++ b/include/linux/splice.h
-@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *,
- extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
- 
- extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
-+
-+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+			   loff_t *ppos, size_t len, unsigned int flags);
-+extern long do_splice_to(struct file *in, loff_t *ppos,
-+			 struct pipe_inode_info *pipe, size_t len,
-+			 unsigned int flags);
- #endif
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/aufs3-kbuild.patch
--- a/linux/stuff/aufs3-kbuild.patch	Tue Jan 28 05:56:16 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-aufs3.2 kbuild patch
-
-diff --git a/fs/Kconfig b/fs/Kconfig
-index 5f4c45d..357a8a6 100644
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -215,6 +215,7 @@ source "fs/pstore/Kconfig"
- source "fs/sysv/Kconfig"
- source "fs/ufs/Kconfig"
- source "fs/exofs/Kconfig"
-+source "fs/aufs/Kconfig"
- 
- endif # MISC_FILESYSTEMS
- 
-diff --git a/fs/Makefile b/fs/Makefile
-index d2c3353..680ad8a 100644
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -123,3 +123,4 @@ obj-$(CONFIG_GFS2_FS)           += gfs2/
- obj-y				+= exofs/ # Multiple modules
- obj-$(CONFIG_CEPH_FS)		+= ceph/
- obj-$(CONFIG_PSTORE)		+= pstore/
-+obj-$(CONFIG_AUFS_FS)           += aufs/
-diff --git a/include/linux/Kbuild b/include/linux/Kbuild
-index 619b565..29f386b 100644
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -65,6 +65,7 @@ header-y += atmppp.h
- header-y += atmsap.h
- header-y += atmsvc.h
- header-y += audit.h
-+header-y += aufs_type.h
- header-y += auto_fs.h
- header-y += auto_fs4.h
- header-y += auxvec.h
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/aufs3-loopback.patch
--- a/linux/stuff/aufs3-loopback.patch	Tue Jan 28 05:56:16 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,287 +0,0 @@
-aufs3.2 loopback patch
-
-diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 1e888c9..17b3109 100644
---- a/drivers/block/loop.c
-+++ b/drivers/block/loop.c
-@@ -499,7 +499,7 @@ out:
- }
- 
- struct switch_request {
--	struct file *file;
-+	struct file *file, *virt_file;
- 	struct completion wait;
- };
- 
-@@ -559,7 +559,8 @@ static int loop_thread(void *data)
-  * First it needs to flush existing IO, it does this by sending a magic
-  * BIO down the pipe. The completion of this BIO does the actual switch.
-  */
--static int loop_switch(struct loop_device *lo, struct file *file)
-+static int loop_switch(struct loop_device *lo, struct file *file,
-+		       struct file *virt_file)
- {
- 	struct switch_request w;
- 	struct bio *bio = bio_alloc(GFP_KERNEL, 0);
-@@ -567,6 +568,7 @@ static int loop_switch(struct loop_device *lo, struct file *file)
- 		return -ENOMEM;
- 	init_completion(&w.wait);
- 	w.file = file;
-+	w.virt_file = virt_file;
- 	bio->bi_private = &w;
- 	bio->bi_bdev = NULL;
- 	loop_make_request(lo->lo_queue, bio);
-@@ -583,7 +585,7 @@ static int loop_flush(struct loop_device *lo)
- 	if (!lo->lo_thread)
- 		return 0;
- 
--	return loop_switch(lo, NULL);
-+	return loop_switch(lo, NULL, NULL);
- }
- 
- /*
-@@ -602,6 +604,7 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p)
- 	mapping = file->f_mapping;
- 	mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
- 	lo->lo_backing_file = file;
-+	lo->lo_backing_virt_file = p->virt_file;
- 	lo->lo_blocksize = S_ISBLK(mapping->host->i_mode) ?
- 		mapping->host->i_bdev->bd_block_size : PAGE_SIZE;
- 	lo->old_gfp_mask = mapping_gfp_mask(mapping);
-@@ -610,6 +613,13 @@ out:
- 	complete(&p->wait);
- }
- 
-+static struct file *loop_real_file(struct file *file)
-+{
-+	struct file *f = NULL;
-+	if (file->f_dentry->d_sb->s_op->real_loop)
-+		f = file->f_dentry->d_sb->s_op->real_loop(file);
-+	return f;
-+}
- 
- /*
-  * loop_change_fd switched the backing store of a loopback device to
-@@ -623,6 +633,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
- 			  unsigned int arg)
- {
- 	struct file	*file, *old_file;
-+	struct file	*f, *virt_file = NULL, *old_virt_file;
- 	struct inode	*inode;
- 	int		error;
- 
-@@ -639,9 +650,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
- 	file = fget(arg);
- 	if (!file)
- 		goto out;
-+	f = loop_real_file(file);
-+	if (f) {
-+		virt_file = file;
-+		file = f;
-+		get_file(file);
-+	}
- 
- 	inode = file->f_mapping->host;
- 	old_file = lo->lo_backing_file;
-+	old_virt_file = lo->lo_backing_virt_file;
- 
- 	error = -EINVAL;
- 
-@@ -653,17 +671,21 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
- 		goto out_putf;
- 
- 	/* and ... switch */
--	error = loop_switch(lo, file);
-+	error = loop_switch(lo, file, virt_file);
- 	if (error)
- 		goto out_putf;
- 
- 	fput(old_file);
-+	if (old_virt_file)
-+		fput(old_virt_file);
- 	if (lo->lo_flags & LO_FLAGS_PARTSCAN)
- 		ioctl_by_bdev(bdev, BLKRRPART, 0);
- 	return 0;
- 
-  out_putf:
- 	fput(file);
-+	if (virt_file)
-+		fput(virt_file);
-  out:
- 	return error;
- }
-@@ -806,7 +828,7 @@ static void loop_config_discard(struct loop_device *lo)
- static int loop_set_fd(struct loop_device *lo, fmode_t mode,
- 		       struct block_device *bdev, unsigned int arg)
- {
--	struct file	*file, *f;
-+	struct file	*file, *f, *virt_file = NULL;
- 	struct inode	*inode;
- 	struct address_space *mapping;
- 	unsigned lo_blocksize;
-@@ -821,6 +843,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
- 	file = fget(arg);
- 	if (!file)
- 		goto out;
-+	f = loop_real_file(file);
-+	if (f) {
-+		virt_file = file;
-+		file = f;
-+		get_file(file);
-+	}
- 
- 	error = -EBUSY;
- 	if (lo->lo_state != Lo_unbound)
-@@ -869,6 +897,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
- 	lo->lo_device = bdev;
- 	lo->lo_flags = lo_flags;
- 	lo->lo_backing_file = file;
-+	lo->lo_backing_virt_file = virt_file;
- 	lo->transfer = transfer_none;
- 	lo->ioctl = NULL;
- 	lo->lo_sizelimit = 0;
-@@ -919,6 +948,7 @@ out_clr:
- 	lo->lo_thread = NULL;
- 	lo->lo_device = NULL;
- 	lo->lo_backing_file = NULL;
-+	lo->lo_backing_virt_file = NULL;
- 	lo->lo_flags = 0;
- 	set_capacity(lo->lo_disk, 0);
- 	invalidate_bdev(bdev);
-@@ -928,6 +958,8 @@ out_clr:
- 	lo->lo_state = Lo_unbound;
-  out_putf:
- 	fput(file);
-+	if (virt_file)
-+		fput(virt_file);
-  out:
- 	/* This is safe: open() is still holding a reference. */
- 	module_put(THIS_MODULE);
-@@ -974,6 +1006,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
- static int loop_clr_fd(struct loop_device *lo)
- {
- 	struct file *filp = lo->lo_backing_file;
-+	struct file *virt_filp = lo->lo_backing_virt_file;
- 	gfp_t gfp = lo->old_gfp_mask;
- 	struct block_device *bdev = lo->lo_device;
- 
-@@ -994,6 +1027,7 @@ static int loop_clr_fd(struct loop_device *lo)
- 
- 	spin_lock_irq(&lo->lo_lock);
- 	lo->lo_backing_file = NULL;
-+	lo->lo_backing_virt_file = NULL;
- 	spin_unlock_irq(&lo->lo_lock);
- 
- 	loop_release_xfer(lo);
-@@ -1036,6 +1070,8 @@ static int loop_clr_fd(struct loop_device *lo)
- 	 * bd_mutex which is usually taken before lo_ctl_mutex.
- 	 */
- 	fput(filp);
-+	if (virt_filp)
-+		fput(virt_filp);
- 	return 0;
- }
- 
-diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index d6318f08b..56555de 100644
---- a/fs/aufs/f_op.c
-+++ b/fs/aufs/f_op.c
-@@ -355,7 +355,7 @@ static ssize_t aufs_splice_read(struct file *file, loff_t *ppos,
- 	err = -EINVAL;
- 	h_file = au_hf_top(file);
- 	get_file(h_file);
--	if (au_test_loopback_kthread()) {
-+	if (0 && au_test_loopback_kthread()) {
- 		au_warn_loopback(h_file->f_dentry->d_sb);
- 		if (file->f_mapping != h_file->f_mapping) {
- 			file->f_mapping = h_file->f_mapping;
-diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c
-index ccae19c..15dc5c2 100644
---- a/fs/aufs/loop.c
-+++ b/fs/aufs/loop.c
-@@ -133,3 +133,19 @@ void au_loopback_fin(void)
- {
- 	kfree(au_warn_loopback_array);
- }
-+
-+/* ---------------------------------------------------------------------- */
-+
-+/* support the loopback block device insude aufs */
-+
-+struct file *aufs_real_loop(struct file *file)
-+{
-+	struct file *f;
-+
-+	BUG_ON(!au_test_aufs(file->f_dentry->d_sb));
-+	fi_read_lock(file);
-+	f = au_hf_top(file);
-+	fi_read_unlock(file);
-+	AuDebugOn(!f);
-+	return f;
-+}
-diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
-index 88d019c..8707c3a 100644
---- a/fs/aufs/loop.h
-+++ b/fs/aufs/loop.h
-@@ -36,6 +36,8 @@ void au_warn_loopback(struct super_block *h_sb);
- 
- int au_loopback_init(void);
- void au_loopback_fin(void);
-+
-+struct file *aufs_real_loop(struct file *file);
- #else
- AuStubInt0(au_test_loopback_overlap, struct super_block *sb,
- 	   struct dentry *h_adding)
-@@ -44,6 +46,8 @@ AuStubVoid(au_warn_loopback, struct super_block *h_sb)
- 
- AuStubInt0(au_loopback_init, void)
- AuStubVoid(au_loopback_fin, void)
-+
-+AuStub(struct file *, aufs_real_loop, return NULL, struct file *file)
- #endif /* BLK_DEV_LOOP */
- 
- #endif /* __KERNEL__ */
-diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index d105672..304f2e5 100644
---- a/fs/aufs/super.c
-+++ b/fs/aufs/super.c
-@@ -823,7 +823,10 @@ static const struct super_operations aufs_sop = {
- 	.statfs		= aufs_statfs,
- 	.put_super	= aufs_put_super,
- 	.sync_fs	= aufs_sync_fs,
--	.remount_fs	= aufs_remount_fs
-+	.remount_fs	= aufs_remount_fs,
-+#ifdef CONFIG_AUFS_BDEV_LOOP
-+	.real_loop	= aufs_real_loop
-+#endif
- };
- 
- /* ---------------------------------------------------------------------- */
-diff --git a/include/linux/fs.h b/include/linux/fs.h
-index e0bc4ff..bd7b3a4 100644
---- a/include/linux/fs.h
-+++ b/include/linux/fs.h
-@@ -1699,6 +1699,10 @@ struct super_operations {
- 	int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
- 	int (*nr_cached_objects)(struct super_block *);
- 	void (*free_cached_objects)(struct super_block *, int);
-+#if defined(CONFIG_BLK_DEV_LOOP) ||  defined(CONFIG_BLK_DEV_LOOP_MODULE)
-+	/* and aufs */
-+	struct file *(*real_loop)(struct file *);
-+#endif
- };
- 
- /*
-diff --git a/include/linux/loop.h b/include/linux/loop.h
-index 11a41a8..c190b78 100644
---- a/include/linux/loop.h
-+++ b/include/linux/loop.h
-@@ -48,7 +48,7 @@ struct loop_device {
- 	int		(*ioctl)(struct loop_device *, int cmd, 
- 				 unsigned long arg); 
- 
--	struct file *	lo_backing_file;
-+	struct file *	lo_backing_file, *lo_backing_virt_file;
- 	struct block_device *lo_device;
- 	unsigned	lo_blocksize;
- 	void		*key_data; 
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/aufs3-mmap.patch
--- a/linux/stuff/aufs3-mmap.patch	Tue Jan 28 05:56:16 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,349 +0,0 @@
-aufs3.2 mmap patch
-
-diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
-index b1822dd..d8518aa 100644
---- a/fs/proc/nommu.c
-+++ b/fs/proc/nommu.c
-@@ -45,7 +45,9 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
- 	file = region->vm_file;
- 
- 	if (file) {
--		struct inode *inode = region->vm_file->f_path.dentry->d_inode;
-+		struct inode *inode;
-+		file = vmr_pr_or_file(region);
-+		inode = file->f_path.dentry->d_inode;
- 		dev = inode->i_sb->s_dev;
- 		ino = inode->i_ino;
- 	}
-diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index e418c5a..06bbf80 100644
---- a/fs/proc/task_mmu.c
-+++ b/fs/proc/task_mmu.c
-@@ -221,7 +221,9 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
- 	int len;
- 
- 	if (file) {
--		struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
-+		struct inode *inode;
-+		file = vma_pr_or_file(vma);
-+		inode = file->f_path.dentry->d_inode;
- 		dev = inode->i_sb->s_dev;
- 		ino = inode->i_ino;
- 		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1044,6 +1046,7 @@ static int show_numa_map(struct seq_file *m, void *v)
- 	seq_printf(m, "%08lx %s", vma->vm_start, buffer);
- 
- 	if (file) {
-+		file = vma_pr_or_file(vma);
- 		seq_printf(m, " file=");
- 		seq_path(m, &file->f_path, "\n\t= ");
- 	} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
-diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index 980de54..b59aa1e 100644
---- a/fs/proc/task_nommu.c
-+++ b/fs/proc/task_nommu.c
-@@ -147,7 +147,9 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
- 	file = vma->vm_file;
- 
- 	if (file) {
--		struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
-+		struct inode *inode;
-+		file = vma_pr_or_file(file);
-+		inode = file->f_path.dentry->d_inode;
- 		dev = inode->i_sb->s_dev;
- 		ino = inode->i_ino;
- 		pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
-diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 4baadd1..b1ee63e 100644
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -17,6 +17,9 @@
- #include <linux/pfn.h>
- #include <linux/bit_spinlock.h>
- #include <linux/shrinker.h>
-+#include <linux/dcache.h>
-+#include <linux/file.h>
-+#include <linux/fs.h>
- 
- struct mempolicy;
- struct anon_vma;
-@@ -984,6 +987,87 @@ static inline int fixup_user_fault(struct task_struct *tsk,
- }
- #endif
- 
-+/*
-+ * Mainly for aufs which mmap(2) diffrent file and wants to print different path
-+ * in /proc/PID/maps.
-+ */
-+/* #define AUFS_DEBUG_MMAP */
-+static inline void aufs_trace(struct file *f, struct file *pr,
-+			      const char func[], int line, const char func2[])
-+{
-+#ifdef AUFS_DEBUG_MMAP
-+	if (pr)
-+		pr_info("%s:%d: %s, %p\n", func, line, func2,
-+			f ? (char *)f->f_dentry->d_name.name : "(null)");
-+#endif
-+}
-+
-+static inline struct file *vmr_do_pr_or_file(struct vm_region *region,
-+					     const char func[], int line)
-+{
-+	struct file *f = region->vm_file, *pr = region->vm_prfile;
-+	aufs_trace(f, pr, func, line, __func__);
-+	return (f && pr) ? pr : f;
-+}
-+
-+static inline void vmr_do_fput(struct vm_region *region,
-+			       const char func[], int line)
-+{
-+	struct file *f = region->vm_file, *pr = region->vm_prfile;
-+	aufs_trace(f, pr, func, line, __func__);
-+	fput(f);
-+	if (f && pr)
-+		fput(pr);
-+}
-+
-+static inline void vma_do_file_update_time(struct vm_area_struct *vma,
-+					   const char func[], int line)
-+{
-+	struct file *f = vma->vm_file, *pr = vma->vm_prfile;
-+	aufs_trace(f, pr, func, line, __func__);
-+	file_update_time(f);
-+	if (f && pr)
-+		file_update_time(pr);
-+}
-+
-+static inline struct file *vma_do_pr_or_file(struct vm_area_struct *vma,
-+					     const char func[], int line)
-+{
-+	struct file *f = vma->vm_file, *pr = vma->vm_prfile;
-+	aufs_trace(f, pr, func, line, __func__);
-+	return (f && pr) ? pr : f;
-+}
-+
-+static inline void vma_do_get_file(struct vm_area_struct *vma,
-+				   const char func[], int line)
-+{
-+	struct file *f = vma->vm_file, *pr = vma->vm_prfile;
-+	aufs_trace(f, pr, func, line, __func__);
-+	get_file(f);
-+	if (f && pr)
-+		get_file(pr);
-+}
-+
-+static inline void vma_do_fput(struct vm_area_struct *vma,
-+			       const char func[], int line)
-+{
-+	struct file *f = vma->vm_file, *pr = vma->vm_prfile;
-+	aufs_trace(f, pr, func, line, __func__);
-+	fput(f);
-+	if (f && pr)
-+		fput(pr);
-+}
-+
-+#define vmr_pr_or_file(region)		vmr_do_pr_or_file(region, __func__, \
-+							  __LINE__)
-+#define vmr_fput(region)		vmr_do_fput(region, __func__, __LINE__)
-+#define vma_file_update_time(vma)	vma_do_file_update_time(vma, __func__, \
-+								__LINE__)
-+#define vma_pr_or_file(vma)		vma_do_pr_or_file(vma, __func__, \
-+							  __LINE__)
-+#define vma_get_file(vma)		vma_do_get_file(vma, __func__, __LINE__)
-+#define vma_fput(vma)			vma_do_fput(vma, __func__, __LINE__)
-+
- extern int make_pages_present(unsigned long addr, unsigned long end);
- extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
- extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
-diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 5b42f1b..a49a07e 100644
---- a/include/linux/mm_types.h
-+++ b/include/linux/mm_types.h
-@@ -186,6 +186,7 @@ struct vm_region {
- 	unsigned long	vm_top;		/* region allocated to here */
- 	unsigned long	vm_pgoff;	/* the offset in vm_file corresponding to vm_start */
- 	struct file	*vm_file;	/* the backing file or NULL */
-+	struct file	*vm_prfile;	/* the virtual backing file or NULL */
- 
- 	int		vm_usage;	/* region usage count (access under nommu_region_sem) */
- 	bool		vm_icache_flushed : 1; /* true if the icache has been flushed for
-@@ -245,6 +246,7 @@ struct vm_area_struct {
- 	unsigned long vm_pgoff;		/* Offset (within vm_file) in PAGE_SIZE
- 					   units, *not* PAGE_CACHE_SIZE */
- 	struct file * vm_file;		/* File we map to (can be NULL). */
-+	struct file *vm_prfile;		/* shadow of vm_file */
- 	void * vm_private_data;		/* was vm_pte (shared mem) */
- 
- #ifndef CONFIG_MMU
-diff --git a/kernel/fork.c b/kernel/fork.c
-index da4a6a1..4a31675 100644
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -378,7 +378,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
- 			struct inode *inode = file->f_path.dentry->d_inode;
- 			struct address_space *mapping = file->f_mapping;
- 
--			get_file(file);
-+			vma_get_file(tmp);
- 			if (tmp->vm_flags & VM_DENYWRITE)
- 				atomic_dec(&inode->i_writecount);
- 			mutex_lock(&mapping->i_mmap_mutex);
-diff --git a/mm/fremap.c b/mm/fremap.c
-index 9ed4fd4..00ee66b 100644
---- a/mm/fremap.c
-+++ b/mm/fremap.c
-@@ -198,10 +198,10 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
- 			struct file *file = vma->vm_file;
- 
- 			flags &= MAP_NONBLOCK;
--			get_file(file);
-+			vma_get_file(vma);
- 			addr = mmap_region(file, start, size,
- 					flags, vma->vm_flags, pgoff);
--			fput(file);
-+			vma_fput(vma);
- 			if (IS_ERR_VALUE(addr)) {
- 				err = addr;
- 			} else {
-diff --git a/mm/memory.c b/mm/memory.c
-index 829d437..6c6f9f1 100644
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -2684,7 +2684,7 @@ reuse:
- 
- 		/* file_update_time outside page_lock */
- 		if (vma->vm_file)
--			file_update_time(vma->vm_file);
-+			vma_file_update_time(vma);
- 
- 		return ret;
- 	}
-@@ -3369,7 +3369,7 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
- 
- 		/* file_update_time outside page_lock */
- 		if (vma->vm_file)
--			file_update_time(vma->vm_file);
-+			vma_file_update_time(vma);
- 	} else {
- 		unlock_page(vmf.page);
- 		if (anon)
-diff --git a/mm/mmap.c b/mm/mmap.c
-index eae90af..570ac61 100644
---- a/mm/mmap.c
-+++ b/mm/mmap.c
-@@ -231,7 +231,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
- 	if (vma->vm_ops && vma->vm_ops->close)
- 		vma->vm_ops->close(vma);
- 	if (vma->vm_file) {
--		fput(vma->vm_file);
-+		vma_fput(vma);
- 		if (vma->vm_flags & VM_EXECUTABLE)
- 			removed_exe_file_vma(vma->vm_mm);
- 	}
-@@ -618,7 +618,7 @@ again:			remove_next = 1 + (end > next->vm_end);
- 
- 	if (remove_next) {
- 		if (file) {
--			fput(file);
-+			vma_fput(vma);
- 			if (next->vm_flags & VM_EXECUTABLE)
- 				removed_exe_file_vma(mm);
- 		}
-@@ -1334,8 +1334,8 @@ out:
- unmap_and_free_vma:
- 	if (correct_wcount)
- 		atomic_inc(&inode->i_writecount);
-+	vma_fput(vma);
- 	vma->vm_file = NULL;
--	fput(file);
- 
- 	/* Undo any partial mapping done by a device driver. */
- 	unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
-@@ -1964,7 +1964,7 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
- 		goto out_free_mpol;
- 
- 	if (new->vm_file) {
--		get_file(new->vm_file);
-+		vma_get_file(new);
- 		if (vma->vm_flags & VM_EXECUTABLE)
- 			added_exe_file_vma(mm);
- 	}
-@@ -1988,7 +1988,7 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
- 	if (new->vm_file) {
- 		if (vma->vm_flags & VM_EXECUTABLE)
- 			removed_exe_file_vma(mm);
--		fput(new->vm_file);
-+		vma_fput(new);
- 	}
- 	unlink_anon_vmas(new);
-  out_free_mpol:
-@@ -2355,7 +2355,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
- 			new_vma->vm_end = addr + len;
- 			new_vma->vm_pgoff = pgoff;
- 			if (new_vma->vm_file) {
--				get_file(new_vma->vm_file);
-+				vma_get_file(new_vma);
- 				if (vma->vm_flags & VM_EXECUTABLE)
- 					added_exe_file_vma(mm);
- 			}
-diff --git a/mm/msync.c b/mm/msync.c
-index 632df45..02d770e 100644
---- a/mm/msync.c
-+++ b/mm/msync.c
-@@ -80,10 +80,10 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags)
- 		start = vma->vm_end;
- 		if ((flags & MS_SYNC) && file &&
- 				(vma->vm_flags & VM_SHARED)) {
--			get_file(file);
-+			vma_get_file(vma);
- 			up_read(&mm->mmap_sem);
- 			error = vfs_fsync(file, 0);
--			fput(file);
-+			vma_fput(vma);
- 			if (error || start >= end)
- 				goto out;
- 			down_read(&mm->mmap_sem);
-diff --git a/mm/nommu.c b/mm/nommu.c
-index b982290..6eb4f31 100644
---- a/mm/nommu.c
-+++ b/mm/nommu.c
-@@ -632,7 +632,7 @@ static void __put_nommu_region(struct vm_region *region)
- 		up_write(&nommu_region_sem);
- 
- 		if (region->vm_file)
--			fput(region->vm_file);
-+			vmr_fput(region);
- 
- 		/* IO memory and memory shared directly out of the pagecache
- 		 * from ramfs/tmpfs mustn't be released here */
-@@ -790,7 +790,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
- 	if (vma->vm_ops && vma->vm_ops->close)
- 		vma->vm_ops->close(vma);
- 	if (vma->vm_file) {
--		fput(vma->vm_file);
-+		vma_fput(vma);
- 		if (vma->vm_flags & VM_EXECUTABLE)
- 			removed_exe_file_vma(mm);
- 	}
-@@ -1363,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file,
- 					goto error_just_free;
- 				}
- 			}
--			fput(region->vm_file);
-+			vmr_fput(region);
- 			kmem_cache_free(vm_region_jar, region);
- 			region = pregion;
- 			result = start;
-@@ -1439,10 +1439,10 @@ error_just_free:
- 	up_write(&nommu_region_sem);
- error:
- 	if (region->vm_file)
--		fput(region->vm_file);
-+		vmr_fput(region);
- 	kmem_cache_free(vm_region_jar, region);
- 	if (vma->vm_file)
--		fput(vma->vm_file);
-+		vma_fput(vma);
- 	if (vma->vm_flags & VM_EXECUTABLE)
- 		removed_exe_file_vma(vma->vm_mm);
- 	kmem_cache_free(vm_area_cachep, vma);
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/aufs3-standalone.patch
--- a/linux/stuff/aufs3-standalone.patch	Tue Jan 28 05:56:16 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,257 +0,0 @@
-aufs3.2 standalone patch
-
-diff --git a/fs/file_table.c b/fs/file_table.c
-index c322794..2aad244 100644
---- a/fs/file_table.c
-+++ b/fs/file_table.c
-@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file)
- 	}
- }
- 
-+EXPORT_SYMBOL(file_sb_list_del);
-+
- #ifdef CONFIG_SMP
- 
- /*
-diff --git a/fs/inode.c b/fs/inode.c
-index ee4e66b..728042b 100644
---- a/fs/inode.c
-+++ b/fs/inode.c
-@@ -65,6 +65,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
- static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);
- 
- __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
-+EXPORT_SYMBOL(inode_sb_list_lock);
- 
- /*
-  * Empty aops. Can be used for the cases where the user does not
-diff --git a/fs/namei.c b/fs/namei.c
-index 4cc94cf..af19e30 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -1759,6 +1759,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
- {
- 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
- }
-+EXPORT_SYMBOL(lookup_hash);
- 
- /**
-  * lookup_one_len - filesystem helper to lookup single pathname component
-diff --git a/fs/namespace.c b/fs/namespace.c
-index cfc6d44..173d15a 100644
---- a/fs/namespace.c
-+++ b/fs/namespace.c
-@@ -1507,6 +1507,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
- 	}
- 	return 0;
- }
-+EXPORT_SYMBOL(iterate_mounts);
- 
- static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end)
- {
-diff --git a/fs/notify/group.c b/fs/notify/group.c
-index 63fc294..6f4adca 100644
---- a/fs/notify/group.c
-+++ b/fs/notify/group.c
-@@ -22,6 +22,7 @@
- #include <linux/srcu.h>
- #include <linux/rculist.h>
- #include <linux/wait.h>
-+#include <linux/module.h>
- 
- #include <linux/fsnotify_backend.h>
- #include "fsnotify.h"
-@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
- 	if (atomic_dec_and_test(&group->refcnt))
- 		fsnotify_destroy_group(group);
- }
-+EXPORT_SYMBOL(fsnotify_put_group);
- 
- /*
-  * Create a new fsnotify_group and hold a reference for the group returned.
-@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
- 
- 	return group;
- }
-+EXPORT_SYMBOL(fsnotify_alloc_group);
-diff --git a/fs/notify/mark.c b/fs/notify/mark.c
-index e14587d..be6533b 100644
---- a/fs/notify/mark.c
-+++ b/fs/notify/mark.c
-@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
- 	if (atomic_dec_and_test(&mark->refcnt))
- 		mark->free_mark(mark);
- }
-+EXPORT_SYMBOL(fsnotify_put_mark);
- 
- /*
-  * Any time a mark is getting freed we end up here.
-@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
- 	if (unlikely(atomic_dec_and_test(&group->num_marks)))
- 		fsnotify_final_destroy_group(group);
- }
-+EXPORT_SYMBOL(fsnotify_destroy_mark);
- 
- void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
- {
-@@ -278,6 +280,7 @@ err:
- 
- 	return ret;
- }
-+EXPORT_SYMBOL(fsnotify_add_mark);
- 
- /*
-  * clear any marks in a group in which mark->flags & flags is true
-@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
- 	atomic_set(&mark->refcnt, 1);
- 	mark->free_mark = free_mark;
- }
-+EXPORT_SYMBOL(fsnotify_init_mark);
- 
- static int fsnotify_mark_destroy(void *ignored)
- {
-diff --git a/fs/open.c b/fs/open.c
-index 22c41b5..33b4033 100644
---- a/fs/open.c
-+++ b/fs/open.c
-@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
- 	mutex_unlock(&dentry->d_inode->i_mutex);
- 	return ret;
- }
-+EXPORT_SYMBOL(do_truncate);
- 
- static long do_sys_truncate(const char __user *pathname, loff_t length)
- {
-diff --git a/fs/splice.c b/fs/splice.c
-index e3569b0..9dc07b7 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -1118,6 +1118,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
- 
- 	return splice_write(pipe, out, ppos, len, flags);
- }
-+EXPORT_SYMBOL(do_splice_from);
- 
- /*
-  * Attempt to initiate a splice from a file to a pipe.
-@@ -1144,6 +1145,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
- 
- 	return splice_read(in, ppos, pipe, len, flags);
- }
-+EXPORT_SYMBOL(do_splice_to);
- 
- /**
-  * splice_direct_to_actor - splices data directly between two non-pipes
-diff --git a/security/commoncap.c b/security/commoncap.c
-index ee4f848..611fd70 100644
---- a/security/commoncap.c
-+++ b/security/commoncap.c
-@@ -981,3 +981,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(cap_file_mmap);
-diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index 4450fbe..bc94175 100644
---- a/security/device_cgroup.c
-+++ b/security/device_cgroup.c
-@@ -7,6 +7,7 @@
- #include <linux/device_cgroup.h>
- #include <linux/cgroup.h>
- #include <linux/ctype.h>
-+#include <linux/export.h>
- #include <linux/list.h>
- #include <linux/uaccess.h>
- #include <linux/seq_file.h>
-@@ -500,6 +501,7 @@ found:
- 
- 	return -EPERM;
- }
-+EXPORT_SYMBOL(__devcgroup_inode_permission);
- 
- int devcgroup_inode_mknod(int mode, dev_t dev)
- {
-diff --git a/security/security.c b/security/security.c
-index e2f684a..892000c 100644
---- a/security/security.c
-+++ b/security/security.c
-@@ -411,6 +411,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
- 		return 0;
- 	return security_ops->path_rmdir(dir, dentry);
- }
-+EXPORT_SYMBOL(security_path_rmdir);
- 
- int security_path_unlink(struct path *dir, struct dentry *dentry)
- {
-@@ -427,6 +428,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
- 		return 0;
- 	return security_ops->path_symlink(dir, dentry, old_name);
- }
-+EXPORT_SYMBOL(security_path_symlink);
- 
- int security_path_link(struct dentry *old_dentry, struct path *new_dir,
- 		       struct dentry *new_dentry)
-@@ -435,6 +437,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
- 		return 0;
- 	return security_ops->path_link(old_dentry, new_dir, new_dentry);
- }
-+EXPORT_SYMBOL(security_path_link);
- 
- int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
- 			 struct path *new_dir, struct dentry *new_dentry)
-@@ -453,6 +456,7 @@ int security_path_truncate(struct path *path)
- 		return 0;
- 	return security_ops->path_truncate(path);
- }
-+EXPORT_SYMBOL(security_path_truncate);
- 
- int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
- 			mode_t mode)
-@@ -461,6 +465,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
- 		return 0;
- 	return security_ops->path_chmod(dentry, mnt, mode);
- }
-+EXPORT_SYMBOL(security_path_chmod);
- 
- int security_path_chown(struct path *path, uid_t uid, gid_t gid)
- {
-@@ -468,6 +473,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
- 		return 0;
- 	return security_ops->path_chown(path, uid, gid);
- }
-+EXPORT_SYMBOL(security_path_chown);
- 
- int security_path_chroot(struct path *path)
- {
-@@ -544,6 +550,7 @@ int security_inode_readlink(struct dentry *dentry)
- 		return 0;
- 	return security_ops->inode_readlink(dentry);
- }
-+EXPORT_SYMBOL(security_inode_readlink);
- 
- int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
- {
-@@ -558,6 +565,7 @@ int security_inode_permission(struct inode *inode, int mask)
- 		return 0;
- 	return security_ops->inode_permission(inode, mask);
- }
-+EXPORT_SYMBOL(security_inode_permission);
- 
- int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
- {
-@@ -673,6 +681,7 @@ int security_file_permission(struct file *file, int mask)
- 
- 	return fsnotify_perm(file, mask);
- }
-+EXPORT_SYMBOL(security_file_permission);
- 
- int security_file_alloc(struct file *file)
- {
-@@ -700,6 +709,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
- 		return ret;
- 	return ima_file_mmap(file, prot);
- }
-+EXPORT_SYMBOL(security_file_mmap);
- 
- int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
- 			    unsigned long prot)
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/channel-negative-one-maxim.patch
--- a/linux/stuff/channel-negative-one-maxim.patch	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux/stuff/channel-negative-one-maxim.patch	Wed Jan 29 09:56:07 2014 +0100
@@ -12,7 +12,7 @@
 index b01a6f6..09d979b 100644
 --- a/net/wireless/chan.c
 +++ b/net/wireless/chan.c
-@@ -82,9 +82,12 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
+@@ -49,9 +49,12 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
  {
  	struct ieee80211_channel *chan;
  	int result;
@@ -26,7 +26,7 @@
  
  	if (wdev) {
  		ASSERT_WDEV_LOCK(wdev);
-@@ -131,5 +134,8 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
+@@ -76,5 +79,8 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
  	if (wdev)
  		wdev->channel = chan;
  
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/check_modules.sh
--- a/linux/stuff/check_modules.sh	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux/stuff/check_modules.sh	Wed Jan 29 09:56:07 2014 +0100
@@ -1,14 +1,10 @@
 #!/bin/sh
 # Echo any module in kernel .config that's not added to one of linux-* pkgs
-# (c) SliTaz - GNU General Public License.
-# 20090618 <jozee@slitaz.org> 
-# 20100528 <pankso@slitaz.org>
+# (c) 2009-2014 SliTaz - GNU General Public License.
 #
-#. /etc/slitaz/slitaz.conf
 
-#WOK=$LOCAL_REPOSITORY/wok
 WOK=$(cd `dirname $0` && pwd | sed 's/wok.*/wok/')
-VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
+VERSION=$(grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g')
 BASEVER="${VERSION:0:3}"
 src="$WOK/linux/source/linux-$VERSION"
 
@@ -34,7 +30,7 @@
 	fi
 done
 # get the original list in .config
-for i in $(find $_pkg -iname "*.ko.?z")
+for i in $(find $install -iname "*.ko.?z")
 do
 	basename $i
 done > $tmp/original-"$VERSION".list
@@ -42,7 +38,7 @@
 for i in $(cat $tmp/original-$VERSION.list)
 do
 	if ! grep -qs "$i" $tmp/pkgs-modules-"$VERSION".list ; then
-		modpath=`find $_pkg -iname "$i"`
+		modpath=`find $install -iname "$i"`
 		echo "Orphan module: $i"
 		echo "$i : $modpath" >> $tmp/unpackaged-modules-"$VERSION".list
 	fi
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/gztazmod.sh
--- a/linux/stuff/gztazmod.sh	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux/stuff/gztazmod.sh	Wed Jan 29 09:56:07 2014 +0100
@@ -1,42 +1,28 @@
 #!/bin/sh
 # gztazmod.sh: Compress Linux kernel modules for SliTaz GNU/Linux.
-# 2007/10/04 <pankso@slitaz.org> - GNU General Public License.
+# 2007-2014 <pankso@slitaz.org> - GNU General Public License.
 #
+. /lib/libtaz.sh
 
 # We do our work in the kernel version modules directory.
 if [ -z "$1" ] ; then
-  echo ""
-  echo -e "\033[1musage:\033[0m `basename $0` path/to/kernel-version"
-  echo ""
-  exit 1
+	newline
+	echo "Usage: $(basename $0) path/to/kernel-version"
+	newline && exit 1
 fi
 
 if [ ! -r "$1" ] ; then
-  echo ""
-  echo -e "Error : $1 does not exist."
-  echo ""
-  exit 1
+	newline
+	echo -e "Error : $1 does not exist."
+	newline && exit 1
 fi
 
 cd $1
 
-# Status functions.
-status()
-{
-	local CHECK=$?
-	echo -en "\\033[70G[ "
-	if [ $CHECK = 0 ]; then
-		echo -en "\\033[1;33mOK"
-	else
-		echo -en "\\033[1;31mFailed"
-	fi
-	echo -e "\\033[0;39m ]"
-}
-
 # Script start.
-echo ""
+newline
 echo "Starting gztazmod.sh to build compressed kernel modules... "
-echo ""
+newline
 
 # Find all modules.
 echo -n "Searching all modules to compress them... "
@@ -62,6 +48,6 @@
 status
 
 # Script end.
-echo ""
+newline
 echo "Kernel modules `basename $1` are ready."
-echo ""
+newline
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/linux-slitaz.config
--- a/linux/stuff/linux-slitaz.config	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux/stuff/linux-slitaz.config	Wed Jan 29 09:56:07 2014 +0100
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2 Kernel Configuration
+# Linux/i386 3.2.53 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -114,47 +114,33 @@
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
-CONFIG_CGROUP_PERF=y
+# CONFIG_CGROUP_FREEZER is not set
+# CONFIG_CGROUP_DEVICE is not set
+# CONFIG_CPUSETS is not set
+# CONFIG_CGROUP_CPUACCT is not set
+# CONFIG_RESOURCE_COUNTERS is not set
+# CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_RT_GROUP_SCHED=y
+# CONFIG_BLK_CGROUP is not set
 CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_NET_NS is not set
 CONFIG_SCHED_AUTOGROUP=y
-CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="initrd.cpio"
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_ROOT_GID=0
+CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
-# CONFIG_INITRAMFS_COMPRESSION_NONE is not set
-# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
-# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
-CONFIG_INITRAMFS_COMPRESSION_LZMA=y
-# CONFIG_INITRAMFS_COMPRESSION_XZ is not set
-# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -230,7 +216,6 @@
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_THROTTLING is not set
 
 #
 # IO Schedulers
@@ -349,7 +334,7 @@
 CONFIG_DMI=y
 # CONFIG_IOMMU_HELPER is not set
 CONFIG_NR_CPUS=8
-# CONFIG_SCHED_SMT is not set
+CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
 CONFIG_PREEMPT_NONE=y
@@ -417,7 +402,7 @@
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-# CONFIG_EFI is not set
+CONFIG_EFI=y
 # CONFIG_SECCOMP is not set
 # CONFIG_CC_STACKPROTECTOR is not set
 # CONFIG_HZ_100 is not set
@@ -496,10 +481,10 @@
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
 # x86 CPU frequency scaling drivers
@@ -528,7 +513,7 @@
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_INTEL_IDLE=y
+# CONFIG_INTEL_IDLE is not set
 
 #
 # Bus options (PCI etc.)
@@ -1188,7 +1173,8 @@
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -1254,208 +1240,154 @@
 #
 CONFIG_ALTERA_STAPL=m
 CONFIG_HAVE_IDE=y
-CONFIG_IDE=y
+# CONFIG_IDE is not set
 
 #
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-CONFIG_IDE_LEGACY=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-# CONFIG_IDE_GD_ATAPI is not set
-CONFIG_BLK_DEV_IDECS=m
-# CONFIG_BLK_DEV_DELKIN is not set
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_BLK_DEV_PLATFORM is not set
-CONFIG_BLK_DEV_CMD640=y
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_PCIBUS_ORDER=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_RZ1000=y
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_BLK_DEV_ALI15X3=y
-CONFIG_BLK_DEV_AMD74XX=y
-CONFIG_BLK_DEV_ATIIXP=y
-CONFIG_BLK_DEV_CMD64X=y
-CONFIG_BLK_DEV_TRIFLEX=y
-# CONFIG_BLK_DEV_CS5520 is not set
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_CS5535=y
-CONFIG_BLK_DEV_CS5536=y
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_BLK_DEV_JMICRON=y
-CONFIG_BLK_DEV_SC1200=y
-CONFIG_BLK_DEV_PIIX=y
-CONFIG_BLK_DEV_IT8172=y
-CONFIG_BLK_DEV_IT8213=y
-CONFIG_BLK_DEV_IT821X=y
-CONFIG_BLK_DEV_NS87415=y
-CONFIG_BLK_DEV_PDC202XX_OLD=y
-CONFIG_BLK_DEV_PDC202XX_NEW=y
-CONFIG_BLK_DEV_SVWKS=y
-CONFIG_BLK_DEV_SIIMAGE=y
-CONFIG_BLK_DEV_SIS5513=y
-CONFIG_BLK_DEV_SLC90E66=y
-CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=y
-CONFIG_BLK_DEV_TC86C001=y
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-CONFIG_BLK_DEV_4DRIVES=y
-CONFIG_BLK_DEV_ALI14XX=y
-CONFIG_BLK_DEV_DTC2278=y
-CONFIG_BLK_DEV_HT6560B=y
-CONFIG_BLK_DEV_QD65XX=y
-CONFIG_BLK_DEV_UMC8672=y
-CONFIG_BLK_DEV_IDEDMA=y
-
-#
 # SCSI device support
 #
 CONFIG_SCSI_MOD=y
-# CONFIG_RAID_ATTRS is not set
+CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_TGT=m
+CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
 
 #
 # SCSI support type (disk, tape, CD-ROM)
 #
 CONFIG_BLK_DEV_SD=y
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=y
-# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=y
-# CONFIG_CHR_DEV_SCH is not set
+CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
 #
 CONFIG_SCSI_SPI_ATTRS=m
-# CONFIG_SCSI_FC_ATTRS is not set
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FC_TGT_ATTRS=y
 CONFIG_SCSI_ISCSI_ATTRS=m
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
-# CONFIG_ISCSI_BOOT_SYSFS is not set
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_SCSI_BNX2X_FCOE is not set
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AACRAID is not set
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_7000FASST=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AHA152X=m
+CONFIG_SCSI_AHA1542=m
+CONFIG_SCSI_AACRAID=m
 CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=5000
-CONFIG_AIC7XXX_DEBUG_ENABLE=y
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
 CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVUMI is not set
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC7XXX_OLD=m
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=4
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_MVSAS_TASKLET=y
+CONFIG_SCSI_MVUMI=m
 # CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_MPT2SAS is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_VMWARE_PVSCSI is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_FCOE is not set
-# CONFIG_FCOE_FNIC is not set
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_IN2000=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS_LOGGING=y
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
 # CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
+CONFIG_SCSI_DTC3280=m
 # CONFIG_SCSI_EATA is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_ISCI is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_GENERIC_NCR5380=m
+CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
+CONFIG_SCSI_GENERIC_NCR53C400=y
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
 # CONFIG_SCSI_PPA is not set
 # CONFIG_SCSI_IMM is not set
 # CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_PAS16 is not set
 # CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_LPFC is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
 # CONFIG_SCSI_T128 is not set
 # CONFIG_SCSI_U14_34F is not set
 # CONFIG_SCSI_ULTRASTOR is not set
 # CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_PMCRAID is not set
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_SRP is not set
-# CONFIG_SCSI_BFA_FC is not set
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_SRP=m
+CONFIG_SCSI_BFA_FC=m
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-# CONFIG_SCSI_DH is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_VERBOSE_ERROR=y
@@ -1466,95 +1398,96 @@
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=y
-# CONFIG_SATA_AHCI_PLATFORM is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_ACARD_AHCI is not set
-# CONFIG_SATA_SIL24 is not set
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
 CONFIG_ATA_SFF=y
 
 #
 # SFF controllers with custom DMA interface
 #
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SX4 is not set
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
 CONFIG_ATA_BMDMA=y
 
 #
 # SATA SFF controllers with BMDMA
 #
 CONFIG_ATA_PIIX=y
-# CONFIG_SATA_MV is not set
-CONFIG_SATA_NV=y
-# CONFIG_SATA_PROMISE is not set
-CONFIG_SATA_SIL=y
-CONFIG_SATA_SIS=y
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_ULI is not set
-CONFIG_SATA_VIA=y
-# CONFIG_SATA_VITESSE is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 #
 # PATA SFF controllers with BMDMA
 #
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_CS5535=m
+CONFIG_PATA_CS5536=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3_DMA is not set
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
 # CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
+CONFIG_PATA_RDC=m
 # CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=y
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-CONFIG_PATA_SIS=y
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
 
 #
 # PIO-only SFF controllers
 #
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_QDI is not set
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_ISAPNP=y
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_QDI=y
 # CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_WINBOND_VLB is not set
+CONFIG_PATA_WINBOND_VLB=y
 
 #
 # Generic fallback / legacy drivers
 #
-# CONFIG_PATA_ACPI is not set
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_PATA_LEGACY is not set
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_LEGACY=y
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_MD_LINEAR=m
@@ -1600,13 +1533,13 @@
 CONFIG_NET_FC=y
 CONFIG_MII=y
 CONFIG_IFB=m
-CONFIG_MACVLAN=y
-CONFIG_MACVTAP=y
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
 CONFIG_TUN=y
-CONFIG_VETH=y
+CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
 CONFIG_SUNGEM_PHY=m
 CONFIG_ARCNET=m
@@ -1659,7 +1592,7 @@
 CONFIG_B44_PCICORE_AUTOSELECT=y
 CONFIG_B44_PCI=y
 CONFIG_BNX2=m
-# CONFIG_CNIC is not set
+CONFIG_CNIC=m
 CONFIG_TIGON3=m
 CONFIG_BNX2X=m
 CONFIG_NET_VENDOR_BROCADE=y
@@ -1707,9 +1640,9 @@
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=y
+CONFIG_E100=m
 CONFIG_E1000=m
-CONFIG_E1000E=y
+CONFIG_E1000E=m
 # CONFIG_IGB is not set
 # CONFIG_IGBVF is not set
 CONFIG_IXGB=m
@@ -1724,7 +1657,7 @@
 CONFIG_NI52=m
 # CONFIG_ZNET is not set
 CONFIG_IP1000=m
-# CONFIG_JME is not set
+CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_SKGE=m
 # CONFIG_SKGE_GENESIS is not set
@@ -1774,7 +1707,7 @@
 CONFIG_8139TOO_TUNE_TWISTER=y
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
+CONFIG_R8169=y
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 CONFIG_NET_VENDOR_SEEQ=y
@@ -2359,7 +2292,7 @@
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 CONFIG_NOZOMI=m
@@ -2371,7 +2304,7 @@
 # Serial drivers
 #
 CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
@@ -2386,7 +2319,6 @@
 # CONFIG_SERIAL_MFD_HSU is not set
 # CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
@@ -3457,6 +3389,7 @@
 # CONFIG_FB_VGA16 is not set
 # CONFIG_FB_UVESA is not set
 CONFIG_FB_VESA=y
+# CONFIG_FB_EFI is not set
 # CONFIG_FB_N411 is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
@@ -3820,8 +3753,8 @@
 CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
@@ -3895,7 +3828,7 @@
 CONFIG_USB_SERIAL_CP210X=m
 # CONFIG_USB_SERIAL_CYPRESS_M8 is not set
 # CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
+CONFIG_USB_SERIAL_FTDI_SIO=m
 # CONFIG_USB_SERIAL_FUNSOFT is not set
 # CONFIG_USB_SERIAL_VISOR is not set
 # CONFIG_USB_SERIAL_IPAQ is not set
@@ -4081,7 +4014,6 @@
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 # CONFIG_LEDS_TRIGGER_GPIO is not set
@@ -4096,7 +4028,14 @@
 # CONFIG_RTC_CLASS is not set
 # CONFIG_DMADEVICES is not set
 # CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
+CONFIG_UIO=m
+# CONFIG_UIO_CIF is not set
+# CONFIG_UIO_PDRV is not set
+# CONFIG_UIO_PDRV_GENIRQ is not set
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_SERCOS3 is not set
+CONFIG_UIO_PCI_GENERIC=m
+# CONFIG_UIO_NETX is not set
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_RING=y
 
@@ -4432,6 +4371,7 @@
 #
 # CONFIG_EDD is not set
 CONFIG_FIRMWARE_MEMMAP=y
+# CONFIG_EFI_VARS is not set
 # CONFIG_DELL_RBU is not set
 # CONFIG_DCDBAS is not set
 CONFIG_DMIID=y
@@ -4568,6 +4508,9 @@
 # CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
@@ -4691,7 +4634,7 @@
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
+# CONFIG_FRAME_POINTER is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
@@ -4890,7 +4833,7 @@
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_T10DIF=m
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC32=y
 CONFIG_CRC7=m
@@ -4922,6 +4865,7 @@
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/linux-slitaz.config64
--- a/linux/stuff/linux-slitaz.config64	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux/stuff/linux-slitaz.config64	Wed Jan 29 09:56:07 2014 +0100
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2 Kernel Configuration
+# Linux/x86_64 3.2.53 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/linux-subroot.u
--- a/linux/stuff/linux-subroot.u	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux/stuff/linux-subroot.u	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,6 @@
 - have several distributions in one partition
 - use efficently the disk space between several distributions
 - deduplicate files across several distributions
-- create pseudo snapshots using "cp -al" outside /
 - test new configurations
 ...
 The bad news : you can't remount /
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/list_modules.sh
--- a/linux/stuff/list_modules.sh	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux/stuff/list_modules.sh	Wed Jan 29 09:56:07 2014 +0100
@@ -3,9 +3,8 @@
 # 2008/06/07 <pascal.bellard@slitaz.org> - GNU General Public License.
 #
 
-find_modules()
-{
-find $_pkg/lib/modules/*-slitaz/kernel/$1 -type f -exec basename {} \;
+find_modules() {
+	find $install/lib/modules/*-slitaz/kernel/$1 -type f -exec basename {} \;
 }
 
 if [ -z "$1" ] ; then
@@ -18,7 +17,7 @@
   exit 1
 fi
 
-if [ -z "$(ls -d $_pkg/lib/modules/*-slitaz/kernel/$1 2> /dev/null)" ] ; then
+if [ -z "$(ls -d $install/lib/modules/*-slitaz/kernel/$1 2> /dev/null)" ] ; then
   cat 1>&2 <<EOT
   
 Error : $1 does not exist.
@@ -29,14 +28,14 @@
 
 for tree in $@; do
     for module in $(find_modules $tree) ; do
-        grep /$module: $_pkg/lib/modules/*-slitaz/modules.dep ||
-        find $_pkg/lib/modules/*-slitaz/kernel/$tree -name $module
+        grep /$module: $install/lib/modules/*-slitaz/modules.dep ||
+        find $install/lib/modules/*-slitaz/kernel/$tree -name $module
     done | awk '{ for (i = 1; i <= NF; i++)  print $i; }'
 done | sort | uniq | sed -e 's,.*slitaz/,,' -e 's,^kernel/,,' -e 's/:$//' | \
 while read module; do
     grep -qs ^$module$ $src/../tmp/modules.list && continue
-    if [ ! -f $_pkg/lib/modules/*-slitaz/kernel/$module ]; then
-	(cd $_pkg/lib/modules/*-slitaz/kernel; find -name $(basename $module) )
+    if [ ! -f $install/lib/modules/*-slitaz/kernel/$module ]; then
+	(cd $install/lib/modules/*-slitaz/kernel; find -name $(basename $module) )
     else
         echo $module
     fi
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/mac80211.compat08082009.wl_frag+ack_v1.patch
--- a/linux/stuff/mac80211.compat08082009.wl_frag+ack_v1.patch	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux/stuff/mac80211.compat08082009.wl_frag+ack_v1.patch	Wed Jan 29 09:56:07 2014 +0100
@@ -2,7 +2,7 @@
 index 0855cac..221bed6 100644
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -792,11 +792,19 @@ int tid;
+@@ -677,11 +677,19 @@ int tid;
  
  	/*
  	 * Packet injection may want to control the sequence
diff -r 83f5a10c4dd7 -r db5b03f42dd9 linux/stuff/modules.list
--- a/linux/stuff/modules.list	Tue Jan 28 05:56:16 2014 +0000
+++ b/linux/stuff/modules.list	Wed Jan 29 09:56:07 2014 +0100
@@ -87,7 +87,6 @@
 drivers/input/sparse-keymap.ko.xz
 drivers/net/ethernet/realtek/atp.ko.xz
 drivers/net/ethernet/realtek/8139cp.ko.xz
-drivers/net/ethernet/realtek/r8169.ko.xz
 drivers/net/ethernet/cisco/enic/enic.ko.xz
 drivers/net/ethernet/qlogic/qlge/qlge.ko.xz
 drivers/net/ethernet/qlogic/netxen/netxen_nic.ko.xz
@@ -216,7 +215,6 @@
 drivers/nfc/pn544.ko.xz
 drivers/nfc/pn533.ko.xz
 drivers/nfc/nfcwilink.ko.xz
-drivers/ide/ide-cs.ko.xz
 drivers/watchdog/softdog.ko.xz
 drivers/parport/parport.ko.xz
 drivers/parport/parport_pc.ko.xz
diff -r 83f5a10c4dd7 -r db5b03f42dd9 ndiswrapper-driver/receipt
--- a/ndiswrapper-driver/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/ndiswrapper-driver/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -18,38 +18,30 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	
-	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
-	cd $src
-	make KBUILD=/usr/src/linux KVER=linux-$KERNEL_VERSION-slitaz
+	make KBUILD=/usr/src/linux KVER=linux-${kvers}-slitaz
 	xz driver/ndiswrapper.ko
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
-	EXTRAVERSION=_${KERNEL_VERSION%.*}
-	
-	mkdir -p $fs/usr/sbin $fs/sbin $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc
+	EXTRAVERSION=_${kvers}
+	mkdir -p $fs/usr/sbin $fs/sbin $fs/lib/modules/${kvers}-slitaz/kernel/misc
 	
 	# Install utilities	
-	install -o root -m 755 $src/utils/loadndisdriver $fs/sbin/
-
-	cp $src/driver/ndiswrapper.ko.xz \
-		$fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc/
-	chown root $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc/ndiswrapper.ko.xz
-	chmod 644 $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc/ndiswrapper.ko.xz
+	install -o root -m 0755 $src/utils/loadndisdriver $fs/sbin/
+	install -o root -m 0644 $src/driver/ndiswrapper.ko.xz \
+		$fs/lib/modules/${kvers}-slitaz/kernel/misc/ndiswrapper.ko.xz
 }
 
 post_install()
 {
 	echo "Processing post-install commands..."
-	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
+	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
 }
 
 post_remove()
 {
 	echo "Processing post-remove commands..."
-	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
+	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
 }
diff -r 83f5a10c4dd7 -r db5b03f42dd9 nvidia-173xx/receipt
--- a/nvidia-173xx/receipt	Tue Jan 28 05:56:16 2014 +0000
+++ b/nvidia-173xx/receipt	Wed Jan 29 09:56:07 2014 +0100
@@ -30,7 +30,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {	
-	EXTRAVERSION=_${kvers%.*}
+	EXTRAVERSION=_${kvers}
 	
 	mkdir -p $fs/usr/share $fs/usr/lib/X11 $fs/usr/share/licenses/$PACKAGE \
 				 $fs/lib/modules/$kvers-slitaz/kernel/drivers/video \
@@ -86,7 +86,7 @@
 post_install()
 {
 	echo "Processing post-install commands..."
-	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
+	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
 	
 	# correct .desktop file file
 	sed -i 's:__UTILS_PATH__/::' $1/usr/share/applications/nvidia-settings.desktop
@@ -116,5 +116,3 @@
 	echo "Processing post-remove commands..."
 	depmod -a
 }
-
-TAZBB_NO_INSTALL="because this is not hardware neutral"