Attachment #70535 for bug #65922




include ./Makefile.conf

AMANDA_AFS_VERSION = amanda-afs version 0.0.4

UTIL = afs_estimate dump_tools volset gtar-wrapper.pl
COMMON = config.h fileseek.o

	@echo "Done!"

install: $(UTIL)
	make DESTDIR=$(DESTDIR) -C volset install
	make DESTDIR=$(DESTDIR) -C dump_tools install
	make DESTDIR=$(DESTDIR) -C afs_estimate install
	install -D -g root -o root gtar-wrapper.pl $(DESTDIR)$(INSTALL_DIR)/gtar-wrapper.pl

volset: $(COMMON)
	make -C volset




#--------------

# Specify the full path to the destination directory for the utilities
INSTALL_DIR = /usr/sbin

#--------------


# OpenAFS will probably have this set to /usr or /usr/local
# AFS_PREFIX = /usr
# IBM AFS will probably have this set to /usr/afsws
AFS_PREFIX = /usr

#--------------


# NOTE: make sure that vos actually is where you say it is
#       otherwise, be prepared for 5k dumps on a 10G partition
#       don't come crying, if you didn't set this correctly!
AFS_VOS = $(AFS_PREFIX)/sbin/vos

#--------------


Lines 2-8 Link Here

(-)amanda-afs.orig/afs_estimate/Makefile (-2 / +2 lines)
2		2
3	AFS_LIBDIR = -L$(AFS_PREFIX)/lib -L$(AFS_PREFIX)/lib/afs#	3	AFS_LIBDIR = -L$(AFS_PREFIX)/lib -L$(AFS_PREFIX)/lib/afs#
4	LIBS = $(AFS_LIBDIR) -lvolser -ldir -laudit $(AFS_PREFIX)/lib/afs/vlib.a -lsys -lvldb \	4	LIBS = $(AFS_LIBDIR) -lvolser -ldir -laudit $(AFS_PREFIX)/lib/afs/vlib.a -lsys -lvldb \
5	-lubik -lauth -lcmd -lrxkad -ldes -lrxstat -lrx -llwp -lacl -lsys \	5	-lubik -lauth -lcmd -lrxkad -ldes -lrxstat -lrx -llwp -lacl -lsys -lresolv \
6	-lcom_err -lkauth -lusd $(AFS_PREFIX)/lib/afs/util.a -liberty #-lefence	6	-lcom_err -lkauth -lusd $(AFS_PREFIX)/lib/afs/util.a -liberty #-lefence
7		7
8		8
Lines 14-20 Link Here
14	all: $(AFS_EST_EXEC)	14	all: $(AFS_EST_EXEC)
15		15
16	install: $(AFS_EST_EXEC)	16	install: $(AFS_EST_EXEC)
17	install -D -g root -o root $(AFS_EST_EXEC) $(INSTALL_DIR)/$(AFS_EST_EXEC)	17	install -D -g root -o root $(AFS_EST_EXEC) $(DESTDIR)$(INSTALL_DIR)/$(AFS_EST_EXEC)
18		18
19	$(AFS_EST_EXEC): $(AFS_EST_OBJS)	19	$(AFS_EST_EXEC): $(AFS_EST_OBJS)
20	$(CC) -o $(AFS_EST_EXEC) $(AFS_EST_CFLAGS) $(AFS_EST_OBJS) $(AFS_EST_LDFLAGS) $(LIBS)	20	$(CC) -o $(AFS_EST_EXEC) $(AFS_EST_CFLAGS) $(AFS_EST_OBJS) $(AFS_EST_LDFLAGS) $(LIBS)

Lines 53-59 Link Here

(-)amanda-afs.orig/afs_estimate/afs_estimate.c (-3 / +3 lines)
53		53
54	#define EIGHT_BYTE_INT long long	54	#define EIGHT_BYTE_INT long long
55		55
56	void DFlushVolume(void) {} ;	56	extern int DFlushVolume(register afsint_32) {} ;
57		57
58	EIGHT_BYTE_INT afs_estimate(char *volname, time_t prev_dump);	58	EIGHT_BYTE_INT afs_estimate(char *volname, time_t prev_dump);
59		59
Lines 243-250 Link Here
243	assert(size != -1);	243	assert(size != -1);
244	nVnodes = (size / vcp->diskSize) - 1;	244	nVnodes = (size / vcp->diskSize) - 1;
245	if (nVnodes > 0) {	245	if (nVnodes > 0) {
246	assert((nVnodes+1)*vcp->diskSize == size)	246	assert((nVnodes+1)*vcp->diskSize == size);
247	assert(STREAM_SEEK(file, vcp->diskSize, 0) == 0)	247	assert(STREAM_SEEK(file, vcp->diskSize, 0) == 0);
248	}	248	}
249	else nVnodes = 0;	249	else nVnodes = 0;
250	for (vnodeIndex = 0;	250	for (vnodeIndex = 0;

Lines 15-22 Link Here

(-)amanda-afs.orig/dump_tools/Makefile (-2 / +2 lines)
15	all: $(EXEC_l) $(EXEC_r)	15	all: $(EXEC_l) $(EXEC_r)
16		16
17	install: $(EXEC_l) $(EXEC_r)	17	install: $(EXEC_l) $(EXEC_r)
18	install -D -g root -o root $(EXEC_l) $(INSTALL_DIR)/$(EXEC_l)	18	install -D -g root -o root $(EXEC_l) $(DESTDIR)$(INSTALL_DIR)/$(EXEC_l)
19	install -D -g root -o root $(EXEC_r) $(INSTALL_DIR)/$(EXEC_r)	19	install -D -g root -o root $(EXEC_r) $(DESTDIR)$(INSTALL_DIR)/$(EXEC_r)
20		20
21	$(EXEC_l): $(SRC_l) ../config.h $(l_COMMON)	21	$(EXEC_l): $(SRC_l) ../config.h $(l_COMMON)
22	$(CC) -o $(EXEC_l) $(l_CFLAGS) $(SRC_l) $(l_COMMON) $(l_LDFLAGS)	22	$(CC) -o $(EXEC_l) $(l_CFLAGS) $(SRC_l) $(l_COMMON) $(l_LDFLAGS)

Lines 1-4 Link Here

(-)amanda-afs.orig/gtar-wrapper.pl.in (-1 / +1 lines)
1	#!/usr/local/bin/perl	1	#!/usr/bin/perl
2		2
3	use Getopt::Long;	3	use Getopt::Long;
4	use Getopt::Std;	4	use Getopt::Std;

Lines 14-20 Link Here

(-)amanda-afs.orig/volset/Makefile (-1 / +1 lines)
14	all: $(VOL_EXEC)	14	all: $(VOL_EXEC)
15		15
16	install: $(VOL_EXEC)	16	install: $(VOL_EXEC)
17	install -D -g root -o root $(VOL_EXEC) $(INSTALL_DIR)/$(VOL_EXEC)	17	install -D -g root -o root $(VOL_EXEC) $(DESTDIR)$(INSTALL_DIR)/$(VOL_EXEC)
18		18
19		19
20	$(VOL_EXEC): ../config.h $(VOL_OBJS) $(VOL_HEADERS)	20	$(VOL_EXEC): ../config.h $(VOL_OBJS) $(VOL_HEADERS)

Lines 198-205 Link Here

(-)amanda-afs.orig/volset/volset-estimate.c (-2 / +2 lines)
198	assert(size != -1);	198	assert(size != -1);
199	nVnodes = (size / vcp->diskSize) - 1;	199	nVnodes = (size / vcp->diskSize) - 1;
200	if (nVnodes > 0) {	200	if (nVnodes > 0) {
201	assert((nVnodes+1)*vcp->diskSize == size)	201	assert((nVnodes+1)*vcp->diskSize == size);
202	assert(STREAM_SEEK(file, vcp->diskSize, 0) == 0)	202	assert(STREAM_SEEK(file, vcp->diskSize, 0) == 0);
203	}	203	}
204	else nVnodes = 0;	204	else nVnodes = 0;
205	for (vnodeIndex = 0;	205	for (vnodeIndex = 0;

Lines 11-17 Link Here

(-)amanda-afs.orig/volset/volset-helper.c (-1 / +1 lines)
11	return checksum;	11	return checksum;
12	}	12	}
13		13
14	void DFlushVolume(void) {};	14	extern int DFlushVolume(register afs32int) {};
15		15
16	/*	16	/*
17	* int osi_audit())	17	* int osi_audit())

Lines 4-10 Link Here

(-)amanda-afs.orig/volset/volset-helper.h (-1 / +1 lines)
4	extern afs_int32 ParseHost(char aname, struct sockaddr_in asockaddr);	4	extern afs_int32 ParseHost(char aname, struct sockaddr_in asockaddr);
5	extern afs_int32 SafeATOI(char *anum);	5	extern afs_int32 SafeATOI(char *anum);
6	extern afs_int32 GetPartitionID(afs_int32 aval, char aname);	6	extern afs_int32 GetPartitionID(afs_int32 aval, char aname);
7	extern void DFlushVolume(void);	7	extern int DFlushVolume(register afs32int);
8	extern int osi_audit();	8	extern int osi_audit();
9	extern ONE_BYTE_INT CheckSum(ONE_BYTE_INT *memory, int length);	9	extern ONE_BYTE_INT CheckSum(ONE_BYTE_INT *memory, int length);
10		10

Lines 244-250 Link Here

(-)amanda-afs.orig/volset/volset.c (-1 / +2 lines)
244		244
245	while(vols)	245	while(vols)
246	{	246	{
247	written += DumpVolume(out, get(&vols), prev_time, vols->next?0:1);	247	Node *curvols = vols;
		248	written += DumpVolume(out, get(&vols), prev_time, curvols->next?0:1);
248	}	249	}
249		250
250	close(out);	251	close(out);

Return to bug 65922

Lines 1-6 Link Here

(-)amanda-afs.orig/Makefile (-5 / +5 lines)
1	include ./Makefile.conf	1	include ./Makefile.conf
2		2
3	AMANDA_AFS_VERSION = amanda-afs version 0.0.3	3	AMANDA_AFS_VERSION = amanda-afs version 0.0.4
4		4
5	UTIL = afs_estimate dump_tools volset gtar-wrapper.pl	5	UTIL = afs_estimate dump_tools volset gtar-wrapper.pl
6	COMMON = config.h fileseek.o	6	COMMON = config.h fileseek.o
Lines 9-18 Link Here
9	@echo "Done!"	9	@echo "Done!"
10		10
11	install: $(UTIL)	11	install: $(UTIL)
12	make -C volset install	12	make DESTDIR=$(DESTDIR) -C volset install
13	make -C dump_tools install	13	make DESTDIR=$(DESTDIR) -C dump_tools install
14	make -C afs_estimate install	14	make DESTDIR=$(DESTDIR) -C afs_estimate install
15	install -D -g root -o root gtar-wrapper.pl $(INSTALL_DIR)/gtar-wrapper.pl	15	install -D -g root -o root gtar-wrapper.pl $(DESTDIR)$(INSTALL_DIR)/gtar-wrapper.pl
16		16
17	volset: $(COMMON)	17	volset: $(COMMON)
18	make -C volset	18	make -C volset

Lines 6-12 Link Here

(-)amanda-afs.orig/Makefile.conf (-3 / +3 lines)
6	#--------------	6	#--------------
7		7
8	# Specify the full path to the destination directory for the utilities	8	# Specify the full path to the destination directory for the utilities
9	INSTALL_DIR = /usr/local/amanda/sbin	9	INSTALL_DIR = /usr/sbin
10		10
11	#--------------	11	#--------------
12		12
Lines 15-21 Link Here
15	# OpenAFS will probably have this set to /usr or /usr/local	15	# OpenAFS will probably have this set to /usr or /usr/local
16	# AFS_PREFIX = /usr	16	# AFS_PREFIX = /usr
17	# IBM AFS will probably have this set to /usr/afsws	17	# IBM AFS will probably have this set to /usr/afsws
18	AFS_PREFIX = /usr/afsws	18	AFS_PREFIX = /usr
19		19
20	#--------------	20	#--------------
21		21
Lines 27-33 Link Here
27	# NOTE: make sure that vos actually is where you say it is	27	# NOTE: make sure that vos actually is where you say it is
28	# otherwise, be prepared for 5k dumps on a 10G partition	28	# otherwise, be prepared for 5k dumps on a 10G partition
29	# don't come crying, if you didn't set this correctly!	29	# don't come crying, if you didn't set this correctly!
30	AFS_VOS = $(AFS_PREFIX)/etc/vos	30	AFS_VOS = $(AFS_PREFIX)/sbin/vos
31		31
32	#--------------	32	#--------------
33		33