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

- check exit code of suse brp scripts and abort if false

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=182
This commit is contained in:
Dirk Mueller 2012-01-20 10:58:48 +00:00 committed by Git OBS Bridge
parent 181c95e8cd
commit 290ee0147e
2 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
brp.diff
View File

@ -1,22 +1,6 @@
SUSE specific brp script patches --- scripts/brp-strip
+++ scripts/brp-strip
Index: scripts/Makefile.am @@ -15,6 +15,7 @@
===================================================================
--- 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 {} \; | \ 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 "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \
grep -v ' shared object,' | \ grep -v ' shared object,' | \
@ -24,11 +8,9 @@ Index: scripts/brp-strip
sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do
$STRIP -g "$f" || : $STRIP -g "$f" || :
done done
Index: scripts/brp-strip-comment-note --- scripts/brp-strip-comment-note
=================================================================== +++ scripts/brp-strip-comment-note
--- scripts/brp-strip-comment-note.orig 2011-12-11 09:38:35.000000000 +0100 @@ -16,6 +16,8 @@
+++ 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 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 {} \; | \ 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 "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \
@ -37,11 +19,9 @@ Index: scripts/brp-strip-comment-note
sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped/\1/p'`; do sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped/\1/p'`; do
note="-R .note" note="-R .note"
if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \ if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \
Index: scripts/brp-suse --- scripts/brp-suse
=================================================================== +++ scripts/brp-suse
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -0,0 +1,13 @@
+++ scripts/brp-suse 2011-12-11 10:31:29.117182578 +0100
@@ -0,0 +1,14 @@
+#! /bin/sh +#! /bin/sh
+ +
+# If using normal root, avoid changing anything: +# If using normal root, avoid changing anything:
@ -52,7 +32,16 @@ Index: scripts/brp-suse
+ls -1 /usr/lib/rpm/brp-suse.d/brp* | sort | while read script; do +ls -1 /usr/lib/rpm/brp-suse.d/brp* | sort | while read script; do
+ if test -x "$script"; then + if test -x "$script"; then
+ echo "calling $script" + echo "calling $script"
+ $script + $script || exit 1
+ fi + fi
+done +done
+ --- scripts/Makefile.am
+++ scripts/Makefile.am
@@ -25,6 +25,7 @@
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 \

5
rpm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 20 11:58:23 CET 2012 - dmueller@suse.de
- check exit code of suse brp scripts and abort if false
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 17 10:28:00 UTC 2012 - saschpe@suse.de Tue Jan 17 10:28:00 UTC 2012 - saschpe@suse.de