From: Luk Claes Date: Fri, 10 May 2013 08:58:15 +0000 (+0000) Subject: drop patch X-Git-Tag: debian/1%1.2.8-1~6 X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=6810f278dec977672b43f57a005b33f120f482fd drop patch --- diff --git a/debian/patches/18-osd_login-sbindir.patch b/debian/patches/18-osd_login-sbindir.patch deleted file mode 100644 index 0207e3d..0000000 --- a/debian/patches/18-osd_login-sbindir.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d4d392087f8ee049ed8f476e5ae780cbc0d0012a Mon Sep 17 00:00:00 2001 -From: NeilBrown -Date: Thu, 17 May 2012 08:14:57 -0400 -Subject: [PATCH] osd_login - ensure /sbin is created before installation. - -If we use a more standard approach to describing the osd_login -script, the automake infrastructure will create /sbin before -attempting installation. -This is important for: make DESTDIR=/empty-dir install - -Signed-off-by: NeilBrown -Signed-off-by: Steve Dickson ---- - utils/osd_login/Makefile.am | 11 ++++------- - 1 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/utils/osd_login/Makefile.am b/utils/osd_login/Makefile.am -index adc493a..20c2d8c 100644 ---- a/utils/osd_login/Makefile.am -+++ b/utils/osd_login/Makefile.am -@@ -1,12 +1,9 @@ - ## Process this file with automake to produce Makefile.in - --OSD_LOGIN_FILES= osd_login -+# These binaries go in /sbin (not /usr/sbin), and that cannot be -+# overridden at config time. -+sbindir = /sbin - --EXTRA_DIST= $(OSD_LOGIN_FILES) -- --all-local: $(OSD_LOGIN_FILES) -- --install-data-hook: -- $(INSTALL) --mode 755 osd_login $(DESTDIR)/sbin/osd_login -+sbin_SCRIPTS = osd_login - - MAINTAINERCLEANFILES = Makefile.in --- -1.7.4.1 diff --git a/debian/patches/series b/debian/patches/series index 0a0c3fa..09fed6f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,5 +4,4 @@ 11-532048-reduce-verbosity.patch 16-mount.nfs.man-update-distinction-between-fstype.patch 17-multiarch-kerberos-paths.patch -18-osd_login-sbindir.patch 19-iscsiadm-path.patch