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

- update to rpm-4.17.1

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=612
This commit is contained in:
Michael Schröder
2022-07-21 14:16:52 +00:00
committed by Git OBS Bridge
parent 4c8827bf04
commit c793cb9035
7 changed files with 26 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
brp.diff
View File

@@ -1,5 +1,5 @@
--- scripts/brp-strip-comment-note.orig 2021-06-21 12:00:44.650612737 +0000
+++ scripts/brp-strip-comment-note 2021-09-23 19:04:31.249193665 +0000
--- scripts/brp-strip-comment-note.orig 2022-07-01 09:02:17.586292400 +0000
+++ scripts/brp-strip-comment-note 2022-07-21 14:03:57.119809772 +0000
@@ -16,6 +16,8 @@ esac
# for already stripped elf files in the build root
for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \
@@ -9,11 +9,11 @@
sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped.*/\1/p'`; do
note="-R .note"
if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \
--- scripts/brp-strip.orig 2021-09-23 19:04:31.249193665 +0000
+++ scripts/brp-strip 2021-09-23 19:07:10.624868675 +0000
--- scripts/brp-strip.orig 2022-07-01 10:31:45.997506545 +0000
+++ scripts/brp-strip 2022-07-21 14:06:12.155573458 +0000
@@ -14,4 +14,4 @@ esac
# Strip ELF binaries
find "$RPM_BUILD_ROOT" -type f \! -regex "${RPM_BUILD_ROOT}/*usr/lib/debug.*" \! -name "*.ko" -print0 | \
- xargs -0 -r -P$NCPUS -n32 sh -c "file \"\$@\" | sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p' | xargs -I\{\} $STRIP -g \{\}" ARG0
+ xargs -0 -r -P$NCPUS -n32 sh -c "file \"\$@\" | grep -v '/lib/modules/' | sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p' | xargs -I\{\} $STRIP -g \{\}" ARG0
find "$RPM_BUILD_ROOT" -type f \! -regex "${RPM_BUILD_ROOT}/*usr/lib/debug.*" \! -name "*.go" -print0 | \
- xargs -0 -r -P$NCPUS -n32 sh -c "file \"\$@\" | sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p' | grep -v 'no machine' | xargs -I\{\} $STRIP -g \{\}" ARG0
+ xargs -0 -r -P$NCPUS -n32 sh -c "file \"\$@\" | grep -v ' shared object,' | grep -v '/lib/modules/ | sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p' | grep -v 'no machine' | xargs -I\{\} $STRIP -g \{\}" ARG0