| Message ID | 20190427211725.4796-1-dann.frazier@canonical.com |
|---|---|
| Headers | show |
| Series | Correct source package in Built-Using control field | expand |
On 4/27/19 11:17 PM, dann frazier wrote: > BugLink: https://bugs.launchpad.net/bugs/1824016 > > Backports of patches already applied to Disco. > > The Built-Using field hardcodes "linux" as the source package, even for the > hwe & hwe-edge packages. Correct that. Technically only the > linux-signed-hwe{-edge} packages need this fix, but I'm including patches > for linux-signed as well to prevent future occurences due to cargo-culting. > > Verified by confirming that the same control file is generated before > and after this change for linux-signed, and Built-Using is now correct > for the hwe packages. > > v2: > * Clarify the vague PACKAGE, VERSION template vars by prefixing > them with "UNSIGNED_SRC_". > Changes already applied to Disco, no issues have been reported that I know of. Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
On 4/27/19 2:17 PM, dann frazier wrote: > BugLink: https://bugs.launchpad.net/bugs/1824016 > > Backports of patches already applied to Disco. > > The Built-Using field hardcodes "linux" as the source package, even for the > hwe & hwe-edge packages. Correct that. Technically only the > linux-signed-hwe{-edge} packages need this fix, but I'm including patches > for linux-signed as well to prevent future occurences due to cargo-culting. > > Verified by confirming that the same control file is generated before > and after this change for linux-signed, and Built-Using is now correct > for the hwe packages. > > v2: > * Clarify the vague PACKAGE, VERSION template vars by prefixing > them with "UNSIGNED_SRC_". > Acked-by: Connor Kuehl <connor.kuehl@canonical.com>
I'm a little confused by this patchset. I'm not sure where each patch is supposed to go, or why only one of the patches is a v2, or why Bionic is tagged twice, or which -hwe is the intended target, or... On 2019-04-27 15:17:19 , dann frazier wrote: > BugLink: https://bugs.launchpad.net/bugs/1824016 > > Backports of patches already applied to Disco. > > The Built-Using field hardcodes "linux" as the source package, even for the > hwe & hwe-edge packages. Correct that. Technically only the > linux-signed-hwe{-edge} packages need this fix, but I'm including patches > for linux-signed as well to prevent future occurences due to cargo-culting. > > Verified by confirming that the same control file is generated before > and after this change for linux-signed, and Built-Using is now correct > for the hwe packages. > > v2: > * Clarify the vague PACKAGE, VERSION template vars by prefixing > them with "UNSIGNED_SRC_". > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
On Wed, May 8, 2019 at 11:47 PM Khaled Elmously <khalid.elmously@canonical.com> wrote: > > I'm a little confused by this patchset. I'm not sure where each patch is supposed to go, or why only one of the patches is a v2, or why Bionic is tagged twice, or which -hwe is the intended target, or... Khaled, Sorry - the missing "v2" on patches 2-6 was a mistake. They should all be v2. AIUI, the list's preference is to have things like this all in one thread (vs. separate threads for package), but that kinda obfuscates the patch numbering. The pattern I used was that you should be able to apply these patches in order, but the trees/branches to which you'd apply them will change as you go, as listed in the subject line tags. To be explicit: Patch 1/2: linux-signed/cosmic linux-signed/bionic Patch 3/4: linux-signed-hwe-edge/bionic linux-signed-hwe/bionic linux-signed-hwe-edge/xenial linux-signed-hwe/xenial Patch 5/6: linux-signed/xenial Always happy to change my process to make it easier - just let me know if you have suggestions :) -dann > > > On 2019-04-27 15:17:19 , dann frazier wrote: > > BugLink: https://bugs.launchpad.net/bugs/1824016 > > > > Backports of patches already applied to Disco. > > > > The Built-Using field hardcodes "linux" as the source package, even for the > > hwe & hwe-edge packages. Correct that. Technically only the > > linux-signed-hwe{-edge} packages need this fix, but I'm including patches > > for linux-signed as well to prevent future occurences due to cargo-culting. > > > > Verified by confirming that the same control file is generated before > > and after this change for linux-signed, and Built-Using is now correct > > for the hwe packages. > > > > v2: > > * Clarify the vague PACKAGE, VERSION template vars by prefixing > > them with "UNSIGNED_SRC_". > > > > -- > > kernel-team mailing list > > kernel-team@lists.ubuntu.com > > https://lists.ubuntu.com/mailman/listinfo/kernel-team
On 2019-05-09 09:00:08 , dann frazier wrote: > On Wed, May 8, 2019 at 11:47 PM Khaled Elmously > <khalid.elmously@canonical.com> wrote: > > > > I'm a little confused by this patchset. I'm not sure where each patch is supposed to go, or why only one of the patches is a v2, or why Bionic is tagged twice, or which -hwe is the intended target, or... > > Khaled, > Sorry - the missing "v2" on patches 2-6 was a mistake. They should all be v2. > > AIUI, the list's preference is to have things like this all in one > thread (vs. separate threads for package), but that kinda obfuscates > the patch numbering. The pattern I used was that you should be able to > apply these patches in order, but the trees/branches to which you'd > apply them will change as you go, as listed in the subject line tags. > > To be explicit: > Patch 1/2: linux-signed/cosmic > linux-signed/bionic > Patch 3/4: linux-signed-hwe-edge/bionic > linux-signed-hwe/bionic > linux-signed-hwe-edge/xenial > linux-signed-hwe/xenial > Patch 5/6: linux-signed/xenial > > Always happy to change my process to make it easier - just let me know > if you have suggestions :) > > -dann > Thans Dann. It makes sense the way you did it - AFTER you explained it :) I don't have a better idea on how to do a patchset like this in the future (other than to hope to use a review tool that automates all of this) > > > > > > On 2019-04-27 15:17:19 , dann frazier wrote: > > > BugLink: https://bugs.launchpad.net/bugs/1824016 > > > > > > Backports of patches already applied to Disco. > > > > > > The Built-Using field hardcodes "linux" as the source package, even for the > > > hwe & hwe-edge packages. Correct that. Technically only the > > > linux-signed-hwe{-edge} packages need this fix, but I'm including patches > > > for linux-signed as well to prevent future occurences due to cargo-culting. > > > > > > Verified by confirming that the same control file is generated before > > > and after this change for linux-signed, and Built-Using is now correct > > > for the hwe packages. > > > > > > v2: > > > * Clarify the vague PACKAGE, VERSION template vars by prefixing > > > them with "UNSIGNED_SRC_". > > > > > > -- > > > kernel-team mailing list > > > kernel-team@lists.ubuntu.com > > > https://lists.ubuntu.com/mailman/listinfo/kernel-team
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 I _was_ able to apply the patches for xenial-signed/hwe-edge, however I was unable to push those changes (seems like a permission error). I will bring this up with the team. Dann, I wasn't comfortable trying to resolve the conflicting patches myself. Could I ask you to please confirm that they apply cleanly to the master (or master-next) branches where they're supposed to go? Thanks Khaled On 2019-04-27 15:17:19 , dann frazier wrote: > BugLink: https://bugs.launchpad.net/bugs/1824016 > > Backports of patches already applied to Disco. > > The Built-Using field hardcodes "linux" as the source package, even for the > hwe & hwe-edge packages. Correct that. Technically only the > linux-signed-hwe{-edge} packages need this fix, but I'm including patches > for linux-signed as well to prevent future occurences due to cargo-culting. > > Verified by confirming that the same control file is generated before > and after this change for linux-signed, and Built-Using is now correct > for the hwe packages. > > v2: > * Clarify the vague PACKAGE, VERSION template vars by prefixing > them with "UNSIGNED_SRC_". > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
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 - cosmic-signed - xenial-signed There was no conflict with xenial-signed/hwe-edge - just the permission error when attempting to push the changes. > > > I _was_ able to apply the patches for xenial-signed/hwe-edge, however I was unable to push those changes (seems like a permission error). I will bring this up with the team. > > Dann, I wasn't comfortable trying to resolve the conflicting patches myself. Could I ask you to please confirm that they apply cleanly to the master (or master-next) branches where they're supposed to go? > > Thanks > Khaled > > > On 2019-04-27 15:17:19 , dann frazier wrote: > > BugLink: https://bugs.launchpad.net/bugs/1824016 > > > > Backports of patches already applied to Disco. > > > > The Built-Using field hardcodes "linux" as the source package, even for the > > hwe & hwe-edge packages. Correct that. Technically only the > > linux-signed-hwe{-edge} packages need this fix, but I'm including patches > > for linux-signed as well to prevent future occurences due to cargo-culting. > > > > Verified by confirming that the same control file is generated before > > and after this change for linux-signed, and Built-Using is now correct > > for the hwe packages. > > > > v2: > > * Clarify the vague PACKAGE, VERSION template vars by prefixing > > them with "UNSIGNED_SRC_". > > > > -- > > kernel-team mailing list > > kernel-team@lists.ubuntu.com > > https://lists.ubuntu.com/mailman/listinfo/kernel-team
On 27.04.19 23:17, dann frazier wrote: > BugLink: https://bugs.launchpad.net/bugs/1824016 > > Backports of patches already applied to Disco. > > The Built-Using field hardcodes "linux" as the source package, even for the > hwe & hwe-edge packages. Correct that. Technically only the > linux-signed-hwe{-edge} packages need this fix, but I'm including patches > for linux-signed as well to prevent future occurences due to cargo-culting. > > Verified by confirming that the same control file is generated before > and after this change for linux-signed, and Built-Using is now correct > for the hwe packages. > > v2: > * Clarify the vague PACKAGE, VERSION template vars by prefixing > them with "UNSIGNED_SRC_". > Applied to requested signed trees. Thanks. Somehow the only tree that required additional care for me was bionic/linux-signed-hwe-edge which required some context adjustment and I believe one more change for both. -Stefan
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@x:~/git/linux-signed.cosmic$ git fetch origin dannf@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@x:~/git/linux-signed.cosmic$ git am /tmp/1.patch Applying: UBUNTU: Rename "VERSION" template string to more precise "UNSIGNED_SRC_VERSION" dannf@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@x:~/git/linux-signed.xenial$ git fetch origin dannf@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
BugLink: https://bugs.launchpad.net/bugs/1824016 Backports of patches already applied to Disco. The Built-Using field hardcodes "linux" as the source package, even for the hwe & hwe-edge packages. Correct that. Technically only the linux-signed-hwe{-edge} packages need this fix, but I'm including patches for linux-signed as well to prevent future occurences due to cargo-culting. Verified by confirming that the same control file is generated before and after this change for linux-signed, and Built-Using is now correct for the hwe packages. v2: * Clarify the vague PACKAGE, VERSION template vars by prefixing them with "UNSIGNED_SRC_".