From 0cdd7bff88804eb7b2aa1856d9c6a70b1a17acf1 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Sun, 30 May 2004 21:12:55 +0000 Subject: [PATCH] * use make only_libafs not dest_only_libafs - AS a result, build times are much faster, Closes: #144781 * Correct module build scripts to install module package from new location * Require 1.3.64 clients for modules built by 1.3.64 * installo penafs.o not libafs-*.o --- debian/changelog | 6 ++++-- debian/control.module | 2 +- debian/control.module-image | 2 +- debian/rules | 2 +- src/libafs/MakefileProto.LINUX.in | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index a941c9cd4..0d6deb9e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,10 +3,12 @@ openafs (1.3.64-1) experimental; urgency=low * New upstream version * Add 2.6 to kern-sysname for i386 * Apply patch from - /afs/cs.cmu.edu/user/jhutz/junk/openafs-patches/openafs-build-on-linux26 which correctly generates 2.6 modules. + /afs/cs.cmu.edu/user/jhutz/junk/openafs-patches/openafs-build-on-linux26 which correctly generates 2.6 modules, Closes: #234284 * use make only_libafs not dest_only_libafs + - AS a result, build times are much faster, Closes: #144781 + * Correct module build scripts to install module package from new location - -- Sam Hartman Sun, 30 May 2004 16:02:19 -0400 + -- openafs (1.2.11-1) unstable; urgency=high diff --git a/debian/control.module b/debian/control.module index c72c5a6ed..2c175bad6 100644 --- a/debian/control.module +++ b/debian/control.module @@ -5,7 +5,7 @@ Maintainer: Sam Hartman Standards-Version: 3.1.1 Package: openafs-modules-=KVERS -Conflicts: openafs-client (<< 1.2.9) +Conflicts: openafs-client (<< 1.3.64) Provides: openafs-modules2 Architecture: any Description: The AFS distributed filesystem- Kernel Module diff --git a/debian/control.module-image b/debian/control.module-image index f1aaf3392..fca77aa9a 100644 --- a/debian/control.module-image +++ b/debian/control.module-image @@ -5,7 +5,7 @@ Maintainer: Sam Hartman Standards-Version: 3.1.1 Package: openafs-modules-=KVERS -Conflicts: openafs-client (<< 1.2.9) +Conflicts: openafs-client (<< 1.3.64) Provides: openafs-modules2 Architecture: any Recommends: kernel-image-=KVERS (= =KREVS) diff --git a/debian/rules b/debian/rules index c6b7b5e3b..86bc59e55 100755 --- a/debian/rules +++ b/debian/rules @@ -240,7 +240,7 @@ binary-modules: build-modules # Install the software install -d -g root -o root -m 755 debian/$(modulepkg)/lib/modules/$(KVERS)/fs - install -g root -o root -m 755 dest/root.client/usr/vice/etc/modload/*.o \ + install -g root -o root -m 755 debian/tmp/lib/openafs/*o \ debian/$(modulepkg)/lib/modules/$(KVERS)/fs # Fix some stuff up install -d -o root -g root -m 755 debian/$(modulepkg)/usr/share/doc diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in index aeaf2ba94..51d4ce4ba 100644 --- a/src/libafs/MakefileProto.LINUX.in +++ b/src/libafs/MakefileProto.LINUX.in @@ -201,8 +201,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} -- 2.39.5