From a8213c0e2cfd2fcb1289b684bcc0cd62dbfa1c92 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 20 Nov 2017 12:57:11 +0100 Subject: [PATCH] build pmg-installer package --- Makefile | 15 ++++++++++++--- debian/changelog | 6 ++++++ debian/pmg-installer.install | 9 +++++++++ debian/rules | 17 +++++------------ 4 files changed, 32 insertions(+), 15 deletions(-) create mode 100644 debian/pmg-installer.install diff --git a/Makefile b/Makefile index e04f829..a6f3517 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,9 @@ PKGVER=5.0 PKGREL=8 PVE_DEB=pve-installer_${PKGVER}-${PKGREL}_all.deb +PMG_DEB=pmg-installer_${PKGVER}-${PKGREL}_all.deb + +DEBS = ${PVE_DEB} ${PMG_DEB} INSTALLER_SOURCES= \ unconfigured.sh \ @@ -26,11 +29,12 @@ all: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES} country.dat: country.pl ./country.pl > country.dat -deb: ${PVE_DEB} -${PVE_DEB}: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES} +deb: ${DEBS} +${DEBS}: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES} rsync -a * build cd build; dpkg-buildpackage -b -us -uc lintian -X man ${PVE_DEB} + lintian -X man ${PMG_DEB} .phony: install install: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES} @@ -60,8 +64,13 @@ check-pve: ${PVE_DEB} test.img dpkg -X ${PVE_DEB} testdir G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img +check-pmg: ${PMG_DEB} test.img + rm -rf testdir + dpkg -X ${PMG_DEB} testdir + G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img + .phony: clean clean: make -C html-common clean - rm -rf *~ *.deb target build packages packages.tmp test.img pve-final.pkglist *.buildinfo *.changes country.dat + rm -rf *~ *.deb target build packages packages.tmp testdir test.img pve-final.pkglist *.buildinfo *.changes country.dat find . -name '*~' -exec rm {} ';' diff --git a/debian/changelog b/debian/changelog index 9055247..7c340dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pve-installer (5.0-8) unstable; urgency=medium + + * add support for multiple products (pve, pmg) + + -- Proxmox Support Team Mon, 20 Nov 2017 12:47:44 +0100 + pve-installer (5.0-7) unstable; urgency=medium * kill dhclient before rebooting diff --git a/debian/pmg-installer.install b/debian/pmg-installer.install new file mode 100644 index 0000000..e70675f --- /dev/null +++ b/debian/pmg-installer.install @@ -0,0 +1,9 @@ +proxlogo.png /var/lib/pve-installer +html-pmg/page1.htm /var/lib/pve-installer/html +html-pmg/passwd.htm /var/lib/pve-installer/html +html-pmg/extract1-license.htm /var/lib/pve-installer/html +html-pmg/extract2-rulesystem.htm /var/lib/pve-installer/html +html-pmg/extract3-spam.htm /var/lib/pve-installer/html +html-pmg/extract4-virus.htm /var/lib/pve-installer/html +html-pmg/fail.htm /var/lib/pve-installer/html +html-pmg/success.htm /var/lib/pve-installer/html diff --git a/debian/rules b/debian/rules index 92a2f1a..382f2fc 100755 --- a/debian/rules +++ b/debian/rules @@ -3,24 +3,17 @@ # output every command that modifies files on the build system. #DH_VERBOSE = 1 -PACKAGE = $(shell dh_listpackages) -SETUPFN = "unknown" - -ifeq (${PACKAGE},pve-installer) -SETUPFN = "ProxmoxInstallerSetup-pve.pm" -endif - -ifeq (${PACKAGE},pmg-installer) -SETUPFN = "ProxmoxInstallerSetup-pmg.pm" -endif +SETUPFN = "/usr/share/perl5/ProxmoxInstallerSetup.pm" %: dh $@ override_dh_auto_install: - install -D -m 0644 ${SETUPFN} $(CURDIR)/debian/${PACKAGE}/usr/share/perl5/ProxmoxInstallerSetup.pm - dh_auto_install $@ + install -D -m 0644 ProxmoxInstallerSetup-pve.pm $(CURDIR)/debian/pve-installer/${SETUPFN} + install -D -m 0644 ProxmoxInstallerSetup-pmg.pm $(CURDIR)/debian/pmg-installer/${SETUPFN} + dh_auto_install --destdir debian/pve-installer + dh_auto_install --destdir debian/pmg-installer override_dh_auto_test: # do nothing here -- 2.39.2