# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1587299821 0
# Node ID a35e535059479be618da1449ca78ed985e6d1ddb
# Parent  84f57aa7cd1829abf4ba3ea08b532becbc809ade
Up tazlito (524)

diff -r 84f57aa7cd18 -r a35e53505947 linux-zram/stuff/compcache
--- a/linux-zram/stuff/compcache	Sat Apr 18 17:07:09 2020 +0100
+++ b/linux-zram/stuff/compcache	Sun Apr 19 12:37:01 2020 +0000
@@ -21,8 +21,8 @@
       exit 1
     fi
     action 'Loading module...'
-    devices=$(awk '/cpu cores/{c=$4} /processor/{p++}
-	END { if (c>0) p=c; if (p==0) p++; print p }' /proc/cpuinfo)
+    devices=$(awk '/cpu cores/{c=$4} /processor/{p++} /siblings/{s=$3}
+	END { if (c*s>0) p/=s/c; if (p==0) p++; print p}' /proc/cpuinfo)
     modprobe zram num_devices=$devices &&
     for i in $(seq 0 $(($devices-1))); do
 	awk "/MemTotal/ { print \$2 * 1024 * ${SIZE%\%} / 100 / $devices }" \
diff -r 84f57aa7cd18 -r a35e53505947 linux64-zram/stuff/compcache
--- a/linux64-zram/stuff/compcache	Sat Apr 18 17:07:09 2020 +0100
+++ b/linux64-zram/stuff/compcache	Sun Apr 19 12:37:01 2020 +0000
@@ -21,8 +21,8 @@
       exit 1
     fi
     action 'Loading module...'
-    devices=$(awk '/cpu cores/{c=$4} /processor/{p++}
-	END { if (c>0) p=c; if (p==0) p++; print p }' /proc/cpuinfo)
+    devices=$(awk '/cpu cores/{c=$4} /processor/{p++} /siblings/{s=$3}
+	END { if (c*s>0) p/=s/c; if (p==0) p++; print p}' /proc/cpuinfo)
     modprobe zram num_devices=$devices &&
     for i in $(seq 0 $(($devices-1))); do
 	awk "/MemTotal/ { print \$2 * 1024 * ${SIZE%\%} / 100 / $devices }" \
diff -r 84f57aa7cd18 -r a35e53505947 rpm4/receipt
--- a/rpm4/receipt	Sat Apr 18 17:07:09 2020 +0100
+++ b/rpm4/receipt	Sun Apr 19 12:37:01 2020 +0000
@@ -7,7 +7,7 @@
 SHORT_DESC="RPM Package Manager."
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://www.rpm.org/"
+WEB_SITE="https://rpm.org/"
 
 SOURCE="rpm"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
diff -r 84f57aa7cd18 -r a35e53505947 tazlito/receipt
--- a/tazlito/receipt	Sat Apr 18 17:07:09 2020 +0100
+++ b/tazlito/receipt	Sun Apr 19 12:37:01 2020 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="tazlito"
-VERSION="520"
+VERSION="524"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz Live Tool."
 MAINTAINER="pascal.bellard@slitaz.org"