Upgrade the kbuild 2.5 rules to reflect recent changes to XFS and
DMAPI.
Unfortunately the backport of the 2.5 quota changes to 2.4 are a
problem for kbuild 2.5. The quota changes affect fs/Makefile and
therefore fs/Makefile.in. However fs/Makefile.in is not part of the
XFS tree, it is part of the kbuild 2.5 patches, but the quota changes
are not yet in 2.4 mainline so kbuild 2.5 cannot be updated either. To
work around this conflict, the XFS tree contains fs/Makefile.in.xfs.
After merging XFS with kbuild 2.5 for 2.4.19-pre10,
cd linux
mv fs/Makefile.in.xfs fs/Makefile.in
to replace the kbuild 2.5 mainline code with the XFS+quota replacement.
This is a temporary workaround until the quota patches are in the
mainline kernel, that should be in 2.4.20-pre1 or thereabouts.
Date: Tue Jul 23 19:53:19 PDT 2002
Workarea: sherman.melbourne.sgi.com:/build/kaos/2.4.x-xfs
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs
Modid: 2.4.x-xfs:slinx:123593a
linux/fs/xfs/Makefile.in - 1.21
linux/fs/xfs_dmapi/Makefile.in - 1.9
linux/fs/Makefile.in.xfs - 1.2
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs
Modid: 2.4.x-xfs:slinx:123596a
linux/fs/xfs/linux/Makefile.in - 1.10
linux/fs/xfs_dmapi/Makefile.in - 1.10
linux/fs/Makefile.in.xfs - 1.3
Date: Tue Jul 23 19:53:19 PDT 2002
Workarea: sherman.melbourne.sgi.com:/build/kaos/2.4.x-xfs
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs
Modid: 2.4.x-xfs:slinx:123593a
linux/fs/xfs/Makefile.in - 1.21
linux/fs/xfs_dmapi/Makefile.in - 1.9
linux/fs/Makefile.in.xfs - 1.2
|