rpms/kernel-xen-2.6/devel kernel.spec,1.14,1.15
Mark McLoughlin (markmc)
fedora-extras-commits at redhat.com
Fri Mar 7 11:09:01 UTC 2008
Author: markmc
Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19387
Modified Files:
kernel.spec
Log Message:
* Fri Mar 7 2008 Mark McLoughlin <markmc at redhat.com>
- Label everything in xen subpackage with %{kverrel}-xen to
ensure xen-syms.debug goes into kernel-debuginfo-xen
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kernel.spec 6 Mar 2008 13:59:25 -0000 1.14
+++ kernel.spec 7 Mar 2008 11:08:23 -0000 1.15
@@ -765,7 +765,7 @@
%description -n %{variantbase}%{?1:-%{1}}-debuginfo\
This package provides debug information for package %{variantbase}%{?1:-%{1}}.\
This is required to use SystemTap with %{variantbase}%{?1:-%{1}}-%{KVERREL}.\
-%{?1:%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:-?%{1}}(-%%{_target_cpu})?/.*|/.*%%{KVERREL}%{?1}(\.debug)?' -o debuginfo%{?1}.list}}\
+%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:-?%{1}}(-%%{_target_cpu})?/.*|/.*%%{KVERREL}%{?1}(\.debug)?' -o debuginfo%{?1}.list}\
%{nil}
#
@@ -1542,8 +1542,8 @@
cd %{xen_hv_dirname}/xen/
mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot
make %{?_smp_mflags} %{xen_flags}
- install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}
- install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}
+ install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}xen
+ install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}xen
cd ../..
%endif
%endif
@@ -1611,8 +1611,8 @@
%if %{includexen}
%if %{with_xen}
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
-rm -f $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-cat > $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf <<\EOF
+rm -f $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.conf
+cat > $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.conf <<\EOF
# This directive teaches ldconfig to search in nosegneg subdirectories
# and cache the DSOs there with extra bit 0 set in their hwcap match
# fields. In Xen guest kernels, the vDSO tells the dynamic linker to
@@ -1620,7 +1620,7 @@
# in the ld.so.cache file.
hwcap 0 nosegneg
EOF
-chmod 444 $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
+chmod 444 $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.conf
%endif
%endif
@@ -1752,7 +1752,7 @@
%if %{with_xen}
%kernel_variant_preun xen
-%kernel_variant_post -v xen -s kernel-xen[0U] -r kernel-xen -- `[ -d /proc/xen -a ! -e /proc/xen/xsd_kva ] || echo --multiboot=/%{image_install_path}/xen.gz-%{KVERREL}`
+%kernel_variant_post -v xen -s kernel-xen[0U] -r kernel-xen -- `[ -d /proc/xen -a ! -e /proc/xen/xsd_kva ] || echo --multiboot=/%{image_install_path}/xen.gz-%{KVERREL}xen`
if [ -x /sbin/ldconfig ]
then
/sbin/ldconfig -X || exit $?
@@ -1849,9 +1849,13 @@
%kernel_variant_files %{with_pae} PAE
%kernel_variant_files %{with_pae_debug} PAEdebug
%kernel_variant_files -k vmlinux %{with_kdump} kdump
-%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
+%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.conf %{with_xen} xen
%changelog
+* Fri Mar 7 2008 Mark McLoughlin <markmc at redhat.com>
+- Label everything in xen subpackage with %{kverrel}-xen to
+ ensure xen-syms.debug goes into kernel-debuginfo-xen
+
* Wed Mar 05 2008 Mark McLoughlin <markmc at redhat.com>
- Reset to pv_ops xen DomU from kernel-2_6_25-0_93_rc4_fc9
- Revert the execshield patch for now
More information about the fedora-extras-commits
mailing list