APPLIED(B/hwe, X/hwe): [PATCH v2 0/6][linux-signed*][SRU Bionic][SRU Cosmic][SRU Bionic] Correct source package in Built-Using control field
dann frazier
dann.frazier at canonical.com
Tue May 14 13:28:52 UTC 2019
On Mon, May 13, 2019 at 02:49:18AM -0400, Khaled Elmously wrote:
> On 2019-05-13 02:44:42 , Khaled Elmously wrote:
> >
> > Assuming that I understood correctly what Dann intended for these patches, I was only able to apply the patches for bionic-signed/hwe and xenial-signed/hwe.
> >
> > I got conflicts when trying to apply the patches for:
> > - bionic-signed/hwe-edge
> > - xenial-signed/hwe-edge
> > - cosmic-signed
> > - xenial-signed
>
> CORRECTION:
> I got conflicts when trying to apply the patches for:
> - bionic-signed/hwe-edge
Yes, the arm64 signing landed since I submitted this, which is the
cause of the conflicts. I'll submit a v3 to resolve that.
> - cosmic-signed
I retrieved the patches back from the list and they still seem to
apply fine for me:
dannf at x:~/git/linux-signed.cosmic$ git fetch origin
dannf at x:~/git/linux-signed.cosmic$ git checkout -b test origin/master
Branch 'test' set up to track remote branch 'master' from 'origin'.
Switched to a new branch 'test'
dannf at x:~/git/linux-signed.cosmic$ git am /tmp/1.patch
Applying: UBUNTU: Rename "VERSION" template string to more precise "UNSIGNED_SRC_VERSION"
dannf at x:~/git/linux-signed.cosmic$ git am /tmp/2.patch
Applying: UBUNTU: Use the correct source package name in Built-Using field
> - xenial-signed
Same here:
dannf at x:~/git/linux-signed.xenial$ git fetch origin
dannf at x:~/git/linux-signed.xenial$ git checkout -b test origin/master
Branch 'test' set up to track remote branch 'master' from 'origin'.
Switched to a new branch 'test'
dannf@:~/git/linux-signed.xenial$ git am /tmp/5.patch
Applying: UBUNTU: Rename "VERSION" template string to more precise "UNSIGNED_SRC_VERSION"
dannf@:~/git/linux-signed.xenial$ git am /tmp/6.patch
Applying: UBUNTU: Use the correct source package name in Built-Using field
-dann
More information about the kernel-team
mailing list