Hi Jarod,
(Copying fedora-kernel-list so other folks know what we're at)
On Sat, 2008-03-29 at 15:19 -0400, Jarod Wilson wrote:
We recently tweaked the main kernel package's spec file such that we now include arch in uname -r output, and have standardized a bunch of path names to match. Completely forgot about kernel-xen in the process, until yesterday, when I started porting everything over the the kernel-xen-2.6/devel spec.
The attached spec patch has been build-tested, with some manual inspection of the resulting packages, but hasn't yet been run-time tested for possible issues (none expected, but you never know...). I'll happily help out with any possible issues if you guys could give this a spin.
Definitely want this in ASAP so the kernel and kernel-xen bits stay mostly in sync (speaking of which, there's also some rpmposttrans stuff -- dkms hooks -- which went into the main kernel spec a bit ago that I don't see in the kernel-xen-2.6 spec
Thanks for the heads-up and the patch. I'm planning on rebasing kernel-xen-2.6/devel to the latest kernel/devel sometime this week, so we'll pick up all this stuff.
We eventually plan to get rid of the separate kernel-xen RPM altogether, but that will probably have to wait until we get most of the x86_64 and dom0 work upstream.
In the meantime, we do intend to keep closely in sync with the latest stock kernel, and we're currently doing that using two git trees:
a) http://git.et.redhat.com/?p=linux-2.6-fedora-pvops.git b) http://git.et.redhat.com/?p=kernel-xen-rpm.git
If you look at e.g. the kernel-xen-2_6-2_6_25-0_6_rc4_fc9 tag for each of those you'll see a (a) a bunch of commits on top of the fedora kernel source tree and (b) a bunch of commits on top of kernel/devel from CVS.
Each time we sync up with a new kernel version, we import a "make prep" tree into (a) and the corresponding kernel/devel tag from CVS into (b) and then use git to rebase the commits from the last kernel-xen tag for both of these.
The easier we can make this rebasing process, the more frequent we'll rebase. Right now, I've got a few lame scripts to:
1) Import the result of "make prep" into (a) 2) Import a kernel/devel CVS tag into (b) 3) Export the xen patches from (a) and include them into the spec file in (b) 4) Copy everything from (b) to kernel-xen-2.6/devel
but it's all still quite manual and error prone.
Cheers, Mark.
On Mon, 2008-03-31 at 09:52 +0200, Mark McLoughlin wrote:
On Sat, 2008-03-29 at 15:19 -0400, Jarod Wilson wrote:
We recently tweaked the main kernel package's spec file such that we now include arch in uname -r output, and have standardized a bunch of path names to match. Completely forgot about kernel-xen in the process, until yesterday, when I started porting everything over the the kernel-xen-2.6/devel spec.
The attached spec patch has been build-tested, with some manual inspection of the resulting packages, but hasn't yet been run-time tested for possible issues (none expected, but you never know...). I'll happily help out with any possible issues if you guys could give this a spin.
Definitely want this in ASAP so the kernel and kernel-xen bits stay mostly in sync (speaking of which, there's also some rpmposttrans stuff -- dkms hooks -- which went into the main kernel spec a bit ago that I don't see in the kernel-xen-2.6 spec
Thanks for the heads-up and the patch. I'm planning on rebasing kernel-xen-2.6/devel to the latest kernel/devel sometime this week, so we'll pick up all this stuff.
Okay, kernel-xen in rawhide is rebased to 2.6.25-0.182.rc7.git6 if you want to take a look.
Thanks, Mark.
On Tuesday 01 April 2008 10:09:17 am Mark McLoughlin wrote:
On Mon, 2008-03-31 at 09:52 +0200, Mark McLoughlin wrote:
On Sat, 2008-03-29 at 15:19 -0400, Jarod Wilson wrote:
We recently tweaked the main kernel package's spec file such that we now include arch in uname -r output, and have standardized a bunch of path names to match. Completely forgot about kernel-xen in the process, until yesterday, when I started porting everything over the the kernel-xen-2.6/devel spec.
The attached spec patch has been build-tested, with some manual inspection of the resulting packages, but hasn't yet been run-time tested for possible issues (none expected, but you never know...). I'll happily help out with any possible issues if you guys could give this a spin.
Definitely want this in ASAP so the kernel and kernel-xen bits stay mostly in sync (speaking of which, there's also some rpmposttrans stuff -- dkms hooks -- which went into the main kernel spec a bit ago that I don't see in the kernel-xen-2.6 spec
Thanks for the heads-up and the patch. I'm planning on rebasing kernel-xen-2.6/devel to the latest kernel/devel sometime this week, so we'll pick up all this stuff.
Okay, kernel-xen in rawhide is rebased to 2.6.25-0.182.rc7.git6 if you want to take a look.
Apologies if this is a dupe, X is being a tad crashy on me today... Looks much better, but a few places where %{KVERREL}xen should be changed to %{KVERREL}.xen to be consistent with the other flavoured kernels.
Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v retrieving revision 1.26 diff -u -p -u -p -r1.26 kernel.spec --- kernel.spec 1 Apr 2008 12:52:48 -0000 1.26 +++ kernel.spec 1 Apr 2008 14:42:34 -0000 @@ -1519,8 +1519,8 @@ mkdir -p $RPM_BUILD_ROOT/boot 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}xen - install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}xen + 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 @@ -1588,8 +1588,8 @@ cd linux-%{kversion}.%{_target_cpu} %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}xen.conf -cat > $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.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 @@ -1597,7 +1597,7 @@ cat > $RPM_BUILD_ROOT/etc/ld.so.conf.d/k # in the ld.so.cache file. hwcap 0 nosegneg EOF -chmod 444 $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.conf +chmod 444 $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %endif %endif
@@ -1744,7 +1744,7 @@ fi}\
%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}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}.xen` if [ -x /sbin/ldconfig ] then /sbin/ldconfig -X || exit $? @@ -1842,7 +1842,7 @@ fi %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}xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.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 * Tue Apr 1 2008 Mark McLoughlin markmc@redhat.com
On Tue, 2008-04-01 at 12:26 -0400, Jarod Wilson wrote:
On Tuesday 01 April 2008 10:09:17 am Mark McLoughlin wrote:
On Mon, 2008-03-31 at 09:52 +0200, Mark McLoughlin wrote:
On Sat, 2008-03-29 at 15:19 -0400, Jarod Wilson wrote:
We recently tweaked the main kernel package's spec file such that we now include arch in uname -r output, and have standardized a bunch of path names to match. Completely forgot about kernel-xen in the process, until yesterday, when I started porting everything over the the kernel-xen-2.6/devel spec.
The attached spec patch has been build-tested, with some manual inspection of the resulting packages, but hasn't yet been run-time tested for possible issues (none expected, but you never know...). I'll happily help out with any possible issues if you guys could give this a spin.
Definitely want this in ASAP so the kernel and kernel-xen bits stay mostly in sync (speaking of which, there's also some rpmposttrans stuff -- dkms hooks -- which went into the main kernel spec a bit ago that I don't see in the kernel-xen-2.6 spec
Thanks for the heads-up and the patch. I'm planning on rebasing kernel-xen-2.6/devel to the latest kernel/devel sometime this week, so we'll pick up all this stuff.
Okay, kernel-xen in rawhide is rebased to 2.6.25-0.182.rc7.git6 if you want to take a look.
Apologies if this is a dupe, X is being a tad crashy on me today... Looks much better, but a few places where %{KVERREL}xen should be changed to %{KVERREL}.xen to be consistent with the other flavoured kernels.
Thanks, applied.
Cheers, Mark.
kernel@lists.fedoraproject.org