~ubuntu-branches/ubuntu/trusty/drbd8/trusty

« back to all changes in this revision

Viewing changes to rpm-macro-fixes/macros.kernel-source.sles11.diff

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2011-07-05 15:40:13 UTC
  • mfrom: (1.4.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20110705154013-f9l32owj6mi9e1p0
Tags: 2:8.3.11-0ubuntu1
* New upstream release
* debian/patches/01_ubuntu_cn_idx.dpatch: Refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
See comment in macros.kernel-source.sles11-sp1.diff
 
2
 
 
3
--- /etc/rpm/macros.kernel-source.orig
 
4
+++ /etc/rpm/macros.kernel-source
 
5
@@ -9,14 +9,14 @@
 
6
        echo "%%define _suse_kernel_module_subpackage(n:v:r:f:p:) %%{expand:%%(cd %_sourcedir; cat $subpkg; echo %%%%nil)}" \
 
7
        flavors_to_build= \
 
8
        flavors="%*" \
 
9
-       for flavor in $(ls /usr/src/linux-obj/%_target_cpu 2>/dev/null); do \
 
10
+       for flavor in $(ls /usr/src/linux-%{?kernel_version:%kernel_version-}obj/%_target_cpu 2>/dev/null); do \
 
11
            case " $flavors " in \
 
12
            (*" $flavor "*) \
 
13
                [ -n "%{-X}" ] && continue ;; \
 
14
            (*) \
 
15
                [ -z "%{-X}" -a -n "$flavors" ] && continue ;; \
 
16
            esac \
 
17
-           krel=$(make -s -C /usr/src/linux-obj/%_target_cpu/$flavor kernelrelease) \
 
18
+           krel=$(make -s -C /usr/src/linux-%{?kernel_version:%kernel_version-}obj/%_target_cpu/$flavor kernelrelease) \
 
19
            kver=${krel%%-*} \
 
20
            [ -e /boot/symsets-$kver-$flavor.tar.gz ] || continue \
 
21
            flavors_to_build="$flavors_to_build $flavor" \
 
22
@@ -24,7 +24,7 @@
 
23
        done \
 
24
        echo "%%global flavors_to_build${flavors_to_build:-%%nil}" \
 
25
        echo "%%{expand:%%(test -z '%flavors_to_build' && echo %%%%internal_kmp_error)}" \
 
26
-       echo "%%global kernel_source() /usr/src/linux-obj/%_target_cpu/%%%%{1}" \
 
27
+       echo "%%global kernel_source() /usr/src/linux-%{?kernel_version:%kernel_version-}obj/%_target_cpu/%%%%{1}" \
 
28
        \
 
29
        echo "%package -n %{-n*}%{!-n:%name}-kmp-_dummy_" \
 
30
        echo "Version: %version" \