[SSI] openssi Makefile,1.56.2.24,1.56.2.24.2.1

Roger Tsang <[email protected]> Sun, 15 Aug 2010 03:18:55 +0000
Newsgroups gmane.linux.cluster.ssic.cvs
Message-ID <[email protected]>
Update of /cvsroot/ssic-linux/openssi
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv13027

Modified Files:
      Tag: OPENSSI-CENTOS
	Makefile 
Log Message:
Modifications for CentOS. Lustre is removed.


Index: Makefile
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/Attic/Makefile,v
retrieving revision 1.56.2.24
retrieving revision 1.56.2.24.2.1
diff -u -d -r1.56.2.24 -r1.56.2.24.2.1
--- Makefile	26 Nov 2007 06:42:37 -0000	1.56.2.24
+++ Makefile	15 Aug 2010 03:18:53 -0000	1.56.2.24.2.1
@@ -101,47 +101,43 @@
 
 e2fsprogs.patch:
 	mkdir -p patches
-	${MKCVSPATCH} e2fsprogs E2FSPROGS-1-38_0-FC3-1
-
-lustre.patch:
-	mkdir -p patches
-	${MKCVSPATCH} lustre VANILLA
+	${MKCVSPATCH} e2fsprogs CENTOS
 
 nfs-utils.patch:
 	mkdir -p patches
-	${MKCVSPATCH} nfs-utils FEDORA
+	${MKCVSPATCH} nfs-utils CENTOS
 
 portmap.patch:
 	mkdir -p patches
-	${MKCVSPATCH} portmap FEDORA
+	${MKCVSPATCH} portmap CENTOS
 
 procps.patch:
 	mkdir -p patches
-	${MKCVSPATCH} procps FEDORA
+	${MKCVSPATCH} procps CENTOS
 
 util-linux.patch:
 	mkdir -p patches
-	${MKCVSPATCH} util-linux FEDORA
+	${MKCVSPATCH} util-linux CENTOS
 
 strace.patch:
 	mkdir -p patches
-	${MKCVSPATCH} strace FEDORA
+	${MKCVSPATCH} strace CENTOS
 
 sysvinit.patch:
 	mkdir -p patches
-	${MKCVSPATCH} sysvinit FEDORA
+	${MKCVSPATCH} sysvinit CENTOS
 
 logrotate.patch:
 	mkdir -p patches
-	${MKCVSPATCH} logrotate FEDORA
+	${MKCVSPATCH} logrotate CENTOS
 
 pam.patch:
 	mkdir -p patches
-	${MKCVSPATCH} pam FEDORA
+	${MKCVSPATCH} pam CENTOS
 
 sudo.patch:
 	mkdir -p patches
-	${MKCVSPATCH} sudo FEDORA
+	${MKCVSPATCH} sudo CENTOS
 
 system-config-network.patch:
 	mkdir -p patches
@@ -149,7 +145,7 @@
 
 psmisc.patch:
 	mkdir -p patches
-	${MKCVSPATCH} psmisc FEDORA
+	${MKCVSPATCH} psmisc CENTOS
 
 am-utils.patch:
 	mkdir -p patches
@@ -157,23 +153,23 @@
 
 chkconfig.patch:
 	mkdir -p patches
-	${MKCVSPATCH} chkconfig FEDORA
+	${MKCVSPATCH} chkconfig CENTOS
 
 initscripts.patch:
 	mkdir -p patches
-	${MKCVSPATCH} initscripts FEDORA
+	${MKCVSPATCH} initscripts CENTOS
 
 mkinitrd.patch:
 	mkdir -p patches
-	${MKCVSPATCH} mkinitrd FEDORA
+	${MKCVSPATCH} mkinitrd CENTOS
 
 udev.patch:
 	mkdir -p patches
-	${MKCVSPATCH} udev FEDORA
+	${MKCVSPATCH} udev CENTOS
 
 # XXX: this REDHAT stuff does not work well for the trunk
 utilpatch:	\
-	e2fsprogs.patch lustre.patch nfs-utils.patch \
+	e2fsprogs.patch nfs-utils.patch \
 	portmap.patch procps.patch util-linux.patch strace.patch \
 	sysvinit.patch logrotate.patch pam.patch sudo.patch \
 	system-config-network.patch psmisc.patch \
@@ -183,19 +179,19 @@
 	find -name '*.base' -prune -exec rm -rf {} \;
 
 docs:
-	cd docs/fedora/lyx; \
+	cd docs/redhat/lyx; \
 	for f in *.lyx; do \
 		lyx -e text $$f; \
 		lyx -e html $$f; \
 		lyx -e pdf $$f;	\
 	done
-	mv docs/fedora/lyx/INSTALL.txt INSTALL
-	-[ -f docs/fedora/lyx/INSTALL.src.txt ] && \
-		mv docs/fedora/lyx/INSTALL.src.txt docs/fedora/INSTALL.source
-	mkdir -p docs/fedora/html
-	mv docs/fedora/lyx/*.html docs/fedora/html/
-	mkdir -p docs/fedora/pdf
-	mv docs/fedora/lyx/*.pdf docs/fedora/pdf/
+	mv docs/redhat/lyx/INSTALL.txt INSTALL
+	-[ -f docs/redhat/lyx/INSTALL.src.txt ] && \
+		mv docs/redhat/lyx/INSTALL.src.txt docs/redhat/INSTALL.source
+	mkdir -p docs/redhat/html
+	mv docs/redhat/lyx/*.html docs/redhat/html/
+	mkdir -p docs/redhat/pdf
+	mv docs/redhat/lyx/*.pdf docs/redhat/pdf/
 
 configure:
 	libtoolize  --force
@@ -241,10 +237,6 @@
 	rm -f mkinstalldirs
 	rm -f Makefile.in
 
-	-make -C lustre distclean
-	find lustre/portals/include -name Makefile.in -exec rm -f {} \;
-	rm -rf lustre/autom4te.cache
-
 	find docs ipvsadm openssi-tools -name Makefile.in \
 		-exec rm -f {} \;
 
@@ -274,7 +266,7 @@
 		echo Please remove ${OTINC}; exit 1; fi
 
 	@cp -al . ../${OTDIR}
-	@cd ../${OTDIR}; rm -rf e2fsprogs util-linux lustre nfs-utils \
+	@cd ../${OTDIR}; rm -rf e2fsprogs util-linux nfs-utils \
 		sysvinit kernel kernel.patches patches portmap procps \
 		strace logrotate pam sudo system-config-network psmisc; \
 		find -name 'CVS' -prune -exec rm -rf {} \;; \
@@ -312,7 +304,6 @@
 
 portmap.rpm:	portmap.patch
 	@${MKRPM} '' specs/portmap.spec \
-		portmap.more/portmap.init \
 		patches/portmap-ssi.patch
 
 procps.rpm:	procps.patch
@@ -385,11 +376,6 @@
 		exit 1; \
 	fi
 
-lustre.rpm:	kerntest lustre.patch
-	@cd lustre; ./configure --with-linux=${KPATH}
-	@${MKRPM} '' lustre/scripts/lustre.spec \
-		patches/lustre-ssi.patch
-
 utilrpms:	openssi-tools.rpm e2fsprogs.rpm nfs-utils.rpm util-linux.rpm sysvinit.rpm chkconfig.rpm initscripts.rpm mkinitrd.rpm portmap.rpm procps.rpm strace.rpm logrotate.rpm pam.rpm sudo.rpm system-config-network.rpm psmisc.rpm udev.rpm
 rpms:	utilrpms kernel.rpm
 binrel:	docs rpms


------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev