[Lunar-commits] r22409 - in moonbase/trunk: filesys/openafs kernel/openafs-driver
Stefan Wold
ratler at lunar-linux.org
Sat Dec 2 19:14:59 CET 2006
Author: ratler
Date: 2006-12-02 19:14:59 +0100 (Sat, 02 Dec 2006)
New Revision: 22409
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:
* New patch to compile with >= kernel 2.6.18
* Fixed so openafs now compile with 64-bit support
Modified: moonbase/trunk/filesys/openafs/BUILD
===================================================================
--- moonbase/trunk/filesys/openafs/BUILD 2006-12-02 18:07:04 UTC (rev 22408)
+++ moonbase/trunk/filesys/openafs/BUILD 2006-12-02 18:14:59 UTC (rev 22409)
@@ -1,18 +1,34 @@
(
patch_it $SOURCE4 1 &&
patch_it $SOURCE5 1 &&
+ patch_it $SOURCE6 1 &&
./regen.sh &&
- case `uname -s -r` in
- [lL]inux\ 2.4.*) OPTS="$OPTS --with-afs-sysname=i386_linux24"
+ case `uname -r` in
+ 2.6.*)
+ kv="26"
;;
- [lL]inux\ 2.6.*) OPTS="$OPTS --with-afs-sysname=i386_linux26"
+ 2.4.*)
+ kv="24"
;;
- *) message "Unsupported OS!"
+ *)
+ message "Unsupported kernel version!"
exit -1
;;
esac
+ case `arch` in
+ x86_64)
+ OPTS="$OPTS --with-afs-sysname=amd64_linux${kv}"
+ ;;
+ i386|i486|i586|i686|athlon)
+ OPTS="$OPTS --with-afs-sysname=i386_linux${kv}"
+ ;;
+ *)
+ OPTS="$OPTS --with-afs-sysname=`arch`_linux${kv}"
+ ;;
+ 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!"
@@ -25,6 +41,8 @@
--localstatedir=/var \
--infodir=/usr/share/info \
--mandir=/usr/share/man \
+ --enable-largefile-fileserver \
+ --enable-supergroups \
$OPTS &&
make all_nolibafs &&
prepare_install &&
Modified: moonbase/trunk/filesys/openafs/DETAILS
===================================================================
--- moonbase/trunk/filesys/openafs/DETAILS 2006-12-02 18:07:04 UTC (rev 22408)
+++ moonbase/trunk/filesys/openafs/DETAILS 2006-12-02 18:14:59 UTC (rev 22409)
@@ -5,16 +5,19 @@
SOURCE3=killafs-0.1
SOURCE4=openafs-1.4.2-paths.patch
SOURCE5=openafs-1.4.1-rename_pagsh.patch
+ SOURCE6=openafs-1.4.2-task_list.patch
SOURCE_URL=http://www.openafs.org/dl/openafs/$VERSION/
SOURCE2_URL=http://grand.central.org/dl/cellservdb/
SOURCE3_URL=$PATCH_URL/
SOURCE4_URL=$PATCH_URL/
SOURCE5_URL=$PATCH_URL/
+ SOURCE6_URL=$PATCH_URL/
WEB_SITE=http://www.openafs.org/
SOURCE_VFY=sha1:062d78e3ee4237ab09fa3b01fed8b2fb35a7f3e5
SOURCE3_VFY=sha1:5532084c54a79f77807ee8ae3cb09018b3e74c12
SOURCE4_VFY=sha1:625fcda8fac555603b62a48d5f2fbbff6cf14d32
SOURCE5_VFY=sha1:401b3ada4f9a2a60cd0f6ac60f7107f1fdca0638
+ SOURCE6_VFY=sha1:b9571e6a5be6cc21080d8f149c85c0b56106826c
ENTERED=20031216
UPDATED=20061121
MAINTAINER="ratler at lunar-linux.org"
Modified: moonbase/trunk/kernel/openafs-driver/BUILD
===================================================================
--- moonbase/trunk/kernel/openafs-driver/BUILD 2006-12-02 18:07:04 UTC (rev 22408)
+++ moonbase/trunk/kernel/openafs-driver/BUILD 2006-12-02 18:14:59 UTC (rev 22409)
@@ -1,19 +1,34 @@
(
patch_it $SOURCE2 1 &&
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"
+ case `uname -r` in
+ 2.6.*)
+ kv="26"
;;
- [lL]inux\ 2.6.*) OPTS="$OPTS --with-afs-sysname=i386_linux26"
+ 2.4.*)
+ kv="24"
;;
- *) message "Unsupported OS!"
+ *)
+ message "Unsupported kernel version!"
exit -1
;;
esac
+ case `arch` in
+ x86_64)
+ OPTS="$OPTS --with-afs-sysname=amd64_linux${kv}"
+ ;;
+ i386|i486|i586|i686|athlon)
+ OPTS="$OPTS --with-afs-sysname=i386_linux${kv}"
+ ;;
+ *)
+ OPTS="$OPTS --with-afs-sysname=`arch`_linux${kv}"
+ ;;
+ esac
+
# Bad idea, this causes a POST_INSTALL problem from kernel.
# In other words this cause openafs-driver to be built against old kernel
Modified: moonbase/trunk/kernel/openafs-driver/DETAILS
===================================================================
--- moonbase/trunk/kernel/openafs-driver/DETAILS 2006-12-02 18:07:04 UTC (rev 22408)
+++ moonbase/trunk/kernel/openafs-driver/DETAILS 2006-12-02 18:14:59 UTC (rev 22409)
@@ -3,14 +3,17 @@
SOURCE=openafs-$VERSION-src.tar.bz2
SOURCE2=openafs-1.4.2-paths.patch
SOURCE3=openafs-1.4.1-rename_pagsh.patch
+ SOURCE4=openafs-1.4.2-task_list.patch
SOURCE_DIRECTORY=$BUILD_DIRECTORY/openafs-$VERSION
SOURCE_URL=http://www.openafs.org/dl/openafs/$VERSION/
SOURCE2_URL=$PATCH_URL/
SOURCE3_URL=$PATCH_URL/
+ SOURCE4_URL=$PATCH_URL/
WEB_SITE=http://www.openafs.org/
SOURCE_VFY=sha1:062d78e3ee4237ab09fa3b01fed8b2fb35a7f3e5
SOURCE2_VFY=sha1:625fcda8fac555603b62a48d5f2fbbff6cf14d32
SOURCE3_VFY=sha1:401b3ada4f9a2a60cd0f6ac60f7107f1fdca0638
+ SOURCE4_VFY=sha1:b9571e6a5be6cc21080d8f149c85c0b56106826c
ENTERED=20031216
UPDATED=20061121
MAINTAINER="ratler at lunar-linux.org"
Modified: moonbase/trunk/kernel/openafs-driver/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/openafs-driver/POST_INSTALL 2006-12-02 18:07:04 UTC (rev 22408)
+++ moonbase/trunk/kernel/openafs-driver/POST_INSTALL 2006-12-02 18:14:59 UTC (rev 22409)
@@ -2,12 +2,33 @@
mkdir -p /usr/vice/etc/modload
fi
-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
+case `uname -r` in
+ 2.6.*)
+ kv="26"
;;
- [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
+ 2.4.*)
+ kv="24"
;;
+ *)
+ message "Unsupported kernel version!"
+ exit -1
+ ;;
esac
+
+case `arch` in
+ x86_64)
+ sysname="amd64_linux${kv}"
+ ;;
+ i386|i486|i586|i686|athlon)
+ sysname="i386_linux${kv}"
+ ;;
+ *)
+ sysname="`arch`_linux${kv}"
+ ;;
+esac
+
+if [ "$kv" == "26" ]; then
+ install -m 644 $SOURCE_DIRECTORY/${sysname}/dest/root.client/usr/vice/etc/modload/*.ko /usr/vice/etc/modload || exit -1
+else
+ install -m 644 $SOURCE_DIRECTORy/${sysname}/dest/root.client/usr/vice/etc/modload/*.o /usr/vice/etc/modload || exit -1
+fi
More information about the Lunar-commits
mailing list