diff options
author | Dave Jones <davej@redhat.com> | 2012-03-30 15:22:42 -0400 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2012-03-30 15:22:42 -0400 |
commit | fc31f43f1e13a5ae9380f90b45044cb5ba08c1c2 (patch) | |
tree | a1bc61b6ac39bc748ac4766c344382127137d80a | |
parent | 5e9e2f5b1611a0b2acd741e8dd9fb4bbf90106e2 (diff) | |
download | kernel-fc31f43f1e13a5ae9380f90b45044cb5ba08c1c2.tar.gz kernel-fc31f43f1e13a5ae9380f90b45044cb5ba08c1c2.tar.xz kernel-fc31f43f1e13a5ae9380f90b45044cb5ba08c1c2.zip |
Change config parsing to use {_target_cpu} (From Niels de Vos)
-rw-r--r-- | Makefile | 7 | ||||
-rw-r--r-- | kernel.spec | 5 |
2 files changed, 5 insertions, 7 deletions
@@ -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 b4cff0f93..5044b057f 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@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 |