Skip to site navigation (Press enter)

[Opsview-checkins] [opsview-base] [23] revert packaging changes - opsview-base goes back as svn:external

Commit messages for Opsview's subversion repository Tue, 31 Jul 2012 01:54:11 -0700

Title: [opsview-base] [23] revert packaging changes - opsview-base goes back as svn:external

Revision: 23
Author: aburzynski
Date: 2012-07-31 09:54:03 +0100 (Tue, 31 Jul 2012)

Log Message

revert packaging changes - opsview-base goes back as svn:external

Modified Paths

trunk/Makefile
trunk/debian/opsview-agent.install
trunk/debian/opsview-base.install
trunk/debian/rules
trunk/opsview-agent.spec.in
trunk/opsview-base.spec.in


Added Paths

trunk/version.in


Removed Paths

trunk/tools/

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2012-07-30 16:36:52 UTC (rev 22)
+++ trunk/Makefile	2012-07-31 08:54:03 UTC (rev 23)
@@ -22,51 +22,9 @@
 # If you run "make install DESTDIR=/tmp/build", then will install files into /tmp/build for packaging
 # Check that /usr/local/nagios does not have any files in there
 
-VERSION = 4.2.0
-REVISION := $(shell ./tools/get_version)
-RELEASE=1
-WORKDIR := $(shell pwd)
+# Expects VERSION to be set
+RELEASE = 1
 
-ifneq ($(origin REVISION),undefined)
-	BUILD := ${VERSION}.${REVISION}
-else
-	BUILD := ${VERSION}
-endif
-
-ARCH = $(shell uname -m)
-DIST = $(shell lsb_release -si)
-DISTRIB = $(shell echo $$os | sed -e 's/^rh//' -e 's/centos/ct/')
-IS_LINUX = 0
-
-# Do calculations for build purposes
-ifeq ($(DIST),Debian)
-  PACKAGE_MACRO=debpkg
-  PACKAGE_UPLOAD_FILES=../*.deb ../*.changes
-  IS_LINUX=1
-else ifeq ($(DIST),Ubuntu)
-  PACKAGE_MACRO=debpkg
-  PACKAGE_UPLOAD_FILES=../*.deb ../*.changes
-  IS_LINUX=1
-else ifeq ($(DIST),RedHatEnterpriseServer)
-  PACKAGE_MACRO=rpmpkg
-  PACKAGE_UPLOAD_FILES=${WORKDIR}/rpmbuild-files/*/opsview-base-*.rpm ${WORKDIR}/rpmbuild-files/*/*/opsview-base-*.rpm
-  RPMBUILD_DEFINE_EXTRA=--define "rhel_version 1"
-  IS_LINUX=1
-else ifeq ($(DIST),CentOS)
-  PACKAGE_MACRO=rpmpkg
-  PACKAGE_UPLOAD_FILES=${WORKDIR}/rpmbuild-files/*/opsview-base-*.rpm ${WORKDIR}/rpmbuild-files/*/*/opsview-base-*.rpm
-  RPMBUILD_DEFINE_EXTRA=--define "centos_version 1"
-  IS_LINUX=1
-else ifeq ($(DIST),SUSE LINUX)
-  PACKAGE_MACRO=rpmpkg
-  PACKAGE_UPLOAD_FILES=${WORKDIR}/rpmbuild-files/*/opsview-base-*.rpm ${WORKDIR}/rpmbuild-files/*/*/opsview-base-*.rpm
-  IS_LINUX=1
-else  # Catches Solaris
-  PACKAGE_MACRO=solpkg
-  PACKAGE_UPLOAD_FILES=${WORKDIR}/opsview-base-*.pkg.gz
-endif
-
-
 NAGIOS = nagios-3.2.3
 NAGIOSPLUG = nagios-plugins-1.4.15
 NAGIOSPLUG_CONFIGURE_PERL_MODULES = --enable-perl-modules
@@ -183,7 +141,7 @@
 CUSTOMER =
 
 GENERATED = ${NAGIOS} ${NAGIOSPLUG} ${NRPE} ${SCRIPT} ${VALIDATION} ${NSCA} ${JSCAL} \
-	${NDOUTILS} nrpe.cfg opsview-base.spec version opsview-agent.spec \
+	${NDOUTILS} nrpe.cfg opsview-base.spec opsview-agent.spec \
 	allmibs.tar.gz ${CHECK_RADIUS_IH} ${AUTOSSH} ${OVERLIB} ${HYPERGRAPH} ${NMIS} ${FABTABULOUS} \
 	${NAGVIS} ${DATATABLES} ${TIMELINE} ${TANGOICONS} ${WEBICONS} ${ICOJOY4} ${FLOT} \
 	${JQUERYSPARKLINES} ${EASYXDM} ${SHOWDOWN}
@@ -194,21 +152,6 @@
 	$(MAKE) NAGIOSPLUG_CONFIGURE_PERL_MODULES=
 	$(MAKE) all
 
-package: package-clean all
-	$(MAKE) $(PACKAGE_MACRO)
-
-package-upload:
-	PACKAGE_UPLOAD_FILES="$(PACKAGE_UPLOAD_FILES)" tools/package_upload
-
-package-clean:
-	$(MAKE) $(PACKAGE_MACRO)-clean
-
-debpkg-clean solpkg-clean:
-	rm -f $(PACKAGE_UPLOAD_FILES) debian/changelog debian/changelog.dch
-
-rpmpkg-clean:
-	sudo rm -rf $(PACKAGE_UPLOAD_FILES) rpmbuild rpmbuild-files
-
 install-fladmin:
 	build-aux/fladmin -r ${DESTDIR} install filelist
 
@@ -226,12 +169,11 @@
 	$(MAKE) install
 
 version:
-	echo ${BUILD} > version
+	perl -pe 's/%VERSION%/${VERSION}/g;' [email protected] > $@
 
 debpkg:
 	cp debian/changelog.in debian/changelog
-	dch --newversion="${BUILD}-${RELEASE}`lsb_release -cs`1" "Auto generated"
-	dpkg-buildpackage -I.svn -i.svn -rfakeroot -uc -b
+	VERSION=`cat version` && cd debian && build/mkdeb $$VERSION-1 ..
 
 # Choose /tmp, but name specific to branch
 # If choose within staging, lots of recursion occurs
@@ -241,8 +183,7 @@
 	mksolpkg -b -s /tmp/opsview-base
 
 rpmpkg: tar
-	mkdir -p ${WORKDIR}/rpmbuild-files/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-	rpmbuild --define "__arch_install_post /bin/true" --define "_topdir ${WORKDIR}/rpmbuild-files" --define "distribution ${DISTRIB}" ${RPMBUILD_DEFINE_EXTRA} --clean -ta opsview-base-*.tar.gz
+	sudo rpmbuild -ta --clean ../opsview-base-${VERSION}.tar.gz
 
 allmibs.tar.gz:
 	cd mibs && tar --gzip -cf ../allmibs.tar.gz *
@@ -265,20 +206,25 @@
 	${INSTALL} -d -o $(NAGIOS_USER) -g $(NAGIOS_GROUP) -m 0775 ${DESTDIR}/${SNMP_DIR}/load
 	${INSTALL} -d -o $(NAGIOS_USER) -g $(NAGIOS_GROUP) -m 0775 ${DESTDIR}/${LIB_DIR}
 
-tar: opsview-base.spec version
-	rm -f ../opsview-base-${BUILD} ../opsview-base-${BUILD}.tar ../opsview-base-${BUILD}.tar.gz
-	cd .. && ln -s ${WORKDIR} opsview-base-${BUILD}
-	cd .. && tar --gzip -h -cf opsview-base-${BUILD}.tar.gz --exclude=.svn --exclude=".git*" --exclude=windows_agent_pkg opsview-base-${BUILD}
-	mv ../opsview-base-${BUILD}.tar.gz .
-	rm ../opsview-base-${BUILD}
+tar: opsview-base.spec
+	if [ x${VERSION} = "x" ] ; then echo "Need version" ; false; fi
+	$(MAKE) clean
+	$(MAKE) opsview-base.spec version
+	rm -f ../opsview-base-${VERSION}
+	cd .. && ln -s opsview-base opsview-base-${VERSION}
+	cd .. && tar -h -cf opsview-base-${VERSION}.tar --exclude=.svn --exclude=".git*" --exclude=windows_agent_pkg opsview-base-${VERSION}
+	cd .. && gzip -f opsview-base-${VERSION}.tar
+	cd .. && rm opsview-base-${VERSION}
 
-agent-tar: opsview-agent.spec version
-	rm -f ../opsview-agent-${BUILD}
-	cd .. && ln -s opsview-base opsview-agent-${BUILD}
-	cd .. && tar -h -cf opsview-agent-${BUILD}.tar --exclude=.svn --exclude=".git*" opsview-agent-${BUILD}
-	cd .. && gzip opsview-agent-${BUILD}.tar
-	mv ../opsview-agent-${BUILD}.tar.gz .
-	cd .. && rm opsview-agent-${BUILD}
+agent-tar: opsview-agent.spec
+	if [ x${VERSION} = "x" ] ; then echo "Need version" ; false; fi
+	$(MAKE) clean
+	$(MAKE) opsview-agent.spec version
+	rm -f ../opsview-agent-${VERSION}
+	cd .. && ln -s opsview-base opsview-agent-${VERSION}
+	cd .. && tar -h -cf opsview-agent-${VERSION}.tar --exclude=.svn --exclude=".git*" opsview-agent-${VERSION}
+	cd .. && gzip opsview-agent-${VERSION}.tar
+	cd .. && rm opsview-agent-${VERSION}
 
 agent: ${NAGIOSPLUG} ${NRPE} nrpe.cfg
 
@@ -366,10 +312,10 @@
 	$(MAKE) DESTDIR=${DESTDIR} nrpe.cfg-install
 
 opsview-base.spec: opsview-base.spec.in
-	perl -pe 's/%VERSION%/${BUILD}/g; s/%RELEASE%/${RELEASE}/g' opsview-base.spec.in > opsview-base.spec
+	perl -pe 's/%VERSION%/${VERSION}/g; s/%RELEASE%/${RELEASE}/g' opsview-base.spec.in > opsview-base.spec
 
 opsview-agent.spec: opsview-agent.spec.in
-	perl -pe 's/%VERSION%/${BUILD}/g; s/%RELEASE%/${RELEASE}/g' opsview-agent.spec.in > opsview-agent.spec
+	perl -pe 's/%VERSION%/${VERSION}/g; s/%RELEASE%/${RELEASE}/g' opsview-agent.spec.in > opsview-agent.spec
 
 
 nagios: ${NAGIOS}
@@ -1023,4 +969,5 @@
 uninstall:
 	build-aux/fladmin -r ${DESTDIR} uninstall filelist
 
-.PHONY: version
+# We remove this so that the version file is only generated once
+#.PHONY: version

Modified: trunk/debian/opsview-agent.install
===================================================================
--- trunk/debian/opsview-agent.install	2012-07-30 16:36:52 UTC (rev 22)
+++ trunk/debian/opsview-agent.install	2012-07-31 08:54:03 UTC (rev 23)
@@ -1,6 +1,6 @@
-debian/opsview-base/usr/local/nagios/libexec /usr/local/nagios
-debian/opsview-base/usr/local/nagios/perl /usr/local/nagios
-debian/opsview-base/usr/local/nagios/bin/nrpe /usr/local/nagios/bin
-debian/opsview-base/usr/local/nagios/bin/send_nsca /usr/local/nagios/bin
-debian/opsview-base/usr/local/nagios/etc/nrpe.cfg /usr/local/nagios/etc
-debian/opsview-base/usr/local/nagios/share/locale /usr/local/nagios/share
+debian/tmp/usr/local/nagios/libexec /usr/local/nagios
+debian/tmp/usr/local/nagios/perl /usr/local/nagios
+debian/tmp/usr/local/nagios/bin/nrpe /usr/local/nagios/bin
+debian/tmp/usr/local/nagios/bin/send_nsca /usr/local/nagios/bin
+debian/tmp/usr/local/nagios/etc/nrpe.cfg /usr/local/nagios/etc
+debian/tmp/usr/local/nagios/share/locale /usr/local/nagios/share

Modified: trunk/debian/opsview-base.install
===================================================================
--- trunk/debian/opsview-base.install	2012-07-30 16:36:52 UTC (rev 22)
+++ trunk/debian/opsview-base.install	2012-07-31 08:54:03 UTC (rev 23)
@@ -1,11 +1,11 @@
-debian/opsview-base/usr/local/nagios/bin /usr/local/nagios
-debian/opsview-base/usr/local/nagios/etc /usr/local/nagios
-debian/opsview-base/usr/local/nagios/installer /usr/local/nagios
-debian/opsview-base/usr/local/nagios/lib /usr/local/nagios
-debian/opsview-base/usr/local/nagios/libexec /usr/local/nagios
-debian/opsview-base/usr/local/nagios/nagvis /usr/local/nagios
-debian/opsview-base/usr/local/nagios/nmis /usr/local/nagios
-debian/opsview-base/usr/local/nagios/sbin /usr/local/nagios
-debian/opsview-base/usr/local/nagios/share /usr/local/nagios
-debian/opsview-base/usr/local/nagios/snmp /usr/local/nagios
-debian/opsview-base/usr/local/nagios/var /usr/local/nagios
+debian/tmp/usr/local/nagios/bin /usr/local/nagios
+debian/tmp/usr/local/nagios/etc /usr/local/nagios
+debian/tmp/usr/local/nagios/installer /usr/local/nagios
+debian/tmp/usr/local/nagios/lib /usr/local/nagios
+debian/tmp/usr/local/nagios/libexec /usr/local/nagios
+debian/tmp/usr/local/nagios/nagvis /usr/local/nagios
+debian/tmp/usr/local/nagios/nmis /usr/local/nagios
+debian/tmp/usr/local/nagios/sbin /usr/local/nagios
+debian/tmp/usr/local/nagios/share /usr/local/nagios
+debian/tmp/usr/local/nagios/snmp /usr/local/nagios
+debian/tmp/usr/local/nagios/var /usr/local/nagios

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2012-07-30 16:36:52 UTC (rev 22)
+++ trunk/debian/rules	2012-07-31 08:54:03 UTC (rev 23)
@@ -9,6 +9,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+BUILDDIR := debian/tmp
+DESTDIR=$(CURDIR)/$(BUILDDIR)
+
+
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -31,7 +35,7 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/opsview-base all
+	$(MAKE) DESTDIR=$(DESTDIR)
 	#docbook-to-man debian/opsview-base.sgml > opsview-base.1
 
 	touch $@
@@ -53,7 +57,7 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/opsview-base.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/opsview-base install
+	$(MAKE) install DESTDIR=$(DESTDIR)
 
 
 # Build architecture-independent files here.

Modified: trunk/opsview-agent.spec.in
===================================================================
--- trunk/opsview-agent.spec.in	2012-07-30 16:36:52 UTC (rev 22)
+++ trunk/opsview-agent.spec.in	2012-07-31 08:54:03 UTC (rev 23)
@@ -31,15 +31,15 @@
 %setup -q
 
 %build
-make DESTDIR=%{buildroot} agent
+make agent
 
 %install
-make install-agent DESTDIR=%{buildroot}
-mkdir -p %{buildroot}/etc/init.d/
-cp support_files/opsview-agent %{buildroot}/etc/init.d/opsview-agent
+make install-agent DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/init.d/
+cp support_files/opsview-agent $RPM_BUILD_ROOT/etc/init.d/opsview-agent
 
 %clean
-rm -fr %{buildroot}
+rm -fr $RPM_BUILD_ROOT
 
 %pre
 if [ "`/bin/uname -i`" != "%{_arch}" ]; then

Modified: trunk/opsview-base.spec.in
===================================================================
--- trunk/opsview-base.spec.in	2012-07-30 16:36:52 UTC (rev 22)
+++ trunk/opsview-base.spec.in	2012-07-31 08:54:03 UTC (rev 23)
@@ -69,20 +69,15 @@
 # This is not so risky, because debian/rules sets DESTDIR at build
 # time too, so other software is not likely to be affected
 %build
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
+make DESTDIR=$RPM_BUILD_ROOT
 
-make DESTDIR=%{buildroot} clean
-make DESTDIR=%{buildroot} all
-
-
 %install
-make DESTDIR=%{buildroot} install
-mkdir -p %{buildroot}/etc/init.d/
-cp support_files/opsview-agent %{buildroot}/etc/init.d/opsview-agent
+make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/init.d/
+cp support_files/opsview-agent $RPM_BUILD_ROOT/etc/init.d/opsview-agent
 
 %clean
-rm -fr %{buildroot}
+rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-,nagios,nagios)

Copied: trunk/version.in (from rev 10, trunk/version.in)
===================================================================
--- trunk/version.in	                        (rev 0)
+++ trunk/version.in	2012-07-31 08:54:03 UTC (rev 23)
@@ -0,0 +1 @@
+%VERSION%

_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins