cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
* [Cluster-devel] cluster/fence/agents/scsi Makefile
@ 2006-10-13 20:40 cfeist
  0 siblings, 0 replies; 10+ messages in thread
From: cfeist @ 2006-10-13 20:40 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	cfeist at sourceware.org	2006-10-13 20:40:53

Modified files:
	fence/agents/scsi: Makefile 

Log message:
	We don't want to delete the scsi_reserve init script when doing a make clean.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8

--- cluster/fence/agents/scsi/Makefile	2006/10/13 16:24:50	1.7
+++ cluster/fence/agents/scsi/Makefile	2006/10/13 20:40:52	1.8
@@ -39,4 +39,4 @@
 	install -m755 ${SCRIPT} ${initdir}
 
 clean:
-	rm -f $(TARGET) $(SCRIPT)
+	rm -f $(TARGET)



^ permalink raw reply	[flat|nested] 10+ messages in thread
* [Cluster-devel] cluster/fence/agents/scsi Makefile
@ 2007-09-21  1:07 fabbione
  0 siblings, 0 replies; 10+ messages in thread
From: fabbione @ 2007-09-21  1:07 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-09-21 01:07:51

Modified files:
	fence/agents/scsi: Makefile 

Log message:
	Fix uninstall target

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14

--- cluster/fence/agents/scsi/Makefile	2007/08/22 08:58:40	1.13
+++ cluster/fence/agents/scsi/Makefile	2007/09/21 01:07:50	1.14
@@ -46,7 +46,7 @@
 	install -m755 ${SCRIPT} ${DESTDIR}/etc/init.d
 
 uninstall:
-	${UNINSTALL} ${TARGET} ${TEST_TARGET} ${sbindir}
+	${UNINSTALL} ${TARGET} ${TARGET}_test ${sbindir}
 	${UNINSTALL} ${SCRIPT} ${DESTDIR}/etc/init.d
 
 clean:



^ permalink raw reply	[flat|nested] 10+ messages in thread
* [Cluster-devel] cluster/fence/agents/scsi Makefile
@ 2007-03-20 18:14 lhh
  0 siblings, 0 replies; 10+ messages in thread
From: lhh @ 2007-03-20 18:14 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	lhh at sourceware.org	2007-03-20 18:14:30

Modified files:
	fence/agents/scsi: Makefile 

Log message:
	Fix clean target; patch from Fabio M. Di Nitto

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.9&r2=1.9.2.1

--- cluster/fence/agents/scsi/Makefile	2006/11/03 17:31:54	1.9
+++ cluster/fence/agents/scsi/Makefile	2007/03/20 18:14:30	1.9.2.1
@@ -52,4 +52,4 @@
 	install -m755 ${SCRIPT} ${initdir}
 
 clean:
-	rm -f $(TARGET) $($TEST_TARGET)
+	rm -f $(TARGET) $(TEST_TARGET)



^ permalink raw reply	[flat|nested] 10+ messages in thread
* [Cluster-devel] cluster/fence/agents/scsi Makefile
@ 2007-03-20 18:13 lhh
  0 siblings, 0 replies; 10+ messages in thread
From: lhh @ 2007-03-20 18:13 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2007-03-20 18:13:52

Modified files:
	fence/agents/scsi: Makefile 

Log message:
	Fix clean target; patch from Fabio M. Di Nitto

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10

--- cluster/fence/agents/scsi/Makefile	2006/11/03 17:31:54	1.9
+++ cluster/fence/agents/scsi/Makefile	2007/03/20 18:13:52	1.10
@@ -52,4 +52,4 @@
 	install -m755 ${SCRIPT} ${initdir}
 
 clean:
-	rm -f $(TARGET) $($TEST_TARGET)
+	rm -f $(TARGET) $(TEST_TARGET)



^ permalink raw reply	[flat|nested] 10+ messages in thread
* [Cluster-devel] cluster/fence/agents/scsi Makefile
@ 2007-01-10 19:57 cfeist
  0 siblings, 0 replies; 10+ messages in thread
From: cfeist @ 2007-01-10 19:57 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	cfeist at sourceware.org	2007-01-10 19:57:25

Modified files:
	fence/agents/scsi: Makefile 

Log message:
	- Use copytobin target instead of install target to remain compatible with
	other fence agents.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.9.6.1&r2=1.9.6.2

--- cluster/fence/agents/scsi/Makefile	2007/01/09 19:42:38	1.9.6.1
+++ cluster/fence/agents/scsi/Makefile	2007/01/10 19:57:25	1.9.6.2
@@ -40,16 +40,8 @@
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TEST_SOURCE) >> $(TEST_TARGET)
 	chmod +x $(TEST_TARGET)
 
-install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir}; \
-	fi
-	install -m755 ${TARGET} ${sbindir}
-	install -m755 ${TEST_TARGET} ${sbindir}
-	if [ ! -d ${initdir} ]; then \
-		install -d ${initdir}; \
-	fi
-	install -m755 ${SCRIPT} ${initdir}
+copytobin: ${TARGET}
+	cp ${TARGET} ${top_srcdir}/bin/${TARGET}
 
 clean:
 	rm -f $(TARGET) $($TEST_TARGET)



^ permalink raw reply	[flat|nested] 10+ messages in thread
* [Cluster-devel] cluster/fence/agents/scsi Makefile
@ 2007-01-09 19:42 rohara
  0 siblings, 0 replies; 10+ messages in thread
From: rohara @ 2007-01-09 19:42 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	rohara at sourceware.org	2007-01-09 19:42:38

Added files:
	fence/agents/scsi: Makefile 

Log message:
	fence_scsi Makefile.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=NONE&r2=1.9.6.1

/cvs/cluster/cluster/fence/agents/scsi/Makefile,v  -->  standard output
revision 1.9.6.1
--- cluster/fence/agents/scsi/Makefile
+++ -	2007-01-09 19:42:39.118575000 +0000
@@ -0,0 +1,55 @@
+###############################################################################
+###############################################################################
+##
+##  Copyright (C) 2006 Red Hat, Inc.  All rights reserved.
+##  
+##  This copyrighted material is made available to anyone wishing to use,
+##  modify, copy, or redistribute it subject to the terms and conditions
+##  of the GNU General Public License v.2.
+##
+###############################################################################
+###############################################################################
+
+SOURCE= fence_scsi.pl
+TARGET= fence_scsi
+SCRIPT= scsi_reserve
+
+TEST_SOURCE= fence_scsi_test.pl
+TEST_TARGET= fence_scsi_test
+
+top_srcdir=../..
+include ${top_srcdir}/make/defines.mk
+
+all: $(TARGET) $(TEST_TARGET)
+
+fence_scsi: fence_scsi.pl
+	: > $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
+	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
+	chmod +x $(TARGET)
+
+fence_scsi_test: fence_scsi_test.pl
+	: > $(TEST_TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TEST_SOURCE) >> $(TEST_TARGET)
+	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TEST_TARGET)
+	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TEST_TARGET)
+	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TEST_TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TEST_SOURCE) >> $(TEST_TARGET)
+	chmod +x $(TEST_TARGET)
+
+install: all
+	if [ ! -d ${sbindir} ]; then \
+		install -d ${sbindir}; \
+	fi
+	install -m755 ${TARGET} ${sbindir}
+	install -m755 ${TEST_TARGET} ${sbindir}
+	if [ ! -d ${initdir} ]; then \
+		install -d ${initdir}; \
+	fi
+	install -m755 ${SCRIPT} ${initdir}
+
+clean:
+	rm -f $(TARGET) $($TEST_TARGET)



^ permalink raw reply	[flat|nested] 10+ messages in thread
* [Cluster-devel] cluster/fence/agents/scsi Makefile
@ 2006-10-13 16:24 rohara
  0 siblings, 0 replies; 10+ messages in thread
From: rohara @ 2006-10-13 16:24 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rohara at sourceware.org	2006-10-13 16:24:50

Modified files:
	fence/agents/scsi: Makefile 

Log message:
	Remove unnecessary chmod for scsi_reserve.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7

--- cluster/fence/agents/scsi/Makefile	2006/10/12 22:02:48	1.6
+++ cluster/fence/agents/scsi/Makefile	2006/10/13 16:24:50	1.7
@@ -27,7 +27,6 @@
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
 	chmod +x $(TARGET)
-	chmod +x $(SCRIPT)
 
 install: all
 	if [ ! -d ${sbindir} ]; then \



^ permalink raw reply	[flat|nested] 10+ messages in thread
* [Cluster-devel] cluster/fence/agents/scsi Makefile
@ 2006-10-12 22:02 rohara
  0 siblings, 0 replies; 10+ messages in thread
From: rohara @ 2006-10-12 22:02 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rohara at sourceware.org	2006-10-12 22:02:48

Modified files:
	fence/agents/scsi: Makefile 

Log message:
	Add code to create initdir if it doesn't exist.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6

--- cluster/fence/agents/scsi/Makefile	2006/10/12 16:29:34	1.5
+++ cluster/fence/agents/scsi/Makefile	2006/10/12 22:02:48	1.6
@@ -34,6 +34,9 @@
 		install -d ${sbindir}; \
 	fi
 	install -m755 ${TARGET} ${sbindir}
+	if [ ! -d ${initdir} ]; then \
+		install -d ${initdir}; \
+	fi
 	install -m755 ${SCRIPT} ${initdir}
 
 clean:



^ permalink raw reply	[flat|nested] 10+ messages in thread
* [Cluster-devel] cluster/fence/agents/scsi Makefile
@ 2006-10-12 15:57 rohara
  0 siblings, 0 replies; 10+ messages in thread
From: rohara @ 2006-10-12 15:57 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rohara at sourceware.org	2006-10-12 15:57:06

Modified files:
	fence/agents/scsi: Makefile 

Log message:
	Remove scsi_reseve from "all". This will be handled by the agent make target.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4

--- cluster/fence/agents/scsi/Makefile	2006/10/12 15:51:53	1.3
+++ cluster/fence/agents/scsi/Makefile	2006/10/12 15:57:06	1.4
@@ -17,7 +17,7 @@
 top_srcdir=../..
 include ${top_srcdir}/make/defines.mk
 
-all: $(TARGET) $(SCRIPT)
+all: $(TARGET)
 
 fence_scsi: fence_scsi.pl
 	: > $(TARGET)



^ permalink raw reply	[flat|nested] 10+ messages in thread
* [Cluster-devel] cluster/fence/agents/scsi Makefile
@ 2006-10-12 15:51 rohara
  0 siblings, 0 replies; 10+ messages in thread
From: rohara @ 2006-10-12 15:51 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rohara at sourceware.org	2006-10-12 15:51:53

Modified files:
	fence/agents/scsi: Makefile 

Log message:
	Add scsi_reserve init script to Makefile so that it gets installed.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3

--- cluster/fence/agents/scsi/Makefile	2006/08/11 15:18:09	1.2
+++ cluster/fence/agents/scsi/Makefile	2006/10/12 15:51:53	1.3
@@ -12,11 +12,12 @@
 
 SOURCE= fence_scsi.pl
 TARGET= fence_scsi
+SCRIPT= scsi_reserve
 
 top_srcdir=../..
 include ${top_srcdir}/make/defines.mk
 
-all: $(TARGET)
+all: $(TARGET) $(SCRIPT)
 
 fence_scsi: fence_scsi.pl
 	: > $(TARGET)
@@ -26,12 +27,14 @@
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
 	chmod +x $(TARGET)
+	chmod +x $(SCRIPT)
 
 install: all
 	if [ ! -d ${sbindir} ]; then \
 		install -d ${sbindir}; \
 	fi
 	install -m755 ${TARGET} ${sbindir}
+	install -m755 ${SCRIPT} /etc/init.d/
 
 clean:
-	rm -f $(TARGET)
+	rm -f $(TARGET) $(SCRIPT)



^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2007-09-21  1:07 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-13 20:40 [Cluster-devel] cluster/fence/agents/scsi Makefile cfeist
  -- strict thread matches above, loose matches on Subject: below --
2007-09-21  1:07 fabbione
2007-03-20 18:14 lhh
2007-03-20 18:13 lhh
2007-01-10 19:57 cfeist
2007-01-09 19:42 rohara
2006-10-13 16:24 rohara
2006-10-12 22:02 rohara
2006-10-12 15:57 rohara
2006-10-12 15:51 rohara

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).