From edf2c55e7fbd5c26e73700b0230c0e5591cefab8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 16 Feb 2025 12:23:17 +0100 Subject: [PATCH] Removing systemd.patch, not needed anymore. Signed-off-by: Daniel Baumann --- debian/patches/debian/0001-systemd.patch | 14 -------------- debian/patches/debian/0003-meson-systemd.patch | 15 --------------- debian/patches/series | 2 -- 3 files changed, 31 deletions(-) delete mode 100644 debian/patches/debian/0001-systemd.patch delete mode 100644 debian/patches/debian/0003-meson-systemd.patch diff --git a/debian/patches/debian/0001-systemd.patch b/debian/patches/debian/0001-systemd.patch deleted file mode 100644 index bf0b372..0000000 --- a/debian/patches/debian/0001-systemd.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Daniel Baumann -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/0003-meson-systemd.patch b/debian/patches/debian/0003-meson-systemd.patch deleted file mode 100644 index 2fb75d7..0000000 --- a/debian/patches/debian/0003-meson-systemd.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: Daniel Baumann -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 index 31c70ee..1a7ad1a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -debian/0001-systemd.patch debian/0002-meson-nose2.patch -debian/0003-meson-systemd.patch