CVS Update: (clem) rocks/src/roll/service-pack
8 views
Skip to first unread message
c...@rocks-127.sdsc.edu
Jan 31, 2013, 7:46:53 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:46:53
Modified: src/roll/service-pack sp-version.mk
Log:
Clean up some of node.xml old code
Revision Changes Path
1.2 +1 -1 rocks/src/roll/service-pack/sp-version.mk
Index: sp-version.mk
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/sp-version.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- sp-version.mk 14 Dec 2010 19:33:24 -0000 1.1
+++ sp-version.mk 1 Feb 2013 00:46:53 -0000 1.2
@@ -1 +1 @@
-SP_VERSION = 5.4.2
+SP_VERSION = 6.1
Modified: src/roll/service-pack sp-version.mk
Log:
Clean up some of node.xml old code
Revision Changes Path
1.2 +1 -1 rocks/src/roll/service-pack/sp-version.mk
Index: sp-version.mk
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/sp-version.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- sp-version.mk 14 Dec 2010 19:33:24 -0000 1.1
+++ sp-version.mk 1 Feb 2013 00:46:53 -0000 1.2
@@ -1 +1 @@
-SP_VERSION = 5.4.2
+SP_VERSION = 6.1
c...@rocks-127.sdsc.edu
Feb 1, 2013, 12:52:27 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 09:52:27
Added: src/roll/service-pack bootstrap.sh
Log:
we need to bootstrap the service-package
It simply call bootstrap on the roll included in the serivce pack
Revision Changes Path
1.1 rocks/src/roll/service-pack/bootstrap.sh
Index: bootstrap.sh
===================================================================
#!/bin/bash -x
#
# $Id: bootstrap.sh,v 1.1 2013/02/01 17:52:27 clem Exp $
#
# @Copyright@
#
# Rocks(r)
# www.rocksclusters.org
# version 5.6 (Emerald Boa)
# version 6.1 (Emerald Boa)
#
# Copyright (c) 2000 - 2013 The Regents of the University of California.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright
# notice unmodified and in its entirety, this list of conditions and the
# following disclaimer in the documentation and/or other materials provided
# with the distribution.
#
# 3. All advertising and press materials, printed or electronic, mentioning
# features or use of this software must display the following acknowledgement:
#
# "This product includes software developed by the Rocks(r)
# Cluster Group at the San Diego Supercomputer Center at the
# University of California, San Diego and its contributors."
#
# 4. Except as permitted for the purposes of acknowledgment in paragraph 3,
# neither the name or logo of this software nor the names of its
# authors may be used to endorse or promote products derived from this
# software without specific prior written permission. The name of the
# software includes the following terms, and any derivatives thereof:
# "Rocks", "Rocks Clusters", and "Avalanche Installer". For licensing of
# the associated name, interested parties should contact Technology
# Transfer & Intellectual Property Services, University of California,
# San Diego, 9500 Gilman Drive, Mail Code 0910, La Jolla, CA 92093-0910,
# Ph: (858) 534-5815, FAX: (858) 534-7345, E-MAIL:inv...@ucsd.edu
#
# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS''
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# @Copyright@
#
#
# we need to boostrap every roll we want to compile an rpm from
#
ROLLS="base ganglia kvm"
for roll in $ROLLS; do
cd ../$roll;
if [ -f bootstrap.sh ]; then
echo -------------- bootstrapping roll $roll --------------;
bash bootstrap.sh || exit 2;
fi;
cd -;
done
Added: src/roll/service-pack bootstrap.sh
Log:
we need to bootstrap the service-package
It simply call bootstrap on the roll included in the serivce pack
Revision Changes Path
1.1 rocks/src/roll/service-pack/bootstrap.sh
Index: bootstrap.sh
===================================================================
#!/bin/bash -x
#
# $Id: bootstrap.sh,v 1.1 2013/02/01 17:52:27 clem Exp $
#
# @Copyright@
#
# Rocks(r)
# www.rocksclusters.org
# version 5.6 (Emerald Boa)
# version 6.1 (Emerald Boa)
#
# Copyright (c) 2000 - 2013 The Regents of the University of California.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright
# notice unmodified and in its entirety, this list of conditions and the
# following disclaimer in the documentation and/or other materials provided
# with the distribution.
#
# 3. All advertising and press materials, printed or electronic, mentioning
# features or use of this software must display the following acknowledgement:
#
# "This product includes software developed by the Rocks(r)
# Cluster Group at the San Diego Supercomputer Center at the
# University of California, San Diego and its contributors."
#
# 4. Except as permitted for the purposes of acknowledgment in paragraph 3,
# neither the name or logo of this software nor the names of its
# authors may be used to endorse or promote products derived from this
# software without specific prior written permission. The name of the
# software includes the following terms, and any derivatives thereof:
# "Rocks", "Rocks Clusters", and "Avalanche Installer". For licensing of
# the associated name, interested parties should contact Technology
# Transfer & Intellectual Property Services, University of California,
# San Diego, 9500 Gilman Drive, Mail Code 0910, La Jolla, CA 92093-0910,
# Ph: (858) 534-5815, FAX: (858) 534-7345, E-MAIL:inv...@ucsd.edu
#
# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS''
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# @Copyright@
#
#
# we need to boostrap every roll we want to compile an rpm from
#
ROLLS="base ganglia kvm"
for roll in $ROLLS; do
cd ../$roll;
if [ -f bootstrap.sh ]; then
echo -------------- bootstrapping roll $roll --------------;
bash bootstrap.sh || exit 2;
fi;
cd -;
done
c...@rocks-127.sdsc.edu
Feb 2, 2013, 2:22:18 AM2/2/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 23:22:18
Modified: src/roll/service-pack Makefile
Added: src/roll/service-pack buildprofile.sh
Log:
now it properly compiles all the required packages
Revision Changes Path
1.14 +12 -2 rocks/src/roll/service-pack/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -t -w -r1.13 -r1.14
--- Makefile 27 Nov 2012 00:49:12 -0000 1.13
+++ Makefile 2 Feb 2013 07:22:18 -0000 1.14
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.13 2012/11/27 00:49:12 phil Exp $
+# $Id: Makefile,v 1.14 2013/02/02 07:22:18 clem Exp $
#
# @Copyright@
#
@@ -56,6 +56,9 @@
# @Copyright@
#
# $Log: Makefile,v $
+# Revision 1.14 2013/02/02 07:22:18 clem
+# now it properly compiles all the required packages
+#
# Revision 1.13 2012/11/27 00:49:12 phil
# Copyright Storm for Emerald Boa
#
@@ -98,10 +101,17 @@
#
#
+PROFILES = condor base ganglia
+
+roll::
+ for i in $(PROFILES); do\
+ bash buildprofile.sh $$i||exit2;\
+ done
+
-include $(ROLLSROOT)/etc/Rolls.mk
include Rolls.mk
-default: roll
+
clean::
rm -f _arch
1.1 rocks/src/roll/service-pack/buildprofile.sh
Index: buildprofile.sh
===================================================================
# $Id: buildprofile.sh,v 1.1 2013/02/02 07:22:18 clem Exp $
#ResetVariable = __PYTHON_MK="" __ROCKS_VERSION_COMMON_MK="" __RELEASE_MK="" __RULES_MK="" __ROLLS_MK="" __RULES_LINUX_CENTOS_MK="" __RULES_LINUX_MK="" __RULES_MK=""
mkdir -p ../RPMS/noarch;
mkdir -p ../RPMS/$ARCH;
# first we build the kickstart rpms
if [ ! "$1" ]; then
exit 2;
fi
profile=$1
export ROLLNAME="" VERSION="" RELEASE="" COLOR=""
cd ../$profile;
make preroll profile || exit 2;
cp RPMS/noarch/roll-$profile-kickstart*rpm ../service-pack/RPMS/noarch/ || exit 2;
cd -
Modified: src/roll/service-pack Makefile
Added: src/roll/service-pack buildprofile.sh
Log:
now it properly compiles all the required packages
Revision Changes Path
1.14 +12 -2 rocks/src/roll/service-pack/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -t -w -r1.13 -r1.14
--- Makefile 27 Nov 2012 00:49:12 -0000 1.13
+++ Makefile 2 Feb 2013 07:22:18 -0000 1.14
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.13 2012/11/27 00:49:12 phil Exp $
+# $Id: Makefile,v 1.14 2013/02/02 07:22:18 clem Exp $
#
# @Copyright@
#
@@ -56,6 +56,9 @@
# @Copyright@
#
# $Log: Makefile,v $
+# Revision 1.14 2013/02/02 07:22:18 clem
+# now it properly compiles all the required packages
+#
# Revision 1.13 2012/11/27 00:49:12 phil
# Copyright Storm for Emerald Boa
#
@@ -98,10 +101,17 @@
#
#
+PROFILES = condor base ganglia
+
+roll::
+ for i in $(PROFILES); do\
+ bash buildprofile.sh $$i||exit2;\
+ done
+
-include $(ROLLSROOT)/etc/Rolls.mk
include Rolls.mk
-default: roll
+
clean::
rm -f _arch
1.1 rocks/src/roll/service-pack/buildprofile.sh
Index: buildprofile.sh
===================================================================
# $Id: buildprofile.sh,v 1.1 2013/02/02 07:22:18 clem Exp $
mkdir -p ../RPMS/noarch;
mkdir -p ../RPMS/$ARCH;
# first we build the kickstart rpms
if [ ! "$1" ]; then
exit 2;
fi
profile=$1
export ROLLNAME="" VERSION="" RELEASE="" COLOR=""
cd ../$profile;
make preroll profile || exit 2;
cp RPMS/noarch/roll-$profile-kickstart*rpm ../service-pack/RPMS/noarch/ || exit 2;
cd -
c...@rocks-127.sdsc.edu
Feb 5, 2013, 12:24:51 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:24:51
Modified: src/roll/service-pack bootstrap.sh
Log:
some more debugging output - added bio roll to the bootstrap
Revision Changes Path
1.2 +3 -3 rocks/src/roll/service-pack/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/bootstrap.sh,v
--- bootstrap.sh 1 Feb 2013 17:52:27 -0000 1.1
+++ bootstrap.sh 5 Feb 2013 17:24:51 -0000 1.2
@@ -1,6 +1,6 @@
#!/bin/bash -x
#
-# $Id: bootstrap.sh,v 1.1 2013/02/01 17:52:27 clem Exp $
+# $Id: bootstrap.sh,v 1.2 2013/02/05 17:24:51 clem Exp $
#
# @Copyright@
#
@@ -60,13 +60,13 @@
+ROLLS="base ganglia kvm perl bio"
for roll in $ROLLS; do
cd ../$roll;
if [ -f bootstrap.sh ]; then
echo -------------- bootstrapping roll $roll --------------;
- bash bootstrap.sh || exit 2;
+ bash bootstrap.sh || (echo Roll $roll failed bootstrapping; exit 2);
fi;
cd -;
done
Modified: src/roll/service-pack bootstrap.sh
Log:
some more debugging output - added bio roll to the bootstrap
Revision Changes Path
1.2 +3 -3 rocks/src/roll/service-pack/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/bootstrap.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
retrieving revision 1.2
--- bootstrap.sh 1 Feb 2013 17:52:27 -0000 1.1
+++ bootstrap.sh 5 Feb 2013 17:24:51 -0000 1.2
@@ -1,6 +1,6 @@
#!/bin/bash -x
#
-# $Id: bootstrap.sh,v 1.1 2013/02/01 17:52:27 clem Exp $
+# $Id: bootstrap.sh,v 1.2 2013/02/05 17:24:51 clem Exp $
#
# @Copyright@
#
@@ -60,13 +60,13 @@
# we need to boostrap every roll we want to compile an rpm from
#
-ROLLS="base ganglia kvm"
#
+ROLLS="base ganglia kvm perl bio"
for roll in $ROLLS; do
cd ../$roll;
if [ -f bootstrap.sh ]; then
echo -------------- bootstrapping roll $roll --------------;
+ bash bootstrap.sh || (echo Roll $roll failed bootstrapping; exit 2);
fi;
cd -;
done
c...@rocks-127.sdsc.edu
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 Makefile
Log:
added the bio/perl stuff to the service-pack
some minor reformatting
Revision Changes Path
1.15 +5 -1 rocks/src/roll/service-pack/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -t -w -r1.14 -r1.15
--- Makefile 2 Feb 2013 07:22:18 -0000 1.14
+++ Makefile 5 Feb 2013 17:27:27 -0000 1.15
+# $Id: Makefile,v 1.15 2013/02/05 17:27:27 clem Exp $
#
# @Copyright@
#
@@ -56,6 +56,11 @@
+# added the bio/perl stuff to the service-pack
+#
+# some minor reformatting
+#
#
@@ -104,6 +109,7 @@
PROFILES = condor base ganglia
roll::
+ mkdir -p RPMS/noarch;
done
Modified: src/roll/service-pack Makefile
Log:
added the bio/perl stuff to the service-pack
some minor reformatting
Revision Changes Path
1.15 +5 -1 rocks/src/roll/service-pack/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/Makefile,v
retrieving revision 1.15
diff -u -b -t -w -r1.14 -r1.15
--- Makefile 2 Feb 2013 07:22:18 -0000 1.14
+++ Makefile 5 Feb 2013 17:27:27 -0000 1.15
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.14 2013/02/02 07:22:18 clem Exp $
#
+# $Id: Makefile,v 1.15 2013/02/05 17:27:27 clem Exp $
#
# @Copyright@
#
@@ -56,6 +56,11 @@
# @Copyright@
#
# $Log: Makefile,v $
+# Revision 1.15 2013/02/05 17:27:27 clem
#
# $Log: Makefile,v $
+# added the bio/perl stuff to the service-pack
+#
+# some minor reformatting
+#
# Revision 1.14 2013/02/02 07:22:18 clem
# now it properly compiles all the required packages
#
@@ -104,6 +109,7 @@
PROFILES = condor base ganglia
roll::
+ mkdir -p RPMS/noarch;
for i in $(PROFILES); do\
bash buildprofile.sh $$i||exit2;\
done
c...@rocks-127.sdsc.edu
Feb 5, 2013, 12:49:16 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:49:16
Added: src/roll/service-pack README
Log:
Added readme with instruction on how to build the service pack
It still needs to be tested...
Revision Changes Path
1.1 rocks/src/roll/service-pack/README
Index: README
===================================================================
Rocks service pack for 6.1
==========================
Build instruction
-----------------
* After installing a Rocks 6.1 system create a devel-server.
* Once the devel-server is installed download again the OS roll and add it to the devel server
rocks add roll os*iso
rocks enable roll os
cd /export/rocks/install
rocks create distro
* run the bootstrap procedure
bash bootstrap.sh
* build the roll
make roll
Added: src/roll/service-pack README
Log:
Added readme with instruction on how to build the service pack
It still needs to be tested...
Revision Changes Path
1.1 rocks/src/roll/service-pack/README
Index: README
===================================================================
Rocks service pack for 6.1
==========================
Build instruction
-----------------
* After installing a Rocks 6.1 system create a devel-server.
* Once the devel-server is installed download again the OS roll and add it to the devel server
rocks add roll os*iso
rocks enable roll os
cd /export/rocks/install
rocks create distro
* run the bootstrap procedure
bash bootstrap.sh
* build the roll
make roll
c...@rocks-127.sdsc.edu
Feb 5, 2013, 6:36:21 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 15:36:21
Modified: src/roll/service-pack README
Log:
fixed readme file
Revision Changes Path
1.2 +2 -1 rocks/src/roll/service-pack/README
Index: README
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/README,v
--- README 5 Feb 2013 17:49:16 -0000 1.1
+++ README 5 Feb 2013 23:36:21 -0000 1.2
@@ -8,7 +8,8 @@
* After installing a Rocks 6.1 system create a devel-server.
-* Once the devel-server is installed download again the OS roll and add it to the devel server
+* Once the devel-server is installed download again the first two OS rolls,
+ add them to the devel server and rebuild the distro
Modified: src/roll/service-pack README
Log:
fixed readme file
Revision Changes Path
1.2 +2 -1 rocks/src/roll/service-pack/README
Index: README
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
retrieving revision 1.2
--- README 5 Feb 2013 17:49:16 -0000 1.1
+++ README 5 Feb 2013 23:36:21 -0000 1.2
@@ -8,7 +8,8 @@
* After installing a Rocks 6.1 system create a devel-server.
+* Once the devel-server is installed download again the first two OS rolls,
+ add them to the devel server and rebuild the distro
Reply all
Reply to author
Forward
0 new messages