[pve-devel] [PATCH conntrack-tool v2 2/5] add packaging support

Mira Limbeck m.limbeck at proxmox.com
Thu Feb 4 10:55:02 CET 2021


On 2/4/21 8:08 AM, Thomas Lamprecht wrote:
> On 03.02.21 15:25, Mira Limbeck wrote:
>> Signed-off-by: Mira Limbeck <m.limbeck at proxmox.com>
>> ---
>> v2:
>>   - unchanged
> Some nits/comments inline.
> You probably adapted this from proxmox-backup so my comments may hold true
> there too.
pmg-log-tracker actually
>
>>   .cargo/config        |  5 ++++
>>   Makefile             | 63 ++++++++++++++++++++++++++++++++++++++++++++
>>   debian/changelog     |  5 ++++
>>   debian/copyright     | 16 +++++++++++
>>   debian/debcargo.toml | 17 ++++++++++++
>>   debian/docs          |  1 +
>>   6 files changed, 107 insertions(+)
>>   create mode 100644 .cargo/config
>>   create mode 100644 Makefile
>>   create mode 100644 debian/changelog
>>   create mode 100644 debian/copyright
>>   create mode 100644 debian/debcargo.toml
>>   create mode 100644 debian/docs
>>
>> diff --git a/.cargo/config b/.cargo/config
>> new file mode 100644
>> index 0000000..3b5b6e4
>> --- /dev/null
>> +++ b/.cargo/config
>> @@ -0,0 +1,5 @@
>> +[source]
>> +[source.debian-packages]
>> +directory = "/usr/share/cargo/registry"
>> +[source.crates-io]
>> +replace-with = "debian-packages"
>> diff --git a/Makefile b/Makefile
>> new file mode 100644
>> index 0000000..8ea2f8a
>> --- /dev/null
>> +++ b/Makefile
>> @@ -0,0 +1,63 @@
>> +include /usr/share/dpkg/pkg-info.mk
>> +include /usr/share/dpkg/architecture.mk
>> +
>> +PACKAGE=pve-conntrack-tool
>> +
>> +GITVERSION:=$(shell git rev-parse HEAD)
>> +
>> +DEB=${PACKAGE}_${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:
> We normally try to use a more Debian conform build directory, like:
>
> BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
>
> This way one can also easily set their own via a make parameter.
>
>
>> +	rm -rf build
>> +	debcargo package \
>> +	  --config debian/debcargo.toml \
>> +	  --changelog-ready \
>> +	  --no-overlay-write-back \
>> +	  --directory build \
>> +	  $(PACKAGE) \
>> +	  $(shell dpkg-parsechangelog -l debian/changelog -SVersion | sed -e 's/-.*//')
>> +	rm build/Cargo.lock
>> +	find build/debian -name "*.hint" -delete
> can we do all in a temporary directory and do a rename at the end? making this
> target actin a bit more "atomic".
Yes, will change that in v3
>
>> +
>> +.PHONY: deb
>> +deb: $(DEB)
>> +$(DEB): build
>> +	cd build; dpkg-buildpackage -b -us -uc --no-pre-clean --build-profiles=nodoc
> is the `nodoc` actually required? Is it always generated by debcargo, as I do not
> see any d/control like reference to it.
>
>> +	lintian $(DEB)
>> +
>> +.PHONY: dsc
>> +dsc: $(DSC)
>> +$(DSC): build
>> +	cd build; 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 at repo.proxmox.com -- upload --product pve --dist buster --arch ${DEB_BUILD_ARCH}
>> +
>> +.PHONY: distclean
>> +distclean: clean
>> +
>> +.PHONY: clean
>> +clean:
>> +	rm -rf *.deb ${PACKAGE}-* *.buildinfo *.changes *.dsc rust-${PACKAGE}_*.tar.?z build/
>> +	find . -name '*~' -exec rm {} ';'
>> diff --git a/debian/changelog b/debian/changelog
>> new file mode 100644
>> index 0000000..700e739
>> --- /dev/null
>> +++ b/debian/changelog
>> @@ -0,0 +1,5 @@
>> +rust-pve-conntrack-tool (1.0.0-1) pve; urgency=medium
>> +
>> +  * Initial release.
>> +
>> + -- Mira Limbeck <m.limbeck at proxmox.com>  Thu, 08 Oct 2020 14:04:19 +0200
>> diff --git a/debian/copyright b/debian/copyright
>> new file mode 100644
>> index 0000000..4d6f36a
>> --- /dev/null
>> +++ b/debian/copyright
>> @@ -0,0 +1,16 @@
>> +Copyright (C) 2020 Proxmox Server Solutions GmbH
> 2020 - 2021

Haven't touched the patch at all since the first series, sorry about 
that. Will fix all these things in v3.

>
>> +
>> +This software is written by Proxmox Server Solutions GmbH <support at proxmox.com>
>> +
>> +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 <http://www.gnu.org/licenses/>.
>> diff --git a/debian/debcargo.toml b/debian/debcargo.toml
>> new file mode 100644
>> index 0000000..66c3e07
>> --- /dev/null
>> +++ b/debian/debcargo.toml
>> @@ -0,0 +1,17 @@
>> +overlay = "."
>> +crate_src_path = ".."
>> +
>> +[source]
>> +maintainer = "Proxmox Support Team <support at proxmox.com>"
>> +section = "admin"
>> +homepage = "http://www.proxmox.com"
>> +vcs_git = "git://git.proxmox.com/git/pve-conntrack-tool.git"
>> +vcs_browser = "https://git.proxmox.com/?p=pve-conntrack-tool.git;a=summary"
>> +
>> +[package]
>> +summary = "PVE Conntrack Tool"
>> +description = "Tool to dump and import conntracks"
>> +
>> +[packages.bin]
>> +build-depends = ["libmnl-dev", "libnetfilter-conntrack-dev"]
>> +depends = ["libmnl0", "libnetfilter-conntrack3"]
>> diff --git a/debian/docs b/debian/docs
>> new file mode 100644
>> index 0000000..8696672
>> --- /dev/null
>> +++ b/debian/docs
>> @@ -0,0 +1 @@
>> +debian/SOURCE
>>




More information about the pve-devel mailing list