diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/TODO | 5 | ||||
| -rw-r--r-- | debian/changelog | 388 | ||||
| -rw-r--r-- | debian/control | 43 | ||||
| -rw-r--r-- | debian/copyright | 114 | ||||
| -rwxr-xr-x | debian/nvme-cli.postinst | 30 | ||||
| -rwxr-xr-x | debian/nvme-cli.postrm | 24 | ||||
| -rw-r--r-- | debian/patches/debian/0001-systemd.patch | 14 | ||||
| -rw-r--r-- | debian/patches/debian/0002-meson-nose2.patch | 15 | ||||
| -rw-r--r-- | debian/patches/debian/0003-meson-systemd.patch | 15 | ||||
| -rw-r--r-- | debian/patches/series | 3 | ||||
| -rwxr-xr-x | debian/rules | 17 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/watch | 4 |
13 files changed, 673 insertions, 0 deletions
diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 0000000..cfe2ad8 --- /dev/null +++ b/debian/TODO @@ -0,0 +1,5 @@ +TODO + + * readd udeb + * update copyright + * run test that don't require nvme devices diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..5bee996 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,388 @@ +nvme-cli (2.4+really2.3-3) sid; urgency=medium + + * Uploading to sid. + * Overwriting systemd unit directory until debhelper supports + /usr/lib/systemd/system (Closes: #1034232). + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Sat, 15 Apr 2023 10:18:22 +0200 + +nvme-cli (2.4+really2.3-2) sid; urgency=medium + + * Uploading to sid. + * Reverting removal of systemd.patch in nvme-cli 2.4, this package is + identical again to 2.3-2 (before the accidental upload to sid instead + of unstable). + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Fri, 07 Apr 2023 14:38:48 +0200 + +nvme-cli (2.4+really2.3-1) sid; urgency=medium + + * Uploading to sid. + * Merging upstream version 2.4+really2.3. + * Reverting bump of libnvme build-depends, the nvme-cli 2.4-1 upload + should have gone to experimental. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Mon, 03 Apr 2023 10:18:26 +0200 + +nvme-cli (2.4-1) sid; urgency=medium + + * Uploading to sid. + * Merging upstream version 2.4. + * Bumping libnvme build-depends. + * Removing systemd.patch, not needed anymore. + * Renumbering patches. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Mon, 03 Apr 2023 10:00:04 +0200 + +nvme-cli (2.3-2) sid; urgency=medium + + * Uploading to sid. + * Adding missing build-depends to libdbus-1-dev. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Wed, 01 Feb 2023 06:32:17 +0100 + +nvme-cli (2.3-1) sid; urgency=medium + + * Uploading to sid. + * Merging upstream version 2.3. + * Bumping libnvme build-depends. + * Updating copyright for 2023. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Tue, 31 Jan 2023 05:13:39 +0100 + +nvme-cli (2.2.1-4) sid; urgency=medium + + * Uploading to sid. + * Dropping (currently empty) udeb, it has never been used and was added + because of a wishlist bug, would require more work to make it work but + is not used for bookworm anyway. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Mon, 23 Jan 2023 11:42:43 +0100 + +nvme-cli (2.2.1-3) sid; urgency=medium + + * Uploading to sid. + * Updating to standards version 4.6.2. + * Removing installation directories overrides, not needed anymore with + current systemd (Closes: #1026054, #1027432). + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Wed, 04 Jan 2023 10:02:45 +0100 + +nvme-cli (2.2.1-2) sid; urgency=medium + + * Uploading to sid. + * Removing now uneeded build-depends on libhugetlbfs, thanks to Lukas + Märdian <slyon@ubuntu.com> (Closes: #1025230). + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Fri, 02 Dec 2022 14:50:14 +0100 + +nvme-cli (2.2.1-1) sid; urgency=medium + + * Uploading to sid. + * Merging upstream version 2.2.1. + * Removing uuid-dev build-dependency, not needed anymore. + * Updating libnvme-dev build-depends for 1.2. + * Refreshing meson-nose2.patch. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Sat, 05 Nov 2022 19:23:57 +0100 + +nvme-cli (2.1.2-2) sid; urgency=medium + + * Uploading to sid. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Tue, 18 Oct 2022 16:04:54 +0200 + +nvme-cli (2.1.2-1) experimental; urgency=medium + + * Uploading to experimental. + * Merging upstream version 2.1.2. + * Updating libnvme build-depends. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Mon, 15 Aug 2022 14:32:51 +0200 + +nvme-cli (2.1~rc0-1) experimental; urgency=medium + + * Uploading to experimental. + * Merging upstream version 2.1~rc0 (Closes: #1015722). + * Refreshing meson-nose2.patch. + * Updating version of libnvme build-depends as necessary. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Tue, 26 Jul 2022 07:18:42 +0200 + +nvme-cli (2.0-1) experimental; urgency=medium + + * Uploading to experimental. + * Merging upstream version 2.0. + * Updating packaging for upstreams migration to meson, + temporarily skipping udeb-build (needs further work). + * Also removing /etc/nvme (if empty) on purge. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Sat, 16 Jul 2022 18:32:50 +0200 + +nvme-cli (1.16-4) sid; urgency=medium + + * Uploading to sid. + * Updating copyright for 2022. + * Updating to standards version 4.6.1. + * Removing trailing whitespace in changelog. + * Adding version mangling in watch file. + * Updating http links to https in copyright. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Sat, 16 Jul 2022 17:04:24 +0200 + +nvme-cli (1.16-3) sid; urgency=medium + + * Uploading to sid. + * Building with uuid-dev to pull in libuuid1 depends in again (Closes: + #1002890). + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Fri, 31 Dec 2021 07:32:56 +0100 + +nvme-cli (1.16-2) sid; urgency=medium + + * Uploading to sid. + * Updating watch file to use github tags instead of releases. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Tue, 28 Dec 2021 19:22:25 +0100 + +nvme-cli (1.16-1) sid; urgency=medium + + * Uploading to sid. + * Merging upstream version 1.16. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Sat, 20 Nov 2021 08:04:50 +0100 + +nvme-cli (1.15-4) sid; urgency=medium + + * Uploading to sid. + * Reuploading with udeb again, as subsequent uploads are also blocked by + NEW. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Sat, 09 Oct 2021 10:49:12 +0200 + +nvme-cli (1.15-3) sid; urgency=medium + + * Uploading to sid. + * Updating to standards version 4.6.0. + * Disabling udeb for now to workaround 0.15 being stuck in NEW for the + past 10 weeks. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Sat, 09 Oct 2021 10:44:45 +0200 + +nvme-cli (1.15-2) sid; urgency=medium + + * Uploading to sid. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Sun, 15 Aug 2021 17:45:13 +0200 + +nvme-cli (1.15-1) experimental; urgency=medium + + * Uploading to experimental. + * Merging upstream version 1.15. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Thu, 12 Aug 2021 14:01:16 +0200 + +nvme-cli (1.14-4) experimental; urgency=medium + + * Uploading to experimental. + * Adding nvme-udeb (Closes: #982917). + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Thu, 29 Jul 2021 07:41:12 +0200 + +nvme-cli (1.14-3) experimental; urgency=medium + + * Uploading to experimental. + * Avoid shipping unused, empty directories for dracut. + * Adding forgotten continuation dots for LGPL-block in copyright. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Thu, 29 Jul 2021 07:20:03 +0200 + +nvme-cli (1.14-2) experimental; urgency=medium + + * Uploading to experimental. + * Removing generated files on purge. + * Completing and correcting debian/copyright. + * Removing obsolete settings for newer systemd versions. + * Removing unneeded build-depends. + * Adding pci.ids to recommends as it's used by some of the plugins. + * Correcting location of the NVMe-oF systemd service files. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Thu, 29 Jul 2021 06:56:57 +0200 + +nvme-cli (1.14-1) experimental; urgency=medium + + * Uploading to experimental. + * Merging upstream version 1.14: + - fixes bug that can cause some Samsung controllers to go + offline (Closes: #989840). + * Removing whitespaces at EOL. + * Correcting name entries in changelog. + * Adding vcs fields. + * Updating to standards version 4.5.1. + * Adding rules-requires-root field. + * Repeating section for binary packages in control for consistency + reasons. + * Updating format url in copyright. + * Updating source url in copyright. + * Adding upstream-name in copyright. + * Adding upstream-contact in copyright. + * Updating year in copyright. + * Using default GPL license blocks in copyright. + * Making postinst executable in source tree. + * Rewriting postinst with the standard maintainer script. + * Removing spurious bash-completion file in source tree. + * Harmonizing rules file. + * Removing spurious source/include-binaries file (Closes: #944833). + * Updating watch file to version 4. + * Wrap and sorting debian directory. + * Updating package description. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Fri, 02 Jul 2021 23:08:03 +0200 + +nvme-cli (1.12-8) unstable; urgency=medium + + * Adopting package. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Fri, 02 Jul 2021 22:41:27 +0200 + +nvme-cli (1.12-7) unstable; urgency=medium + + * Orphaning the package + + -- Breno Leitao <leitao@debian.org> Fri, 02 Jul 2021 19:37:48 +0100 + +nvme-cli (1.12-5) unstable; urgency=medium + + * Add uuid-runtime as dependency. (Closes: #970637) + + -- Breno Leitao <leitao@debian.org> Tue, 22 Sep 2020 20:37:51 +0100 + +nvme-cli (1.12-4) unstable; urgency=medium + + * Fix udev rules and config files. Thanks intrigeri (Closes: #968769) + * Remove debian/package.bash-completion (Closes: #969345) + + -- Breno Leitao <leitao@debian.org> Sun, 20 Sep 2020 10:39:01 +0100 + +nvme-cli (1.12-3) unstable; urgency=medium + + * Bring debhelper compat to 13 and fix build deps (Closes: ##969183) + + -- Breno Leitao <leitao@debian.org> Sun, 20 Sep 2020 10:23:14 +0100 + +nvme-cli (1.12-2) unstable; urgency=medium + + * Generate /etc/nvme/host* files at install time, not build time. + Thanks Dan for the patch. (Closes: #969340) + + -- Breno Leitao <leitao@debian.org> Sun, 20 Sep 2020 10:14:36 +0100 + +nvme-cli (1.12-1) unstable; urgency=medium + + * New upstream release. + + -- Breno Leitao <leit@debian.org> Sat, 20 Jun 2020 09:27:22 +0100 + +nvme-cli (1.9-1) unstable; urgency=medium + + * New upstream release + * Fixed dependencies (Closes: #944832) + + -- Breno Leitao <leitao@debian.org> Sat, 23 Nov 2019 13:40:40 +0000 + +nvme-cli (1.7-1) unstable; urgency=medium + + * New upstream release + + -- Breno Leitao <leitao@debian.org> Mon, 21 Jan 2019 06:25:35 -0500 + +nvme-cli (1.6-1) unstable; urgency=medium + + * New upstream release + + -- Breno Leitao <leitao@debian.org> Mon, 06 Aug 2018 12:12:32 -0400 + +nvme-cli (1.5-1) unstable; urgency=medium + + * New upstream release + + -- Breno Leitao <leitao@debian.org> Mon, 29 Jan 2018 12:59:02 -0500 + +nvme-cli (1.4-1) unstable; urgency=medium + + * New upstream release + * Standard Version upgraded to 4.0.1 + + -- Breno Leitao <leitao@debian.org> Mon, 02 Oct 2017 08:27:23 -0400 + +nvme-cli (1.3-1) unstable; urgency=medium + + * New upstream release. Thanks Rodrigo R. Galvão <rosattig@br.ibm.com> + + -- Breno Leitao <leitao@debian.org> Wed, 14 Jun 2017 16:36:20 -0300 + +nvme-cli (1.1-1) unstable; urgency=medium + + * New upstream release + + -- Breno Leitao <leitao@debian.org> Mon, 06 Feb 2017 08:20:45 -0500 + +nvme-cli (1.0-3) unstable; urgency=medium + + * Last commit didn't fix all the problem for 32-bits archs. + Fixing it properly now. (Closes: #847232) + + -- Breno Leitao <leitao@debian.org> Wed, 14 Dec 2016 07:51:29 -0500 + +nvme-cli (1.0-2) unstable; urgency=medium + + * Fix FTBFS in 32-bits arch. (Closes: #847232) + + -- Breno Leitao <leitao@debian.org> Tue, 13 Dec 2016 08:31:42 -0500 + +nvme-cli (1.0-1) unstable; urgency=medium + + * New upstream release. + + -- Breno Leitao <leitao@debian.org> Thu, 24 Nov 2016 15:15:28 -0500 + +nvme-cli (0.9-1) unstable; urgency=medium + + * New upstream release + + -- Breno Leitao <leitao@debian.org> Thu, 06 Oct 2016 13:03:59 -0400 + +nvme-cli (0.8-2) unstable; urgency=medium + + * Add a patch to enable nvme-cli to compile on 32 bits system (Thanks Steve + Langasek) (Closes: #830521) + + -- Breno Leitao <brenohl@br.ibm.com> Mon, 11 Jul 2016 12:48:11 -0400 + +nvme-cli (0.8-1) unstable; urgency=medium + + * New upstream release + + -- Breno Leitao <brenohl@br.ibm.com> Sun, 03 Jul 2016 07:12:26 -0400 + +nvme-cli (0.7-1) unstable; urgency=medium + + * New upstream release + * Bump Standard-Version to 3.9.8, no changes required. + + -- Breno Leitao <brenohl@br.ibm.com> Tue, 21 Jun 2016 16:32:22 -0400 + +nvme-cli (0.5-1) unstable; urgency=medium + + * New upstream release + - Fix version number (Closes: #816438) + * Bump Standard-Version to 3.9.7, no changes required. + * drop 0004-Fix-English-typos-only.patch: upstream. + + -- Breno Leitao <brenohl@br.ibm.com> Tue, 22 Mar 2016 10:43:12 -0400 + +nvme-cli (0.3-1) unstable; urgency=medium + + * Initial release. (Closes: #810033) + + -- Breno Leitao <brenohl@br.ibm.com> Tue, 05 Jan 2016 14:40:05 -0500 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..e0482ce --- /dev/null +++ b/debian/control @@ -0,0 +1,43 @@ +Source: nvme-cli +Section: admin +Priority: optional +Maintainer: Daniel Baumann <daniel.baumann@progress-linux.org> +Build-Depends: + asciidoc, + cmake, + debhelper-compat (= 13), + flake8 <!nocheck>, + isort <!nocheck>, + libdbus-1-dev, + libjson-c-dev, + libnvme-dev (>= 1.3), + libssl-dev, + meson, + mypy <!nocheck>, + pkg-config, + python3-autopep8 <!nocheck>, + python3-nose2 <!nocheck>, + uuid-runtime, + xmlto, + zlib1g-dev, +Rules-Requires-Root: no +Standards-Version: 4.6.2 +Homepage: https://github.com/linux-nvme/nvme-cli +Vcs-Browser: https://git.progress-linux.org/users/daniel.baumann/debian/packages/nvme-cli +Vcs-Git: https://git.progress-linux.org/users/daniel.baumann/debian/packages/nvme-cli + +Package: nvme-cli +Section: admin +Architecture: any +Depends: + uuid-runtime, + ${misc:Depends}, + ${shlibs:Depends}, +Recommends: + pci.ids, +Description: NVMe management tool + NVM Express (NVMe) is a interface specification for accessing non-volatile + storage media, typically modern solid state drives (SSDs) through PCI Express + (PCIe). + . + The nvme-cli tool provides management functions for these devices. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..19e7c07 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,114 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: nvme-cli +Upstream-Contact: https://github.com/linux-nvme/nvme-cli/issues +Source: https://github.com/linux-nvme/nvme-cli/releases + +Files: * +Copyright: 2011-2023 Intel Corporation. +License: GPL-2+ + +Files: fabrics.c +Copyright: 2016 Intel Corporation. + 2016 HGST, a Western Digital Company. + 2016 Samsung Electronics Co., Ltd. +License: GPL-2 + +Files: linux/lightnvm.h nvme-lightnvm.h +Copyright: 2015-2016 CNEX Labs +License: GPL-2 + +Files: nvme-lightnvm.c +Copyright: 2015-2016 CNEX Labs +License: GPL-2+ + +Files: nvme-rpmb.c +Copyright: 2020 Micron Techology Inc. +License: GPL-2 + +Files: plugins/netapp/* +Copyright: 2018 NetApp, Inc. +License: GPL-2+ + +Files: plugins/seagate/* +Copyright: 2017-2018 Seagate Technology LLC and/or its Affiliates. +License: GPL-2+ + +Files: plugins/wdc/* +Copyright: 2017-2018 Western Digital Corporation or its affiliates. +License: GPL-2+ + +Files: plugins/huawei/* +Copyright: 2017-2019 Huawei Corporation or its affiliates. +License: GPL-2+ + +Files: regress scripts/latency util/suffix.h util/argconfig.* util/suffix.c +Copyright: 2014-2015 PMC-Sierra, Inc. +License: GPL-2+ + +Files: tests/* +Copyright: 2015-2016 Western Digital Corporation or its affiliates. +License: GPL-2+ + +Files: util/log.c +Copyright: 2021 SUSE LLC +License: GPL-2 + +Files: util/log.h +Copyright: 2021 Martin Wilck + 2021 SUSE LLC +License: LGPL-2.1+ + +Files: debian/* +Copyright: 2021-2023 Daniel Baumann <daniel.baumann@progress-linux.org> +License: GPL-2+ + +License: GPL-2 + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2 of the License. + . + 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 General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. + . + The complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +License: GPL-2+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 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 General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. + . + The complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library 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 + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + The complete text of the GNU Lesser General Public License + can be found in /usr/share/common-licenses/LGPL-2.1 file. diff --git a/debian/nvme-cli.postinst b/debian/nvme-cli.postinst new file mode 100755 index 0000000..f984cc9 --- /dev/null +++ b/debian/nvme-cli.postinst @@ -0,0 +1,30 @@ +#!/bin/sh + +set -e + +case "${1}" in + configure) + if [ ! -s /etc/nvme/hostnqn ] + then + nvme gen-hostnqn > /etc/nvme/hostnqn + fi + + if [ ! -s /etc/nvme/hostid ] + then + uuidgen > /etc/nvme/hostid + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`${1}'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/nvme-cli.postrm b/debian/nvme-cli.postrm new file mode 100755 index 0000000..79c2438 --- /dev/null +++ b/debian/nvme-cli.postrm @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +case "${1}" in + purge) + rm -f /etc/nvme/hostnqn + rm -f /etc/nvme/hostid + rmdir /etc/nvme > /dev/null 2>&1 || true + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + ;; + + *) + echo "postrm called with unknown argument \`${1}'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/patches/debian/0001-systemd.patch b/debian/patches/debian/0001-systemd.patch new file mode 100644 index 0000000..bf0b372 --- /dev/null +++ b/debian/patches/debian/0001-systemd.patch @@ -0,0 +1,14 @@ +Author: Daniel Baumann <daniel.baumann@progress-linux.org> +Description: Removing obsolete settings for newer systemd versions. + +diff -Naurp nvme-cli.orig/nvmf-autoconnect/systemd/nvmf-connect@.service.in nvme-cli/nvmf-autoconnect/systemd/nvmf-connect@.service.in +--- nvme-cli.orig/nvmf-autoconnect/systemd/nvmf-connect@.service.in ++++ nvme-cli/nvmf-autoconnect/systemd/nvmf-connect@.service.in +@@ -4,7 +4,6 @@ + + [Unit] + Description=NVMf auto-connect scan upon nvme discovery controller Events +-After=syslog.target + PartOf=nvmf-connect.target + Requires=nvmf-connect.target + diff --git a/debian/patches/debian/0002-meson-nose2.patch b/debian/patches/debian/0002-meson-nose2.patch new file mode 100644 index 0000000..4929c6a --- /dev/null +++ b/debian/patches/debian/0002-meson-nose2.patch @@ -0,0 +1,15 @@ +Author: Daniel Baumann <daniel.baumann@progress-linux.org> +Description: Updating meson to find /usr/bin/nose2-3 (python3). + +diff -Naurp nvme-cli.orig/tests/meson.build nvme-cli/tests/meson.build +--- nvme-cli.orig/tests/meson.build ++++ nvme-cli/tests/meson.build +@@ -30,7 +30,7 @@ tests = [ + 'nvme_get_lba_status_test.py', + ] + +-runtests = find_program('nose2', required : false) ++runtests = find_program('nose2-3', required : false) + + if meson.version().version_compare('>= 0.56') + nvmecli_path = meson.project_build_root() diff --git a/debian/patches/debian/0003-meson-systemd.patch b/debian/patches/debian/0003-meson-systemd.patch new file mode 100644 index 0000000..2fb75d7 --- /dev/null +++ b/debian/patches/debian/0003-meson-systemd.patch @@ -0,0 +1,15 @@ +Author: Daniel Baumann <daniel.baumann@progress-linux.org> +Description: Overwriting systemd unit directory until debhelper supports /usr/lib/systemd/system (Closes: #1034232). + +diff -Naurp nvme-cli.orig/meson.build nvme-cli/meson.build +--- nvme-cli.orig/meson.build ++++ nvme-cli/meson.build +@@ -25,7 +25,7 @@ sysconfdir = join_paths(prefixdir, get_o + + udevrulesdir = join_paths(prefixdir, get_option('udevrulesdir')) + dracutrulesdir = join_paths(prefixdir, get_option('dracutrulesdir')) +-systemddir = join_paths(prefixdir, get_option('systemddir')) ++systemddir = '/lib/systemd/system' + + ############################################################################### + conf = configuration_data() diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..31c70ee --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +debian/0001-systemd.patch +debian/0002-meson-nose2.patch +debian/0003-meson-systemd.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..bb8767e --- /dev/null +++ b/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +%: + dh ${@} --buildsystem=meson + +override_dh_auto_configure: + dh_auto_configure -- -Ddocs=man -Ddocs-build=true + +execute_after_dh_auto_install: + # removing unused files + rm -rf debian/nvme-cli/usr/lib/dracut + + # fix wrong-manual-section + sed -i -e 's|\\" "1"|" "1"|' debian/nvme-cli/usr/share/man/*/*.1 + +override_dh_auto_test: + # disabled, requires a NVMe device diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..3b2bede --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=4 +opts="pgpmode=auto, filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/nvme-cli-$1\.tar\.gz/, \ + uversionmangle=s/(\d)\-?((pre|rc)\d*)$/$1~$2/" \ +https://github.com/linux-nvme/nvme-cli/tags .*/v?(\d\S+)\.tar\.gz |