From 718803d681af0095e526937504ecee756dafc9a4 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Wed, 11 Jul 2001 15:42:36 +0000 Subject: [PATCH] Label new version; build for alpha; integrate module build fixes --- debian/changelog | 14 +++++++++++++- debian/control | 13 +++++++------ debian/kern-sysname | 10 ++++++++++ debian/rules | 9 +++++---- debian/sysname | 3 +++ 5 files changed, 38 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0eb2f908a..d0d49dcf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +openafs (1.0.90.20010710.snapshot-1) experimental; urgency=low + + * New upstream snapshot + * Fix module package to not have build cruft + * Use --disable-kernel-module option except for module sources + * Attempt to build modules correctly, although still not in right place + * Pretend we build for alpha. This is mostly not a fiction, although I + don't really know that much more than the kernel module and afsd + work. The pointer cast warnings are frightening. + + -- Sam Hartman Wed, 11 Jul 2001 11:41:22 -0400 + openafs (1.0.90.20010704.snapshot-1) experimental; urgency=low * New upstream snapshot. Support AFSDB records and many other @@ -11,7 +23,7 @@ openafs (1.0.4-3) unstable; urgency=medium * Fix patch introduced in -2 to be consistent with what is sent upstream. * openafs-modules-source depends on debhelper - -- Sam Hartman Wed, 4 Jul 2001 03:52:37 -0400 + -- Sam Hartman Wed, 4 Jul 2001 03:52:37 -0400 openafs (1.0.4-2) unstable; urgency=low diff --git a/debian/control b/debian/control index d26539e2f..e93afcad3 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,11 @@ Source: openafs Section: non-us/main Priority: optional Maintainer: Sam Hartman -Build-Depends: debhelper (>= 2.2.20), libncurses5-dev, libpam0g-dev, bison, docbook-to-man, flex +Build-Depends: debhelper (>= 2.2.20), libncurses5-dev, libpam0g-dev, bison, docbook-to-man, flex, autoconf, automake Standards-Version: 3.5.0 Package: openafs-client -Architecture: i386 powerpc sparc +Architecture: i386 powerpc sparc alpha Depends: ${shlibs:Depends}, debconf, host|dnsutils, openafs-modules-source|openafs-modules Conflicts: arla Description: The AFS distributed filesystem- client support @@ -19,7 +19,7 @@ Description: The AFS distributed filesystem- client support Package: openafs-kpasswd Priority: extra -Architecture: i386 powerpc sparc +Architecture: i386 powerpc sparc alpha Depends: ${shlibs:Depends}, openafs-client (= ${Source-Version}) Conflicts: krb5-user, heimdal-clients Description: The AFS distributed filesystem- old password changing @@ -33,7 +33,7 @@ Description: The AFS distributed filesystem- old password changing not install this package for new cells or for cells using Kerberos5. Package: openafs-fileserver -Architecture: i386 powerpc sparc +Architecture: i386 powerpc sparc alpha Depends: ${shlibs:Depends}, debconf, openafs-client (= ${Source-Version}) Recommends: ntp Description: The AFS distributed filesystem- file server @@ -45,7 +45,7 @@ Description: The AFS distributed filesystem- file server installed on any machine that will export files into AFS. Package: openafs-dbserver -Architecture: i386 powerpc sparc +Architecture: i386 powerpc sparc alpha Depends: ${shlibs:Depends}, debconf, openafs-fileserver (= ${Source-Version}), openafs-client (= ${Source-Version}), perl5 Conflicts: openafs-ptutil Replaces: openafs-ptutil @@ -60,7 +60,7 @@ Description: The AFS distributed filesystem- database server protection servers. Package: libopenafs-dev -Architecture: i386 powerpc sparc +Architecture: i386 powerpc sparc alpha Priority: extra Description: The AFS distributed filesystem- development libraries AFS is a distributed filesystem allowing cross-platform sharing of @@ -80,3 +80,4 @@ Description: The AFS distributed filesystem- Module Sources control, authentication, backup and administrative management. . This package provides source to the AFS kernel modules. + diff --git a/debian/kern-sysname b/debian/kern-sysname index fd4dc4daf..855f1a3dc 100644 --- a/debian/kern-sysname +++ b/debian/kern-sysname @@ -9,6 +9,16 @@ i[3456]86) echo i386_linux24 ;; esac +;; +ialpha) + case $KVERS in + 2.2*) + echo alpha_linux_22 + ;; + 2.4*) + echo alpha_linux_24 + ;; + esac ;; sparc) case $KVERS in diff --git a/debian/rules b/debian/rules index 7029a2a56..6e1676bb7 100755 --- a/debian/rules +++ b/debian/rules @@ -37,7 +37,8 @@ configure-stamp: dh_testdir -ln -s @sys/dest dest -ln -s $(SYS_NAME) @sys - sh configure --with-afs-sysname=$(SYS_NAME) + sh regen.sh + sh configure --with-afs-sysname=$(SYS_NAME) --disable-kernel-module install -d $(SYS_NAME)/dest/root.client/usr/vice/etc install -d dest/root.server/usr/afs/bin @@ -59,7 +60,7 @@ clean: dh_testroot rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. - -$(MAKE) -ki clean + -$(MAKE) -ki distclean -rm -rf obj dest $(SYS_NAME) @sys Makefile debian/openafs-client.init -rm -f config.status config.cache @@ -167,7 +168,7 @@ binary-arch: build install dh_md5sums dh_builddeb -binary: binary-arch binary-indep +binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure ############################Module package support @@ -224,7 +225,7 @@ 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) libafs "COMPILE_PART1=cd src; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_PART3=; $(MAKE) test SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_CLEAN=; $(MAKE) clean SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME} + $(MAKE) libafs "COMPILE_PART1=cd src; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=`pwd`/src SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_PART3=; $(MAKE) test SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=`pwd`/src SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_CLEAN=; $(MAKE) clean SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=`pwd`/src SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME} touch build-modules-stamp binary-modules: build-modules diff --git a/debian/sysname b/debian/sysname index edeb7c138..6b13e3b49 100755 --- a/debian/sysname +++ b/debian/sysname @@ -1,5 +1,8 @@ #!/bin/sh case `arch` in + alpha) + echo alpha_linux_22 + ;; i[3456]86) echo i386_linux22 ;; -- 2.39.5