I took a stab at bz 197065 and arrived at the patch below. Would appreciate some eyeballs before I commit from people familiar with the macro goo in the specfile. (Hi Roland!)
Aparently pm-utils will need a change to cope with the changed filename, but I think that should be the limit of the damage. (oprofile will need to append the archname on the end of System.map-$ver filenames, but they're user-passed anyway, and not coded anywhere afaik Hmm. Not sure about Systemtap). Comments? Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.521 diff -u -p -r1.521 kernel.spec --- kernel.spec 21 Mar 2008 15:27:16 -0000 1.521 +++ kernel.spec 24 Mar 2008 19:20:58 -0000 @@ -1268,15 +1268,15 @@ BuildKernel() { mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/%{image_install_path} %endif mkdir -p $RPM_BUILD_ROOT/%{image_install_path} - install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer - install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer - touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img + install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer.%{_arch} + install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer.%{_arch} + touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img.%{_arch} if [ -f arch/$Arch/boot/zImage.stub ]; then cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || : fi $CopyKernel $KernelImage \ - $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer - chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer + $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer.%{_arch} + chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer.%{_arch} mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer @@ -1570,7 +1570,7 @@ fi\ # %define kernel_variant_posttrans(s:r:v:) \ %{expand:%%posttrans %{?-v*}}\ -/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --rpmposttrans %{?1} %{KVERREL}%{?-v*} || exit $?\ +/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --rpmposttrans %{?1} %{KVERREL}%{?-v*}.%{_arch} || exit $?\ %{nil} # @@ -1587,7 +1587,7 @@ if [ `uname -i` == "x86_64" -o `uname -i [ -f /etc/sysconfig/kernel ]; then\ /bin/sed -i -e 's/^DEFAULTKERNEL=%{-s*}$/DEFAULTKERNEL=%{-r*}/' /etc/sysconfig/kernel || exit $?\ fi}\ -/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{?1} %{KVERREL}%{?-v*} || exit $?\ +/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{?1} %{KVERREL}%{?-v*}.%{_arch} || exit $?\ #if [ -x /sbin/weak-modules ]\ #then\ # /sbin/weak-modules --add-kernel %{KVERREL}%{?-v*} || exit $?\ @@ -1600,7 +1600,7 @@ fi}\ # %define kernel_variant_preun() \ %{expand:%%preun %{?1}}\ -/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}%{?1} || exit $?\ +/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}%{?1}.%{_arch} || exit $?\ #if [ -x /sbin/weak-modules ]\ #then\ # /sbin/weak-modules --remove-kernel %{KVERREL}%{?1} || exit $?\ @@ -1668,10 +1668,9 @@ fi %if %{1}\ %{expand:%%files %{?2}}\ %defattr(-,root,root)\ -/%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2}\ -/boot/System.map-%{KVERREL}%{?2}\ -#/boot/symvers-%{KVERREL}%{?2}.gz\ -/boot/config-%{KVERREL}%{?2}\ +/%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2}.%{_arch}\ +/boot/System.map-%{KVERREL}%{?2}.%{_arch}\ +/boot/config-%{KVERREL}%{?2}.%{_arch}\ %{?-a:%{-a*}}\ %dir /lib/modules/%{KVERREL}%{?2}\ /lib/modules/%{KVERREL}%{?2}/kernel\ -- http://www.codemonkey.org.uk _______________________________________________ Fedora-kernel-list mailing list Fedora-kernel-list@redhat.com https://www.redhat.com/mailman/listinfo/fedora-kernel-list