forked from pool/rpmlint
Ludwig Nussel
912bea2445
- rpmlint 1.8 update * python 3 fixes * Add support for file triggers * Mechanism to black list certain C calls * new error: non-devel-file-in-devel-package * appdata check configurable * project moved to github * Patches dropped: avoid-mismatched-libregex.diff filename-non-utf8-exception.diff fix-ghost-file-handling.diff save-content-to-an-array.diff fix-TmpFilesCheck-pattern-match.diff move-ghost-file-check-to-TmpFilesCh.diff OBS-URL: https://build.opensuse.org/request/show/346358 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=353
59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
From: Some One <nobody@opensuse.org>
|
|
Date: Thu, 9 Apr 2015 14:55:39 +0200
|
|
Subject: [PATCH] noarch-lib64.diff
|
|
|
|
===================================================================
|
|
---
|
|
BinariesCheck.py | 15 ++++++++++++++-
|
|
1 file changed, 14 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/BinariesCheck.py b/BinariesCheck.py
|
|
index 62951d6..eb19387 100644
|
|
--- a/BinariesCheck.py
|
|
+++ b/BinariesCheck.py
|
|
@@ -337,6 +337,7 @@ class BinariesCheck(AbstractCheck.AbstractCheck):
|
|
binary = False
|
|
binary_in_usr_lib = False
|
|
has_usr_lib_file = False
|
|
+ file_in_lib64 = False
|
|
|
|
multi_pkg = False
|
|
srpm = pkg[rpm.RPMTAG_SOURCERPM]
|
|
@@ -355,6 +356,10 @@ class BinariesCheck(AbstractCheck.AbstractCheck):
|
|
# only-non-binary-in-usr-lib false positives
|
|
binary_in_usr_lib = True
|
|
|
|
+ if stat.S_ISREG(pkgfile.mode) and \
|
|
+ (fname.startswith("/usr/lib64") or fname.startswith("/lib64")):
|
|
+ file_in_lib64 = True
|
|
+
|
|
is_elf = 'ELF' in pkgfile.magic
|
|
is_ar = 'current ar archive' in pkgfile.magic
|
|
is_ocaml_native = 'Objective caml native' in pkgfile.magic
|
|
@@ -588,9 +593,12 @@ class BinariesCheck(AbstractCheck.AbstractCheck):
|
|
if version and version != -1 and version not in pkg.name:
|
|
printError(pkg, 'incoherent-version-in-name', version)
|
|
|
|
- if not binary and not multi_pkg and pkg.arch != 'noarch':
|
|
+ if not binary and not multi_pkg and not file_in_lib64 and pkg.arch != 'noarch':
|
|
printError(pkg, 'no-binary')
|
|
|
|
+ if pkg.arch == 'noarch' and file_in_lib64:
|
|
+ printError(pkg, 'noarch-with-lib64')
|
|
+
|
|
if has_usr_lib_file and not binary_in_usr_lib:
|
|
printWarning(pkg, 'only-non-binary-in-usr-lib')
|
|
|
|
@@ -614,6 +622,11 @@ FHS and the FSSTND forbid this.''',
|
|
# 'non-sparc32-binary',
|
|
# '',
|
|
|
|
+'noarch-with-lib64',
|
|
+'''This package is marked as noarch but installs files into lib64.
|
|
+Not all architectures have this in path, so the package can't be
|
|
+noarch.''',
|
|
+
|
|
'invalid-soname',
|
|
'''The soname of the library is neither of the form lib<libname>.so.<major> or
|
|
lib<libname>-<major>.so.''',
|