| Message ID | 20210130105126.406676-2-colin.king@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | Use gcc-10 for riscv 5.8 kernel build | expand |
On 30.01.21 11:51, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1913864 > > 5.8 RISC-V really requires gcc-10 for a bootable build, so > enable this. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- Adjusted bug report and subject a little to match what we would normally use. Normally I would use critical only for issues which put data in production environments at risk. -Stefan > debian.master/control.stub.in | 2 +- > debian/rules | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in > index 9c1e956092bf..3b920328caff 100644 > --- a/debian.master/control.stub.in > +++ b/debian.master/control.stub.in > @@ -68,7 +68,7 @@ Section: devel > Priority: optional > Provides: linux-source > Depends: ${misc:Depends}, binutils, bzip2, coreutils > -Recommends: libc-dev, gcc, make > +Recommends: libc-dev, gcc-10, make > Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev > Description: Linux kernel source for version PKGVER with Ubuntu patches > This package provides the source code for the Linux kernel version > diff --git a/debian/rules b/debian/rules > index 627ca3cb968f..425d33b35fde 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -8,6 +8,7 @@ > # > > DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' <debian/debian.env) > +gcc=gcc-10 > > # dpkg-buildpackage passes options that are incomptatible > # with the kernel build. >
On Sat, Jan 30, 2021 at 10:51:26AM +0000, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1913864 > > 5.8 RISC-V really requires gcc-10 for a bootable build, so > enable this. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> Do you think it'd make sense to keep gcc-10 in "Recommends", but when setting the gcc variable check if the installed version is < 10, and only in that case redefine gcc=gcc-10? In this case if (for any reason) gcc > 10 is installed we would use the new version instead of forcing it to be gcc-10. In any case: Acked-by: Andrea Righi <andrea.righi@canonical.com> > --- > debian.master/control.stub.in | 2 +- > debian/rules | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in > index 9c1e956092bf..3b920328caff 100644 > --- a/debian.master/control.stub.in > +++ b/debian.master/control.stub.in > @@ -68,7 +68,7 @@ Section: devel > Priority: optional > Provides: linux-source > Depends: ${misc:Depends}, binutils, bzip2, coreutils > -Recommends: libc-dev, gcc, make > +Recommends: libc-dev, gcc-10, make > Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev > Description: Linux kernel source for version PKGVER with Ubuntu patches > This package provides the source code for the Linux kernel version > diff --git a/debian/rules b/debian/rules > index 627ca3cb968f..425d33b35fde 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -8,6 +8,7 @@ > # > > DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' <debian/debian.env) > +gcc=gcc-10 > > # dpkg-buildpackage passes options that are incomptatible > # with the kernel build. > -- > 2.29.2 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
On 01.02.21 09:40, Andrea Righi wrote: > On Sat, Jan 30, 2021 at 10:51:26AM +0000, Colin King wrote: >> From: Colin Ian King <colin.king@canonical.com> >> >> BugLink: https://bugs.launchpad.net/bugs/1913864 >> >> 5.8 RISC-V really requires gcc-10 for a bootable build, so >> enable this. >> >> Signed-off-by: Colin Ian King <colin.king@canonical.com> > > Do you think it'd make sense to keep gcc-10 in "Recommends", but when > setting the gcc variable check if the installed version is < 10, and > only in that case redefine gcc=gcc-10? > > In this case if (for any reason) gcc > 10 is installed we would use the > new version instead of forcing it to be gcc-10. Note this is Focal... I am very strongly opinionated against getting a new major version of gcc there... ;) -Stefan > > In any case: > > Acked-by: Andrea Righi <andrea.righi@canonical.com> > >> --- >> debian.master/control.stub.in | 2 +- >> debian/rules | 1 + >> 2 files changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in >> index 9c1e956092bf..3b920328caff 100644 >> --- a/debian.master/control.stub.in >> +++ b/debian.master/control.stub.in >> @@ -68,7 +68,7 @@ Section: devel >> Priority: optional >> Provides: linux-source >> Depends: ${misc:Depends}, binutils, bzip2, coreutils >> -Recommends: libc-dev, gcc, make >> +Recommends: libc-dev, gcc-10, make >> Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev >> Description: Linux kernel source for version PKGVER with Ubuntu patches >> This package provides the source code for the Linux kernel version >> diff --git a/debian/rules b/debian/rules >> index 627ca3cb968f..425d33b35fde 100755 >> --- a/debian/rules >> +++ b/debian/rules >> @@ -8,6 +8,7 @@ >> # >> >> DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' <debian/debian.env) >> +gcc=gcc-10 >> >> # dpkg-buildpackage passes options that are incomptatible >> # with the kernel build. >> -- >> 2.29.2 >> >> >> -- >> kernel-team mailing list >> kernel-team@lists.ubuntu.com >> https://lists.ubuntu.com/mailman/listinfo/kernel-team >
On Mon, Feb 01, 2021 at 10:45:42AM +0100, Stefan Bader wrote: > On 01.02.21 09:40, Andrea Righi wrote: > > On Sat, Jan 30, 2021 at 10:51:26AM +0000, Colin King wrote: > >> From: Colin Ian King <colin.king@canonical.com> > >> > >> BugLink: https://bugs.launchpad.net/bugs/1913864 > >> > >> 5.8 RISC-V really requires gcc-10 for a bootable build, so > >> enable this. > >> > >> Signed-off-by: Colin Ian King <colin.king@canonical.com> > > > > Do you think it'd make sense to keep gcc-10 in "Recommends", but when > > setting the gcc variable check if the installed version is < 10, and > > only in that case redefine gcc=gcc-10? > > > > In this case if (for any reason) gcc > 10 is installed we would use the > > new version instead of forcing it to be gcc-10. > > Note this is Focal... I am very strongly opinionated against getting a new major > version of gcc there... ;) Very true... my mind is set to unstable/development right now. :) Just ignore my comment, the patch looks good as it is to me. -Andrea > > -Stefan > > > > > In any case: > > > > Acked-by: Andrea Righi <andrea.righi@canonical.com> > > > >> --- > >> debian.master/control.stub.in | 2 +- > >> debian/rules | 1 + > >> 2 files changed, 2 insertions(+), 1 deletion(-) > >> > >> diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in > >> index 9c1e956092bf..3b920328caff 100644 > >> --- a/debian.master/control.stub.in > >> +++ b/debian.master/control.stub.in > >> @@ -68,7 +68,7 @@ Section: devel > >> Priority: optional > >> Provides: linux-source > >> Depends: ${misc:Depends}, binutils, bzip2, coreutils > >> -Recommends: libc-dev, gcc, make > >> +Recommends: libc-dev, gcc-10, make > >> Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev > >> Description: Linux kernel source for version PKGVER with Ubuntu patches > >> This package provides the source code for the Linux kernel version > >> diff --git a/debian/rules b/debian/rules > >> index 627ca3cb968f..425d33b35fde 100755 > >> --- a/debian/rules > >> +++ b/debian/rules > >> @@ -8,6 +8,7 @@ > >> # > >> > >> DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' <debian/debian.env) > >> +gcc=gcc-10 > >> > >> # dpkg-buildpackage passes options that are incomptatible > >> # with the kernel build. > >> -- > >> 2.29.2 > >> > >> > >> -- > >> kernel-team mailing list > >> kernel-team@lists.ubuntu.com > >> https://lists.ubuntu.com/mailman/listinfo/kernel-team > > > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
On 30.01.21 11:51, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1913864 > > 5.8 RISC-V really requires gcc-10 for a bootable build, so > enable this. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> Applied to focal/linux-riscv-5.8. Thanks, Kleber > --- > debian.master/control.stub.in | 2 +- > debian/rules | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in > index 9c1e956092bf..3b920328caff 100644 > --- a/debian.master/control.stub.in > +++ b/debian.master/control.stub.in > @@ -68,7 +68,7 @@ Section: devel > Priority: optional > Provides: linux-source > Depends: ${misc:Depends}, binutils, bzip2, coreutils > -Recommends: libc-dev, gcc, make > +Recommends: libc-dev, gcc-10, make > Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev > Description: Linux kernel source for version PKGVER with Ubuntu patches > This package provides the source code for the Linux kernel version > diff --git a/debian/rules b/debian/rules > index 627ca3cb968f..425d33b35fde 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -8,6 +8,7 @@ > # > > DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' <debian/debian.env) > +gcc=gcc-10 > > # dpkg-buildpackage passes options that are incomptatible > # with the kernel build. >
On 30.01.21 11:51, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1913864 > > 5.8 RISC-V really requires gcc-10 for a bootable build, so > enable this. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > debian.master/control.stub.in | 2 +- > debian/rules | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in > index 9c1e956092bf..3b920328caff 100644 > --- a/debian.master/control.stub.in > +++ b/debian.master/control.stub.in > @@ -68,7 +68,7 @@ Section: devel > Priority: optional > Provides: linux-source > Depends: ${misc:Depends}, binutils, bzip2, coreutils > -Recommends: libc-dev, gcc, make > +Recommends: libc-dev, gcc-10, make Unfortunately the change above has no effect, mainly for changing a file under 'debian.master' which are not used for any of the derivative kernels. Such change should be done under 'debian.riscv-5.8'. So I have amended this commit and pushed this change instead: diff --git a/debian.riscv-5.8/control.stub.in b/debian.riscv-5.8/control.stub.in index d50b8113a635..05de0bfcd9b8 100644 --- a/debian.riscv-5.8/control.stub.in +++ b/debian.riscv-5.8/control.stub.in @@ -39,6 +39,8 @@ Build-Depends: curl <!stage1>, lz4 [amd64 s390x] <!stage1>, dwarves <!stage1>, +Build-Depends-Arch: + gcc-10, Build-Depends-Indep: xmlto <!stage1>, docbook-utils <!stage1>, This is building so the issue seems to be fixed for now. We can fix it later if this is not the best way to solve this issue. Kleber > Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev > Description: Linux kernel source for version PKGVER with Ubuntu patches > This package provides the source code for the Linux kernel version > diff --git a/debian/rules b/debian/rules > index 627ca3cb968f..425d33b35fde 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -8,6 +8,7 @@ > # > > DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' <debian/debian.env) > +gcc=gcc-10 > > # dpkg-buildpackage passes options that are incomptatible > # with the kernel build. >
On 01/02/2021 17:42, Kleber Souza wrote: > On 30.01.21 11:51, Colin King wrote: >> From: Colin Ian King <colin.king@canonical.com> >> >> BugLink: https://bugs.launchpad.net/bugs/1913864 >> >> 5.8 RISC-V really requires gcc-10 for a bootable build, so >> enable this. >> >> Signed-off-by: Colin Ian King <colin.king@canonical.com> >> --- >> debian.master/control.stub.in | 2 +- >> debian/rules | 1 + >> 2 files changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/debian.master/control.stub.in >> b/debian.master/control.stub.in >> index 9c1e956092bf..3b920328caff 100644 >> --- a/debian.master/control.stub.in >> +++ b/debian.master/control.stub.in >> @@ -68,7 +68,7 @@ Section: devel >> Priority: optional >> Provides: linux-source >> Depends: ${misc:Depends}, binutils, bzip2, coreutils >> -Recommends: libc-dev, gcc, make >> +Recommends: libc-dev, gcc-10, make > > Unfortunately the change above has no effect, mainly for changing a file > under 'debian.master' which are not used for any of the derivative kernels. > Such change should be done under 'debian.riscv-5.8'. > > So I have amended this commit and pushed this change instead: > > diff --git a/debian.riscv-5.8/control.stub.in > b/debian.riscv-5.8/control.stub.in > index d50b8113a635..05de0bfcd9b8 100644 > --- a/debian.riscv-5.8/control.stub.in > +++ b/debian.riscv-5.8/control.stub.in > @@ -39,6 +39,8 @@ Build-Depends: > curl <!stage1>, > lz4 [amd64 s390x] <!stage1>, > dwarves <!stage1>, > +Build-Depends-Arch: > + gcc-10, > Build-Depends-Indep: > xmlto <!stage1>, > docbook-utils <!stage1>, Thanks Kleber for spotting and fixing that. My bad. > > > This is building so the issue seems to be fixed for now. We can fix it > later > if this is not the best way to solve this issue. > > > Kleber > >> Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev >> Description: Linux kernel source for version PKGVER with Ubuntu patches >> This package provides the source code for the Linux kernel version >> diff --git a/debian/rules b/debian/rules >> index 627ca3cb968f..425d33b35fde 100755 >> --- a/debian/rules >> +++ b/debian/rules >> @@ -8,6 +8,7 @@ >> # >> DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' >> <debian/debian.env) >> +gcc=gcc-10 >> # dpkg-buildpackage passes options that are incomptatible >> # with the kernel build. >> > >
diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 9c1e956092bf..3b920328caff 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -68,7 +68,7 @@ Section: devel Priority: optional Provides: linux-source Depends: ${misc:Depends}, binutils, bzip2, coreutils -Recommends: libc-dev, gcc, make +Recommends: libc-dev, gcc-10, make Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev Description: Linux kernel source for version PKGVER with Ubuntu patches This package provides the source code for the Linux kernel version diff --git a/debian/rules b/debian/rules index 627ca3cb968f..425d33b35fde 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,7 @@ # DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' <debian/debian.env) +gcc=gcc-10 # dpkg-buildpackage passes options that are incomptatible # with the kernel build.