From f34f68dc4a1ad014c588bae006cfe8a9fd866b3d Mon Sep 17 00:00:00 2001 From: ramonn Date: Fri, 24 Jan 2014 09:51:04 +0000 Subject: [PATCH] 2014-01-24 Ramon Novoa * build_rpm.sh, build_rpm_redhat.sh, build_src.sh: Remove the keygen from the build scripts (it is not used anymore). git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- extras/ChangeLog | 7 +++++++ extras/build_rpm.sh | 3 --- extras/build_rpm_redhat.sh | 3 --- extras/build_src.sh | 3 --- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/extras/ChangeLog b/extras/ChangeLog index 663efe3125..9169a15ad6 100644 --- a/extras/ChangeLog +++ b/extras/ChangeLog @@ -1,3 +1,10 @@ +2014-01-24 Ramon Novoa + + * build_rpm.sh, + build_rpm_redhat.sh, + build_src.sh: Remove the keygen from the build scripts (it is not used + anymore). + 2013-11-26 Sergio Martin * pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java diff --git a/extras/build_rpm.sh b/extras/build_rpm.sh index 590b7a14a6..bf94591c2e 100755 --- a/extras/build_rpm.sh +++ b/extras/build_rpm.sh @@ -22,8 +22,5 @@ rpmbuild -ba $PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise # Enterprise server rpmbuild -ba $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.spec || exit 1 -# Updatemanager keygen -rpmbuild -ba $CODEHOME_ENT/updatemanager/keygen/pandora/pandora_keygen.spec || exit 1 - exit 0 diff --git a/extras/build_rpm_redhat.sh b/extras/build_rpm_redhat.sh index d23272daf5..7f45bc6773 100755 --- a/extras/build_rpm_redhat.sh +++ b/extras/build_rpm_redhat.sh @@ -22,8 +22,5 @@ rpmbuild -ba $PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise # Enterprise server rpmbuild -ba $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.redhat.spec || exit 1 -# Updatemanager keygen -rpmbuild -ba $CODEHOME_ENT/updatemanager/keygen/pandora/pandora_keygen.redhat.spec || exit 1 - exit 0 diff --git a/extras/build_src.sh b/extras/build_src.sh index 0ffcbb3f8b..3c4eef5de8 100755 --- a/extras/build_src.sh +++ b/extras/build_src.sh @@ -32,9 +32,6 @@ cd $PANDHOME_ENT/pandora_console && tar zcvf $RPMHOME/SOURCES/pandorafms_console # Enterprise server cd $PANDHOME_ENT/pandora_server/ && tar zcvf $RPMHOME/SOURCES/pandorafms_server_enterprise-$LOCAL_VERSION.tar.gz --exclude \.svn PandoraFMS-Enterprise || exit 1 -# Updatemanager keygen -cd $CODEHOME_ENT/updatemanager/keygen && tar cvzf $RPMHOME/SOURCES/pandorafms_keygen-$KEYGEN_VERSION.tar.gz --exclude .svn --exclude keygen --exclude keygen.i386.static --exclude pandora_keygen.spec pandora || exit 1 - # Create symlinks needed to build RPM packages if [ "$1" == "nightly" ]; then ln -s $RPMHOME/SOURCES/pandorafms_console-$LOCAL_VERSION.tar.gz $RPMHOME/SOURCES/pandorafms_console-$VERSION.tar.gz || exit 1