APPLIED[F]: [F/hwe-5.8][PATCH] UBUNTU: [Packaging] Fix typo in -tools template s/PGKVER/PKGVER/

[dann frazier]

On Fri, Oct 9, 2020 at 3:18 AM Stefan Bader <stefan.bader at canonical.com> wrote:
>
> On 09.10.20 11:01, Kleber Souza wrote:
> > Hi Ian,
> >
> > On 08.10.20 23:57, Ian May wrote:
> >> Applied to Focal/master-next.
> >>
> >
> > This patchset doesn't have a cover letter so it's not very obvious where
> > these patches are supposed to be applied. It seems that the patch on the
> > "cover letter" of the set is supposed to be applied to F/B/X linux kernels
> > as they change the file under debian.master/. The other ones tagged for
> > "F/hwe-5.8" and "B/hwe-5.4" are supposed to be applied to these specific
> > hwe kernels tree as they change files under "debian.hwe-{5.8,5.4}".
> > These changes on the hwe kernels are necessary because as pointed out
> > by Stefan these files don't get automatically synced from their masters.
>
> Yeah, I tried to warn about that fact in my reply. Probably was a bit too
> cryptic. Indeed the patches sent for the two hwe branches change the individual
> control files (debian.hwe-*) and those do not exist in the primary branch, nor
> are those part of the file copy that happens on the cranky rebases. The reason
> there is that in the control files one also defines the (build-)dependencies and
> those are based on the series something is built for and released. Like some
> packages exist in Bionic but have been replaced or renamed in Focal.

Yeah, apologies for not including the cover letter. If I had though, I
don't think I could've clarified things any further than what is in
the subject series/hwe tags - i.e., "this one is for bionic-hwe, this
one is for x/b/f/g/u", etc. I'm only going by what I see in the public
git trees, and don't understand the primary branch/cranky rebases
concepts.

Thanks all the same for reviewing/applying.

btw, I didn't attempt to do an exhaustive search for this typo - given
it goes back so far, I expect it may also impact our other kernel
flavors.

  -dann

> > Looking at the trees it seems the patches for f/hwe-5.8 and b/hwe-5.4
> > still need to be applied.
> >
> > Kleber
> >
> >> Thanks!
> >> Ian
> >>
> >> On 2020-10-07 11:02:21 , dann frazier wrote:
> >>> BugLink: https://bugs.launchpad.net/bugs/1898903
> >>>
> >>> Signed-off-by: dann frazier <dann.frazier at canonical.com>
> >>> ---
> >>>  debian.hwe-5.8/control.stub.in | 4 ++--
> >>>  1 file changed, 2 insertions(+), 2 deletions(-)
> >>>
> >>> diff --git a/debian.hwe-5.8/control.stub.in b/debian.hwe-5.8/control.stub.in
> >>> index e2b3c92061a7..5498587cfe0c 100644
> >>> --- a/debian.hwe-5.8/control.stub.in
> >>> +++ b/debian.hwe-5.8/control.stub.in
> >>> @@ -108,7 +108,7 @@ 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 PGKVER.
> >>> + version PKGVER.
> >>>
> >>>  Package: SRCPKGNAME-tools-PKGVER-ABINUM
> >>>  Build-Profiles: <!stage1>
> >>> @@ -132,7 +132,7 @@ Priority: optional
> >>>  Depends: ${misc:Depends}
> >>>  Description: Linux kernel version specific cloud tools for version PKGVER
> >>>   This package provides the architecture independent parts for kernel
> >>> - version locked tools for cloud tools for version PGKVER.
> >>> + version locked tools for cloud tools for version PKGVER.
> >>>
> >>>  Package: SRCPKGNAME-cloud-tools-PKGVER-ABINUM
> >>>  Build-Profiles: <!stage1>
> >>> --
> >>> 2.28.0
> >>>
> >>>
> >>> --
> >>> kernel-team mailing list
> >>> kernel-team at lists.ubuntu.com
> >>> https://lists.ubuntu.com/mailman/listinfo/kernel-team
> >>
> >
> >
>
>