From b67c4f3cae5d79a519f8f459638829446006adb7 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Tue, 5 Dec 2023 17:24:40 -0500 Subject: sbopkglint: support aarch64 static lib checking --- TODO | 6 +++--- sbopkglint.d/75-static_libs.t.sh | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/TODO b/TODO index 2c98198..ba0dae9 100644 --- a/TODO +++ b/TODO @@ -1,14 +1,14 @@ This stuff is implemented, probably works, needs more testing: -TODO: sbolint and sbopkglint both: complain if PRGNAM has invalid characters. -TODO: if sbopkglint finds a hardcoded $PKG in /var/lib/pkgtools/scripts/*, +DONE: sbolint and sbopkglint both: complain if PRGNAM has invalid characters. +DONE: if sbopkglint finds a hardcoded $PKG in /var/lib/pkgtools/scripts/*, mention doinst.sh in the error message +DONE: check arch of static libs (like the shared lib checks). Not yet implemented: TODO: don't complain about: --- non-image files in icon dirs: [text/xml]: -rw-r--r-- 1 root root 11763 Oct 30 19:35 usr/share/pixmaps/pidgin/guifications/themes/default/theme.xml TODO: if package contains any static libs, don't suggest noarch. -TODO: check arch of static libs (like the shared lib checks). TODO: stop checking shared libs for +x and being stripped if they're not directly in /lib /lib64 /usr/lib /usr/lib64. too many packages trigger this, and it just doesn't matter much. diff --git a/sbopkglint.d/75-static_libs.t.sh b/sbopkglint.d/75-static_libs.t.sh index 24e7cd2..39f466b 100644 --- a/sbopkglint.d/75-static_libs.t.sh +++ b/sbopkglint.d/75-static_libs.t.sh @@ -35,8 +35,8 @@ check_static_arch() { local dir="$( basename "$libdir" )" # lib or lib64 case "$libarch" in - x86) wantdir="lib" ;; - x86_64) wantdir="lib64" ;; + x86) wantdir="lib" ;; + x86_64|aarch64) wantdir="lib64" ;; esac } @@ -51,7 +51,9 @@ check_static_lib() { ELF*80386*) check_static_arch "$1" x86 ;; - # TODO: aarch64 + ELF*aarch64*) + check_static_arch "$1" aarch64 + ;; *) ;; # dunno, assume OK esac } -- cgit v1.2.3