openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File brp.diff of Package rpm (Revision 29c9556dce35b8f3ac0ab952e210caa5)

Currently displaying revision 29c9556dce35b8f3ac0ab952e210caa5 , Show latest

--- ./scripts/Makefile.am.orig	2012-03-20 08:07:25.000000000 +0000
+++ ./scripts/Makefile.am	2012-06-01 11:39:13.000000000 +0000
@@ -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 \
--- ./scripts/brp-strip-comment-note.orig	2012-03-20 08:07:25.000000000 +0000
+++ ./scripts/brp-strip-comment-note	2012-06-01 11:39:13.000000000 +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	2012-03-20 08:07:25.000000000 +0000
+++ ./scripts/brp-strip	2012-06-01 11:39:13.000000000 +0000
@@ -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
--- ./scripts/brp-suse.orig	2012-06-01 11:39:13.000000000 +0000
+++ ./scripts/brp-suse	2012-06-01 11:39:13.000000000 +0000
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+# If using normal root, avoid changing anything:
+if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
+       exit 0
+fi
+
+for script in /usr/lib/rpm/brp-suse.d/brp*; do
+  if test -x "$script"; then
+    echo "calling $script"
+    $script || exit 1
+  fi
+done

Places

File brp.diff of Package rpm (Revision 29c9556dce35b8f3ac0ab952e210caa5)

Places