diff options
| -rw-r--r-- | sbopkglint.d/05-basic-sanity.t.sh | 2 | ||||
| -rw-r--r-- | sbopkglint.d/20-arch.t.sh | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sbopkglint.d/05-basic-sanity.t.sh b/sbopkglint.d/05-basic-sanity.t.sh index 562dbc5..1a03004 100644 --- a/sbopkglint.d/05-basic-sanity.t.sh +++ b/sbopkglint.d/05-basic-sanity.t.sh @@ -43,7 +43,7 @@ nofiledirs="usr usr/doc usr/share usr/man usr/doc/HTML" # packages break that rule. usr/share/applications is listed here, # even though Slackware's KDE packages (erroneously) install .desktop # files +x. -noexecdirs="usr/man usr/share/pixmaps usr/share/icons usr/share/applications usr/share/appdata usr/share/mime usr/share/mime-info usr/share/glib-2.0 usr/doc/HTML" +noexecdirs="usr/include usr/man usr/share/pixmaps usr/share/icons usr/share/applications usr/share/appdata usr/share/mime usr/share/mime-info usr/share/glib-2.0 usr/doc/HTML" # these files must exist, unless -s option given. requiredfiles="usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild" diff --git a/sbopkglint.d/20-arch.t.sh b/sbopkglint.d/20-arch.t.sh index 81a91a4..a6b9265 100644 --- a/sbopkglint.d/20-arch.t.sh +++ b/sbopkglint.d/20-arch.t.sh @@ -54,11 +54,19 @@ if [ -n "$WRONGDIR" ]; then grep -q DL_RO_DYN_TEMP_CNT "$file" && continue fi - if ! echo "$filetype" | grep -q "$CPU"; then + # "no machine" ELF objects are allowed, but since they still come + # in 64-bit and 32-bit varieties, they must be in the correct + # directory. + if ! echo "$filetype" | grep -q -e "$CPU" -e 'no machine'; then WRONGARCH+="$file " fi - if echo "$filetype" | grep -q "not stripped"; then - NOTSTRIPPED+="$file " + + # 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 echo "$filetype" | grep -q "not stripped"; then + NOTSTRIPPED+="$file " + fi fi done < .tmp.$$ rm -f .tmp.$$ |