From 8389937fa2ba53bfc2d6e8aac383b82908ab2016 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sun, 24 Apr 2016 12:31:34 +0200 Subject: [PATCH] drop usage of O= in kernel module macros; ver 1.715 breaks KERNELRELEASE determination --- rpm-build-macros.spec | 4 ++-- rpm.macros.kernel | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec index 5c52175..204dd44 100644 --- 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 2fb7c9f..4c7998e 100644 --- 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() { \ -- 2.44.0