From 7916b64e262043e1757db836323662829a4f9944 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Thu, 5 Jun 2014 09:04:00 +0000 Subject: [PATCH] 2014-06-05 Ramon Novoa * build_deb.sh, build_rpm.sh, build_src.sh: Build enterprise server packages, since we are having issues with ActiveState binaries. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10115 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- extras/ChangeLog | 7 +++++++ extras/build_deb.sh | 2 +- extras/build_rpm.sh | 2 +- extras/build_src.sh | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/extras/ChangeLog b/extras/ChangeLog index 9126e32fac..79249e6af2 100644 --- a/extras/ChangeLog +++ b/extras/ChangeLog @@ -1,3 +1,10 @@ +2014-06-05 Ramon Novoa + + * build_deb.sh, + build_rpm.sh, + build_src.sh: Build enterprise server packages, since we are having + issues with ActiveState binaries. + 2014-03-11 Mario Pulido * aditional_rpmspec/nfdump-1.6.8p1-1.redhat.spec: Add spec to create nfdump rpms. diff --git a/extras/build_deb.sh b/extras/build_deb.sh index bd43f91a5c..787929c543 100755 --- a/extras/build_deb.sh +++ b/extras/build_deb.sh @@ -20,7 +20,7 @@ cd $CODEHOME/pandora_agents/unix/DEBIAN && bash ./make_deb_package.sh && mv ../* cd $PANDHOME_ENT/pandora_console/DEBIAN && bash ./make_deb_package.sh && mv ../*.deb $RPMHOME/DEB || exit 1 # Enterprise server -#cd $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/DEBIAN && bash ./make_deb_package.sh && mv ../*.deb $RPMHOME/DEB || exit 1 +cd $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/DEBIAN && bash ./make_deb_package.sh && mv ../*.deb $RPMHOME/DEB || exit 1 exit 0 diff --git a/extras/build_rpm.sh b/extras/build_rpm.sh index 7b49427bc9..bf94591c2e 100755 --- a/extras/build_rpm.sh +++ b/extras/build_rpm.sh @@ -20,7 +20,7 @@ rpmbuild -ba $CODEHOME/pandora_agents/unix/pandora_agent.spec || exit 1 rpmbuild -ba $PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.spec || exit 1 # Enterprise server -#rpmbuild -ba $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.spec || exit 1 +rpmbuild -ba $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.spec || exit 1 exit 0 diff --git a/extras/build_src.sh b/extras/build_src.sh index 4ef9f9ca5c..3c4eef5de8 100755 --- a/extras/build_src.sh +++ b/extras/build_src.sh @@ -30,7 +30,7 @@ cd $CODEHOME/pandora_agents && tar zvcf $RPMHOME/SOURCES/pandorafms_agent_unix-$ cd $PANDHOME_ENT/pandora_console && tar zcvf $RPMHOME/SOURCES/pandorafms_console_enterprise-$LOCAL_VERSION.tar.gz --exclude \.svn enterprise/* || exit 1 # Enterprise server -#cd $PANDHOME_ENT/pandora_server/ && tar zcvf $RPMHOME/SOURCES/pandorafms_server_enterprise-$LOCAL_VERSION.tar.gz --exclude \.svn PandoraFMS-Enterprise || exit 1 +cd $PANDHOME_ENT/pandora_server/ && tar zcvf $RPMHOME/SOURCES/pandorafms_server_enterprise-$LOCAL_VERSION.tar.gz --exclude \.svn PandoraFMS-Enterprise || exit 1 # Create symlinks needed to build RPM packages if [ "$1" == "nightly" ]; then @@ -39,7 +39,7 @@ if [ "$1" == "nightly" ]; then ln -s $RPMHOME/SOURCES/pandorafms_agent-$LOCAL_VERSION.tar.gz $RPMHOME/SOURCES/pandorafms_agent-$VERSION.tar.gz || exit 1 ln -s $RPMHOME/SOURCES/pandorafms_agent_unix-$LOCAL_VERSION.tar.gz $RPMHOME/SOURCES/pandorafms_agent_unix-$VERSION.tar.gz || exit 1 ln -s $RPMHOME/SOURCES/pandorafms_console_enterprise-$LOCAL_VERSION.tar.gz $RPMHOME/SOURCES/pandorafms_console_enterprise-$VERSION.tar.gz || exit 1 - #ln -s $RPMHOME/SOURCES/pandorafms_server_enterprise-$LOCAL_VERSION.tar.gz $RPMHOME/SOURCES/pandorafms_server_enterprise-$VERSION.tar.gz || exit 1 + ln -s $RPMHOME/SOURCES/pandorafms_server_enterprise-$LOCAL_VERSION.tar.gz $RPMHOME/SOURCES/pandorafms_server_enterprise-$VERSION.tar.gz || exit 1 fi exit 0