summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2012-04-02 15:45:30 -0500
committerJustin M. Forbes <jforbes@redhat.com>2012-04-02 15:45:30 -0500
commit3be53ac5269e59a93502efc0199e222a91a89366 (patch)
tree2913ba3e3072e328865b559252c62300ae6a10b1 /kernel.spec
parentd8c9baa9103001162859031f9cb6a39eb39f9695 (diff)
parentfc31f43f1e13a5ae9380f90b45044cb5ba08c1c2 (diff)
downloadkernel-3be53ac5269e59a93502efc0199e222a91a89366.tar.gz
kernel-3be53ac5269e59a93502efc0199e222a91a89366.tar.xz
kernel-3be53ac5269e59a93502efc0199e222a91a89366.zip
Merge fixup
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 47297e118..363068ad5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1458,7 +1458,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-`
@@ -2289,6 +2289,9 @@ fi
* Fri Mar 30 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc0.git5.1
- Linux v3.3-9295-gf52b69f
+* Fri Mar 30 2012 Dave Jones <davej@redhat.com>
+- Change config parsing to use {_target_cpu} (From Niels de Vos)
+
* Thu Mar 29 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc0.git4.1
- Linux v3.3-8839-gb5174fa