drop usage of O= in kernel module macros; ver 1.715

breaks KERNELRELEASE determination

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 5c521757c49a30d9a8dbd1bf5083ae5e8ac911a0..204dd44b95428e2d93b66f00f8abdc03bce20671 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,10 +1,10 @@
-%define                rpm_macros_rev  1.714
+%define                rpm_macros_rev  1.715
 %define                find_lang_rev   1.38
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
 Name:          rpm-build-macros
 Version:       %{rpm_macros_rev}
-Release:       2
+Release:       1
 License:       GPL
 Group:         Development/Building
 Source0:       rpm.macros

diff --git a/rpm.macros.kernel b/rpm.macros.kernel
index 2fb7c9f1ca49df4022dceff8a07648d388bb258a..4c7998ee2af7eceb7d6506a5ee9133b543522239 100644 (file)
--- a/rpm.macros.kernel
+++ b/rpm.macros.kernel
@@ -176,7 +176,7 @@ done)
        CC="%{__cc}"                                                                                                    \\\
 %endif                                                                                                                         \
 %define        MakeOpts HOSTCC="%{__cc}" SYSSRC=%{_kernelsrcdir} SYSOUT=$PWD/o \\\\\\\
-               O=$PWD/o %{?with_verbose:V=1} %{Opts}                                           \
+               %{?with_verbose:V=1} %{Opts}                                            \
                                                                                                                                        \
 %{?-C:cd %{-C*}}                                                                                                       \
 compile() {                                                                                                                    \
@@ -235,7 +235,7 @@ compile %{*}                                                                                                                \
        CC="%{__cc}"                                                                                                    \\\
 %endif                                                                                                                         \
 %define        MakeOpts HOSTCC="%{__cc}" SYSSRC=%{_kernelsrcdir} SYSOUT=$PWD/o \\\\\\\
-               O=$PWD/o %{?with_verbose:V=1} %{Opts}                                           \
+               %{?with_verbose:V=1} %{Opts}                                            \
                                                                                                                                        \
 %{?-C:cd %{-C*}}                                                                                                       \
 compile() {                                                                                                                    \