[kcbench-data] - switch to 2.6.35 for F14 and later - add a patch to fix building with newer make versions - do not
Thorsten Leemhuis
thl at fedoraproject.org
Mon Sep 27 17:51:37 UTC 2010
commit ddbce5d1008b857cd2fa58645cc9e0aad803ab68
Author: Thorsten Leemhuis <thl at thl.ct.heise.de>
Date: Mon Sep 27 19:51:37 2010 +0200
- switch to 2.6.35 for F14 and later
- add a patch to fix building with newer make versions
- do not exclude docs, as that can lead to a build error
- add proper obsolets for 2.6.25 package
- remove the hard require on a specific kcbench-data version
in kcbench-data.foo
.gitignore | 1 +
kcbench-data-fixes_for_using_make_3.82.patch | 52 ++++++++++++++++++++++++++
kcbench-data.spec | 35 +++++++++++------
sources | 1 +
4 files changed, 77 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b59286e..41733f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
linux-2.6.25.tar.bz2
+/linux-2.6.35.tar.bz2
diff --git a/kcbench-data-fixes_for_using_make_3.82.patch b/kcbench-data-fixes_for_using_make_3.82.patch
new file mode 100644
index 0000000..eba656e
--- /dev/null
+++ b/kcbench-data-fixes_for_using_make_3.82.patch
@@ -0,0 +1,52 @@
+From ca3d0a0f66312d45e876ece90c04fc9225bdd3ab Mon Sep 17 00:00:00 2001
+From: Jan Beulich <JBeulich at novell.com>
+Date: Mon, 16 Aug 2010 11:58:58 +0100
+Subject: [PATCH] fixes for using make 3.82
+
+commit 3c955b407a084810f57260d61548cc92c14bc627 upstream.
+
+It doesn't like pattern and explicit rules to be on the same line,
+and it seems to be more picky when matching file (or really directory)
+names with different numbers of trailing slashes.
+
+Signed-off-by: Jan Beulich <jbeulich at novell.com>
+Acked-by: Sam Ravnborg <sam at ravnborg.org>
+Andrew Benton <b3nton at gmail.com>
+Signed-off-by: Michal Marek <mmarek at suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+ firmware/Makefile | 2 +-
+ scripts/mkmakefile | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/firmware/Makefile b/firmware/Makefile
+index 020e629..99955ed 100644
+--- a/firmware/Makefile
++++ b/firmware/Makefile
+@@ -142,7 +142,7 @@ fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin
+ fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
+
+ # Directories which we _might_ need to create, so we have a rule for them.
+-firmware-dirs := $(sort $(patsubst %,$(objtree)/$(obj)/%/,$(dir $(fw-external-y) $(fw-shipped-all))))
++firmware-dirs := $(sort $(addprefix $(objtree)/$(obj)/,$(dir $(fw-external-y) $(fw-shipped-all))))
+
+ quiet_cmd_mkdir = MKDIR $(patsubst $(objtree)/%,%,$@)
+ cmd_mkdir = mkdir -p $@
+diff --git a/scripts/mkmakefile b/scripts/mkmakefile
+index 67d59c7..5325423 100644
+--- a/scripts/mkmakefile
++++ b/scripts/mkmakefile
+@@ -44,7 +44,9 @@ all:
+
+ Makefile:;
+
+-\$(all) %/: all
++\$(all): all
+ @:
+
++%/: all
++ @:
+ EOF
+--
+1.7.3
+
diff --git a/kcbench-data.spec b/kcbench-data.spec
index 2d57226..a2e7d6d 100644
--- a/kcbench-data.spec
+++ b/kcbench-data.spec
@@ -1,13 +1,15 @@
Name: kcbench-data
Version: 0.1
-Release: 5
+Release: 6.1
Summary: Kernel sources to be used by kcbench
Group: Applications/System
License: GPLv2
URL: http://fedoraproject.org/wiki/Packages/kcbench
Source1: %{name}-README
-Source25: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2
+Source35: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.35.tar.bz2
+# Source: http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.35.y.git;a=patch;h=ca3d0a0f66312d45e876ece90c04fc9225bdd3ab
+Patch1: %{name}-fixes_for_using_make_3.82.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -15,23 +17,24 @@ BuildArch: noarch
Requires: kcbench
# Require the latest package, to avoid people installing this
# and wondering what it's about
-Requires: %{name}-2.6.25 = %{version}-%{release}
+Requires: %{name}-2.6.35 = %{version}-%{release}
%description
Linux Kernel sources to be compiled by kcbench to benchmark system
performance or test system stability.
-%package 2.6.25
-Summary: Kernel sources from 2.6.25 to be used by kcbench
+%package 2.6.35
+Summary: Kernel sources from 2.6.35 to be used by kcbench
Group: Applications/System
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}
Provides: kcbench-datafiles = %{version}-%{release}
# needed for compiling a kernel:
Requires: make gcc binutils
+Obsoletes: %{name}-2.6.25 < 0.1-6
-%description 2.6.25
-Linux Kernel sources 2.6.25 to be compiled by kcbench to benchmark system
+%description 2.6.35
+Linux Kernel sources 2.6.35 to be compiled by kcbench to benchmark system
performance or test system stability.
@@ -48,8 +51,8 @@ echo "Nothing to build"
rm -rf ${RPM_BUILD_ROOT}
install -D -p -m 0644 %{SOURCE1} ./README
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}
-tar -xjf %{SOURCE25} -C ${RPM_BUILD_ROOT}%{_datadir}/%{name} --exclude='linux-2.6.25/Documentation'
-
+tar -xjf %{SOURCE35} -C ${RPM_BUILD_ROOT}%{_datadir}/%{name}
+patch -d ${RPM_BUILD_ROOT}%{_datadir}/%{name}/linux-2.6.35/ -p1 < %{PATCH1}
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -61,12 +64,20 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %{_datadir}/%{name}/
-%files 2.6.25
+%files 2.6.35
%defattr(-,root,root,-)
-%{_datadir}/%{name}/linux-2.6.25
+%{_datadir}/%{name}/linux-2.6.35
%changelog
+* Mon Sep 27 2010 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]org> - 0.1-6.1
+- switch to 2.6.35 for F14 and later
+- add a patch to fix building with newer make versions
+- do not exclude docs, as that can lead to a build error
+- add proper obsolets for 2.6.25 package
+- remove the hard require on a specific kcbench-data version
+ in kcbench-data.foo
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index 8031c0d..bd80a25 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2
+091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2
More information about the scm-commits
mailing list