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

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

clem 13/02/05 17:17:30

Modified: src/roll/service-pack/src Makefile
Log:
Now it properly fetches the rpm after building them

Some cp used the wrong path

Revision Changes Path
1.23 +12 -3 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.22
retrieving revision 1.23
diff -u -b -t -w -r1.22 -r1.23
--- Makefile 5 Feb 2013 18:41:32 -0000 1.22
+++ Makefile 6 Feb 2013 01:17:30 -0000 1.23
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 2013/02/05 18:41:32 clem Exp $
+# $Id: Makefile,v 1.23 2013/02/06 01:17:30 clem Exp $
#
# @Copyright@
#
@@ -55,6 +55,11 @@
# @Copyright@
#
# $Log: Makefile,v $
+# Revision 1.23 2013/02/06 01:17:30 clem
+# Now it properly fetches the rpm after building them
+#
+# Some cp used the wrong path
+#
# Revision 1.22 2013/02/05 18:41:32 clem
# Deleted a # by mistake
#
@@ -137,6 +142,12 @@

BASEPATH = ../../

+
+ROCKSROOT.ABSOLUTE = $(shell cd $(ROCKSROOT); pwd)
+ARCH.BIN = $(ROCKSROOT.ABSOLUTE)/bin/arch
+ARCH = $(shell $(ARCH.BIN))
+
+
default: rpm

copyright rpm clean::
@@ -150,8 +161,8 @@
cd -; \
done
#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;
+ cp $(BASEPATH)/perl/RPMS/*/opt-perl-*.rpm ../RPMS/$(ARCH) || exit 2;
+ cp $(BASEPATH)/bio/RPMS/*/opt-perl-*.rpm ../RPMS/$(ARCH) || exit 2;

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

clem 13/02/06 15:19:50

Modified: src/roll/service-pack/src Makefile
Log:
added new release of the jdk to the service pack

Revision Changes Path
1.24 +9 -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.23
retrieving revision 1.24
diff -u -b -t -w -r1.23 -r1.24
--- Makefile 6 Feb 2013 01:17:30 -0000 1.23
+++ Makefile 6 Feb 2013 23:19:50 -0000 1.24
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.23 2013/02/06 01:17:30 clem Exp $
+# $Id: Makefile,v 1.24 2013/02/06 23:19:50 clem Exp $
#
# @Copyright@
#
@@ -55,6 +55,9 @@

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

+# Revision 1.24 2013/02/06 23:19:50 clem
+# added new release of the jdk to the service pack
+#

# Revision 1.23 2013/02/06 01:17:30 clem

# Now it properly fetches the rpm after building them
#
@@ -136,7 +139,7 @@

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 \
+ base/src/java 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

@@ -163,6 +166,8 @@

#special case for the perl cpan-support packages

cp $(BASEPATH)/perl/RPMS/*/opt-perl-*.rpm ../RPMS/$(ARCH) || exit 2;

cp $(BASEPATH)/bio/RPMS/*/opt-perl-*.rpm ../RPMS/$(ARCH) || exit 2;

+ cp $(BASEPATH)/base/RPMS/$(ARCH)/jdk-* ../RPMS/$(ARCH) || exit 2;
+ cd usersguide; make rpm

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

clem 13/02/07 18:27:57

Modified: src/roll/service-pack/src Makefile
Log:
bio perl needs new version of xslt lib

Revision Changes Path
1.25 +5 -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.24
retrieving revision 1.25
diff -u -b -t -w -r1.24 -r1.25
--- Makefile 6 Feb 2013 23:19:50 -0000 1.24
+++ Makefile 8 Feb 2013 02:27:57 -0000 1.25
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.24 2013/02/06 23:19:50 clem Exp $
+# $Id: Makefile,v 1.25 2013/02/08 02:27:57 clem Exp $

#
# @Copyright@
#
@@ -55,6 +55,9 @@
# @Copyright@
#
# $Log: Makefile,v $

+# Revision 1.25 2013/02/08 02:27:57 clem
+# bio perl needs new version of xslt lib
+#

# Revision 1.24 2013/02/06 23:19:50 clem

# added new release of the jdk to the service pack
#
@@ -141,7 +144,7 @@
base/src/foundation-mysql base/src/foundation-python-extras base/src/usersguide \

base/src/java 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
+ bio/src/libxslt bio/src/bioperl-support bio/src/bioperl-ext bio/src/bioperl

BASEPATH = ../../

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

clem 13/02/07 18:29:13

Modified: src/roll/service-pack/src Makefile
Log:
some minor fixes to properly handle clean targe

Revision Changes Path
1.26 +13 -3 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.25
retrieving revision 1.26
diff -u -b -t -w -r1.25 -r1.26
--- Makefile 8 Feb 2013 02:27:57 -0000 1.25
+++ Makefile 8 Feb 2013 02:29:13 -0000 1.26
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.25 2013/02/08 02:27:57 clem Exp $
+# $Id: Makefile,v 1.26 2013/02/08 02:29:13 clem Exp $

#
# @Copyright@
#
@@ -55,6 +55,9 @@
# @Copyright@
#
# $Log: Makefile,v $

+# Revision 1.26 2013/02/08 02:29:13 clem
+# some minor fixes to properly handle clean targe
+#

# Revision 1.25 2013/02/08 02:27:57 clem

# bio perl needs new version of xslt lib
#
@@ -156,7 +159,7 @@

default: rpm

-copyright rpm clean::
+rpm::
for i in $(INCLUDEPACKAGE) ; do \
cd $(BASEPATH)$$i; \
$(MAKE) $@ || exit 2 ; \
@@ -169,8 +172,15 @@

#special case for the perl cpan-support packages
cp $(BASEPATH)/perl/RPMS/*/opt-perl-*.rpm ../RPMS/$(ARCH) || exit 2;
cp $(BASEPATH)/bio/RPMS/*/opt-perl-*.rpm ../RPMS/$(ARCH) || exit 2;

- cp $(BASEPATH)/base/RPMS/$(ARCH)/jdk-* ../RPMS/$(ARCH) || exit 2;
+ cp $(BASEPATH)/base/RPMS/$(ARCH)/jdk-*.rpm ../RPMS/$(ARCH) || exit 2;
cd usersguide; make rpm


+copyright clean::
+ for i in $(INCLUDEPACKAGE) ; do \
+ cd $(BASEPATH)$$i; \
+ $(MAKE) $@ || exit 2 ; \
+ cd -; \
+ done
+

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

clem 13/02/07 18:30:29

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

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

Revision Changes Path
1.27 +6 -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.26
retrieving revision 1.27
diff -u -b -t -w -r1.26 -r1.27
--- Makefile 8 Feb 2013 02:29:13 -0000 1.26
+++ Makefile 8 Feb 2013 02:30:29 -0000 1.27
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.26 2013/02/08 02:29:13 clem Exp $
+# $Id: Makefile,v 1.27 2013/02/08 02:30:29 clem Exp $
#
# @Copyright@
#
@@ -55,6 +55,12 @@

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

+# Revision 1.27 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.26 2013/02/08 02:29:13 clem

# some minor fixes to properly handle clean targe
#
@@ -147,7 +153,8 @@

base/src/foundation-mysql base/src/foundation-python-extras base/src/usersguide \
base/src/java ganglia/src/rocks-command ganglia/src/usersguide \
kvm/src/rocks-command kvm/src/usersguide perl/src/cpan perl/src/cpan-support \

- bio/src/libxslt bio/src/bioperl-support bio/src/bioperl-ext bio/src/bioperl
+ bio/src/libxslt bio/src/bioperl-support bio/src/bioperl-ext bio/src/bioperl \
+ zfs-linux/src/spl zfs-linux/src/zfs

BASEPATH = ../../

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

clem 13/02/08 11:25:48

Modified: src/roll/service-pack/src Makefile
Log:
zfs-linux is a source only roll

i should not include the binary part of the roll :-(

Revision Changes Path
1.28 +8 -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.27
retrieving revision 1.28
diff -u -b -t -w -r1.27 -r1.28
--- Makefile 8 Feb 2013 02:30:29 -0000 1.27
+++ Makefile 8 Feb 2013 19:25:47 -0000 1.28
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.27 2013/02/08 02:30:29 clem Exp $
+# $Id: Makefile,v 1.28 2013/02/08 19:25:47 clem Exp $
#
# @Copyright@
#
@@ -55,6 +55,11 @@

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

+# Revision 1.28 2013/02/08 19:25:47 clem
+# zfs-linux is a source only roll
+#
+# i should not include the binary part of the roll :-(
+#

# Revision 1.27 2013/02/08 02:30:29 clem

# adding new version of zfs
#
@@ -154,7 +159,7 @@

base/src/java ganglia/src/rocks-command ganglia/src/usersguide \
kvm/src/rocks-command kvm/src/usersguide perl/src/cpan perl/src/cpan-support \

bio/src/libxslt bio/src/bioperl-support bio/src/bioperl-ext bio/src/bioperl \
- zfs-linux/src/spl zfs-linux/src/zfs
+ zfs-linux/src/zfs-source-roll

BASEPATH = ../../

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

clem 13/02/08 16:55:09

Modified: src/roll/service-pack/src Makefile
Log:
removing zfs-linux

Revision Changes Path
1.29 +2 -96 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.28
retrieving revision 1.29
diff -u -b -t -w -r1.28 -r1.29
--- Makefile 8 Feb 2013 19:25:47 -0000 1.28
+++ Makefile 9 Feb 2013 00:55:09 -0000 1.29
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.28 2013/02/08 19:25:47 clem Exp $
+# $Id: Makefile,v 1.29 2013/02/09 00:55:09 clem Exp $
#
# @Copyright@
#
@@ -54,112 +54,13 @@
#
# @Copyright@
#
-# $Log: Makefile,v $
-# Revision 1.28 2013/02/08 19:25:47 clem
-# zfs-linux is a source only roll
-#
-# i should not include the binary part of the roll :-(
-#
-# Revision 1.27 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.26 2013/02/08 02:29:13 clem
-# some minor fixes to properly handle clean targe
-#
-# Revision 1.25 2013/02/08 02:27:57 clem
-# bio perl needs new version of xslt lib
-#
-# Revision 1.24 2013/02/06 23:19:50 clem
-# added new release of the jdk to the service pack
-#
-# Revision 1.23 2013/02/06 01:17:30 clem
-# Now it properly fetches the rpm after building them
-#
-# Some cp used the wrong path
-#
-# 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
-#
-# some minor reformatting
-#
-# 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
-#
-# 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
-#
-# Revision 1.16 2012/11/27 00:49:12 phil
-# Copyright Storm for Emerald Boa
-#
-# Revision 1.15 2012/05/06 05:49:20 phil
-# Copyright Storm for Mamba
-#
-# Revision 1.14 2011/07/23 02:31:17 phil
-# Viper Copyright
-#
-# Revision 1.13 2010/12/14 19:33:24 bruno
-# add the new tracker client into initrd inside the rocks-boot RPMS.
-#
-# also, make it easy to change the version number of the service pack roll and
-# have all the RPMs 'release' number match the version number of the roll
-#
-# Revision 1.12 2010/12/07 23:52:16 bruno
-# the start of SP 5.4.1
-#
-# Revision 1.11 2010/09/07 23:53:24 bruno
-# star power for gb
-#
-# Revision 1.10 2010/08/12 21:43:40 mjk
-# 5.3.1 - fixes corrupted package downloads
-#
-# Revision 1.9 2009/08/12 23:02:46 bruno
-# fixes for 5.2.2
-#
-# Revision 1.7 2009/05/01 19:07:22 mjk
-# chimi con queso
-#
-# Revision 1.6 2008/10/18 00:56:13 mjk
-# copyright 5.1
-#
-# Revision 1.5 2008/03/06 23:41:57 mjk
-# copyright storm on
-#
-# Revision 1.4 2007/06/23 04:04:00 mjk
-# mars hill copyright
-#
-# Revision 1.3 2006/12/19 22:21:50 bruno
-# get the dependencies right
-#
-# Revision 1.2 2006/12/16 21:01:31 bruno
-# more goodies for the service pack roll
-#
-# Revision 1.1 2006/10/06 23:33:45 bruno
-# first draft
-#
#

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 \

base/src/java ganglia/src/rocks-command ganglia/src/usersguide \
kvm/src/rocks-command kvm/src/usersguide perl/src/cpan perl/src/cpan-support \

- bio/src/libxslt bio/src/bioperl-support bio/src/bioperl-ext bio/src/bioperl \
- zfs-linux/src/zfs-source-roll

+ bio/src/libxslt bio/src/bioperl-support bio/src/bioperl-ext bio/src/bioperl

BASEPATH = ../../

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

clem 13/02/13 11:47:30

Modified: src/roll/service-pack/src Makefile
Log:
only if on 64bit we need to build the kvm stuff

Revision Changes Path
1.30 +5 -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.29
retrieving revision 1.30
diff -u -b -t -w -r1.29 -r1.30
--- Makefile 9 Feb 2013 00:55:09 -0000 1.29
+++ Makefile 13 Feb 2013 19:47:30 -0000 1.30
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.29 2013/02/09 00:55:09 clem Exp $
+# $Id: Makefile,v 1.30 2013/02/13 19:47:30 clem Exp $
#
# @Copyright@
#
@@ -59,7 +59,7 @@

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 \
base/src/java ganglia/src/rocks-command ganglia/src/usersguide \

- kvm/src/rocks-command kvm/src/usersguide perl/src/cpan perl/src/cpan-support \
+ perl/src/cpan perl/src/cpan-support \

bio/src/libxslt bio/src/bioperl-support bio/src/bioperl-ext bio/src/bioperl

BASEPATH = ../../

@@ -69,6 +69,9 @@
ARCH.BIN = $(ROCKSROOT.ABSOLUTE)/bin/arch
ARCH = $(shell $(ARCH.BIN))

+ifeq ($(strip $(ARCH)), x86_64)
+INCLUDEPACKAGE += kvm/src/rocks-command kvm/src/usersguide
+endif

default: rpm