From 931e58dcf2228be420c471ae8e9366097061f914 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Fri, 23 Dec 2022 13:49:34 +0100 Subject: initial attempt at a debian package Notably missing: * manual pages * autopkgtests --- debian/changelog | 5 +++++ debian/control | 28 ++++++++++++++++++++++++++++ debian/copyright | 31 +++++++++++++++++++++++++++++++ debian/debvm.docs | 1 + debian/debvm.install | 2 ++ debian/rules | 4 ++++ debian/source/format | 1 + debvm-create | 2 +- 8 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 debian/changelog create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/debvm.docs create mode 100644 debian/debvm.install create mode 100755 debian/rules create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..dc1480a --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +debvm (0) UNRELEASED; urgency=medium + + * Initial release. + + -- Helmut Grohne Fri, 23 Dec 2022 12:53:45 +0100 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..b575797 --- /dev/null +++ b/debian/control @@ -0,0 +1,28 @@ +Source: debvm +Maintainer: Helmut Grohne +Build-Depends: debhelper-compat (= 13) +Section: admin +Priority: optional +Standards-Version: 4.6.2 +Rules-Requires-Root: no +Homepage: https://salsa.debian.org/helmutg/debvm/ + +Package: debvm +Architecture: all +Depends: + ${misc:Depends}, + e2fsprogs, + genext2fs, + mmdebstrap (>= 1.2.3), + qemu-kvm | qemu-system-arm | qemu-system-system-mips | qemu-system-misc | qemu-system-ppc | qemu-system-x86, +Recommends: + arch-test, + binfmt-support, + qemu-system, + qemu-user-static, + uidmap, +Description: create and run virtual machines for various Debian releases and architectures + The tool debvm-create can be used to create a virtual machine image and + the tool debvm-run can be used to run such a machine image. Their purpose + primarily is testing software using qemu as a containment technology. + These are relatively thin wrappers around mmdebstrap and qemu. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..c2201cf --- /dev/null +++ b/debian/copyright @@ -0,0 +1,31 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: debvm +Upstream-Contact: Helmut Grohne +Source: https://salsa.debian.org/helmutg/debvm/ + +Files: * +Copyright: + 2022 Helmut Grohne + 2022 Johannes Schauer Marin Rodrigues + 2022 Jochen Sprickerhof +License: MIT + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + The software is provided "as is", without warranty of any kind, express or + implied, including but not limited to the warranties of merchantability, + fitness for a particular purpose and noninfringement. In no event shall the + authors or copyright holders be liable for any claim, damages or other + liability, whether in an action of contract, tort or otherwise, arising + from, out of or in connection with the software or the use or other dealings + in the software. diff --git a/debian/debvm.docs b/debian/debvm.docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/debian/debvm.docs @@ -0,0 +1 @@ +README.md diff --git a/debian/debvm.install b/debian/debvm.install new file mode 100644 index 0000000..2ef7d56 --- /dev/null +++ b/debian/debvm.install @@ -0,0 +1,2 @@ +debvm-create usr/bin +debvm-run usr/bin diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..2d33f6a --- /dev/null +++ b/debian/rules @@ -0,0 +1,4 @@ +#!/usr/bin/make -f + +%: + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debvm-create b/debvm-create index a8f164d..be24358 100755 --- a/debvm-create +++ b/debvm-create @@ -198,7 +198,7 @@ fi set -- --skip=cleanup/apt "$@" -# We need /var/lib/dpkg/available for dpkg --set-selections to work. +# Make dpkg --set-selections to work. set -- '--customize-hook=chroot "$1" apt-cache dumpavail | chroot "$1" dpkg --update-avail' "$@" if test "$DEBVER" -le 8; then -- cgit v1.2.3 From 4afa72f4cc34c5d36c68f76514bc59347936f8ca Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Fri, 23 Dec 2022 14:33:38 +0100 Subject: Update my mail address --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index c2201cf..2df7827 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ Files: * Copyright: 2022 Helmut Grohne 2022 Johannes Schauer Marin Rodrigues - 2022 Jochen Sprickerhof + 2022 Jochen Sprickerhof License: MIT License: MIT -- cgit v1.2.3 From c856e06999fdc2b992e07c1b82b4af08c834f78b Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Fri, 23 Dec 2022 20:27:03 +0100 Subject: debian: bump mmdebstrap version for jessie hook --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b575797..b9f51ba 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Depends: ${misc:Depends}, e2fsprogs, genext2fs, - mmdebstrap (>= 1.2.3), + mmdebstrap (>= 1.2.4), qemu-kvm | qemu-system-arm | qemu-system-system-mips | qemu-system-misc | qemu-system-ppc | qemu-system-x86, Recommends: arch-test, -- cgit v1.2.3 From 3c0de91f6d9ca23ce503de6c94e593145faeb3e4 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sat, 31 Dec 2022 07:46:37 +0100 Subject: recommend openssh-client --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index b9f51ba..fb4d76c 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Depends: Recommends: arch-test, binfmt-support, + openssh-client, qemu-system, qemu-user-static, uidmap, -- cgit v1.2.3 From 39daf2ef0d7e9087d2625d9da9dfd07d681c583e Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sat, 31 Dec 2022 07:47:04 +0100 Subject: add an autopkgtest --- debian/control | 1 + debian/tests/control | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 debian/tests/control diff --git a/debian/control b/debian/control index fb4d76c..c844b4e 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Priority: optional Standards-Version: 4.6.2 Rules-Requires-Root: no Homepage: https://salsa.debian.org/helmutg/debvm/ +Testsuite: autopkgtest Package: debvm Architecture: all diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..9401ca5 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,3 @@ +Test-Command: ./tests/create-and-run.sh $(dpkg --print-architecture) sid +Depends: debvm, fakeroot, fakechroot, sleepenh, openssh-client, libsystemd-shared +Restrictions: allow-stderr, needs-internet -- cgit v1.2.3 From c149afe12f6d17553903f2150f4bb18f60aac969 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sat, 31 Dec 2022 07:48:11 +0100 Subject: install 9pmounthook --- debian/debvm.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/debvm.install b/debian/debvm.install index 2ef7d56..7de5074 100644 --- a/debian/debvm.install +++ b/debian/debvm.install @@ -1,2 +1,3 @@ debvm-create usr/bin debvm-run usr/bin +9pmounthook usr/share/mmdebstrap/9pmount -- cgit v1.2.3 From 673b66d863d3799948e501dcbdc63ebbab42356c Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sat, 31 Dec 2022 08:01:54 +0100 Subject: fix location of 9pmount hook --- debian/debvm.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/debvm.install b/debian/debvm.install index 7de5074..c091796 100644 --- a/debian/debvm.install +++ b/debian/debvm.install @@ -1,3 +1,3 @@ debvm-create usr/bin debvm-run usr/bin -9pmounthook usr/share/mmdebstrap/9pmount +9pmounthook/* usr/share/mmdebstrap/9pmount -- cgit v1.2.3 From e12f55f914538e057fbd4c8f1afcfa2c32684a7c Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sun, 1 Jan 2023 16:49:03 +0100 Subject: debian: drop redundant Testsuite declaration --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index c844b4e..fb4d76c 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Priority: optional Standards-Version: 4.6.2 Rules-Requires-Root: no Homepage: https://salsa.debian.org/helmutg/debvm/ -Testsuite: autopkgtest Package: debvm Architecture: all -- cgit v1.2.3 From 610ea29411f8a131395361bd89f4e2036c21a622 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sun, 1 Jan 2023 16:49:31 +0100 Subject: debian: ship pod2man generated manual pages --- debian/clean | 2 ++ debian/control | 2 +- debian/debvm.manpages | 2 ++ debian/rules | 4 ++++ 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 debian/clean create mode 100644 debian/debvm.manpages diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..3a838a2 --- /dev/null +++ b/debian/clean @@ -0,0 +1,2 @@ +debvm-create.1 +debvm-run.1 diff --git a/debian/control b/debian/control index fb4d76c..82bae04 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: debvm Maintainer: Helmut Grohne -Build-Depends: debhelper-compat (= 13) +Build-Depends: debhelper-compat (= 13), perl Section: admin Priority: optional Standards-Version: 4.6.2 diff --git a/debian/debvm.manpages b/debian/debvm.manpages new file mode 100644 index 0000000..3a838a2 --- /dev/null +++ b/debian/debvm.manpages @@ -0,0 +1,2 @@ +debvm-create.1 +debvm-run.1 diff --git a/debian/rules b/debian/rules index 2d33f6a..3e8486c 100755 --- a/debian/rules +++ b/debian/rules @@ -2,3 +2,7 @@ %: dh $@ + +override_dh_auto_build: + pod2man debvm-create debvm-create.1 + pod2man debvm-run debvm-run.1 -- cgit v1.2.3 From b317e75264e9d87b595193c7d6a24bcd50827edc Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sun, 1 Jan 2023 16:49:57 +0100 Subject: debian: add Vcs headers --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index 82bae04..d3d1415 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,8 @@ Priority: optional Standards-Version: 4.6.2 Rules-Requires-Root: no Homepage: https://salsa.debian.org/helmutg/debvm/ +Vcs-Git: https://salsa.debian.org/helmutg/debvm.git -b debian +Vcs-Browser: https://salsa.debian.org/helmutg/debvm/ Package: debvm Architecture: all -- cgit v1.2.3 From 287bb80fba2208e40fb1cc99df2592d325afb7a9 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sun, 1 Jan 2023 17:39:47 +0100 Subject: upload to experimental as version 0.1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc1480a..45b97dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -debvm (0) UNRELEASED; urgency=medium +debvm (0.1) experimental; urgency=medium * Initial release. - -- Helmut Grohne Fri, 23 Dec 2022 12:53:45 +0100 + -- Helmut Grohne Sun, 01 Jan 2023 17:38:43 +0100 -- cgit v1.2.3 From 4f89cae5b63b09d0109fb33788fb379d98658175 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Mon, 2 Jan 2023 07:21:48 +0100 Subject: debian: allow satisfying recommends with fakeroot and fakechroot --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index d3d1415..512f9e7 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,8 @@ Recommends: openssh-client, qemu-system, qemu-user-static, - uidmap, + uidmap | fakeroot, + uidmap | fakechroot, Description: create and run virtual machines for various Debian releases and architectures The tool debvm-create can be used to create a virtual machine image and the tool debvm-run can be used to run such a machine image. Their purpose -- cgit v1.2.3