wok-6.x rev 15855
New kernel config and huge receipt clean up
line diff
1.1 --- a/aufs/receipt Tue Jan 28 05:56:16 2014 +0000 1.2 +++ b/aufs/receipt Wed Jan 29 09:56:07 2014 +0100 1.3 @@ -4,14 +4,13 @@ 1.4 VERSION="20130311" 1.5 CATEGORY="base-system" 1.6 SHORT_DESC="aufs3 kernel module" 1.7 -MAINTAINER="slaxemulator@gmail.com" 1.8 +MAINTAINER="godane@slitaz.org" 1.9 LICENSE="GPL2" 1.10 WEB_SITE="http://aufs.sf.net/" 1.11 PROVIDE="linux-aufs" 1.12 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.13 WGET_URL="git|git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git" 1.14 BRANCH="origin/${PACKAGE}3.2" 1.15 -COOK_OPT="!remove_src" 1.16 1.17 DEPENDS="linux" 1.18 BUILD_DEPENDS="linux-module-headers git xz" 1.19 @@ -19,27 +18,17 @@ 1.20 # Rules to configure and make the package. 1.21 compile_rules() 1.22 { 1.23 - cd $src 1.24 - 1.25 - sed -i 's|CONFIG_AUFS_BRANCH_MAX_127 =.*|CONFIG_AUFS_BRANCH_MAX_127 =|' \ 1.26 - config.mk || return 1 1.27 - sed -i 's|#CONFIG_AUFS_BRANCH_MAX_32767 =.*|CONFIG_AUFS_BRANCH_MAX_32767 = y|' \ 1.28 - config.mk || return 1 1.29 - sed -i 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y|' \ 1.30 - config.mk || return 1 1.31 - sed -i 's|CONFIG_AUFS_HFSNOTIFY =.*|CONFIG_AUFS_HFSNOTIFY = y|' \ 1.32 - config.mk || return 1 1.33 - sed -i 's|CONFIG_AUFS_EXPORT =.*|CONFIG_AUFS_EXPORT = y|' \ 1.34 - config.mk || return 1 1.35 - sed -i 's|CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \ 1.36 - config.mk || return 1 1.37 - sed -i 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y|' \ 1.38 - config.mk || return 1 1.39 - sed -i 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \ 1.40 - config.mk || return 1 1.41 - sed -i 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' \ 1.42 - config.mk || return 1 1.43 - 1.44 + sed -i \ 1.45 + -e 's|CONFIG_AUFS_BRANCH_MAX_127 =.*|CONFIG_AUFS_BRANCH_MAX_127 =|' \ 1.46 + -e 's|#CONFIG_AUFS_BRANCH_MAX_32767 =.*|CONFIG_AUFS_BRANCH_MAX_32767 = y|' \ 1.47 + -e 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y|' \ 1.48 + -e 's|CONFIG_AUFS_HFSNOTIFY =.*|CONFIG_AUFS_HFSNOTIFY = y|' \ 1.49 + -e 's|CONFIG_AUFS_EXPORT =.*|CONFIG_AUFS_EXPORT = y|' \ 1.50 + -e 's|CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \ 1.51 + -e 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y|' \ 1.52 + -e 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \ 1.53 + -e 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' config.mk 1.54 + 1.55 # The sed fixes are from gentoo portage build. 1.56 sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile 1.57 sed -i "s:__user::g" include/linux/aufs_type.h 1.58 @@ -50,25 +39,23 @@ 1.59 # Rules to gen a SliTaz package suitable for Tazpkg. 1.60 genpkg_rules() 1.61 { 1.62 - KERNEL_VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` 1.63 - BASEVER=${KERNEL_VERSION:0:3} 1.64 - EXTRAVERSION=_$BASEVER 1.65 - mkdir -p $fs/lib/modules/$BASEVER-slitaz/kernel/fs/aufs 1.66 - cp $src/fs/aufs/aufs.ko.xz $fs/lib/modules/$BASEVER-slitaz/kernel/fs/aufs/ 1.67 - chown root $fs/lib/modules/$BASEVER-slitaz/kernel/fs/aufs/aufs.ko.xz 1.68 - chmod 0644 $fs/lib/modules/$BASEVER-slitaz/kernel/fs/aufs/aufs.ko.xz 1.69 - install -D -m 644 $src/include/linux/aufs_type.h \ 1.70 + EXTRAVERSION=_${kvers} 1.71 + mkdir -p $fs/lib/modules/${kvers}-slitaz/kernel/fs/aufs 1.72 + install -o root -m 0644 $src/fs/aufs/aufs.ko.xz \ 1.73 + $fs/lib/modules/${kvers}-slitaz/kernel/fs/aufs/aufs.ko.xz 1.74 + install -D -o root -m 0644 $src/include/linux/aufs_type.h \ 1.75 $fs/usr/include/linux/aufs_type.h 1.76 } 1.77 1.78 +# Post install/remove commands for Tazpkg. 1.79 post_install() 1.80 { 1.81 echo "Processing post-install commands..." 1.82 - chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 1.83 + chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz 1.84 } 1.85 1.86 post_remove() 1.87 { 1.88 echo "Processing post-remove commands..." 1.89 - chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 1.90 + chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz 1.91 }
2.1 --- a/broadcom-wl/receipt Tue Jan 28 05:56:16 2014 +0000 2.2 +++ b/broadcom-wl/receipt Wed Jan 29 09:56:07 2014 +0100 2.3 @@ -27,26 +27,22 @@ 2.4 # Rules to gen a SliTaz package suitable for Tazpkg. 2.5 genpkg_rules() 2.6 { 2.7 - KERNEL_VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` 2.8 - EXTRAVERSION=_$KERNEL_VERSION 2.9 - 2.10 - mkdir -p $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/wireless 2.11 - 2.12 + EXTRAVERSION=_${kvers} 2.13 + mkdir -p $fs/lib/modules/${kvers}-slitaz/kernel/drivers/net/wireless 2.14 # Compress and install module 2.15 - cp $src/wl.ko.xz $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/wireless/ 2.16 - chown root $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/wireless/wl.ko.xz 2.17 - chmod 0644 $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/wireless/wl.ko.xz 2.18 + install -o root -m 0644 $src/wl.ko.xz \ 2.19 + $fs/lib/modules/${kvers}-slitaz/kernel/drivers/net/wireless/wl.ko.xz 2.20 } 2.21 2.22 # Post install/remove commands for Tazpkg. 2.23 post_install() 2.24 { 2.25 echo "Processing post-install commands..." 2.26 - chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 2.27 + chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz 2.28 } 2.29 2.30 post_remove() 2.31 { 2.32 echo "Processing post-remove commands..." 2.33 - chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 2.34 + chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz 2.35 }
3.1 --- a/dahdi-linux-dev/receipt Tue Jan 28 05:56:16 2014 +0000 3.2 +++ b/dahdi-linux-dev/receipt Wed Jan 29 09:56:07 2014 +0100 3.3 @@ -12,7 +12,7 @@ 3.4 # Rules to gen a SliTaz package suitable for Tazpkg. 3.5 genpkg_rules() 3.6 { 3.7 - EXTRAVERSION="$(ls $install/lib/modules | sed 's|\(.*\)-slitaz|_\1|')" 3.8 + EXTRAVERSION=${kvers} 3.9 mkdir -p $fs/usr 3.10 cp -a $install/usr/include $fs/usr 3.11 }
4.1 --- a/dahdi-linux/receipt Tue Jan 28 05:56:16 2014 +0000 4.2 +++ b/dahdi-linux/receipt Wed Jan 29 09:56:07 2014 +0100 4.3 @@ -21,13 +21,7 @@ 4.4 sed -i 's/tar -xof/tar -xf/' drivers/dahdi/firmware/Makefile 4.5 find -type f | xargs sed -i -e 's/DECLARE_MUTEX/DEFINE_SEMAPHORE/g' \ 4.6 -e 's/init_MUTEX\([^)]*\)/sema_init\1, 1/g' 4.7 - if [ ! -d $WOK/linux/taz ]; then 4.8 - if [ -x /usr/bin/cook ]; then 4.9 - cook linux 4.10 - else 4.11 - tazwok cook linux 4.12 - fi 4.13 - fi 4.14 + [ ! -d $WOK/linux/taz ] && cook linux 4.15 make KVERS=$kvers KSRC=$WOK/linux/source/$(ls $WOK/linux/taz) \ 4.16 install 2>&1 | grep -v 'slitaz/modules' 4.17 } 4.18 @@ -35,17 +29,18 @@ 4.19 # Rules to gen a SliTaz package suitable for Tazpkg. 4.20 genpkg_rules() 4.21 { 4.22 - EXTRAVERSION=_${kvers%.*} 4.23 + EXTRAVERSION=_${kvers} 4.24 cp -a $install/* $fs 4.25 + rm -rf $fs/usr/include 4.26 } 4.27 4.28 # Post install/remove commands for Tazpkg. 4.29 post_install() 4.30 { 4.31 - chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 4.32 + chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz 4.33 } 4.34 4.35 post_remove() 4.36 { 4.37 - chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 4.38 + chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz 4.39 }
5.1 --- a/iptables-dev/receipt Tue Jan 28 05:56:16 2014 +0000 5.2 +++ b/iptables-dev/receipt Wed Jan 29 09:56:07 2014 +0100 5.3 @@ -5,7 +5,7 @@ 5.4 CATEGORY="development" 5.5 SHORT_DESC="Packet filtering framework (Firewall) - dev files" 5.6 WEB_SITE="http://www.netfilter.org/" 5.7 -MAINTAINER="slaxemulator@gmail.com" 5.8 +MAINTAINER="pankso@slitaz.org" 5.9 LICENSE="GPL2" 5.10 WANTED="iptables" 5.11 5.12 @@ -14,6 +14,7 @@ 5.13 # Rules to gen a SliTaz package suitable for Tazpkg. 5.14 genpkg_rules() 5.15 { 5.16 + EXTRAVERSION=_${kvers} 5.17 mkdir -p $fs/usr/lib 5.18 cp -a $install/usr/include $fs/usr 5.19 cp -a $install/usr/lib/pkgconfig $fs/usr/lib
6.1 --- a/iptables/receipt Tue Jan 28 05:56:16 2014 +0000 6.2 +++ b/iptables/receipt Wed Jan 29 09:56:07 2014 +0100 6.3 @@ -31,7 +31,7 @@ 6.4 # Rules to gen a SliTaz package suitable for Tazpkg. 6.5 genpkg_rules() 6.6 { 6.7 - EXTRAVERSION=_${kvers%.*} 6.8 + EXTRAVERSION=_${kvers} 6.9 mkdir -p $fs/usr/lib 6.10 cp -a $install/usr/sbin $fs/usr 6.11 cp -a $install/usr/lib/lib* $fs/usr/lib
7.1 --- a/linux-acpi/receipt Tue Jan 28 05:56:16 2014 +0000 7.2 +++ b/linux-acpi/receipt Wed Jan 29 09:56:07 2014 +0100 7.3 @@ -2,7 +2,6 @@ 7.4 7.5 PACKAGE="linux-acpi" 7.6 VERSION="3.2.53" 7.7 -BASEVER="${VERSION:0:3}" 7.8 CATEGORY="base-system" 7.9 SHORT_DESC="The Linux kernel acpi modules." 7.10 DEPENDS="linux" 7.11 @@ -15,10 +14,9 @@ 7.12 genpkg_rules() 7.13 { 7.14 local path 7.15 - path=lib/modules/$BASEVER-slitaz/kernel 7.16 + path=lib/modules/$VERSION-slitaz/kernel 7.17 mkdir -p $fs/$path 7.18 - export src 7.19 - export _pkg 7.20 + export src install 7.21 $wanted_stuff/list_modules.sh drivers/acpi drivers/platform/x86 | \ 7.22 while read module; do 7.23 dir=$path/$(dirname $module) 7.24 @@ -28,19 +26,19 @@ 7.25 7.26 for i in $(cat $wanted_stuff/modules.list); do 7.27 if [ -f $fs/$path/$i ]; then 7.28 - rm -f $fs/$path/$i 7.29 - fi 7.30 + rm -f $fs/$path/$i 7.31 + fi 7.32 done 7.33 } 7.34 7.35 # Post install/remove commands for Tazpkg. 7.36 post_install() 7.37 { 7.38 - chroot "$1/" depmod -a $BASEVER-slitaz 7.39 + chroot "$root/" depmod -a $VERSION-slitaz 7.40 } 7.41 7.42 post_remove() 7.43 { 7.44 - chroot "$1/" depmod -a $BASEVER-slitaz 7.45 + chroot "$root/" depmod -a $VERSION-slitaz 7.46 } 7.47
8.1 --- a/linux-agp/receipt Tue Jan 28 05:56:16 2014 +0000 8.2 +++ b/linux-agp/receipt Wed Jan 29 09:56:07 2014 +0100 8.3 @@ -2,7 +2,6 @@ 8.4 8.5 PACKAGE="linux-agp" 8.6 VERSION="3.2.53" 8.7 -BASEVER="${VERSION:0:3}" 8.8 CATEGORY="base-system" 8.9 SHORT_DESC="The Linux kernel AGP modules." 8.10 MAINTAINER="erjo@slitaz.org" 8.11 @@ -15,10 +14,9 @@ 8.12 genpkg_rules() 8.13 { 8.14 local path 8.15 - path=lib/modules/$BASEVER-slitaz/kernel 8.16 + path=lib/modules/$VERSION-slitaz/kernel 8.17 mkdir -p $fs/$path 8.18 - export src 8.19 - export _pkg 8.20 + export src install 8.21 $wanted_stuff/list_modules.sh drivers/char/agp | while read module; do 8.22 dir=$path/$(dirname $module) 8.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 8.24 @@ -35,11 +33,11 @@ 8.25 # Post install/remove commands for Tazpkg. 8.26 post_install() 8.27 { 8.28 - chroot "$1/" depmod -a $BASEVER-slitaz 8.29 + chroot "$root/" depmod -a $VERSION-slitaz 8.30 } 8.31 8.32 post_remove() 8.33 { 8.34 - chroot "$1/" depmod -a $BASEVER-slitaz 8.35 + chroot "$root/" depmod -a $VERSION-slitaz 8.36 } 8.37
9.1 --- a/linux-aoe/receipt Tue Jan 28 05:56:16 2014 +0000 9.2 +++ b/linux-aoe/receipt Wed Jan 29 09:56:07 2014 +0100 9.3 @@ -2,7 +2,6 @@ 9.4 9.5 PACKAGE="linux-aoe" 9.6 VERSION="3.2.53" 9.7 -BASEVER="${VERSION:0:3}" 9.8 CATEGORY="base-system" 9.9 SHORT_DESC="The Linux kernel ATA over Ethernet modules." 9.10 MAINTAINER="devel@slitaz.org" 9.11 @@ -15,10 +14,9 @@ 9.12 genpkg_rules() 9.13 { 9.14 local path 9.15 - path=lib/modules/$BASEVER-slitaz/kernel 9.16 + path=lib/modules/$VERSION-slitaz/kernel 9.17 mkdir -p $fs/$path 9.18 - export src 9.19 - export _pkg 9.20 + export src install 9.21 $wanted_stuff/list_modules.sh drivers/block/aoe/aoe.ko.xz | \ 9.22 while read module; do 9.23 dir=$path/$(dirname $module) 9.24 @@ -30,11 +28,11 @@ 9.25 # Post install/remove commands for Tazpkg. 9.26 post_install() 9.27 { 9.28 - chroot "$1/" depmod -a $BASEVER-slitaz 9.29 + chroot "$root/" depmod -a $VERSION-slitaz 9.30 } 9.31 9.32 post_remove() 9.33 { 9.34 - chroot "$1/" depmod -a $BASEVER-slitaz 9.35 + chroot "$root/" depmod -a $VERSION-slitaz 9.36 } 9.37
10.1 --- a/linux-appletalk/receipt Tue Jan 28 05:56:16 2014 +0000 10.2 +++ b/linux-appletalk/receipt Wed Jan 29 09:56:07 2014 +0100 10.3 @@ -2,7 +2,6 @@ 10.4 10.5 PACKAGE="linux-appletalk" 10.6 VERSION="3.2.53" 10.7 -BASEVER="${VERSION:0:3}" 10.8 CATEGORY="base-system" 10.9 SHORT_DESC="The Linux kernel appletalk modules." 10.10 MAINTAINER="devel@slitaz.org" 10.11 @@ -15,11 +14,10 @@ 10.12 genpkg_rules() 10.13 { 10.14 local path 10.15 - path=lib/modules/$BASEVER-slitaz/kernel 10.16 + path=lib/modules/$VERSION-slitaz/kernel 10.17 mkdir -p $fs/$path 10.18 10.19 - export src 10.20 - export _pkg 10.21 + export src install 10.22 10.23 $wanted_stuff/list_modules.sh drivers/net/appletalk net/appletalk \ 10.24 net/802/p8022.ko.xz | while read module; do 10.25 @@ -38,11 +36,11 @@ 10.26 # Post install/remove commands for Tazpkg. 10.27 post_install() 10.28 { 10.29 - chroot "$1/" depmod -a $BASEVER-slitaz 10.30 + chroot "$root/" depmod -a $VERSION-slitaz 10.31 } 10.32 10.33 post_remove() 10.34 { 10.35 - chroot "$1/" depmod -a $BASEVER-slitaz 10.36 + chroot "$root/" depmod -a $VERSION-slitaz 10.37 } 10.38
11.1 --- a/linux-arcnet/receipt Tue Jan 28 05:56:16 2014 +0000 11.2 +++ b/linux-arcnet/receipt Wed Jan 29 09:56:07 2014 +0100 11.3 @@ -2,7 +2,6 @@ 11.4 11.5 PACKAGE="linux-arcnet" 11.6 VERSION="3.2.53" 11.7 -BASEVER="${VERSION:0:3}" 11.8 CATEGORY="base-system" 11.9 SHORT_DESC="arcnet kernel modules" 11.10 MAINTAINER="slaxemulator@gmail.com" 11.11 @@ -15,11 +14,10 @@ 11.12 genpkg_rules() 11.13 { 11.14 local path 11.15 - path=lib/modules/$BASEVER-slitaz/kernel 11.16 + path=lib/modules/$VERSION-slitaz/kernel 11.17 mkdir -p $fs/$path 11.18 11.19 - export src 11.20 - export _pkg 11.21 + export src install 11.22 11.23 $wanted_stuff/list_modules.sh drivers/net/arcnet drivers/net/arcnet/arcnet.ko.xz \ 11.24 drivers/net/arcnet/com90xx.ko.xz drivers/net/arcnet/rfc1051.ko.xz | while read module; do 11.25 @@ -38,10 +36,10 @@ 11.26 # Post install/remove commands for Tazpkg. 11.27 post_install() 11.28 { 11.29 - chroot "$1/" depmod -a $BASEVER-slitaz 11.30 + chroot "$root/" depmod -a $VERSION-slitaz 11.31 } 11.32 11.33 post_remove() 11.34 { 11.35 - chroot "$1/" depmod -a $BASEVER-slitaz 11.36 + chroot "$root/" depmod -a $VERSION-slitaz 11.37 }
12.1 --- a/linux-autofs/receipt Tue Jan 28 05:56:16 2014 +0000 12.2 +++ b/linux-autofs/receipt Wed Jan 29 09:56:07 2014 +0100 12.3 @@ -2,7 +2,6 @@ 12.4 12.5 PACKAGE="linux-autofs" 12.6 VERSION="3.2.53" 12.7 -BASEVER="${VERSION:0:3}" 12.8 CATEGORY="base-system" 12.9 SHORT_DESC="The Linux kernel automounter module." 12.10 MAINTAINER="devel@slitaz.org" 12.11 @@ -16,10 +15,9 @@ 12.12 genpkg_rules() 12.13 { 12.14 local path 12.15 - path=lib/modules/$BASEVER-slitaz/kernel 12.16 + path=lib/modules/$VERSION-slitaz/kernel 12.17 mkdir -p $fs/$path $fs/etc 12.18 - export src 12.19 - export _pkg 12.20 + export src install 12.21 $wanted_stuff/list_modules.sh fs/autofs4 | while read module; do 12.22 dir=$path/$(dirname $module) 12.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 12.24 @@ -33,12 +31,12 @@ 12.25 { 12.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 12.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 12.28 - chroot "$1/" depmod -a $BASEVER-slitaz 12.29 + chroot "$root/" depmod -a $VERSION-slitaz 12.30 } 12.31 12.32 post_remove() 12.33 { 12.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 12.35 - chroot "$1/" depmod -a $BASEVER-slitaz 12.36 + chroot "$root/" depmod -a $VERSION-slitaz 12.37 } 12.38
13.1 --- a/linux-bluetooth/receipt Tue Jan 28 05:56:16 2014 +0000 13.2 +++ b/linux-bluetooth/receipt Wed Jan 29 09:56:07 2014 +0100 13.3 @@ -2,7 +2,6 @@ 13.4 13.5 PACKAGE="linux-bluetooth" 13.6 VERSION="3.2.53" 13.7 -BASEVER="${VERSION:0:3}" 13.8 CATEGORY="base-system" 13.9 SHORT_DESC="The Linux kernel bluetooth modules." 13.10 MAINTAINER="devel@slitaz.org" 13.11 @@ -15,10 +14,9 @@ 13.12 genpkg_rules() 13.13 { 13.14 local path 13.15 - path=lib/modules/$BASEVER-slitaz/kernel 13.16 + path=lib/modules/$VERSION-slitaz/kernel 13.17 mkdir -p $fs/$path 13.18 - export src 13.19 - export _pkg 13.20 + export src install 13.21 $wanted_stuff/list_modules.sh drivers/bluetooth net/bluetooth | while read module; do 13.22 dir=$path/$(dirname $module) 13.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 13.24 @@ -35,11 +33,11 @@ 13.25 # Post install/remove commands for Tazpkg. 13.26 post_install() 13.27 { 13.28 - chroot "$1/" depmod -a $BASEVER-slitaz 13.29 + chroot "$root/" depmod -a $VERSION-slitaz 13.30 } 13.31 13.32 post_remove() 13.33 { 13.34 - chroot "$1/" depmod -a $BASEVER-slitaz 13.35 + chroot "$root/" depmod -a $VERSION-slitaz 13.36 } 13.37
14.1 --- a/linux-bridge/receipt Tue Jan 28 05:56:16 2014 +0000 14.2 +++ b/linux-bridge/receipt Wed Jan 29 09:56:07 2014 +0100 14.3 @@ -2,7 +2,6 @@ 14.4 14.5 PACKAGE="linux-bridge" 14.6 VERSION="3.2.53" 14.7 -BASEVER="${VERSION:0:3}" 14.8 CATEGORY="base-system" 14.9 SHORT_DESC="The Linux kernel bridge modules." 14.10 MAINTAINER="devel@slitaz.org" 14.11 @@ -15,10 +14,9 @@ 14.12 genpkg_rules() 14.13 { 14.14 local path 14.15 - path=lib/modules/$BASEVER-slitaz/kernel 14.16 + path=lib/modules/$VERSION-slitaz/kernel 14.17 mkdir -p $fs/$path 14.18 - export src 14.19 - export _pkg 14.20 + export src install 14.21 $wanted_stuff/list_modules.sh net/bridge | while read module; do 14.22 dir=$path/$(dirname $module) 14.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 14.24 @@ -35,11 +33,11 @@ 14.25 # Post install/remove commands for Tazpkg. 14.26 post_install() 14.27 { 14.28 - chroot "$1/" depmod -a $BASEVER-slitaz 14.29 + chroot "$root/" depmod -a $VERSION-slitaz 14.30 } 14.31 14.32 post_remove() 14.33 { 14.34 - chroot "$1/" depmod -a $BASEVER-slitaz 14.35 + chroot "$root/" depmod -a $VERSION-slitaz 14.36 } 14.37
15.1 --- a/linux-cifs/receipt Tue Jan 28 05:56:16 2014 +0000 15.2 +++ b/linux-cifs/receipt Wed Jan 29 09:56:07 2014 +0100 15.3 @@ -2,7 +2,6 @@ 15.4 15.5 PACKAGE="linux-cifs" 15.6 VERSION="3.2.53" 15.7 -BASEVER="${VERSION:0:3}" 15.8 CATEGORY="base-system" 15.9 SHORT_DESC="The Linux kernel cifs module." 15.10 MAINTAINER="devel@slitaz.org" 15.11 @@ -16,10 +15,9 @@ 15.12 genpkg_rules() 15.13 { 15.14 local path 15.15 - path=lib/modules/$BASEVER-slitaz/kernel 15.16 + path=lib/modules/$VERSION-slitaz/kernel 15.17 mkdir -p $fs/$path $fs/etc 15.18 - export src 15.19 - export _pkg 15.20 + export src install 15.21 $wanted_stuff/list_modules.sh fs/cifs | while read module; do 15.22 dir=$path/$(dirname $module) 15.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 15.24 @@ -33,12 +31,12 @@ 15.25 { 15.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 15.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 15.28 - chroot "$1/" depmod -a $BASEVER-slitaz 15.29 + chroot "$root/" depmod -a $VERSION-slitaz 15.30 } 15.31 15.32 post_remove() 15.33 { 15.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 15.35 - chroot "$1/" depmod -a $BASEVER-slitaz 15.36 + chroot "$root/" depmod -a $VERSION-slitaz 15.37 } 15.38
16.1 --- a/linux-coda/receipt Tue Jan 28 05:56:16 2014 +0000 16.2 +++ b/linux-coda/receipt Wed Jan 29 09:56:07 2014 +0100 16.3 @@ -2,7 +2,6 @@ 16.4 16.5 PACKAGE="linux-coda" 16.6 VERSION="3.2.53" 16.7 -BASEVER="${VERSION:0:3}" 16.8 CATEGORY="base-system" 16.9 SHORT_DESC="The Linux kernel coda module." 16.10 MAINTAINER="devel@slitaz.org" 16.11 @@ -16,10 +15,9 @@ 16.12 genpkg_rules() 16.13 { 16.14 local path 16.15 - path=lib/modules/$BASEVER-slitaz/kernel 16.16 + path=lib/modules/$VERSION-slitaz/kernel 16.17 mkdir -p $fs/$path $fs/etc 16.18 - export src 16.19 - export _pkg 16.20 + export src install 16.21 $wanted_stuff/list_modules.sh fs/coda | while read module; do 16.22 dir=$path/$(dirname $module) 16.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 16.24 @@ -33,12 +31,12 @@ 16.25 { 16.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 16.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 16.28 - chroot "$1/" depmod -a $BASEVER-slitaz 16.29 + chroot "$root/" depmod -a $VERSION-slitaz 16.30 } 16.31 16.32 post_remove() 16.33 { 16.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 16.35 - chroot "$1/" depmod -a $BASEVER-slitaz 16.36 + chroot "$root/" depmod -a $VERSION-slitaz 16.37 } 16.38
17.1 --- a/linux-configfs/receipt Tue Jan 28 05:56:16 2014 +0000 17.2 +++ b/linux-configfs/receipt Wed Jan 29 09:56:07 2014 +0100 17.3 @@ -2,7 +2,6 @@ 17.4 17.5 PACKAGE="linux-configfs" 17.6 VERSION="3.2.53" 17.7 -BASEVER="${VERSION:0:3}" 17.8 CATEGORY="base-system" 17.9 SHORT_DESC="The Linux kernel configfs module." 17.10 MAINTAINER="devel@slitaz.org" 17.11 @@ -16,10 +15,9 @@ 17.12 genpkg_rules() 17.13 { 17.14 local path 17.15 - path=lib/modules/$BASEVER-slitaz/kernel 17.16 + path=lib/modules/$VERSION-slitaz/kernel 17.17 mkdir -p $fs/$path $fs/etc 17.18 - export src 17.19 - export _pkg 17.20 + export src install 17.21 $wanted_stuff/list_modules.sh fs/${PACKAGE#*-} | while read module; do 17.22 dir=$path/$(dirname $module) 17.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 17.24 @@ -33,12 +31,12 @@ 17.25 { 17.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 17.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 17.28 - chroot "$1/" depmod -a $BASEVER-slitaz 17.29 + chroot "$root/" depmod -a $VERSION-slitaz 17.30 } 17.31 17.32 post_remove() 17.33 { 17.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 17.35 - chroot "$1/" depmod -a $BASEVER-slitaz 17.36 + chroot "$root/" depmod -a $VERSION-slitaz 17.37 } 17.38
18.1 --- a/linux-cpufreq/receipt Tue Jan 28 05:56:16 2014 +0000 18.2 +++ b/linux-cpufreq/receipt Wed Jan 29 09:56:07 2014 +0100 18.3 @@ -2,7 +2,6 @@ 18.4 18.5 PACKAGE="linux-cpufreq" 18.6 VERSION="3.2.53" 18.7 -BASEVER="${VERSION:0:3}" 18.8 CATEGORY="base-system" 18.9 SHORT_DESC="The Linux kernel cpufreq modules." 18.10 MAINTAINER="devel@slitaz.org" 18.11 @@ -15,10 +14,9 @@ 18.12 genpkg_rules() 18.13 { 18.14 local path 18.15 - path=lib/modules/$BASEVER-slitaz/kernel 18.16 + path=lib/modules/$VERSION-slitaz/kernel 18.17 mkdir -p $fs/$path 18.18 - export src 18.19 - export _pkg 18.20 + export src install 18.21 $wanted_stuff/list_modules.sh drivers/cpufreq | \ 18.22 while read module; do 18.23 dir=$path/$(dirname $module) 18.24 @@ -30,11 +28,11 @@ 18.25 # Post install/remove commands for Tazpkg. 18.26 post_install() 18.27 { 18.28 - chroot "$1/" depmod -a $BASEVER-slitaz 18.29 + chroot "$root/" depmod -a $VERSION-slitaz 18.30 } 18.31 18.32 post_remove() 18.33 { 18.34 - chroot "$1/" depmod -a $BASEVER-slitaz 18.35 + chroot "$root/" depmod -a $VERSION-slitaz 18.36 } 18.37
19.1 --- a/linux-cramfs/receipt Tue Jan 28 05:56:16 2014 +0000 19.2 +++ b/linux-cramfs/receipt Wed Jan 29 09:56:07 2014 +0100 19.3 @@ -2,7 +2,6 @@ 19.4 19.5 PACKAGE="linux-cramfs" 19.6 VERSION="3.2.53" 19.7 -BASEVER="${VERSION:0:3}" 19.8 CATEGORY="base-system" 19.9 SHORT_DESC="The Linux kernel cramfs module." 19.10 MAINTAINER="devel@slitaz.org" 19.11 @@ -16,10 +15,9 @@ 19.12 genpkg_rules() 19.13 { 19.14 local path 19.15 - path=lib/modules/$BASEVER-slitaz/kernel 19.16 + path=lib/modules/$VERSION-slitaz/kernel 19.17 mkdir -p $fs/$path $fs/etc 19.18 - export src 19.19 - export _pkg 19.20 + export src install 19.21 $wanted_stuff/list_modules.sh fs/cramfs | while read module; do 19.22 dir=$path/$(dirname $module) 19.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 19.24 @@ -33,12 +31,12 @@ 19.25 { 19.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 19.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 19.28 - chroot "$1/" depmod -a $BASEVER-slitaz 19.29 + chroot "$root/" depmod -a $VERSION-slitaz 19.30 } 19.31 19.32 post_remove() 19.33 { 19.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 19.35 - chroot "$1/" depmod -a $BASEVER-slitaz 19.36 + chroot "$root/" depmod -a $VERSION-slitaz 19.37 } 19.38
20.1 --- a/linux-crypto/receipt Tue Jan 28 05:56:16 2014 +0000 20.2 +++ b/linux-crypto/receipt Wed Jan 29 09:56:07 2014 +0100 20.3 @@ -2,7 +2,6 @@ 20.4 20.5 PACKAGE="linux-crypto" 20.6 VERSION="3.2.53" 20.7 -BASEVER="${VERSION:0:3}" 20.8 CATEGORY="base-system" 20.9 SHORT_DESC="The Linux kernel crypto modules." 20.10 MAINTAINER="devel@slitaz.org" 20.11 @@ -15,10 +14,9 @@ 20.12 genpkg_rules() 20.13 { 20.14 local path 20.15 - path=lib/modules/$BASEVER-slitaz/kernel 20.16 + path=lib/modules/$VERSION-slitaz/kernel 20.17 mkdir -p $fs/$path 20.18 - export src 20.19 - export _pkg 20.20 + export src install 20.21 $wanted_stuff/list_modules.sh arch/x86/crypto crypto drivers/crypto | \ 20.22 while read module; do 20.23 dir=$path/$(dirname $module) 20.24 @@ -36,11 +34,11 @@ 20.25 # Post install/remove commands for Tazpkg. 20.26 post_install() 20.27 { 20.28 - chroot "$1/" depmod -a $BASEVER-slitaz 20.29 + chroot "$root/" depmod -a $VERSION-slitaz 20.30 } 20.31 20.32 post_remove() 20.33 { 20.34 - chroot "$1/" depmod -a $BASEVER-slitaz 20.35 + chroot "$root/" depmod -a $VERSION-slitaz 20.36 } 20.37
21.1 --- a/linux-cryptoloop/receipt Tue Jan 28 05:56:16 2014 +0000 21.2 +++ b/linux-cryptoloop/receipt Wed Jan 29 09:56:07 2014 +0100 21.3 @@ -2,7 +2,6 @@ 21.4 21.5 PACKAGE="linux-cryptoloop" 21.6 VERSION="3.2.53" 21.7 -BASEVER="${VERSION:0:3}" 21.8 CATEGORY="base-system" 21.9 SHORT_DESC="The Linux kernel cryptoloop modules." 21.10 MAINTAINER="devel@slitaz.org" 21.11 @@ -15,10 +14,9 @@ 21.12 genpkg_rules() 21.13 { 21.14 local path 21.15 - path=lib/modules/$BASEVER-slitaz/kernel 21.16 + path=lib/modules/$VERSION-slitaz/kernel 21.17 mkdir -p $fs/$path 21.18 - export src 21.19 - export _pkg 21.20 + export src install 21.21 $wanted_stuff/list_modules.sh drivers/block/cryptoloop.ko.xz | \ 21.22 while read module; do 21.23 dir=$path/$(dirname $module) 21.24 @@ -30,11 +28,11 @@ 21.25 # Post install/remove commands for Tazpkg. 21.26 post_install() 21.27 { 21.28 - chroot "$1/" depmod -a $BASEVER-slitaz 21.29 + chroot "$root/" depmod -a $VERSION-slitaz 21.30 } 21.31 21.32 post_remove() 21.33 { 21.34 - chroot "$1/" depmod -a $BASEVER-slitaz 21.35 + chroot "$root/" depmod -a $VERSION-slitaz 21.36 } 21.37
22.1 --- a/linux-dialup/receipt Tue Jan 28 05:56:16 2014 +0000 22.2 +++ b/linux-dialup/receipt Wed Jan 29 09:56:07 2014 +0100 22.3 @@ -2,7 +2,6 @@ 22.4 22.5 PACKAGE="linux-dialup" 22.6 VERSION="3.2.53" 22.7 -BASEVER="${VERSION:0:3}" 22.8 CATEGORY="base-system" 22.9 SHORT_DESC="The Linux kernel dial-up modules." 22.10 MAINTAINER="domcox@slitaz.org" 22.11 @@ -15,10 +14,9 @@ 22.12 genpkg_rules() 22.13 { 22.14 local path 22.15 - path=lib/modules/$BASEVER-slitaz/kernel 22.16 + path=lib/modules/$VERSION-slitaz/kernel 22.17 mkdir -p $fs/$path 22.18 - export src 22.19 - export _pkg 22.20 + export src install 22.21 $wanted_stuff/list_modules.sh drivers/tty/serial/serial_cs.ko.xz \ 22.22 drivers/usb/serial drivers/net/usb/hso.ko.xz | \ 22.23 while read module; do 22.24 @@ -37,11 +35,11 @@ 22.25 # Post install/remove commands for Tazpkg. 22.26 post_install() 22.27 { 22.28 - chroot "$1/" depmod -a $BASEVER-slitaz 22.29 + chroot "$root/" depmod -a $VERSION-slitaz 22.30 } 22.31 22.32 post_remove() 22.33 { 22.34 - chroot "$1/" depmod -a $BASEVER-slitaz 22.35 + chroot "$root/" depmod -a $VERSION-slitaz 22.36 } 22.37
23.1 --- a/linux-dlm/receipt Tue Jan 28 05:56:16 2014 +0000 23.2 +++ b/linux-dlm/receipt Wed Jan 29 09:56:07 2014 +0100 23.3 @@ -2,7 +2,6 @@ 23.4 23.5 PACKAGE="linux-dlm" 23.6 VERSION="3.2.53" 23.7 -BASEVER="${VERSION:0:3}" 23.8 CATEGORY="base-system" 23.9 SHORT_DESC="The Linux kernel dlmfs module." 23.10 MAINTAINER="devel@slitaz.org" 23.11 @@ -13,7 +12,7 @@ 23.12 CONFIG_FILES="/etc/filesystems" 23.13 23.14 # Modules paths and list 23.15 -MOD_PATH="lib/modules/$BASEVER-slitaz/kernel" 23.16 +MOD_PATH="lib/modules/$VERSION-slitaz/kernel" 23.17 MODULES="fs/dlm/dlm.ko.xz" 23.18 23.19 # Rules to gen a SliTaz package suitable for Tazpkg. 23.20 @@ -34,12 +33,12 @@ 23.21 { 23.22 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 23.23 echo "${PACKAGE#*-}" >> $1/etc/filesystems 23.24 - chroot "$1/" depmod -a $BASEVER-slitaz 23.25 + chroot "$root/" depmod -a $VERSION-slitaz 23.26 } 23.27 23.28 post_remove() 23.29 { 23.30 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 23.31 - chroot "$1/" depmod -a $BASEVER-slitaz 23.32 + chroot "$root/" depmod -a $VERSION-slitaz 23.33 } 23.34
24.1 --- a/linux-drm/receipt Tue Jan 28 05:56:16 2014 +0000 24.2 +++ b/linux-drm/receipt Wed Jan 29 09:56:07 2014 +0100 24.3 @@ -2,7 +2,6 @@ 24.4 24.5 PACKAGE="linux-drm" 24.6 VERSION="3.2.53" 24.7 -BASEVER="${VERSION:0:3}" 24.8 CATEGORY="base-system" 24.9 SHORT_DESC="The Linux kernel drm module." 24.10 MAINTAINER="devel@slitaz.org" 24.11 @@ -15,10 +14,9 @@ 24.12 genpkg_rules() 24.13 { 24.14 local path 24.15 - path=lib/modules/$BASEVER-slitaz/kernel 24.16 + path=lib/modules/$VERSION-slitaz/kernel 24.17 mkdir -p $fs/$path 24.18 - export src 24.19 - export _pkg 24.20 + export src install 24.21 $wanted_stuff/list_modules.sh drivers/gpu/drm | while read module; do 24.22 dir=$path/$(dirname $module) 24.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 24.24 @@ -31,7 +29,7 @@ 24.25 fi 24.26 done 24.27 24.28 - # remove drivers/char/agp kernel modules cause there in linux-agp package 24.29 + # Remove drivers/char/agp kernel modules cause there in linux-agp package 24.30 if [ -d $fs/$path/drivers/char/agp ]; then 24.31 rm -rf $fs/$path/drivers/char/agp 24.32 fi 24.33 @@ -40,11 +38,11 @@ 24.34 # Post install/remove commands for Tazpkg. 24.35 post_install() 24.36 { 24.37 - chroot "$1/" depmod -a $BASEVER-slitaz 24.38 + chroot "$root/" depmod -a $VERSION-slitaz 24.39 } 24.40 24.41 post_remove() 24.42 { 24.43 - chroot "$1/" depmod -a $BASEVER-slitaz 24.44 + chroot "$root/" depmod -a $VERSION-slitaz 24.45 } 24.46
25.1 --- a/linux-firewire/receipt Tue Jan 28 05:56:16 2014 +0000 25.2 +++ b/linux-firewire/receipt Wed Jan 29 09:56:07 2014 +0100 25.3 @@ -2,7 +2,6 @@ 25.4 25.5 PACKAGE="linux-firewire" 25.6 VERSION="3.2.53" 25.7 -BASEVER="${VERSION:0:3}" 25.8 CATEGORY="base-system" 25.9 SHORT_DESC="The Linux kernel firewire modules." 25.10 MAINTAINER="devel@slitaz.org" 25.11 @@ -15,10 +14,9 @@ 25.12 genpkg_rules() 25.13 { 25.14 local path 25.15 - path=lib/modules/$BASEVER-slitaz/kernel 25.16 + path=lib/modules/$VERSION-slitaz/kernel 25.17 mkdir -p $fs/$path 25.18 - export src 25.19 - export _pkg 25.20 + export src install 25.21 $wanted_stuff/list_modules.sh drivers/firewire | while read module; do 25.22 dir=$path/$(dirname $module) 25.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 25.24 @@ -29,11 +27,11 @@ 25.25 # Post install/remove commands for Tazpkg. 25.26 post_install() 25.27 { 25.28 - chroot "$1/" depmod -a $BASEVER-slitaz 25.29 + chroot "$root/" depmod -a $VERSION-slitaz 25.30 } 25.31 25.32 post_remove() 25.33 { 25.34 - chroot "$1/" depmod -a $BASEVER-slitaz 25.35 + chroot "$root/" depmod -a $VERSION-slitaz 25.36 } 25.37
26.1 --- a/linux-firmware/receipt Tue Jan 28 05:56:16 2014 +0000 26.2 +++ b/linux-firmware/receipt Wed Jan 29 09:56:07 2014 +0100 26.3 @@ -2,7 +2,6 @@ 26.4 26.5 PACKAGE="linux-firmware" 26.6 VERSION="3.2.53" 26.7 -BASEVER="${VERSION:0:3}" 26.8 CATEGORY="non-free" 26.9 SHORT_DESC="Firmware thats compiled from linux source code." 26.10 MAINTAINER="slaxemulator@gmail.com"
27.1 --- a/linux-gfs2/receipt Tue Jan 28 05:56:16 2014 +0000 27.2 +++ b/linux-gfs2/receipt Wed Jan 29 09:56:07 2014 +0100 27.3 @@ -2,7 +2,6 @@ 27.4 27.5 PACKAGE="linux-gfs2" 27.6 VERSION="3.2.53" 27.7 -BASEVER="${VERSION:0:3}" 27.8 CATEGORY="base-system" 27.9 SHORT_DESC="The Linux kernel gfs2 module." 27.10 MAINTAINER="devel@slitaz.org" 27.11 @@ -16,10 +15,9 @@ 27.12 genpkg_rules() 27.13 { 27.14 local path 27.15 - path=lib/modules/$BASEVER-slitaz/kernel 27.16 + path=lib/modules/$VERSION-slitaz/kernel 27.17 mkdir -p $fs/$path $fs/etc 27.18 - export src 27.19 - export _pkg 27.20 + export src install 27.21 $wanted_stuff/list_modules.sh fs/gfs2 | while read module; do 27.22 dir=$path/$(dirname $module) 27.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 27.24 @@ -33,12 +31,12 @@ 27.25 { 27.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 27.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 27.28 - chroot "$1/" depmod -a $BASEVER-slitaz 27.29 + chroot "$root/" depmod -a $VERSION-slitaz 27.30 } 27.31 27.32 post_remove() 27.33 { 27.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 27.35 - chroot "$1/" depmod -a $BASEVER-slitaz 27.36 + chroot "$root/" depmod -a $VERSION-slitaz 27.37 } 27.38
28.1 --- a/linux-hfs/receipt Tue Jan 28 05:56:16 2014 +0000 28.2 +++ b/linux-hfs/receipt Wed Jan 29 09:56:07 2014 +0100 28.3 @@ -2,7 +2,6 @@ 28.4 28.5 PACKAGE="linux-hfs" 28.6 VERSION="3.2.53" 28.7 -BASEVER="${VERSION:0:3}" 28.8 CATEGORY="base-system" 28.9 SHORT_DESC="The Linux kernel hfs module." 28.10 MAINTAINER="devel@slitaz.org" 28.11 @@ -16,10 +15,9 @@ 28.12 genpkg_rules() 28.13 { 28.14 local path 28.15 - path=lib/modules/$BASEVER-slitaz/kernel 28.16 + path=lib/modules/$VERSION-slitaz/kernel 28.17 mkdir -p $fs/$path $fs/etc 28.18 - export src 28.19 - export _pkg 28.20 + export src install 28.21 $wanted_stuff/list_modules.sh fs/${PACKAGE#*-} | while read module; do 28.22 dir=$path/$(dirname $module) 28.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 28.24 @@ -33,12 +31,12 @@ 28.25 { 28.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 28.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 28.28 - chroot "$1/" depmod -a $BASEVER-slitaz 28.29 + chroot "$root/" depmod -a $VERSION-slitaz 28.30 } 28.31 28.32 post_remove() 28.33 { 28.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 28.35 - chroot "$1/" depmod -a $BASEVER-slitaz 28.36 + chroot "$root/" depmod -a $VERSION-slitaz 28.37 } 28.38
29.1 --- a/linux-hfsplus/receipt Tue Jan 28 05:56:16 2014 +0000 29.2 +++ b/linux-hfsplus/receipt Wed Jan 29 09:56:07 2014 +0100 29.3 @@ -2,7 +2,6 @@ 29.4 29.5 PACKAGE="linux-hfsplus" 29.6 VERSION="3.2.53" 29.7 -BASEVER="${VERSION:0:3}" 29.8 CATEGORY="base-system" 29.9 SHORT_DESC="The Linux kernel hfsplus module." 29.10 MAINTAINER="devel@slitaz.org" 29.11 @@ -16,10 +15,9 @@ 29.12 genpkg_rules() 29.13 { 29.14 local path 29.15 - path=lib/modules/$BASEVER-slitaz/kernel 29.16 + path=lib/modules/$VERSION-slitaz/kernel 29.17 mkdir -p $fs/$path $fs/etc 29.18 - export src 29.19 - export _pkg 29.20 + export src install 29.21 $wanted_stuff/list_modules.sh fs/hfsplus | while read module; do 29.22 dir=$path/$(dirname $module) 29.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 29.24 @@ -33,11 +31,11 @@ 29.25 { 29.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 29.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 29.28 - chroot "$1/" depmod -a $BASEVER-slitaz 29.29 + chroot "$root/" depmod -a $VERSION-slitaz 29.30 } 29.31 29.32 post_remove() 29.33 { 29.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 29.35 - chroot "$1/" depmod -a $BASEVER-slitaz 29.36 + chroot "$root/" depmod -a $VERSION-slitaz 29.37 }
30.1 --- a/linux-hwmon/receipt Tue Jan 28 05:56:16 2014 +0000 30.2 +++ b/linux-hwmon/receipt Wed Jan 29 09:56:07 2014 +0100 30.3 @@ -2,7 +2,6 @@ 30.4 30.5 PACKAGE="linux-hwmon" 30.6 VERSION="3.2.53" 30.7 -BASEVER="${VERSION:0:3}" 30.8 CATEGORY="base-system" 30.9 SHORT_DESC="The Linux kernel hwmon modules." 30.10 MAINTAINER="devel@slitaz.org" 30.11 @@ -15,10 +14,9 @@ 30.12 genpkg_rules() 30.13 { 30.14 local path 30.15 - path=lib/modules/$BASEVER-slitaz/kernel 30.16 + path=lib/modules/$VERSION-slitaz/kernel 30.17 mkdir -p $fs/$path 30.18 - export src 30.19 - export _pkg 30.20 + export src install 30.21 $wanted_stuff/list_modules.sh drivers/hwmon | while read module; do 30.22 dir=$path/$(dirname $module) 30.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 30.24 @@ -35,11 +33,11 @@ 30.25 # Post install/remove commands for Tazpkg. 30.26 post_install() 30.27 { 30.28 - chroot "$1/" depmod -a $BASEVER-slitaz 30.29 + chroot "$root/" depmod -a $VERSION-slitaz 30.30 } 30.31 30.32 post_remove() 30.33 { 30.34 - chroot "$1/" depmod -a $BASEVER-slitaz 30.35 + chroot "$root/" depmod -a $VERSION-slitaz 30.36 } 30.37
31.1 --- a/linux-input-misc/receipt Tue Jan 28 05:56:16 2014 +0000 31.2 +++ b/linux-input-misc/receipt Wed Jan 29 09:56:07 2014 +0100 31.3 @@ -2,7 +2,6 @@ 31.4 31.5 PACKAGE="linux-input-misc" 31.6 VERSION="3.2.53" 31.7 -BASEVER="${VERSION:0:3}" 31.8 CATEGORY="base-system" 31.9 SHORT_DESC="The Linux kernel misc. input drivers, including the ATI RemoteWonders." 31.10 MAINTAINER="rcx@zoominternet.net" 31.11 @@ -15,10 +14,9 @@ 31.12 genpkg_rules() 31.13 { 31.14 local path 31.15 - path=lib/modules/$BASEVER-slitaz/kernel 31.16 + path=lib/modules/$VERSION-slitaz/kernel 31.17 mkdir -p $fs/$path 31.18 - export src 31.19 - export _pkg 31.20 + export src install 31.21 $wanted_stuff/list_modules.sh drivers/input/misc | while read module; do 31.22 dir=$path/$(dirname $module) 31.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 31.24 @@ -35,11 +33,11 @@ 31.25 # Post install/remove commands for Tazpkg. 31.26 post_install() 31.27 { 31.28 - chroot "$1/" depmod -a $BASEVER-slitaz 31.29 + chroot "$root/" depmod -a $VERSION-slitaz 31.30 } 31.31 31.32 post_remove() 31.33 { 31.34 - chroot "$1/" depmod -a $BASEVER-slitaz 31.35 + chroot "$root/" depmod -a $VERSION-slitaz 31.36 } 31.37
32.1 --- a/linux-input-tablet/receipt Tue Jan 28 05:56:16 2014 +0000 32.2 +++ b/linux-input-tablet/receipt Wed Jan 29 09:56:07 2014 +0100 32.3 @@ -2,7 +2,6 @@ 32.4 32.5 PACKAGE="linux-input-tablet" 32.6 VERSION="3.2.53" 32.7 -BASEVER="${VERSION:0:3}" 32.8 CATEGORY="base-system" 32.9 SHORT_DESC="The Linux kernel tablet input drivers." 32.10 MAINTAINER="rcx@zoominternet.net" 32.11 @@ -15,10 +14,9 @@ 32.12 genpkg_rules() 32.13 { 32.14 local path 32.15 - path=lib/modules/$BASEVER-slitaz/kernel 32.16 + path=lib/modules/$VERSION-slitaz/kernel 32.17 mkdir -p $fs/$path 32.18 - export src 32.19 - export _pkg 32.20 + export src install 32.21 $wanted_stuff/list_modules.sh drivers/input/tablet | while read module; do 32.22 dir=$path/$(dirname $module) 32.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 32.24 @@ -30,11 +28,11 @@ 32.25 # Post install/remove commands for Tazpkg. 32.26 post_install() 32.27 { 32.28 - chroot "$1/" depmod -a $BASEVER-slitaz 32.29 + chroot "$root/" depmod -a $VERSION-slitaz 32.30 } 32.31 32.32 post_remove() 32.33 { 32.34 - chroot "$1/" depmod -a $BASEVER-slitaz 32.35 + chroot "$root/" depmod -a $VERSION-slitaz 32.36 } 32.37
33.1 --- a/linux-input-touchscreen/receipt Tue Jan 28 05:56:16 2014 +0000 33.2 +++ b/linux-input-touchscreen/receipt Wed Jan 29 09:56:07 2014 +0100 33.3 @@ -2,7 +2,6 @@ 33.4 33.5 PACKAGE="linux-input-touchscreen" 33.6 VERSION="3.2.53" 33.7 -BASEVER="${VERSION:0:3}" 33.8 CATEGORY="base-system" 33.9 SHORT_DESC="The Linux kernel touchscreen input drivers." 33.10 MAINTAINER="jozee@slitaz.org" 33.11 @@ -15,10 +14,9 @@ 33.12 genpkg_rules() 33.13 { 33.14 local path 33.15 - path=lib/modules/$BASEVER-slitaz/kernel 33.16 + path=lib/modules/$VERSION-slitaz/kernel 33.17 mkdir -p $fs/$path 33.18 - export src 33.19 - export _pkg 33.20 + export src install 33.21 $wanted_stuff/list_modules.sh drivers/input/touchscreen | \ 33.22 while read module; do 33.23 dir=$path/$(dirname $module) 33.24 @@ -36,11 +34,11 @@ 33.25 # Post install/remove commands for Tazpkg. 33.26 post_install() 33.27 { 33.28 - chroot "$1/" depmod -a $BASEVER-slitaz 33.29 + chroot "$root/" depmod -a $VERSION-slitaz 33.30 } 33.31 33.32 post_remove() 33.33 { 33.34 - chroot "$1/" depmod -a $BASEVER-slitaz 33.35 + chroot "$root/" depmod -a $VERSION-slitaz 33.36 } 33.37
34.1 --- a/linux-ipv6/receipt Tue Jan 28 05:56:16 2014 +0000 34.2 +++ b/linux-ipv6/receipt Wed Jan 29 09:56:07 2014 +0100 34.3 @@ -2,7 +2,6 @@ 34.4 34.5 PACKAGE="linux-ipv6" 34.6 VERSION="3.2.53" 34.7 -BASEVER="${VERSION:0:3}" 34.8 CATEGORY="base-system" 34.9 SHORT_DESC="The Linux kernel ipv6 modules." 34.10 MAINTAINER="devel@slitaz.org" 34.11 @@ -15,10 +14,9 @@ 34.12 genpkg_rules() 34.13 { 34.14 local path 34.15 - path=lib/modules/$BASEVER-slitaz/kernel 34.16 + path=lib/modules/$VERSION-slitaz/kernel 34.17 mkdir -p $fs/$path 34.18 - export src 34.19 - export _pkg 34.20 + export src install 34.21 $wanted_stuff/list_modules.sh net/ipv6 | while read module; do 34.22 dir=$path/$(dirname $module) 34.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 34.24 @@ -35,11 +33,11 @@ 34.25 # Post install/remove commands for Tazpkg. 34.26 post_install() 34.27 { 34.28 - chroot "$1/" depmod -a $BASEVER-slitaz 34.29 + chroot "$root/" depmod -a $VERSION-slitaz 34.30 } 34.31 34.32 post_remove() 34.33 { 34.34 - chroot "$1/" depmod -a $BASEVER-slitaz 34.35 + chroot "$root/" depmod -a $VERSION-slitaz 34.36 } 34.37
35.1 --- a/linux-irda/receipt Tue Jan 28 05:56:16 2014 +0000 35.2 +++ b/linux-irda/receipt Wed Jan 29 09:56:07 2014 +0100 35.3 @@ -2,7 +2,6 @@ 35.4 35.5 PACKAGE="linux-irda" 35.6 VERSION="3.2.53" 35.7 -BASEVER="${VERSION:0:3}" 35.8 CATEGORY="base-system" 35.9 SHORT_DESC="The Linux kernel irda modules." 35.10 MAINTAINER="devel@slitaz.org" 35.11 @@ -15,11 +14,10 @@ 35.12 genpkg_rules() 35.13 { 35.14 local path 35.15 - path=lib/modules/$BASEVER-slitaz/kernel 35.16 + path=lib/modules/$VERSION-slitaz/kernel 35.17 mkdir -p $fs/$path 35.18 35.19 - export src 35.20 - export _pkg 35.21 + export src install 35.22 35.23 $wanted_stuff/list_modules.sh drivers/net/irda net/irda | while read module; do 35.24 dir=$path/$(dirname $module) 35.25 @@ -31,11 +29,11 @@ 35.26 # Post install/remove commands for Tazpkg. 35.27 post_install() 35.28 { 35.29 - chroot "$1/" depmod -a $BASEVER-slitaz 35.30 + chroot "$root/" depmod -a $VERSION-slitaz 35.31 } 35.32 35.33 post_remove() 35.34 { 35.35 - chroot "$1/" depmod -a $BASEVER-slitaz 35.36 + chroot "$root/" depmod -a $VERSION-slitaz 35.37 } 35.38
36.1 --- a/linux-isdn/receipt Tue Jan 28 05:56:16 2014 +0000 36.2 +++ b/linux-isdn/receipt Wed Jan 29 09:56:07 2014 +0100 36.3 @@ -2,7 +2,6 @@ 36.4 36.5 PACKAGE="linux-isdn" 36.6 VERSION="3.2.53" 36.7 -BASEVER="${VERSION:0:3}" 36.8 CATEGORY="base-system" 36.9 SHORT_DESC="The Linux kernel isdn modules." 36.10 MAINTAINER="devel@slitaz.org" 36.11 @@ -15,10 +14,9 @@ 36.12 genpkg_rules() 36.13 { 36.14 local path 36.15 - path=lib/modules/$BASEVER-slitaz/kernel 36.16 + path=lib/modules/$VERSION-slitaz/kernel 36.17 mkdir -p $fs/$path 36.18 - export src 36.19 - export _pkg 36.20 + export src install 36.21 $wanted_stuff/list_modules.sh drivers/isdn | while read module; do 36.22 dir=$path/$(dirname $module) 36.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 36.24 @@ -35,11 +33,11 @@ 36.25 # Post install/remove commands for Tazpkg. 36.26 post_install() 36.27 { 36.28 - chroot "$1/" depmod -a $BASEVER-slitaz 36.29 + chroot "$root/" depmod -a $VERSION-slitaz 36.30 } 36.31 36.32 post_remove() 36.33 { 36.34 - chroot "$1/" depmod -a $BASEVER-slitaz 36.35 + chroot "$root/" depmod -a $VERSION-slitaz 36.36 } 36.37
37.1 --- a/linux-jfs/receipt Tue Jan 28 05:56:16 2014 +0000 37.2 +++ b/linux-jfs/receipt Wed Jan 29 09:56:07 2014 +0100 37.3 @@ -2,7 +2,6 @@ 37.4 37.5 PACKAGE="linux-jfs" 37.6 VERSION="3.2.53" 37.7 -BASEVER="${VERSION:0:3}" 37.8 CATEGORY="base-system" 37.9 SHORT_DESC="The Linux kernel jfs module." 37.10 MAINTAINER="devel@slitaz.org" 37.11 @@ -16,10 +15,9 @@ 37.12 genpkg_rules() 37.13 { 37.14 local path 37.15 - path=lib/modules/$BASEVER-slitaz/kernel 37.16 + path=lib/modules/$VERSION-slitaz/kernel 37.17 mkdir -p $fs/$path $fs/etc 37.18 - export src 37.19 - export _pkg 37.20 + export src install 37.21 $wanted_stuff/list_modules.sh fs/jfs | while read module; do 37.22 dir=$path/$(dirname $module) 37.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 37.24 @@ -33,11 +31,11 @@ 37.25 { 37.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 37.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 37.28 - chroot "$1/" depmod -a $BASEVER-slitaz 37.29 + chroot "$root/" depmod -a $VERSION-slitaz 37.30 } 37.31 37.32 post_remove() 37.33 { 37.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 37.35 - chroot "$1/" depmod -a $BASEVER-slitaz 37.36 + chroot "$root/" depmod -a $VERSION-slitaz 37.37 }
38.1 --- a/linux-joystick/receipt Tue Jan 28 05:56:16 2014 +0000 38.2 +++ b/linux-joystick/receipt Wed Jan 29 09:56:07 2014 +0100 38.3 @@ -2,7 +2,6 @@ 38.4 38.5 PACKAGE="linux-joystick" 38.6 VERSION="3.2.53" 38.7 -BASEVER="${VERSION:0:3}" 38.8 CATEGORY="base-system" 38.9 SHORT_DESC="The Linux kernel joystick modules." 38.10 MAINTAINER="devel@slitaz.org" 38.11 @@ -15,10 +14,9 @@ 38.12 genpkg_rules() 38.13 { 38.14 local path 38.15 - path=lib/modules/$BASEVER-slitaz/kernel 38.16 + path=lib/modules/$VERSION-slitaz/kernel 38.17 mkdir -p $fs/$path 38.18 - export src 38.19 - export _pkg 38.20 + export src install 38.21 $wanted_stuff/list_modules.sh drivers/input/joystick drivers/input/gameport \ 38.22 drivers/input/input-polldev.ko.xz | \ 38.23 while read module; do 38.24 @@ -37,11 +35,11 @@ 38.25 # Post install/remove commands for Tazpkg. 38.26 post_install() 38.27 { 38.28 - chroot "$1/" depmod -a $BASEVER-slitaz 38.29 + chroot "$root/" depmod -a $VERSION-slitaz 38.30 } 38.31 38.32 post_remove() 38.33 { 38.34 - chroot "$1/" depmod -a $BASEVER-slitaz 38.35 + chroot "$root/" depmod -a $VERSION-slitaz 38.36 } 38.37
39.1 --- a/linux-kvm/receipt Tue Jan 28 05:56:16 2014 +0000 39.2 +++ b/linux-kvm/receipt Wed Jan 29 09:56:07 2014 +0100 39.3 @@ -2,7 +2,6 @@ 39.4 39.5 PACKAGE="linux-kvm" 39.6 VERSION="3.2.53" 39.7 -BASEVER="${VERSION:0:3}" 39.8 CATEGORY="base-system" 39.9 SHORT_DESC="The Linux kernel kvm and virtio modules." 39.10 MAINTAINER="devel@slitaz.org" 39.11 @@ -15,10 +14,9 @@ 39.12 genpkg_rules() 39.13 { 39.14 local path 39.15 - path=lib/modules/$BASEVER-slitaz/kernel 39.16 + path=lib/modules/$VERSION-slitaz/kernel 39.17 mkdir -p $fs/$path 39.18 - export src 39.19 - export _pkg 39.20 + export src install 39.21 $wanted_stuff/list_modules.sh arch/x86/kvm drivers/virtio drivers/lguest \ 39.22 drivers/char/hw_random/virtio-rng.ko.xz \ 39.23 drivers/net/virtio_net.ko.xz drivers/block/virtio_blk.ko.xz | \ 39.24 @@ -32,11 +30,11 @@ 39.25 # Post install/remove commands for Tazpkg. 39.26 post_install() 39.27 { 39.28 - chroot "$1/" depmod -a $BASEVER-slitaz 39.29 + chroot "$root/" depmod -a $VERSION-slitaz 39.30 } 39.31 39.32 post_remove() 39.33 { 39.34 - chroot "$1/" depmod -a $BASEVER-slitaz 39.35 + chroot "$root/" depmod -a $VERSION-slitaz 39.36 } 39.37
40.1 --- a/linux-logfs/receipt Tue Jan 28 05:56:16 2014 +0000 40.2 +++ b/linux-logfs/receipt Wed Jan 29 09:56:07 2014 +0100 40.3 @@ -2,7 +2,6 @@ 40.4 40.5 PACKAGE="linux-logfs" 40.6 VERSION="3.2.53" 40.7 -BASEVER="${VERSION:0:3}" 40.8 CATEGORY="base-system" 40.9 SHORT_DESC="The Linux kernel logfs module." 40.10 MAINTAINER="devel@slitaz.org" 40.11 @@ -16,10 +15,9 @@ 40.12 genpkg_rules() 40.13 { 40.14 local path 40.15 - path=lib/modules/$BASEVER-slitaz/kernel 40.16 + path=lib/modules/$VERSION-slitaz/kernel 40.17 mkdir -p $fs/$path $fs/etc 40.18 - export src 40.19 - export _pkg 40.20 + export src install 40.21 $wanted_stuff/list_modules.sh fs/${PACKAGE#*-} | while read module; do 40.22 dir=$path/$(dirname $module) 40.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 40.24 @@ -33,12 +31,12 @@ 40.25 { 40.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 40.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 40.28 - chroot "$1/" depmod -a $BASEVER-slitaz 40.29 + chroot "$root/" depmod -a $VERSION-slitaz 40.30 } 40.31 40.32 post_remove() 40.33 { 40.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 40.35 - chroot "$1/" depmod -a $BASEVER-slitaz 40.36 + chroot "$root/" depmod -a $VERSION-slitaz 40.37 } 40.38
41.1 --- a/linux-md/receipt Tue Jan 28 05:56:16 2014 +0000 41.2 +++ b/linux-md/receipt Wed Jan 29 09:56:07 2014 +0100 41.3 @@ -2,7 +2,6 @@ 41.4 41.5 PACKAGE="linux-md" 41.6 VERSION="3.2.53" 41.7 -BASEVER="${VERSION:0:3}" 41.8 CATEGORY="base-system" 41.9 SHORT_DESC="The Linux kernel md modules." 41.10 MAINTAINER="devel@slitaz.org" 41.11 @@ -16,10 +15,9 @@ 41.12 genpkg_rules() 41.13 { 41.14 local path 41.15 - path=lib/modules/$BASEVER-slitaz/kernel 41.16 + path=lib/modules/$VERSION-slitaz/kernel 41.17 mkdir -p $fs/$path 41.18 - export src 41.19 - export _pkg 41.20 + export src install 41.21 $wanted_stuff/list_modules.sh drivers/md | while read module; do 41.22 case "$module" in 41.23 crypto/*) continue;; 41.24 @@ -39,11 +37,11 @@ 41.25 # Post install/remove commands for Tazpkg. 41.26 post_install() 41.27 { 41.28 - chroot "$1/" depmod -a $BASEVER-slitaz 41.29 + chroot "$root/" depmod -a $VERSION-slitaz 41.30 } 41.31 41.32 post_remove() 41.33 { 41.34 - chroot "$1/" depmod -a $BASEVER-slitaz 41.35 + chroot "$root/" depmod -a $VERSION-slitaz 41.36 } 41.37
42.1 --- a/linux-media/receipt Tue Jan 28 05:56:16 2014 +0000 42.2 +++ b/linux-media/receipt Wed Jan 29 09:56:07 2014 +0100 42.3 @@ -2,7 +2,6 @@ 42.4 42.5 PACKAGE="linux-media" 42.6 VERSION="3.2.53" 42.7 -BASEVER="${VERSION:0:3}" 42.8 CATEGORY="base-system" 42.9 SHORT_DESC="The Linux kernel media modules." 42.10 MAINTAINER="slaxemulator@gmail.com" 42.11 @@ -12,7 +11,7 @@ 42.12 WEB_SITE="http://kernel.org" 42.13 42.14 # Modules paths and list 42.15 -MOD_PATH="lib/modules/$BASEVER-slitaz/kernel" 42.16 +MOD_PATH="lib/modules/$VERSION-slitaz/kernel" 42.17 MODULES="drivers/media drivers/mfd" 42.18 42.19 # Rules to gen a SliTaz package suitable for Tazpkg. 42.20 @@ -36,10 +35,10 @@ 42.21 # Post install/remove commands for Tazpkg. 42.22 post_install() 42.23 { 42.24 - chroot "$1/" depmod -a $BASEVER-slitaz 42.25 + chroot "$root/" depmod -a $VERSION-slitaz 42.26 } 42.27 42.28 post_remove() 42.29 { 42.30 - chroot "$1/" depmod -a $BASEVER-slitaz 42.31 + chroot "$root/" depmod -a $VERSION-slitaz 42.32 }
43.1 --- a/linux-memstick/receipt Tue Jan 28 05:56:16 2014 +0000 43.2 +++ b/linux-memstick/receipt Wed Jan 29 09:56:07 2014 +0100 43.3 @@ -2,7 +2,6 @@ 43.4 43.5 PACKAGE="linux-memstick" 43.6 VERSION="3.2.53" 43.7 -BASEVER="${VERSION:0:3}" 43.8 CATEGORY="base-system" 43.9 SHORT_DESC="The Linux kernel sony memory stick modules." 43.10 MAINTAINER="devel@slitaz.org" 43.11 @@ -15,11 +14,10 @@ 43.12 genpkg_rules() 43.13 { 43.14 local path 43.15 - path=lib/modules/$BASEVER-slitaz/kernel 43.16 + path=lib/modules/$VERSION-slitaz/kernel 43.17 mkdir -p $fs/$path 43.18 43.19 - export src 43.20 - export _pkg 43.21 + export src install 43.22 43.23 $wanted_stuff/list_modules.sh drivers/memstick | while read module; do 43.24 dir=$path/$(dirname $module) 43.25 @@ -37,11 +35,11 @@ 43.26 # Post install/remove commands for Tazpkg. 43.27 post_install() 43.28 { 43.29 - chroot "$1/" depmod -a $BASEVER-slitaz 43.30 + chroot "$root/" depmod -a $VERSION-slitaz 43.31 } 43.32 43.33 post_remove() 43.34 { 43.35 - chroot "$1/" depmod -a $BASEVER-slitaz 43.36 + chroot "$root/" depmod -a $VERSION-slitaz 43.37 } 43.38
44.1 --- a/linux-minix/receipt Tue Jan 28 05:56:16 2014 +0000 44.2 +++ b/linux-minix/receipt Wed Jan 29 09:56:07 2014 +0100 44.3 @@ -2,7 +2,6 @@ 44.4 44.5 PACKAGE="linux-minix" 44.6 VERSION="3.2.53" 44.7 -BASEVER="${VERSION:0:3}" 44.8 CATEGORY="base-system" 44.9 SHORT_DESC="The Linux kernel minix module." 44.10 MAINTAINER="devel@slitaz.org" 44.11 @@ -16,10 +15,9 @@ 44.12 genpkg_rules() 44.13 { 44.14 local path 44.15 - path=lib/modules/$BASEVER-slitaz/kernel 44.16 + path=lib/modules/$VERSION-slitaz/kernel 44.17 mkdir -p $fs/$path $fs/etc 44.18 - export src 44.19 - export _pkg 44.20 + export src install 44.21 $wanted_stuff/list_modules.sh fs/${PACKAGE#*-} | while read module; do 44.22 dir=$path/$(dirname $module) 44.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 44.24 @@ -33,12 +31,12 @@ 44.25 { 44.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 44.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 44.28 - chroot "$1/" depmod -a $BASEVER-slitaz 44.29 + chroot "$root/" depmod -a $VERSION-slitaz 44.30 } 44.31 44.32 post_remove() 44.33 { 44.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 44.35 - chroot "$1/" depmod -a $BASEVER-slitaz 44.36 + chroot "$root/" depmod -a $VERSION-slitaz 44.37 } 44.38
45.1 --- a/linux-mmc/receipt Tue Jan 28 05:56:16 2014 +0000 45.2 +++ b/linux-mmc/receipt Wed Jan 29 09:56:07 2014 +0100 45.3 @@ -2,7 +2,6 @@ 45.4 45.5 PACKAGE="linux-mmc" 45.6 VERSION="3.2.53" 45.7 -BASEVER="${VERSION:0:3}" 45.8 CATEGORY="base-system" 45.9 SHORT_DESC="The Linux kernel mmc modules (card reader)." 45.10 MAINTAINER="devel@slitaz.org" 45.11 @@ -15,10 +14,9 @@ 45.12 genpkg_rules() 45.13 { 45.14 local path 45.15 - path=lib/modules/$BASEVER-slitaz/kernel 45.16 + path=lib/modules/$VERSION-slitaz/kernel 45.17 mkdir -p $fs/$path 45.18 - export src 45.19 - export _pkg 45.20 + export src install 45.21 $wanted_stuff/list_modules.sh drivers/mmc drivers/misc/tifm_7xx1.ko.xz drivers/misc/iwmc3200top/iwmc3200top.ko.xz| \ 45.22 while read module; do 45.23 dir=$path/$(dirname $module) 45.24 @@ -36,11 +34,11 @@ 45.25 # Post install/remove commands for Tazpkg. 45.26 post_install() 45.27 { 45.28 - chroot "$1/" depmod -a $BASEVER-slitaz 45.29 + chroot "$root/" depmod -a $VERSION-slitaz 45.30 } 45.31 45.32 post_remove() 45.33 { 45.34 - chroot "$1/" depmod -a $BASEVER-slitaz 45.35 + chroot "$root/" depmod -a $VERSION-slitaz 45.36 } 45.37
46.1 --- a/linux-module-headers/receipt Tue Jan 28 05:56:16 2014 +0000 46.2 +++ b/linux-module-headers/receipt Wed Jan 29 09:56:07 2014 +0100 46.3 @@ -2,7 +2,6 @@ 46.4 46.5 PACKAGE="linux-module-headers" 46.6 VERSION="3.2.53" 46.7 -BASEVER="${VERSION:0:3}" 46.8 CATEGORY="development" 46.9 SHORT_DESC="Header files and scripts for building modules for linux kernel." 46.10 MAINTAINER="devel@slitaz.org" 46.11 @@ -10,14 +9,14 @@ 46.12 DEPENDS="slitaz-toolchain" 46.13 WANTED="linux" 46.14 WEB_SITE="http://kernel.org/" 46.15 -KVERSION=$BASEVER-slitaz 46.16 +KVERSION=$VERSION-slitaz 46.17 46.18 # Rules to gen a SliTaz package suitable for Tazpkg. 46.19 genpkg_rules() 46.20 { 46.21 local path 46.22 - _AUFSVER=`grep ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g'` 46.23 - AUFSDIR="$WOK/$WANTED/aufs-${_AUFSVER}" 46.24 + AUFSVER=$(grep ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g') 46.25 + AUFSDIR="$WOK/$WANTED/aufs-${AUFSVER}" 46.26 path=usr/src/linux-$KVERSION 46.27 mkdir -p $fs/lib/modules/$KVERSION 46.28 ln -sf /$path $fs/lib/modules/$KVERSION/build
47.1 --- a/linux-mwave/receipt Tue Jan 28 05:56:16 2014 +0000 47.2 +++ b/linux-mwave/receipt Wed Jan 29 09:56:07 2014 +0100 47.3 @@ -2,7 +2,6 @@ 47.4 47.5 PACKAGE="linux-mwave" 47.6 VERSION="3.2.53" 47.7 -BASEVER="${VERSION:0:3}" 47.8 CATEGORY="base-system" 47.9 SHORT_DESC="The Linux kernel ACP Modem driver module (for IBM Thinkpad)" 47.10 MAINTAINER="devel@slitaz.org" 47.11 @@ -15,10 +14,9 @@ 47.12 genpkg_rules() 47.13 { 47.14 local path 47.15 - path=lib/modules/$BASEVER-slitaz/kernel 47.16 + path=lib/modules/$VERSION-slitaz/kernel 47.17 mkdir -p $fs/$path 47.18 - export src 47.19 - export _pkg 47.20 + export src install 47.21 $wanted_stuff/list_modules.sh drivers/char/mwave | while read module; do 47.22 dir=$path/$(dirname $module) 47.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 47.24 @@ -29,11 +27,11 @@ 47.25 # Post install/remove commands for Tazpkg. 47.26 post_install() 47.27 { 47.28 - chroot "$1/" depmod -a $BASEVER-slitaz 47.29 + chroot "$root/" depmod -a $VERSION-slitaz 47.30 } 47.31 47.32 post_remove() 47.33 { 47.34 - chroot "$1/" depmod -a $BASEVER-slitaz 47.35 + chroot "$root/" depmod -a $VERSION-slitaz 47.36 } 47.37
48.1 --- a/linux-nbd/receipt Tue Jan 28 05:56:16 2014 +0000 48.2 +++ b/linux-nbd/receipt Wed Jan 29 09:56:07 2014 +0100 48.3 @@ -2,7 +2,6 @@ 48.4 48.5 PACKAGE="linux-nbd" 48.6 VERSION="3.2.53" 48.7 -BASEVER="${VERSION:0:3}" 48.8 CATEGORY="base-system" 48.9 SHORT_DESC="The Linux kernel network block device modules." 48.10 MAINTAINER="devel@slitaz.org" 48.11 @@ -15,10 +14,9 @@ 48.12 genpkg_rules() 48.13 { 48.14 local path 48.15 - path=lib/modules/$BASEVER-slitaz/kernel 48.16 + path=lib/modules/$VERSION-slitaz/kernel 48.17 mkdir -p $fs/$path 48.18 - export src 48.19 - export _pkg 48.20 + export src install 48.21 $wanted_stuff/list_modules.sh drivers/block/nbd.ko.xz \ 48.22 drivers/block/drbd/drbd.ko.xz | \ 48.23 while read module; do 48.24 @@ -31,11 +29,11 @@ 48.25 # Post install/remove commands for Tazpkg. 48.26 post_install() 48.27 { 48.28 - chroot "$1/" depmod -a $BASEVER-slitaz 48.29 + chroot "$root/" depmod -a $VERSION-slitaz 48.30 } 48.31 48.32 post_remove() 48.33 { 48.34 - chroot "$1/" depmod -a $BASEVER-slitaz 48.35 + chroot "$root/" depmod -a $VERSION-slitaz 48.36 } 48.37
49.1 --- a/linux-ncpfs/receipt Tue Jan 28 05:56:16 2014 +0000 49.2 +++ b/linux-ncpfs/receipt Wed Jan 29 09:56:07 2014 +0100 49.3 @@ -2,7 +2,6 @@ 49.4 49.5 PACKAGE="linux-ncpfs" 49.6 VERSION="3.2.53" 49.7 -BASEVER="${VERSION:0:3}" 49.8 CATEGORY="base-system" 49.9 SHORT_DESC="The Linux kernel ncpfs module." 49.10 MAINTAINER="devel@slitaz.org" 49.11 @@ -16,10 +15,9 @@ 49.12 genpkg_rules() 49.13 { 49.14 local path 49.15 - path=lib/modules/$BASEVER-slitaz/kernel 49.16 + path=lib/modules/$VERSION-slitaz/kernel 49.17 mkdir -p $fs/$path $fs/etc 49.18 - export src 49.19 - export _pkg 49.20 + export src install 49.21 $wanted_stuff/list_modules.sh fs/ncpfs | while read module; do 49.22 dir=$path/$(dirname $module) 49.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 49.24 @@ -33,12 +31,12 @@ 49.25 { 49.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 49.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 49.28 - chroot "$1/" depmod -a $BASEVER-slitaz 49.29 + chroot "$root/" depmod -a $VERSION-slitaz 49.30 } 49.31 49.32 post_remove() 49.33 { 49.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 49.35 - chroot "$1/" depmod -a $BASEVER-slitaz 49.36 + chroot "$root/" depmod -a $VERSION-slitaz 49.37 } 49.38
50.1 --- a/linux-netfilter/receipt Tue Jan 28 05:56:16 2014 +0000 50.2 +++ b/linux-netfilter/receipt Wed Jan 29 09:56:07 2014 +0100 50.3 @@ -2,7 +2,6 @@ 50.4 50.5 PACKAGE="linux-netfilter" 50.6 VERSION="3.2.53" 50.7 -BASEVER="${VERSION:0:3}" 50.8 CATEGORY="base-system" 50.9 SHORT_DESC="The Linux kernel netfilter modules." 50.10 MAINTAINER="devel@slitaz.org" 50.11 @@ -15,11 +14,10 @@ 50.12 genpkg_rules() 50.13 { 50.14 local path 50.15 - path=lib/modules/$BASEVER-slitaz/kernel 50.16 + path=lib/modules/$VERSION-slitaz/kernel 50.17 mkdir -p $fs/$path 50.18 50.19 - export src 50.20 - export _pkg 50.21 + export src install 50.22 50.23 $wanted_stuff/list_modules.sh net/netfilter net/ipv4/netfilter net/8021q | \ 50.24 while read module; do 50.25 @@ -39,11 +37,11 @@ 50.26 # Post install/remove commands for Tazpkg. 50.27 post_install() 50.28 { 50.29 - chroot "$1/" depmod -a $BASEVER-slitaz 50.30 + chroot "$root/" depmod -a $VERSION-slitaz 50.31 } 50.32 50.33 post_remove() 50.34 { 50.35 - chroot "$1/" depmod -a $BASEVER-slitaz 50.36 + chroot "$root/" depmod -a $VERSION-slitaz 50.37 } 50.38
51.1 --- a/linux-nfsd/receipt Tue Jan 28 05:56:16 2014 +0000 51.2 +++ b/linux-nfsd/receipt Wed Jan 29 09:56:07 2014 +0100 51.3 @@ -2,7 +2,6 @@ 51.4 51.5 PACKAGE="linux-nfsd" 51.6 VERSION="3.2.53" 51.7 -BASEVER="${VERSION:0:3}" 51.8 CATEGORY="base-system" 51.9 SHORT_DESC="The Linux kernel NFS server module." 51.10 MAINTAINER="devel@slitaz.org" 51.11 @@ -16,10 +15,9 @@ 51.12 genpkg_rules() 51.13 { 51.14 local path 51.15 - path=lib/modules/$BASEVER-slitaz/kernel 51.16 + path=lib/modules/$VERSION-slitaz/kernel 51.17 mkdir -p $fs/$path $fs/etc 51.18 - export src 51.19 - export _pkg 51.20 + export src install 51.21 $wanted_stuff/list_modules.sh fs/nfsd | while read module; do 51.22 dir=$path/$(dirname $module) 51.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 51.24 @@ -33,12 +31,12 @@ 51.25 { 51.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 51.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 51.28 - chroot "$1/" depmod -a $BASEVER-slitaz 51.29 + chroot "$root/" depmod -a $VERSION-slitaz 51.30 } 51.31 51.32 post_remove() 51.33 { 51.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 51.35 - chroot "$1/" depmod -a $BASEVER-slitaz 51.36 + chroot "$root/" depmod -a $VERSION-slitaz 51.37 } 51.38
52.1 --- a/linux-ocfs2/receipt Tue Jan 28 05:56:16 2014 +0000 52.2 +++ b/linux-ocfs2/receipt Wed Jan 29 09:56:07 2014 +0100 52.3 @@ -2,7 +2,6 @@ 52.4 52.5 PACKAGE="linux-ocfs2" 52.6 VERSION="3.2.53" 52.7 -BASEVER="${VERSION:0:3}" 52.8 CATEGORY="base-system" 52.9 SHORT_DESC="ocfs2 filesystem" 52.10 MAINTAINER="slaxemulator@gmail.com" 52.11 @@ -15,11 +14,10 @@ 52.12 genpkg_rules() 52.13 { 52.14 local path 52.15 - path=lib/modules/$BASEVER-slitaz/kernel 52.16 + path=lib/modules/$VERSION-slitaz/kernel 52.17 mkdir -p $fs/$path 52.18 52.19 - export src 52.20 - export _pkg 52.21 + export src install 52.22 52.23 $wanted_stuff/list_modules.sh fs/ocfs2 | while read module; do 52.24 dir=$path/$(dirname $module) 52.25 @@ -37,10 +35,10 @@ 52.26 # Post install/remove commands for Tazpkg. 52.27 post_install() 52.28 { 52.29 - chroot "$1/" depmod -a $BASEVER-slitaz 52.30 + chroot "$root/" depmod -a $VERSION-slitaz 52.31 } 52.32 52.33 post_remove() 52.34 { 52.35 - chroot "$1/" depmod -a $BASEVER-slitaz 52.36 + chroot "$root/" depmod -a $VERSION-slitaz 52.37 }
53.1 --- a/linux-radio/receipt Tue Jan 28 05:56:16 2014 +0000 53.2 +++ b/linux-radio/receipt Wed Jan 29 09:56:07 2014 +0100 53.3 @@ -2,7 +2,6 @@ 53.4 53.5 PACKAGE="linux-radio" 53.6 VERSION="3.2.53" 53.7 -BASEVER="${VERSION:0:3}" 53.8 CATEGORY="base-system" 53.9 SHORT_DESC="The Linux kernel radio modules." 53.10 MAINTAINER="slaxemulator@gmail.com" 53.11 @@ -15,11 +14,10 @@ 53.12 genpkg_rules() 53.13 { 53.14 local path 53.15 - path=lib/modules/$BASEVER-slitaz/kernel 53.16 + path=lib/modules/$VERSION-slitaz/kernel 53.17 mkdir -p $fs/$path 53.18 53.19 - export src 53.20 - export _pkg 53.21 + export src install 53.22 53.23 $wanted_stuff/list_modules.sh drivers/media/radio | while read module; do 53.24 dir=$path/$(dirname $module) 53.25 @@ -38,11 +36,11 @@ 53.26 # Post install/remove commands for Tazpkg. 53.27 post_install() 53.28 { 53.29 - chroot "$1/" depmod -a $BASEVER-slitaz 53.30 + chroot "$root/" depmod -a $VERSION-slitaz 53.31 } 53.32 53.33 post_remove() 53.34 { 53.35 - chroot "$1/" depmod -a $BASEVER-slitaz 53.36 + chroot "$root/" depmod -a $VERSION-slitaz 53.37 } 53.38
54.1 --- a/linux-reiserfs/receipt Tue Jan 28 05:56:16 2014 +0000 54.2 +++ b/linux-reiserfs/receipt Wed Jan 29 09:56:07 2014 +0100 54.3 @@ -2,7 +2,6 @@ 54.4 54.5 PACKAGE="linux-reiserfs" 54.6 VERSION="3.2.53" 54.7 -BASEVER="${VERSION:0:3}" 54.8 CATEGORY="base-system" 54.9 SHORT_DESC="The Linux kernel reiserfs module." 54.10 MAINTAINER="devel@slitaz.org" 54.11 @@ -16,10 +15,9 @@ 54.12 genpkg_rules() 54.13 { 54.14 local path 54.15 - path=lib/modules/$BASEVER-slitaz/kernel 54.16 + path=lib/modules/$VERSION-slitaz/kernel 54.17 mkdir -p $fs/$path $fs/etc 54.18 - export src 54.19 - export _pkg 54.20 + export src install 54.21 $wanted_stuff/list_modules.sh fs/reiserfs | while read module; do 54.22 dir=$path/$(dirname $module) 54.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 54.24 @@ -33,12 +31,12 @@ 54.25 { 54.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 54.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 54.28 - chroot "$1/" depmod -a $BASEVER-slitaz 54.29 + chroot "$root/" depmod -a $VERSION-slitaz 54.30 } 54.31 54.32 post_remove() 54.33 { 54.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 54.35 - chroot "$1/" depmod -a $BASEVER-slitaz 54.36 + chroot "$root/" depmod -a $VERSION-slitaz 54.37 } 54.38
55.1 --- a/linux-sched/receipt Tue Jan 28 05:56:16 2014 +0000 55.2 +++ b/linux-sched/receipt Wed Jan 29 09:56:07 2014 +0100 55.3 @@ -2,7 +2,6 @@ 55.4 55.5 PACKAGE="linux-sched" 55.6 VERSION="3.2.53" 55.7 -BASEVER="${VERSION:0:3}" 55.8 CATEGORY="base-system" 55.9 SHORT_DESC="The Linux kernel sched modules." 55.10 MAINTAINER="devel@slitaz.org" 55.11 @@ -15,11 +14,10 @@ 55.12 genpkg_rules() 55.13 { 55.14 local path 55.15 - path=lib/modules/$BASEVER-slitaz/kernel 55.16 + path=lib/modules/$VERSION-slitaz/kernel 55.17 mkdir -p $fs/$path 55.18 55.19 - export src 55.20 - export _pkg 55.21 + export src install 55.22 55.23 $wanted_stuff/list_modules.sh net/sched | while read module; do 55.24 dir=$path/$(dirname $module) 55.25 @@ -31,11 +29,11 @@ 55.26 # Post install/remove commands for Tazpkg. 55.27 post_install() 55.28 { 55.29 - chroot "$1/" depmod -a $BASEVER-slitaz 55.30 + chroot "$root/" depmod -a $VERSION-slitaz 55.31 } 55.32 55.33 post_remove() 55.34 { 55.35 - chroot "$1/" depmod -a $BASEVER-slitaz 55.36 + chroot "$root/" depmod -a $VERSION-slitaz 55.37 } 55.38
56.1 --- a/linux-scsi/receipt Tue Jan 28 05:56:16 2014 +0000 56.2 +++ b/linux-scsi/receipt Wed Jan 29 09:56:07 2014 +0100 56.3 @@ -2,7 +2,6 @@ 56.4 56.5 PACKAGE="linux-scsi" 56.6 VERSION="3.2.53" 56.7 -BASEVER="${VERSION:0:3}" 56.8 CATEGORY="base-system" 56.9 SHORT_DESC="The Linux kernel scsi modules." 56.10 MAINTAINER="devel@slitaz.org" 56.11 @@ -15,10 +14,9 @@ 56.12 genpkg_rules() 56.13 { 56.14 local path 56.15 - path=lib/modules/$BASEVER-slitaz/kernel 56.16 + path=lib/modules/$VERSION-slitaz/kernel 56.17 mkdir -p $fs/$path 56.18 - export src 56.19 - export _pkg 56.20 + export src install 56.21 $wanted_stuff/list_modules.sh drivers/scsi | while read module; do 56.22 dir=$path/$(dirname $module) 56.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 56.24 @@ -29,11 +27,11 @@ 56.25 # Post install/remove commands for Tazpkg. 56.26 post_install() 56.27 { 56.28 - chroot "$1/" depmod -a $BASEVER-slitaz 56.29 + chroot "$root/" depmod -a $VERSION-slitaz 56.30 } 56.31 56.32 post_remove() 56.33 { 56.34 - chroot "$1/" depmod -a $BASEVER-slitaz 56.35 + chroot "$root/" depmod -a $VERSION-slitaz 56.36 } 56.37
57.1 --- a/linux-sound/receipt Tue Jan 28 05:56:16 2014 +0000 57.2 +++ b/linux-sound/receipt Wed Jan 29 09:56:07 2014 +0100 57.3 @@ -2,7 +2,6 @@ 57.4 57.5 PACKAGE="linux-sound" 57.6 VERSION="3.2.53" 57.7 -BASEVER="${VERSION:0:3}" 57.8 CATEGORY="base-system" 57.9 SHORT_DESC="The Linux kernel sound modules." 57.10 MAINTAINER="devel@slitaz.org" 57.11 @@ -15,15 +14,16 @@ 57.12 genpkg_rules() 57.13 { 57.14 local path 57.15 - path=lib/modules/$BASEVER-slitaz/kernel 57.16 + path=lib/modules/$VERSION-slitaz/kernel 57.17 mkdir -p $fs/$path 57.18 - export src 57.19 - export _pkg 57.20 + export src install 57.21 $wanted_stuff/list_modules.sh sound | while read module; do 57.22 dir=$path/$(dirname $module) 57.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 57.24 cp -a $install/$path/$module $fs/$dir 57.25 done 57.26 + 57.27 + # Firmware 57.28 mkdir $fs/lib/firmware 57.29 for i in ess korg sun yamaha; do 57.30 cp -a $install/lib/firmware/$i $fs/lib/firmware 57.31 @@ -31,8 +31,8 @@ 57.32 57.33 for i in $(cat $wanted_stuff/modules.list); do 57.34 if [ -f $fs/$path/$i ]; then 57.35 - rm -f $fs/$path/$i 57.36 - fi 57.37 + rm -f $fs/$path/$i 57.38 + fi 57.39 done 57.40 57.41 } 57.42 @@ -40,11 +40,11 @@ 57.43 # Post install/remove commands for Tazpkg. 57.44 post_install() 57.45 { 57.46 - chroot "$1/" depmod -a $BASEVER-slitaz 57.47 + chroot "$root/" depmod -a $VERSION-slitaz 57.48 } 57.49 57.50 post_remove() 57.51 { 57.52 - chroot "$1/" depmod -a $BASEVER-slitaz 57.53 + chroot "$root/" depmod -a $VERSION-slitaz 57.54 } 57.55
58.1 --- a/linux-source/receipt Tue Jan 28 05:56:16 2014 +0000 58.2 +++ b/linux-source/receipt Wed Jan 29 09:56:07 2014 +0100 58.3 @@ -2,14 +2,13 @@ 58.4 58.5 PACKAGE="linux-source" 58.6 VERSION="3.2.53" 58.7 -BASEVER="${VERSION:0:3}" 58.8 CATEGORY="development" 58.9 SHORT_DESC="The Linux kernel source files." 58.10 MAINTAINER="devel@slitaz.org" 58.11 LICENSE="GPL2" 58.12 WANTED="linux" 58.13 WEB_SITE="http://www.kernel.org/" 58.14 -DEPENDS="linux slitaz-toolchain ncurses-dev perl busybox-boot" 58.15 +DEPENDS="linux slitaz-toolchain ncurses-dev perl" 58.16 58.17 # Rules to gen a SliTaz package suitable for Tazpkg. 58.18 genpkg_rules() 58.19 @@ -17,7 +16,7 @@ 58.20 local _AUFSVER=`grep ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g'` 58.21 local AUFSDIR="aufs-${_AUFSVER}" 58.22 mkdir -p $fs/usr/src/kernel-patches \ 58.23 - $fs/lib/modules/$BASEVER-slitaz \ 58.24 + $fs/lib/modules/$VERSION-slitaz \ 58.25 $fs/usr/bin $fs/usr/sbin 58.26 cp -a $WOK/$WANTED/source/slitaz $fs/usr/src/kernel-patches 58.27 cp -a $stuff/buildtaz $fs/usr/src/kernel-patches/slitaz 58.28 @@ -36,5 +35,5 @@ 58.29 $fs/usr/src/kernel-patches/slitaz/aufs2 58.30 fi 58.31 ln -s /usr/src/linux-$VERSION \ 58.32 - $fs/lib/modules/$BASEVER-slitaz/source 58.33 + $fs/lib/modules/$VERSION-slitaz/source 58.34 }
59.1 --- a/linux-source/stuff/get-linux-source Tue Jan 28 05:56:16 2014 +0000 59.2 +++ b/linux-source/stuff/get-linux-source Wed Jan 29 09:56:07 2014 +0100 59.3 @@ -41,7 +41,6 @@ 59.4 fi 59.5 59.6 cd /usr/src/linux-$VERSION 59.7 -cp /usr/share/boot/initrd initrd.cpio 59.8 while read patch_file; do 59.9 echo "Apply $patch_file" 59.10 patch -p1 < slitaz/$patch_file
60.1 --- a/linux-speakup/receipt Tue Jan 28 05:56:16 2014 +0000 60.2 +++ b/linux-speakup/receipt Wed Jan 29 09:56:07 2014 +0100 60.3 @@ -2,7 +2,6 @@ 60.4 60.5 PACKAGE="linux-speakup" 60.6 VERSION="3.2.53" 60.7 -BASEVER="${VERSION:0:3}" 60.8 CATEGORY="base-system" 60.9 SHORT_DESC="The Linux kernel Speakup modules." 60.10 MAINTAINER="erjo@slitaz.org" 60.11 @@ -15,10 +14,9 @@ 60.12 genpkg_rules() 60.13 { 60.14 local path 60.15 - path=lib/modules/$BASEVER-slitaz/kernel 60.16 + path=lib/modules/$VERSION-slitaz/kernel 60.17 mkdir -p $fs/$path 60.18 - export src 60.19 - export _pkg 60.20 + export src install 60.21 $wanted_stuff/list_modules.sh drivers/staging/speakup | while read module; do 60.22 dir=$path/$(dirname $module) 60.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 60.24 @@ -35,11 +33,11 @@ 60.25 # Post install/remove commands for Tazpkg. 60.26 post_install() 60.27 { 60.28 - chroot "$1/" depmod -a $BASEVER-slitaz 60.29 + chroot "$root/" depmod -a $VERSION-slitaz 60.30 } 60.31 60.32 post_remove() 60.33 { 60.34 - chroot "$1/" depmod -a $BASEVER-slitaz 60.35 + chroot "$root/" depmod -a $VERSION-slitaz 60.36 } 60.37
61.1 --- a/linux-squashfs/receipt Tue Jan 28 05:56:16 2014 +0000 61.2 +++ b/linux-squashfs/receipt Wed Jan 29 09:56:07 2014 +0100 61.3 @@ -2,7 +2,6 @@ 61.4 61.5 PACKAGE="linux-squashfs" 61.6 VERSION="3.2.53" 61.7 -BASEVER="${VERSION:0:3}" 61.8 CATEGORY="base-system" 61.9 SHORT_DESC="The Linux kernel squashfs module." 61.10 MAINTAINER="devel@slitaz.org" 61.11 @@ -17,10 +16,9 @@ 61.12 genpkg_rules() 61.13 { 61.14 local path 61.15 - path=lib/modules/$BASEVER-slitaz/kernel 61.16 + path=lib/modules/$VERSION-slitaz/kernel 61.17 mkdir -p $fs/$path $fs/etc 61.18 - export src 61.19 - export _pkg 61.20 + export src install 61.21 $wanted_stuff/list_modules.sh fs/squashfs | while read module; do 61.22 dir=$path/$(dirname $module) 61.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 61.24 @@ -34,12 +32,12 @@ 61.25 { 61.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 61.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 61.28 - chroot "$1/" depmod -a $BASEVER-slitaz 61.29 + chroot "$root/" depmod -a $VERSION-slitaz 61.30 } 61.31 61.32 post_remove() 61.33 { 61.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 61.35 - chroot "$1/" depmod -a $BASEVER-slitaz 61.36 + chroot "$root/" depmod -a $VERSION-slitaz 61.37 } 61.38
62.1 --- a/linux-staging/receipt Tue Jan 28 05:56:16 2014 +0000 62.2 +++ b/linux-staging/receipt Wed Jan 29 09:56:07 2014 +0100 62.3 @@ -2,7 +2,6 @@ 62.4 62.5 PACKAGE="linux-staging" 62.6 VERSION="3.2.53" 62.7 -BASEVER="${VERSION:0:3}" 62.8 CATEGORY="base-system" 62.9 SHORT_DESC="staging kernel modules" 62.10 MAINTAINER="slaxemulator@gmail.com" 62.11 @@ -15,11 +14,10 @@ 62.12 genpkg_rules() 62.13 { 62.14 local path 62.15 - path=lib/modules/$BASEVER-slitaz/kernel 62.16 + path=lib/modules/$VERSION-slitaz/kernel 62.17 mkdir -p $fs/$path 62.18 62.19 - export src 62.20 - export _pkg 62.21 + export src install 62.22 62.23 $wanted_stuff/list_modules.sh drivers/staging | while read module; do 62.24 dir=$path/$(dirname $module) 62.25 @@ -37,10 +35,10 @@ 62.26 # Post install/remove commands for Tazpkg. 62.27 post_install() 62.28 { 62.29 - chroot "$1/" depmod -a $BASEVER-slitaz 62.30 + chroot "$root/" depmod -a $VERSION-slitaz 62.31 } 62.32 62.33 post_remove() 62.34 { 62.35 - chroot "$1/" depmod -a $BASEVER-slitaz 62.36 + chroot "$root/" depmod -a $VERSION-slitaz 62.37 }
63.1 --- a/linux-toshiba/receipt Tue Jan 28 05:56:16 2014 +0000 63.2 +++ b/linux-toshiba/receipt Wed Jan 29 09:56:07 2014 +0100 63.3 @@ -2,7 +2,6 @@ 63.4 63.5 PACKAGE="linux-toshiba" 63.6 VERSION="3.2.53" 63.7 -BASEVER="${VERSION:0:3}" 63.8 CATEGORY="base-system" 63.9 SHORT_DESC="The Linux kernel toshiba module." 63.10 MAINTAINER="devel@slitaz.org" 63.11 @@ -12,7 +11,7 @@ 63.12 WEB_SITE="http://www.kernel.org/" 63.13 63.14 # Modules paths and list 63.15 -MOD_PATH="lib/modules/$BASEVER-slitaz/kernel" 63.16 +MOD_PATH="lib/modules/$VERSION-slitaz/kernel" 63.17 MODULES="drivers/char/toshiba.ko.xz" 63.18 63.19 # Rules to gen a SliTaz package suitable for Tazpkg. 63.20 @@ -30,10 +29,10 @@ 63.21 # Post install/remove commands for Tazpkg. 63.22 post_install() 63.23 { 63.24 - chroot "$1/" depmod -a $BASEVER-slitaz 63.25 + chroot "$root/" depmod -a $VERSION-slitaz 63.26 } 63.27 63.28 post_remove() 63.29 { 63.30 - chroot "$1/" depmod -a $BASEVER-slitaz 63.31 + chroot "$root/" depmod -a $VERSION-slitaz 63.32 }
64.1 --- a/linux-usb-misc/receipt Tue Jan 28 05:56:16 2014 +0000 64.2 +++ b/linux-usb-misc/receipt Wed Jan 29 09:56:07 2014 +0100 64.3 @@ -2,7 +2,6 @@ 64.4 64.5 PACKAGE="linux-usb-misc" 64.6 VERSION="3.2.53" 64.7 -BASEVER="${VERSION:0:3}" 64.8 CATEGORY="base-system" 64.9 SHORT_DESC="The Linux kernel misc. USB drivers, including the Lego USB tower." 64.10 MAINTAINER="rcx@zoominternet.net" 64.11 @@ -15,10 +14,9 @@ 64.12 genpkg_rules() 64.13 { 64.14 local path 64.15 - path=lib/modules/$BASEVER-slitaz/kernel 64.16 + path=lib/modules/$VERSION-slitaz/kernel 64.17 mkdir -p $fs/$path 64.18 - export src 64.19 - export _pkg 64.20 + export src install 64.21 $wanted_stuff/list_modules.sh drivers/usb/misc | while read module; do 64.22 dir=$path/$(dirname $module) 64.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 64.24 @@ -30,11 +28,11 @@ 64.25 # Post install/remove commands for Tazpkg. 64.26 post_install() 64.27 { 64.28 - chroot "$1/" depmod -a $BASEVER-slitaz 64.29 + chroot "$root/" depmod -a $VERSION-slitaz 64.30 } 64.31 64.32 post_remove() 64.33 { 64.34 - chroot "$1/" depmod -a $BASEVER-slitaz 64.35 + chroot "$root/" depmod -a $VERSION-slitaz 64.36 } 64.37
65.1 --- a/linux-usbdsl/receipt Tue Jan 28 05:56:16 2014 +0000 65.2 +++ b/linux-usbdsl/receipt Wed Jan 29 09:56:07 2014 +0100 65.3 @@ -2,7 +2,6 @@ 65.4 65.5 PACKAGE="linux-usbdsl" 65.6 VERSION="3.2.53" 65.7 -BASEVER="${VERSION:0:3}" 65.8 CATEGORY="base-system" 65.9 SHORT_DESC="The Linux kernel usb dsl modem modules." 65.10 MAINTAINER="devel@slitaz.org" 65.11 @@ -15,11 +14,10 @@ 65.12 genpkg_rules() 65.13 { 65.14 local path 65.15 - path=lib/modules/$BASEVER-slitaz/kernel 65.16 + path=lib/modules/$VERSION-slitaz/kernel 65.17 mkdir -p $fs/$path 65.18 65.19 - export src 65.20 - export _pkg 65.21 + export src install 65.22 65.23 $wanted_stuff/list_modules.sh drivers/usb/atm net/atm | \ 65.24 while read module; do 65.25 @@ -32,11 +30,11 @@ 65.26 # Post install/remove commands for Tazpkg. 65.27 post_install() 65.28 { 65.29 - chroot "$1/" depmod -a $BASEVER-slitaz 65.30 + chroot "$root/" depmod -a $VERSION-slitaz 65.31 } 65.32 65.33 post_remove() 65.34 { 65.35 - chroot "$1/" depmod -a $BASEVER-slitaz 65.36 + chroot "$root/" depmod -a $VERSION-slitaz 65.37 } 65.38
66.1 --- a/linux-usbip/receipt Tue Jan 28 05:56:16 2014 +0000 66.2 +++ b/linux-usbip/receipt Wed Jan 29 09:56:07 2014 +0100 66.3 @@ -2,7 +2,6 @@ 66.4 66.5 PACKAGE="linux-usbip" 66.6 VERSION="3.2.53" 66.7 -BASEVER="${VERSION:0:3}" 66.8 CATEGORY="base-system" 66.9 SHORT_DESC="The Linux kernel usbip module." 66.10 MAINTAINER="devel@slitaz.org" 66.11 @@ -16,10 +15,9 @@ 66.12 genpkg_rules() 66.13 { 66.14 local path 66.15 - path=lib/modules/$BASEVER-slitaz/kernel 66.16 + path=lib/modules/$VERSION-slitaz/kernel 66.17 mkdir -p $fs/$path 66.18 - export src 66.19 - export _pkg 66.20 + export src install 66.21 $wanted_stuff/list_modules.sh drivers/staging/usbip | while read module; do 66.22 dir=$path/$(dirname $module) 66.23 [ -d $fs/$dir ] || mkdir -p $fs/$dir 66.24 @@ -32,12 +30,12 @@ 66.25 { 66.26 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 66.27 echo "${PACKAGE#*-}" >> $1/etc/filesystems 66.28 - chroot "$1/" depmod -a $BASEVER-slitaz 66.29 + chroot "$root/" depmod -a $VERSION-slitaz 66.30 } 66.31 66.32 post_remove() 66.33 { 66.34 sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems 66.35 - chroot "$1/" depmod -a $BASEVER-slitaz 66.36 + chroot "$root/" depmod -a $VERSION-slitaz 66.37 } 66.38
67.1 --- a/linux-uwb/receipt Tue Jan 28 05:56:16 2014 +0000 67.2 +++ b/linux-uwb/receipt Wed Jan 29 09:56:07 2014 +0100 67.3 @@ -2,7 +2,6 @@ 67.4 67.5 PACKAGE="linux-uwb" 67.6 VERSION="3.2.53" 67.7 -BASEVER="${VERSION:0:3}" 67.8 CATEGORY="base-system" 67.9 SHORT_DESC="The Linux kernel uwb modules." 67.10 MAINTAINER="devel@slitaz.org" 67.11 @@ -15,11 +14,10 @@ 67.12 genpkg_rules() 67.13 { 67.14 local path 67.15 - path=lib/modules/$BASEVER-slitaz/kernel 67.16 + path=lib/modules/$VERSION-slitaz/kernel 67.17 mkdir -p $fs/$path 67.18 67.19 - export src 67.20 - export _pkg 67.21 + export src install 67.22 67.23 $wanted_stuff/list_modules.sh drivers/uwb drivers/usb/wusbcore \ 67.24 drivers/usb/host/whci | while read module; do 67.25 @@ -32,11 +30,11 @@ 67.26 # Post install/remove commands for Tazpkg. 67.27 post_install() 67.28 { 67.29 - chroot "$1/" depmod -a $BASEVER-slitaz 67.30 + chroot "$root/" depmod -a $VERSION-slitaz 67.31 } 67.32 67.33 post_remove() 67.34 { 67.35 - chroot "$1/" depmod -a $BASEVER-slitaz 67.36 + chroot "$root/" depmod -a $VERSION-slitaz 67.37 } 67.38
68.1 --- a/linux-video/receipt Tue Jan 28 05:56:16 2014 +0000 68.2 +++ b/linux-video/receipt Wed Jan 29 09:56:07 2014 +0100 68.3 @@ -2,7 +2,6 @@ 68.4 68.5 PACKAGE="linux-video" 68.6 VERSION="3.2.53" 68.7 -BASEVER="${VERSION:0:3}" 68.8 CATEGORY="base-system" 68.9 SHORT_DESC="The Linux kernel video modules." 68.10 MAINTAINER="devel@slitaz.org" 68.11 @@ -12,7 +11,7 @@ 68.12 WEB_SITE="http://www.kernel.org/" 68.13 68.14 # Modules paths and list 68.15 -MOD_PATH="lib/modules/$BASEVER-slitaz/kernel" 68.16 +MOD_PATH="lib/modules/$VERSION-slitaz/kernel" 68.17 MODULES="drivers/video/backlight" 68.18 68.19 # Rules to gen a SliTaz package suitable for Tazpkg. 68.20 @@ -30,11 +29,11 @@ 68.21 # Post install/remove commands for Tazpkg. 68.22 post_install() 68.23 { 68.24 - chroot "$1/" depmod -a $BASEVER-slitaz 68.25 + chroot "$root/" depmod -a $VERSION-slitaz 68.26 } 68.27 68.28 post_remove() 68.29 { 68.30 - chroot "$1/" depmod -a $BASEVER-slitaz 68.31 + chroot "$root/" depmod -a $VERSION-slitaz 68.32 } 68.33
69.1 --- a/linux-wan/receipt Tue Jan 28 05:56:16 2014 +0000 69.2 +++ b/linux-wan/receipt Wed Jan 29 09:56:07 2014 +0100 69.3 @@ -2,7 +2,6 @@ 69.4 69.5 PACKAGE="linux-wan" 69.6 VERSION="3.2.53" 69.7 -BASEVER="${VERSION:0:3}" 69.8 CATEGORY="base-system" 69.9 SHORT_DESC="Wide Area Networks (WANs) kernel modules" 69.10 MAINTAINER="slaxemulator@gmail.com" 69.11 @@ -15,11 +14,10 @@ 69.12 genpkg_rules() 69.13 { 69.14 local path 69.15 - path=lib/modules/$BASEVER-slitaz/kernel 69.16 + path=lib/modules/$VERSION-slitaz/kernel 69.17 mkdir -p $fs/$path 69.18 69.19 - export src 69.20 - export _pkg 69.21 + export src install 69.22 69.23 $wanted_stuff/list_modules.sh drivers/net/wan | while read module; do 69.24 dir=$path/$(dirname $module) 69.25 @@ -37,10 +35,10 @@ 69.26 # Post install/remove commands for Tazpkg. 69.27 post_install() 69.28 { 69.29 - chroot "$1/" depmod -a $BASEVER-slitaz 69.30 + chroot "$root/" depmod -a $VERSION-slitaz 69.31 } 69.32 69.33 post_remove() 69.34 { 69.35 - chroot "$1/" depmod -a $BASEVER-slitaz 69.36 + chroot "$root/" depmod -a $VERSION-slitaz 69.37 }
70.1 --- a/linux-wimax/receipt Tue Jan 28 05:56:16 2014 +0000 70.2 +++ b/linux-wimax/receipt Wed Jan 29 09:56:07 2014 +0100 70.3 @@ -2,7 +2,6 @@ 70.4 70.5 PACKAGE="linux-wimax" 70.6 VERSION="3.2.53" 70.7 -BASEVER="${VERSION:0:3}" 70.8 CATEGORY="base-system" 70.9 SHORT_DESC="The Linux kernel wimax modules." 70.10 MAINTAINER="devel@slitaz.org" 70.11 @@ -15,11 +14,10 @@ 70.12 genpkg_rules() 70.13 { 70.14 local path 70.15 - path=lib/modules/$BASEVER-slitaz/kernel 70.16 + path=lib/modules/$VERSION-slitaz/kernel 70.17 mkdir -p $fs/$path 70.18 70.19 - export src 70.20 - export _pkg 70.21 + export src install 70.22 70.23 $wanted_stuff/list_modules.sh drivers/net/wimax net/wimax | while read module; do 70.24 dir=$path/$(dirname $module) 70.25 @@ -37,11 +35,11 @@ 70.26 # Post install/remove commands for Tazpkg. 70.27 post_install() 70.28 { 70.29 - chroot "$1/" depmod -a $BASEVER-slitaz 70.30 + chroot "$root/" depmod -a $VERSION-slitaz 70.31 } 70.32 70.33 post_remove() 70.34 { 70.35 - chroot "$1/" depmod -a $BASEVER-slitaz 70.36 + chroot "$root/" depmod -a $VERSION-slitaz 70.37 } 70.38
71.1 --- a/linux-wireless/receipt Tue Jan 28 05:56:16 2014 +0000 71.2 +++ b/linux-wireless/receipt Wed Jan 29 09:56:07 2014 +0100 71.3 @@ -2,7 +2,6 @@ 71.4 71.5 PACKAGE="linux-wireless" 71.6 VERSION="3.2.53" 71.7 -BASEVER="${VERSION:0:3}" 71.8 CATEGORY="base-system" 71.9 SHORT_DESC="The Linux kernel wireless modules." 71.10 MAINTAINER="devel@slitaz.org" 71.11 @@ -15,11 +14,10 @@ 71.12 genpkg_rules() 71.13 { 71.14 local path 71.15 - path=lib/modules/$BASEVER-slitaz/kernel 71.16 + path=lib/modules/$VERSION-slitaz/kernel 71.17 mkdir -p $fs/$path 71.18 71.19 - export src 71.20 - export _pkg 71.21 + export src install 71.22 71.23 $wanted_stuff/list_modules.sh drivers/net/wireless drivers/staging/wlan-ng \ 71.24 drivers/staging/echo drivers/leds net/wireless net/mac80211 \ 71.25 @@ -42,11 +40,11 @@ 71.26 # Post install/remove commands for Tazpkg. 71.27 post_install() 71.28 { 71.29 - chroot "$1/" depmod -a $BASEVER-slitaz 71.30 + chroot "$root/" depmod -a $VERSION-slitaz 71.31 } 71.32 71.33 post_remove() 71.34 { 71.35 - chroot "$1/" depmod -a $BASEVER-slitaz 71.36 + chroot "$root/" depmod -a $VERSION-slitaz 71.37 } 71.38
72.1 --- a/linux-without-modules/receipt Tue Jan 28 05:56:16 2014 +0000 72.2 +++ b/linux-without-modules/receipt Wed Jan 29 09:56:07 2014 +0100 72.3 @@ -2,7 +2,6 @@ 72.4 72.5 PACKAGE="linux-without-modules" 72.6 VERSION="3.2.53" 72.7 -BASEVER="${VERSION:0:3}" 72.8 CATEGORY="base-system" 72.9 SHORT_DESC="The Linux kernel without module support." 72.10 MAINTAINER="devel@slitaz.org"
73.1 --- a/linux-zram/receipt Tue Jan 28 05:56:16 2014 +0000 73.2 +++ b/linux-zram/receipt Wed Jan 29 09:56:07 2014 +0100 73.3 @@ -2,7 +2,6 @@ 73.4 73.5 PACKAGE="linux-zram" 73.6 VERSION="3.2.53" 73.7 -BASEVER="${VERSION:0:3}" 73.8 CATEGORY="base-system" 73.9 SHORT_DESC="Compressed caching" 73.10 MAINTAINER="devel@slitaz.org" 73.11 @@ -17,10 +16,9 @@ 73.12 genpkg_rules() 73.13 { 73.14 local path 73.15 - path=lib/modules/$BASEVER-slitaz/kernel 73.16 + path=lib/modules/$VERSION-slitaz/kernel 73.17 mkdir -p $fs/$path $fs/etc/init.d 73.18 - export src 73.19 - export _pkg 73.20 + export src install 73.21 $wanted_stuff/list_modules.sh drivers/staging/zram | \ 73.22 while read module; do 73.23 dir=$path/$(dirname $module) 73.24 @@ -34,11 +32,11 @@ 73.25 # Post install/remove commands for Tazpkg. 73.26 post_install() 73.27 { 73.28 - chroot "$1/" depmod -a $BASEVER-slitaz 73.29 + chroot "$root/" depmod -a $VERSION-slitaz 73.30 } 73.31 73.32 post_remove() 73.33 { 73.34 - chroot "$1/" depmod -a $BASEVER-slitaz 73.35 + chroot "$root/" depmod -a $VERSION-slitaz 73.36 } 73.37
74.1 --- a/linux/receipt Tue Jan 28 05:56:16 2014 +0000 74.2 +++ b/linux/receipt Wed Jan 29 09:56:07 2014 +0100 74.3 @@ -2,40 +2,45 @@ 74.4 74.5 PACKAGE="linux" 74.6 VERSION="3.2.53" 74.7 -KBASEVER="${VERSION:0:3}" 74.8 CATEGORY="base-system" 74.9 SHORT_DESC="The Linux kernel and modules." 74.10 MAINTAINER="devel@slitaz.org" 74.11 LICENSE="GPL2" 74.12 -TARBALL="$PACKAGE-$KBASEVER.tar.xz" 74.13 +TARBALL="$PACKAGE-$VERSION.tar.xz" 74.14 WEB_SITE="http://www.kernel.org/" 74.15 WGET_URL="ftp://ftp.kernel.org/pub/linux/kernel/v3.0/$TARBALL" 74.16 HOST_ARCH="i486 arm x86_64" 74.17 74.18 -DEPENDS="" 74.19 -BUILD_DEPENDS="slitaz-toolchain perl git xz lzma patch \ 74.20 +DEPENDS="kmod" 74.21 +BUILD_DEPENDS="slitaz-toolchain perl git xz lzma patch kmod \ 74.22 uclibc-cross-compiler-x86_64 busybox-boot" 74.23 74.24 -# Use version patch so we dont dl full kernel source on each minor update 74.25 -[ "$KBASEVER" != "$VERSION" ] && 74.26 -PATCH="$(dirname $WGET_URL)/patch-$VERSION.xz" && 74.27 -EXTRA_SOURCE_FILES="$(basename $PATCH)" 74.28 +# 74.29 +# The Linux receipt handle cross compilation. For x86_64 we actually use 74.30 +# the uclibc-cross-compiler-x86_64 and for ARM we use a real cross env. 74.31 +# Please discuss any change and keep it simple, dont play with VERSION 74.32 +# string or Kernel SUBLEVEL because depmod and Pankso dont like that! 74.33 +# 74.34 +# The receipt also handle some cook options for faster build: 74.35 +# --nox64 : Skip the x86_64 cross compilation 74.36 +# --nonomods : Skip bzImage without modules build 74.37 +# 74.38 74.39 # Aufs enable chroot 74.40 AUFS_NOT_RAMFS="uclibc-cross-compiler-x86_64 is not compatible with aufs+tmpfs 8(" 74.41 74.42 -# This will save/restore modules.dep but we want to regenerate it on 74.43 -# install or upgrade. 74.44 -#CONFIG_FILES="/lib/modules/$KBASEVER-slitaz/modules.dep" 74.45 - 74.46 # Handle multiarch compilation. Less bdeps when cross-compiling for ARM 74.47 case "$ARCH" in 74.48 - arm) BUILD_DEPENDS="xz" TARBALL="$PACKAGE-$VERSION.tar.bz2" ;; 74.49 + arm) BUILD_DEPENDS="xz" ;; 74.50 x86_64) BUILD_DEPENDS="xz" ;; 74.51 esac 74.52 74.53 -# TODO: slitaz.conf provide SLITAZ_ARCH and must be handled by tazpkg/spk 74.54 -[ -f "$root/etc/slitaz/slitaz.conf" ] && . $root/etc/slitaz/slitaz.conf 74.55 +# Handle multiarch installation. ARM use Busybox modutils, so avoid any 74.56 +# deps on kmod. SLITAZ_ARCH can have also custom post_install commands 74.57 +. $root/etc/slitaz/slitaz.conf || exit 1 74.58 +case "$SLITAZ_ARCH" in 74.59 + arm) DEPENDS="" ;; 74.60 +esac 74.61 74.62 # Rules to configure and make the package. 74.63 compile_rules() 74.64 @@ -43,28 +48,14 @@ 74.65 cd $src 74.66 cp /usr/share/boot/initrd initrd.cpio 74.67 74.68 - if [ "$KBASEVER" != "$VERSION" ]; then 74.69 - [ -s $SRC/$(basename $PATCH) ] || 74.70 - wget $PATCH -O $SRC/$(basename $PATCH) 74.71 - xzcat $SRC/$(basename $PATCH) | patch -Np1 74.72 - touch done.patch-$VERSION 74.73 - fi 74.74 - 74.75 + # Handle cross compilation 74.76 case "$ARCH" in 74.77 arm) 74.78 - echo "Compiling: ARM Kernel" 74.79 - if [ ! -s $SRC/$(basename $PATCH) ]; then 74.80 - wget $PATCH -O $SRC/$(basename $PATCH) 74.81 - fi 74.82 + echo "Compiling: $ARCH Kernel" 74.83 make mrproper 74.84 - # Buggy: we got kernel panic about module not tinted 3.2.14 74.85 - #echo "Applying patch: $(basename $PATCH)" 74.86 - #xzcat $SRC/$(basename $PATCH) | patch -Np1 >/dev/null 74.87 patch -Np1 < $stuff/$ARCH/linux-arm.patch || exit 1 74.88 cp -f $stuff/$ARCH/linux-arm.config .config 74.89 - echo "Configure $ARCH kernel..." 74.90 yes '' | make ARCH=$ARCH oldconfig 74.91 - echo "Build $ARCH kernel..." 74.92 make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- bzImage && 74.93 make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- modules && 74.94 make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- \ 74.95 @@ -79,34 +70,25 @@ 74.96 return 0 ;; 74.97 esac 74.98 74.99 - [ ! -x /usr/bin/cook ] && report open-bloc 74.100 - 74.101 - # Check for Aufs and cook it if unbuilt. 74.102 + # Check for Aufs and get source/patches if needed 74.103 echo "Checking for Aufs packages..." 74.104 - _AUFSVER=`grep ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g'` 74.105 - if [ -x /usr/bin/cook ]; then 74.106 - # Give info an redirect to /dev/null since aufs got it own log. 74.107 - AUFSDIR=$WOK/aufs/source/aufs-${_AUFSVER} 74.108 - [ -d "$AUFSDIR" ] && rm -rf $AUFSDIR 74.109 - #echo "Cook: aufs $_AUFSVER" 74.110 - cook aufs --getsrc 74.111 + AUFSVER=$(grep ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g') 74.112 + AUFSDIR="$WOK/aufs/source/aufs-${AUFSVER}" 74.113 + if [ ! -d "$AUFSDIR" ]; then 74.114 + [ ! -f "$SRC/aufs-${AUFSVER}.tar.bz2" ] && cook aufs --getsrc 74.115 mkdir -p $WOK/aufs/source/ 74.116 - tar xjf $SRC/aufs-${_AUFSVER}.tar.bz2 -C $WOK/aufs/source/ 74.117 - elif [ -x /usr/bin/tazwok ]; then 74.118 - # we just need aufs source. Also cooking now is a bad idea since it 74.119 - # needs linux-module-headers. The one your cooking not the one from the web. 74.120 - AUFSDIR=$WOK/aufs/aufs-${_AUFSVER} 74.121 - [ -d "$AUFSDIR" ] && rm -rf $AUFSDIR 74.122 - tazwok get-src aufs --target=$AUFSDIR || { report close-bloc; return 1; } 74.123 + echo "Extracting: aufs-${AUFSVER}.tar.bz2" 74.124 + tar xjf $SRC/aufs-${AUFSVER}.tar.bz2 -C $WOK/aufs/source/ 74.125 fi 74.126 + 74.127 echo "cook:linux" > $command 74.128 74.129 echo "Copying Aufs files and patches..." 74.130 cp -a $AUFSDIR/Documentation $AUFSDIR/fs $AUFSDIR/include $src 74.131 cp -a $AUFSDIR/aufs3-*.patch $stuff 74.132 74.133 - # SliTaz db 74.134 - [ -d $WOK/$PACKAGE/source/slitaz ] && rm -rf $WOK/$PACKAGE/source/slitaz 2> /dev/null 74.135 + # SliTaz db stuff 74.136 + [ -d $WOK/$PACKAGE/source/slitaz ] && rm -rf $WOK/$PACKAGE/source/slitaz 74.137 mkdir -p $WOK/$PACKAGE/source/slitaz 74.138 echo "$WGET_URL" > $WOK/$PACKAGE/source/slitaz/url 74.139 cp $stuff/gztazmod.sh $stuff/list_modules.sh $WOK/$PACKAGE/source/slitaz 74.140 @@ -118,15 +100,10 @@ 74.141 echo "$patch_file" >> $WOK/$PACKAGE/source/slitaz/patches 74.142 cp $stuff/$patch_file $WOK/$PACKAGE/source/slitaz 74.143 if [ -f done.$patch_file ]; then 74.144 - echo "Skipping $patch_file" 74.145 - continue 74.146 + echo "Skipping $patch_file" && continue 74.147 fi 74.148 echo "Apply $patch_file" 74.149 - if [ -x /usr/bin/cook ]; then 74.150 - patch -p1 < $WOK/$PACKAGE/source/slitaz/$patch_file || return 1 74.151 - elif [ -x /usr/bin/tazwok ]; then 74.152 - patch -p1 < $WOK/$PACKAGE/source/slitaz/$patch_file || { report close-bloc; return 1; } 74.153 - fi 74.154 + patch -p1 < $WOK/$PACKAGE/source/slitaz/$patch_file || return 1 74.155 touch done.$patch_file 74.156 done <<EOT 74.157 $PACKAGE-diff.u 74.158 @@ -141,129 +118,103 @@ 74.159 channel-negative-one-maxim.patch 74.160 mac80211.compat08082009.wl_frag+ack_v1.patch 74.161 EOT 74.162 - 74.163 - sed -i 's|SUBLEVEL =.*|SUBLEVEL =|g' Makefile 74.164 - 74.165 - [ ! -x /usr/bin/cook ] && report step "Make kernel proper and then build lguest" 74.166 - [ -x /usr/bin/cook ] && echo "Make kernel proper and then build lguest" 74.167 + 74.168 + # Mrproper and lguest 74.169 + echo "Make kernel proper and then build lguest..." 74.170 make mrproper 74.171 cd Documentation/virtual/lguest 74.172 - if [ -x /usr/bin/cook ]; then 74.173 - make lguest || return 1 74.174 - elif [ -x /usr/bin/tazwok ]; then 74.175 - make lguest || { report close-bloc; return 1; } 74.176 + make lguest || return 1 74.177 + cd $src 74.178 + 74.179 + # 74.180 + # Arch x86_64: TODO have a real cross environment 74.181 + # 74.182 + if [ ! "nox64" ]; then 74.183 + echo "Compiling: x86_64 Kernel" 74.184 + 74.185 + # Build bzImage64 without modules first 74.186 + if [ ! "nonomods" ]; then 74.187 + cp -f $stuff/$PACKAGE-slitaz.config64 .config 74.188 + sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config 74.189 + # We can't keep every driver in staging ??? 74.190 + sed -i -e 's/^CONFIG_RTL8192/#&/' \ 74.191 + -e 's/^CONFIG_R8187SE/#&/' \ 74.192 + -e 's/^CONFIG_RT2870/#&/' .config 74.193 + echo -e "\n* Configure bzImage64 without modules...\n" 74.194 + yes '' | make ARCH=x86_64 oldconfig 74.195 + echo -e "\n* Building bzImage64 without modules...\n" 74.196 + make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage || exit 1 74.197 + [ -d $DESTDIR ] || mkdir -p $DESTDIR/linux64 74.198 + mv arch/x86/boot/bzImage $DESTDIR/linux64 74.199 + mv System.map System.map-without-modules64 74.200 + fi 74.201 + 74.202 + # Build bzImage64 with modules 74.203 + cp -f $stuff/$PACKAGE-slitaz.config64 .config 74.204 + echo -e "\n* Configure bzImage64 with modules...\n" 74.205 + yes '' | make ARCH=x86_64 oldconfig 74.206 + echo -e "\n* Building bzImage64 with modules...\n" 74.207 + make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage && 74.208 + make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- modules && 74.209 + make ARCH=x86_64 INSTALL_MOD_PATH=$DESTDIR/linux64 modules_install && 74.210 + make ARCH=x86_64 INSTALL_HDR_PATH=$DESTDIR/linux64/usr headers_install && 74.211 + ln .config $WOK/$PACKAGE/source/slitaz/config64 74.212 + [ -s arch/x86/boot/bzImage ] || return 1 74.213 + mkdir -p $DESTDIR/linux64/boot 2> /dev/null 74.214 + mv arch/x86/boot/bzImage $DESTDIR/linux64/boot/vmlinuz-$VERSION-slitaz 74.215 + ln System.map System.map-modules64 74.216 + ln Module.symvers Module.symvers-modules64 74.217 + else 74.218 + echo "* Skipping: x86_64 Kernel..." 74.219 fi 74.220 - cd $src 74.221 - 74.222 - case "$opt" in 74.223 - *--no64*);; 74.224 - *) 74.225 + 74.226 # 74.227 - # Arch x86_64 74.228 + # Linux Arch i386 - GCC arch i486 74.229 # 74.230 - [ ! -x /usr/bin/cook ] && report step "Make bzImage64 without modules first" 74.231 - [ -x /usr/bin/cook ] && echo "Building x86_64 Kernel" 74.232 - 74.233 - # Build bzImage64 without modules first 74.234 - cp -f $stuff/$PACKAGE-slitaz.config64 .config 74.235 - sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config 74.236 - 74.237 - # We can't keep every driver in staging 74.238 - sed -i -e 's/^CONFIG_RTL8192/#&/' \ 74.239 - -e 's/^CONFIG_R8187SE/#&/' \ 74.240 - -e 's/^CONFIG_RT2870/#&/' .config 74.241 - echo "Configure bzImage64 without modules..." 74.242 - yes '' | make ARCH=x86_64 oldconfig 74.243 - echo "Build bzImage64 without modules..." 74.244 - if [ -x /usr/bin/cook ]; then 74.245 - make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage || exit 1 74.246 - elif [ -x /usr/bin/tazwok ]; then 74.247 - make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage || { report close-bloc; return 1; } 74.248 - fi 74.249 - [ -d $DESTDIR ] || mkdir -p $DESTDIR/linux64 74.250 - mv arch/x86/boot/bzImage $DESTDIR/linux64 74.251 - mv System.map System.map-without-modules64 74.252 - 74.253 - [ ! -x /usr/bin/cook ] && report step "Now build bzImage64 with modules" 74.254 - 74.255 - # Build bzImage64 with modules 74.256 - cp -f $stuff/$PACKAGE-slitaz.config64 .config 74.257 - echo "Configure bzImage64 with modules..." 74.258 - yes '' | make ARCH=x86_64 oldconfig 74.259 - echo "Build bzImage64 with modules..." 74.260 - make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage && 74.261 - make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- modules && 74.262 - make ARCH=x86_64 INSTALL_MOD_PATH=$DESTDIR/linux64 modules_install && 74.263 - make ARCH=x86_64 INSTALL_HDR_PATH=$DESTDIR/linux64/usr headers_install && 74.264 - ln .config $WOK/$PACKAGE/source/slitaz/config64 74.265 - if [ -x /usr/bin/cook ]; then 74.266 - [ -s arch/x86/boot/bzImage ] || return 1 74.267 - elif [ -x /usr/bin/tazwok ]; then 74.268 - [ -s arch/x86/boot/bzImage ] || { report close-bloc; return 1; } 74.269 - fi 74.270 - mkdir -p $DESTDIR/linux64/boot 2> /dev/null 74.271 - mv arch/x86/boot/bzImage $DESTDIR/linux64/boot/vmlinuz-$VERSION-slitaz 74.272 - ln System.map System.map-modules64 74.273 - ln Module.symvers Module.symvers-modules64 74.274 - esac 74.275 - 74.276 - # 74.277 - # Standard kernel 74.278 - # 74.279 - [ ! -x /usr/bin/cook ] && report step "Make bzImage without modules first" 74.280 - [ -x /usr/bin/cook ] && echo "Building standard kernel..." 74.281 + echo "Compiling: i386 Kernel..." 74.282 74.283 # Build bzImage without modules first 74.284 - cp -f $stuff/$PACKAGE-slitaz.config .config 74.285 - sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config 74.286 - 74.287 - # We can't keep every driver in staging 74.288 - sed -i -e 's/^CONFIG_RTL8192/#&/' \ 74.289 - -e 's/^CONFIG_R8187SE/#&/' \ 74.290 - -e 's/^CONFIG_RT2870/#&/' .config 74.291 - echo "Configure bzImage without modules..." 74.292 - yes '' | make ARCH=i386 oldconfig 74.293 - echo "Build bzImage without modules..." 74.294 - if [ -x /usr/bin/cook ]; then 74.295 + if [ ! "nonomods" ]; then 74.296 + cp -f $stuff/$PACKAGE-slitaz.config .config 74.297 + sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config 74.298 + # We can't keep every driver in staging ??? 74.299 + sed -i -e 's/^CONFIG_RTL8192/#&/' \ 74.300 + -e 's/^CONFIG_R8187SE/#&/' \ 74.301 + -e 's/^CONFIG_RT2870/#&/' .config 74.302 + echo -e "\n* Configure bzImage without modules...\n" 74.303 + yes '' | make ARCH=i386 oldconfig 74.304 + echo -e "\n* Building bzImage without modules...\n" 74.305 make ARCH=i386 -j 4 bzImage || exit 1 74.306 - elif [ -x /usr/bin/tazwok ]; then 74.307 - make ARCH=i386 -j 4 bzImage || { report close-bloc; return 1; } 74.308 + [ -d $DESTDIR ] || mkdir -p $DESTDIR 74.309 + mv arch/x86/boot/bzImage $DESTDIR 74.310 + mv System.map System.map-without-modules 74.311 fi 74.312 - [ -d $DESTDIR ] || mkdir -p $DESTDIR 74.313 - mv arch/x86/boot/bzImage $DESTDIR 74.314 - mv System.map System.map-without-modules 74.315 - 74.316 - [ ! -x /usr/bin/cook ] && report step "Now build bzImage with modules" 74.317 - 74.318 + 74.319 # Build bzImage with modules 74.320 cp -f $stuff/$PACKAGE-slitaz.config .config 74.321 - echo "Configure bzImage with modules..." 74.322 + echo -e "\n* Configure bzImage with modules...\n" 74.323 yes '' | make ARCH=i386 oldconfig 74.324 ln .config $WOK/$PACKAGE/source/slitaz/config 74.325 - echo "Build bzImage with modules..." 74.326 + echo -e "\n* Building bzImage with modules...\n" 74.327 make ARCH=i386 -j 4 bzImage && 74.328 make ARCH=i386 -j 4 modules && 74.329 make ARCH=i386 INSTALL_MOD_PATH=$DESTDIR modules_install && 74.330 make ARCH=i386 INSTALL_HDR_PATH=$DESTDIR/usr headers_install && 74.331 - if [ -x /usr/bin/cook ]; then 74.332 - [ -s arch/x86/boot/bzImage ] || return 1 74.333 - elif [ -x /usr/bin/tazwok ]; then 74.334 - [ -s arch/x86/boot/bzImage ] || { report close-bloc; return 1; } 74.335 - fi 74.336 + [ -s arch/x86/boot/bzImage ] || return 1 74.337 mkdir -p $DESTDIR/boot 2> /dev/null 74.338 mv arch/x86/boot/bzImage $DESTDIR/boot/vmlinuz-$VERSION-slitaz 74.339 - 74.340 - [ ! -x /usr/bin/cook ] && report step "Compressing all modules" 74.341 - 74.342 + 74.343 # Compress all modules. 74.344 - $stuff/gztazmod.sh $DESTDIR/lib/modules/$KBASEVER-slitaz 74.345 - $stuff/gztazmod.sh $DESTDIR/linux64/lib/modules/$KBASEVER-slitaz 74.346 + if [ -d "$DESTDIR/lib/modules/$VERSION-slitaz" ]; then 74.347 + $stuff/gztazmod.sh $DESTDIR/lib/modules/$VERSION-slitaz 74.348 + else 74.349 + return 1 74.350 + fi 74.351 + if [ -d "$DESTDIR/linux64/lib/modules/$VERSION-slitaz" ]; then 74.352 + $stuff/gztazmod.sh $DESTDIR/linux64/lib/modules/$VERSION-slitaz 74.353 + fi 74.354 ln System.map System.map-modules 74.355 ln Module.symvers Module.symvers-modules 74.356 - 74.357 - if [ ! -x /usr/bin/cook ]; then 74.358 - report close-bloc 74.359 - fi 74.360 } 74.361 74.362 # Rules to gen a SliTaz package suitable for Tazpkg. 74.363 @@ -283,70 +234,78 @@ 74.364 export PACKAGE VERSION 74.365 local path 74.366 cp -a $install/boot $fs 74.367 + 74.368 # Compress all modules. 74.369 - path=$fs/lib/modules/$KBASEVER-slitaz/kernel 74.370 + path=$fs/lib/modules/$VERSION-slitaz/kernel 74.371 mkdir -p $path 74.372 - cp -a $install/lib/modules/$KBASEVER-slitaz/mo* \ 74.373 - $fs/lib/modules/$KBASEVER-slitaz 74.374 - [ "$KBASEVER" != "$VERSION" ] && 74.375 - ln -s $KBASEVER-slitaz $fs/lib/modules/$VERSION-slitaz 74.376 + 74.377 # Get the base modules 74.378 - export src 74.379 - export _pkg 74.380 + export src install 74.381 mkdir -p $WOK/$PACKAGE/source/tmp 74.382 # Warning stuff/list_modules.sh must find the generated modules.list 74.383 $stuff/list_modules.sh \ 74.384 - $(cat $stuff/modules.list) > $WOK/$PACKAGE/source/tmp/modules.list 74.385 + $(cat $stuff/modules.list) > $WOK/$PACKAGE/source/tmp/modules.list 74.386 while read module; do 74.387 dir=$(dirname $module) 74.388 [ -d $path/$dir ] || mkdir -p $path/$dir 74.389 - cp -a $install/lib/modules/$KBASEVER-slitaz/kernel/$module $path/$dir 74.390 + cp -a $install/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir 74.391 done < $WOK/$PACKAGE/source/tmp/modules.list 74.392 + 74.393 # Remove unresolved links 74.394 - rm -f $fs/lib/modules/$KBASEVER-slitaz/build 74.395 - rm -f $fs/lib/modules/$KBASEVER-slitaz/source 74.396 - # Cook all packages with a kernel module 74.397 - for i in $(cd $WOK; grep -l 'cook linux$' */receipt) 74.398 + rm -f $fs/lib/modules/$VERSION-slitaz/build 74.399 + rm -f $fs/lib/modules/$VERSION-slitaz/source 74.400 + 74.401 + # We only need module.{order,builtin} because other map files are 74.402 + # generated by depmod in post_install 74.403 + cp -a $install/lib/modules/$VERSION-slitaz/modules.order \ 74.404 + $install/lib/modules/$VERSION-slitaz/modules.builtin \ 74.405 + $fs/lib/modules/$VERSION-slitaz 74.406 + 74.407 + # Pack all packages with a kernel module 74.408 + for i in $(cd $WOK; grep -l '^WANTED="linux"' */receipt) 74.409 do 74.410 - echo cook ${i%/receipt} 74.411 + [ ! -d "$install/lib/modules/$VERSION-slitaz" ] && return 1 74.412 + cook ${i%/receipt} 74.413 done 74.414 - # Fixed modules.dep to use right path 74.415 - # saves 100kb of space too 74.416 - sed -i "s|$_pkg||g" $fs/lib/modules/$KBASEVER-slitaz/modules.dep 74.417 - sed -i "s|99.98.$KBASEVER-slitaz|$KBASEVER-slitaz|g" $fs/lib/modules/$KBASEVER-slitaz/modules.dep 74.418 - # Check and echo any module in kernel .config that's not added to 74.419 - # one of linux-* pkgs 74.420 - $stuff/check_modules.sh 74.421 + 74.422 + # Check any module in kernel .config that's not added to a linux-* pkgs 74.423 + # and remove aufs patches: we dont need them in HG wok. 74.424 + $stuff/check_modules.sh 74.425 + rm -f $stuff/aufs3-* 74.426 } 74.427 74.428 # Pre and post install commands for Tazpkg. 74.429 post_install() 74.430 { 74.431 echo "Processing post-install commands..." 74.432 - case "$ARCH" in 74.433 + chroot "$root/" depmod -a $VERSION-slitaz 74.434 + 74.435 + # Handle multiarch installation 74.436 + case "$SLITAZ_ARCH" in 74.437 arm) 74.438 echo "Kernel : /boot/linux-$VERSION-slitaz-$ARCH" 74.439 echo "Modules: /lib/modules/$VERSION-slitaz" 74.440 return 0 ;; 74.441 esac 74.442 - chroot "$1/" depmod -a $KBASEVER-slitaz 74.443 - # GRUB stuff. 74.444 - if [ -f "$1/boot/grub/menu.lst" ]; then 74.445 - root_dev="/dev/`lsblk | grep '/$'| grep -o '[a-z]d[a-z][0-9]*'`" # current root device 74.446 - grub_part="$(( `echo $root_dev | grep -o '[0-9]*$'`-1 ))" 74.447 - grub_dev="`grep $(echo $root_dev | grep -o '^/dev/.d.' ) $1/boot/grub/device.map |\ 74.448 - cut -f1 | sed "s/)$/.$grub_part)/g"`" # use device.map to find grub device number 74.449 + 74.450 + # GRUB stuff. 74.451 + if [ -f "$1/boot/grub/menu.lst" ]; then 74.452 + # Current root device 74.453 + root_dev="/dev/$(lsblk | grep '/$'| grep -o '[a-z]d[a-z][0-9]*')" 74.454 + grub_part="$(( $(echo $root_dev | grep -o '[0-9]*$')-1 ))" 74.455 + # Use device.map to find grub device number 74.456 + grub_dev="$(grep $(echo $root_dev | grep -o '^/dev/.d.' ) \ 74.457 + $1/boot/grub/device.map | cut -f1 | sed "s/)$/.$grub_part)/g")" 74.458 74.459 - # Add and clean kernel entrys in case of upgrade for installed system. 74.460 - if ! grep -q vmlinuz-$VERSION-slitaz $1/boot/grub/menu.lst; then 74.461 + # Add and clean kernel entries in case of upgrade for installed system. 74.462 + if ! grep -q vmlinuz-$VERSION-slitaz $1/boot/grub/menu.lst; then 74.463 74.464 - #clean the old entry 74.465 - # TODO somewhere, the old vmlinuz file is removed. 74.466 - # but the entry is still there. this cause a grub error:15 when selected 74.467 - # see http://bugs.slitaz.org/?id=74 74.468 + # Clean the old entry 74.469 + # TODO: old vmlinuz file is removed but the entry is still there. 74.470 + # So grub error:15 when selected: http://bugs.slitaz.org/?id=74 74.471 74.472 - #add the new 74.473 - cat >> $1/boot/grub/menu.lst << EOT 74.474 + # Add the new entry 74.475 + cat >> $1/boot/grub/menu.lst << EOT 74.476 74.477 title SliTaz GNU/Linux (Kernel $VERSION-slitaz) 74.478 $grub_dev 74.479 @@ -356,8 +315,9 @@ 74.480 last_entry=$(( $(grep -c '^title' $1/boot/grub/menu.lst)-1 )) 74.481 sed -e "s/^default.*/default $last_entry/g" -i $1/boot/grub/menu.lst 74.482 fi 74.483 + 74.484 # Display information message. 74.485 - cat <<EOT 74.486 + cat <<EOT 74.487 ---- 74.488 GRUB is installed, these tree lines must be in your /boot/grub/menu.lst: 74.489
75.1 --- a/linux/stuff/aufs2-base.patch Tue Jan 28 05:56:16 2014 +0000 75.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 75.3 @@ -1,70 +0,0 @@ 75.4 -aufs2.1 base patch for linux-2.6. 75.5 - 75.6 -diff --git a/fs/namei.c b/fs/namei.c 75.7 -index 5c867dd..95978ec 100644 75.8 ---- a/fs/namei.c 75.9 -+++ b/fs/namei.c 75.10 -@@ -1692,7 +1692,7 @@ static struct dentry *__lookup_hash(struct qstr *name, 75.11 - * needs parent already locked. Doesn't follow mounts. 75.12 - * SMP-safe. 75.13 - */ 75.14 --static struct dentry *lookup_hash(struct nameidata *nd) 75.15 -+struct dentry *lookup_hash(struct nameidata *nd) 75.16 - { 75.17 - return __lookup_hash(&nd->last, nd->path.dentry, nd); 75.18 - } 75.19 -diff --git a/fs/splice.c b/fs/splice.c 75.20 -index aa866d3..19afec6 100644 75.21 ---- a/fs/splice.c 75.22 -+++ b/fs/splice.c 75.23 -@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); 75.24 - /* 75.25 - * Attempt to initiate a splice from pipe to file. 75.26 - */ 75.27 --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 75.28 -- loff_t *ppos, size_t len, unsigned int flags) 75.29 -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 75.30 -+ loff_t *ppos, size_t len, unsigned int flags) 75.31 - { 75.32 - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, 75.33 - loff_t *, size_t, unsigned int); 75.34 -@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 75.35 - /* 75.36 - * Attempt to initiate a splice from a file to a pipe. 75.37 - */ 75.38 --static long do_splice_to(struct file *in, loff_t *ppos, 75.39 -- struct pipe_inode_info *pipe, size_t len, 75.40 -- unsigned int flags) 75.41 -+long do_splice_to(struct file *in, loff_t *ppos, 75.42 -+ struct pipe_inode_info *pipe, size_t len, 75.43 -+ unsigned int flags) 75.44 - { 75.45 - ssize_t (*splice_read)(struct file *, loff_t *, 75.46 - struct pipe_inode_info *, size_t, unsigned int); 75.47 -diff --git a/include/linux/namei.h b/include/linux/namei.h 75.48 -index eba45ea..21ed6c9 100644 75.49 ---- a/include/linux/namei.h 75.50 -+++ b/include/linux/namei.h 75.51 -@@ -82,6 +82,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, 75.52 - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, 75.53 - int (*open)(struct inode *, struct file *)); 75.54 - 75.55 -+extern struct dentry *lookup_hash(struct nameidata *nd); 75.56 - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); 75.57 - 75.58 - extern int follow_down_one(struct path *); 75.59 -diff --git a/include/linux/splice.h b/include/linux/splice.h 75.60 -index 997c3b4..be9a153 100644 75.61 ---- a/include/linux/splice.h 75.62 -+++ b/include/linux/splice.h 75.63 -@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *); 75.64 - extern void splice_shrink_spd(struct pipe_inode_info *, 75.65 - struct splice_pipe_desc *); 75.66 - 75.67 -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 75.68 -+ loff_t *ppos, size_t len, unsigned int flags); 75.69 -+extern long do_splice_to(struct file *in, loff_t *ppos, 75.70 -+ struct pipe_inode_info *pipe, size_t len, 75.71 -+ unsigned int flags); 75.72 -+ 75.73 - #endif
76.1 --- a/linux/stuff/aufs2-kbuild.patch Tue Jan 28 05:56:16 2014 +0000 76.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 76.3 @@ -1,35 +0,0 @@ 76.4 -aufs2.1 kbuild patch for linux-2.6. 76.5 - 76.6 -diff --git a/fs/Kconfig b/fs/Kconfig 76.7 -index 19891aa..b660b64 100644 76.8 ---- a/fs/Kconfig 76.9 -+++ b/fs/Kconfig 76.10 -@@ -208,6 +208,7 @@ source "fs/pstore/Kconfig" 76.11 - source "fs/sysv/Kconfig" 76.12 - source "fs/ufs/Kconfig" 76.13 - source "fs/exofs/Kconfig" 76.14 -+source "fs/aufs/Kconfig" 76.15 - 76.16 - endif # MISC_FILESYSTEMS 76.17 - 76.18 -diff --git a/fs/Makefile b/fs/Makefile 76.19 -index fb68c2b..c031a85 100644 76.20 ---- a/fs/Makefile 76.21 -+++ b/fs/Makefile 76.22 -@@ -124,3 +124,4 @@ obj-$(CONFIG_GFS2_FS) += gfs2/ 76.23 - obj-$(CONFIG_EXOFS_FS) += exofs/ 76.24 - obj-$(CONFIG_CEPH_FS) += ceph/ 76.25 - obj-$(CONFIG_PSTORE) += pstore/ 76.26 -+obj-$(CONFIG_AUFS_FS) += aufs/ 76.27 -diff --git a/include/linux/Kbuild b/include/linux/Kbuild 76.28 -index 01f6362..8b3b9f1 100644 76.29 ---- a/include/linux/Kbuild 76.30 -+++ b/include/linux/Kbuild 76.31 -@@ -65,6 +65,7 @@ header-y += atmppp.h 76.32 - header-y += atmsap.h 76.33 - header-y += atmsvc.h 76.34 - header-y += audit.h 76.35 -+header-y += aufs_type.h 76.36 - header-y += auto_fs.h 76.37 - header-y += auto_fs4.h 76.38 - header-y += auxvec.h
77.1 --- a/linux/stuff/aufs2-standalone.patch Tue Jan 28 05:56:16 2014 +0000 77.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 77.3 @@ -1,257 +0,0 @@ 77.4 -aufs2.1 standalone patch for linux-2.6. 77.5 - 77.6 -diff --git a/fs/file_table.c b/fs/file_table.c 77.7 -index 01e4c1e..0e800e2 100644 77.8 ---- a/fs/file_table.c 77.9 -+++ b/fs/file_table.c 77.10 -@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) 77.11 - } 77.12 - } 77.13 - 77.14 -+EXPORT_SYMBOL(file_sb_list_del); 77.15 -+ 77.16 - #ifdef CONFIG_SMP 77.17 - 77.18 - /* 77.19 -diff --git a/fs/inode.c b/fs/inode.c 77.20 -index 43566d1..4291eae 100644 77.21 ---- a/fs/inode.c 77.22 -+++ b/fs/inode.c 77.23 -@@ -69,6 +69,7 @@ static DEFINE_SPINLOCK(inode_lru_lock); 77.24 - 77.25 - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); 77.26 - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_wb_list_lock); 77.27 -+EXPORT_SYMBOL(inode_sb_list_lock); 77.28 - 77.29 - /* 77.30 - * iprune_sem provides exclusion between the icache shrinking and the 77.31 -diff --git a/fs/namei.c b/fs/namei.c 77.32 -index 95978ec..f86d670 100644 77.33 ---- a/fs/namei.c 77.34 -+++ b/fs/namei.c 77.35 -@@ -365,6 +365,7 @@ int deny_write_access(struct file * file) 77.36 - 77.37 - return 0; 77.38 - } 77.39 -+EXPORT_SYMBOL(deny_write_access); 77.40 - 77.41 - /** 77.42 - * path_get - get a reference to a path 77.43 -@@ -1696,6 +1697,7 @@ struct dentry *lookup_hash(struct nameidata *nd) 77.44 - { 77.45 - return __lookup_hash(&nd->last, nd->path.dentry, nd); 77.46 - } 77.47 -+EXPORT_SYMBOL(lookup_hash); 77.48 - 77.49 - /** 77.50 - * lookup_one_len - filesystem helper to lookup single pathname component 77.51 -diff --git a/fs/namespace.c b/fs/namespace.c 77.52 -index fe59bd1..7d3843f 100644 77.53 ---- a/fs/namespace.c 77.54 -+++ b/fs/namespace.c 77.55 -@@ -1508,6 +1508,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, 77.56 - } 77.57 - return 0; 77.58 - } 77.59 -+EXPORT_SYMBOL(iterate_mounts); 77.60 - 77.61 - static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) 77.62 - { 77.63 -diff --git a/fs/notify/group.c b/fs/notify/group.c 77.64 -index d309f38..f0e9568 100644 77.65 ---- a/fs/notify/group.c 77.66 -+++ b/fs/notify/group.c 77.67 -@@ -22,6 +22,7 @@ 77.68 - #include <linux/srcu.h> 77.69 - #include <linux/rculist.h> 77.70 - #include <linux/wait.h> 77.71 -+#include <linux/module.h> 77.72 - 77.73 - #include <linux/fsnotify_backend.h> 77.74 - #include "fsnotify.h" 77.75 -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) 77.76 - if (atomic_dec_and_test(&group->refcnt)) 77.77 - fsnotify_destroy_group(group); 77.78 - } 77.79 -+EXPORT_SYMBOL(fsnotify_put_group); 77.80 - 77.81 - /* 77.82 - * Create a new fsnotify_group and hold a reference for the group returned. 77.83 -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) 77.84 - 77.85 - return group; 77.86 - } 77.87 -+EXPORT_SYMBOL(fsnotify_alloc_group); 77.88 -diff --git a/fs/notify/mark.c b/fs/notify/mark.c 77.89 -index 252ab1f..2199b9b 100644 77.90 ---- a/fs/notify/mark.c 77.91 -+++ b/fs/notify/mark.c 77.92 -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) 77.93 - if (atomic_dec_and_test(&mark->refcnt)) 77.94 - mark->free_mark(mark); 77.95 - } 77.96 -+EXPORT_SYMBOL(fsnotify_put_mark); 77.97 - 77.98 - /* 77.99 - * Any time a mark is getting freed we end up here. 77.100 -@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) 77.101 - if (unlikely(atomic_dec_and_test(&group->num_marks))) 77.102 - fsnotify_final_destroy_group(group); 77.103 - } 77.104 -+EXPORT_SYMBOL(fsnotify_destroy_mark); 77.105 - 77.106 - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) 77.107 - { 77.108 -@@ -276,6 +278,7 @@ err: 77.109 - 77.110 - return ret; 77.111 - } 77.112 -+EXPORT_SYMBOL(fsnotify_add_mark); 77.113 - 77.114 - /* 77.115 - * clear any marks in a group in which mark->flags & flags is true 77.116 -@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, 77.117 - atomic_set(&mark->refcnt, 1); 77.118 - mark->free_mark = free_mark; 77.119 - } 77.120 -+EXPORT_SYMBOL(fsnotify_init_mark); 77.121 - 77.122 - static int fsnotify_mark_destroy(void *ignored) 77.123 - { 77.124 -diff --git a/fs/open.c b/fs/open.c 77.125 -index b52cf01..c1b341c 100644 77.126 ---- a/fs/open.c 77.127 -+++ b/fs/open.c 77.128 -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, 77.129 - mutex_unlock(&dentry->d_inode->i_mutex); 77.130 - return ret; 77.131 - } 77.132 -+EXPORT_SYMBOL(do_truncate); 77.133 - 77.134 - static long do_sys_truncate(const char __user *pathname, loff_t length) 77.135 - { 77.136 -diff --git a/fs/splice.c b/fs/splice.c 77.137 -index 19afec6..11f07f8 100644 77.138 ---- a/fs/splice.c 77.139 -+++ b/fs/splice.c 77.140 -@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 77.141 - 77.142 - return splice_write(pipe, out, ppos, len, flags); 77.143 - } 77.144 -+EXPORT_SYMBOL(do_splice_from); 77.145 - 77.146 - /* 77.147 - * Attempt to initiate a splice from a file to a pipe. 77.148 -@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos, 77.149 - 77.150 - return splice_read(in, ppos, pipe, len, flags); 77.151 - } 77.152 -+EXPORT_SYMBOL(do_splice_to); 77.153 - 77.154 - /** 77.155 - * splice_direct_to_actor - splices data directly between two non-pipes 77.156 -diff --git a/security/commoncap.c b/security/commoncap.c 77.157 -index a93b3b7..024282c 100644 77.158 ---- a/security/commoncap.c 77.159 -+++ b/security/commoncap.c 77.160 -@@ -971,3 +971,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, 77.161 - } 77.162 - return ret; 77.163 - } 77.164 -+EXPORT_SYMBOL(cap_file_mmap); 77.165 -diff --git a/security/device_cgroup.c b/security/device_cgroup.c 77.166 -index 1be6826..215278c 100644 77.167 ---- a/security/device_cgroup.c 77.168 -+++ b/security/device_cgroup.c 77.169 -@@ -508,6 +508,7 @@ found: 77.170 - 77.171 - return -EPERM; 77.172 - } 77.173 -+EXPORT_SYMBOL(__devcgroup_inode_permission); 77.174 - 77.175 - int devcgroup_inode_mknod(int mode, dev_t dev) 77.176 - { 77.177 -diff --git a/security/security.c b/security/security.c 77.178 -index 4ba6d4c..9f64bb8 100644 77.179 ---- a/security/security.c 77.180 -+++ b/security/security.c 77.181 -@@ -373,6 +373,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) 77.182 - return 0; 77.183 - return security_ops->path_rmdir(dir, dentry); 77.184 - } 77.185 -+EXPORT_SYMBOL(security_path_rmdir); 77.186 - 77.187 - int security_path_unlink(struct path *dir, struct dentry *dentry) 77.188 - { 77.189 -@@ -389,6 +390,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, 77.190 - return 0; 77.191 - return security_ops->path_symlink(dir, dentry, old_name); 77.192 - } 77.193 -+EXPORT_SYMBOL(security_path_symlink); 77.194 - 77.195 - int security_path_link(struct dentry *old_dentry, struct path *new_dir, 77.196 - struct dentry *new_dentry) 77.197 -@@ -397,6 +399,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, 77.198 - return 0; 77.199 - return security_ops->path_link(old_dentry, new_dir, new_dentry); 77.200 - } 77.201 -+EXPORT_SYMBOL(security_path_link); 77.202 - 77.203 - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, 77.204 - struct path *new_dir, struct dentry *new_dentry) 77.205 -@@ -415,6 +418,7 @@ int security_path_truncate(struct path *path) 77.206 - return 0; 77.207 - return security_ops->path_truncate(path); 77.208 - } 77.209 -+EXPORT_SYMBOL(security_path_truncate); 77.210 - 77.211 - int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, 77.212 - mode_t mode) 77.213 -@@ -423,6 +427,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, 77.214 - return 0; 77.215 - return security_ops->path_chmod(dentry, mnt, mode); 77.216 - } 77.217 -+EXPORT_SYMBOL(security_path_chmod); 77.218 - 77.219 - int security_path_chown(struct path *path, uid_t uid, gid_t gid) 77.220 - { 77.221 -@@ -430,6 +435,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) 77.222 - return 0; 77.223 - return security_ops->path_chown(path, uid, gid); 77.224 - } 77.225 -+EXPORT_SYMBOL(security_path_chown); 77.226 - 77.227 - int security_path_chroot(struct path *path) 77.228 - { 77.229 -@@ -506,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry) 77.230 - return 0; 77.231 - return security_ops->inode_readlink(dentry); 77.232 - } 77.233 -+EXPORT_SYMBOL(security_inode_readlink); 77.234 - 77.235 - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) 77.236 - { 77.237 -@@ -520,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask) 77.238 - return 0; 77.239 - return security_ops->inode_permission(inode, mask, 0); 77.240 - } 77.241 -+EXPORT_SYMBOL(security_inode_permission); 77.242 - 77.243 - int security_inode_exec_permission(struct inode *inode, unsigned int flags) 77.244 - { 77.245 -@@ -626,6 +634,7 @@ int security_file_permission(struct file *file, int mask) 77.246 - 77.247 - return fsnotify_perm(file, mask); 77.248 - } 77.249 -+EXPORT_SYMBOL(security_file_permission); 77.250 - 77.251 - int security_file_alloc(struct file *file) 77.252 - { 77.253 -@@ -653,6 +662,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, 77.254 - return ret; 77.255 - return ima_file_mmap(file, prot); 77.256 - } 77.257 -+EXPORT_SYMBOL(security_file_mmap); 77.258 - 77.259 - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, 77.260 - unsigned long prot)
78.1 --- a/linux/stuff/aufs3-base.patch Tue Jan 28 05:56:16 2014 +0000 78.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 78.3 @@ -1,70 +0,0 @@ 78.4 -aufs3.2 base patch 78.5 - 78.6 -diff --git a/fs/namei.c b/fs/namei.c 78.7 -index 5008f01..4cc94cf 100644 78.8 ---- a/fs/namei.c 78.9 -+++ b/fs/namei.c 78.10 -@@ -1755,7 +1755,7 @@ static struct dentry *__lookup_hash(struct qstr *name, 78.11 - * needs parent already locked. Doesn't follow mounts. 78.12 - * SMP-safe. 78.13 - */ 78.14 --static struct dentry *lookup_hash(struct nameidata *nd) 78.15 -+struct dentry *lookup_hash(struct nameidata *nd) 78.16 - { 78.17 - return __lookup_hash(&nd->last, nd->path.dentry, nd); 78.18 - } 78.19 -diff --git a/fs/splice.c b/fs/splice.c 78.20 -index fa2defa..e3569b0 100644 78.21 ---- a/fs/splice.c 78.22 -+++ b/fs/splice.c 78.23 -@@ -1094,8 +1094,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); 78.24 - /* 78.25 - * Attempt to initiate a splice from pipe to file. 78.26 - */ 78.27 --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 78.28 -- loff_t *ppos, size_t len, unsigned int flags) 78.29 -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 78.30 -+ loff_t *ppos, size_t len, unsigned int flags) 78.31 - { 78.32 - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, 78.33 - loff_t *, size_t, unsigned int); 78.34 -@@ -1122,9 +1122,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 78.35 - /* 78.36 - * Attempt to initiate a splice from a file to a pipe. 78.37 - */ 78.38 --static long do_splice_to(struct file *in, loff_t *ppos, 78.39 -- struct pipe_inode_info *pipe, size_t len, 78.40 -- unsigned int flags) 78.41 -+long do_splice_to(struct file *in, loff_t *ppos, 78.42 -+ struct pipe_inode_info *pipe, size_t len, 78.43 -+ unsigned int flags) 78.44 - { 78.45 - ssize_t (*splice_read)(struct file *, loff_t *, 78.46 - struct pipe_inode_info *, size_t, unsigned int); 78.47 -diff --git a/include/linux/namei.h b/include/linux/namei.h 78.48 -index ffc0213..ef35a31 100644 78.49 ---- a/include/linux/namei.h 78.50 -+++ b/include/linux/namei.h 78.51 -@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, 78.52 - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, 78.53 - int (*open)(struct inode *, struct file *)); 78.54 - 78.55 -+extern struct dentry *lookup_hash(struct nameidata *nd); 78.56 - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); 78.57 - 78.58 - extern int follow_down_one(struct path *); 78.59 -diff --git a/include/linux/splice.h b/include/linux/splice.h 78.60 -index 26e5b61..3ffef2f 100644 78.61 ---- a/include/linux/splice.h 78.62 -+++ b/include/linux/splice.h 78.63 -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *, 78.64 - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); 78.65 - 78.66 - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; 78.67 -+ 78.68 -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 78.69 -+ loff_t *ppos, size_t len, unsigned int flags); 78.70 -+extern long do_splice_to(struct file *in, loff_t *ppos, 78.71 -+ struct pipe_inode_info *pipe, size_t len, 78.72 -+ unsigned int flags); 78.73 - #endif
79.1 --- a/linux/stuff/aufs3-kbuild.patch Tue Jan 28 05:56:16 2014 +0000 79.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 79.3 @@ -1,35 +0,0 @@ 79.4 -aufs3.2 kbuild patch 79.5 - 79.6 -diff --git a/fs/Kconfig b/fs/Kconfig 79.7 -index 5f4c45d..357a8a6 100644 79.8 ---- a/fs/Kconfig 79.9 -+++ b/fs/Kconfig 79.10 -@@ -215,6 +215,7 @@ source "fs/pstore/Kconfig" 79.11 - source "fs/sysv/Kconfig" 79.12 - source "fs/ufs/Kconfig" 79.13 - source "fs/exofs/Kconfig" 79.14 -+source "fs/aufs/Kconfig" 79.15 - 79.16 - endif # MISC_FILESYSTEMS 79.17 - 79.18 -diff --git a/fs/Makefile b/fs/Makefile 79.19 -index d2c3353..680ad8a 100644 79.20 ---- a/fs/Makefile 79.21 -+++ b/fs/Makefile 79.22 -@@ -123,3 +123,4 @@ obj-$(CONFIG_GFS2_FS) += gfs2/ 79.23 - obj-y += exofs/ # Multiple modules 79.24 - obj-$(CONFIG_CEPH_FS) += ceph/ 79.25 - obj-$(CONFIG_PSTORE) += pstore/ 79.26 -+obj-$(CONFIG_AUFS_FS) += aufs/ 79.27 -diff --git a/include/linux/Kbuild b/include/linux/Kbuild 79.28 -index 619b565..29f386b 100644 79.29 ---- a/include/linux/Kbuild 79.30 -+++ b/include/linux/Kbuild 79.31 -@@ -65,6 +65,7 @@ header-y += atmppp.h 79.32 - header-y += atmsap.h 79.33 - header-y += atmsvc.h 79.34 - header-y += audit.h 79.35 -+header-y += aufs_type.h 79.36 - header-y += auto_fs.h 79.37 - header-y += auto_fs4.h 79.38 - header-y += auxvec.h
80.1 --- a/linux/stuff/aufs3-loopback.patch Tue Jan 28 05:56:16 2014 +0000 80.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 80.3 @@ -1,287 +0,0 @@ 80.4 -aufs3.2 loopback patch 80.5 - 80.6 -diff --git a/drivers/block/loop.c b/drivers/block/loop.c 80.7 -index 1e888c9..17b3109 100644 80.8 ---- a/drivers/block/loop.c 80.9 -+++ b/drivers/block/loop.c 80.10 -@@ -499,7 +499,7 @@ out: 80.11 - } 80.12 - 80.13 - struct switch_request { 80.14 -- struct file *file; 80.15 -+ struct file *file, *virt_file; 80.16 - struct completion wait; 80.17 - }; 80.18 - 80.19 -@@ -559,7 +559,8 @@ static int loop_thread(void *data) 80.20 - * First it needs to flush existing IO, it does this by sending a magic 80.21 - * BIO down the pipe. The completion of this BIO does the actual switch. 80.22 - */ 80.23 --static int loop_switch(struct loop_device *lo, struct file *file) 80.24 -+static int loop_switch(struct loop_device *lo, struct file *file, 80.25 -+ struct file *virt_file) 80.26 - { 80.27 - struct switch_request w; 80.28 - struct bio *bio = bio_alloc(GFP_KERNEL, 0); 80.29 -@@ -567,6 +568,7 @@ static int loop_switch(struct loop_device *lo, struct file *file) 80.30 - return -ENOMEM; 80.31 - init_completion(&w.wait); 80.32 - w.file = file; 80.33 -+ w.virt_file = virt_file; 80.34 - bio->bi_private = &w; 80.35 - bio->bi_bdev = NULL; 80.36 - loop_make_request(lo->lo_queue, bio); 80.37 -@@ -583,7 +585,7 @@ static int loop_flush(struct loop_device *lo) 80.38 - if (!lo->lo_thread) 80.39 - return 0; 80.40 - 80.41 -- return loop_switch(lo, NULL); 80.42 -+ return loop_switch(lo, NULL, NULL); 80.43 - } 80.44 - 80.45 - /* 80.46 -@@ -602,6 +604,7 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p) 80.47 - mapping = file->f_mapping; 80.48 - mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask); 80.49 - lo->lo_backing_file = file; 80.50 -+ lo->lo_backing_virt_file = p->virt_file; 80.51 - lo->lo_blocksize = S_ISBLK(mapping->host->i_mode) ? 80.52 - mapping->host->i_bdev->bd_block_size : PAGE_SIZE; 80.53 - lo->old_gfp_mask = mapping_gfp_mask(mapping); 80.54 -@@ -610,6 +613,13 @@ out: 80.55 - complete(&p->wait); 80.56 - } 80.57 - 80.58 -+static struct file *loop_real_file(struct file *file) 80.59 -+{ 80.60 -+ struct file *f = NULL; 80.61 -+ if (file->f_dentry->d_sb->s_op->real_loop) 80.62 -+ f = file->f_dentry->d_sb->s_op->real_loop(file); 80.63 -+ return f; 80.64 -+} 80.65 - 80.66 - /* 80.67 - * loop_change_fd switched the backing store of a loopback device to 80.68 -@@ -623,6 +633,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, 80.69 - unsigned int arg) 80.70 - { 80.71 - struct file *file, *old_file; 80.72 -+ struct file *f, *virt_file = NULL, *old_virt_file; 80.73 - struct inode *inode; 80.74 - int error; 80.75 - 80.76 -@@ -639,9 +650,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, 80.77 - file = fget(arg); 80.78 - if (!file) 80.79 - goto out; 80.80 -+ f = loop_real_file(file); 80.81 -+ if (f) { 80.82 -+ virt_file = file; 80.83 -+ file = f; 80.84 -+ get_file(file); 80.85 -+ } 80.86 - 80.87 - inode = file->f_mapping->host; 80.88 - old_file = lo->lo_backing_file; 80.89 -+ old_virt_file = lo->lo_backing_virt_file; 80.90 - 80.91 - error = -EINVAL; 80.92 - 80.93 -@@ -653,17 +671,21 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, 80.94 - goto out_putf; 80.95 - 80.96 - /* and ... switch */ 80.97 -- error = loop_switch(lo, file); 80.98 -+ error = loop_switch(lo, file, virt_file); 80.99 - if (error) 80.100 - goto out_putf; 80.101 - 80.102 - fput(old_file); 80.103 -+ if (old_virt_file) 80.104 -+ fput(old_virt_file); 80.105 - if (lo->lo_flags & LO_FLAGS_PARTSCAN) 80.106 - ioctl_by_bdev(bdev, BLKRRPART, 0); 80.107 - return 0; 80.108 - 80.109 - out_putf: 80.110 - fput(file); 80.111 -+ if (virt_file) 80.112 -+ fput(virt_file); 80.113 - out: 80.114 - return error; 80.115 - } 80.116 -@@ -806,7 +828,7 @@ static void loop_config_discard(struct loop_device *lo) 80.117 - static int loop_set_fd(struct loop_device *lo, fmode_t mode, 80.118 - struct block_device *bdev, unsigned int arg) 80.119 - { 80.120 -- struct file *file, *f; 80.121 -+ struct file *file, *f, *virt_file = NULL; 80.122 - struct inode *inode; 80.123 - struct address_space *mapping; 80.124 - unsigned lo_blocksize; 80.125 -@@ -821,6 +843,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, 80.126 - file = fget(arg); 80.127 - if (!file) 80.128 - goto out; 80.129 -+ f = loop_real_file(file); 80.130 -+ if (f) { 80.131 -+ virt_file = file; 80.132 -+ file = f; 80.133 -+ get_file(file); 80.134 -+ } 80.135 - 80.136 - error = -EBUSY; 80.137 - if (lo->lo_state != Lo_unbound) 80.138 -@@ -869,6 +897,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, 80.139 - lo->lo_device = bdev; 80.140 - lo->lo_flags = lo_flags; 80.141 - lo->lo_backing_file = file; 80.142 -+ lo->lo_backing_virt_file = virt_file; 80.143 - lo->transfer = transfer_none; 80.144 - lo->ioctl = NULL; 80.145 - lo->lo_sizelimit = 0; 80.146 -@@ -919,6 +948,7 @@ out_clr: 80.147 - lo->lo_thread = NULL; 80.148 - lo->lo_device = NULL; 80.149 - lo->lo_backing_file = NULL; 80.150 -+ lo->lo_backing_virt_file = NULL; 80.151 - lo->lo_flags = 0; 80.152 - set_capacity(lo->lo_disk, 0); 80.153 - invalidate_bdev(bdev); 80.154 -@@ -928,6 +958,8 @@ out_clr: 80.155 - lo->lo_state = Lo_unbound; 80.156 - out_putf: 80.157 - fput(file); 80.158 -+ if (virt_file) 80.159 -+ fput(virt_file); 80.160 - out: 80.161 - /* This is safe: open() is still holding a reference. */ 80.162 - module_put(THIS_MODULE); 80.163 -@@ -974,6 +1006,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer, 80.164 - static int loop_clr_fd(struct loop_device *lo) 80.165 - { 80.166 - struct file *filp = lo->lo_backing_file; 80.167 -+ struct file *virt_filp = lo->lo_backing_virt_file; 80.168 - gfp_t gfp = lo->old_gfp_mask; 80.169 - struct block_device *bdev = lo->lo_device; 80.170 - 80.171 -@@ -994,6 +1027,7 @@ static int loop_clr_fd(struct loop_device *lo) 80.172 - 80.173 - spin_lock_irq(&lo->lo_lock); 80.174 - lo->lo_backing_file = NULL; 80.175 -+ lo->lo_backing_virt_file = NULL; 80.176 - spin_unlock_irq(&lo->lo_lock); 80.177 - 80.178 - loop_release_xfer(lo); 80.179 -@@ -1036,6 +1070,8 @@ static int loop_clr_fd(struct loop_device *lo) 80.180 - * bd_mutex which is usually taken before lo_ctl_mutex. 80.181 - */ 80.182 - fput(filp); 80.183 -+ if (virt_filp) 80.184 -+ fput(virt_filp); 80.185 - return 0; 80.186 - } 80.187 - 80.188 -diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c 80.189 -index d6318f08b..56555de 100644 80.190 ---- a/fs/aufs/f_op.c 80.191 -+++ b/fs/aufs/f_op.c 80.192 -@@ -355,7 +355,7 @@ static ssize_t aufs_splice_read(struct file *file, loff_t *ppos, 80.193 - err = -EINVAL; 80.194 - h_file = au_hf_top(file); 80.195 - get_file(h_file); 80.196 -- if (au_test_loopback_kthread()) { 80.197 -+ if (0 && au_test_loopback_kthread()) { 80.198 - au_warn_loopback(h_file->f_dentry->d_sb); 80.199 - if (file->f_mapping != h_file->f_mapping) { 80.200 - file->f_mapping = h_file->f_mapping; 80.201 -diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c 80.202 -index ccae19c..15dc5c2 100644 80.203 ---- a/fs/aufs/loop.c 80.204 -+++ b/fs/aufs/loop.c 80.205 -@@ -133,3 +133,19 @@ void au_loopback_fin(void) 80.206 - { 80.207 - kfree(au_warn_loopback_array); 80.208 - } 80.209 -+ 80.210 -+/* ---------------------------------------------------------------------- */ 80.211 -+ 80.212 -+/* support the loopback block device insude aufs */ 80.213 -+ 80.214 -+struct file *aufs_real_loop(struct file *file) 80.215 -+{ 80.216 -+ struct file *f; 80.217 -+ 80.218 -+ BUG_ON(!au_test_aufs(file->f_dentry->d_sb)); 80.219 -+ fi_read_lock(file); 80.220 -+ f = au_hf_top(file); 80.221 -+ fi_read_unlock(file); 80.222 -+ AuDebugOn(!f); 80.223 -+ return f; 80.224 -+} 80.225 -diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h 80.226 -index 88d019c..8707c3a 100644 80.227 ---- a/fs/aufs/loop.h 80.228 -+++ b/fs/aufs/loop.h 80.229 -@@ -36,6 +36,8 @@ void au_warn_loopback(struct super_block *h_sb); 80.230 - 80.231 - int au_loopback_init(void); 80.232 - void au_loopback_fin(void); 80.233 -+ 80.234 -+struct file *aufs_real_loop(struct file *file); 80.235 - #else 80.236 - AuStubInt0(au_test_loopback_overlap, struct super_block *sb, 80.237 - struct dentry *h_adding) 80.238 -@@ -44,6 +46,8 @@ AuStubVoid(au_warn_loopback, struct super_block *h_sb) 80.239 - 80.240 - AuStubInt0(au_loopback_init, void) 80.241 - AuStubVoid(au_loopback_fin, void) 80.242 -+ 80.243 -+AuStub(struct file *, aufs_real_loop, return NULL, struct file *file) 80.244 - #endif /* BLK_DEV_LOOP */ 80.245 - 80.246 - #endif /* __KERNEL__ */ 80.247 -diff --git a/fs/aufs/super.c b/fs/aufs/super.c 80.248 -index d105672..304f2e5 100644 80.249 ---- a/fs/aufs/super.c 80.250 -+++ b/fs/aufs/super.c 80.251 -@@ -823,7 +823,10 @@ static const struct super_operations aufs_sop = { 80.252 - .statfs = aufs_statfs, 80.253 - .put_super = aufs_put_super, 80.254 - .sync_fs = aufs_sync_fs, 80.255 -- .remount_fs = aufs_remount_fs 80.256 -+ .remount_fs = aufs_remount_fs, 80.257 -+#ifdef CONFIG_AUFS_BDEV_LOOP 80.258 -+ .real_loop = aufs_real_loop 80.259 -+#endif 80.260 - }; 80.261 - 80.262 - /* ---------------------------------------------------------------------- */ 80.263 -diff --git a/include/linux/fs.h b/include/linux/fs.h 80.264 -index e0bc4ff..bd7b3a4 100644 80.265 ---- a/include/linux/fs.h 80.266 -+++ b/include/linux/fs.h 80.267 -@@ -1699,6 +1699,10 @@ struct super_operations { 80.268 - int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t); 80.269 - int (*nr_cached_objects)(struct super_block *); 80.270 - void (*free_cached_objects)(struct super_block *, int); 80.271 -+#if defined(CONFIG_BLK_DEV_LOOP) || defined(CONFIG_BLK_DEV_LOOP_MODULE) 80.272 -+ /* and aufs */ 80.273 -+ struct file *(*real_loop)(struct file *); 80.274 -+#endif 80.275 - }; 80.276 - 80.277 - /* 80.278 -diff --git a/include/linux/loop.h b/include/linux/loop.h 80.279 -index 11a41a8..c190b78 100644 80.280 ---- a/include/linux/loop.h 80.281 -+++ b/include/linux/loop.h 80.282 -@@ -48,7 +48,7 @@ struct loop_device { 80.283 - int (*ioctl)(struct loop_device *, int cmd, 80.284 - unsigned long arg); 80.285 - 80.286 -- struct file * lo_backing_file; 80.287 -+ struct file * lo_backing_file, *lo_backing_virt_file; 80.288 - struct block_device *lo_device; 80.289 - unsigned lo_blocksize; 80.290 - void *key_data;
81.1 --- a/linux/stuff/aufs3-mmap.patch Tue Jan 28 05:56:16 2014 +0000 81.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 81.3 @@ -1,349 +0,0 @@ 81.4 -aufs3.2 mmap patch 81.5 - 81.6 -diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c 81.7 -index b1822dd..d8518aa 100644 81.8 ---- a/fs/proc/nommu.c 81.9 -+++ b/fs/proc/nommu.c 81.10 -@@ -45,7 +45,9 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region) 81.11 - file = region->vm_file; 81.12 - 81.13 - if (file) { 81.14 -- struct inode *inode = region->vm_file->f_path.dentry->d_inode; 81.15 -+ struct inode *inode; 81.16 -+ file = vmr_pr_or_file(region); 81.17 -+ inode = file->f_path.dentry->d_inode; 81.18 - dev = inode->i_sb->s_dev; 81.19 - ino = inode->i_ino; 81.20 - } 81.21 -diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c 81.22 -index e418c5a..06bbf80 100644 81.23 ---- a/fs/proc/task_mmu.c 81.24 -+++ b/fs/proc/task_mmu.c 81.25 -@@ -221,7 +221,9 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma) 81.26 - int len; 81.27 - 81.28 - if (file) { 81.29 -- struct inode *inode = vma->vm_file->f_path.dentry->d_inode; 81.30 -+ struct inode *inode; 81.31 -+ file = vma_pr_or_file(vma); 81.32 -+ inode = file->f_path.dentry->d_inode; 81.33 - dev = inode->i_sb->s_dev; 81.34 - ino = inode->i_ino; 81.35 - pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; 81.36 -@@ -1044,6 +1046,7 @@ static int show_numa_map(struct seq_file *m, void *v) 81.37 - seq_printf(m, "%08lx %s", vma->vm_start, buffer); 81.38 - 81.39 - if (file) { 81.40 -+ file = vma_pr_or_file(vma); 81.41 - seq_printf(m, " file="); 81.42 - seq_path(m, &file->f_path, "\n\t= "); 81.43 - } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { 81.44 -diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c 81.45 -index 980de54..b59aa1e 100644 81.46 ---- a/fs/proc/task_nommu.c 81.47 -+++ b/fs/proc/task_nommu.c 81.48 -@@ -147,7 +147,9 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) 81.49 - file = vma->vm_file; 81.50 - 81.51 - if (file) { 81.52 -- struct inode *inode = vma->vm_file->f_path.dentry->d_inode; 81.53 -+ struct inode *inode; 81.54 -+ file = vma_pr_or_file(file); 81.55 -+ inode = file->f_path.dentry->d_inode; 81.56 - dev = inode->i_sb->s_dev; 81.57 - ino = inode->i_ino; 81.58 - pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; 81.59 -diff --git a/include/linux/mm.h b/include/linux/mm.h 81.60 -index 4baadd1..b1ee63e 100644 81.61 ---- a/include/linux/mm.h 81.62 -+++ b/include/linux/mm.h 81.63 -@@ -17,6 +17,9 @@ 81.64 - #include <linux/pfn.h> 81.65 - #include <linux/bit_spinlock.h> 81.66 - #include <linux/shrinker.h> 81.67 -+#include <linux/dcache.h> 81.68 -+#include <linux/file.h> 81.69 -+#include <linux/fs.h> 81.70 - 81.71 - struct mempolicy; 81.72 - struct anon_vma; 81.73 -@@ -984,6 +987,87 @@ static inline int fixup_user_fault(struct task_struct *tsk, 81.74 - } 81.75 - #endif 81.76 - 81.77 -+/* 81.78 -+ * Mainly for aufs which mmap(2) diffrent file and wants to print different path 81.79 -+ * in /proc/PID/maps. 81.80 -+ */ 81.81 -+/* #define AUFS_DEBUG_MMAP */ 81.82 -+static inline void aufs_trace(struct file *f, struct file *pr, 81.83 -+ const char func[], int line, const char func2[]) 81.84 -+{ 81.85 -+#ifdef AUFS_DEBUG_MMAP 81.86 -+ if (pr) 81.87 -+ pr_info("%s:%d: %s, %p\n", func, line, func2, 81.88 -+ f ? (char *)f->f_dentry->d_name.name : "(null)"); 81.89 -+#endif 81.90 -+} 81.91 -+ 81.92 -+static inline struct file *vmr_do_pr_or_file(struct vm_region *region, 81.93 -+ const char func[], int line) 81.94 -+{ 81.95 -+ struct file *f = region->vm_file, *pr = region->vm_prfile; 81.96 -+ aufs_trace(f, pr, func, line, __func__); 81.97 -+ return (f && pr) ? pr : f; 81.98 -+} 81.99 -+ 81.100 -+static inline void vmr_do_fput(struct vm_region *region, 81.101 -+ const char func[], int line) 81.102 -+{ 81.103 -+ struct file *f = region->vm_file, *pr = region->vm_prfile; 81.104 -+ aufs_trace(f, pr, func, line, __func__); 81.105 -+ fput(f); 81.106 -+ if (f && pr) 81.107 -+ fput(pr); 81.108 -+} 81.109 -+ 81.110 -+static inline void vma_do_file_update_time(struct vm_area_struct *vma, 81.111 -+ const char func[], int line) 81.112 -+{ 81.113 -+ struct file *f = vma->vm_file, *pr = vma->vm_prfile; 81.114 -+ aufs_trace(f, pr, func, line, __func__); 81.115 -+ file_update_time(f); 81.116 -+ if (f && pr) 81.117 -+ file_update_time(pr); 81.118 -+} 81.119 -+ 81.120 -+static inline struct file *vma_do_pr_or_file(struct vm_area_struct *vma, 81.121 -+ const char func[], int line) 81.122 -+{ 81.123 -+ struct file *f = vma->vm_file, *pr = vma->vm_prfile; 81.124 -+ aufs_trace(f, pr, func, line, __func__); 81.125 -+ return (f && pr) ? pr : f; 81.126 -+} 81.127 -+ 81.128 -+static inline void vma_do_get_file(struct vm_area_struct *vma, 81.129 -+ const char func[], int line) 81.130 -+{ 81.131 -+ struct file *f = vma->vm_file, *pr = vma->vm_prfile; 81.132 -+ aufs_trace(f, pr, func, line, __func__); 81.133 -+ get_file(f); 81.134 -+ if (f && pr) 81.135 -+ get_file(pr); 81.136 -+} 81.137 -+ 81.138 -+static inline void vma_do_fput(struct vm_area_struct *vma, 81.139 -+ const char func[], int line) 81.140 -+{ 81.141 -+ struct file *f = vma->vm_file, *pr = vma->vm_prfile; 81.142 -+ aufs_trace(f, pr, func, line, __func__); 81.143 -+ fput(f); 81.144 -+ if (f && pr) 81.145 -+ fput(pr); 81.146 -+} 81.147 -+ 81.148 -+#define vmr_pr_or_file(region) vmr_do_pr_or_file(region, __func__, \ 81.149 -+ __LINE__) 81.150 -+#define vmr_fput(region) vmr_do_fput(region, __func__, __LINE__) 81.151 -+#define vma_file_update_time(vma) vma_do_file_update_time(vma, __func__, \ 81.152 -+ __LINE__) 81.153 -+#define vma_pr_or_file(vma) vma_do_pr_or_file(vma, __func__, \ 81.154 -+ __LINE__) 81.155 -+#define vma_get_file(vma) vma_do_get_file(vma, __func__, __LINE__) 81.156 -+#define vma_fput(vma) vma_do_fput(vma, __func__, __LINE__) 81.157 -+ 81.158 - extern int make_pages_present(unsigned long addr, unsigned long end); 81.159 - extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write); 81.160 - extern int access_remote_vm(struct mm_struct *mm, unsigned long addr, 81.161 -diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h 81.162 -index 5b42f1b..a49a07e 100644 81.163 ---- a/include/linux/mm_types.h 81.164 -+++ b/include/linux/mm_types.h 81.165 -@@ -186,6 +186,7 @@ struct vm_region { 81.166 - unsigned long vm_top; /* region allocated to here */ 81.167 - unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */ 81.168 - struct file *vm_file; /* the backing file or NULL */ 81.169 -+ struct file *vm_prfile; /* the virtual backing file or NULL */ 81.170 - 81.171 - int vm_usage; /* region usage count (access under nommu_region_sem) */ 81.172 - bool vm_icache_flushed : 1; /* true if the icache has been flushed for 81.173 -@@ -245,6 +246,7 @@ struct vm_area_struct { 81.174 - unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE 81.175 - units, *not* PAGE_CACHE_SIZE */ 81.176 - struct file * vm_file; /* File we map to (can be NULL). */ 81.177 -+ struct file *vm_prfile; /* shadow of vm_file */ 81.178 - void * vm_private_data; /* was vm_pte (shared mem) */ 81.179 - 81.180 - #ifndef CONFIG_MMU 81.181 -diff --git a/kernel/fork.c b/kernel/fork.c 81.182 -index da4a6a1..4a31675 100644 81.183 ---- a/kernel/fork.c 81.184 -+++ b/kernel/fork.c 81.185 -@@ -378,7 +378,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) 81.186 - struct inode *inode = file->f_path.dentry->d_inode; 81.187 - struct address_space *mapping = file->f_mapping; 81.188 - 81.189 -- get_file(file); 81.190 -+ vma_get_file(tmp); 81.191 - if (tmp->vm_flags & VM_DENYWRITE) 81.192 - atomic_dec(&inode->i_writecount); 81.193 - mutex_lock(&mapping->i_mmap_mutex); 81.194 -diff --git a/mm/fremap.c b/mm/fremap.c 81.195 -index 9ed4fd4..00ee66b 100644 81.196 ---- a/mm/fremap.c 81.197 -+++ b/mm/fremap.c 81.198 -@@ -198,10 +198,10 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, 81.199 - struct file *file = vma->vm_file; 81.200 - 81.201 - flags &= MAP_NONBLOCK; 81.202 -- get_file(file); 81.203 -+ vma_get_file(vma); 81.204 - addr = mmap_region(file, start, size, 81.205 - flags, vma->vm_flags, pgoff); 81.206 -- fput(file); 81.207 -+ vma_fput(vma); 81.208 - if (IS_ERR_VALUE(addr)) { 81.209 - err = addr; 81.210 - } else { 81.211 -diff --git a/mm/memory.c b/mm/memory.c 81.212 -index 829d437..6c6f9f1 100644 81.213 ---- a/mm/memory.c 81.214 -+++ b/mm/memory.c 81.215 -@@ -2684,7 +2684,7 @@ reuse: 81.216 - 81.217 - /* file_update_time outside page_lock */ 81.218 - if (vma->vm_file) 81.219 -- file_update_time(vma->vm_file); 81.220 -+ vma_file_update_time(vma); 81.221 - 81.222 - return ret; 81.223 - } 81.224 -@@ -3369,7 +3369,7 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, 81.225 - 81.226 - /* file_update_time outside page_lock */ 81.227 - if (vma->vm_file) 81.228 -- file_update_time(vma->vm_file); 81.229 -+ vma_file_update_time(vma); 81.230 - } else { 81.231 - unlock_page(vmf.page); 81.232 - if (anon) 81.233 -diff --git a/mm/mmap.c b/mm/mmap.c 81.234 -index eae90af..570ac61 100644 81.235 ---- a/mm/mmap.c 81.236 -+++ b/mm/mmap.c 81.237 -@@ -231,7 +231,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) 81.238 - if (vma->vm_ops && vma->vm_ops->close) 81.239 - vma->vm_ops->close(vma); 81.240 - if (vma->vm_file) { 81.241 -- fput(vma->vm_file); 81.242 -+ vma_fput(vma); 81.243 - if (vma->vm_flags & VM_EXECUTABLE) 81.244 - removed_exe_file_vma(vma->vm_mm); 81.245 - } 81.246 -@@ -618,7 +618,7 @@ again: remove_next = 1 + (end > next->vm_end); 81.247 - 81.248 - if (remove_next) { 81.249 - if (file) { 81.250 -- fput(file); 81.251 -+ vma_fput(vma); 81.252 - if (next->vm_flags & VM_EXECUTABLE) 81.253 - removed_exe_file_vma(mm); 81.254 - } 81.255 -@@ -1334,8 +1334,8 @@ out: 81.256 - unmap_and_free_vma: 81.257 - if (correct_wcount) 81.258 - atomic_inc(&inode->i_writecount); 81.259 -+ vma_fput(vma); 81.260 - vma->vm_file = NULL; 81.261 -- fput(file); 81.262 - 81.263 - /* Undo any partial mapping done by a device driver. */ 81.264 - unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); 81.265 -@@ -1964,7 +1964,7 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, 81.266 - goto out_free_mpol; 81.267 - 81.268 - if (new->vm_file) { 81.269 -- get_file(new->vm_file); 81.270 -+ vma_get_file(new); 81.271 - if (vma->vm_flags & VM_EXECUTABLE) 81.272 - added_exe_file_vma(mm); 81.273 - } 81.274 -@@ -1988,7 +1988,7 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, 81.275 - if (new->vm_file) { 81.276 - if (vma->vm_flags & VM_EXECUTABLE) 81.277 - removed_exe_file_vma(mm); 81.278 -- fput(new->vm_file); 81.279 -+ vma_fput(new); 81.280 - } 81.281 - unlink_anon_vmas(new); 81.282 - out_free_mpol: 81.283 -@@ -2355,7 +2355,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, 81.284 - new_vma->vm_end = addr + len; 81.285 - new_vma->vm_pgoff = pgoff; 81.286 - if (new_vma->vm_file) { 81.287 -- get_file(new_vma->vm_file); 81.288 -+ vma_get_file(new_vma); 81.289 - if (vma->vm_flags & VM_EXECUTABLE) 81.290 - added_exe_file_vma(mm); 81.291 - } 81.292 -diff --git a/mm/msync.c b/mm/msync.c 81.293 -index 632df45..02d770e 100644 81.294 ---- a/mm/msync.c 81.295 -+++ b/mm/msync.c 81.296 -@@ -80,10 +80,10 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags) 81.297 - start = vma->vm_end; 81.298 - if ((flags & MS_SYNC) && file && 81.299 - (vma->vm_flags & VM_SHARED)) { 81.300 -- get_file(file); 81.301 -+ vma_get_file(vma); 81.302 - up_read(&mm->mmap_sem); 81.303 - error = vfs_fsync(file, 0); 81.304 -- fput(file); 81.305 -+ vma_fput(vma); 81.306 - if (error || start >= end) 81.307 - goto out; 81.308 - down_read(&mm->mmap_sem); 81.309 -diff --git a/mm/nommu.c b/mm/nommu.c 81.310 -index b982290..6eb4f31 100644 81.311 ---- a/mm/nommu.c 81.312 -+++ b/mm/nommu.c 81.313 -@@ -632,7 +632,7 @@ static void __put_nommu_region(struct vm_region *region) 81.314 - up_write(&nommu_region_sem); 81.315 - 81.316 - if (region->vm_file) 81.317 -- fput(region->vm_file); 81.318 -+ vmr_fput(region); 81.319 - 81.320 - /* IO memory and memory shared directly out of the pagecache 81.321 - * from ramfs/tmpfs mustn't be released here */ 81.322 -@@ -790,7 +790,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) 81.323 - if (vma->vm_ops && vma->vm_ops->close) 81.324 - vma->vm_ops->close(vma); 81.325 - if (vma->vm_file) { 81.326 -- fput(vma->vm_file); 81.327 -+ vma_fput(vma); 81.328 - if (vma->vm_flags & VM_EXECUTABLE) 81.329 - removed_exe_file_vma(mm); 81.330 - } 81.331 -@@ -1363,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file, 81.332 - goto error_just_free; 81.333 - } 81.334 - } 81.335 -- fput(region->vm_file); 81.336 -+ vmr_fput(region); 81.337 - kmem_cache_free(vm_region_jar, region); 81.338 - region = pregion; 81.339 - result = start; 81.340 -@@ -1439,10 +1439,10 @@ error_just_free: 81.341 - up_write(&nommu_region_sem); 81.342 - error: 81.343 - if (region->vm_file) 81.344 -- fput(region->vm_file); 81.345 -+ vmr_fput(region); 81.346 - kmem_cache_free(vm_region_jar, region); 81.347 - if (vma->vm_file) 81.348 -- fput(vma->vm_file); 81.349 -+ vma_fput(vma); 81.350 - if (vma->vm_flags & VM_EXECUTABLE) 81.351 - removed_exe_file_vma(vma->vm_mm); 81.352 - kmem_cache_free(vm_area_cachep, vma);
82.1 --- a/linux/stuff/aufs3-standalone.patch Tue Jan 28 05:56:16 2014 +0000 82.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 82.3 @@ -1,257 +0,0 @@ 82.4 -aufs3.2 standalone patch 82.5 - 82.6 -diff --git a/fs/file_table.c b/fs/file_table.c 82.7 -index c322794..2aad244 100644 82.8 ---- a/fs/file_table.c 82.9 -+++ b/fs/file_table.c 82.10 -@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) 82.11 - } 82.12 - } 82.13 - 82.14 -+EXPORT_SYMBOL(file_sb_list_del); 82.15 -+ 82.16 - #ifdef CONFIG_SMP 82.17 - 82.18 - /* 82.19 -diff --git a/fs/inode.c b/fs/inode.c 82.20 -index ee4e66b..728042b 100644 82.21 ---- a/fs/inode.c 82.22 -+++ b/fs/inode.c 82.23 -@@ -65,6 +65,7 @@ static struct hlist_head *inode_hashtable __read_mostly; 82.24 - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); 82.25 - 82.26 - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); 82.27 -+EXPORT_SYMBOL(inode_sb_list_lock); 82.28 - 82.29 - /* 82.30 - * Empty aops. Can be used for the cases where the user does not 82.31 -diff --git a/fs/namei.c b/fs/namei.c 82.32 -index 4cc94cf..af19e30 100644 82.33 ---- a/fs/namei.c 82.34 -+++ b/fs/namei.c 82.35 -@@ -1759,6 +1759,7 @@ struct dentry *lookup_hash(struct nameidata *nd) 82.36 - { 82.37 - return __lookup_hash(&nd->last, nd->path.dentry, nd); 82.38 - } 82.39 -+EXPORT_SYMBOL(lookup_hash); 82.40 - 82.41 - /** 82.42 - * lookup_one_len - filesystem helper to lookup single pathname component 82.43 -diff --git a/fs/namespace.c b/fs/namespace.c 82.44 -index cfc6d44..173d15a 100644 82.45 ---- a/fs/namespace.c 82.46 -+++ b/fs/namespace.c 82.47 -@@ -1507,6 +1507,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, 82.48 - } 82.49 - return 0; 82.50 - } 82.51 -+EXPORT_SYMBOL(iterate_mounts); 82.52 - 82.53 - static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) 82.54 - { 82.55 -diff --git a/fs/notify/group.c b/fs/notify/group.c 82.56 -index 63fc294..6f4adca 100644 82.57 ---- a/fs/notify/group.c 82.58 -+++ b/fs/notify/group.c 82.59 -@@ -22,6 +22,7 @@ 82.60 - #include <linux/srcu.h> 82.61 - #include <linux/rculist.h> 82.62 - #include <linux/wait.h> 82.63 -+#include <linux/module.h> 82.64 - 82.65 - #include <linux/fsnotify_backend.h> 82.66 - #include "fsnotify.h" 82.67 -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) 82.68 - if (atomic_dec_and_test(&group->refcnt)) 82.69 - fsnotify_destroy_group(group); 82.70 - } 82.71 -+EXPORT_SYMBOL(fsnotify_put_group); 82.72 - 82.73 - /* 82.74 - * Create a new fsnotify_group and hold a reference for the group returned. 82.75 -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) 82.76 - 82.77 - return group; 82.78 - } 82.79 -+EXPORT_SYMBOL(fsnotify_alloc_group); 82.80 -diff --git a/fs/notify/mark.c b/fs/notify/mark.c 82.81 -index e14587d..be6533b 100644 82.82 ---- a/fs/notify/mark.c 82.83 -+++ b/fs/notify/mark.c 82.84 -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) 82.85 - if (atomic_dec_and_test(&mark->refcnt)) 82.86 - mark->free_mark(mark); 82.87 - } 82.88 -+EXPORT_SYMBOL(fsnotify_put_mark); 82.89 - 82.90 - /* 82.91 - * Any time a mark is getting freed we end up here. 82.92 -@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) 82.93 - if (unlikely(atomic_dec_and_test(&group->num_marks))) 82.94 - fsnotify_final_destroy_group(group); 82.95 - } 82.96 -+EXPORT_SYMBOL(fsnotify_destroy_mark); 82.97 - 82.98 - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) 82.99 - { 82.100 -@@ -278,6 +280,7 @@ err: 82.101 - 82.102 - return ret; 82.103 - } 82.104 -+EXPORT_SYMBOL(fsnotify_add_mark); 82.105 - 82.106 - /* 82.107 - * clear any marks in a group in which mark->flags & flags is true 82.108 -@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, 82.109 - atomic_set(&mark->refcnt, 1); 82.110 - mark->free_mark = free_mark; 82.111 - } 82.112 -+EXPORT_SYMBOL(fsnotify_init_mark); 82.113 - 82.114 - static int fsnotify_mark_destroy(void *ignored) 82.115 - { 82.116 -diff --git a/fs/open.c b/fs/open.c 82.117 -index 22c41b5..33b4033 100644 82.118 ---- a/fs/open.c 82.119 -+++ b/fs/open.c 82.120 -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, 82.121 - mutex_unlock(&dentry->d_inode->i_mutex); 82.122 - return ret; 82.123 - } 82.124 -+EXPORT_SYMBOL(do_truncate); 82.125 - 82.126 - static long do_sys_truncate(const char __user *pathname, loff_t length) 82.127 - { 82.128 -diff --git a/fs/splice.c b/fs/splice.c 82.129 -index e3569b0..9dc07b7 100644 82.130 ---- a/fs/splice.c 82.131 -+++ b/fs/splice.c 82.132 -@@ -1118,6 +1118,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 82.133 - 82.134 - return splice_write(pipe, out, ppos, len, flags); 82.135 - } 82.136 -+EXPORT_SYMBOL(do_splice_from); 82.137 - 82.138 - /* 82.139 - * Attempt to initiate a splice from a file to a pipe. 82.140 -@@ -1144,6 +1145,7 @@ long do_splice_to(struct file *in, loff_t *ppos, 82.141 - 82.142 - return splice_read(in, ppos, pipe, len, flags); 82.143 - } 82.144 -+EXPORT_SYMBOL(do_splice_to); 82.145 - 82.146 - /** 82.147 - * splice_direct_to_actor - splices data directly between two non-pipes 82.148 -diff --git a/security/commoncap.c b/security/commoncap.c 82.149 -index ee4f848..611fd70 100644 82.150 ---- a/security/commoncap.c 82.151 -+++ b/security/commoncap.c 82.152 -@@ -981,3 +981,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, 82.153 - } 82.154 - return ret; 82.155 - } 82.156 -+EXPORT_SYMBOL(cap_file_mmap); 82.157 -diff --git a/security/device_cgroup.c b/security/device_cgroup.c 82.158 -index 4450fbe..bc94175 100644 82.159 ---- a/security/device_cgroup.c 82.160 -+++ b/security/device_cgroup.c 82.161 -@@ -7,6 +7,7 @@ 82.162 - #include <linux/device_cgroup.h> 82.163 - #include <linux/cgroup.h> 82.164 - #include <linux/ctype.h> 82.165 -+#include <linux/export.h> 82.166 - #include <linux/list.h> 82.167 - #include <linux/uaccess.h> 82.168 - #include <linux/seq_file.h> 82.169 -@@ -500,6 +501,7 @@ found: 82.170 - 82.171 - return -EPERM; 82.172 - } 82.173 -+EXPORT_SYMBOL(__devcgroup_inode_permission); 82.174 - 82.175 - int devcgroup_inode_mknod(int mode, dev_t dev) 82.176 - { 82.177 -diff --git a/security/security.c b/security/security.c 82.178 -index e2f684a..892000c 100644 82.179 ---- a/security/security.c 82.180 -+++ b/security/security.c 82.181 -@@ -411,6 +411,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) 82.182 - return 0; 82.183 - return security_ops->path_rmdir(dir, dentry); 82.184 - } 82.185 -+EXPORT_SYMBOL(security_path_rmdir); 82.186 - 82.187 - int security_path_unlink(struct path *dir, struct dentry *dentry) 82.188 - { 82.189 -@@ -427,6 +428,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, 82.190 - return 0; 82.191 - return security_ops->path_symlink(dir, dentry, old_name); 82.192 - } 82.193 -+EXPORT_SYMBOL(security_path_symlink); 82.194 - 82.195 - int security_path_link(struct dentry *old_dentry, struct path *new_dir, 82.196 - struct dentry *new_dentry) 82.197 -@@ -435,6 +437,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, 82.198 - return 0; 82.199 - return security_ops->path_link(old_dentry, new_dir, new_dentry); 82.200 - } 82.201 -+EXPORT_SYMBOL(security_path_link); 82.202 - 82.203 - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, 82.204 - struct path *new_dir, struct dentry *new_dentry) 82.205 -@@ -453,6 +456,7 @@ int security_path_truncate(struct path *path) 82.206 - return 0; 82.207 - return security_ops->path_truncate(path); 82.208 - } 82.209 -+EXPORT_SYMBOL(security_path_truncate); 82.210 - 82.211 - int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, 82.212 - mode_t mode) 82.213 -@@ -461,6 +465,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, 82.214 - return 0; 82.215 - return security_ops->path_chmod(dentry, mnt, mode); 82.216 - } 82.217 -+EXPORT_SYMBOL(security_path_chmod); 82.218 - 82.219 - int security_path_chown(struct path *path, uid_t uid, gid_t gid) 82.220 - { 82.221 -@@ -468,6 +473,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) 82.222 - return 0; 82.223 - return security_ops->path_chown(path, uid, gid); 82.224 - } 82.225 -+EXPORT_SYMBOL(security_path_chown); 82.226 - 82.227 - int security_path_chroot(struct path *path) 82.228 - { 82.229 -@@ -544,6 +550,7 @@ int security_inode_readlink(struct dentry *dentry) 82.230 - return 0; 82.231 - return security_ops->inode_readlink(dentry); 82.232 - } 82.233 -+EXPORT_SYMBOL(security_inode_readlink); 82.234 - 82.235 - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) 82.236 - { 82.237 -@@ -558,6 +565,7 @@ int security_inode_permission(struct inode *inode, int mask) 82.238 - return 0; 82.239 - return security_ops->inode_permission(inode, mask); 82.240 - } 82.241 -+EXPORT_SYMBOL(security_inode_permission); 82.242 - 82.243 - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) 82.244 - { 82.245 -@@ -673,6 +681,7 @@ int security_file_permission(struct file *file, int mask) 82.246 - 82.247 - return fsnotify_perm(file, mask); 82.248 - } 82.249 -+EXPORT_SYMBOL(security_file_permission); 82.250 - 82.251 - int security_file_alloc(struct file *file) 82.252 - { 82.253 -@@ -700,6 +709,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, 82.254 - return ret; 82.255 - return ima_file_mmap(file, prot); 82.256 - } 82.257 -+EXPORT_SYMBOL(security_file_mmap); 82.258 - 82.259 - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, 82.260 - unsigned long prot)
83.1 --- a/linux/stuff/channel-negative-one-maxim.patch Tue Jan 28 05:56:16 2014 +0000 83.2 +++ b/linux/stuff/channel-negative-one-maxim.patch Wed Jan 29 09:56:07 2014 +0100 83.3 @@ -12,7 +12,7 @@ 83.4 index b01a6f6..09d979b 100644 83.5 --- a/net/wireless/chan.c 83.6 +++ b/net/wireless/chan.c 83.7 -@@ -82,9 +82,12 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, 83.8 +@@ -49,9 +49,12 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, 83.9 { 83.10 struct ieee80211_channel *chan; 83.11 int result; 83.12 @@ -26,7 +26,7 @@ 83.13 83.14 if (wdev) { 83.15 ASSERT_WDEV_LOCK(wdev); 83.16 -@@ -131,5 +134,8 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, 83.17 +@@ -76,5 +79,8 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, 83.18 if (wdev) 83.19 wdev->channel = chan; 83.20
84.1 --- a/linux/stuff/check_modules.sh Tue Jan 28 05:56:16 2014 +0000 84.2 +++ b/linux/stuff/check_modules.sh Wed Jan 29 09:56:07 2014 +0100 84.3 @@ -1,14 +1,10 @@ 84.4 #!/bin/sh 84.5 # Echo any module in kernel .config that's not added to one of linux-* pkgs 84.6 -# (c) SliTaz - GNU General Public License. 84.7 -# 20090618 <jozee@slitaz.org> 84.8 -# 20100528 <pankso@slitaz.org> 84.9 +# (c) 2009-2014 SliTaz - GNU General Public License. 84.10 # 84.11 -#. /etc/slitaz/slitaz.conf 84.12 84.13 -#WOK=$LOCAL_REPOSITORY/wok 84.14 WOK=$(cd `dirname $0` && pwd | sed 's/wok.*/wok/') 84.15 -VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` 84.16 +VERSION=$(grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g') 84.17 BASEVER="${VERSION:0:3}" 84.18 src="$WOK/linux/source/linux-$VERSION" 84.19 84.20 @@ -34,7 +30,7 @@ 84.21 fi 84.22 done 84.23 # get the original list in .config 84.24 -for i in $(find $_pkg -iname "*.ko.?z") 84.25 +for i in $(find $install -iname "*.ko.?z") 84.26 do 84.27 basename $i 84.28 done > $tmp/original-"$VERSION".list 84.29 @@ -42,7 +38,7 @@ 84.30 for i in $(cat $tmp/original-$VERSION.list) 84.31 do 84.32 if ! grep -qs "$i" $tmp/pkgs-modules-"$VERSION".list ; then 84.33 - modpath=`find $_pkg -iname "$i"` 84.34 + modpath=`find $install -iname "$i"` 84.35 echo "Orphan module: $i" 84.36 echo "$i : $modpath" >> $tmp/unpackaged-modules-"$VERSION".list 84.37 fi
85.1 --- a/linux/stuff/gztazmod.sh Tue Jan 28 05:56:16 2014 +0000 85.2 +++ b/linux/stuff/gztazmod.sh Wed Jan 29 09:56:07 2014 +0100 85.3 @@ -1,42 +1,28 @@ 85.4 #!/bin/sh 85.5 # gztazmod.sh: Compress Linux kernel modules for SliTaz GNU/Linux. 85.6 -# 2007/10/04 <pankso@slitaz.org> - GNU General Public License. 85.7 +# 2007-2014 <pankso@slitaz.org> - GNU General Public License. 85.8 # 85.9 +. /lib/libtaz.sh 85.10 85.11 # We do our work in the kernel version modules directory. 85.12 if [ -z "$1" ] ; then 85.13 - echo "" 85.14 - echo -e "\033[1musage:\033[0m `basename $0` path/to/kernel-version" 85.15 - echo "" 85.16 - exit 1 85.17 + newline 85.18 + echo "Usage: $(basename $0) path/to/kernel-version" 85.19 + newline && exit 1 85.20 fi 85.21 85.22 if [ ! -r "$1" ] ; then 85.23 - echo "" 85.24 - echo -e "Error : $1 does not exist." 85.25 - echo "" 85.26 - exit 1 85.27 + newline 85.28 + echo -e "Error : $1 does not exist." 85.29 + newline && exit 1 85.30 fi 85.31 85.32 cd $1 85.33 85.34 -# Status functions. 85.35 -status() 85.36 -{ 85.37 - local CHECK=$? 85.38 - echo -en "\\033[70G[ " 85.39 - if [ $CHECK = 0 ]; then 85.40 - echo -en "\\033[1;33mOK" 85.41 - else 85.42 - echo -en "\\033[1;31mFailed" 85.43 - fi 85.44 - echo -e "\\033[0;39m ]" 85.45 -} 85.46 - 85.47 # Script start. 85.48 -echo "" 85.49 +newline 85.50 echo "Starting gztazmod.sh to build compressed kernel modules... " 85.51 -echo "" 85.52 +newline 85.53 85.54 # Find all modules. 85.55 echo -n "Searching all modules to compress them... " 85.56 @@ -62,6 +48,6 @@ 85.57 status 85.58 85.59 # Script end. 85.60 -echo "" 85.61 +newline 85.62 echo "Kernel modules `basename $1` are ready." 85.63 -echo "" 85.64 +newline
86.1 --- a/linux/stuff/linux-slitaz.config Tue Jan 28 05:56:16 2014 +0000 86.2 +++ b/linux/stuff/linux-slitaz.config Wed Jan 29 09:56:07 2014 +0100 86.3 @@ -1,6 +1,6 @@ 86.4 # 86.5 # Automatically generated file; DO NOT EDIT. 86.6 -# Linux/i386 3.2 Kernel Configuration 86.7 +# Linux/i386 3.2.53 Kernel Configuration 86.8 # 86.9 # CONFIG_64BIT is not set 86.10 CONFIG_X86_32=y 86.11 @@ -114,47 +114,33 @@ 86.12 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y 86.13 CONFIG_CGROUPS=y 86.14 # CONFIG_CGROUP_DEBUG is not set 86.15 -CONFIG_CGROUP_FREEZER=y 86.16 -CONFIG_CGROUP_DEVICE=y 86.17 -CONFIG_CPUSETS=y 86.18 -CONFIG_PROC_PID_CPUSET=y 86.19 -CONFIG_CGROUP_CPUACCT=y 86.20 -CONFIG_RESOURCE_COUNTERS=y 86.21 -CONFIG_CGROUP_MEM_RES_CTLR=y 86.22 -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y 86.23 -CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y 86.24 -CONFIG_CGROUP_PERF=y 86.25 +# CONFIG_CGROUP_FREEZER is not set 86.26 +# CONFIG_CGROUP_DEVICE is not set 86.27 +# CONFIG_CPUSETS is not set 86.28 +# CONFIG_CGROUP_CPUACCT is not set 86.29 +# CONFIG_RESOURCE_COUNTERS is not set 86.30 +# CONFIG_CGROUP_PERF is not set 86.31 CONFIG_CGROUP_SCHED=y 86.32 CONFIG_FAIR_GROUP_SCHED=y 86.33 CONFIG_CFS_BANDWIDTH=y 86.34 -# CONFIG_RT_GROUP_SCHED is not set 86.35 -CONFIG_BLK_CGROUP=y 86.36 -# CONFIG_DEBUG_BLK_CGROUP is not set 86.37 +CONFIG_RT_GROUP_SCHED=y 86.38 +# CONFIG_BLK_CGROUP is not set 86.39 CONFIG_NAMESPACES=y 86.40 -CONFIG_UTS_NS=y 86.41 -CONFIG_IPC_NS=y 86.42 -CONFIG_USER_NS=y 86.43 -CONFIG_PID_NS=y 86.44 -CONFIG_NET_NS=y 86.45 +# CONFIG_UTS_NS is not set 86.46 +# CONFIG_IPC_NS is not set 86.47 +# CONFIG_USER_NS is not set 86.48 +# CONFIG_PID_NS is not set 86.49 +# CONFIG_NET_NS is not set 86.50 CONFIG_SCHED_AUTOGROUP=y 86.51 -CONFIG_MM_OWNER=y 86.52 # CONFIG_SYSFS_DEPRECATED is not set 86.53 # CONFIG_RELAY is not set 86.54 CONFIG_BLK_DEV_INITRD=y 86.55 -CONFIG_INITRAMFS_SOURCE="initrd.cpio" 86.56 -CONFIG_INITRAMFS_ROOT_UID=0 86.57 -CONFIG_INITRAMFS_ROOT_GID=0 86.58 +CONFIG_INITRAMFS_SOURCE="" 86.59 CONFIG_RD_GZIP=y 86.60 CONFIG_RD_BZIP2=y 86.61 CONFIG_RD_LZMA=y 86.62 CONFIG_RD_XZ=y 86.63 CONFIG_RD_LZO=y 86.64 -# CONFIG_INITRAMFS_COMPRESSION_NONE is not set 86.65 -# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set 86.66 -# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set 86.67 -CONFIG_INITRAMFS_COMPRESSION_LZMA=y 86.68 -# CONFIG_INITRAMFS_COMPRESSION_XZ is not set 86.69 -# CONFIG_INITRAMFS_COMPRESSION_LZO is not set 86.70 CONFIG_CC_OPTIMIZE_FOR_SIZE=y 86.71 CONFIG_SYSCTL=y 86.72 CONFIG_ANON_INODES=y 86.73 @@ -230,7 +216,6 @@ 86.74 CONFIG_BLK_DEV_BSG=y 86.75 CONFIG_BLK_DEV_BSGLIB=y 86.76 # CONFIG_BLK_DEV_INTEGRITY is not set 86.77 -# CONFIG_BLK_DEV_THROTTLING is not set 86.78 86.79 # 86.80 # IO Schedulers 86.81 @@ -349,7 +334,7 @@ 86.82 CONFIG_DMI=y 86.83 # CONFIG_IOMMU_HELPER is not set 86.84 CONFIG_NR_CPUS=8 86.85 -# CONFIG_SCHED_SMT is not set 86.86 +CONFIG_SCHED_SMT=y 86.87 CONFIG_SCHED_MC=y 86.88 # CONFIG_IRQ_TIME_ACCOUNTING is not set 86.89 CONFIG_PREEMPT_NONE=y 86.90 @@ -417,7 +402,7 @@ 86.91 CONFIG_X86_PAT=y 86.92 CONFIG_ARCH_USES_PG_UNCACHED=y 86.93 CONFIG_ARCH_RANDOM=y 86.94 -# CONFIG_EFI is not set 86.95 +CONFIG_EFI=y 86.96 # CONFIG_SECCOMP is not set 86.97 # CONFIG_CC_STACKPROTECTOR is not set 86.98 # CONFIG_HZ_100 is not set 86.99 @@ -496,10 +481,10 @@ 86.100 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 86.101 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set 86.102 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y 86.103 -CONFIG_CPU_FREQ_GOV_POWERSAVE=y 86.104 +CONFIG_CPU_FREQ_GOV_POWERSAVE=m 86.105 CONFIG_CPU_FREQ_GOV_USERSPACE=y 86.106 CONFIG_CPU_FREQ_GOV_ONDEMAND=y 86.107 -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y 86.108 +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m 86.109 86.110 # 86.111 # x86 CPU frequency scaling drivers 86.112 @@ -528,7 +513,7 @@ 86.113 CONFIG_CPU_IDLE=y 86.114 CONFIG_CPU_IDLE_GOV_LADDER=y 86.115 CONFIG_CPU_IDLE_GOV_MENU=y 86.116 -CONFIG_INTEL_IDLE=y 86.117 +# CONFIG_INTEL_IDLE is not set 86.118 86.119 # 86.120 # Bus options (PCI etc.) 86.121 @@ -1188,7 +1173,8 @@ 86.122 CONFIG_BLK_DEV_DRBD=m 86.123 # CONFIG_DRBD_FAULT_INJECTION is not set 86.124 CONFIG_BLK_DEV_NBD=m 86.125 -# CONFIG_BLK_DEV_SX8 is not set 86.126 +CONFIG_BLK_DEV_OSD=m 86.127 +CONFIG_BLK_DEV_SX8=m 86.128 # CONFIG_BLK_DEV_UB is not set 86.129 CONFIG_BLK_DEV_RAM=y 86.130 CONFIG_BLK_DEV_RAM_COUNT=16 86.131 @@ -1254,208 +1240,154 @@ 86.132 # 86.133 CONFIG_ALTERA_STAPL=m 86.134 CONFIG_HAVE_IDE=y 86.135 -CONFIG_IDE=y 86.136 +# CONFIG_IDE is not set 86.137 86.138 # 86.139 -# Please see Documentation/ide/ide.txt for help/info on IDE drives 86.140 -# 86.141 -CONFIG_IDE_XFER_MODE=y 86.142 -CONFIG_IDE_TIMINGS=y 86.143 -CONFIG_IDE_ATAPI=y 86.144 -CONFIG_IDE_LEGACY=y 86.145 -# CONFIG_BLK_DEV_IDE_SATA is not set 86.146 -CONFIG_IDE_GD=y 86.147 -CONFIG_IDE_GD_ATA=y 86.148 -# CONFIG_IDE_GD_ATAPI is not set 86.149 -CONFIG_BLK_DEV_IDECS=m 86.150 -# CONFIG_BLK_DEV_DELKIN is not set 86.151 -CONFIG_BLK_DEV_IDECD=y 86.152 -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 86.153 -# CONFIG_BLK_DEV_IDETAPE is not set 86.154 -# CONFIG_BLK_DEV_IDEACPI is not set 86.155 -# CONFIG_IDE_TASK_IOCTL is not set 86.156 -CONFIG_IDE_PROC_FS=y 86.157 - 86.158 -# 86.159 -# IDE chipset support/bugfixes 86.160 -# 86.161 -CONFIG_IDE_GENERIC=y 86.162 -# CONFIG_BLK_DEV_PLATFORM is not set 86.163 -CONFIG_BLK_DEV_CMD640=y 86.164 -# CONFIG_BLK_DEV_CMD640_ENHANCED is not set 86.165 -# CONFIG_BLK_DEV_IDEPNP is not set 86.166 -CONFIG_BLK_DEV_IDEDMA_SFF=y 86.167 - 86.168 -# 86.169 -# PCI IDE chipsets support 86.170 -# 86.171 -CONFIG_BLK_DEV_IDEPCI=y 86.172 -CONFIG_IDEPCI_PCIBUS_ORDER=y 86.173 -# CONFIG_BLK_DEV_OFFBOARD is not set 86.174 -CONFIG_BLK_DEV_GENERIC=y 86.175 -# CONFIG_BLK_DEV_OPTI621 is not set 86.176 -CONFIG_BLK_DEV_RZ1000=y 86.177 -CONFIG_BLK_DEV_IDEDMA_PCI=y 86.178 -CONFIG_BLK_DEV_AEC62XX=y 86.179 -CONFIG_BLK_DEV_ALI15X3=y 86.180 -CONFIG_BLK_DEV_AMD74XX=y 86.181 -CONFIG_BLK_DEV_ATIIXP=y 86.182 -CONFIG_BLK_DEV_CMD64X=y 86.183 -CONFIG_BLK_DEV_TRIFLEX=y 86.184 -# CONFIG_BLK_DEV_CS5520 is not set 86.185 -CONFIG_BLK_DEV_CS5530=y 86.186 -CONFIG_BLK_DEV_CS5535=y 86.187 -CONFIG_BLK_DEV_CS5536=y 86.188 -CONFIG_BLK_DEV_HPT366=y 86.189 -CONFIG_BLK_DEV_JMICRON=y 86.190 -CONFIG_BLK_DEV_SC1200=y 86.191 -CONFIG_BLK_DEV_PIIX=y 86.192 -CONFIG_BLK_DEV_IT8172=y 86.193 -CONFIG_BLK_DEV_IT8213=y 86.194 -CONFIG_BLK_DEV_IT821X=y 86.195 -CONFIG_BLK_DEV_NS87415=y 86.196 -CONFIG_BLK_DEV_PDC202XX_OLD=y 86.197 -CONFIG_BLK_DEV_PDC202XX_NEW=y 86.198 -CONFIG_BLK_DEV_SVWKS=y 86.199 -CONFIG_BLK_DEV_SIIMAGE=y 86.200 -CONFIG_BLK_DEV_SIS5513=y 86.201 -CONFIG_BLK_DEV_SLC90E66=y 86.202 -CONFIG_BLK_DEV_TRM290=y 86.203 -CONFIG_BLK_DEV_VIA82CXXX=y 86.204 -CONFIG_BLK_DEV_TC86C001=y 86.205 - 86.206 -# 86.207 -# Other IDE chipsets support 86.208 -# 86.209 - 86.210 -# 86.211 -# Note: most of these also require special kernel boot parameters 86.212 -# 86.213 -CONFIG_BLK_DEV_4DRIVES=y 86.214 -CONFIG_BLK_DEV_ALI14XX=y 86.215 -CONFIG_BLK_DEV_DTC2278=y 86.216 -CONFIG_BLK_DEV_HT6560B=y 86.217 -CONFIG_BLK_DEV_QD65XX=y 86.218 -CONFIG_BLK_DEV_UMC8672=y 86.219 -CONFIG_BLK_DEV_IDEDMA=y 86.220 - 86.221 -# 86.222 # SCSI device support 86.223 # 86.224 CONFIG_SCSI_MOD=y 86.225 -# CONFIG_RAID_ATTRS is not set 86.226 +CONFIG_RAID_ATTRS=m 86.227 CONFIG_SCSI=y 86.228 CONFIG_SCSI_DMA=y 86.229 -# CONFIG_SCSI_TGT is not set 86.230 -# CONFIG_SCSI_NETLINK is not set 86.231 +CONFIG_SCSI_TGT=m 86.232 +CONFIG_SCSI_NETLINK=y 86.233 CONFIG_SCSI_PROC_FS=y 86.234 86.235 # 86.236 # SCSI support type (disk, tape, CD-ROM) 86.237 # 86.238 CONFIG_BLK_DEV_SD=y 86.239 -# CONFIG_CHR_DEV_ST is not set 86.240 -# CONFIG_CHR_DEV_OSST is not set 86.241 +CONFIG_CHR_DEV_ST=m 86.242 +CONFIG_CHR_DEV_OSST=m 86.243 CONFIG_BLK_DEV_SR=y 86.244 -# CONFIG_BLK_DEV_SR_VENDOR is not set 86.245 +CONFIG_BLK_DEV_SR_VENDOR=y 86.246 CONFIG_CHR_DEV_SG=y 86.247 -# CONFIG_CHR_DEV_SCH is not set 86.248 +CONFIG_CHR_DEV_SCH=m 86.249 CONFIG_SCSI_MULTI_LUN=y 86.250 -# CONFIG_SCSI_CONSTANTS is not set 86.251 -# CONFIG_SCSI_LOGGING is not set 86.252 -# CONFIG_SCSI_SCAN_ASYNC is not set 86.253 +CONFIG_SCSI_CONSTANTS=y 86.254 +CONFIG_SCSI_LOGGING=y 86.255 +CONFIG_SCSI_SCAN_ASYNC=y 86.256 CONFIG_SCSI_WAIT_SCAN=m 86.257 86.258 # 86.259 # SCSI Transports 86.260 # 86.261 CONFIG_SCSI_SPI_ATTRS=m 86.262 -# CONFIG_SCSI_FC_ATTRS is not set 86.263 +CONFIG_SCSI_FC_ATTRS=m 86.264 +CONFIG_SCSI_FC_TGT_ATTRS=y 86.265 CONFIG_SCSI_ISCSI_ATTRS=m 86.266 -# CONFIG_SCSI_SAS_ATTRS is not set 86.267 -# CONFIG_SCSI_SAS_LIBSAS is not set 86.268 -# CONFIG_SCSI_SRP_ATTRS is not set 86.269 +CONFIG_SCSI_SAS_ATTRS=m 86.270 +CONFIG_SCSI_SAS_LIBSAS=m 86.271 +CONFIG_SCSI_SAS_ATA=y 86.272 +CONFIG_SCSI_SAS_HOST_SMP=y 86.273 +CONFIG_SCSI_SRP_ATTRS=m 86.274 +CONFIG_SCSI_SRP_TGT_ATTRS=y 86.275 CONFIG_SCSI_LOWLEVEL=y 86.276 CONFIG_ISCSI_TCP=m 86.277 -# CONFIG_ISCSI_BOOT_SYSFS is not set 86.278 -# CONFIG_SCSI_CXGB3_ISCSI is not set 86.279 -# CONFIG_SCSI_CXGB4_ISCSI is not set 86.280 -# CONFIG_SCSI_BNX2_ISCSI is not set 86.281 -# CONFIG_SCSI_BNX2X_FCOE is not set 86.282 -# CONFIG_BE2ISCSI is not set 86.283 -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 86.284 -# CONFIG_SCSI_HPSA is not set 86.285 -# CONFIG_SCSI_3W_9XXX is not set 86.286 -# CONFIG_SCSI_3W_SAS is not set 86.287 -# CONFIG_SCSI_7000FASST is not set 86.288 -# CONFIG_SCSI_ACARD is not set 86.289 -# CONFIG_SCSI_AHA152X is not set 86.290 -# CONFIG_SCSI_AHA1542 is not set 86.291 -# CONFIG_SCSI_AACRAID is not set 86.292 +CONFIG_ISCSI_BOOT_SYSFS=m 86.293 +CONFIG_SCSI_CXGB3_ISCSI=m 86.294 +CONFIG_SCSI_CXGB4_ISCSI=m 86.295 +CONFIG_SCSI_BNX2_ISCSI=m 86.296 +CONFIG_SCSI_BNX2X_FCOE=m 86.297 +CONFIG_BE2ISCSI=m 86.298 +CONFIG_BLK_DEV_3W_XXXX_RAID=m 86.299 +CONFIG_SCSI_HPSA=m 86.300 +CONFIG_SCSI_3W_9XXX=m 86.301 +CONFIG_SCSI_3W_SAS=m 86.302 +CONFIG_SCSI_7000FASST=m 86.303 +CONFIG_SCSI_ACARD=m 86.304 +CONFIG_SCSI_AHA152X=m 86.305 +CONFIG_SCSI_AHA1542=m 86.306 +CONFIG_SCSI_AACRAID=m 86.307 CONFIG_SCSI_AIC7XXX=m 86.308 -CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 86.309 -CONFIG_AIC7XXX_RESET_DELAY_MS=5000 86.310 -CONFIG_AIC7XXX_DEBUG_ENABLE=y 86.311 +CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 86.312 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 86.313 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set 86.314 CONFIG_AIC7XXX_DEBUG_MASK=0 86.315 -CONFIG_AIC7XXX_REG_PRETTY_PRINT=y 86.316 -# CONFIG_SCSI_AIC7XXX_OLD is not set 86.317 -# CONFIG_SCSI_AIC79XX is not set 86.318 -# CONFIG_SCSI_AIC94XX is not set 86.319 -# CONFIG_SCSI_MVSAS is not set 86.320 -# CONFIG_SCSI_MVUMI is not set 86.321 +# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set 86.322 +CONFIG_SCSI_AIC7XXX_OLD=m 86.323 +CONFIG_SCSI_AIC79XX=m 86.324 +CONFIG_AIC79XX_CMDS_PER_DEVICE=4 86.325 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 86.326 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set 86.327 +CONFIG_AIC79XX_DEBUG_MASK=0 86.328 +# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set 86.329 +CONFIG_SCSI_AIC94XX=m 86.330 +# CONFIG_AIC94XX_DEBUG is not set 86.331 +CONFIG_SCSI_MVSAS=m 86.332 +# CONFIG_SCSI_MVSAS_DEBUG is not set 86.333 +CONFIG_SCSI_MVSAS_TASKLET=y 86.334 +CONFIG_SCSI_MVUMI=m 86.335 # CONFIG_SCSI_DPT_I2O is not set 86.336 -# CONFIG_SCSI_ADVANSYS is not set 86.337 -# CONFIG_SCSI_IN2000 is not set 86.338 -# CONFIG_SCSI_ARCMSR is not set 86.339 -# CONFIG_MEGARAID_NEWGEN is not set 86.340 -# CONFIG_MEGARAID_LEGACY is not set 86.341 -# CONFIG_MEGARAID_SAS is not set 86.342 -# CONFIG_SCSI_MPT2SAS is not set 86.343 -# CONFIG_SCSI_HPTIOP is not set 86.344 -# CONFIG_SCSI_BUSLOGIC is not set 86.345 -# CONFIG_VMWARE_PVSCSI is not set 86.346 -# CONFIG_LIBFC is not set 86.347 -# CONFIG_LIBFCOE is not set 86.348 -# CONFIG_FCOE is not set 86.349 -# CONFIG_FCOE_FNIC is not set 86.350 +CONFIG_SCSI_ADVANSYS=m 86.351 +CONFIG_SCSI_IN2000=m 86.352 +CONFIG_SCSI_ARCMSR=m 86.353 +CONFIG_MEGARAID_NEWGEN=y 86.354 +CONFIG_MEGARAID_MM=m 86.355 +CONFIG_MEGARAID_MAILBOX=m 86.356 +CONFIG_MEGARAID_LEGACY=m 86.357 +CONFIG_MEGARAID_SAS=m 86.358 +CONFIG_SCSI_MPT2SAS=m 86.359 +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 86.360 +CONFIG_SCSI_MPT2SAS_LOGGING=y 86.361 +CONFIG_SCSI_HPTIOP=m 86.362 +CONFIG_SCSI_BUSLOGIC=m 86.363 +CONFIG_SCSI_FLASHPOINT=y 86.364 +CONFIG_VMWARE_PVSCSI=m 86.365 +CONFIG_LIBFC=m 86.366 +CONFIG_LIBFCOE=m 86.367 +CONFIG_FCOE=m 86.368 +CONFIG_FCOE_FNIC=m 86.369 # CONFIG_SCSI_DMX3191D is not set 86.370 -# CONFIG_SCSI_DTC3280 is not set 86.371 +CONFIG_SCSI_DTC3280=m 86.372 # CONFIG_SCSI_EATA is not set 86.373 # CONFIG_SCSI_FUTURE_DOMAIN is not set 86.374 -# CONFIG_SCSI_GDTH is not set 86.375 -# CONFIG_SCSI_ISCI is not set 86.376 -# CONFIG_SCSI_GENERIC_NCR5380 is not set 86.377 -# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set 86.378 -# CONFIG_SCSI_IPS is not set 86.379 -# CONFIG_SCSI_INITIO is not set 86.380 -# CONFIG_SCSI_INIA100 is not set 86.381 +CONFIG_SCSI_GDTH=m 86.382 +CONFIG_SCSI_ISCI=m 86.383 +CONFIG_SCSI_GENERIC_NCR5380=m 86.384 +CONFIG_SCSI_GENERIC_NCR5380_MMIO=m 86.385 +CONFIG_SCSI_GENERIC_NCR53C400=y 86.386 +CONFIG_SCSI_IPS=m 86.387 +CONFIG_SCSI_INITIO=m 86.388 +CONFIG_SCSI_INIA100=m 86.389 # CONFIG_SCSI_PPA is not set 86.390 # CONFIG_SCSI_IMM is not set 86.391 # CONFIG_SCSI_NCR53C406A is not set 86.392 -# CONFIG_SCSI_STEX is not set 86.393 -# CONFIG_SCSI_SYM53C8XX_2 is not set 86.394 +CONFIG_SCSI_STEX=m 86.395 +CONFIG_SCSI_SYM53C8XX_2=m 86.396 +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 86.397 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 86.398 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 86.399 +CONFIG_SCSI_SYM53C8XX_MMIO=y 86.400 # CONFIG_SCSI_IPR is not set 86.401 # CONFIG_SCSI_PAS16 is not set 86.402 # CONFIG_SCSI_QLOGIC_FAS is not set 86.403 -# CONFIG_SCSI_QLOGIC_1280 is not set 86.404 -# CONFIG_SCSI_QLA_FC is not set 86.405 -# CONFIG_SCSI_QLA_ISCSI is not set 86.406 -# CONFIG_SCSI_LPFC is not set 86.407 +CONFIG_SCSI_QLOGIC_1280=m 86.408 +CONFIG_SCSI_QLA_FC=m 86.409 +CONFIG_SCSI_QLA_ISCSI=m 86.410 +CONFIG_SCSI_LPFC=m 86.411 # CONFIG_SCSI_SYM53C416 is not set 86.412 -# CONFIG_SCSI_DC395x is not set 86.413 -# CONFIG_SCSI_DC390T is not set 86.414 +CONFIG_SCSI_DC395x=m 86.415 +CONFIG_SCSI_DC390T=m 86.416 # CONFIG_SCSI_T128 is not set 86.417 # CONFIG_SCSI_U14_34F is not set 86.418 # CONFIG_SCSI_ULTRASTOR is not set 86.419 # CONFIG_SCSI_NSP32 is not set 86.420 -# CONFIG_SCSI_DEBUG is not set 86.421 -# CONFIG_SCSI_PMCRAID is not set 86.422 -# CONFIG_SCSI_PM8001 is not set 86.423 -# CONFIG_SCSI_SRP is not set 86.424 -# CONFIG_SCSI_BFA_FC is not set 86.425 +CONFIG_SCSI_DEBUG=m 86.426 +CONFIG_SCSI_PMCRAID=m 86.427 +CONFIG_SCSI_PM8001=m 86.428 +CONFIG_SCSI_SRP=m 86.429 +CONFIG_SCSI_BFA_FC=m 86.430 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 86.431 -# CONFIG_SCSI_DH is not set 86.432 -# CONFIG_SCSI_OSD_INITIATOR is not set 86.433 +CONFIG_SCSI_DH=y 86.434 +CONFIG_SCSI_DH_RDAC=m 86.435 +CONFIG_SCSI_DH_HP_SW=m 86.436 +CONFIG_SCSI_DH_EMC=m 86.437 +CONFIG_SCSI_DH_ALUA=m 86.438 +CONFIG_SCSI_OSD_INITIATOR=m 86.439 +CONFIG_SCSI_OSD_ULD=m 86.440 +CONFIG_SCSI_OSD_DPRINT_SENSE=1 86.441 +# CONFIG_SCSI_OSD_DEBUG is not set 86.442 CONFIG_ATA=y 86.443 # CONFIG_ATA_NONSTANDARD is not set 86.444 CONFIG_ATA_VERBOSE_ERROR=y 86.445 @@ -1466,95 +1398,96 @@ 86.446 # Controllers with non-SFF native interface 86.447 # 86.448 CONFIG_SATA_AHCI=y 86.449 -# CONFIG_SATA_AHCI_PLATFORM is not set 86.450 -# CONFIG_SATA_INIC162X is not set 86.451 -# CONFIG_SATA_ACARD_AHCI is not set 86.452 -# CONFIG_SATA_SIL24 is not set 86.453 +CONFIG_SATA_AHCI_PLATFORM=m 86.454 +CONFIG_SATA_INIC162X=m 86.455 +CONFIG_SATA_ACARD_AHCI=m 86.456 +CONFIG_SATA_SIL24=m 86.457 CONFIG_ATA_SFF=y 86.458 86.459 # 86.460 # SFF controllers with custom DMA interface 86.461 # 86.462 -# CONFIG_PDC_ADMA is not set 86.463 -# CONFIG_SATA_QSTOR is not set 86.464 -# CONFIG_SATA_SX4 is not set 86.465 +CONFIG_PDC_ADMA=m 86.466 +CONFIG_SATA_QSTOR=m 86.467 +CONFIG_SATA_SX4=m 86.468 CONFIG_ATA_BMDMA=y 86.469 86.470 # 86.471 # SATA SFF controllers with BMDMA 86.472 # 86.473 CONFIG_ATA_PIIX=y 86.474 -# CONFIG_SATA_MV is not set 86.475 -CONFIG_SATA_NV=y 86.476 -# CONFIG_SATA_PROMISE is not set 86.477 -CONFIG_SATA_SIL=y 86.478 -CONFIG_SATA_SIS=y 86.479 -# CONFIG_SATA_SVW is not set 86.480 -# CONFIG_SATA_ULI is not set 86.481 -CONFIG_SATA_VIA=y 86.482 -# CONFIG_SATA_VITESSE is not set 86.483 +CONFIG_SATA_MV=m 86.484 +CONFIG_SATA_NV=m 86.485 +CONFIG_SATA_PROMISE=m 86.486 +CONFIG_SATA_SIL=m 86.487 +CONFIG_SATA_SIS=m 86.488 +CONFIG_SATA_SVW=m 86.489 +CONFIG_SATA_ULI=m 86.490 +CONFIG_SATA_VIA=m 86.491 +CONFIG_SATA_VITESSE=m 86.492 86.493 # 86.494 # PATA SFF controllers with BMDMA 86.495 # 86.496 -# CONFIG_PATA_ALI is not set 86.497 -# CONFIG_PATA_AMD is not set 86.498 -# CONFIG_PATA_ARTOP is not set 86.499 -# CONFIG_PATA_ATIIXP is not set 86.500 -# CONFIG_PATA_ATP867X is not set 86.501 -# CONFIG_PATA_CMD64X is not set 86.502 -# CONFIG_PATA_CS5520 is not set 86.503 -# CONFIG_PATA_CS5530 is not set 86.504 -# CONFIG_PATA_CS5535 is not set 86.505 -# CONFIG_PATA_CS5536 is not set 86.506 -# CONFIG_PATA_CYPRESS is not set 86.507 -# CONFIG_PATA_EFAR is not set 86.508 -# CONFIG_PATA_HPT366 is not set 86.509 -# CONFIG_PATA_HPT37X is not set 86.510 -# CONFIG_PATA_HPT3X2N is not set 86.511 -# CONFIG_PATA_HPT3X3 is not set 86.512 -# CONFIG_PATA_IT8213 is not set 86.513 -# CONFIG_PATA_IT821X is not set 86.514 -# CONFIG_PATA_JMICRON is not set 86.515 -# CONFIG_PATA_MARVELL is not set 86.516 -# CONFIG_PATA_NETCELL is not set 86.517 -# CONFIG_PATA_NINJA32 is not set 86.518 -# CONFIG_PATA_NS87415 is not set 86.519 -# CONFIG_PATA_OLDPIIX is not set 86.520 -# CONFIG_PATA_OPTIDMA is not set 86.521 -# CONFIG_PATA_PDC2027X is not set 86.522 -# CONFIG_PATA_PDC_OLD is not set 86.523 +CONFIG_PATA_ALI=m 86.524 +CONFIG_PATA_AMD=m 86.525 +CONFIG_PATA_ARTOP=m 86.526 +CONFIG_PATA_ATIIXP=m 86.527 +CONFIG_PATA_ATP867X=m 86.528 +CONFIG_PATA_CMD64X=m 86.529 +CONFIG_PATA_CS5520=m 86.530 +CONFIG_PATA_CS5530=m 86.531 +CONFIG_PATA_CS5535=m 86.532 +CONFIG_PATA_CS5536=m 86.533 +CONFIG_PATA_CYPRESS=m 86.534 +CONFIG_PATA_EFAR=m 86.535 +CONFIG_PATA_HPT366=m 86.536 +CONFIG_PATA_HPT37X=m 86.537 +CONFIG_PATA_HPT3X2N=m 86.538 +CONFIG_PATA_HPT3X3=m 86.539 +# CONFIG_PATA_HPT3X3_DMA is not set 86.540 +CONFIG_PATA_IT8213=m 86.541 +CONFIG_PATA_IT821X=m 86.542 +CONFIG_PATA_JMICRON=m 86.543 +CONFIG_PATA_MARVELL=m 86.544 +CONFIG_PATA_NETCELL=m 86.545 +CONFIG_PATA_NINJA32=m 86.546 +CONFIG_PATA_NS87415=m 86.547 +CONFIG_PATA_OLDPIIX=m 86.548 +CONFIG_PATA_OPTIDMA=m 86.549 +CONFIG_PATA_PDC2027X=m 86.550 +CONFIG_PATA_PDC_OLD=m 86.551 # CONFIG_PATA_RADISYS is not set 86.552 -# CONFIG_PATA_RDC is not set 86.553 +CONFIG_PATA_RDC=m 86.554 # CONFIG_PATA_SC1200 is not set 86.555 -CONFIG_PATA_SCH=y 86.556 -# CONFIG_PATA_SERVERWORKS is not set 86.557 -# CONFIG_PATA_SIL680 is not set 86.558 -CONFIG_PATA_SIS=y 86.559 -# CONFIG_PATA_TOSHIBA is not set 86.560 -# CONFIG_PATA_TRIFLEX is not set 86.561 -# CONFIG_PATA_VIA is not set 86.562 -# CONFIG_PATA_WINBOND is not set 86.563 +CONFIG_PATA_SCH=m 86.564 +CONFIG_PATA_SERVERWORKS=m 86.565 +CONFIG_PATA_SIL680=m 86.566 +CONFIG_PATA_SIS=m 86.567 +CONFIG_PATA_TOSHIBA=m 86.568 +CONFIG_PATA_TRIFLEX=m 86.569 +CONFIG_PATA_VIA=m 86.570 +CONFIG_PATA_WINBOND=m 86.571 86.572 # 86.573 # PIO-only SFF controllers 86.574 # 86.575 -# CONFIG_PATA_CMD640_PCI is not set 86.576 -# CONFIG_PATA_ISAPNP is not set 86.577 -# CONFIG_PATA_MPIIX is not set 86.578 -# CONFIG_PATA_NS87410 is not set 86.579 -# CONFIG_PATA_OPTI is not set 86.580 -# CONFIG_PATA_PCMCIA is not set 86.581 -# CONFIG_PATA_QDI is not set 86.582 +CONFIG_PATA_CMD640_PCI=m 86.583 +CONFIG_PATA_ISAPNP=y 86.584 +CONFIG_PATA_MPIIX=m 86.585 +CONFIG_PATA_NS87410=m 86.586 +CONFIG_PATA_OPTI=m 86.587 +CONFIG_PATA_PCMCIA=m 86.588 +CONFIG_PATA_QDI=y 86.589 # CONFIG_PATA_RZ1000 is not set 86.590 -# CONFIG_PATA_WINBOND_VLB is not set 86.591 +CONFIG_PATA_WINBOND_VLB=y 86.592 86.593 # 86.594 # Generic fallback / legacy drivers 86.595 # 86.596 -# CONFIG_PATA_ACPI is not set 86.597 -# CONFIG_ATA_GENERIC is not set 86.598 -# CONFIG_PATA_LEGACY is not set 86.599 +CONFIG_PATA_ACPI=m 86.600 +CONFIG_ATA_GENERIC=m 86.601 +CONFIG_PATA_LEGACY=y 86.602 CONFIG_MD=y 86.603 CONFIG_BLK_DEV_MD=m 86.604 CONFIG_MD_LINEAR=m 86.605 @@ -1600,13 +1533,13 @@ 86.606 CONFIG_NET_FC=y 86.607 CONFIG_MII=y 86.608 CONFIG_IFB=m 86.609 -CONFIG_MACVLAN=y 86.610 -CONFIG_MACVTAP=y 86.611 +CONFIG_MACVLAN=m 86.612 +CONFIG_MACVTAP=m 86.613 # CONFIG_NETCONSOLE is not set 86.614 # CONFIG_NETPOLL is not set 86.615 # CONFIG_NET_POLL_CONTROLLER is not set 86.616 CONFIG_TUN=y 86.617 -CONFIG_VETH=y 86.618 +CONFIG_VETH=m 86.619 CONFIG_VIRTIO_NET=m 86.620 CONFIG_SUNGEM_PHY=m 86.621 CONFIG_ARCNET=m 86.622 @@ -1659,7 +1592,7 @@ 86.623 CONFIG_B44_PCICORE_AUTOSELECT=y 86.624 CONFIG_B44_PCI=y 86.625 CONFIG_BNX2=m 86.626 -# CONFIG_CNIC is not set 86.627 +CONFIG_CNIC=m 86.628 CONFIG_TIGON3=m 86.629 CONFIG_BNX2X=m 86.630 CONFIG_NET_VENDOR_BROCADE=y 86.631 @@ -1707,9 +1640,9 @@ 86.632 CONFIG_NET_VENDOR_HP=y 86.633 CONFIG_HP100=m 86.634 CONFIG_NET_VENDOR_INTEL=y 86.635 -CONFIG_E100=y 86.636 +CONFIG_E100=m 86.637 CONFIG_E1000=m 86.638 -CONFIG_E1000E=y 86.639 +CONFIG_E1000E=m 86.640 # CONFIG_IGB is not set 86.641 # CONFIG_IGBVF is not set 86.642 CONFIG_IXGB=m 86.643 @@ -1724,7 +1657,7 @@ 86.644 CONFIG_NI52=m 86.645 # CONFIG_ZNET is not set 86.646 CONFIG_IP1000=m 86.647 -# CONFIG_JME is not set 86.648 +CONFIG_JME=m 86.649 CONFIG_NET_VENDOR_MARVELL=y 86.650 CONFIG_SKGE=m 86.651 # CONFIG_SKGE_GENESIS is not set 86.652 @@ -1774,7 +1707,7 @@ 86.653 CONFIG_8139TOO_TUNE_TWISTER=y 86.654 CONFIG_8139TOO_8129=y 86.655 # CONFIG_8139_OLD_RX_RESET is not set 86.656 -CONFIG_R8169=m 86.657 +CONFIG_R8169=y 86.658 CONFIG_NET_VENDOR_RDC=y 86.659 CONFIG_R6040=m 86.660 CONFIG_NET_VENDOR_SEEQ=y 86.661 @@ -2359,7 +2292,7 @@ 86.662 CONFIG_HW_CONSOLE=y 86.663 # CONFIG_VT_HW_CONSOLE_BINDING is not set 86.664 CONFIG_UNIX98_PTYS=y 86.665 -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y 86.666 +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 86.667 # CONFIG_LEGACY_PTYS is not set 86.668 # CONFIG_SERIAL_NONSTANDARD is not set 86.669 CONFIG_NOZOMI=m 86.670 @@ -2371,7 +2304,7 @@ 86.671 # Serial drivers 86.672 # 86.673 CONFIG_SERIAL_8250=y 86.674 -CONFIG_SERIAL_8250_CONSOLE=y 86.675 +# CONFIG_SERIAL_8250_CONSOLE is not set 86.676 CONFIG_FIX_EARLYCON_MEM=y 86.677 CONFIG_SERIAL_8250_PCI=y 86.678 CONFIG_SERIAL_8250_PNP=y 86.679 @@ -2386,7 +2319,6 @@ 86.680 # CONFIG_SERIAL_MFD_HSU is not set 86.681 # CONFIG_SERIAL_UARTLITE is not set 86.682 CONFIG_SERIAL_CORE=y 86.683 -CONFIG_SERIAL_CORE_CONSOLE=y 86.684 # CONFIG_SERIAL_JSM is not set 86.685 # CONFIG_SERIAL_TIMBERDALE is not set 86.686 # CONFIG_SERIAL_ALTERA_JTAGUART is not set 86.687 @@ -3457,6 +3389,7 @@ 86.688 # CONFIG_FB_VGA16 is not set 86.689 # CONFIG_FB_UVESA is not set 86.690 CONFIG_FB_VESA=y 86.691 +# CONFIG_FB_EFI is not set 86.692 # CONFIG_FB_N411 is not set 86.693 # CONFIG_FB_HGA is not set 86.694 # CONFIG_FB_S1D13XXX is not set 86.695 @@ -3820,8 +3753,8 @@ 86.696 CONFIG_USB_XHCI_HCD=m 86.697 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set 86.698 CONFIG_USB_EHCI_HCD=y 86.699 -# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 86.700 -# CONFIG_USB_EHCI_TT_NEWSCHED is not set 86.701 +CONFIG_USB_EHCI_ROOT_HUB_TT=y 86.702 +CONFIG_USB_EHCI_TT_NEWSCHED=y 86.703 CONFIG_USB_OXU210HP_HCD=m 86.704 CONFIG_USB_ISP116X_HCD=m 86.705 CONFIG_USB_ISP1760_HCD=m 86.706 @@ -3895,7 +3828,7 @@ 86.707 CONFIG_USB_SERIAL_CP210X=m 86.708 # CONFIG_USB_SERIAL_CYPRESS_M8 is not set 86.709 # CONFIG_USB_SERIAL_EMPEG is not set 86.710 -# CONFIG_USB_SERIAL_FTDI_SIO is not set 86.711 +CONFIG_USB_SERIAL_FTDI_SIO=m 86.712 # CONFIG_USB_SERIAL_FUNSOFT is not set 86.713 # CONFIG_USB_SERIAL_VISOR is not set 86.714 # CONFIG_USB_SERIAL_IPAQ is not set 86.715 @@ -4081,7 +4014,6 @@ 86.716 # LED Triggers 86.717 # 86.718 CONFIG_LEDS_TRIGGER_TIMER=m 86.719 -CONFIG_LEDS_TRIGGER_IDE_DISK=y 86.720 CONFIG_LEDS_TRIGGER_HEARTBEAT=m 86.721 CONFIG_LEDS_TRIGGER_BACKLIGHT=m 86.722 # CONFIG_LEDS_TRIGGER_GPIO is not set 86.723 @@ -4096,7 +4028,14 @@ 86.724 # CONFIG_RTC_CLASS is not set 86.725 # CONFIG_DMADEVICES is not set 86.726 # CONFIG_AUXDISPLAY is not set 86.727 -# CONFIG_UIO is not set 86.728 +CONFIG_UIO=m 86.729 +# CONFIG_UIO_CIF is not set 86.730 +# CONFIG_UIO_PDRV is not set 86.731 +# CONFIG_UIO_PDRV_GENIRQ is not set 86.732 +# CONFIG_UIO_AEC is not set 86.733 +# CONFIG_UIO_SERCOS3 is not set 86.734 +CONFIG_UIO_PCI_GENERIC=m 86.735 +# CONFIG_UIO_NETX is not set 86.736 CONFIG_VIRTIO=y 86.737 CONFIG_VIRTIO_RING=y 86.738 86.739 @@ -4432,6 +4371,7 @@ 86.740 # 86.741 # CONFIG_EDD is not set 86.742 CONFIG_FIRMWARE_MEMMAP=y 86.743 +# CONFIG_EFI_VARS is not set 86.744 # CONFIG_DELL_RBU is not set 86.745 # CONFIG_DCDBAS is not set 86.746 CONFIG_DMIID=y 86.747 @@ -4568,6 +4508,9 @@ 86.748 # CONFIG_PSTORE is not set 86.749 # CONFIG_SYSV_FS is not set 86.750 # CONFIG_UFS_FS is not set 86.751 +CONFIG_EXOFS_FS=m 86.752 +# CONFIG_EXOFS_DEBUG is not set 86.753 +CONFIG_ORE=m 86.754 CONFIG_NETWORK_FILESYSTEMS=y 86.755 CONFIG_NFS_FS=y 86.756 CONFIG_NFS_V3=y 86.757 @@ -4691,7 +4634,7 @@ 86.758 CONFIG_DEBUG_BUGVERBOSE=y 86.759 CONFIG_DEBUG_MEMORY_INIT=y 86.760 CONFIG_ARCH_WANT_FRAME_POINTERS=y 86.761 -CONFIG_FRAME_POINTER=y 86.762 +# CONFIG_FRAME_POINTER is not set 86.763 CONFIG_RCU_CPU_STALL_TIMEOUT=60 86.764 # CONFIG_SYSCTL_SYSCALL_CHECK is not set 86.765 CONFIG_USER_STACKTRACE_SUPPORT=y 86.766 @@ -4890,7 +4833,7 @@ 86.767 CONFIG_GENERIC_FIND_FIRST_BIT=y 86.768 CONFIG_CRC_CCITT=y 86.769 CONFIG_CRC16=y 86.770 -# CONFIG_CRC_T10DIF is not set 86.771 +CONFIG_CRC_T10DIF=m 86.772 CONFIG_CRC_ITU_T=y 86.773 CONFIG_CRC32=y 86.774 CONFIG_CRC7=m 86.775 @@ -4922,6 +4865,7 @@ 86.776 CONFIG_HAS_IOMEM=y 86.777 CONFIG_HAS_IOPORT=y 86.778 CONFIG_HAS_DMA=y 86.779 +CONFIG_CHECK_SIGNATURE=y 86.780 CONFIG_CPU_RMAP=y 86.781 CONFIG_NLATTR=y 86.782 CONFIG_LRU_CACHE=m
87.1 --- a/linux/stuff/linux-slitaz.config64 Tue Jan 28 05:56:16 2014 +0000 87.2 +++ b/linux/stuff/linux-slitaz.config64 Wed Jan 29 09:56:07 2014 +0100 87.3 @@ -1,6 +1,6 @@ 87.4 # 87.5 # Automatically generated file; DO NOT EDIT. 87.6 -# Linux/x86_64 3.2 Kernel Configuration 87.7 +# Linux/x86_64 3.2.53 Kernel Configuration 87.8 # 87.9 CONFIG_64BIT=y 87.10 # CONFIG_X86_32 is not set
88.1 --- a/linux/stuff/linux-subroot.u Tue Jan 28 05:56:16 2014 +0000 88.2 +++ b/linux/stuff/linux-subroot.u Wed Jan 29 09:56:07 2014 +0100 88.3 @@ -2,7 +2,6 @@ 88.4 - have several distributions in one partition 88.5 - use efficently the disk space between several distributions 88.6 - deduplicate files across several distributions 88.7 -- create pseudo snapshots using "cp -al" outside / 88.8 - test new configurations 88.9 ... 88.10 The bad news : you can't remount /
89.1 --- a/linux/stuff/list_modules.sh Tue Jan 28 05:56:16 2014 +0000 89.2 +++ b/linux/stuff/list_modules.sh Wed Jan 29 09:56:07 2014 +0100 89.3 @@ -3,9 +3,8 @@ 89.4 # 2008/06/07 <pascal.bellard@slitaz.org> - GNU General Public License. 89.5 # 89.6 89.7 -find_modules() 89.8 -{ 89.9 -find $_pkg/lib/modules/*-slitaz/kernel/$1 -type f -exec basename {} \; 89.10 +find_modules() { 89.11 + find $install/lib/modules/*-slitaz/kernel/$1 -type f -exec basename {} \; 89.12 } 89.13 89.14 if [ -z "$1" ] ; then 89.15 @@ -18,7 +17,7 @@ 89.16 exit 1 89.17 fi 89.18 89.19 -if [ -z "$(ls -d $_pkg/lib/modules/*-slitaz/kernel/$1 2> /dev/null)" ] ; then 89.20 +if [ -z "$(ls -d $install/lib/modules/*-slitaz/kernel/$1 2> /dev/null)" ] ; then 89.21 cat 1>&2 <<EOT 89.22 89.23 Error : $1 does not exist. 89.24 @@ -29,14 +28,14 @@ 89.25 89.26 for tree in $@; do 89.27 for module in $(find_modules $tree) ; do 89.28 - grep /$module: $_pkg/lib/modules/*-slitaz/modules.dep || 89.29 - find $_pkg/lib/modules/*-slitaz/kernel/$tree -name $module 89.30 + grep /$module: $install/lib/modules/*-slitaz/modules.dep || 89.31 + find $install/lib/modules/*-slitaz/kernel/$tree -name $module 89.32 done | awk '{ for (i = 1; i <= NF; i++) print $i; }' 89.33 done | sort | uniq | sed -e 's,.*slitaz/,,' -e 's,^kernel/,,' -e 's/:$//' | \ 89.34 while read module; do 89.35 grep -qs ^$module$ $src/../tmp/modules.list && continue 89.36 - if [ ! -f $_pkg/lib/modules/*-slitaz/kernel/$module ]; then 89.37 - (cd $_pkg/lib/modules/*-slitaz/kernel; find -name $(basename $module) ) 89.38 + if [ ! -f $install/lib/modules/*-slitaz/kernel/$module ]; then 89.39 + (cd $install/lib/modules/*-slitaz/kernel; find -name $(basename $module) ) 89.40 else 89.41 echo $module 89.42 fi
90.1 --- a/linux/stuff/mac80211.compat08082009.wl_frag+ack_v1.patch Tue Jan 28 05:56:16 2014 +0000 90.2 +++ b/linux/stuff/mac80211.compat08082009.wl_frag+ack_v1.patch Wed Jan 29 09:56:07 2014 +0100 90.3 @@ -2,7 +2,7 @@ 90.4 index 0855cac..221bed6 100644 90.5 --- a/net/mac80211/tx.c 90.6 +++ b/net/mac80211/tx.c 90.7 -@@ -792,11 +792,19 @@ int tid; 90.8 +@@ -677,11 +677,19 @@ int tid; 90.9 90.10 /* 90.11 * Packet injection may want to control the sequence
91.1 --- a/linux/stuff/modules.list Tue Jan 28 05:56:16 2014 +0000 91.2 +++ b/linux/stuff/modules.list Wed Jan 29 09:56:07 2014 +0100 91.3 @@ -87,7 +87,6 @@ 91.4 drivers/input/sparse-keymap.ko.xz 91.5 drivers/net/ethernet/realtek/atp.ko.xz 91.6 drivers/net/ethernet/realtek/8139cp.ko.xz 91.7 -drivers/net/ethernet/realtek/r8169.ko.xz 91.8 drivers/net/ethernet/cisco/enic/enic.ko.xz 91.9 drivers/net/ethernet/qlogic/qlge/qlge.ko.xz 91.10 drivers/net/ethernet/qlogic/netxen/netxen_nic.ko.xz 91.11 @@ -216,7 +215,6 @@ 91.12 drivers/nfc/pn544.ko.xz 91.13 drivers/nfc/pn533.ko.xz 91.14 drivers/nfc/nfcwilink.ko.xz 91.15 -drivers/ide/ide-cs.ko.xz 91.16 drivers/watchdog/softdog.ko.xz 91.17 drivers/parport/parport.ko.xz 91.18 drivers/parport/parport_pc.ko.xz
92.1 --- a/ndiswrapper-driver/receipt Tue Jan 28 05:56:16 2014 +0000 92.2 +++ b/ndiswrapper-driver/receipt Wed Jan 29 09:56:07 2014 +0100 92.3 @@ -18,38 +18,30 @@ 92.4 # Rules to configure and make the package. 92.5 compile_rules() 92.6 { 92.7 - 92.8 - KERNEL_VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` 92.9 - cd $src 92.10 - make KBUILD=/usr/src/linux KVER=linux-$KERNEL_VERSION-slitaz 92.11 + make KBUILD=/usr/src/linux KVER=linux-${kvers}-slitaz 92.12 xz driver/ndiswrapper.ko 92.13 } 92.14 92.15 # Rules to gen a SliTaz package suitable for Tazpkg. 92.16 genpkg_rules() 92.17 { 92.18 - KERNEL_VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` 92.19 - EXTRAVERSION=_${KERNEL_VERSION%.*} 92.20 - 92.21 - mkdir -p $fs/usr/sbin $fs/sbin $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc 92.22 + EXTRAVERSION=_${kvers} 92.23 + mkdir -p $fs/usr/sbin $fs/sbin $fs/lib/modules/${kvers}-slitaz/kernel/misc 92.24 92.25 # Install utilities 92.26 - install -o root -m 755 $src/utils/loadndisdriver $fs/sbin/ 92.27 - 92.28 - cp $src/driver/ndiswrapper.ko.xz \ 92.29 - $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc/ 92.30 - chown root $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc/ndiswrapper.ko.xz 92.31 - chmod 644 $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc/ndiswrapper.ko.xz 92.32 + install -o root -m 0755 $src/utils/loadndisdriver $fs/sbin/ 92.33 + install -o root -m 0644 $src/driver/ndiswrapper.ko.xz \ 92.34 + $fs/lib/modules/${kvers}-slitaz/kernel/misc/ndiswrapper.ko.xz 92.35 } 92.36 92.37 post_install() 92.38 { 92.39 echo "Processing post-install commands..." 92.40 - chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 92.41 + chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz 92.42 } 92.43 92.44 post_remove() 92.45 { 92.46 echo "Processing post-remove commands..." 92.47 - chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 92.48 + chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz 92.49 }
93.1 --- a/nvidia-173xx/receipt Tue Jan 28 05:56:16 2014 +0000 93.2 +++ b/nvidia-173xx/receipt Wed Jan 29 09:56:07 2014 +0100 93.3 @@ -30,7 +30,7 @@ 93.4 # Rules to gen a SliTaz package suitable for Tazpkg. 93.5 genpkg_rules() 93.6 { 93.7 - EXTRAVERSION=_${kvers%.*} 93.8 + EXTRAVERSION=_${kvers} 93.9 93.10 mkdir -p $fs/usr/share $fs/usr/lib/X11 $fs/usr/share/licenses/$PACKAGE \ 93.11 $fs/lib/modules/$kvers-slitaz/kernel/drivers/video \ 93.12 @@ -86,7 +86,7 @@ 93.13 post_install() 93.14 { 93.15 echo "Processing post-install commands..." 93.16 - chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 93.17 + chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz 93.18 93.19 # correct .desktop file file 93.20 sed -i 's:__UTILS_PATH__/::' $1/usr/share/applications/nvidia-settings.desktop 93.21 @@ -116,5 +116,3 @@ 93.22 echo "Processing post-remove commands..." 93.23 depmod -a 93.24 } 93.25 - 93.26 -TAZBB_NO_INSTALL="because this is not hardware neutral"