From 7a67a35f2964ac2aea9c63954431c32017220410 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 19 May 2010 17:09:15 +0000 Subject: [PATCH] 2010-05-19 Miguel de Dios * DEBIAN/make_deb_package.sh: added cpan parameter for to make module packages or not. * pandora_server.spec: force the location of lib. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2757 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 7 + pandora_server/DEBIAN/make_deb_package.sh | 212 ++++++++++++---------- pandora_server/pandora_server.spec | 12 +- 3 files changed, 134 insertions(+), 97 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index b670b07642..9b387aa184 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,10 @@ +2010-05-19 Miguel de Dios + + * DEBIAN/make_deb_package.sh: added cpan parameter for to make module + packages or not. + + * pandora_server.spec: force the location of lib. + 2010-05-19 Sergio Martin * util/plugin/snmp_process.pl: Added the SNMP Server diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index d0df85ab56..a1b2703b25 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/DEBIAN/make_deb_package.sh @@ -16,6 +16,27 @@ pandora_console_version="3.1.0" +package_cpan=1 +package_pandora=1 +for param in $@ +do + if [ $param = "-h" -o $param = "--help" ] + then + echo "For only make packages of cpan type +cpan" + echo "For not make packages of cpan type -cpan" + exit 0 + fi + + if [ $param = "+cpan" ] + then + package_pandora=0 + fi + if [ $param = "-cpan" ] + then + package_cpan=0 + fi +done + echo "This script to make deb must run as root (because the dh-make-perl need this). Then test if you are root." if [ `id -u` != 0 ] then @@ -23,14 +44,17 @@ then exit 1 fi -echo "Test if you has the tools for to make the packages." -whereis dh-make-perl | cut -d":" -f2 | grep dh-make-perl > /dev/null -if [ $? = 1 ] +if [ $package_cpan -eq 1 ] then - echo "No found \"dh-make-perl\" aplication, please install." - exit 1 -else - echo "Found \"dh-make-perl\"." + echo "Test if you has the tools for to make the packages." + whereis dh-make-perl | cut -d":" -f2 | grep dh-make-perl > /dev/null + if [ $? = 1 ] + then + echo "No found \"dh-make-perl\" aplication, please install." + exit 1 + else + echo "Found \"dh-make-perl\"." + fi fi cd .. @@ -38,106 +62,112 @@ cd .. echo "Make a \"temp_package\" temp dir for job." mkdir temp_package -echo "Make the fake tree system in \"temp_package\"." -mkdir -p temp_package/var/spool/pandora/data_in/conf -mkdir -p temp_package/var/spool/pandora/data_in/md5 -mkdir -p temp_package/var/log/pandora -mkdir -p temp_package/etc/pandora -mkdir -p temp_package/etc/init.d/ -mkdir -p temp_package/etc/logrotate.d -mkdir -p temp_package/usr/share/pandora_server -mkdir -p temp_package/usr/bin +if [ $package_pandora -eq 1 ] +then + echo "Make the fake tree system in \"temp_package\"." + mkdir -p temp_package/var/spool/pandora/data_in/conf + mkdir -p temp_package/var/spool/pandora/data_in/md5 + mkdir -p temp_package/var/log/pandora + mkdir -p temp_package/etc/pandora + mkdir -p temp_package/etc/init.d/ + mkdir -p temp_package/etc/logrotate.d + mkdir -p temp_package/usr/share/pandora_server + mkdir -p temp_package/usr/bin -echo "Make the perl of Pandora Server." -perl Makefile.PL -make + echo "Make the perl of Pandora Server." + perl Makefile.PL + make -# Adjust Makefile to use our "fake" root dir to install libraries and also binaries" -cat Makefile | sed -e "s/PREFIX = \/usr/PREFIX = temp_package\/usr/" > Makefile.temp + # Adjust Makefile to use our "fake" root dir to install libraries and also binaries" + cat Makefile | sed -e "s/PREFIX = \/usr/PREFIX = temp_package\/usr/" > Makefile.temp -# This is needed to create .DEB in OpenSUSE. + # This is needed to create .DEB in OpenSUSE. -cat Makefile.temp | sed -e "s/INSTALLBIN = .*/INSTALLBIN = temp_package\/usr\/bin/" > Makefile -cat Makefile | sed -e "s/INSTALLSITEBIN = .*/INSTALLSITEBIN = temp_package\/usr\/bin/" > Makefile.temp -cat Makefile.temp | sed -e "s/INSTALLVENDORBIN = .*/INSTALLVENDORBIN = temp_package\/usr\/bin/" > Makefile -cat Makefile | sed -e "s/INSTALLSCRIPT = .*/INSTALLSCRIPT = temp_package\/usr\/bin/" > Makefile.temp -cat Makefile.temp | sed -e "s/INSTALLSITESCRIPT = .*/INSTALLSITESCRIPT = temp_package\/usr\/bin/" > Makefile -cat Makefile | sed -e "s/INSTALLVENDORSCRIPT = .*/INSTALLVENDORSCRIPT = temp_package\/usr\/bin/" > Makefile.temp + cat Makefile.temp | sed -e "s/INSTALLBIN = .*/INSTALLBIN = temp_package\/usr\/bin/" > Makefile + cat Makefile | sed -e "s/INSTALLSITEBIN = .*/INSTALLSITEBIN = temp_package\/usr\/bin/" > Makefile.temp + cat Makefile.temp | sed -e "s/INSTALLVENDORBIN = .*/INSTALLVENDORBIN = temp_package\/usr\/bin/" > Makefile + cat Makefile | sed -e "s/INSTALLSCRIPT = .*/INSTALLSCRIPT = temp_package\/usr\/bin/" > Makefile.temp + cat Makefile.temp | sed -e "s/INSTALLSITESCRIPT = .*/INSTALLSITESCRIPT = temp_package\/usr\/bin/" > Makefile + cat Makefile | sed -e "s/INSTALLVENDORSCRIPT = .*/INSTALLVENDORSCRIPT = temp_package\/usr\/bin/" > Makefile.temp -mv Makefile.temp Makefile -make install + mv Makefile.temp Makefile + make install -echo "Copy other files in fake file." -cp util/pandora_logrotate temp_package/etc/logrotate.d/pandora + echo "Copy other files in fake file." + cp util/pandora_logrotate temp_package/etc/logrotate.d/pandora -cp bin/tentacle_server temp_package/usr/bin -cp util/tentacle_serverd temp_package/etc/init.d/tentacle_serverd + cp bin/tentacle_server temp_package/usr/bin + cp util/tentacle_serverd temp_package/etc/init.d/tentacle_serverd -cp conf/pandora_server.conf temp_package/etc/pandora/ -cp util/pandora_server temp_package/etc/init.d/ + cp conf/pandora_server.conf temp_package/etc/pandora/ + cp util/pandora_server temp_package/etc/init.d/ -cp -R util temp_package/usr/share/pandora_server -cp -R DEBIAN temp_package/ + cp -R util temp_package/usr/share/pandora_server + cp -R DEBIAN temp_package/ -echo "Remove the SVN files and other temp files." -for item in `find temp_package` -do - echo -n "." - echo $item | grep "svn" > /dev/null - #last command success - if [ $? -eq 0 ] - then - rm -rf $item - fi - - echo $item | grep "make_deb_package.sh" > /dev/null - #last command success - if [ $? -eq 0 ] - then - rm -rf $item - fi -done -echo "END" - -echo "Calcule md5sum for md5sums file control of package." -for item in `find temp_package` -do - echo -n "." - if [ ! -d $item ] - then - echo $item | grep "DEBIAN" > /dev/null + echo "Remove the SVN files and other temp files." + for item in `find temp_package` + do + echo -n "." + echo $item | grep "svn" > /dev/null #last command success - if [ $? -eq 1 ] + if [ $? -eq 0 ] then - md5=`md5sum $item | cut -d" " -f1` - - #delete "temp_package" in the path - final_path=${item#temp_package} - echo $md5" "$final_path >> temp_package/DEBIAN/md5sums + rm -rf $item fi - fi -done + + echo $item | grep "make_deb_package.sh" > /dev/null + #last command success + if [ $? -eq 0 ] + then + rm -rf $item + fi + done + echo "END" -echo "END" + echo "Calcule md5sum for md5sums file control of package." + for item in `find temp_package` + do + echo -n "." + if [ ! -d $item ] + then + echo $item | grep "DEBIAN" > /dev/null + #last command success + if [ $? -eq 1 ] + then + md5=`md5sum $item | cut -d" " -f1` + + #delete "temp_package" in the path + final_path=${item#temp_package} + echo $md5" "$final_path >> temp_package/DEBIAN/md5sums + fi + fi + done -echo "Make the package \"Pandorafms server\"." -dpkg-deb --build temp_package -mv temp_package.deb pandorafms.server_$pandora_console_version.deb -chmod 777 pandorafms.server_$pandora_console_version.deb + echo "END" -echo "Make the package \"libnet-traceroute-pureperl-perl\"." -cd temp_package -dh-make-perl --build --cpan Net::Traceroute::PurePerl -chmod 777 libnet-traceroute-pureperl-perl*.deb -mv libnet-traceroute-pureperl-perl*.deb .. -cd .. + echo "Make the package \"Pandorafms server\"." + dpkg-deb --build temp_package + mv temp_package.deb pandorafms.server_$pandora_console_version.deb + chmod 777 pandorafms.server_$pandora_console_version.deb +fi -echo "Make the package \"libnet-traceroute-perl\"." -cd temp_package -dh-make-perl --build --cpan Net::Traceroute -chmod 777 libnet-traceroute-perl*.deb -mv libnet-traceroute-perl*.deb .. -cd .. +if [ $package_cpan -eq 1 ] +then + echo "Make the package \"libnet-traceroute-pureperl-perl\"." + cd temp_package + dh-make-perl --build --cpan Net::Traceroute::PurePerl + chmod 777 libnet-traceroute-pureperl-perl*.deb + mv libnet-traceroute-pureperl-perl*.deb .. + cd .. + + echo "Make the package \"libnet-traceroute-perl\"." + cd temp_package + dh-make-perl --build --cpan Net::Traceroute + chmod 777 libnet-traceroute-perl*.deb + mv libnet-traceroute-perl*.deb .. + cd .. +fi echo "Delete the \"temp_package\" temp dir for job." -rm -rf temp_package +#rm -rf temp_package diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 80fbafeaa1..68e4862129 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -41,8 +41,8 @@ rm -rf $RPM_BUILD_ROOT #export perl_version=`rpm -q --queryformat='%{VERSION}' perl` # Temporal hack for For SLES 11 only, warning -export perl_version=5.10.0 -%define perl_version 5.10.0 +#export perl_version=5.10.0 +#%define perl_version 5.10.0 rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/bin/ @@ -54,7 +54,7 @@ mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/data_in/conf mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/data_in/md5 mkdir -p $RPM_BUILD_ROOT/var/log/pandora/ mkdir -p $RPM_BUILD_ROOT%{prefix}/pandora_server/conf/ -mkdir -p $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/$perl_version/ +mkdir -p $RPM_BUILD_ROOT/usr/lib/perl5/ # All binaries go to /usr/bin cp -aRf bin/pandora_server $RPM_BUILD_ROOT/usr/bin/ @@ -63,7 +63,7 @@ cp -aRf bin/tentacle_server $RPM_BUILD_ROOT/usr/bin/ cp -aRf conf/* $RPM_BUILD_ROOT%{prefix}/pandora_server/conf/ cp -aRf util $RPM_BUILD_ROOT%{prefix}/pandora_server/ -cp -aRf lib/* $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/$perl_version/ +cp -aRf lib/* $RPM_BUILD_ROOT/usr/lib/perl5/ cp -aRf AUTHORS COPYING ChangeLog README $RPM_BUILD_ROOT%{prefix}/pandora_server/ cp -aRf util/pandora_server $RPM_BUILD_ROOT/etc/init.d/ @@ -115,7 +115,7 @@ rm -Rf /etc/init.d/tentacle_serverd rm -Rf /etc/init.d/pandora_server rm -Rf %{prefix}pandora_server rm -Rf /var/log/pandora -rm -Rf /usr/lib/perl5/site_perl/%{perl_version}/PandoraFMS/ +rm -Rf /usr/lib/perl5/PandoraFMS/ rm -Rf /etc/pandora/pandora_server.conf rm -Rf /var/spool/pandora rm -Rf /etc/init.d/pandora_server /etc/init.d/tentacle_serverd @@ -135,7 +135,7 @@ rm -Rf /etc/logrotate.d/pandora /usr/bin/tentacle_server %defattr(755,pandora,root) -/usr/lib/perl5/site_perl/%{perl_version}/PandoraFMS/ +/usr/lib/perl5/PandoraFMS/ %{prefix}/pandora_server /var/log/pandora