diff mbox series

[4/4,F,SRU,L-R-M] UBUNTU: update-version -- copy arch/powerpc/kernel/module.lds

Message ID 20200529143433.2215808-3-alberto.milone@canonical.com
State New
Headers show
Series Add signed modules for the new NVIDIA -server drivers | expand

Commit Message

Alberto Milone May 29, 2020, 2:34 p.m. UTC
This only seems to be needed on ppc64el.

BugLink: https://bugs.launchpad.net/bugs/1881137

Signed-off-by: Alberto Milone <alberto.milone@canonical.com>
---
 arch/powerpc/kernel/module.lds | 8 ++++++++
 update-version                 | 1 +
 2 files changed, 9 insertions(+)
 create mode 100644 arch/powerpc/kernel/module.lds

Comments

Seth Forshee June 1, 2020, 7:53 p.m. UTC | #1
On Fri, May 29, 2020 at 04:34:31PM +0200, Alberto Milone wrote:
> This only seems to be needed on ppc64el.
> 
> BugLink: https://bugs.launchpad.net/bugs/1881137
> 
> Signed-off-by: Alberto Milone <alberto.milone@canonical.com>

Why do we need to copy modules.lds from update-version and also add it
to linux-buildinfo. Shouldn't one or the other be sufficient?

Thanks,
Seth

> ---
>  arch/powerpc/kernel/module.lds | 8 ++++++++
>  update-version                 | 1 +
>  2 files changed, 9 insertions(+)
>  create mode 100644 arch/powerpc/kernel/module.lds
> 
> diff --git a/arch/powerpc/kernel/module.lds b/arch/powerpc/kernel/module.lds
> new file mode 100644
> index 0000000..cea5dc1
> --- /dev/null
> +++ b/arch/powerpc/kernel/module.lds
> @@ -0,0 +1,8 @@
> +/* Force alignment of .toc section.  */
> +SECTIONS
> +{
> +	.toc 0 : ALIGN(256)
> +	{
> +		*(.got .toc)
> +	}
> +}
> diff --git a/update-version b/update-version
> index 94a6908..0df01c5 100755
> --- a/update-version
> +++ b/update-version
> @@ -47,6 +47,7 @@ for thing in \
>  	debian/scripts/dkms-build \
>  	debian/scripts/dkms-build--nvidia-N \
>  	debian/scripts/fix-filenames.c \
> +	arch/powerpc/kernel/module.lds \
>  	scripts/module-common.lds
>  do
>  	cp -p "$master_dir/$thing" "$thing" || exit 1
> -- 
> 2.25.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Alberto Milone June 3, 2020, 3:30 p.m. UTC | #2
The copy was meant to get the build (or the linking) to succeed in the
kernel. The thing that we do with update-version in the l-r-m is to help
when building the nvidia modules again for the l-r-m.

On Mon, 1 Jun 2020 at 21:53, Seth Forshee <seth.forshee@canonical.com>
wrote:

> On Fri, May 29, 2020 at 04:34:31PM +0200, Alberto Milone wrote:
> > This only seems to be needed on ppc64el.
> >
> > BugLink: https://bugs.launchpad.net/bugs/1881137
> >
> > Signed-off-by: Alberto Milone <alberto.milone@canonical.com>
>
> Why do we need to copy modules.lds from update-version and also add it
> to linux-buildinfo. Shouldn't one or the other be sufficient?
>
> Thanks,
> Seth
>
> > ---
> >  arch/powerpc/kernel/module.lds | 8 ++++++++
> >  update-version                 | 1 +
> >  2 files changed, 9 insertions(+)
> >  create mode 100644 arch/powerpc/kernel/module.lds
> >
> > diff --git a/arch/powerpc/kernel/module.lds
> b/arch/powerpc/kernel/module.lds
> > new file mode 100644
> > index 0000000..cea5dc1
> > --- /dev/null
> > +++ b/arch/powerpc/kernel/module.lds
> > @@ -0,0 +1,8 @@
> > +/* Force alignment of .toc section.  */
> > +SECTIONS
> > +{
> > +     .toc 0 : ALIGN(256)
> > +     {
> > +             *(.got .toc)
> > +     }
> > +}
> > diff --git a/update-version b/update-version
> > index 94a6908..0df01c5 100755
> > --- a/update-version
> > +++ b/update-version
> > @@ -47,6 +47,7 @@ for thing in \
> >       debian/scripts/dkms-build \
> >       debian/scripts/dkms-build--nvidia-N \
> >       debian/scripts/fix-filenames.c \
> > +     arch/powerpc/kernel/module.lds \
> >       scripts/module-common.lds
> >  do
> >       cp -p "$master_dir/$thing" "$thing" || exit 1
> > --
> > 2.25.1
> >
> >
> > --
> > kernel-team mailing list
> > kernel-team@lists.ubuntu.com
> > https://lists.ubuntu.com/mailman/listinfo/kernel-team
>
diff mbox series

Patch

diff --git a/arch/powerpc/kernel/module.lds b/arch/powerpc/kernel/module.lds
new file mode 100644
index 0000000..cea5dc1
--- /dev/null
+++ b/arch/powerpc/kernel/module.lds
@@ -0,0 +1,8 @@ 
+/* Force alignment of .toc section.  */
+SECTIONS
+{
+	.toc 0 : ALIGN(256)
+	{
+		*(.got .toc)
+	}
+}
diff --git a/update-version b/update-version
index 94a6908..0df01c5 100755
--- a/update-version
+++ b/update-version
@@ -47,6 +47,7 @@  for thing in \
 	debian/scripts/dkms-build \
 	debian/scripts/dkms-build--nvidia-N \
 	debian/scripts/fix-filenames.c \
+	arch/powerpc/kernel/module.lds \
 	scripts/module-common.lds
 do
 	cp -p "$master_dir/$thing" "$thing" || exit 1