diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-16 15:35:19 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-16 17:15:37 +0000 |
| commit | a40d7d90ef128a592ec85673bb6892a5e07f16e9 (patch) | |
| tree | 77e22bff731343ba3774dae02ac37d6b979f913f /debian/patches | |
| parent | Merging upstream version 2.0. (diff) | |
| download | nvme-cli-a40d7d90ef128a592ec85673bb6892a5e07f16e9.tar.xz nvme-cli-a40d7d90ef128a592ec85673bb6892a5e07f16e9.zip | |
Updating packaging for upstreams migration to meson, temporarily skipping udeb-build (needs further work).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/debian/0001-systemd.patch | 6 | ||||
| -rw-r--r-- | debian/patches/debian/0002-meson-nose2.patch | 15 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 19 insertions, 3 deletions
diff --git a/debian/patches/debian/0001-systemd.patch b/debian/patches/debian/0001-systemd.patch index c369508..bf0b372 100644 --- a/debian/patches/debian/0001-systemd.patch +++ b/debian/patches/debian/0001-systemd.patch @@ -1,9 +1,9 @@ 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 nvme-cli/nvmf-autoconnect/systemd/nvmf-connect@.service ---- nvme-cli.orig/nvmf-autoconnect/systemd/nvmf-connect@.service -+++ nvme-cli/nvmf-autoconnect/systemd/nvmf-connect@.service +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] diff --git a/debian/patches/debian/0002-meson-nose2.patch b/debian/patches/debian/0002-meson-nose2.patch new file mode 100644 index 0000000..19bcc0e --- /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 +@@ -24,7 +24,7 @@ tests = [ + 'nvme_get_lba_status_test', + ] + +-runtests = find_program('nose2', required : false) ++runtests = find_program('nose2-3', required : false) + + if runtests.found() + foreach t : tests diff --git a/debian/patches/series b/debian/patches/series index 20f0183..4878cbb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ debian/0001-systemd.patch +debian/0002-meson-nose2.patch |