Merge ~rafaeldtinoco/ubuntu/+source/kmod:lp1864992-devel into ubuntu/+source/kmod:ubuntu/focal-devel

[Rafael David Tinoco]

BUG: https://bugs.launchpad.net/ubuntu/+source/kmod/+bug/1864992

[Rafael David Tinoco (rafaeldtinoco)]

Explanation of what is happening:

https://bugs.launchpad.net/ubuntu/+source/kmod/+bug/1864992/comments/34
https://bugs.launchpad.net/ubuntu/+source/kmod/+bug/1864992/comments/35
https://bugs.launchpad.net/ubuntu/+source/kmod/+bug/1864992/comments/36
https://bugs.launchpad.net/ubuntu/+source/kmod/+bug/1864992/comments/37

Explanation why its safe to drop the patch causing issue:

https://bugs.launchpad.net/curtin/+bug/1864992/comments/40

[Rafael David Tinoco (rafaeldtinoco)]

This is wrong.. latest version is:

27-1ubuntu1

but usd-importer is stuck at

26+20191223-1ubuntu1

Please disconsider versioning for now, I'll fix that.

[Rafael David Tinoco (rafaeldtinoco)]

git-ubuntu issue:

https://bugs.launchpad.net/usd-importer/+bug/1867059

[Christian Ehrhardt  (paelzer)]

I'm +1 going forward for 20.04, I'm torn for the SRU cases (will mention on those MPs) but going forward I think the change LGTM.

review: Approve

[Rafael David Tinoco (rafaeldtinoco)]

Thanks for reviewing this!

[Rafael David Tinoco (rafaeldtinoco)]

Because of the git-ubuntu issue I haven't pushed this to usd-import.. only uploaded.
Lets see if this new upload makes git-ubuntu not to crash when trying to import it.
Thanks again.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 9a1a47a..6cefc94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kmod (26+20191223-1ubuntu2) focal; urgency=medium
+
+  * d/p/verbose_missing_bin: drop this patch to avoid spurious missing
+    file messages when running depmod -a for the first time in recent
+    kernels (>= 5.3.x) (LP: #1864992)
+
+ -- Rafael David Tinoco <[e-mail]>  Wed, 11 Mar 2020 19:21:09 +0000
+
 kmod (26+20191223-1ubuntu1) focal; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff --git a/debian/patches/series b/debian/patches/series
index a0f32d0..dc7382c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 
 # fixes to be pushed upstream
-verbose_missing_bin
 
 # features to be pushed upstream
 
diff --git a/debian/patches/verbose_missing_bin b/debian/patches/verbose_missing_bin
deleted file mode 100644
index f2aec1f..0000000
--- a/debian/patches/verbose_missing_bin
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Report an error when some .bin files do not exist
-Author: Marco d'Itri <[e-mail]>
-Bug-Debian: http://bugs.debian.org/684901
----
-
---- a/libkmod/libkmod.c
-+++ b/libkmod/libkmod.c
-@@ -503,7 +503,7 @@ static char *lookup_builtin_file(struct
- 
- 		idx = index_file_open(fn);
- 		if (idx == NULL) {
--			DBG(ctx, "could not open builtin file '%s'\n", fn);
-+			ERR(ctx, "could not open builtin file '%s'\n", fn);
- 			return NULL;
- 		}
- 
-@@ -575,7 +575,7 @@ char *kmod_search_moddep(struct kmod_ctx
- 
- 	idx = index_file_open(fn);
- 	if (idx == NULL) {
--		DBG(ctx, "could not open moddep file '%s'\n", fn);
-+		ERR(ctx, "could not open moddep file '%s'\n", fn);
- 		return NULL;
- 	}
-