[kernel] Skip config entirely when noarch
Dave Jones
davej at fedoraproject.org
Mon Apr 2 21:54:39 UTC 2012
commit 30514337d11a65361c9e1e1f153d060f32aae138
Author: Dave Jones <davej at redhat.com>
Date: Mon Apr 2 17:54:24 2012 -0400
Skip config entirely when noarch
kernel.spec | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 339f2b5..034c4dc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1457,21 +1457,17 @@ done
rm -f kernel-%{version}-*debug.config
%endif
-arch=%{_target_cpu}
-# Koji preps as noarch. Pick the config file for the arch.
-if [ "%{_target_cpu}" -eq "noarch" ]; then
- arch=$(uname -p)
+# run oldconfig over the config files (except when noarch)
+if [ "%{_target_cpu}" != "noarch" ]; then
+ for i in kernel-*-%{_target_cpu}-*.config
+ do
+ mv $i .config
+ Arch=`head -1 .config | cut -b 3-`
+ make ARCH=$Arch oldnoconfig
+ echo "# $Arch" > configs/$i
+ cat .config >> configs/$i
+ done
fi
-
-# now run oldconfig over the config files
-for i in kernel-*-$arch-*.config
-do
- mv $i .config
- Arch=`head -1 .config | cut -b 3-`
- make ARCH=$Arch oldnoconfig
- echo "# $Arch" > configs/$i
- cat .config >> configs/$i
-done
# end of kernel config
%endif
More information about the scm-commits
mailing list