testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

Accepting request 200349 from home:bernhard-voelker:branches:Base:System

Browse Source 
- replace obsoleted "find -perm +NNN" syntax [bnc#842004]
  to "-perm /NNN" in debugsource-package.diff and
  finddebuginfo.diff.

OBS-URL: https://build.opensuse.org/request/show/200349
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=292
This commit is contained in:
Dirk Mueller 2013-09-24 12:26:06 +00:00 committed by Git OBS Bridge
parent 785c0a0cdf
commit d79e9fd06b
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debugsource-package.diff
View File

@ -31,9 +31,9 @@ build the binary. The patches moves them into a separate package -debugsource.
$strict || strict_error=WARNING $strict || strict_error=WARNING
-# Strip ELF binaries -# Strip ELF binaries
-find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort -z | -find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm /111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort -z |
+# Strip ELF binaries (and no static libraries) +# Strip ELF binaries (and no static libraries)
+find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" -print0 | sort -z | +find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm /111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" -print0 | sort -z |
xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' | xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' |
while read nlinks inum f; do while read nlinks inum f; do
case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in

2
finddebuginfo.diff
View File

@ -39,7 +39,7 @@
- -print | - -print |
-file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped/\1/p' | -file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped/\1/p' |
-xargs --no-run-if-empty stat -c '%h %D_%i %n' | -xargs --no-run-if-empty stat -c '%h %D_%i %n' |
+find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort -z | +find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm /111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort -z |
+xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' | +xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' |
while read nlinks inum f; do while read nlinks inum f; do
+ case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in + case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in

7
rpm.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Sep 24 10:36:15 UTC 2013 - mail@bernhard-voelker.de
- replace obsoleted "find -perm +NNN" syntax [bnc#842004]
to "-perm /NNN" in debugsource-package.diff and
finddebuginfo.diff.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 11 18:28:39 CEST 2013 - mls@suse.de Wed Sep 11 18:28:39 CEST 2013 - mls@suse.de