diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/build-sys-no-check_rundir.patch | 33 | ||||
| -rw-r--r-- | debian/patches/rebuildmap-strip-local-host-name-from-device-name.patch | 47 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
4 files changed, 1 insertions, 82 deletions
diff --git a/debian/changelog b/debian/changelog index c5b620eb..b7b3ec00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ mdadm (3.3.4-1) unstable; urgency=medium * New upstream release. * Bump standards version to 3.9.6.0, no changes required. * Use dh_prep instead of dh_clean -k + * Drop cherrypicked patches. [ Helmut Grohne ] * Fix FTCBFS. Export CROSS_COMPILE=<triplet>- (Closes: #794335) diff --git a/debian/patches/build-sys-no-check_rundir.patch b/debian/patches/build-sys-no-check_rundir.patch deleted file mode 100644 index 61f3a6f0..00000000 --- a/debian/patches/build-sys-no-check_rundir.patch +++ /dev/null @@ -1,33 +0,0 @@ -Subject: build-sys: do not depend on check_rundir for executables -From: Michael Tokarev <mjt@tls.msk.ru> -To: linux-raid@vger.kernel.org - -The problem is that the link lines will always be executed -even if the executables are up to date. - -If anything, this check_rundir should be a dependency of -install target, or some other "phony" target like this, -since check_rundir is phony by itself. - -Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> - ---- a/Makefile -+++ b/Makefile -@@ -172,7 +172,7 @@ everything-test: all mdadm.static swap_super test_stripe \ - # mdadm.uclibc and mdassemble.uclibc don't work on x86-64 - # mdadm.tcc doesn't work.. - --mdadm : check_rundir $(OBJS) -+mdadm : $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS) - - mdadm.static : $(OBJS) $(STATICOBJS) -@@ -195,7 +195,7 @@ mdmon.O2 : $(MON_SRCS) $(INCL) mdmon.h - $(CC) -o mdmon.O2 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(MON_LDFLAGS) -DHAVE_STDINT_H -O2 -D_FORTIFY_SOURCE=2 $(MON_SRCS) - - # use '-z now' to guarantee no dynamic linker interactions with the monitor thread --mdmon : check_rundir $(MON_OBJS) -+mdmon : $(MON_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) $(LDLIBS) - msg.o: msg.c msg.h - diff --git a/debian/patches/rebuildmap-strip-local-host-name-from-device-name.patch b/debian/patches/rebuildmap-strip-local-host-name-from-device-name.patch deleted file mode 100644 index f7c9b1b7..00000000 --- a/debian/patches/rebuildmap-strip-local-host-name-from-device-name.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 628cdf19ea35daad22e409e51c0abc7ffb19d6aa Mon Sep 17 00:00:00 2001 -From: NeilBrown <neilb@suse.de> -Date: Mon, 3 Nov 2014 12:49:05 +1100 -Subject: Rebuildmap: strip local host name from device name. - -When /run/mdadm/map is being rebuilt, e.g. by "mdadm -Ir", -if the device doesn't exist in /dev, we have to choose -a name. -Currently we don't strip the hostname which is wrong if -it is the local host. - -Reported-by: Stephen Kent <smkent@smkent.net> -Signed-off-by: NeilBrown <neilb@suse.de> ---- - mapfile.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/mapfile.c b/mapfile.c -index 4e7f242..41599df 100644 ---- a/mapfile.c -+++ b/mapfile.c -@@ -455,12 +455,19 @@ void RebuildMap(void) - sep = ""; - } - } -- if (strchr(name, ':')) -- /* probably a uniquifying -+ if (strchr(name, ':')) { -+ /* Probably a uniquifying - * hostname prefix. Allow -- * without a suffix -+ * without a suffix, and strip -+ * hostname if it is us. - */ -+ if (homehost && unum == -1 && -+ strncmp(name, homehost, -+ strlen(homehost)) == 0 && -+ name[strlen(homehost)] == ':') -+ name += strlen(homehost)+1; - unum = -1; -+ } - - while (conflict) { - if (unum >= 0) --- -1.7.10.4 - diff --git a/debian/patches/series b/debian/patches/series index c13a5c88..60a98a69 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,7 +3,5 @@ debian-no-Werror.diff sha1-includes.diff use-external-blkid.diff use-tempnode-not-devnode.patch -build-sys-no-check_rundir.patch -rebuildmap-strip-local-host-name-from-device-name.patch readlink-path.patch mdmonitor-service-simplify.diff |