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;