raven-rhel6/rpm/rpm-4.8.0-fix-stripping.patch
2024-02-21 20:14:44 +06:00

35 lines
1.8 KiB
Diff

diff -up rpm-4.8.0/scripts/brp-strip-comment-note.orig rpm-4.8.0/scripts/brp-strip-comment-note
--- rpm-4.8.0/scripts/brp-strip-comment-note.orig 2016-03-29 17:16:17.141035355 +0200
+++ rpm-4.8.0/scripts/brp-strip-comment-note 2016-03-29 17:17:00.248446288 +0200
@@ -13,7 +13,7 @@ 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" | \
- sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped/\1/p'`; do
+ sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped.*/\1/p'`; do
note="-R .note"
if objdump -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \
grep ALLOC >/dev/null; then
diff -up rpm-4.8.0/scripts/brp-strip.orig rpm-4.8.0/scripts/brp-strip
--- rpm-4.8.0/scripts/brp-strip.orig 2016-03-29 17:16:05.244197939 +0200
+++ rpm-4.8.0/scripts/brp-strip 2016-03-29 17:16:49.928587315 +0200
@@ -13,6 +13,6 @@ esac
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,' | \
- sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do
+ sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p'`; do
strip -g "$f" || :
done
diff -up rpm-4.8.0/scripts/brp-strip-shared.orig rpm-4.8.0/scripts/brp-strip-shared
--- rpm-4.8.0/scripts/brp-strip-shared.orig 2016-03-29 17:16:29.305869135 +0200
+++ rpm-4.8.0/scripts/brp-strip-shared 2016-03-29 17:17:10.048312368 +0200
@@ -18,6 +18,6 @@ esac
for f in `find $RPM_BUILD_ROOT -type f -a -exec file {} \; | \
grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \
grep ' shared object,' | \
- sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do
+ sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p'`; do
strip --strip-unneeded "$f"
done