From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DAD6C73740; Fri, 28 May 2021 16:30:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D7C79ACAE; Fri, 28 May 2021 16:30:11 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 2F70AAC07; Fri, 28 May 2021 16:30:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id F1F784179F; Fri, 28 May 2021 16:30:07 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Fri, 28 May 2021 16:29:41 +0200 Message-Id: <20210528143002.16190-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210528143002.16190-1-f.ebner@proxmox.com> References: <20210528143002.16190-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.001 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_SHORT 0.001 Use of a URL Shortener for very short URL SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [architecture.mk, proxmox.com, gnu.org, pkg-info.mk] Subject: [pve-devel] [PATCH v5 proxmox-apt 02/23] add files for Debian packaging X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 May 2021 14:30:11 -0000 The Makefile is based on the one from Mira's conntrack series, as it already got some review. Signed-off-by: Fabian Ebner --- Changes from v4: * also call cargo clean with make clean .gitignore | 5 ++++ Makefile | 65 ++++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 5 ++++ debian/copyright | 16 +++++++++++ debian/debcargo.toml | 7 +++++ 5 files changed, 98 insertions(+) create mode 100644 Makefile create mode 100644 debian/changelog create mode 100644 debian/copyright create mode 100644 debian/debcargo.toml diff --git a/.gitignore b/.gitignore index 24917d4..db6f13e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,8 @@ Cargo.lock target/ tests/sources.list.d.actual tests/sources.list.d.digest +proxmox-apt-*/ +*proxmox-apt*.buildinfo +*proxmox-apt*.tar.?z +*proxmox-apt*.changes +*proxmox-apt*.deb diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..42665c8 --- /dev/null +++ b/Makefile @@ -0,0 +1,65 @@ +include /usr/share/dpkg/pkg-info.mk +include /usr/share/dpkg/architecture.mk + +PACKAGE=proxmox-apt +BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM) +BUILDDIR_TMP ?= $(BUILDDIR).tmp + +DEB=librust-$(PACKAGE)-dev_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb +DSC=rust-$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc + +ifeq ($(BUILD_MODE), release) +CARGO_BUILD_ARGS += --release +COMPILEDIR := target/release +else +COMPILEDIR := target/debug +endif + +all: cargo-build $(SUBDIRS) + +.PHONY: cargo-build +cargo-build: + cargo build $(CARGO_BUILD_ARGS) + +.PHONY: build +build: + rm -rf $(BUILDDIR) $(BUILDDIR_TMP); mkdir $(BUILDDIR_TMP) + debcargo package \ + --config debian/debcargo.toml \ + --changelog-ready \ + --no-overlay-write-back \ + --directory $(BUILDDIR_TMP) \ + $(PACKAGE) \ + $(shell dpkg-parsechangelog -l debian/changelog -SVersion | sed -e 's/-.*//') + rm -f $(BUILDDIR_TMP)/Cargo.lock + find $(BUILDDIR_TMP)/debian -name "*.hint" -delete + mv $(BUILDDIR_TMP) $(BUILDDIR) + +.PHONY: deb +deb: $(DEB) +$(DEB): build + cd $(BUILDDIR); dpkg-buildpackage -b -us -uc --no-pre-clean + lintian $(DEB) + +.PHONY: dsc +dsc: $(DSC) +$(DSC): build + cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d -nc + lintian $(DSC) + +.PHONY: dinstall +dinstall: $(DEB) + dpkg -i $(DEB) + +.PHONY: upload +upload: $(DEB) $(DBG_DEB) + tar cf - $(DEB) $(DBG_DEB) | ssh -X repoman@repo.proxmox.com -- upload --product pbs,pmg,pve --dist buster --arch $(DEB_BUILD_ARCH) + +.PHONY: distclean +distclean: clean + +.PHONY: clean +clean: + cargo clean + rm -rf *.deb *.buildinfo *.changes *.dsc rust-$(PACKAGE)_*.tar.?z $(BUILDDIR) $(BUILDDIR_TMP) + find . -name '*~' -exec rm {} ';' diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..11e26ed --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +rust-proxmox-apt (0.1.0-1) unstable; urgency=medium + + * Initial release. + + -- Proxmox Support Team Thu, 18 Feb 2021 10:20:44 +0100 diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..5661ef6 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,16 @@ +Copyright (C) 2021 Proxmox Server Solutions GmbH + +This software is written by Proxmox Server Solutions GmbH + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . diff --git a/debian/debcargo.toml b/debian/debcargo.toml new file mode 100644 index 0000000..74e3854 --- /dev/null +++ b/debian/debcargo.toml @@ -0,0 +1,7 @@ +overlay = "." +crate_src_path = ".." +maintainer = "Proxmox Support Team " + +[source] +vcs_git = "git://git.proxmox.com/git/proxmox-apt.git" +vcs_browser = "https://git.proxmox.com/?p=proxmox-apt.git" -- 2.20.1