wok-next rev 19777

Update aufs to latest; linux: package 'linux' went without modules.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Jun 16 13:35:47 2017 +0300 (2017-06-16)
parents 52c764d3ee0f
children becece00f2de
files aufs/receipt linux/receipt linux/stuff/split.rules linux/stuff/tools/copy_modules.sh
line diff
     1.1 --- a/aufs/receipt	Fri Jun 16 03:38:59 2017 +0300
     1.2 +++ b/aufs/receipt	Fri Jun 16 13:35:47 2017 +0300
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="aufs"
     1.7 -VERSION="0d8e71c"
     1.8 +VERSION="5b18dc7"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="The Linux Kernel 4.9 aufs module"
    1.11  MAINTAINER="godane@slitaz.org"
     2.1 --- a/linux/receipt	Fri Jun 16 03:38:59 2017 +0300
     2.2 +++ b/linux/receipt	Fri Jun 16 13:35:47 2017 +0300
     2.3 @@ -13,7 +13,7 @@
     2.4  TARBALL="$PACKAGE-$KBASEVER.tar.xz"
     2.5  WGET_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$TARBALL"
     2.6  
     2.7 -BUILD_DEPENDS="slitaz-toolchain perl git xz lzma patch kmod bc"
     2.8 +BUILD_DEPENDS="slitaz-toolchain perl xz lzma patch kmod bc" # git
     2.9  SPLIT="lguest linux-acpi linux-agp linux-aoe linux-appletalk linux-arcnet \
    2.10  linux-autofs linux-bluetooth linux-bridge linux-btrfs linux-cifs linux-coda \
    2.11  linux-cpufreq linux-cramfs linux-crypto linux-cryptoloop linux-dialup \
    2.12 @@ -209,7 +209,7 @@
    2.13  		*-drm)					c="DRM module"; DEPENDS="linux-agp";;
    2.14  		*-ecryptfs)				c="eCrypt FS module";;
    2.15  		*-efi)					c="EFI modules";;
    2.16 -		*-ethernet)				c="Ethernet drivers";;
    2.17 +		*-ethernet)				c="Ethernet drivers"; DEPENDS="linux-crypto";;
    2.18  		*-exofs)				c="OSD based FS module"; DEPENDS="linux-crypto";;
    2.19  		*-firewire)				c="Firewire modules";;
    2.20  		*-gfs2)					c="GFS2 module";;
    2.21 @@ -242,7 +242,7 @@
    2.22  		*-nfsd)					c="NFS server module"; DEPENDS="linux-nfs";;
    2.23  		*-ocfs2)				c="OCFS2 modules"; DEPENDS="linux-dlm";;
    2.24  		*-orangefs)				c="OrangeFS module";;
    2.25 -		*-radio)				c="radio modules";;
    2.26 +		*-radio)				c="radio modules"; DEPENDS="linux-sound";;
    2.27  		*-reiserfs)				c="ReiserFS module";;
    2.28  		*-romfs)				c="ROMFS module";;
    2.29  		*-sched)				c="Sched modules";;
    2.30 @@ -271,6 +271,7 @@
    2.31  
    2.32  	case $PACKAGE in
    2.33  		linux)
    2.34 +			DEPENDS="kmod"
    2.35  			case "$ARCH" in
    2.36  				arm)
    2.37  					echo "Packing: ARM Kernel"
    2.38 @@ -298,7 +299,7 @@
    2.39  
    2.40  			# Checking for Linux Kernel modules that don't belong to any of the packages
    2.41  			# $stuff/tools/check_modules.sh
    2.42 -			DEPENDS="kmod"
    2.43 +			# please, see web interface instead
    2.44  			;;
    2.45  		*-firmware)
    2.46  			mkdir -p $fs/lib
    2.47 @@ -464,7 +465,7 @@
    2.48  
    2.49  post_install_linux_zram() {
    2.50  	chroot "$1/" depmod -a $VERSION-slitaz &&
    2.51 -	RAM=$(cat /proc/meminfo | grep MemTotal | sed s/[^0-9]//g) &&
    2.52 +	RAM=$(grep MemTotal /proc/meminfo | tr -dc 0-9) &&
    2.53  	echo "SIZE_KB="$(($RAM/2)) > "$1/etc/compcache.conf"
    2.54  	[ -n "$quiet" ] || cat <<EOT
    2.55  
     3.1 --- a/linux/stuff/split.rules	Fri Jun 16 03:38:59 2017 +0300
     3.2 +++ b/linux/stuff/split.rules	Fri Jun 16 13:35:47 2017 +0300
     3.3 @@ -20,6 +20,7 @@
     3.4  crypto            arch/x86/crypto
     3.5  crypto            crypto
     3.6  crypto            drivers/crypto
     3.7 +crypto            drivers/net/ethernet/chelsio/cxgb4/cxgb4.ko.xz
     3.8  cryptoloop        drivers/block/cryptoloop.ko.xz
     3.9  dialup            drivers/tty/serial/8250/serial_cs.ko.xz
    3.10  dialup            drivers/usb/serial
    3.11 @@ -202,6 +203,7 @@
    3.12  video             drivers/video/backlight
    3.13  wan               drivers/net/wan
    3.14  watchdog          drivers/watchdog
    3.15 +watchdog          drivers/mfd/kempld-core.ko.xz
    3.16  wimax             drivers/net/wimax
    3.17  wimax             net/wimax
    3.18  wireless          drivers/leds
     4.1 --- a/linux/stuff/tools/copy_modules.sh	Fri Jun 16 03:38:59 2017 +0300
     4.2 +++ b/linux/stuff/tools/copy_modules.sh	Fri Jun 16 13:35:47 2017 +0300
     4.3 @@ -58,21 +58,29 @@
     4.4  		while read rule_name rule_value; do
     4.5  			[ "$rule_name" != 'linux' ] && continue
     4.6  			list_modules $rule_value >> "$modlist" 2>/dev/null
     4.7 -		done < "${wanted_stuff:-$stuff}/split.rules"
     4.8 +		done < "$stuff/split.rules"
     4.9  		;;
    4.10  esac
    4.11  
    4.12 -# A.3. If package depends on other package - make these modules "restricted" (excluded) too
    4.13 -if [ "$DEPENDS" != "$WANTED" ]; then
    4.14 +# A.3. Simulate deprecated (for receipts v2) variable $WANTED
    4.15 +case $PACKAGE in
    4.16 +	linux-libre|linux64|linux) wanted='';;
    4.17 +	linux-libre-*) wanted='linux-libre';;
    4.18 +	linux64-*)     wanted='linux64';;
    4.19 +	linux-*)       wanted='linux';;
    4.20 +esac
    4.21 +
    4.22 +# A.4. If package depends on other package - make these modules "restricted" (excluded) too
    4.23 +if [ "$DEPENDS" != "$wanted" ]; then
    4.24  	for i in $DEPENDS; do
    4.25 -		if [ "$i" != "$WANTED" ]; then
    4.26 +		if [ "$i" != "$wanted" ]; then
    4.27  			pkg_subname=${i#linux-libre-}
    4.28  			pkg_subname=${pkg_subname#linux*-}
    4.29  
    4.30  			while read rule_name rule_value; do
    4.31  				[ "$pkg_subname" != "$rule_name" ] && continue
    4.32  				list_modules $rule_value >> "$modlist" 2>/dev/null
    4.33 -			done < "${wanted_stuff:-$stuff}/split.rules"
    4.34 +			done < "$stuff/split.rules"
    4.35  		fi
    4.36  	done
    4.37  fi
    4.38 @@ -99,7 +107,7 @@
    4.39  		mkdir -p $fs/$dir
    4.40  		cp -a $modroot/$module $fs/$dir
    4.41  	done
    4.42 -done < "${wanted_stuff:-$stuff}/split.rules"
    4.43 +done < "$stuff/split.rules"
    4.44  
    4.45  # B.3. Clean
    4.46  rm "$modlist"