| Message ID | 20191003145210.10393-1-seth.forshee@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,E] UBUNTU: [Packaging] Build only linux-libc-dev for i386 | expand |
On Thu, Oct 03, 2019 at 09:52:10AM -0500, Seth Forshee wrote: > https://bugs.launchpad.net/bugs/1846508 > > Even though we aren't producing i386 kernels anymore, we still > need to produce a linux-libc-dev package. Re-enable building only > this package for i386. > > Signed-off-by: Seth Forshee <seth.forshee@canonical.com> > --- Looks good to me. Acked-by: Andrea Righi <andrea.righi@canonical.com> > debian.master/control.stub.in | 2 +- > debian.master/rules.d/i386.mk | 17 ++++++++--------- > 2 files changed, 9 insertions(+), 10 deletions(-) > > diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in > index c19ede1d451c..bf0a9f57bc67 100644 > --- a/debian.master/control.stub.in > +++ b/debian.master/control.stub.in > @@ -104,7 +104,7 @@ Description: Header files related to Linux kernel version PKGVER > /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details > > Package: SRCPKGNAME-libc-dev > -Architecture: amd64 armhf arm64 ppc64el s390x > +Architecture: amd64 armhf arm64 i386 ppc64el s390x > Depends: ${misc:Depends} > Conflicts: SRCPKGNAME-kernel-headers > Replaces: SRCPKGNAME-kernel-headers > diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk > index 06ac6ea33563..a0c64b72864b 100644 > --- a/debian.master/rules.d/i386.mk > +++ b/debian.master/rules.d/i386.mk > @@ -9,12 +9,11 @@ install_file = vmlinuz > loader = grub > vdso = vdso_install > no_dumpfile = true > -do_tools_usbip = true > -do_tools_cpupower = true > -do_tools_perf = true > -do_tools_perf_jvmti = true > -do_tools_bpftool = true > -do_tools_x86 = true > -do_tools_hyperv = true > -do_extras_package = true > -do_dkms_vbox = true > +do_flavour_image_package = false > +do_tools = false > +do_tools_common = false > +do_extras_package = false > +do_source_package = false > +do_doc_package = false > +do_flavour_header_package = false > +do_common_headers_indep = false > -- > 2.20.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
On 03/10/2019 15:52, Seth Forshee wrote: > https://bugs.launchpad.net/bugs/1846508 > > Even though we aren't producing i386 kernels anymore, we still > need to produce a linux-libc-dev package. Re-enable building only > this package for i386. > > Signed-off-by: Seth Forshee <seth.forshee@canonical.com> > --- > debian.master/control.stub.in | 2 +- > debian.master/rules.d/i386.mk | 17 ++++++++--------- > 2 files changed, 9 insertions(+), 10 deletions(-) > > diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in > index c19ede1d451c..bf0a9f57bc67 100644 > --- a/debian.master/control.stub.in > +++ b/debian.master/control.stub.in > @@ -104,7 +104,7 @@ Description: Header files related to Linux kernel version PKGVER > /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details > > Package: SRCPKGNAME-libc-dev > -Architecture: amd64 armhf arm64 ppc64el s390x > +Architecture: amd64 armhf arm64 i386 ppc64el s390x > Depends: ${misc:Depends} > Conflicts: SRCPKGNAME-kernel-headers > Replaces: SRCPKGNAME-kernel-headers > diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk > index 06ac6ea33563..a0c64b72864b 100644 > --- a/debian.master/rules.d/i386.mk > +++ b/debian.master/rules.d/i386.mk > @@ -9,12 +9,11 @@ install_file = vmlinuz > loader = grub > vdso = vdso_install > no_dumpfile = true > -do_tools_usbip = true > -do_tools_cpupower = true > -do_tools_perf = true > -do_tools_perf_jvmti = true > -do_tools_bpftool = true > -do_tools_x86 = true > -do_tools_hyperv = true > -do_extras_package = true > -do_dkms_vbox = true > +do_flavour_image_package = false > +do_tools = false > +do_tools_common = false > +do_extras_package = false > +do_source_package = false > +do_doc_package = false > +do_flavour_header_package = false > +do_common_headers_indep = false > Acked-by: Colin Ian King <colin.king@canonical.com>
On Thu, Oct 03, 2019 at 09:52:10AM -0500, Seth Forshee wrote: > https://bugs.launchpad.net/bugs/1846508 > > Even though we aren't producing i386 kernels anymore, we still > need to produce a linux-libc-dev package. Re-enable building only > this package for i386. > > Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Applied to eoan/master-next.
diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index c19ede1d451c..bf0a9f57bc67 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -104,7 +104,7 @@ Description: Header files related to Linux kernel version PKGVER /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details Package: SRCPKGNAME-libc-dev -Architecture: amd64 armhf arm64 ppc64el s390x +Architecture: amd64 armhf arm64 i386 ppc64el s390x Depends: ${misc:Depends} Conflicts: SRCPKGNAME-kernel-headers Replaces: SRCPKGNAME-kernel-headers diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk index 06ac6ea33563..a0c64b72864b 100644 --- a/debian.master/rules.d/i386.mk +++ b/debian.master/rules.d/i386.mk @@ -9,12 +9,11 @@ install_file = vmlinuz loader = grub vdso = vdso_install no_dumpfile = true -do_tools_usbip = true -do_tools_cpupower = true -do_tools_perf = true -do_tools_perf_jvmti = true -do_tools_bpftool = true -do_tools_x86 = true -do_tools_hyperv = true -do_extras_package = true -do_dkms_vbox = true +do_flavour_image_package = false +do_tools = false +do_tools_common = false +do_extras_package = false +do_source_package = false +do_doc_package = false +do_flavour_header_package = false +do_common_headers_indep = false
https://bugs.launchpad.net/bugs/1846508 Even though we aren't producing i386 kernels anymore, we still need to produce a linux-libc-dev package. Re-enable building only this package for i386. Signed-off-by: Seth Forshee <seth.forshee@canonical.com> --- debian.master/control.stub.in | 2 +- debian.master/rules.d/i386.mk | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-)