Re: CML2

[Keith Owens <kaos@xxxxxxx>]

On 26 Dec 2001 13:51:20 -0600, 
Austin Gonyou <austin@xxxxxxxxxxxxxxx> wrote:
>Is there a patch for integrating CML2 make system with the XFS tree? Any
>pointers on this would be great.

Are you sure that you mean CML2?  CML2 just defines the config symbols,
their help text and generates the .config file.  There is only two
config.in files affected, one for KDB and one for XFS.  Simply convert
the KDB/XFS changes below to CML2, the help text is already in
Configure.help and will be converted by the install-cml2 script.

If you really mean the new kernel build system (kbuild 2.5), that works
with both CML1 and CML2.  XFS is already kbuild 2.5 ready, see
http://marc.theaimsgroup.com/?l=linux-xfs&m=100231202715631&w=2

diff -urNp 2.4.16/arch/i386/config.in 2.4.16-xfs/arch/i386/config.in
--- 2.4.16/arch/i386/config.in  Fri Nov 23 17:35:37 2001
+++ 2.4.16-xfs/arch/i386/config.in      Tue Dec  4 17:29:36 2001
@@ -407,6 +407,16 @@ if [ "$CONFIG_DEBUG_KERNEL" != "n" ]; th
    bool '  Magic SysRq key' CONFIG_MAGIC_SYSRQ
    bool '  Spinlock debugging' CONFIG_DEBUG_SPINLOCK
    bool '  Verbose BUG() reporting (adds 70K)' CONFIG_DEBUG_BUGVERBOSE
+   bool '  Built-in Kernel Debugger support' CONFIG_KDB
+   dep_tristate '    KDB modules' CONFIG_KDB_MODULES $CONFIG_KDB
+   if [ "$CONFIG_KDB" = "y" ]; then
+      bool '    KDB off by default' CONFIG_KDB_OFF
+      comment '  Load all symbols for debugging is required for KDB'
+      define_bool CONFIG_KALLSYMS y
+   else
+      bool '  Load all symbols for debugging' CONFIG_KALLSYMS
+   fi
+   bool '  Compile the kernel with frame pointers' CONFIG_FRAME_POINTER
 fi
 
 endmenu

diff -urNp 2.4.16/fs/Config.in 2.4.16-xfs/fs/Config.in
--- 2.4.16/fs/Config.in Fri Nov 23 17:36:10 2001
+++ 2.4.16-xfs/fs/Config.in     Tue Dec  4 17:29:36 2001
@@ -5,6 +5,7 @@ mainmenu_option next_comment
 comment 'File systems'
 
 bool 'Quota support' CONFIG_QUOTA
+bool 'POSIX Access Control List support' CONFIG_FS_POSIX_ACL
 tristate 'Kernel automounter support' CONFIG_AUTOFS_FS
 tristate 'Kernel automounter version 4 support (also supports v3)' 
CONFIG_AUTOFS4_FS
 
@@ -85,6 +86,20 @@ dep_mbool '  UDF write support (DANGEROU
 
 tristate 'UFS file system support (read only)' CONFIG_UFS_FS
 dep_mbool '  UFS file system write support (DANGEROUS)' CONFIG_UFS_FS_WRITE 
$CONFIG_UFS_FS $CONFIG_EXPERIMENTAL
+
+tristate 'Page Buffer support' CONFIG_PAGE_BUF
+
+if [ "$CONFIG_PAGE_BUF" = "n" ]; then
+   comment '  Page Buffer support needed for XFS filesystem'
+else
+   dep_tristate 'SGI XFS filesystem support' CONFIG_XFS_FS $CONFIG_PAGE_BUF
+   dep_mbool    '  Enable XFS Realtime support' CONFIG_XFS_RT $CONFIG_XFS_FS
+   dep_mbool    '  Enable XFS Quota' CONFIG_XFS_QUOTA $CONFIG_XFS_FS
+   if [ "$CONFIG_XFS_FS" != "n" ]; then
+      define_bool CONFIG_HAVE_ATTRCTL y
+      dep_mbool '  Enable XFS DMAPI' CONFIG_XFS_DMAPI $CONFIG_XFS_FS
+   fi
+fi
 
 if [ "$CONFIG_NET" = "y" ]; then