From ee55cc9d82df1a12769c595608d7212cb0327d55 Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Fri, 7 Jan 2011 16:40:18 -0500 Subject: [PATCH] Add support for local rebuild config option overrides Signed-off-by: Jarod Wilson --- config-local | 2 ++ kernel.spec | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 config-local diff --git a/config-local b/config-local new file mode 100644 index 000000000..8c32be5be --- /dev/null +++ b/config-local @@ -0,0 +1,2 @@ +# This file is intentionally left empty in the stock kernel. Its a nicety +# added for those wanting to do custom rebuilds with altered config opts. diff --git a/kernel.spec b/kernel.spec index 71213793a..dea585965 100644 --- a/kernel.spec +++ b/kernel.spec @@ -541,6 +541,10 @@ Source90: config-sparc64-generic Source100: config-arm +# This file is intentionally left empty in the stock kernel. Its a nicety +# added for those wanting to do custom rebuilds with altered config opts. +Source1000: config-local + # Here should be only the patches up to the upstream canonical Linus tree. # For a stable release kernel @@ -1145,6 +1149,14 @@ make -f %{SOURCE20} VERSION=%{version} configs done %endif +# Merge in any user-provided local config option changes +for i in %{all_arch_configs} +do + mv $i $i.tmp + ./merge.pl %{SOURCE1000} $i.tmp > $i + rm $i.tmp +done + ApplyOptionalPatch git-linus.diff ApplyPatch linux-2.6-makefile-after_link.patch @@ -2002,8 +2014,10 @@ fi # (__)\ )\/\ # ||----w | # || || - %changelog +* Mon Jan 10 2011 Jarod Wilson +- Add support for local rebuild config option overrides + * Mon Jan 10 2011 Chuck Ebbert 2.6.36.3-14 - Linux 2.6.36.3 - Drop merged patches: