CVS Update: (clem) rocks/src/roll/service-pack/src

1 view
Skip to first unread message

c...@rocks-127.sdsc.edu

unread,
Jan 31, 2013, 7:45:57 PM1/31/13
to rocks-clusters-de...@googlegroups.com, anoop.r...@gmail.com, greg....@gmail.com, mason...@gmail.com, philip.pa...@gmail.com, luca.c...@gmail.com
clem 13/01/31 16:45:57

Modified: src/roll/service-pack/src Makefile
Log:
First take at a Makefile which compile rpm directly from other rolls

Revision Changes Path
1.17 +25 -10 rocks/src/roll/service-pack/src/Makefile

Index: Makefile
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/src/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -t -w -r1.16 -r1.17
--- Makefile 27 Nov 2012 00:49:12 -0000 1.16
+++ Makefile 1 Feb 2013 00:45:57 -0000 1.17
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.16 2012/11/27 00:49:12 phil Exp $
+# $Id: Makefile,v 1.17 2013/02/01 00:45:57 clem Exp $
#
# @Copyright@
#
@@ -55,6 +55,9 @@
# @Copyright@
#
# $Log: Makefile,v $
+# Revision 1.17 2013/02/01 00:45:57 clem
+# First take at a Makefile which compile rpm directly from other rolls
+#
# Revision 1.16 2012/11/27 00:49:12 phil
# Copyright Storm for Emerald Boa
#
@@ -105,18 +108,30 @@
#
#

-#
-# make sure kernel-rocks-boot is built last
-#
-SRCDIRS = `find . -type d -maxdepth 1 \
- -not -name CVS \
- -not -name kernel-rocks-boot \
- -not -name .` kernel-rocks-boot
+INCLUDEPACKAGE = base/src/command/ base/src/devel base/src/developersguide base/src/foundation-git base/src/foundation-mysql base/src/foundation-python-extras base/src/usersguide ganglia/src/rocks-command ganglia/src/usersguide kvm/src/rocks-command kvm/src/usersguide perl/src/cpan perl/src/cpan-support
+
+
+PROFILE = condor-profile base-profile ganglia-profile
+
+BASEPATH = ../../


default: rpm

copyright rpm clean::
- for i in $(SRCDIRS) ; do \
- (cd $$i; make $@) ; \
+ # sed s/$$(ROLL)/*/ is to remove the $$(ROLL) from the documentation
+ # rpm name
+ for i in $(INCLUDEPACKAGE) ; do \
+ echo Recreating roll $$i in $(BASEPATH)$$i; \
+ cd $(BASEPATH)$$i; \
+ echo $(MAKE) $@ || exit 2 ; \
+ PkgName=`grep ^NAME version.mk | awk '{print $$3}'|sed 's/$$(ROLL)/*/'`; \
+ if [ "$$PkgName" ] ; then \
+ echo cp ../../RPMS/*/$$PkgName*rpm ../../../service-pack/RPMS/ || exit 2; \
+ fi; \
+ cd -; \
done
+ #special case for the opt-perl packages
+
+
+




c...@rocks-127.sdsc.edu

unread,
Jan 31, 2013, 8:44:45 PM1/31/13
to rocks-clusters-de...@googlegroups.com, anoop.r...@gmail.com, greg....@gmail.com, mason...@gmail.com, philip.pa...@gmail.com, luca.c...@gmail.com
clem 13/01/31 17:44:45

Modified: src/roll/service-pack/src Makefile
Log:
Now this Makefile really does some compilation

before it was just a test script

Revision Changes Path
1.18 +8 -5 rocks/src/roll/service-pack/src/Makefile

Index: Makefile
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/src/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -t -w -r1.17 -r1.18
--- Makefile 1 Feb 2013 00:45:57 -0000 1.17
+++ Makefile 1 Feb 2013 01:44:45 -0000 1.18
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.17 2013/02/01 00:45:57 clem Exp $
+# $Id: Makefile,v 1.18 2013/02/01 01:44:45 clem Exp $
#
# @Copyright@
#
@@ -55,6 +55,11 @@
# @Copyright@
#
# $Log: Makefile,v $
+# Revision 1.18 2013/02/01 01:44:45 clem
+# Now this Makefile really does some compilation
+#
+# before it was just a test script
+#
# Revision 1.17 2013/02/01 00:45:57 clem
# First take at a Makefile which compile rpm directly from other rolls
#
@@ -122,16 +127,16 @@
# sed s/$$(ROLL)/*/ is to remove the $$(ROLL) from the documentation
# rpm name
for i in $(INCLUDEPACKAGE) ; do \
- echo Recreating roll $$i in $(BASEPATH)$$i; \
cd $(BASEPATH)$$i; \
- echo $(MAKE) $@ || exit 2 ; \
+ $(MAKE) $@ || exit 2 ; \
PkgName=`grep ^NAME version.mk | awk '{print $$3}'|sed 's/$$(ROLL)/*/'`; \
if [ "$$PkgName" ] ; then \
- echo cp ../../RPMS/*/$$PkgName*rpm ../../../service-pack/RPMS/ || exit 2; \
+ cp ../../RPMS/*/$$PkgName*rpm ../../../service-pack/RPMS/$(ARCH) || exit 2; \
fi; \
cd -; \
done
- #special case for the opt-perl packages
+ #special case for the perl cpan-support packages
+ cp ../../perl/RPMS/*/opt-perl-*.rpm ../../RPMS/$(ARCH) || exit 2;







c...@rocks-127.sdsc.edu

unread,
Jan 31, 2013, 9:10:40 PM1/31/13
to rocks-clusters-de...@googlegroups.com, anoop.r...@gmail.com, greg....@gmail.com, mason...@gmail.com, philip.pa...@gmail.com, luca.c...@gmail.com
clem 13/01/31 18:10:40

Modified: src/roll/service-pack/src Makefile
Log:
now with the kickstart rpms

Revision Changes Path
1.19 +19 -4 rocks/src/roll/service-pack/src/Makefile

Index: Makefile
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/src/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -t -w -r1.18 -r1.19
--- Makefile 1 Feb 2013 01:44:45 -0000 1.18
+++ Makefile 1 Feb 2013 02:10:40 -0000 1.19
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.18 2013/02/01 01:44:45 clem Exp $
+# $Id: Makefile,v 1.19 2013/02/01 02:10:40 clem Exp $
#
# @Copyright@
#
@@ -55,6 +55,9 @@
# @Copyright@
#
# $Log: Makefile,v $
+# Revision 1.19 2013/02/01 02:10:40 clem
+# now with the kickstart rpms
+#
# Revision 1.18 2013/02/01 01:44:45 clem
# Now this Makefile really does some compilation
#
@@ -113,10 +116,10 @@
#
#

-INCLUDEPACKAGE = base/src/command/ base/src/devel base/src/developersguide base/src/foundation-git base/src/foundation-mysql base/src/foundation-python-extras base/src/usersguide ganglia/src/rocks-command ganglia/src/usersguide kvm/src/rocks-command kvm/src/usersguide perl/src/cpan perl/src/cpan-support
-
+INCLUDEPACKAGE = base/src/command/ base/src/devel base/src/developersguide base/src/foundation-git base/src/foundation-mysql base/src/foundation-python-extras base/src/usersguide ganglia/src/rocks-command ganglia/src/usersguide kvm/src/rocks-command kvm/src/usersguide
+#TODO update perl module perl/src/cpan perl/src/cpan-support

-PROFILE = condor-profile base-profile ganglia-profile
+PROFILE = condor base ganglia

BASEPATH = ../../

@@ -124,6 +127,16 @@
default: rpm

copyright rpm clean::
+ mkdir -p ../RPMS/noarch;
+ mkdir -p ../RPMS/$(ARCH);
+ # first we build the kickstart rpms
+ for i in $(PROFILE); do \
+ cd ../../$$i; \
+ make preroll || exit 2; \
+ make profile || exit 2; \
+ cp RPMS/noarch/roll-$$i-kickstart*rpm ../service-pack/RPMS/noarch/ || exit 2; \
+ cd -;\
+ done

c...@rocks-127.sdsc.edu

unread,
Feb 1, 2013, 9:49:47 PM2/1/13
to rocks-clusters-de...@googlegroups.com, anoop.r...@gmail.com, greg....@gmail.com, mason...@gmail.com, philip.pa...@gmail.com, luca.c...@gmail.com
clem 13/02/01 18:49:47

Modified: src/roll/service-pack/src Makefile
Log:
now it properly build the rpms

Im still missing the perl cpan

Revision Changes Path
1.20 +7 -19 rocks/src/roll/service-pack/src/Makefile

Index: Makefile
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/src/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -t -w -r1.19 -r1.20
--- Makefile 1 Feb 2013 02:10:40 -0000 1.19
+++ Makefile 2 Feb 2013 02:49:47 -0000 1.20
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.19 2013/02/01 02:10:40 clem Exp $
+# $Id: Makefile,v 1.20 2013/02/02 02:49:47 clem Exp $
#
# @Copyright@
#
@@ -55,6 +55,11 @@
# @Copyright@
#
# $Log: Makefile,v $
+# Revision 1.20 2013/02/02 02:49:47 clem
+# now it properly build the rpms
+#
+# Im still missing the perl cpan
+#
# Revision 1.19 2013/02/01 02:10:40 clem
# now with the kickstart rpms
#
@@ -119,37 +124,22 @@
INCLUDEPACKAGE = base/src/command/ base/src/devel base/src/developersguide base/src/foundation-git base/src/foundation-mysql base/src/foundation-python-extras base/src/usersguide ganglia/src/rocks-command ganglia/src/usersguide kvm/src/rocks-command kvm/src/usersguide
#TODO update perl module perl/src/cpan perl/src/cpan-support

-PROFILE = condor base ganglia
-
BASEPATH = ../../

-
default: rpm

copyright rpm clean::
- mkdir -p ../RPMS/noarch;
- mkdir -p ../RPMS/$(ARCH);
- # first we build the kickstart rpms
- for i in $(PROFILE); do \
- cd ../../$$i; \
- make preroll || exit 2; \
- make profile || exit 2; \
- cp RPMS/noarch/roll-$$i-kickstart*rpm ../service-pack/RPMS/noarch/ || exit 2; \
- cd -;\
- done
- # sed s/$$(ROLL)/*/ is to remove the $$(ROLL) from the documentation
- # rpm name
for i in $(INCLUDEPACKAGE) ; do \
cd $(BASEPATH)$$i; \
$(MAKE) $@ || exit 2 ; \
PkgName=`grep ^NAME version.mk | awk '{print $$3}'|sed 's/$$(ROLL)/*/'`; \
if [ "$$PkgName" ] ; then \
- cp ../../RPMS/*/$$PkgName*rpm ../../../service-pack/RPMS/$(ARCH) || exit 2; \
+ cp $(BASEPATH)RPMS/*/$$PkgName*rpm ../../../service-pack/RPMS/$(ARCH) || exit 2; \
fi; \
cd -; \
done
#special case for the perl cpan-support packages
- cp ../../perl/RPMS/*/opt-perl-*.rpm ../../RPMS/$(ARCH) || exit 2;
+ #cp $(BASEPATH)/perl/RPMS/*/opt-perl-*.rpm $(BASEPATH)/RPMS/$(ARCH) || exit 2;







c...@rocks-127.sdsc.edu

unread,
Feb 5, 2013, 12:27:27 PM2/5/13
to rocks-clusters-de...@googlegroups.com, anoop.r...@gmail.com, greg....@gmail.com, mason...@gmail.com, philip.pa...@gmail.com, luca.c...@gmail.com
clem 13/02/05 09:27:27

Modified: src/roll/service-pack/src Makefile
Log:
added the bio/perl stuff to the service-pack

some minor reformatting

Revision Changes Path
1.21 +14 -5 rocks/src/roll/service-pack/src/Makefile

Index: Makefile
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/src/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -t -w -r1.20 -r1.21
--- Makefile 2 Feb 2013 02:49:47 -0000 1.20
+++ Makefile 5 Feb 2013 17:27:27 -0000 1.21
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.20 2013/02/02 02:49:47 clem Exp $
+# $Id: Makefile,v 1.21 2013/02/05 17:27:27 clem Exp $
#
# @Copyright@
#
@@ -55,6 +55,11 @@
# @Copyright@
#
# $Log: Makefile,v $
+# Revision 1.21 2013/02/05 17:27:27 clem
+# added the bio/perl stuff to the service-pack
+#
+# some minor reformatting
+#
# Revision 1.20 2013/02/02 02:49:47 clem
# now it properly build the rpms
#
@@ -121,8 +126,11 @@
#
#

-INCLUDEPACKAGE = base/src/command/ base/src/devel base/src/developersguide base/src/foundation-git base/src/foundation-mysql base/src/foundation-python-extras base/src/usersguide ganglia/src/rocks-command ganglia/src/usersguide kvm/src/rocks-command kvm/src/usersguide
-#TODO update perl module perl/src/cpan perl/src/cpan-support
+INCLUDEPACKAGE = base/src/command/ base/src/devel base/src/developersguide base/src/foundation-git \
+ base/src/foundation-mysql base/src/foundation-python-extras base/src/usersguide \
+ ganglia/src/rocks-command ganglia/src/usersguide \
+ kvm/src/rocks-command kvm/src/usersguide perl/src/cpan perl/src/cpan-support \
+ bio/src/bioperl-support bio/src/bioperl-ext bio/src/bioperl

BASEPATH = ../../

@@ -138,8 +146,9 @@
fi; \
cd -; \
done
- #special case for the perl cpan-support packages
- #cp $(BASEPATH)/perl/RPMS/*/opt-perl-*.rpm $(BASEPATH)/RPMS/$(ARCH) || exit 2;
+ special case for the perl cpan-support packages
+ cp $(BASEPATH)/perl/RPMS/*/opt-perl-*.rpm $(BASEPATH)/RPMS/$(ARCH) || exit 2;
+ cp $(BASEPATH)/bio/RPMS/*/opt-perl-*.rpm $(BASEPATH)/RPMS/$(ARCH) || exit 2;







c...@rocks-127.sdsc.edu

unread,
Feb 5, 2013, 1:41:32 PM2/5/13
to rocks-clusters-de...@googlegroups.com, anoop.r...@gmail.com, greg....@gmail.com, mason...@gmail.com, philip.pa...@gmail.com, luca.c...@gmail.com
clem 13/02/05 10:41:32

Modified: src/roll/service-pack/src Makefile
Log:
Deleted a # by mistake

Revision Changes Path
1.22 +7 -2 rocks/src/roll/service-pack/src/Makefile

Index: Makefile
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/src/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -t -w -r1.21 -r1.22
--- Makefile 5 Feb 2013 17:27:27 -0000 1.21
+++ Makefile 5 Feb 2013 18:41:32 -0000 1.22
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.21 2013/02/05 17:27:27 clem Exp $
+# $Id: Makefile,v 1.22 2013/02/05 18:41:32 clem Exp $
#
# @Copyright@
#
@@ -55,6 +55,9 @@
# @Copyright@
#
# $Log: Makefile,v $
+# Revision 1.22 2013/02/05 18:41:32 clem
+# Deleted a # by mistake
+#
# Revision 1.21 2013/02/05 17:27:27 clem
# added the bio/perl stuff to the service-pack
#
@@ -146,7 +149,7 @@
fi; \
cd -; \
done
- special case for the perl cpan-support packages
+ #special case for the perl cpan-support packages
cp $(BASEPATH)/perl/RPMS/*/opt-perl-*.rpm $(BASEPATH)/RPMS/$(ARCH) || exit 2;
Reply all
Reply to author
Forward
0 new messages