Name the kernel module openafs instead of libafs

Apply quilt patch module-name: Build the kernel module as openafs.ko
instead of libafs.ko.  This should really be done upstream as well, but it
poses backwards compatibility problems and it's always been called libafs
on other platforms, so it's controversial.

This implementation of the idea produces warnings and needs some
improvement.

diff --git a/src/config/linux-version b/src/config/linux-version
index caa7b253d08ca463f516d396fe26a880921dd697..ebc8437a6c517d46302dac36fe7af647e548324c 100644 (file)
--- a/src/config/linux-version
+++ b/src/config/linux-version
@@ -38,7 +38,7 @@ found_one="false"
 CAN_BUILD=""
 
 for VERS in $LINUX_VERS ; do
-       dir=$LINUX_SRCDIR$VERS
+       dir=$LINUX_SRCDIR
        if [ ! -d $dir ] ; then
            dir=$LINUX_SRCDIR
            if [ ! -d $dir ] ; then
@@ -47,7 +47,7 @@ for VERS in $LINUX_VERS ; do
                continue
            fi
        fi
-       header=$LINUX_SRCDIR$VERS/include/linux/version.h
+       header=$LINUX_SRCDIR/include/linux/version.h
        if [ ! -f $header ] ; then
            header=$LINUX_SRCDIR/include/linux/version.h
            if [ ! -f $header ] ; then

diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 14ef621295555074a68efefcb915afc8d110786c..50a7312120426d2464c4fbae4bc25ef38f28eb50 100644 (file)
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -222,8 +222,8 @@ linux_destdirs_libafs.bm: dest_libafs.bm
 
 # Below this line are targets when in the COMMON directory:
 # For Linux there is no kernel NFS server.
-LIBAFS = libafs-${CLIENT}.${LINUX_MODULE_EXT}
-LIBAFS_MP = libafs-${CLIENT}.mp.${LINUX_MODULE_EXT}
+LIBAFS = openafs.${LINUX_MODULE_EXT}
+LIBAFS_MP = openafs.${LINUX_MODULE_EXT}
 LIBAFS_EP = libafs-${CLIENT}.ep.${LINUX_MODULE_EXT}
 LIBAFS_BM = libafs-${CLIENT}.bm.${LINUX_MODULE_EXT}
 
@@ -232,10 +232,8 @@ INST_LIBAFS_MP = ${DESTDIR}${afskerneldir}/${LIBAFS_MP}
 INST_LIBAFS_EP = ${DESTDIR}${afskerneldir}/${LIBAFS_EP}
 INST_LIBAFS_BM = ${DESTDIR}${afskerneldir}/${LIBAFS_BM}
 
-DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS}
-DEST_LIBAFS_MP = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS_MP}
-DEST_LIBAFS_EP = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS_EP}
-DEST_LIBAFS_BM = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS_BM}
+DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/openafs.o
+DEST_LIBAFS_MP = ${DEST}/root.client/usr/vice/etc/modload/openafs.mp.o
 
 
 libafs:        $(LIBAFS) 
@@ -251,11 +249,11 @@ libafs.bm: $(LIBAFS_BM)
        echo BM Build Complete
 
 <linux26 linux_26 umlinux26>
-${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: libafs.ko
-       cp libafs.ko $@
+${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: openafs.ko
+       cp openafs.ko $@
 
 .FORCE:
-libafs.ko: .FORCE
+openafs.ko: .FORCE
        env EXTRA_CFLAGS="${EXTRA_CFLAGS}" @TOP_SRCDIR@/libafs/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common
        env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_PATH} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules