On Fri, Mar 24, 2006 at 11:10:52AM +0100, Gerald Hochegger wrote:
> I'm willing to maintain the Ubuntu Dapper 2.6.15.6 kernel with
> the vserver 2.0.2 patch for some time in the future
> since we ourself depend heavily on this combination.

i'm just trying patch-2.6.15.6-vs2.0.2-rc13.diff and the newest ubuntu kernel:

my mini howto:

0. http://packages.ubuntu.com/linux-source

1. http://packages.ubuntu.com/dapper/devel/linux-source

Package: linux-source (2.6.15.18)
Linux kernel source with Ubuntu patches

This package will always depend on the latest Linux kernel source code
available. The Ubuntu patches have been applied. 

2. http://packages.ubuntu.com/dapper/devel/linux-source-2.6.15

Package: linux-source-2.6.15 (2.6.15-19.29)
Linux kernel source for version 2.6.15 with Ubuntu patches

This package provides the source code for the Linux kernel version
2.6.15.

3. Download linux-source-2.6.15

wget 
http://archive.ubuntu.com/ubuntu/pool/main/l/linux-source-2.6.15/linux-source-2.6.15_2.6.15-19.29_all.deb

The MD5sum for linux-source-2.6.15_2.6.15-19.29_all.deb is 
035a9d4dfbf3c453c2d5f88fbdf326c6

ar x linux-source-2.6.15_2.6.15-19.29_all.deb
tar xzf data.tar.gz
mv usr/src/linux-source-2.6.15.tar.bz2 .
rm -f data.tar.gz control.tar.gz debian-binary
tar xjf linux-source-2.6.15.tar.bz2
cd linux-source-2.6.15

cat ../vserver.13thfloor.at/Experimental/patch-2.6.15.6-vs2.0.2-rc13.diff | 
patch -p1 --dry-run --quiet
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
1 out of 2 hunks FAILED -- saving rejects to file 
arch/sparc64/kernel/sys_sparc.c.rej
1 out of 1 hunk FAILED -- saving rejects to file drivers/block/Makefile.rej
1 out of 1 hunk FAILED -- saving rejects to file include/asm-i386/page.h.rej
1 out of 18 hunks FAILED -- saving rejects to file kernel/sys.c.rej


so i modify this patch and i have:
1 out of 1 hunk FAILED -- saving rejects to file include/asm-i386/page.h.rej

can someone look at this last FAILED hunk???

my modified patch:
http://people.uvt.tuke.sk/~mann/patch-2.6.15.6-vs2.0.2-rc13-ubuntu.diff.gz

you can look at page.h.rej in attachment

i like to see patch to latest ubuntu dapper kernel ... and i can help,
like now ... but i'm not vserver kernel guru ;-)

i'm using Debian Sarge and i want stable kernel for my vservers ... so
dapper kernel is IMHO the best kernel for now ... (maybe until Debian Etch) ;-)
[i don't want change kernel after each vanilla release]

-- 

5o   Peter.Mann at tuke.sk


***************
*** 109,127 ****
  
  #endif /* __ASSEMBLY__ */
  
- #ifdef __ASSEMBLY__
  #define __PAGE_OFFSET         (0xC0000000)
- #define __PHYSICAL_START      CONFIG_PHYSICAL_START
- #else
- #define __PAGE_OFFSET         (0xC0000000UL)
- #define __PHYSICAL_START      ((unsigned long)CONFIG_PHYSICAL_START)
  #endif
  #define __KERNEL_START                (__PAGE_OFFSET + __PHYSICAL_START)
  
  
  #define PAGE_OFFSET           ((unsigned long)__PAGE_OFFSET)
  #define VMALLOC_RESERVE               ((unsigned long)__VMALLOC_RESERVE)
- #define MAXMEM                        (-__PAGE_OFFSET-__VMALLOC_RESERVE)
  #define __pa(x)                       ((unsigned long)(x)-PAGE_OFFSET)
  #define __va(x)                       ((void *)((unsigned 
long)(x)+PAGE_OFFSET))
  #define pfn_to_kaddr(pfn)      __va((pfn) << PAGE_SHIFT)
--- 109,135 ----
  
  #endif /* __ASSEMBLY__ */
  
+ #if   defined(CONFIG_SPLIT_3GB)
  #define __PAGE_OFFSET         (0xC0000000)
+ #elif defined(CONFIG_SPLIT_25GB)
+ #define __PAGE_OFFSET         (0xA0000000)
+ #elif defined(CONFIG_SPLIT_2GB)
+ #define __PAGE_OFFSET         (0x80000000)
+ #elif defined(CONFIG_SPLIT_15GB)
+ #define __PAGE_OFFSET         (0x60000000)
+ #elif defined(CONFIG_SPLIT_1GB)
+ #define __PAGE_OFFSET         (0x40000000)
  #endif
+ 
+ #define __PHYSICAL_START      CONFIG_PHYSICAL_START
  #define __KERNEL_START                (__PAGE_OFFSET + __PHYSICAL_START)
+ #define __MAXMEM              (-__PAGE_OFFSET-__VMALLOC_RESERVE)
  
  
  #define PAGE_OFFSET           ((unsigned long)__PAGE_OFFSET)
+ #define PHYSICAL_START                ((unsigned long)__PHYSICAL_START)
  #define VMALLOC_RESERVE               ((unsigned long)__VMALLOC_RESERVE)
+ #define MAXMEM                        ((unsigned long)__MAXMEM)
  #define __pa(x)                       ((unsigned long)(x)-PAGE_OFFSET)
  #define __va(x)                       ((void *)((unsigned 
long)(x)+PAGE_OFFSET))
  #define pfn_to_kaddr(pfn)      __va((pfn) << PAGE_SHIFT)
_______________________________________________
Vserver mailing list
[email protected]
http://list.linux-vserver.org/mailman/listinfo/vserver

Reply via email to