From 9b21cdd41980ad0394ed6afea318c07a147a4501 Mon Sep 17 00:00:00 2001 From: Jean-Marc Pigeon Date: Thu, 10 Jun 2010 17:02:06 -0400 Subject: [PATCH] Release. Working with kernel-2.6.35-rc2 and fc13 --- Makefile | 12 +++++++----- shell/vzgot.mksrvz | 1 + support/sauver | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 93c1631..b9bba9c 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,9 @@ fclean : clean $(MAKE) -s -C $$i clean ; \ done @ rm -fr $(RPMDIR)/SOURCES/$(APLR)*.tgz \ - $(APPNAME)*.src.rpm + $(APPNAME)*.src.rpm \ + $(APPNAME)*.*.x86_64.rpm \ + $(APPNAME)*.*.i386.rpm fdebug : @ $(MAKE) -s debug @@ -118,12 +120,12 @@ xtest : rpm rpm -Uhv ~safe/rpmbuild/RPMS/i586/$(APPNAME)*.i586.rpm test : binary - @ ssh $(TSTSYS).safe.ca \ + @ ssh safe@$(TSTSYS).safe.ca \ "rm -fr $(APPNAME)-*.x86_64.rpm" @ scp -q \ $(RPMDIR)/RPMS/x86_64/$(APPNAME)-*.x86_64.rpm \ - $(TSTSYS).safe.ca: - @ ssh -Y -t $(TSTSYS).safe.ca sudo \ + safe@$(TSTSYS).safe.ca: + @ ssh -Y -t safe@$(TSTSYS).safe.ca sudo \ rpm -Uhv ~safe/$(APPNAME)-*.x86_64.rpm binary : rpm @@ -166,7 +168,7 @@ rpm : @ mv $(APLR).tgz $(RPMDIR)/SOURCES @ rpmbuild -bs \ --quiet \ - --define "_topdir /home/safe/RPM" \ + --define "_topdir /home/jmp/RPM" \ support/$(APPNAME).spec > /dev/null 2>&1 @ mv $(RPMDIR)/SRPMS/$(APLR)*.src.rpm . @ echo "RPM src completed" diff --git a/shell/vzgot.mksrvz b/shell/vzgot.mksrvz index ae65112..3566001 100755 --- a/shell/vzgot.mksrvz +++ b/shell/vzgot.mksrvz @@ -66,6 +66,7 @@ while read -r NODE TEMPLATE DISTRIB CPUARCH "el4.7" | \ "el4.6" | \ "ovzfc12" | \ + "fc13" | \ "fc12" | \ "fc11" | \ "fc10" | \ diff --git a/support/sauver b/support/sauver index d81442d..15631ec 100755 --- a/support/sauver +++ b/support/sauver @@ -9,7 +9,7 @@ VERS=`echo $REV | cut -d' ' -f2 - ` NUM=`echo $REV | cut -d' ' -f2 | cut -d'.' -f1,2` #NXTVER doit etre activer pour un changement de version #et mis en commentaire apres -NXTVER="0.84" +#NXTVER="0.84" #----------------------------------------------- for i in $* do -- 1.8.2.3