buildsys: cleanup and add target to build DSC

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index 15fd84d382d1d7a7c3af860bf157355f8acde5c5..21816eda1f6676f0b6884ba33cc1d0f2f6ec315f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@ VERSION=5.1
 PACKAGE=libpve-access-control
 PKGREL=5
 
 PACKAGE=libpve-access-control
 PKGREL=5
 

+BUILDDIR ?= ${PACKAGE}-${VERSION}
+

 DESTDIR=
 PREFIX=/usr
 BINDIR=${PREFIX}/bin
 DESTDIR=
 PREFIX=/usr
 BINDIR=${PREFIX}/bin


@@ -20,6 +22,7 @@ ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb

+DSC=${PACKAGE}_${VERSION}-${PKGREL}.dsc

 
 # this requires package pve-doc-generator
 export NOVIEW=1
 
 # this requires package pve-doc-generator
 export NOVIEW=1


@@ -58,23 +61,32 @@ test:
        perl -I. ./pveum verifyapi
        perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->verify_api();"
 
        perl -I. ./pveum verifyapi
        perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->verify_api();"
 

+${BUILDDIR}:
+       rm -rf ${BUILDDIR}
+       rsync -a * ${BUILDDIR}
+       echo "git clone git://git.proxmox.com/git/pve-access-control.git\\ngit checkout ${GITVERSION}" > ${BUILDDIR}/debian/SOURCE
+

 .PHONY: deb
 deb: ${DEB}
 .PHONY: deb
 deb: ${DEB}

-${DEB}:
-       rm -rf build
-       rsync -a * build
-       echo "git clone git://git.proxmox.com/git/pve-access-control.git\\ngit checkout ${GITVERSION}" >build/debian/SOURCE
-       cd build; dpkg-buildpackage -b -us -uc
+${DEB}: ${BUILDDIR}
+       cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc

        lintian ${DEB}
 
        lintian ${DEB}
 

+.PHONY: dsc
+dsc: ${DSC}
+${DSC}: ${BUILDDIR}
+       cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d
+       lintian ${DSC}
+

 .PHONY: upload
 upload: ${DEB}
        tar cf - ${DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
 
 .PHONY: clean
 clean:
 .PHONY: upload
 upload: ${DEB}
        tar cf - ${DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
 
 .PHONY: clean
 clean:

+       rm -rf ${BUILDDIR}

        make cleanup-docgen
        make cleanup-docgen

-       rm -rf build *.deb *.buildinfo *.changes
+       rm -rf *.deb *.buildinfo *.changes ${PACKAGE}*.tar.gz *.dsc

        find . -name '*~' -exec rm {} ';'
 
 .PHONY: distclean
        find . -name '*~' -exec rm {} ';'
 
 .PHONY: distclean

diff --git a/debian/control b/debian/control
index a174d026e261919f7731dc60343757be280f8b6a..2622c9e0adb48e59070ab1c10b7fc758b8151d46 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,13 +10,12 @@ Build-Depends: debhelper (>= 9.0.0~),
                perl (>= 5.10.0-19),
                pve-cluster,
                pve-doc-generator (>= 5.3-3),
                perl (>= 5.10.0-19),
                pve-cluster,
                pve-doc-generator (>= 5.3-3),

-Standards-Version: 3.9.5
+Standards-Version: 3.9.8

 Homepage: http://www.proxmox.com
 
 Package: libpve-access-control
 Architecture: any
 Depends: libauthen-pam-perl,
 Homepage: http://www.proxmox.com
 
 Package: libpve-access-control
 Architecture: any
 Depends: libauthen-pam-perl,

-         libc6 (>= 2.3),

          libcrypt-openssl-random-perl,
          libcrypt-openssl-rsa-perl,
          libjson-perl,
          libcrypt-openssl-random-perl,
          libcrypt-openssl-rsa-perl,
          libjson-perl,


@@ -29,6 +28,7 @@ Depends: libauthen-pam-perl,
          libwww-perl,
          perl (>= 5.6.0-16),
          pve-cluster (>= 5.0-34),
          libwww-perl,
          perl (>= 5.6.0-16),
          pve-cluster (>= 5.0-34),

+         ${misc:Depends},

          ${perl:Depends},
 Description: Proxmox VE access control library
  This package contains the role based user management and access
          ${perl:Depends},
 Description: Proxmox VE access control library
  This package contains the role based user management and access

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0