rpms/kernel/devel kernel.spec,1.1066,1.1067
David Woodhouse
dwmw2 at fedoraproject.org
Mon Oct 20 12:57:12 UTC 2008
Author: dwmw2
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1834
Modified Files:
kernel.spec
Log Message:
Fix #465486 harder
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1066
retrieving revision 1.1067
diff -u -r1.1066 -r1.1067
--- kernel.spec 20 Oct 2008 04:49:19 -0000 1.1066
+++ kernel.spec 20 Oct 2008 12:56:41 -0000 1.1067
@@ -1443,17 +1443,20 @@
rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
- if [ -d arch/%{_arch}/scripts ]; then
- cp -a arch/%{_arch}/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :
+ if [ -d arch/$Arch/scripts ]; then
+ cp -a arch/$Arch/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :
fi
- if [ -f arch/%{_arch}/*lds ]; then
- cp -a arch/%{_arch}/*lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/ || :
+ if [ -f arch/$Arch/*lds ]; then
+ cp -a arch/$Arch/*lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/ || :
fi
rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o
rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
%ifarch ppc
cp -a --parents arch/powerpc/lib/crtsavres.[So] $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
%endif
+ if [ -d arch/$Arch/include ]; then
+ cp -a --parents arch/$Arch/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ fi
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
cd include
cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video drm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
@@ -1462,9 +1465,6 @@
pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
ln -s $asmdir asm
popd
- if [ -d arch/%{_arch}/include ]; then
- cp -a --parents arch/%{_arch}/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
- fi
# Make sure the Makefile and version.h have a matching timestamp so that
# external modules can be built
touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/version.h
@@ -1840,6 +1840,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Mon Oct 20 2008 David Woodhouse <David.Woodhouse at intel.com>
+- Fix %%{_arch} vs. $Arch confusion in fix for #465486
+
* Mon Oct 20 2008 Dave Airlie <airlied at redhat.com>
- radeon: fix VRAM sizing issue
More information about the fedora-extras-commits
mailing list