[Lunar-commits] r19922 - in moonbase/trunk: filesys/openafs kernel/openafs-driver

Stefan Wold ratler at lunar-linux.org
Wed May 3 07:49:02 UTC 2006


Author: ratler
Date: 2006-05-03 07:49:00 +0000 (Wed, 03 May 2006)
New Revision: 19922

Modified:
   moonbase/trunk/filesys/openafs/BUILD
   moonbase/trunk/filesys/openafs/DETAILS
   moonbase/trunk/kernel/openafs-driver/BUILD
   moonbase/trunk/kernel/openafs-driver/DETAILS
   moonbase/trunk/kernel/openafs-driver/POST_INSTALL
Log:
Major version bump of openafs.
* Stability improvements on client side
* Kernel 2.6 support
* pagsh will no longer conflict with heimdal pagsh
  it is now named pagsh.afs
* Some cleaning have been done to the module in general


Modified: moonbase/trunk/filesys/openafs/BUILD
===================================================================
--- moonbase/trunk/filesys/openafs/BUILD	2006-05-03 03:57:02 UTC (rev 19921)
+++ moonbase/trunk/filesys/openafs/BUILD	2006-05-03 07:49:00 UTC (rev 19922)
@@ -1,10 +1,26 @@
 (
-  unpack $SOURCE3				&&
-  patch_it $SOURCE_CACHE/$SOURCE2 0		&&
-  ./regen.sh					&& 
+  patch_it $SOURCE3 1	&&
+  patch_it $SOURCE4 1	&&
+  ./regen.sh		&& 
 
+  case `uname -s -r` in
+    [lL]inux\ 2.4.*) OPTS="$OPTS --with-afs-sysname=i386_linux24"
+      ;;
+    [lL]inux\ 2.6.*) OPTS="$OPTS --with-afs-sysname=i386_linux26"
+      ;;
+    *) message "Unsupported OS!"
+      exit -1
+      ;;
+  esac
+
+  if [ ! -e /lib/modules/`uname -r`/build/include/linux/version.h ]; then
+    message "Can't find '/lib/modules/`uname -r`/build/include/linux/version.h'!"
+    message "You need to have the source for your running kernel online and configured!"
+    exit -1
+  fi
+  OPTS="$OPTS --with-linux-kernel-headers=/lib/modules/`uname -r`/build"
+
   ./configure 	--prefix=/usr			\
-  		--with-afs-sysname=i386_linux24	\
 		--sysconfdir=/usr/vice/etc	\
 		--localstatedir=/var		\
 		--infodir=/usr/share/info	\
@@ -20,26 +36,29 @@
   fi &&
 
   if [ ! -d /usr/vice/cache ]; then
-	mkdir -p /usr/vice/cache
+	mkdir -p /usr/vice/cache &&
  	chmod 0700 /usr/vice/cache
   fi &&	
 
   if [ ! -d /afs ]; then
-  	mkdir /afs
+  	mkdir /afs &&
 	chmod 755 /afs
   fi &&	
 
   # Installing some db files
-  install -p -m 644 $SOURCE_DIRECTORY/etc/openafs-CellServDB /usr/vice/etc/CellServDB &&
-  install -p -m 644 $SOURCE_DIRECTORY/etc/openafs-SuidCells /usr/vice/etc/SuidCells &&
-  install -p -m 644 $SOURCE_DIRECTORY/etc/openafs-cacheinfo /usr/vice/etc/cacheinfo &&
-  install -p -m 755 $SOURCE_DIRECTORY/etc/openafs-afsmodname /usr/vice/etc/afsmodname &&
+  install -p -m 644 $SOURCE_CACHE/CellServDB /usr/vice/etc/CellServDB &&
+  install -p -m 644 $SOURCE_DIRECTORY/src/packaging/HP-UX/files/usr/vice/etc/cacheinfo /usr/vice/etc/cacheinfo &&
+  install -p -m 755 $SOURCE_DIRECTORY/src/packaging/RedHat/afsmodname /usr/vice/etc/afsmodname &&
+  touch /usr/vice/etc/SuidCells &&
 
   # Copy conf and rc files
-  sedit "s;^OPTIONS=.*;OPTIONS=\"\$MEDIUM -nosettime\";" $SOURCE_DIRECTORY/src/afsd/afs.conf.linux
-  install -p -m 644 $SOURCE_DIRECTORY/src/afsd/afs.conf.linux /etc/config.d/afs	 &&
-  sedit "s;^SYSCNF=.*;SYSCNF=/etc/config.d/afs;" $SOURCE_DIRECTORY/src/afsd/afs.rc.linux	&&
+  sedit "s;^OPTIONS=.*;OPTIONS=\"\$MEDIUM -nosettime\";" $SOURCE_DIRECTORY/src/afsd/afs.conf.linux &&
+  install -p -m 644 $SOURCE_DIRECTORY/src/afsd/afs.conf.linux /etc/config.d/afs &&
+  sedit "s;^SYSCNF=.*;SYSCNF=/etc/config.d/afs;" $SOURCE_DIRECTORY/src/afsd/afs.rc.linux &&
   install -p -m 755 $SOURCE_DIRECTORY/src/afsd/afs.rc.linux /etc/init.d/afs
- 
+
+  # Ugly but we need a new cellservdb everytime we run lin
+  rm -f $SOURCE_CACHE/$SOURCE2
+
 ) > $C_FIFO 2>&1
   

Modified: moonbase/trunk/filesys/openafs/DETAILS
===================================================================
--- moonbase/trunk/filesys/openafs/DETAILS	2006-05-03 03:57:02 UTC (rev 19921)
+++ moonbase/trunk/filesys/openafs/DETAILS	2006-05-03 07:49:00 UTC (rev 19922)
@@ -1,19 +1,21 @@
         MODULE=openafs
-       VERSION=1.2.13
+       VERSION=1.4.1
         SOURCE=openafs-$VERSION-src.tar.bz2
-       SOURCE2=openafs-1.2.10a-m4.patch.bz2
-       SOURCE3=openafs-etc-1.0.tar.bz2
+       SOURCE2=CellServDB
+       SOURCE3=openafs-1.4.1-paths.patch
+       SOURCE4=openafs-1.4.1-rename_pagsh.patch
     SOURCE_URL=http://www.openafs.org/dl/openafs/$VERSION/
-   SOURCE2_URL=$PATCH_URL/
+   SOURCE2_URL=http://grand.central.org/dl/cellservdb/
    SOURCE3_URL=$PATCH_URL/
+   SOURCE4_URL=$PATCH_URL/
       WEB_SITE=http://www.openafs.org/
-    SOURCE_VFY=sha1:75f213cfaa3c3dad6d5f30cd4c6e59b0996e4358
-   SOURCE2_VFY=sha1:e4de5fe0201dc4e0fa5668f616f7433905c67c2a
-   SOURCE3_VFY=sha1:1094fa88c3ab4499557be52d162eedc68a47e36a
+    SOURCE_VFY=sha1:8f2ba479dfdc32e7471555f4a19493839bdd736f
+   SOURCE3_VFY=sha1:3f0b5191eff5ea9cf17940eae8f27a2ece603899
+   SOURCE4_VFY=sha1:401b3ada4f9a2a60cd0f6ac60f7107f1fdca0638
        ENTERED=20031216
-       UPDATED=20050321
+       UPDATED=20060503
     MAINTAINER="ratler at lunar-linux.org"
-         SHORT="OpenAFS distributed filesystem"
+         SHORT="A distributed filesystem"
          PSAFE="no"
 cat << EOF
 OpenAFS distributed filesystem. AFS is a distributed filesystem

Modified: moonbase/trunk/kernel/openafs-driver/BUILD
===================================================================
--- moonbase/trunk/kernel/openafs-driver/BUILD	2006-05-03 03:57:02 UTC (rev 19921)
+++ moonbase/trunk/kernel/openafs-driver/BUILD	2006-05-03 07:49:00 UTC (rev 19922)
@@ -1,7 +1,27 @@
 (
+  patch_it $SOURCE2 1 &&
+  patch_it $SOURCE3 1 &&
 
+  ./regen.sh &&
+
+  case `uname -s -r` in
+    [lL]inux\ 2.4.*) OPTS="$OPTS --with-afs-sysname=i386_linux24"
+      ;;
+    [lL]inux\ 2.6.*) OPTS="$OPTS --with-afs-sysname=i386_linux26"
+      ;;
+    *) message "Unsupported OS!"
+      exit -1
+      ;;
+  esac
+
+  if [ ! -e /lib/modules/`uname -r`/build/include/linux/version.h ]; then
+    message "Can't find '/lib/modules/`uname -r`/build/include/linux/version.h'!"
+    message "You need to have the source for your running kernel online and configured!"
+    exit -1
+  fi
+  OPTS="$OPTS --with-linux-kernel-headers=/lib/modules/`uname -r`/build"
+
   ./configure 	--prefix=/usr			\
-  		--with-afs-sysname=i386_linux24	\
 		--sysconfdir=/usr/vice/etc	\
 		--localstatedir=/var		\
 		--infodir=/usr/share/info	\

Modified: moonbase/trunk/kernel/openafs-driver/DETAILS
===================================================================
--- moonbase/trunk/kernel/openafs-driver/DETAILS	2006-05-03 03:57:02 UTC (rev 19921)
+++ moonbase/trunk/kernel/openafs-driver/DETAILS	2006-05-03 07:49:00 UTC (rev 19922)
@@ -1,18 +1,24 @@
           MODULE=openafs-driver
-         VERSION=1.2.13
+         VERSION=1.4.1
           SOURCE=openafs-$VERSION-src.tar.bz2
-   SOURCE_URL[0]=http://www.openafs.org/dl/openafs/$VERSION/
-   SOURCE_VFY[0]=sha1:75f213cfaa3c3dad6d5f30cd4c6e59b0996e4358
+         SOURCE2=openafs-1.4.1-paths.patch
+         SOURCE3=openafs-1.4.1-rename_pagsh.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/openafs-$VERSION
+      SOURCE_URL=http://www.openafs.org/dl/openafs/$VERSION/
+     SOURCE2_URL=$PATCH_URL/
+     SOURCE3_URL=$PATCH_URL/
         WEB_SITE=http://www.openafs.org/
+      SOURCE_VFY=sha1:8f2ba479dfdc32e7471555f4a19493839bdd736f
+     SOURCE2_VFY=sha1:3f0b5191eff5ea9cf17940eae8f27a2ece603899
+     SOURCE3_VFY=sha1:401b3ada4f9a2a60cd0f6ac60f7107f1fdca0638
          ENTERED=20031216
-         UPDATED=20050321
+         UPDATED=20060503
       MAINTAINER="ratler at lunar-linux.org"
            SHORT="OpenAFS kernel module"
            PSAFE="no"
 cat << EOF
-OpenAFS kernel module. AFS is a distributed filesystem allowing
-cross-platform sharing of files among multiple computers. Facilities
-are provided for access control, authentication, backup and
+OpenAFS distributed filesystem. AFS is a distributed filesystem
+allowing cross-platform sharing of files among multiple computers.
+Facilities are provided for access control, authentication, backup and
 adminsitrative management.
 EOF

Modified: moonbase/trunk/kernel/openafs-driver/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/openafs-driver/POST_INSTALL	2006-05-03 03:57:02 UTC (rev 19921)
+++ moonbase/trunk/kernel/openafs-driver/POST_INSTALL	2006-05-03 07:49:00 UTC (rev 19922)
@@ -1,5 +1,13 @@
 if [ ! -d /usr/vice/etc/modload ]; then
-	mkdir -p /usr/vice/etc/modload
+  mkdir -p /usr/vice/etc/modload
 fi
 
-install -m 644 $SOURCE_DIRECTORY/i386_linux24/dest/root.client/usr/vice/etc/modload/*.o /usr/vice/etc/modload
+case `uname -s -r` in
+  [lL]inux\ 2.4.*) install -m 644 $SOURCE_DIRECTORY/i386_linux24/dest/root.client/usr/vice/etc/modload/*.o /usr/vice/etc/modload
+    ;;
+  [lL]inux\ 2.6.*) for mod in $SOURCE_DIRECTORY/i386_linux26/dest/root.client/usr/vice/etc/modload/*.ko; do
+      install -m 644 $mod /usr/vice/etc/modload || exit -1
+      ln -sf `basename $mod` /usr/vice/etc/modload/`basename $mod .ko`.o
+    done
+    ;;
+esac



More information about the Lunar-commits mailing list