Hi, Aron
This patch fix rpmbuilding kernel-xenU on ia64.
If you want to install kerne-xenU into /boot,
I''ll fix with another way.
(e.g. make %{xenUimage_install_path})
I think we can install it into /boot/efi/EFI/redhat on ia64.
What do you think about this?
Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>
diff -r f8ab3683a4fb SPECS/kernel-2.6.spec
--- a/SPECS/kernel-2.6.spec Wed May 24 22:19:50 2006 -0400
+++ b/SPECS/kernel-2.6.spec Sun May 28 16:48:09 2006 +0900
@@ -1621,7 +1621,7 @@ fi
%files xenU
%defattr(-,root,root)
-/boot/vmlinuz-%{KVERREL}xenU
+/%{image_install_path}/vmlinuz-%{KVERREL}xenU
/boot/System.map-%{KVERREL}xenU
/boot/config-%{KVERREL}xenU
%dir /lib/modules/%{KVERREL}xenU
Best Regards,
Akio Takebe
Akio Takebe wrote: [Thu May 25 2006, 04:36:13AM EDT]> This patch fix rpmbuilding kernel-xenU on ia64. > If you want to install kerne-xenU into /boot, > I''ll fix with another way. > (e.g. make %{xenUimage_install_path})Thanks Akio. I pushed a fix for this already this morning. Sorry for the temporary breakage. See cset 28 I''d prefer to install the xenU kernels to /boot always so they''re not wasting space on the EFI partition. Plus that will be one less special case for the Fedora xen management tools. Regards, Aron
Hi, Aron O.K. I''ll send new patch. Now I''m testing. Please wait. Best Regards, Akio Takebe>Akio Takebe wrote: [Thu May 25 2006, 04:36:13AM EDT] >> This patch fix rpmbuilding kernel-xenU on ia64. >> If you want to install kerne-xenU into /boot, >> I''ll fix with another way. >> (e.g. make %{xenUimage_install_path}) > >Thanks Akio. I pushed a fix for this already this morning. Sorry for >the temporary breakage. See cset 28 > >I''d prefer to install the xenU kernels to /boot always so they''re not >wasting space on the EFI partition. Plus that will be one less >special case for the Fedora xen management tools. > >Regards, >Aron
Hi, Aron
I fixed my patch to install xenU to /boot.
How about this?
Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>
diff -r f8ab3683a4fb SPECS/kernel-2.6.spec
--- a/SPECS/kernel-2.6.spec Wed May 24 22:19:50 2006 -0400
+++ b/SPECS/kernel-2.6.spec Sun May 28 23:31:13 2006 +0900
@@ -3,7 +3,7 @@ Summary: The Linux kernel (the core of t
# What parts do we want to build? We must build at least one kernel.
# These are the kernels that are built IF the architecture allows it.
-%define buildup 1
+%define buildup 0
%define buildsmp 0
%define buildpae 0
# Whether to apply the Xen patches, leave this enabled.
@@ -12,7 +12,7 @@ Summary: The Linux kernel (the core of t
%define buildxen 1
%define buildxenPAE 0
%define builddoc 0
-%define buildkdump 1
+%define buildkdump 0
%define buildheaders 0
# Versions of various parts
@@ -1146,12 +1146,16 @@ BuildKernel() {
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
- cp $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-
$KernelVer
+ if [ x"$Flavour" == x"xenU" ]; then
+ cp $KernelImage $RPM_BUILD_ROOT/boot/vmlinuz-$KernelVer
+ else
+ cp $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-
$KernelVer
+ fi
if [ -f arch/$Arch/boot/zImage.stub ]; then
cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%
{image_install_path}/zImage.stub-$KernelVer || :
fi
- if [ "$Flavour" == "kdump" ]; then
+ if [ x"$Flavour" == x"kdump" ]; then
cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinux-
$KernelVer
rm -f $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
fi
Best Regards,
Akio Takebe
>Hi, Aron
>
>O.K. I''ll send new patch.
>Now I''m testing. Please wait.
>
>Best Regards,
>
>Akio Takebe
>
>>Akio Takebe wrote: [Thu May 25 2006, 04:36:13AM EDT]
>>> This patch fix rpmbuilding kernel-xenU on ia64.
>>> If you want to install kerne-xenU into /boot,
>>> I''ll fix with another way.
>>> (e.g. make %{xenUimage_install_path})
>>
>>Thanks Akio. I pushed a fix for this already this morning. Sorry for
>>the temporary breakage. See cset 28
>>
>>I''d prefer to install the xenU kernels to /boot always so
they''re not
>>wasting space on the EFI partition. Plus that will be one less
>>special case for the Fedora xen management tools.
>>
>>Regards,
>>Aron
Akio Takebe wrote: [Thu May 25 2006, 07:53:11PM EDT]> I fixed my patch to install xenU to /boot. > How about this? > > Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>Thanks, comments below.> diff -r f8ab3683a4fb SPECS/kernel-2.6.spec > --- a/SPECS/kernel-2.6.spec Wed May 24 22:19:50 2006 -0400 > +++ b/SPECS/kernel-2.6.spec Sun May 28 23:31:13 2006 +0900 > @@ -3,7 +3,7 @@ Summary: The Linux kernel (the core of t > # What parts do we want to build? We must build at least one kernel. > # These are the kernels that are built IF the architecture allows it. > > -%define buildup 1 > +%define buildup 0 > %define buildsmp 0 > %define buildpae 0 > # Whether to apply the Xen patches, leave this enabled. > @@ -12,7 +12,7 @@ Summary: The Linux kernel (the core of t > %define buildxen 1 > %define buildxenPAE 0 > %define builddoc 0 > -%define buildkdump 1 > +%define buildkdump 0 > %define buildheaders 0These defines shouldn''t be changed. They''re overridden by the architecture-specific parts lower down. I left this out.> # Versions of various parts > @@ -1146,12 +1146,16 @@ BuildKernel() { > 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 > - cp $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz- > $KernelVer > + if [ x"$Flavour" == x"xenU" ]; then > + cp $KernelImage $RPM_BUILD_ROOT/boot/vmlinuz-$KernelVer > + else > + cp $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz- > $KernelVer > + fiThis is a good idea, but doesn''t cover the PAE kernels for the other architectures. Thanks for showing it can be easier than my initial attempt. Here is what I committed: + if [[ $Flavour == *xenU* ]]; then + # xenU kernels should always install to /boot + # because they''re never needed for system boot + cp $KernelImage $RPM_BUILD_ROOT/root/vmlinuz-$KernelVer + else + cp $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer + fi> - if [ "$Flavour" == "kdump" ]; then > + if [ x"$Flavour" == x"kdump" ]; thenThis shell technique was popularized as a way to guarantee a string isn''t empty, to prevent poor interpreters from exploding. It was never necessary if quoting was done right, and is certainly not needed with bash :-) Regards, Aron
Hi, Aron Thank you for your comments. My commets is below.>Akio Takebe wrote: [Thu May 25 2006, 07:53:11PM EDT] >> I fixed my patch to install xenU to /boot. >> How about this? >> >> Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com> > >Thanks, comments below. > >> diff -r f8ab3683a4fb SPECS/kernel-2.6.spec >> --- a/SPECS/kernel-2.6.spec Wed May 24 22:19:50 2006 -0400 >> +++ b/SPECS/kernel-2.6.spec Sun May 28 23:31:13 2006 +0900 >> @@ -3,7 +3,7 @@ Summary: The Linux kernel (the core of t >> # What parts do we want to build? We must build at least one kernel. >> # These are the kernels that are built IF the architecture allows it. >> >> -%define buildup 1 >> +%define buildup 0 >> %define buildsmp 0 >> %define buildpae 0 >> # Whether to apply the Xen patches, leave this enabled. >> @@ -12,7 +12,7 @@ Summary: The Linux kernel (the core of t >> %define buildxen 1 >> %define buildxenPAE 0 >> %define builddoc 0 >> -%define buildkdump 1 >> +%define buildkdump 0 >> %define buildheaders 0 > >These defines shouldn''t be changed. They''re overridden by the >architecture-specific parts lower down. I left this out. >I''m sorry. this is my mistakes.>> # Versions of various parts >> @@ -1146,12 +1146,16 @@ BuildKernel() { >> 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 >> - cp $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz- >> $KernelVer >> + if [ x"$Flavour" == x"xenU" ]; then >> + cp $KernelImage $RPM_BUILD_ROOT/boot/vmlinuz-$KernelVer >> + else >> + cp $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz- >> $KernelVer >> + fi > >This is a good idea, but doesn''t cover the PAE kernels for the other >architectures. Thanks for showing it can be easier than my initial >attempt. Here is what I committed: > >+ if [[ $Flavour == *xenU* ]]; then >+ # xenU kernels should always install to /boot >+ # because they''re never needed for system boot >+ cp $KernelImage $RPM_BUILD_ROOT/root/vmlinuz-$KernelVer >+ else >+ cp $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz- >$KernelVer >+ fi >Oh, I forgot xenU-PAE. This is good idea.>> - if [ "$Flavour" == "kdump" ]; then >> + if [ x"$Flavour" == x"kdump" ]; then > >This shell technique was popularized as a way to guarantee a string >isn''t empty, to prevent poor interpreters from exploding. It was >never necessary if quoting was done right, and is certainly not needed >with bash :-) >OK. Best Regards, Akio Takebe