[kernel] Change config parsing to use {_target_cpu} (From Niels de Vos)
Dave Jones
davej at fedoraproject.org
Fri Mar 30 19:22:52 UTC 2012
commit fc31f43f1e13a5ae9380f90b45044cb5ba08c1c2
Author: Dave Jones <davej at redhat.com>
Date: Fri Mar 30 15:22:42 2012 -0400
Change config parsing to use {_target_cpu} (From Niels de Vos)
Makefile | 7 +------
kernel.spec | 5 ++++-
2 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/Makefile b/Makefile
index b9475a4..5df8b21 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,6 @@
# Makefile for source rpm: kernel
SPECFILE := kernel.spec
-# use noarch for make prep instead of the current CPU
-# noarch creates and checks all config files not just the current one,
-# in addition "i386" isn't a valid kernel target
-PREPARCH = noarch
-
# we only check the .sign signatures
UPSTREAM_CHECKS = sign
@@ -18,7 +13,7 @@ help:
include Makefile.config
prep:
- fedpkg -v prep --arch=$(PREPARCH)
+ fedpkg -v prep
noarch:
fedpkg -v local --arch=noarch
diff --git a/kernel.spec b/kernel.spec
index b4cff0f..5044b05 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1466,7 +1466,7 @@ rm -f kernel-%{version}-*debug.config
%endif
# now run oldconfig over all the config files
-for i in kernel-*-$(uname -p)*.config
+for i in kernel-*-%{_target_cpu}*.config
do
mv $i .config
Arch=`head -1 .config | cut -b 3-`
@@ -2291,6 +2291,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Mar 30 2012 Dave Jones <davej at redhat.com>
+- Change config parsing to use {_target_cpu} (From Niels de Vos)
+
* Thu Mar 29 2012 Justin M. Forbes <jforbes at redhat.com> - 3.4.0-0.rc0.git4.1
- Linux v3.3-8839-gb5174fa
More information about the scm-commits
mailing list