| Message ID | 20200417115711.102370-1-vicamo.yang@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [U,OEM-5.6] UBUNTU: [Packaging] Include modules.builtin.modinfo in linux-modules | expand |
On 17.4.2020 14.57, You-Sheng Yang wrote: > From: Seth Forshee <seth.forshee@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1873441 > > This is a new file generated since 5.2 (898490c010b5 "moduleparam: > Save information about built-in modules in separate file"). Recent > kmod versionss will try to use this file, so include it in > linux-modules. > > Signed-off-by: Seth Forshee <seth.forshee@canonical.com> > Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com> > --- > debian/rules.d/2-binary-arch.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk > index b87214e7f124..ebaa1164b70c 100644 > --- a/debian/rules.d/2-binary-arch.mk > +++ b/debian/rules.d/2-binary-arch.mk > @@ -347,6 +347,10 @@ endif > mv $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin \ > $(pkgdir)/lib/modules/$(abi_release)-$*/_; \ > fi > + if [ -f $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin.modinfo ] ; then \ > + mv $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin.modinfo \ > + $(pkgdir)/lib/modules/$(abi_release)-$*/_; \ > + fi > rm -f $(pkgdir)/lib/modules/$(abi_release)-$*/modules.* > mv $(pkgdir)/lib/modules/$(abi_release)-$*/_/* \ > $(pkgdir)/lib/modules/$(abi_release)-$* > yep, cherry-picked to oem-5.6-next, thanks
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index b87214e7f124..ebaa1164b70c 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -347,6 +347,10 @@ endif mv $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin \ $(pkgdir)/lib/modules/$(abi_release)-$*/_; \ fi + if [ -f $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin.modinfo ] ; then \ + mv $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin.modinfo \ + $(pkgdir)/lib/modules/$(abi_release)-$*/_; \ + fi rm -f $(pkgdir)/lib/modules/$(abi_release)-$*/modules.* mv $(pkgdir)/lib/modules/$(abi_release)-$*/_/* \ $(pkgdir)/lib/modules/$(abi_release)-$*