| Message ID | 20231121065712.722729-1-juerg.haefliger@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,M:laptop] UBUNTU: [Packaging] laptop: Don't build linux-laptop-tools-{common, host} | expand |
On Tue, Nov 21, 2023 at 07:57:12AM +0100, Juerg Haefliger wrote: > BugLink: https://bugs.launchpad.net/bugs/2044003 > > These must not be built for non-main kernels, so disable them and drop > the package stanzas from the control stub. > > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> > --- > debian.laptop/control.stub.in | 23 ----------------------- > debian.laptop/rules.d/arm64.mk | 2 ++ > 2 files changed, 2 insertions(+), 23 deletions(-) > > diff --git a/debian.laptop/control.stub.in b/debian.laptop/control.stub.in > index 85a827010da6..b5dff52516fe 100644 > --- a/debian.laptop/control.stub.in > +++ b/debian.laptop/control.stub.in > @@ -75,19 +75,6 @@ Description: Header files related to Linux kernel version PKGVER > that want the latest kernel headers. Please read > /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details > > -Package: SRCPKGNAME-tools-common > -Build-Profiles: <!stage1> > -Architecture: all > -Multi-Arch: foreign > -Section: kernel > -Priority: optional > -Provides: bpftool > -Depends: ${misc:Depends}, lsb-release > -Description: Linux kernel version specific tools for version PKGVER > - This package provides the architecture independent parts for kernel > - version locked tools (such as perf and x86_energy_perf_policy) for > - version PKGVER. > - > Package: SRCPKGNAME-tools-PKGVER-ABINUM > Build-Profiles: <!stage1> > Architecture: arm64 > @@ -101,13 +88,3 @@ Description: Linux kernel version specific tools for version PKGVER-ABINUM > =HUMAN=. > You probably want to install linux-tools-PKGVER-ABINUM-<flavour>. > > -Package: SRCPKGNAME-tools-host > -Build-Profiles: <!stage1> > -Architecture: all > -Multi-Arch: foreign > -Section: kernel > -Priority: optional > -Depends: ${misc:Depends}, python3 > -Description: Linux kernel VM host tools > - This package provides kernel tools useful for VM hosts. > - > diff --git a/debian.laptop/rules.d/arm64.mk b/debian.laptop/rules.d/arm64.mk > index b86b5c7abead..964a1f3bb4f1 100644 > --- a/debian.laptop/rules.d/arm64.mk > +++ b/debian.laptop/rules.d/arm64.mk > @@ -23,3 +23,5 @@ do_dtbs = true > do_libc_dev_package = false > do_doc_package = false > do_source_package = false > +do_tools_common = false > +do_tools_host = false > -- > 2.40.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team Acked-by: Manuel Diewald <manuel.diewald@canonical.com>
On Tue, 21 Nov 2023 at 06:58, Juerg Haefliger <juerg.haefliger@canonical.com> wrote: > > BugLink: https://bugs.launchpad.net/bugs/2044003 > > These must not be built for non-main kernels, so disable them and drop > the package stanzas from the control stub. > > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> > --- > debian.laptop/control.stub.in | 23 ----------------------- > debian.laptop/rules.d/arm64.mk | 2 ++ > 2 files changed, 2 insertions(+), 23 deletions(-) > > diff --git a/debian.laptop/control.stub.in b/debian.laptop/control.stub.in > index 85a827010da6..b5dff52516fe 100644 > --- a/debian.laptop/control.stub.in > +++ b/debian.laptop/control.stub.in > @@ -75,19 +75,6 @@ Description: Header files related to Linux kernel version PKGVER > that want the latest kernel headers. Please read > /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details > > -Package: SRCPKGNAME-tools-common > -Build-Profiles: <!stage1> > -Architecture: all > -Multi-Arch: foreign > -Section: kernel > -Priority: optional > -Provides: bpftool > -Depends: ${misc:Depends}, lsb-release > -Description: Linux kernel version specific tools for version PKGVER > - This package provides the architecture independent parts for kernel > - version locked tools (such as perf and x86_energy_perf_policy) for > - version PKGVER. > - > Package: SRCPKGNAME-tools-PKGVER-ABINUM > Build-Profiles: <!stage1> > Architecture: arm64 > @@ -101,13 +88,3 @@ Description: Linux kernel version specific tools for version PKGVER-ABINUM > =HUMAN=. > You probably want to install linux-tools-PKGVER-ABINUM-<flavour>. > > -Package: SRCPKGNAME-tools-host > -Build-Profiles: <!stage1> > -Architecture: all > -Multi-Arch: foreign > -Section: kernel > -Priority: optional > -Depends: ${misc:Depends}, python3 > -Description: Linux kernel VM host tools > - This package provides kernel tools useful for VM hosts. > - > diff --git a/debian.laptop/rules.d/arm64.mk b/debian.laptop/rules.d/arm64.mk > index b86b5c7abead..964a1f3bb4f1 100644 > --- a/debian.laptop/rules.d/arm64.mk > +++ b/debian.laptop/rules.d/arm64.mk > @@ -23,3 +23,5 @@ do_dtbs = true > do_libc_dev_package = false > do_doc_package = false > do_source_package = false > +do_tools_common = false > +do_tools_host = false > -- > 2.40.1 > > Acked-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> okurrr, Dimitri
Applied to ~ubuntu-concept/ubuntu/+source/linux/+git/mantic linux-laptop branch. ...Juerg > BugLink: https://bugs.launchpad.net/bugs/2044003 > > These must not be built for non-main kernels, so disable them and drop > the package stanzas from the control stub. > > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> > --- > debian.laptop/control.stub.in | 23 ----------------------- > debian.laptop/rules.d/arm64.mk | 2 ++ > 2 files changed, 2 insertions(+), 23 deletions(-) > > diff --git a/debian.laptop/control.stub.in b/debian.laptop/control.stub.in > index 85a827010da6..b5dff52516fe 100644 > --- a/debian.laptop/control.stub.in > +++ b/debian.laptop/control.stub.in > @@ -75,19 +75,6 @@ Description: Header files related to Linux kernel version PKGVER > that want the latest kernel headers. Please read > /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details > > -Package: SRCPKGNAME-tools-common > -Build-Profiles: <!stage1> > -Architecture: all > -Multi-Arch: foreign > -Section: kernel > -Priority: optional > -Provides: bpftool > -Depends: ${misc:Depends}, lsb-release > -Description: Linux kernel version specific tools for version PKGVER > - This package provides the architecture independent parts for kernel > - version locked tools (such as perf and x86_energy_perf_policy) for > - version PKGVER. > - > Package: SRCPKGNAME-tools-PKGVER-ABINUM > Build-Profiles: <!stage1> > Architecture: arm64 > @@ -101,13 +88,3 @@ Description: Linux kernel version specific tools for version PKGVER-ABINUM > =HUMAN=. > You probably want to install linux-tools-PKGVER-ABINUM-<flavour>. > > -Package: SRCPKGNAME-tools-host > -Build-Profiles: <!stage1> > -Architecture: all > -Multi-Arch: foreign > -Section: kernel > -Priority: optional > -Depends: ${misc:Depends}, python3 > -Description: Linux kernel VM host tools > - This package provides kernel tools useful for VM hosts. > - > diff --git a/debian.laptop/rules.d/arm64.mk b/debian.laptop/rules.d/arm64.mk > index b86b5c7abead..964a1f3bb4f1 100644 > --- a/debian.laptop/rules.d/arm64.mk > +++ b/debian.laptop/rules.d/arm64.mk > @@ -23,3 +23,5 @@ do_dtbs = true > do_libc_dev_package = false > do_doc_package = false > do_source_package = false > +do_tools_common = false > +do_tools_host = false
diff --git a/debian.laptop/control.stub.in b/debian.laptop/control.stub.in index 85a827010da6..b5dff52516fe 100644 --- a/debian.laptop/control.stub.in +++ b/debian.laptop/control.stub.in @@ -75,19 +75,6 @@ Description: Header files related to Linux kernel version PKGVER that want the latest kernel headers. Please read /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details -Package: SRCPKGNAME-tools-common -Build-Profiles: <!stage1> -Architecture: all -Multi-Arch: foreign -Section: kernel -Priority: optional -Provides: bpftool -Depends: ${misc:Depends}, lsb-release -Description: Linux kernel version specific tools for version PKGVER - This package provides the architecture independent parts for kernel - version locked tools (such as perf and x86_energy_perf_policy) for - version PKGVER. - Package: SRCPKGNAME-tools-PKGVER-ABINUM Build-Profiles: <!stage1> Architecture: arm64 @@ -101,13 +88,3 @@ Description: Linux kernel version specific tools for version PKGVER-ABINUM =HUMAN=. You probably want to install linux-tools-PKGVER-ABINUM-<flavour>. -Package: SRCPKGNAME-tools-host -Build-Profiles: <!stage1> -Architecture: all -Multi-Arch: foreign -Section: kernel -Priority: optional -Depends: ${misc:Depends}, python3 -Description: Linux kernel VM host tools - This package provides kernel tools useful for VM hosts. - diff --git a/debian.laptop/rules.d/arm64.mk b/debian.laptop/rules.d/arm64.mk index b86b5c7abead..964a1f3bb4f1 100644 --- a/debian.laptop/rules.d/arm64.mk +++ b/debian.laptop/rules.d/arm64.mk @@ -23,3 +23,5 @@ do_dtbs = true do_libc_dev_package = false do_doc_package = false do_source_package = false +do_tools_common = false +do_tools_host = false
BugLink: https://bugs.launchpad.net/bugs/2044003 These must not be built for non-main kernels, so disable them and drop the package stanzas from the control stub. Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> --- debian.laptop/control.stub.in | 23 ----------------------- debian.laptop/rules.d/arm64.mk | 2 ++ 2 files changed, 2 insertions(+), 23 deletions(-)