From 88b0c395f0e6a17888a80f28cf1537bb4670c10f204d4034fdd7f5c2fd3eed90 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 2 Jul 2010 14:09:25 +0000 Subject: [PATCH] Accepting request 42327 from Base:System Copy from Base:System/rpmlint based on submit request 42327 from user lnussel OBS-URL: https://build.opensuse.org/request/show/42327 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=64 --- rpmlint.changes | 6 ++++++ rpmlint.spec | 2 +- suse-hide-unstripped-outside-build.diff | 18 ++++++++++++++++-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/rpmlint.changes b/rpmlint.changes index 0141634..147cf1c 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 30 12:12:53 UTC 2010 - lnussel@suse.de + +- additionally look at the BUILD_DEBUG variable to determine whether + a warning should be printed. Needs an updated 'build' script. + ------------------------------------------------------------------- Tue Jun 29 14:29:57 UTC 2010 - lnussel@suse.de diff --git a/rpmlint.spec b/rpmlint.spec index eb233cc..141c6b0 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -23,7 +23,7 @@ Name: rpmlint BuildRequires: rpm-python Summary: Rpm correctness checker Version: 0.95 -Release: 9 +Release: 10 Source0: %{name}-%{version}.tar.bz2 Source1: config Source1001: config.in diff --git a/suse-hide-unstripped-outside-build.diff b/suse-hide-unstripped-outside-build.diff index cdc6112..dad95aa 100644 --- a/suse-hide-unstripped-outside-build.diff +++ b/suse-hide-unstripped-outside-build.diff @@ -10,13 +10,27 @@ Index: BinariesCheck.py import rpm -@@ -271,7 +272,8 @@ class BinariesCheck(AbstractCheck.Abstra +@@ -271,7 +272,9 @@ class BinariesCheck(AbstractCheck.Abstra # stripped ? if not is_ocaml_native and not unstrippable.search(fname): - if 'not stripped' in pkgfile.magic: + if 'not stripped' in pkgfile.magic and \ -+ os.environ.get('BUILD_DIR', None) == None: ++ (os.environ.get('BUILD_DIR', None) == None or ++ os.environ.get('BUILD_DEBUG', None) != None): printWarning( pkg, 'unstripped-binary-or-object', fname) +@@ -585,6 +588,12 @@ form, make sure that rpmbuild does not s + that use prelink, make sure that prelink does not strip it either, usually by + placing a blacklist file in /etc/prelink.conf.d. For more information, see + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256900#49''', ++ ++'unstripped-binary-or-object', ++'''stripping debug info from binaries happens automatically according to global ++project settings. So there's normally no need to manually strip binaries. ++Left over unstripped binaries could therefore indicate a bug in the automatic ++stripping process.''', + ) + + # BinariesCheck.py ends here