# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1497609347 -10800
# Node ID cf03631202da60a322719d7c08d746aecc232da9
# Parent  52c764d3ee0f2abc588a6d8379274ac232447740
Update aufs to latest; linux: package 'linux' went without modules.

diff -r 52c764d3ee0f -r cf03631202da aufs/receipt
--- a/aufs/receipt	Fri Jun 16 03:38:59 2017 +0300
+++ b/aufs/receipt	Fri Jun 16 13:35:47 2017 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="aufs"
-VERSION="0d8e71c"
+VERSION="5b18dc7"
 CATEGORY="base-system"
 SHORT_DESC="The Linux Kernel 4.9 aufs module"
 MAINTAINER="godane@slitaz.org"
diff -r 52c764d3ee0f -r cf03631202da linux/receipt
--- a/linux/receipt	Fri Jun 16 03:38:59 2017 +0300
+++ b/linux/receipt	Fri Jun 16 13:35:47 2017 +0300
@@ -13,7 +13,7 @@
 TARBALL="$PACKAGE-$KBASEVER.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$TARBALL"
 
-BUILD_DEPENDS="slitaz-toolchain perl git xz lzma patch kmod bc"
+BUILD_DEPENDS="slitaz-toolchain perl xz lzma patch kmod bc" # git
 SPLIT="lguest linux-acpi linux-agp linux-aoe linux-appletalk linux-arcnet \
 linux-autofs linux-bluetooth linux-bridge linux-btrfs linux-cifs linux-coda \
 linux-cpufreq linux-cramfs linux-crypto linux-cryptoloop linux-dialup \
@@ -209,7 +209,7 @@
 		*-drm)					c="DRM module"; DEPENDS="linux-agp";;
 		*-ecryptfs)				c="eCrypt FS module";;
 		*-efi)					c="EFI modules";;
-		*-ethernet)				c="Ethernet drivers";;
+		*-ethernet)				c="Ethernet drivers"; DEPENDS="linux-crypto";;
 		*-exofs)				c="OSD based FS module"; DEPENDS="linux-crypto";;
 		*-firewire)				c="Firewire modules";;
 		*-gfs2)					c="GFS2 module";;
@@ -242,7 +242,7 @@
 		*-nfsd)					c="NFS server module"; DEPENDS="linux-nfs";;
 		*-ocfs2)				c="OCFS2 modules"; DEPENDS="linux-dlm";;
 		*-orangefs)				c="OrangeFS module";;
-		*-radio)				c="radio modules";;
+		*-radio)				c="radio modules"; DEPENDS="linux-sound";;
 		*-reiserfs)				c="ReiserFS module";;
 		*-romfs)				c="ROMFS module";;
 		*-sched)				c="Sched modules";;
@@ -271,6 +271,7 @@
 
 	case $PACKAGE in
 		linux)
+			DEPENDS="kmod"
 			case "$ARCH" in
 				arm)
 					echo "Packing: ARM Kernel"
@@ -298,7 +299,7 @@
 
 			# Checking for Linux Kernel modules that don't belong to any of the packages
 			# $stuff/tools/check_modules.sh
-			DEPENDS="kmod"
+			# please, see web interface instead
 			;;
 		*-firmware)
 			mkdir -p $fs/lib
@@ -464,7 +465,7 @@
 
 post_install_linux_zram() {
 	chroot "$1/" depmod -a $VERSION-slitaz &&
-	RAM=$(cat /proc/meminfo | grep MemTotal | sed s/[^0-9]//g) &&
+	RAM=$(grep MemTotal /proc/meminfo | tr -dc 0-9) &&
 	echo "SIZE_KB="$(($RAM/2)) > "$1/etc/compcache.conf"
 	[ -n "$quiet" ] || cat <<EOT
 
diff -r 52c764d3ee0f -r cf03631202da linux/stuff/split.rules
--- a/linux/stuff/split.rules	Fri Jun 16 03:38:59 2017 +0300
+++ b/linux/stuff/split.rules	Fri Jun 16 13:35:47 2017 +0300
@@ -20,6 +20,7 @@
 crypto            arch/x86/crypto
 crypto            crypto
 crypto            drivers/crypto
+crypto            drivers/net/ethernet/chelsio/cxgb4/cxgb4.ko.xz
 cryptoloop        drivers/block/cryptoloop.ko.xz
 dialup            drivers/tty/serial/8250/serial_cs.ko.xz
 dialup            drivers/usb/serial
@@ -202,6 +203,7 @@
 video             drivers/video/backlight
 wan               drivers/net/wan
 watchdog          drivers/watchdog
+watchdog          drivers/mfd/kempld-core.ko.xz
 wimax             drivers/net/wimax
 wimax             net/wimax
 wireless          drivers/leds
diff -r 52c764d3ee0f -r cf03631202da linux/stuff/tools/copy_modules.sh
--- a/linux/stuff/tools/copy_modules.sh	Fri Jun 16 03:38:59 2017 +0300
+++ b/linux/stuff/tools/copy_modules.sh	Fri Jun 16 13:35:47 2017 +0300
@@ -58,21 +58,29 @@
 		while read rule_name rule_value; do
 			[ "$rule_name" != 'linux' ] && continue
 			list_modules $rule_value >> "$modlist" 2>/dev/null
-		done < "${wanted_stuff:-$stuff}/split.rules"
+		done < "$stuff/split.rules"
 		;;
 esac
 
-# A.3. If package depends on other package - make these modules "restricted" (excluded) too
-if [ "$DEPENDS" != "$WANTED" ]; then
+# A.3. Simulate deprecated (for receipts v2) variable $WANTED
+case $PACKAGE in
+	linux-libre|linux64|linux) wanted='';;
+	linux-libre-*) wanted='linux-libre';;
+	linux64-*)     wanted='linux64';;
+	linux-*)       wanted='linux';;
+esac
+
+# A.4. If package depends on other package - make these modules "restricted" (excluded) too
+if [ "$DEPENDS" != "$wanted" ]; then
 	for i in $DEPENDS; do
-		if [ "$i" != "$WANTED" ]; then
+		if [ "$i" != "$wanted" ]; then
 			pkg_subname=${i#linux-libre-}
 			pkg_subname=${pkg_subname#linux*-}
 
 			while read rule_name rule_value; do
 				[ "$pkg_subname" != "$rule_name" ] && continue
 				list_modules $rule_value >> "$modlist" 2>/dev/null
-			done < "${wanted_stuff:-$stuff}/split.rules"
+			done < "$stuff/split.rules"
 		fi
 	done
 fi
@@ -99,7 +107,7 @@
 		mkdir -p $fs/$dir
 		cp -a $modroot/$module $fs/$dir
 	done
-done < "${wanted_stuff:-$stuff}/split.rules"
+done < "$stuff/split.rules"
 
 # B.3. Clean
 rm "$modlist"