Home| summaryrefslogtreecommitdiff |
diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-01-14 11:25:27 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-01-14 11:25:27 +0100 |
| commit | 6ce7e4659c6ab2e6b087667459cc94a7be50bb0c (patch) | |
| tree | 7c8aa3c6c7111d80722051dda3d58602f46cbf59 | |
| parent | 7fea7818d3e57e7acb7886c8fe76265c4f149a54 (diff) | |
| parent | ffbdc9e1ab8a7f43265d45f982170f2877b717be (diff) | |
Merge branch 'ksyms-fix' into SLE11-SP1
| -rw-r--r-- | kernel-source.changes | 6 | ||||
| -rw-r--r-- | rpm/find-provides | 6 | ||||
| -rw-r--r-- | rpm/kernel-binary.spec.in | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/kernel-source.changes b/kernel-source.changes index fe2f90adfd..df0298e0b8 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 14 10:25:21 CET 2010 - mmarek@suse.de + +- rpm/find-provides, rpm/kernel-binary.spec.in: really fix ppc + symbol provides. + +------------------------------------------------------------------- Wed Jan 13 13:53:04 CET 2010 - mmarek@suse.de - rpm/kernel-binary.spec.in, rpm/find-provides: extract exported diff --git a/rpm/find-provides b/rpm/find-provides index fde0b51ee8..0ca619abdd 100644 --- a/rpm/find-provides +++ b/rpm/find-provides @@ -5,14 +5,16 @@ filelist=$(mktemp -t ${0##*/}.XXXXXXXXXX) grep -v '/kernel/drivers/staging/.*\.ko$' >"$filelist" shopt -s nullglob +builddir=$1 +shift + # pretend that /boot/vmlinux-* is in the -base package and not in -devel 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 + if test -e "$builddir/$(basename "$f").provides"; then cat "$_" - rm "$_" fi done else diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index 90486dad15..2e74046aa7 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -203,7 +203,7 @@ Obsoletes: perfmon-kmp-%build_flavor Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" -%define __find_provides %_sourcedir/find-provides %name +%define __find_provides %_sourcedir/find-provides %my_builddir %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -390,8 +390,8 @@ add_vmlinux() # (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 + echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \ + %my_builddir/$(basename $vmlinux).provides fi %endif if $compressed; then |