diff -Nru mdadm-4.1/debian/changelog mdadm-4.1/debian/changelog --- mdadm-4.1/debian/changelog 2019-12-04 14:05:07.000000000 +0000 +++ mdadm-4.1/debian/changelog 2020-01-23 18:41:55.000000000 +0000 @@ -1,3 +1,43 @@ +mdadm (4.1-5ubuntu1) focal; urgency=medium + + [ dann frazier ] + * Merge from Debian unstable. Remaining changes: + - Ship finalrd hook. + - Do not install mdadm-shutdown.service on Ubuntu. + - Drop broken and unused init scripts in favor of native systemd units, + which can cause failure to reconfigure mdadm package under certain + confiment types. + - Drop /etc/cron.d/mdadm and migrate to systemd mdcheck_start|continue + timer units. + - Drop /etc/cron.daily/mdadm and migrate to system mdmonitor-oneshot + timer unit. + - mdcheck_start.timer configures the mdcheck on a first sunday of the + month, with a randomized start delay of up to 24h, and runs for at + most 6h. mdcheck_continue.timer kicks off daily, with a randomized + start delay of up to 12h, and continues mdcheck for at most 6h. + - mdmonitor-oneshot.timer runs daily, with a randomized start delay of + up to 24h. + - One can use systemd drop-ins to change .timer units timings, set + environmental variables to decrease/increase the length of checking, + or start the checks by hand. Previously used checkarray is still + available, albeit not used by timer units. + - Above ensures that previous daily / monthly checks are performed, but + are randomized, such that performance is not as impacted across a + cluster of machines. + - Honor the debconf daily autoscan setting in the systemd timer. + + -- dann frazier Thu, 23 Jan 2020 11:41:55 -0700 + +mdadm (4.1-5) unstable; urgency=medium + + * QA upload. + * Fix cross-compilation failure. (Closes: #866522). + Thanks to Helmut Grohne. + * Add support for raid0/linear 'broken' state. (Closes: #943520). + Thanks to Guilherme G. Piccoli and Dan Streetman. LP: #1847924. + + -- dann frazier Wed, 22 Jan 2020 09:56:25 -0700 + mdadm (4.1-4ubuntu1) focal; urgency=medium [ dann frazier ] diff -Nru mdadm-4.1/debian/patches/0001-Respect-CROSS_COMPILE-when-CC-is-the-default.patch mdadm-4.1/debian/patches/0001-Respect-CROSS_COMPILE-when-CC-is-the-default.patch --- mdadm-4.1/debian/patches/0001-Respect-CROSS_COMPILE-when-CC-is-the-default.patch 1970-01-01 00:00:00.000000000 +0000 +++ mdadm-4.1/debian/patches/0001-Respect-CROSS_COMPILE-when-CC-is-the-default.patch 2020-01-22 16:56:25.000000000 +0000 @@ -0,0 +1,31 @@ +From aced6fc9542077a69b00d05bc9cd66c12fc34950 Mon Sep 17 00:00:00 2001 +From: dann frazier +Date: Mon, 9 Dec 2019 13:54:13 -0700 +Subject: [PATCH] Respect $(CROSS_COMPILE) when $(CC) is the default + +Commit 1180ed5 told make to only respect $(CROSS_COMPILE) when $(CC) +was unset. But that will never be the case, as make provides +a default value for $(CC). Change this logic to respect $(CROSS_COMPILE) +when $(CC) is the default. Patch originally by Helmet Grohne. + +Fixes: 1180ed5 ("Makefile: make the CC definition conditional") +Signed-off-by: dann frazier +Signed-off-by: Jes Sorensen + +Bug-Debian: https://bugs.debian.org/866522 + +Index: mdadm-4.1/Makefile +=================================================================== +--- mdadm-4.1.orig/Makefile ++++ mdadm-4.1/Makefile +@@ -46,7 +46,9 @@ ifdef COVERITY + COVERITY_FLAGS=-include coverity-gcc-hack.h + endif + +-CC ?= $(CROSS_COMPILE)gcc ++ifeq ($(origin CC),default) ++CC := $(CROSS_COMPILE)gcc ++endif + CXFLAGS ?= -ggdb + CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter + ifdef WARN_UNUSED diff -Nru mdadm-4.1/debian/patches/lp-1847924-introduce-new-array-state-broken.patch mdadm-4.1/debian/patches/lp-1847924-introduce-new-array-state-broken.patch --- mdadm-4.1/debian/patches/lp-1847924-introduce-new-array-state-broken.patch 2019-12-04 14:04:43.000000000 +0000 +++ mdadm-4.1/debian/patches/lp-1847924-introduce-new-array-state-broken.patch 2020-01-22 16:56:25.000000000 +0000 @@ -1,4 +1,4 @@ -Subject: mdadm: Introduce new array state 'broken' for raid0/linear +Subject: Introduce new array state 'broken' for raid0/linear Currently if a md raid0/linear array gets one or more members removed while being mounted, kernel keeps showing state 'clean' in the 'array_state' @@ -21,11 +21,11 @@ command (for raid0/linear only) - now it takes the 'array_state' sysfs attribute into account instead of only rely in the MD_SB_CLEAN flag. -Author: "Guilherme G. Piccoli" -Origin:upstream, -git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=43ebc9105e9dafe5 +Author: Guilherme G. Piccoli +Origin: upstream, +git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=cb77f8c598ede2b7efec23f899b1cda44c315195 Bug-Ubuntu: https://bugs.launchpad.net/bugs/1847924 -Last-Update: 2019-12-04 +Last-Update: 2019-10-13 --- Detail.c | 14 ++++++++++++-- Monitor.c | 8 ++++++-- @@ -35,10 +35,10 @@ monitor.c | 4 ++-- 6 files changed, 23 insertions(+), 7 deletions(-) -diff --git a/Detail.c b/Detail.c -index ce69796..b741bf3 100644 ---- a/Detail.c -+++ b/Detail.c +Index: mdadm-4.1/Detail.c +=================================================================== +--- mdadm-4.1.orig/Detail.c ++++ mdadm-4.1/Detail.c @@ -81,6 +81,7 @@ int Detail(char *dev, struct context *c) int external; int inactive; @@ -68,10 +68,10 @@ (!e || (e->percent < 0 && e->percent != RESYNC_PENDING && e->percent != RESYNC_DELAYED)) ? -diff --git a/Monitor.c b/Monitor.c -index 036103f..b527165 100644 ---- a/Monitor.c -+++ b/Monitor.c +Index: mdadm-4.1/Monitor.c +=================================================================== +--- mdadm-4.1.orig/Monitor.c ++++ mdadm-4.1/Monitor.c @@ -1055,8 +1055,11 @@ int Wait(char *dev) } } @@ -95,10 +95,10 @@ break; rv = sysfs_wait(state_fd, &delay); if (rv < 0 && errno != EINTR) -diff --git a/maps.c b/maps.c -index f143552..a4fd279 100644 ---- a/maps.c -+++ b/maps.c +Index: mdadm-4.1/maps.c +=================================================================== +--- mdadm-4.1.orig/maps.c ++++ mdadm-4.1/maps.c @@ -162,6 +162,7 @@ mapping_t sysfs_array_states[] = { { "read-auto", ARRAY_READ_AUTO }, { "clean", ARRAY_CLEAN }, @@ -107,10 +107,10 @@ { NULL, ARRAY_UNKNOWN_STATE } }; -diff --git a/mdadm.h b/mdadm.h -index 8da9170..b23308c 100644 ---- a/mdadm.h -+++ b/mdadm.h +Index: mdadm-4.1/mdadm.h +=================================================================== +--- mdadm-4.1.orig/mdadm.h ++++ mdadm-4.1/mdadm.h @@ -345,6 +345,7 @@ struct mdinfo { ARRAY_ACTIVE, ARRAY_WRITE_PENDING, @@ -119,10 +119,10 @@ ARRAY_UNKNOWN_STATE, } array_state; struct md_bb bb; -diff --git a/mdmon.h b/mdmon.h -index 818367c..b3d72ac 100644 ---- a/mdmon.h -+++ b/mdmon.h +Index: mdadm-4.1/mdmon.h +=================================================================== +--- mdadm-4.1.orig/mdmon.h ++++ mdadm-4.1/mdmon.h @@ -21,7 +21,7 @@ extern const char Name[]; @@ -132,10 +132,10 @@ enum sync_action { idle, reshape, resync, recover, check, repair, bad_action }; -diff --git a/monitor.c b/monitor.c -index 81537ed..e0d3be6 100644 ---- a/monitor.c -+++ b/monitor.c +Index: mdadm-4.1/monitor.c +=================================================================== +--- mdadm-4.1.orig/monitor.c ++++ mdadm-4.1/monitor.c @@ -26,7 +26,7 @@ static char *array_states[] = { @@ -145,7 +145,7 @@ static char *sync_actions[] = { "idle", "reshape", "resync", "recover", "check", "repair", NULL }; -@@ -476,7 +476,7 @@ static int read_and_act(struct active_array *a, fd_set *fds) +@@ -476,7 +476,7 @@ static int read_and_act(struct active_ar a->next_state = clean; ret |= ARRAY_DIRTY; } @@ -154,6 +154,3 @@ a->container->ss->set_array_state(a, 1); } if (a->curr_state == active || --- -2.24.0 - diff -Nru mdadm-4.1/debian/patches/series mdadm-4.1/debian/patches/series --- mdadm-4.1/debian/patches/series 2019-12-04 14:04:43.000000000 +0000 +++ mdadm-4.1/debian/patches/series 2020-01-23 18:40:10.000000000 +0000 @@ -16,6 +16,7 @@ mdmonitor-service-simplify.diff 0001-Create-add-support-for-RAID0-layouts.patch 0002-Assemble-add-support-for-RAID0-layouts.patch +0001-Respect-CROSS_COMPILE-when-CC-is-the-default.patch +lp-1847924-introduce-new-array-state-broken.patch randomize-timers.patch systemd-honor-debconf-daily-scan.patch -lp-1847924-introduce-new-array-state-broken.patch