rpm/brp.diff
Michael Schröder 765802d7a0 - update to rpm-4.17.0
- dropped support for berkeley db
- archive unpacking failures no longer leave garbage
- unified built-in and user-define macro syntax and calling conventions 
- python generators and debuginfo extraction has been split into a
  separate upstream project
- support for ed25519 signatures
- easier rpm macro access in lua
- new patches:
  * python-rpm-packaging.diff
- modified patches:
  * usr-lib-sysimage-rpm.patch 
  * localetag.diff
  * brp.diff
  * findlang.diff
  * macrosin.diff
  * rpmqpack.diff
  * build.diff
  * whatrequires-doc.diff
  * remove-brp-strips.diff
  * fileattrs.diff
  * langnoc.diff
  * find-lang-qt-qm.patch
  * findsupplements.diff
  * finddebuginfo.diff
  * finddebuginfo-absolute-links.diff
  * debugsubpkg.diff
  * debuglink.diff
  * debuginfo-mono.patch
- dropped patches:

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=584
2021-09-24 08:49:04 +00:00

20 lines
1.2 KiB
Diff

--- ./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
@@ -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 {} \; | \
grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \
+ grep -v ' shared object,' | \
+ grep -v '/lib/modules/' | \
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
@@ -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