aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xsbolint2
-rwxr-xr-xsbopkglint2
-rw-r--r--sbopkglint.d/20-arch.t.sh11
4 files changed, 10 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 9f0943b..f126da7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
PROJ=sbo-maintainer-tools
# for now, VERSION has to be updated here and also in both scripts.
-VERSION=0.6.0
+VERSION=0.6.1
PREFIX=/usr/local
DESTDIR=
diff --git a/sbolint b/sbolint
index 872e056..97235eb 100755
--- a/sbolint
+++ b/sbolint
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
# note to self: keep this in sync with VER in sbopkglint and VERSION in Makefile.
-$VERSION="0.6.0";
+$VERSION="0.6.1";
# ChangeLog:
diff --git a/sbopkglint b/sbopkglint
index adc591f..815667f 100755
--- a/sbopkglint
+++ b/sbopkglint
@@ -3,7 +3,7 @@
# 20220408 bkw: note to self: VER must be in sync with VERSION in sbolint
# and the Makefile.
-VER=0.6.0
+VER=0.6.1
: <<EOF
=pod
diff --git a/sbopkglint.d/20-arch.t.sh b/sbopkglint.d/20-arch.t.sh
index 376074d..6ad2d72 100644
--- a/sbopkglint.d/20-arch.t.sh
+++ b/sbopkglint.d/20-arch.t.sh
@@ -15,16 +15,19 @@
# if an x86_64 package has any 32-bit ELF objects (libs or bins)
# if an i?86 package has lib64 or usr/lib64 at all
# if an x86_64 package has 64-bit libs in lib or usr/lib
+# same 32/64 checking for arm (32-bit) and aarch64 (64-bit)
# note: sometimes files in /lib/firmware are ELF, and would cause
# false "wrong directory" warnings, so we exclude that dir from the
# search.
case "$ARCH" in
- noarch) ;; # ok, do nothing.
- i?86) WRONGDIR="lib64"; CPU="80386" ;;
- x86_64) WRONGDIR="lib"; CPU="x86-64" ;;
- *) warn "ARCH isn't noarch, i?86, or x86_64. don't know how to check binaries." ;;
+ noarch) ;; # ok, do nothing.
+ i?86) WRONGDIR="lib64"; CPU="80386" ;;
+ x86_64) WRONGDIR="lib"; CPU="x86-64" ;;
+ aarch64) WRONGDIR="lib"; CPU="aarch64" ;;
+ arm) WRONGDIR="lib64"; CPU="ARM" ;;
+ *) warn "ARCH isn't noarch, i?86, x86_64, arm, or aarch64. don't know how to check binaries." ;;
esac
INWRONGDIR=""