diff -Nru fwupd-1.7.9/debian/changelog fwupd-1.7.9/debian/changelog --- fwupd-1.7.9/debian/changelog 2022-07-03 11:18:51.000000000 +0800 +++ fwupd-1.7.9/debian/changelog 2022-10-12 10:04:07.000000000 +0800 @@ -1,4 +1,4 @@ -fwupd (1.7.9-1~20.04.1) focal; urgency=medium +fwupd (1.7.9-1~20.04.2) focal; urgency=medium * New upstream release, and drop all patches since they are merged. * Properly fall back to use DMI instead of /sys/class/dmi interface. @@ -9,8 +9,10 @@ optional. (LP: #1966364) * Run fwupd-refresh under a dedicated fwupd-refresh user. This is fixed in 1.1.7, so it's automatically included. (LP: #1969976) + * d/p/0001_make_sure_mtdram_is_set_up.patch: Upstreamed patch that + fix the false alarm in the autopkgtest. - -- Yuan-Chen Cheng Sun, 03 Jul 2022 03:18:51 +0000 + -- Yuan-Chen Cheng Wed, 12 Oct 2022 02:04:07 +0000 fwupd (1.7.5-3~20.04.1) focal; urgency=medium diff -Nru fwupd-1.7.9/debian/patches/0001_make_sure_mtdram_is_set_up.patch fwupd-1.7.9/debian/patches/0001_make_sure_mtdram_is_set_up.patch --- fwupd-1.7.9/debian/patches/0001_make_sure_mtdram_is_set_up.patch 1970-01-01 08:00:00.000000000 +0800 +++ fwupd-1.7.9/debian/patches/0001_make_sure_mtdram_is_set_up.patch 2022-10-12 10:04:07.000000000 +0800 @@ -0,0 +1,30 @@ +commit d6a455e8567feaea923b546624025b86e5b8dee1 +Author: Mario Limonciello +Date: Wed Sep 7 08:08:26 2022 -0500 + + trivial: try harder to make sure mtdram is set up + + the autopkgtest environment in Ubuntu seems to not be preparing the mtdram + device properly. Sometimes the udev node "exists" but the /dev/mtd0 does not + exist. + + Look for this explicitly and skip the test if it happens. + +--- a/plugins/mtd/fu-self-test.c ++++ b/plugins/mtd/fu-self-test.c +@@ -39,6 +39,15 @@ + g_test_skip("could not find mtdram device"); + return; + } ++ dev_name = g_udev_device_get_property(udev_device, "DEVNAME"); ++ if (g_strcmp0(dev_name, "/dev/mtd0") != 0) { ++ g_test_skip("DEVNAME not /dev/mtd0"); ++ return; ++ } ++ if (!g_file_test(dev_name, G_FILE_TEST_EXISTS)) { ++ g_test_skip("/dev/mtd0 doesn't exist"); ++ return; ++ } + + /* create device */ + device = g_object_new(FU_TYPE_MTD_DEVICE, "context", ctx, "udev-device", udev_device, NULL); diff -Nru fwupd-1.7.9/debian/patches/series fwupd-1.7.9/debian/patches/series --- fwupd-1.7.9/debian/patches/series 2022-07-03 11:18:51.000000000 +0800 +++ fwupd-1.7.9/debian/patches/series 2022-10-12 10:04:07.000000000 +0800 @@ -0,0 +1 @@ +0001_make_sure_mtdram_is_set_up.patch