x32 fixes (baggins?)

1 files changed, 23 insertions, 17 deletions

diff --git a/wwwbin/consistency-check.sh b/wwwbin/consistency-check.sh
index 0fe6489..285770e 100755
--- a/wwwbin/consistency-check.sh
+++ b/wwwbin/consistency-check.sh
@@ -3,9 +3,11 @@
 export LC_ALL=C
 
 filter_deps() {
-	grep -Ev "(FileDigestParameterized|unsatisfied dependencies found|-multilib-|zsh/latest/functions|VirtualBox.*libc\.so\.6|obextool.*libc\.so\.6)" | \
-	grep -v "uname(release)" |
-	grep -v "/eclipse/"
+	if [ $1 = "x32" ]; then
+	  grep -Ev "(uname\(release\)|-multilib-|\/eclipse\/|statifier|kernel-nopae-source-|kernel-tools-perf-vdso|libreoffice|iceape|iceweasel|icedove|nodejs)"
+	else
+	  grep -Ev "(uname\(release\)|-multilib-|\/eclipse\/|statifier|kernel-nopae-source-|kernel-tools-perf-vdso)"
+    fi
 }
 
 # group errors by same error kind
@@ -47,6 +49,8 @@ pkg2src() {
 }
 
 gen_list() {
+	arch=$1
+	shift
 	date
 	/usr/bin/poldek -O "auto directory dependencies = yes" \
 	--ignore "*-debuginfo-*" \
@@ -59,28 +63,30 @@ gen_list() {
 	--ignore "libpurple-protocol-skype-*.x86_64" \
 	--ignore "nagios-plugin-check_cciss-*" \
 	--ignore "libpng1*" \
-	--verify=deps -Q "$@" | filter_deps | group_deps | sort | pkg2src "$@"
+	--verify=deps -Q "$@" | filter_deps $arch | group_deps | sort | pkg2src "$@"
 }
 
 gen_list_uniq() {
-	gen_list -O"unique package names = yes" "$@"
+	arch=$1
+	shift
+	gen_list $arch -O"unique package names = yes" "$@"
 }
 
 t=$(mktemp)
 ftpdir=$HOME/ftp
-gen_list      -s $ftpdir/PLD/x86_64/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ > $t && cat $t > $HOME/www/main.txt
-gen_list_uniq -s $ftpdir/PLD/x86_64/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ -s $ftpdir/ready/x86_64/RPMS/ -s $ftpdir/ready/noarch/RPMS/ > $t && cat $t > $HOME/www/main-ready.txt
-gen_list_uniq -s $ftpdir/PLD/x86_64/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ -s $ftpdir/ready/x86_64/RPMS/ -s $ftpdir/ready/noarch/RPMS/ -s $ftpdir/test/x86_64/RPMS/ -s $ftpdir/test/noarch/RPMS/ > $t && cat $t > $HOME/www/main-ready-test.txt
+for arch in x86_64 i686 x32 ; do
+	if [ "$arch" = x86_64 ]; then
+		outfext=.txt
+	else
+		outfext=-$arch.txt
+	fi
+	gen_list      $arch -s $ftpdir/PLD/$arch/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ > $t && cat $t > $HOME/www/main$outfext
+	gen_list_uniq $arch -s $ftpdir/PLD/$arch/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ -s $ftpdir/ready/$arch/RPMS/ -s $ftpdir/ready/noarch/RPMS/ > $t && cat $t > $HOME/www/main-ready$outfext
+	gen_list_uniq $arch -s $ftpdir/PLD/$arch/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ -s $ftpdir/ready/$arch/RPMS/ -s $ftpdir/ready/noarch/RPMS/ -s $ftpdir/test/$arch/RPMS/ -s $ftpdir/test/noarch/RPMS/ > $t && cat $t > $HOME/www/main-ready-test$outfext
+done
 
-gen_list      -s $ftpdir/PLD/i686/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ > $t && cat $t > $HOME/www/main-i686.txt
-gen_list_uniq -s $ftpdir/PLD/i686/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ -s $ftpdir/ready/i686/RPMS/ -s $ftpdir/ready/noarch/RPMS/ > $t && cat $t > $HOME/www/main-ready-i686.txt
-gen_list_uniq -s $ftpdir/PLD/i686/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ -s $ftpdir/ready/i686/RPMS/ -s $ftpdir/ready/noarch/RPMS/ -s $ftpdir/test/i686/RPMS/ -s $ftpdir/test/noarch/RPMS/ > $t && cat $t > $HOME/www/main-ready-test-i686.txt
-
-gen_list      -s $ftpdir/PLD/i486/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ > $t && cat $t > $HOME/www/main-i486.txt
-gen_list_uniq -s $ftpdir/PLD/i486/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ -s $ftpdir/ready/i486/RPMS/ -s $ftpdir/ready/noarch/RPMS/ > $t && cat $t > $HOME/www/main-ready-i486.txt
-gen_list_uniq -s $ftpdir/PLD/i486/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ -s $ftpdir/ready/i486/RPMS/ -s $ftpdir/ready/noarch/RPMS/ -s $ftpdir/test/i486/RPMS/ -s $ftpdir/test/noarch/RPMS/ > $t && cat $t > $HOME/www/main-ready-test-i486.txt
-
-(date; $HOME/bin/ac-th-diff.py) > $t && cat $t > $HOME/www/ac-th-diff.txt
+# that does not make sense anymore iMO - baggins
+# (date; $HOME/bin/ac-th-diff.py) > $t && cat $t > $HOME/www/ac-th-diff.txt
 
 chmod 644 $HOME/www/*.txt
 rm -f $t