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

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

clem 13/02/05 17:15:18

Modified: src/roll/service-pack Makefile
Log:
Needs to mkdir all the directory for the RPMS

Revision Changes Path
1.16 +11 -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
retrieving revision 1.16
diff -u -b -t -w -r1.15 -r1.16
--- Makefile 5 Feb 2013 17:27:27 -0000 1.15
+++ Makefile 6 Feb 2013 01:15:18 -0000 1.16
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.15 2013/02/05 17:27:27 clem Exp $
+# $Id: Makefile,v 1.16 2013/02/06 01:15:18 clem Exp $
#
# @Copyright@
#
@@ -56,6 +56,9 @@
# @Copyright@
#
# $Log: Makefile,v $
+# Revision 1.16 2013/02/06 01:15:18 clem
+# Needs to mkdir all the directory for the RPMS
+#
# Revision 1.15 2013/02/05 17:27:27 clem
# added the bio/perl stuff to the service-pack
#
@@ -107,9 +110,14 @@
#

PROFILES = condor base ganglia
+ROCKSROOT.ABSOLUTE = $(shell cd $(ROCKSROOT); pwd)
+ARCH.BIN = $(ROCKSROOT.ABSOLUTE)/bin/arch
+ARCH = $(shell $(ARCH.BIN))
+

roll::
mkdir -p RPMS/noarch;
+ mkdir -p RPMS/$(ARCH);
for i in $(PROFILES); do\
bash buildprofile.sh $$i||exit2;\
done

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

clem 13/02/07 18:30:29

Modified: src/roll/service-pack Makefile bootstrap.sh
Log:
adding new version of zfs

when simple things make your life impossible, half a day behind this stupid
addition....

Revision Changes Path
1.17 +6 -2 rocks/src/roll/service-pack/Makefile

Index: Makefile
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/Makefile,v

retrieving revision 1.16
retrieving revision 1.17
diff -u -b -t -w -r1.16 -r1.17
--- Makefile 6 Feb 2013 01:15:18 -0000 1.16
+++ Makefile 8 Feb 2013 02:30:29 -0000 1.17

@@ -1,5 +1,5 @@
#

-# $Id: Makefile,v 1.16 2013/02/06 01:15:18 clem Exp $
+# $Id: Makefile,v 1.17 2013/02/08 02:30:29 clem Exp $
#
# @Copyright@
#
@@ -56,6 +56,12 @@

# @Copyright@
#
# $Log: Makefile,v $

+# Revision 1.17 2013/02/08 02:30:29 clem
+# adding new version of zfs
+#
+# when simple things make your life impossible, half a day behind this stupid
+# addition....
+#

# Revision 1.16 2013/02/06 01:15:18 clem

# Needs to mkdir all the directory for the RPMS
#
@@ -109,7 +115,8 @@
#
#

-PROFILES = condor base ganglia
+
+PROFILES = condor base ganglia zfs-linux

ROCKSROOT.ABSOLUTE = $(shell cd $(ROCKSROOT); pwd)

ARCH.BIN = $(ROCKSROOT.ABSOLUTE)/bin/arch
ARCH = $(shell $(ARCH.BIN))



1.3 +2 -2 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.2
retrieving revision 1.3
diff -u -b -t -w -r1.2 -r1.3
--- bootstrap.sh 5 Feb 2013 17:24:51 -0000 1.2
+++ bootstrap.sh 8 Feb 2013 02:30:29 -0000 1.3
@@ -1,6 +1,6 @@
#!/bin/bash -x
#
-# $Id: bootstrap.sh,v 1.2 2013/02/05 17:24:51 clem Exp $
+# $Id: bootstrap.sh,v 1.3 2013/02/08 02:30:29 clem Exp $
#
# @Copyright@
#
@@ -60,7 +60,7 @@
# we need to boostrap every roll we want to compile an rpm from
#

-ROLLS="base ganglia kvm perl bio"
+ROLLS="base ganglia kvm perl bio zfs-linux"

for roll in $ROLLS; do
cd ../$roll;

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

clem 13/02/08 16:55:09

Modified: src/roll/service-pack bootstrap.sh
Log:
removing zfs-linux

Revision Changes Path
1.4 +2 -2 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.3
retrieving revision 1.4
diff -u -b -t -w -r1.3 -r1.4
--- bootstrap.sh 8 Feb 2013 02:30:29 -0000 1.3
+++ bootstrap.sh 9 Feb 2013 00:55:09 -0000 1.4

@@ -1,6 +1,6 @@
#!/bin/bash -x
#

-# $Id: bootstrap.sh,v 1.3 2013/02/08 02:30:29 clem Exp $
+# $Id: bootstrap.sh,v 1.4 2013/02/09 00:55:09 clem Exp $

#
# @Copyright@
#
@@ -60,7 +60,7 @@
# we need to boostrap every roll we want to compile an rpm from
#

-ROLLS="base ganglia kvm perl bio zfs-linux"

+ROLLS="base ganglia kvm perl bio"

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

clem 13/02/13 11:47:06

Modified: src/roll/service-pack Makefile
Log:
remove some leftover zfs-linux stuff

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

Index: Makefile
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/src/roll/service-pack/Makefile,v

retrieving revision 1.17
retrieving revision 1.18
diff -u -b -t -w -r1.17 -r1.18
--- Makefile 8 Feb 2013 02:30:29 -0000 1.17
+++ Makefile 13 Feb 2013 19:47:06 -0000 1.18

@@ -1,5 +1,5 @@
#

-# $Id: Makefile,v 1.17 2013/02/08 02:30:29 clem Exp $
+# $Id: Makefile,v 1.18 2013/02/13 19:47:06 clem Exp $
#
# @Copyright@
#
@@ -56,6 +56,9 @@

# @Copyright@
#
# $Log: Makefile,v $

+# Revision 1.18 2013/02/13 19:47:06 clem
+# remove some leftover zfs-linux stuff
+#
# Revision 1.17 2013/02/08 02:30:29 clem
# adding new version of zfs
#
@@ -116,7 +119,7 @@
#


-PROFILES = condor base ganglia zfs-linux

+PROFILES = condor base ganglia

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

clem 13/02/13 11:51:58

Modified: src/roll/service-pack bootstrap.sh
Log:
only bootstrap kvm if we are on a 64 bit system

Revision Changes Path
1.5 +7 -2 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.4
retrieving revision 1.5
diff -u -b -t -w -r1.4 -r1.5
--- bootstrap.sh 9 Feb 2013 00:55:09 -0000 1.4
+++ bootstrap.sh 13 Feb 2013 19:51:58 -0000 1.5

@@ -1,6 +1,6 @@
#!/bin/bash -x
#

-# $Id: bootstrap.sh,v 1.4 2013/02/09 00:55:09 clem Exp $
+# $Id: bootstrap.sh,v 1.5 2013/02/13 19:51:58 clem Exp $
#
# @Copyright@
#
@@ -60,7 +60,12 @@

# we need to boostrap every roll we want to compile an rpm from
#

-ROLLS="base ganglia kvm perl bio"

+ROLLS="base ganglia perl bio"
+
+if [ `arch` == 'x86_64' ]; then
+ ROLLS="$ROLLS kvm"
+fi
+