there were a few tweaks to get kbuild 2.5 working on 2.5.11

in core, there is one rej from scrips/tkparse.c.  pretty obvious to fix
up, but here is the new chunk:

--- linux-2.5.11/scripts/tkparse.c      Sun Apr 28 20:11:16 2002
+++ linux-2.5.11+kbuild/scripts/tkparse.c       Mon Apr 29 17:10:51 2002
@@ -74,12 +74,12 @@
 

 /*
- * Find index of a specyfic variable in the symbol table.
+ * Find index of a specific variable in the symbol table.
  * Create a new entry if it does not exist yet.
  */
-#define VARTABLE_SIZE 4096
-struct variable vartable[VARTABLE_SIZE];
+struct variable *vartable;
 int max_varnum = 0;
+static int vartable_size = 0;
 
 int get_varnum( char * name )
 {

the "#define VARTABLE_SIZE 4096" was "#define VARTABLE_SIZE 2048"

and attached is a patch to kbuild-2.5-common-2.5.10-2 to get 2.5.11
working.  apply this after applying kbuild-2.5-common-2.5.10-2.

soon, I should have a sparc64 patch for 2.5.11, although the tree is a
mess right now WRT to building sparc, so there is going to be a big
"fixup" patch that goes with it.

-tduffy
--- linux-2.5.10+kbuild-2.5-core-8-common-2-i386-1/drivers/video/Makefile.in    Mon 
Apr 29 18:16:32 2002
+++ linux-2.5.11+sparc64hacks+kbuild/drivers/video/Makefile.in  Mon Apr 29 18:17:24 
+2002
@@ -3,7 +3,8 @@
        fbcon-ilbm.o fbcon-vga.o fbcon-iplan2p2.o fbcon-iplan2p4.o
        fbcon-iplan2p8.o fbcon-vga-planes.o fbcon-cfb16.o fbcon-cfb2.o
        fbcon-cfb24.o fbcon-cfb32.o fbcon-cfb4.o fbcon-cfb8.o
-       fbcon-mac.o fbcon-mfb.o cyber2000fb.o sa1100fb.o fbcon-hga.o)
+       fbcon-mac.o fbcon-mfb.o cyber2000fb.o sa1100fb.o fbcon-hga.o
+       fbgen.o)
 
 select(CONFIG_DUMMY_CONSOLE dummycon.o)
 select(CONFIG_SGI_NEWPORT_CONSOLE newport_con.o)
--- linux-2.5.10+kbuild-2.5-core-8-common-2-i386-1/drivers/ide/Makefile.in      Mon 
Apr 29 18:16:32 2002
+++ linux-2.5.11+sparc64hacks+kbuild/drivers/ide/Makefile.in    Mon Apr 29 17:53:08 
+2002
@@ -26,7 +26,6 @@
 objlink(CONFIG_BLK_DEV_HT6560B         ide-mod.o ht6560b.o)
 objlink(CONFIG_BLK_DEV_IDE_ICSIDE      ide-mod.o icside.o)
 objlink(CONFIG_BLK_DEV_IDEDMA_PCI      ide-mod.o ide-dma.o)
-objlink(CONFIG_BLK_DEV_IDE_TCQ         ide-mod.o ide-tcq.o)
 objlink(CONFIG_BLK_DEV_IDEPCI          ide-mod.o ide-pci.o)
 objlink(CONFIG_BLK_DEV_ISAPNP          ide-mod.o ide-pnp.o)
 objlink(CONFIG_BLK_DEV_IDE_PMAC                ide-mod.o ide-pmac.o)
--- linux-2.5.10+kbuild-2.5-core-8-common-2-i386-1/fs/ntfs/Makefile.in  Mon Apr 29 
18:16:32 2002
+++ linux-2.5.11+sparc64hacks+kbuild/fs/ntfs/Makefile.in        Mon Apr 29 18:33:00 
+2002
@@ -1,9 +1,9 @@
 
 # Rules for making the NTFS driver
 
-objlink(ntfs.o fs.o sysctl.o support.o util.o inode.o dir.o super.o attr.o
-       unistr.o)
+objlink(ntfs.o aops.o attrib.o compress.o debug.o dir.o file.o inode.o mft.o
+       mst.o namei.o super.o sysctl.o time.o unistr.o upcase.o)
 select(CONFIG_NTFS_FS ntfs.o)
 # New version format started 3 February 2001.
-extra_cflags_all(-DNTFS_VERSION=\"1.1.22\")
+extra_cflags_all(-DNTFS_VERSION=\"2.0.4\")
 #extra_cflags_all(-DDEBUG)

Reply via email to