From fb8277d332684576e8fd54550017d074ee9389ae Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Sun, 30 May 2004 20:20:50 +0000 Subject: [PATCH] * Run regen.sh * Use make only_libafs not dest_only_libafs --- aclocal.m4 | 3 +-- configure | 3 +-- configure-libafs | 3 +-- debian/changelog | 3 ++- debian/rules | 5 +++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 4e63e5303..f2893586f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2575,9 +2575,8 @@ lose; ac_cv_linux_config_modversions=yes, ac_cv_linux_config_modversions=no)]) AC_MSG_RESULT($ac_cv_linux_config_modversions) - ac_cv_linux_config_modversions=yes AC_MSG_CHECKING(which kernel modules to build) - if test "x$ac_linux_rhconfig" = "xyes" -o "x$ac_cv_linux_config_modversions" = "xno"; then + if false; then MPS="MP SP" else AC_CACHE_VAL(ac_cv_linux_config_smp, [ diff --git a/configure b/configure index 68518ea49..b93072bb1 100755 --- a/configure +++ b/configure @@ -6043,10 +6043,9 @@ fi echo "$as_me:$LINENO: result: $ac_cv_linux_config_modversions" >&5 echo "${ECHO_T}$ac_cv_linux_config_modversions" >&6 - ac_cv_linux_config_modversions=yes echo "$as_me:$LINENO: checking which kernel modules to build" >&5 echo $ECHO_N "checking which kernel modules to build... $ECHO_C" >&6 - if test "x$ac_linux_rhconfig" = "xyes" -o "x$ac_cv_linux_config_modversions" = "xno"; then + if false; then MPS="MP SP" else if test "${ac_cv_linux_config_smp+set}" = set; then diff --git a/configure-libafs b/configure-libafs index 87df9f04c..9559d47d6 100755 --- a/configure-libafs +++ b/configure-libafs @@ -6043,10 +6043,9 @@ fi echo "$as_me:$LINENO: result: $ac_cv_linux_config_modversions" >&5 echo "${ECHO_T}$ac_cv_linux_config_modversions" >&6 - ac_cv_linux_config_modversions=yes echo "$as_me:$LINENO: checking which kernel modules to build" >&5 echo $ECHO_N "checking which kernel modules to build... $ECHO_C" >&6 - if test "x$ac_linux_rhconfig" = "xyes" -o "x$ac_cv_linux_config_modversions" = "xno"; then + if false; then MPS="MP SP" else if test "${ac_cv_linux_config_smp+set}" = set; then diff --git a/debian/changelog b/debian/changelog index b217bd963..a941c9cd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ openafs (1.3.64-1) experimental; urgency=low * 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. + * use make only_libafs not dest_only_libafs - -- + -- Sam Hartman Sun, 30 May 2004 16:02:19 -0400 openafs (1.2.11-1) unstable; urgency=high diff --git a/debian/rules b/debian/rules index 31f54dd0c..c6b7b5e3b 100755 --- a/debian/rules +++ b/debian/rules @@ -224,8 +224,9 @@ build-modules: build-modules-stamp build-modules-stamp: -ln -s @sys/dest dest -ln -s $(SYS_NAME) @sys - sh configure --with-afs-sysname=$(SYS_NAME) --with-linux-kernel-headers=$(KSRC) - make dest_only_libafs + sh configure --with-afs-sysname=$(SYS_NAME) --with-linux-kernel-headers=$(KSRC) --prefix=`pwd`/debian/tmp + make only_libafs + cd src/libafs&&make install touch build-modules-stamp binary-modules: build-modules -- 2.39.5