From 117cffb25e61cb38e5cb4abaa202b8cd86d17bcf Mon Sep 17 00:00:00 2001 From: Luk Claes Date: Fri, 25 May 2012 20:24:49 +0200 Subject: [PATCH] Add 18-osd_login-sbindir.patch to avoid FTBFS --- debian/changelog | 1 + debian/patches/18-osd_login-sbindir.patch | 39 +++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 41 insertions(+) create mode 100644 debian/patches/18-osd_login-sbindir.patch diff --git a/debian/changelog b/debian/changelog index ace5d5c..8b2050b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ nfs-utils (1:1.2.6-1) UNRELEASED; urgency=low - Remove 18-dont-use-PAGE_SIZE.patch: merged upstream. - Update other patches. * Check for blank exports file (Closes: #673798). + * Add 18-osd_login-sbindir.patch to avoid FTBFS -- Luk Claes Fri, 25 May 2012 19:16:54 +0200 diff --git a/debian/patches/18-osd_login-sbindir.patch b/debian/patches/18-osd_login-sbindir.patch new file mode 100644 index 0000000..0207e3d --- /dev/null +++ b/debian/patches/18-osd_login-sbindir.patch @@ -0,0 +1,39 @@ +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 e05755b..a746b89 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +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 -- 2.39.5