pool/rpm
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

Accepting request 74046 from home:fcrozat:systemd

Browse Source 
- update brp.diff to not convert /sbin/init to absolute symlink
  (needed for kiwi and systemd).

OBS-URL: https://build.opensuse.org/request/show/74046
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=130
This commit is contained in:
Cristian Rodríguez
2011-06-17 16:31:03 +00:00
committed by Git OBS Bridge
parent cea6411dc9
commit 6839977296
4 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
brp.diff
View File

@@ -1,7 +1,9 @@
SUSE specific brp script patches
--- ./scripts/Makefile.am.orig 2010-12-03 12:11:57.000000000 +0000
+++ ./scripts/Makefile.am 2011-05-11 14:31:45.000000000 +0000
Index: scripts/Makefile.am
===================================================================
--- scripts/Makefile.am.orig
+++ scripts/Makefile.am
@@ -6,6 +6,7 @@ CLEANFILES =
EXTRA_DIST = \
@@ -18,8 +20,10 @@ SUSE specific brp script patches
brp-strip brp-strip-comment-note brp-python-hardlink \
brp-strip-shared brp-strip-static-archive \
check-files check-prereqs \
--- ./scripts/brp-lib64-linux.orig 2011-05-11 14:30:08.000000000 +0000
+++ ./scripts/brp-lib64-linux 2011-05-11 14:30:08.000000000 +0000
Index: scripts/brp-lib64-linux
===================================================================
--- /dev/null
+++ scripts/brp-lib64-linux
@@ -0,0 +1,42 @@
+#!/bin/bash
+# script checks wether package is 64-bit clean
@@ -63,8 +67,22 @@ SUSE specific brp script patches
+ fi
+done
+exit 0
--- ./scripts/brp-strip-comment-note.orig 2010-12-03 12:11:57.000000000 +0000
+++ ./scripts/brp-strip-comment-note 2011-05-11 14:30:08.000000000 +0000
Index: scripts/brp-strip
===================================================================
--- scripts/brp-strip.orig
+++ scripts/brp-strip
@@ -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
+++ scripts/brp-strip-comment-note
@@ -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 {} \; | \
@@ -74,19 +92,11 @@ SUSE specific brp script patches
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 2010-12-03 12:11:57.000000000 +0000
+++ ./scripts/brp-strip 2011-05-11 14:30:08.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-symlink.orig 2011-05-11 14:30:08.000000000 +0000
+++ ./scripts/brp-symlink 2011-05-11 14:30:08.000000000 +0000
@@ -0,0 +1,184 @@
Index: scripts/brp-symlink
===================================================================
--- /dev/null
+++ scripts/brp-symlink
@@ -0,0 +1,186 @@
+#!/bin/sh
+
+# Task: go through the files in $RPM_BUILD_ROOT and
@@ -176,6 +186,8 @@ SUSE specific brp script patches
+ continue;;
+ */share/texmf/*|/usr/share/terminfo/*)
+ continue;;
+ /sbin/init,*) # don't create absolute symlink for /sbin/init
+ continue;;
+ *share/automake-*)
+ echo "ERROR: link target $link points into automake directory"
+ echo " You might want to add a -c to the automake call (or just"