From 61e9f12b11e864bc0bccccea287dc5c32808efc6 Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Tue, 11 Dec 2001 18:35:18 +0000 Subject: [PATCH] More tweaking. --- VERSION | 1 + configure | 2 +- configure.in | 2 +- patches/linux-2.4.16-devmapper-fs.patch | 12 ++++++------ patches/linux-2.4.16-devmapper-ioctl.patch | 8 ++++---- 5 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..bcee9b6 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.90.00 (2001-12-11) diff --git a/configure b/configure index 468496a..f56c7de 100755 --- a/configure +++ b/configure @@ -1926,7 +1926,7 @@ if test "${with_tmp_dir+set}" = set; then withval="$with_tmp_dir" tmpdir="$withval" else - tmpdir=/tmp/kerneldiffs + tmpdir=/tmp/kerndiff fi if test "${with_tmp_dir+set}" = set; then diff --git a/configure.in b/configure.in index 61e3f31..f976e0e 100644 --- a/configure.in +++ b/configure.in @@ -117,7 +117,7 @@ dnl -- Temporary directory for kernel diffs AC_ARG_WITH(tmp-dir, [ --with-tmp-dir=DIR temp directory to make kernel patches [/tmp/kerndiff]], [ tmpdir="$withval" ], - [ tmpdir=/tmp/kerneldiffs ]) + [ tmpdir=/tmp/kerndiff ]) if test "${with_tmp_dir+set}" = set; then tmpdir="$with_tmp_dir" fi diff --git a/patches/linux-2.4.16-devmapper-fs.patch b/patches/linux-2.4.16-devmapper-fs.patch index 648c184..c2637df 100644 --- a/patches/linux-2.4.16-devmapper-fs.patch +++ b/patches/linux-2.4.16-devmapper-fs.patch @@ -1,6 +1,6 @@ diff -ruN linux-2.4.16/drivers/md/Config.in linux/drivers/md/Config.in --- linux-2.4.16/drivers/md/Config.in Fri Sep 14 22:22:18 2001 -+++ linux/drivers/md/Config.in Mon Dec 10 17:49:45 2001 ++++ linux/drivers/md/Config.in Tue Dec 11 18:15:01 2001 @@ -14,5 +14,6 @@ dep_tristate ' Multipath I/O support' CONFIG_MD_MULTIPATH $CONFIG_BLK_DEV_MD @@ -10,7 +10,7 @@ diff -ruN linux-2.4.16/drivers/md/Config.in linux/drivers/md/Config.in endmenu diff -ruN linux-2.4.16/drivers/md/Makefile linux/drivers/md/Makefile --- linux-2.4.16/drivers/md/Makefile Thu Dec 6 15:57:55 2001 -+++ linux/drivers/md/Makefile Mon Dec 10 17:49:45 2001 ++++ linux/drivers/md/Makefile Tue Dec 11 18:15:01 2001 @@ -4,9 +4,12 @@ O_TARGET := mddev.o @@ -3335,7 +3335,7 @@ diff -ruN linux-2.4.16/drivers/md/dmfs.h linux/drivers/md/dmfs.h +#endif /* LINUX_DMFS_H */ diff -ruN linux-2.4.16/fs/namespace.c linux/fs/namespace.c --- linux-2.4.16/fs/namespace.c Thu Dec 6 15:57:56 2001 -+++ linux/fs/namespace.c Mon Dec 10 17:49:45 2001 ++++ linux/fs/namespace.c Tue Dec 11 18:15:01 2001 @@ -332,7 +332,7 @@ } } @@ -3408,7 +3408,7 @@ diff -ruN linux-2.4.16/include/linux/device-mapper.h linux/include/linux/device- +#endif /* _LINUX_DEVICE_MAPPER_H */ diff -ruN linux-2.4.16/include/linux/fs.h linux/include/linux/fs.h --- linux-2.4.16/include/linux/fs.h Thu Dec 6 15:57:58 2001 -+++ linux/include/linux/fs.h Mon Dec 10 17:49:45 2001 ++++ linux/include/linux/fs.h Tue Dec 11 18:15:01 2001 @@ -980,6 +980,7 @@ extern struct vfsmount *kern_mount(struct file_system_type *); extern int may_umount(struct vfsmount *); @@ -3419,7 +3419,7 @@ diff -ruN linux-2.4.16/include/linux/fs.h linux/include/linux/fs.h diff -ruN linux-2.4.16/include/linux/seq_file.h linux/include/linux/seq_file.h --- linux-2.4.16/include/linux/seq_file.h Thu Dec 6 15:57:56 2001 -+++ linux/include/linux/seq_file.h Mon Dec 10 17:49:45 2001 ++++ linux/include/linux/seq_file.h Tue Dec 11 18:15:01 2001 @@ -12,6 +12,7 @@ loff_t index; struct semaphore sem; @@ -3430,7 +3430,7 @@ diff -ruN linux-2.4.16/include/linux/seq_file.h linux/include/linux/seq_file.h struct seq_operations { diff -ruN linux-2.4.16/kernel/ksyms.c linux/kernel/ksyms.c --- linux-2.4.16/kernel/ksyms.c Thu Dec 6 15:57:56 2001 -+++ linux/kernel/ksyms.c Mon Dec 10 17:49:45 2001 ++++ linux/kernel/ksyms.c Tue Dec 11 18:15:01 2001 @@ -46,6 +46,7 @@ #include #include diff --git a/patches/linux-2.4.16-devmapper-ioctl.patch b/patches/linux-2.4.16-devmapper-ioctl.patch index 0d541dc..d519016 100644 --- a/patches/linux-2.4.16-devmapper-ioctl.patch +++ b/patches/linux-2.4.16-devmapper-ioctl.patch @@ -1,6 +1,6 @@ diff -ruN linux-2.4.16/drivers/md/Config.in linux/drivers/md/Config.in --- linux-2.4.16/drivers/md/Config.in Fri Sep 14 22:22:18 2001 -+++ linux/drivers/md/Config.in Mon Dec 10 17:43:12 2001 ++++ linux/drivers/md/Config.in Tue Dec 11 18:12:48 2001 @@ -14,5 +14,6 @@ dep_tristate ' Multipath I/O support' CONFIG_MD_MULTIPATH $CONFIG_BLK_DEV_MD @@ -10,7 +10,7 @@ diff -ruN linux-2.4.16/drivers/md/Config.in linux/drivers/md/Config.in endmenu diff -ruN linux-2.4.16/drivers/md/Makefile linux/drivers/md/Makefile --- linux-2.4.16/drivers/md/Makefile Thu Dec 6 15:57:55 2001 -+++ linux/drivers/md/Makefile Mon Dec 10 17:43:12 2001 ++++ linux/drivers/md/Makefile Tue Dec 11 18:12:48 2001 @@ -4,9 +4,11 @@ O_TARGET := mddev.o @@ -2461,12 +2461,12 @@ diff -ruN linux-2.4.16/include/linux/device-mapper.h linux/include/linux/device- +#endif /* _LINUX_DEVICE_MAPPER_H */ diff -ruN linux-2.4.16/include/linux/dm-ioctl.h linux/include/linux/dm-ioctl.h --- linux-2.4.16/include/linux/dm-ioctl.h Thu Jan 1 01:00:00 1970 -+++ linux/include/linux/dm-ioctl.h Mon Dec 10 17:30:36 2001 ++++ linux/include/linux/dm-ioctl.h Tue Dec 11 14:17:26 2001 @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2001 Sistina Software (UK) Limited. + * -+ * This file is released under the GPL. ++ * This file is released under the LGPL. + */ + +#ifndef _LINUX_DM_IOCTL_H -- 2.43.5