41c257a762
- add libtool as explicit buildrequire - do not hardcode brp check list, but call everything below /usr/lib/rpm/brp-suse.d - and move our own brp scripts to brp-check-suse OBS-URL: https://build.opensuse.org/request/show/96284 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=161
59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
SUSE specific brp script patches
|
|
|
|
Index: scripts/Makefile.am
|
|
===================================================================
|
|
--- scripts/Makefile.am.orig 2011-12-11 09:38:35.000000000 +0100
|
|
+++ scripts/Makefile.am 2011-12-11 10:30:24.786227246 +0100
|
|
@@ -25,6 +25,7 @@ EXTRA_DIST = \
|
|
rpmconfig_SCRIPTS = \
|
|
brp-compress brp-python-bytecompile brp-java-gcjcompile \
|
|
brp-strip brp-strip-comment-note brp-python-hardlink \
|
|
+ brp-suse \
|
|
brp-strip-shared brp-strip-static-archive \
|
|
check-files check-prereqs \
|
|
check-buildroot check-rpaths check-rpaths-worker \
|
|
Index: scripts/brp-strip
|
|
===================================================================
|
|
--- scripts/brp-strip.orig 2011-12-11 09:38:35.000000000 +0100
|
|
+++ scripts/brp-strip 2011-12-11 10:30:16.464621084 +0100
|
|
@@ -15,6 +15,7 @@ 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,' | \
|
|
+ grep -v '/lib/modules/' | \
|
|
sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do
|
|
$STRIP -g "$f" || :
|
|
done
|
|
Index: scripts/brp-strip-comment-note
|
|
===================================================================
|
|
--- scripts/brp-strip-comment-note.orig 2011-12-11 09:38:35.000000000 +0100
|
|
+++ scripts/brp-strip-comment-note 2011-12-11 10:30:16.465621036 +0100
|
|
@@ -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 | \
|
|
Index: scripts/brp-suse
|
|
===================================================================
|
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
+++ scripts/brp-suse 2011-12-11 10:31:29.117182578 +0100
|
|
@@ -0,0 +1,14 @@
|
|
+#! /bin/sh
|
|
+
|
|
+# If using normal root, avoid changing anything:
|
|
+if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
|
|
+ exit 0
|
|
+fi
|
|
+
|
|
+ls -1 /usr/lib/rpm/brp-suse.d/brp* | sort | while read script; do
|
|
+ if test -x "$script"; then
|
|
+ echo "calling $script"
|
|
+ $script
|
|
+ fi
|
|
+done
|
|
+
|