From 8e1c2a8cbbfe67ca046cacb42d4e48de9b2b41c0 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Fri, 30 Jun 2023 06:06:18 -0400 Subject: sbopkglint: do not require +x perm for 'no machine' ELF objects. --- TODO | 2 ++ sbopkglint.d/20-arch.t.sh | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index a0b96e0..1dde8f8 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,5 @@ +TODO: sbopkglint should check for perllocal.pod, .packlist, *.bs + (see perl template). TODO: sbopkglint could complain if the SlackBuild sets SLKCFLAGS but there's no native code. diff --git a/sbopkglint.d/20-arch.t.sh b/sbopkglint.d/20-arch.t.sh index bb9fafe..462a3c6 100644 --- a/sbopkglint.d/20-arch.t.sh +++ b/sbopkglint.d/20-arch.t.sh @@ -38,8 +38,14 @@ if [ -n "$WRONGDIR" ]; then while read line; do file="$( echo $line | cut -d: -f1 )" filetype="$( echo $line | cut -d: -f2 )" + nomachine="$( echo $line | grep 'no machine' )" - [ ! -x "$file" ] && ls -bld "$file" >> .nonexec.$$ + # 20230630 bkw: don't require nomachine objects to be +x. + # AFAIK, the only thing that uses them is guile2.2, and it + # installs them 0644. + if [ ! "$nomachine" ]; then + [ ! -x "$file" ] && ls -bld "$file" >> .nonexec.$$ + fi case "$file" in # 20220414 bkw: only check for libs directly in the dir. @@ -69,7 +75,7 @@ if [ -n "$WRONGDIR" ]; then # don't check "no machine" ELF objects for being stripped. # our strip command doesn't know how to strip them! - if ! echo "$filetype" | grep -q 'no machine'; then + if [ ! "$nomachine" ]; then if echo "$filetype" | grep -q "not stripped"; then ls -lb "$file" >> .notstripped.$$ fi -- cgit v1.2.3