It is the first time I try to install a patch and it was unsuccessful. I
did what you wrote in another post, first I copied the patch (from 'Index'
to the end) into the file
fix-prepareclient-with-custom-kernel-openSUSE10.3.patch and then I tested
the patch. Here is the output:
golden-client:/usr/lib/systemimager/perl/SystemImager # patch -p0 --dry-run
< fix-prepareclient-with-custom-kernel-openSUSE10.3.patch
patching file /usr/lib/systemimager/perl/SystemImager/UseYourOwnKernel.pm
Hunk #1 succeeded at 373 with fuzz 2 (offset -12 lines).
Hunk #2 FAILED at 445.
1 out of 2 hunks FAILED -- saving rejects to file
/usr/lib/systemimager/perl/SystemImager/UseYourOwnKernel.pm.rej
golden-client:/usr/lib/systemimager/perl/SystemImager #
I don't know what's wrong, but it seems that the patch cannot be applied
correctly :(
Is there any other way to get the latest revision of
UseYourOwnKernel.pmdirectly from the repository?
Thanks for helping.
jesus .-
On 2/21/08, Andrea Righi <[EMAIL PROTECTED]> wrote:
>
> Jesús Sánchez González wrote:
> > Here you have the output of the commands you asked for, the third one
> > produced no output:
> >
> > golden-client:~ # file /boot/vmlinuz-2.6.22.5-31-default
> > /boot/vmlinuz-2.6.22.5-31-default: Linux/x86 Kernel, Setup Version
>
> > 0x206, bzImage, Version 2.6.22.5 <http://2.6.22.5>, Version 2.6.22.5-31,
>
> > RO-rootFS, swap_dev 0x1, Normal VGA
> >
> > golden-client:~ # file -z /boot/vmlinuz-2.6.22.5-31-default
> > /boot/vmlinuz-2.6.22.5-31-default: Linux/x86 Kernel, Setup Version
>
> > 0x206, bzImage, Version 2.6.22.5 <http://2.6.22.5>, Version 2.6.22.5-31,
>
> > RO-rootFS, swap_dev 0x1, Normal VGA
> >
> > golden-client:~ # cat /boot/vmlinuz-2.6.22.5-31-default | perl -pe
> > 'while (<STDIN>) { print "$1\n" if (m/(2\.[46]\.\d[^\/]*?) \([EMAIL
> > PROTECTED])
> > [#]\d+.*\w{3} \w{3} \d{1,2} \d{2}:\d{2}:\d{2} \w{3,4} \d{4}/o) }'
> > golden-client:~ #
> >
> > golden-client:~ # zcat /boot/vmlinuz-2.6.22.5-31-default | perl -pe
> > 'while (<STDIN>) { print "$1\n" if (m/(2\.[46]\.\d[^\/]*?) \([EMAIL
> > PROTECTED])
> > [#]\d+.*\w{3} \w{3} \d{1,2} \d{2}:\d{2}:\d{2} \w{3,4} \d{4}/o) }'
> >
> > gzip: /boot/vmlinuz-2.6.22.5-31-default: not in gzip format
> >
> > I also append the output for 'file *' of the /boot directory:
> >
> > golden-client:/boot # file *
> > backup_mbr: x86 boot sector; partition 2:
> > ID=0x83, starthead 0, startsector 4209030, 41945715 sectors; partition
> > 3: ID=0x83, starthead 254, startsector 46154745, 110141640 sectors
> > boot: symbolic link to `.'
> > boot.0800: x86 boot sector; partition 2:
> > ID=0x83, active, starthead 0, startsector 4209030, 41945715 sectors;
> > partition 3: ID=0x83, starthead 254, startsector 46154745, 110141640
> sectors
> > boot.0802: x86 boot sector; GRand Unified
> > Bootloader, stage1 version 0x3, 1st sector stage2 0xa97986, GRUB version
> > 0.97, code offset 0x48
> > config-2.6.22.5-31-default: ASCII text
> > grub: directory
> > initrd: symbolic link to
> > `initrd-2.6.22.5-31-default'
> > initrd-2.6.22.5-31-default: gzip compressed data, from Unix,
> > last modified: Wed Feb 6 13:50:59 2008, max compression
> > map: data
> > memtest.bin: Linux x86 kernel
> > message: cpio archive
> > symsets-2.6.22.5-31-debug.tar.gz: gzip compressed data, from Unix,
> > last modified: Mon Sep 24 21:24:18 2007, max compression
> > symsets-2.6.22.5-31-default.tar.gz: gzip compressed data, from Unix,
> > last modified: Mon Sep 24 21:11:35 2007, max compression
> > symsets-2.6.22.5-31-xen.tar.gz: gzip compressed data, from Unix,
> > last modified: Mon Sep 24 21:01:03 2007, max compression
> > symtypes-2.6.22.5-31-default.gz: gzip compressed data, was
> > "symtypes-2.6.22.5-31-default", from Unix, last modified: Mon Sep 24
> > 21:11:47 2007, max compression
> > symvers-2.6.22.5-31-default.gz: gzip compressed data, from Unix,
> > last modified: Mon Sep 24 21:03:20 2007, max compression
> > System.map-2.6.22.5-31-default: ASCII text
> > vmlinux-2.6.22.5-31-default.gz: gzip compressed data, was
> > "vmlinux-2.6.22.5-31-default", from Unix, last modified: Mon Sep 24
> > 21:09:09 2007, max compression
> > vmlinuz: symbolic link to
> > `vmlinuz-2.6.22.5-31-default'
> > vmlinuz-2.6.22.5-31-default: Linux/x86 Kernel, Setup Version
>
> > 0x206, bzImage, Version 2.6.22.5 <http://2.6.22.5>, Version 2.6.22.5-31,
>
> > RO-rootFS, swap_dev 0x1, Normal VGA
> >
> > Thanks for your help.
> >
> > jesus .-
>
>
> OK, it seems we must change the regexp to properly identify the openSuSE
> 10.3 kernel. Could you check if the following patch resolves?
>
> -Andrea
>
> Index: /usr/lib/systemimager/perl/SystemImager/UseYourOwnKernel.pm
> ===================================================================
> --- /usr/lib/systemimager/perl/SystemImager/UseYourOwnKernel.pm (revision
> 4392)
> +++ /usr/lib/systemimager/perl/SystemImager/UseYourOwnKernel.pm (working
> copy)
> @@ -385,7 +385,7 @@
> # Usage:
> # my $kernel_file = _choose_kernel_file( $uname_r, $image_dir );
> #
> -sub _choose_kernel_file($) {
> +sub _choose_kernel_file($$) {
>
> my $uname_r = shift;
> my $image_dir = shift;
> @@ -457,8 +457,20 @@
> # 2.4.24 ([EMAIL PROTECTED]) #2 Fri Jan 16 19:51:43 CST
> 2004^
> # 2.4.19-mantis-2002.11.20 ([EMAIL PROTECTED]) #6 Tue
> Nov
> 19 15:15:43 CST 2002
> # 2.6.7-1-686 ([EMAIL PROTECTED]) #1
> Thu Jul 8 05:36:53 EDT 2004
> + # 2.6.22.5-31-default ([EMAIL PROTECTED]) #1 SMP
> 2007/09/21 22:29:00 UTC
> #
> - my $regex = '(2\.[46]\.\d[^\/]*?) \([EMAIL PROTECTED])
> [#]\d+.*\w{3}
> \w{3} \d{1,2} \d{2}:\d{2}:\d{2} \w{3,4} \d{4}';
> + my $regex =
> + # | kernel version + build machine
> + # `---------------------------------------
> + '(2\.[46]\.\d[^\/]*?) \([EMAIL PROTECTED])
> [#]\d+.*' .
> + #
> + # | build date
> + # `---------------------------------------
> + '(\w{3} \w{3} \d{1,2}|\d{4}\/\d{2}\/\d{2}) '.
> + #
> + # | build time
> + # `---------------------------------------
> + '\d{2}:\d{2}:\d{2} \w{3,4}( \d{4})?';
> while(<IN>) {
> # extract the `uname -r` string from the kernel
> file
> if(m/$regex/o) {
>
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
sisuite-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/sisuite-users
