wok rev 23634

Up tazlito (524)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Apr 19 12:37:01 2020 +0000 (2020-04-19)
parents 84f57aa7cd18
children a5ef19f1580a
files linux-zram/stuff/compcache linux64-zram/stuff/compcache rpm4/receipt tazlito/receipt
line diff
     1.1 --- a/linux-zram/stuff/compcache	Sat Apr 18 17:07:09 2020 +0100
     1.2 +++ b/linux-zram/stuff/compcache	Sun Apr 19 12:37:01 2020 +0000
     1.3 @@ -21,8 +21,8 @@
     1.4        exit 1
     1.5      fi
     1.6      action 'Loading module...'
     1.7 -    devices=$(awk '/cpu cores/{c=$4} /processor/{p++}
     1.8 -	END { if (c>0) p=c; if (p==0) p++; print p }' /proc/cpuinfo)
     1.9 +    devices=$(awk '/cpu cores/{c=$4} /processor/{p++} /siblings/{s=$3}
    1.10 +	END { if (c*s>0) p/=s/c; if (p==0) p++; print p}' /proc/cpuinfo)
    1.11      modprobe zram num_devices=$devices &&
    1.12      for i in $(seq 0 $(($devices-1))); do
    1.13  	awk "/MemTotal/ { print \$2 * 1024 * ${SIZE%\%} / 100 / $devices }" \
     2.1 --- a/linux64-zram/stuff/compcache	Sat Apr 18 17:07:09 2020 +0100
     2.2 +++ b/linux64-zram/stuff/compcache	Sun Apr 19 12:37:01 2020 +0000
     2.3 @@ -21,8 +21,8 @@
     2.4        exit 1
     2.5      fi
     2.6      action 'Loading module...'
     2.7 -    devices=$(awk '/cpu cores/{c=$4} /processor/{p++}
     2.8 -	END { if (c>0) p=c; if (p==0) p++; print p }' /proc/cpuinfo)
     2.9 +    devices=$(awk '/cpu cores/{c=$4} /processor/{p++} /siblings/{s=$3}
    2.10 +	END { if (c*s>0) p/=s/c; if (p==0) p++; print p}' /proc/cpuinfo)
    2.11      modprobe zram num_devices=$devices &&
    2.12      for i in $(seq 0 $(($devices-1))); do
    2.13  	awk "/MemTotal/ { print \$2 * 1024 * ${SIZE%\%} / 100 / $devices }" \
     3.1 --- a/rpm4/receipt	Sat Apr 18 17:07:09 2020 +0100
     3.2 +++ b/rpm4/receipt	Sun Apr 19 12:37:01 2020 +0000
     3.3 @@ -7,7 +7,7 @@
     3.4  SHORT_DESC="RPM Package Manager."
     3.5  MAINTAINER="erjo@slitaz.org"
     3.6  LICENSE="GPL2"
     3.7 -WEB_SITE="https://www.rpm.org/"
     3.8 +WEB_SITE="https://rpm.org/"
     3.9  
    3.10  SOURCE="rpm"
    3.11  TARBALL="$SOURCE-$VERSION.tar.bz2"
     4.1 --- a/tazlito/receipt	Sat Apr 18 17:07:09 2020 +0100
     4.2 +++ b/tazlito/receipt	Sun Apr 19 12:37:01 2020 +0000
     4.3 @@ -1,7 +1,7 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="tazlito"
     4.7 -VERSION="520"
     4.8 +VERSION="524"
     4.9  CATEGORY="base-system"
    4.10  SHORT_DESC="SliTaz Live Tool."
    4.11  MAINTAINER="pascal.bellard@slitaz.org"