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

[Rafael David Tinoco]

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)]

(k)rafaeldtinoco@bkmodissue:~$ sudo rm /lib/modules/5.3.0-42-generic/modules.builtin.bin
(k)rafaeldtinoco@bkmodissue:~$ sudo depmod -a -F /boot/System.map-5.3.0-42-generic
(k)rafaeldtinoco@bkmodissue:~$

PPA: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1864992

[Christian Ehrhardt  (paelzer)]

I'm concerned there might be issues with kernel 4.15 in bionic that would change the expected output.

Could you check and confirm that even the oldest kernel (in that case 4.15) is still delivering valid messages on the initial problem "loading a non existing module while aliases don't exist".
If it behaves different with 4.15 the solution for Bionic needs to be more complex :-/

review: Needs Information

[Rafael David Tinoco (rafaeldtinoco)]

Yep, will do and post it in the bug and mention here for you.

[Rafael David Tinoco (rafaeldtinoco)]

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

Done. I think its safe to drop for 4.15 as well.

6ac2880... by Rafael David Tinoco on 2020-03-12

* Removed --add-udeb from dh_makeshlibs, since libkmod2-udeb does not
  actually contain a library. (Closes: #939779)
  (backported from debian version 26-2)

[Rafael David Tinoco (rafaeldtinoco)]

Could you give a +1 for this last change as well ? This guarantees that the package actually builds with current dh_makeshlibs. It is based in a change made in Debian at version 26-2.

[Christian Ehrhardt  (paelzer)]

As I said on IRC:
for your 4.15 check - don't you need to remove /move the .alias. file?

[Rafael David Tinoco (rafaeldtinoco)]

Yep, I did:

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

"""

Testing Bionic kernel with the initial situation the bug being dropped said to fix:

(k)rafaeldtinoco@bkmodissue:~$ sudo rm /lib/modules/4.15.0-91-generic/modules.builtin.bin
(k)rafaeldtinoco@bkmodissue:~$ sudo depmod -a -F /boot/System.map-4.15.0-91-generic

ok

(k)rafaeldtinoco@bkmodissue:.../4.15.0-91-generic$ sudo mv modules.alias.bin modules.alias.bin.old

(k)rafaeldtinoco@bkmodissue:.../4.15.0-91-generic$ sudo modprobe hehe
modprobe: FATAL: Module hehe not found in directory /lib/modules/4.15.0-91-generic

and it is also safe to drop it based on previous bug test case
"""

[Christian Ehrhardt  (paelzer)]

Thanks for checking +1 now

review: Approve

[Rafael David Tinoco (rafaeldtinoco)]

rafaeldtinoco@workstation:~/.../sources/ubuntu/kmod$ git describe --tag
upload/24-1ubuntu3.3

rafaeldtinoco@workstation:~/.../sources/ubuntu/kmod$ git push pkg upload/24-1ubuntu3.3
Enumerating objects: 20, done.
Counting objects: 100% (20/20), done.
Delta compression using up to 8 threads
Compressing objects: 100% (14/14), done.
Writing objects: 100% (14/14), 1.83 KiB | 626.00 KiB/s, done.
Total 14 (delta 10), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/kmod
 * [new tag] upload/24-1ubuntu3.3 -> upload/24-1ubuntu3.3

rafaeldtinoco@workstation:~/.../sources/ubuntu/kmod$ dput ubuntu ../kmod_24-1ubuntu3.3_source.changes
Checking signature on .changes
gpg: ../kmod_24-1ubuntu3.3_source.changes: Valid signature from A93E0E0AD83C0D0F
Checking signature on .dsc
gpg: ../kmod_24-1ubuntu3.3.dsc: Valid signature from A93E0E0AD83C0D0F
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading kmod_24-1ubuntu3.3.dsc: done.
  Uploading kmod_24-1ubuntu3.3.debian.tar.xz: done.
  Uploading kmod_24-1ubuntu3.3_source.buildinfo: done.
  Uploading kmod_24-1ubuntu3.3_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

This was accepted by the SRU Team -> merged

diff --git a/debian/changelog b/debian/changelog
index dc0ecee..a990613 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+kmod (24-1ubuntu3.3) bionic; 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)
+  * Removed --add-udeb from dh_makeshlibs, since libkmod2-udeb does not
+    actually contain a library. (Closes: #939779)
+
+ -- Rafael David Tinoco <[e-mail]>  Wed, 11 Mar 2020 19:37:06 +0000
+
 kmod (24-1ubuntu3.2) bionic; urgency=medium
 
   * Add i2c_i801 back to d/modprobe.d/blacklist.conf again due to regressions.
diff --git a/debian/patches/series b/debian/patches/series
index 2bdb88a..b1dfabc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 
 # fixes to be pushed upstream
-verbose_missing_bin
 check_builtin_kver
 
 # 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;
- 	}
- 
diff --git a/debian/rules b/debian/rules
index 9b5eda8..0812832 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,7 +129,7 @@ endif
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs --add-udeb=libkmod2-udeb -- -c4
+	dh_makeshlibs -- -c4
 	dh_shlibdeps -- --warnings=7
 	dh_installdeb
 	touch $@