From 0d9e2930a4a0348b9ef73b674565aaac40490efd Mon Sep 17 00:00:00 2001 From: slerena Date: Wed, 22 Sep 2010 18:31:25 +0000 Subject: [PATCH] 2010-09-22 Sancho Lerena * extras/build_src.sh extras/build_rpm.sh: Fixed scripts for my enviroment (SUSE 11.3) git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3278 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- extras/ChangeLog | 6 ++++++ extras/build_rpm.sh | 3 ++- extras/build_src.sh | 21 +++------------------ 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/extras/ChangeLog b/extras/ChangeLog index fd1306839a..01bf1b2750 100644 --- a/extras/ChangeLog +++ b/extras/ChangeLog @@ -1,3 +1,9 @@ + +2010-09-22 Sancho Lerena + + * extras/build_src.sh + extras/build_rpm.sh: Fixed scripts for my enviroment (SUSE 11.3) + 2010-06-02 Ramon Novoa * pandora_update_version.sh: Fixed parameter check. Make sure diff --git a/extras/build_rpm.sh b/extras/build_rpm.sh index faf0356481..5ef9b41aa7 100755 --- a/extras/build_rpm.sh +++ b/extras/build_rpm.sh @@ -1,10 +1,11 @@ #!/bin/bash CODEHOME=~/code/pandora/trunk -CODEHOME_ENT=~/code/artica/code +CODEHOME_ENT=~/code/artica RPMHOME=/usr/src/packages echo "Creating RPMs at $RPMHOME/RPMS" + cd $CODEHOME sudo rpmbuild -ba pandora_console/pandora_console.spec sudo rpmbuild -ba pandora_agents/unix/pandora_agent.spec diff --git a/extras/build_src.sh b/extras/build_src.sh index da750da163..4c07ad5acd 100755 --- a/extras/build_src.sh +++ b/extras/build_src.sh @@ -1,13 +1,13 @@ #!/bin/bash CODEHOME=~/code/pandora/trunk -CODEHOME_ENT=~/code/artica/code +CODEHOME_ENT=~/code/artica RPMHOME=/usr/src/packages VERSION=$(grep 'my $pandora_version =' $CODEHOME/pandora_server/lib/PandoraFMS/Config.pm | awk '{print substr($4, 2, length($4) - 3)}') KEYGEN_VERSION=$(grep "%define version" $CODEHOME_ENT/updatemanager/keygen/pandora/pandora_keygen.spec | awk '{print $3}') echo "Creating source tarballs (/usr/src/rpm/SOURCES)" -rm -Rf /usr/src/rpm/SOURCES/pandorafms_*.tar.gz +sudo rm -Rf /usr/src/rpm/SOURCES/pandorafms_*.tar.gz cd $CODEHOME/pandora_agents sudo tar zcvf $RPMHOME/SOURCES/pandorafms_agent-$VERSION.tar.gz --exclude \.svn --exclude nohup linux @@ -18,7 +18,7 @@ sudo tar zcvf $RPMHOME/SOURCES/pandorafms_server-$VERSION.tar.gz --exclude \.svn # Console OpenSource cd $CODEHOME -tar zcvf $RPMHOME/SOURCES/pandorafms_console-$VERSION.tar.gz --exclude \.svn --exclude config.php --exclude enterprise pandora_console +sudo tar zcvf $RPMHOME/SOURCES/pandorafms_console-$VERSION.tar.gz --exclude \.svn --exclude config.php --exclude enterprise pandora_console # Console Enterprise cd $CODEHOME_ENT/pandora/trunk/pandora_console @@ -32,18 +32,3 @@ sudo tar zcvf $RPMHOME/SOURCES/pandorafms_server_enterprise-$VERSION.tar.gz --ex cd $CODEHOME_ENT/updatemanager/keygen sudo tar cvzf $RPMHOME/SOURCES/pandorafms_keygen-$KEYGEN_VERSION.tar.gz --exclude .svn --exclude keygen --exclude keygen.i386.static --exclude pandora_keygen.spec pandora -echo " " -echo " ABORTING RPM Creation, only tarball packages build " -exit - -echo "Creating RPMs at $RPMHOME/RPMS" -cd $CODEHOME -sudo rpmbuild -ba pandora_console/pandora_console.spec -sudo rpmbuild -ba pandora_agents/linux/pandora_agent.spec -sudo rpmbuild -ba pandora_agents/unix/pandora_agent.spec -sudo rpmbuild -ba pandora_server/pandora_server.spec -sudo rpmbuild -ba $CODEHOME_ENT/pandora/trunk/pandora_console/enterprise/pandora_console_enterprise.spec -sudo rpmbuild -ba $CODEHOME_ENT/pandora/trunk/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.spec -sudo rpmbuild -ba $CODEHOME_ENT/updatemanager/keygen/pandora/pandora_keygen.spec - -