Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-01-13 15:15:36 +0100
committerMichal Marek <mmarek@suse.cz>2010-01-13 15:15:36 +0100
commit7fea7818d3e57e7acb7886c8fe76265c4f149a54 (patch)
tree6546c71067a3c98802314772499b3a2086ec5d47
parente55dc2b73dc1e1eabb3de0744f77fd728ec520a3 (diff)
parent862f8cb601a13e5eb08a1448669d13ca1244b791 (diff)
Merge branch 'ksyms-fix' into SLE11-SP1
-rw-r--r--kernel-source.changes7
-rw-r--r--rpm/find-provides4
-rw-r--r--rpm/kernel-binary.spec.in4
3 files changed, 15 insertions, 0 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 8ac6fbec45..fe2f90adfd 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Jan 13 13:53:04 CET 2010 - mmarek@suse.de
+
+- rpm/kernel-binary.spec.in, rpm/find-provides: extract exported
+ symbols from /boot/vmlinux before the image is stripped (affects
+ ppc).
+
+-------------------------------------------------------------------
Tue Jan 12 09:21:52 CET 2010 - tonyj@suse.de
- needs_update: remove LTT/trace patches (assigned to jbl), all had
diff --git a/rpm/find-provides b/rpm/find-provides
index 6716ed7d82..fde0b51ee8 100644
--- a/rpm/find-provides
+++ b/rpm/find-provides
@@ -10,6 +10,10 @@ if grep -q '/boot/System\.map\>' "$filelist"; then
prefix=$(sed -rn 's:(.*)/boot/System\.map\>.*:\1:p; T; q' "$filelist")
for f in "$prefix"/boot/vmlinux*; do
echo "$f" >>"$filelist"
+ if test -e "$f.provides"; then
+ cat "$_"
+ rm "$_"
+ fi
done
else
perl -ni -e 'next if /\/boot\/vmlinux/ && !/\.debug$/; print' "$filelist"
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index 0f86619eb9..90486dad15 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -389,6 +389,9 @@ add_vmlinux()
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
chmod +x %buildroot/$vmlinux
+ # exctact the provided symbols before they are stripped away
+ echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms > \
+ %buildroot/$vmlinux.provides
fi
%endif
if $compressed; then
@@ -638,6 +641,7 @@ done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
+ -type f -name 'vmlinux-*.provides' -prune -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'