[PATCH v2 0/6][linux-signed*][SRU Bionic][SRU Cosmic][SRU Bionic] Correct source package in Built-Using control field

classic Classic list List threaded Threaded
16 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH v2 0/6][linux-signed*][SRU Bionic][SRU Cosmic][SRU Bionic] Correct source package in Built-Using control field

dann frazier-4
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
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH v2 1/6][linux-signed][SRU Cosmic][SRU Bionic] UBUNTU: Rename "VERSION" template string to more precise "UNSIGNED_SRC_VERSION"

dann frazier-4
BugLink: https://bugs.launchpad.net/bugs/1824016

I'll be adding UNSIGNED_SRC_PACKAGE in the next commit, so this will keep
the names consistent.

Signed-off-by: dann frazier <[hidden email]>
---
 debian/control.stub | 8 ++++----
 debian/rules        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/control.stub b/debian/control.stub
index 3f546b6..6c7d775 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -9,7 +9,7 @@ Build-Depends:
  python3-apt,
 Build-Depends-Arch:
  sbsigntool [amd64],
- linux-libc-dev (>= VERSION),
+ linux-libc-dev (>= UNSIGNED_SRC_VERSION),
 Standards-Version: 3.9.4
 
 Package: linux-image-ABI-generic
@@ -19,7 +19,7 @@ Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux (= VERSION)
+Built-Using: linux (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image generic
  A kernel image for generic.  This version of it is signed with
  Canonical's UEFI/Opal signing key.
@@ -31,7 +31,7 @@ Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux (= VERSION)
+Built-Using: linux (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image lowlatency
  A kernel image for lowlatency.  This version of it is signed with
  Canonical's UEFI signing key.
@@ -42,7 +42,7 @@ Section: debian-installer
 Priority: extra
 Provides: kernel-signed-image
 Architecture: amd64 ppc64el
-Built-Using: linux (= VERSION)
+Built-Using: linux (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image generic for the Debian installer
  A kernel image for generic.  This version of it is signed with
  Canonical's UEFI signing key.  It is intended for the Debian installer,
diff --git a/debian/rules b/debian/rules
index b9afe67..1f2083f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ src_abi = $(shell echo "$(src_version)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[
 pre-clean:
  sed <debian/control.stub >debian/control \
  -e "s/ABI/$(src_abi)/g" \
- -e "s/VERSION/$(src_version)/g"
+ -e "s/UNSIGNED_SRC_VERSION/$(src_version)/g"
  rm -rf ./$(src_version) UNSIGNED SIGNED
  rm -f debian/linux-image-*.install \
  debian/linux-image-*.preinst \
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/6][linux-signed][SRU Cosmic][SRU Bionic] UBUNTU: Use the correct source package name in Built-Using field

dann frazier-4
In reply to this post by dann frazier-4
BugLink: https://bugs.launchpad.net/bugs/1824016

Signed-off-by: dann frazier <[hidden email]>
---
 debian/control.stub | 6 +++---
 debian/rules        | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/control.stub b/debian/control.stub
index 6c7d775..34a37c7 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -19,7 +19,7 @@ Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux (= UNSIGNED_SRC_VERSION)
+Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image generic
  A kernel image for generic.  This version of it is signed with
  Canonical's UEFI/Opal signing key.
@@ -31,7 +31,7 @@ Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux (= UNSIGNED_SRC_VERSION)
+Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image lowlatency
  A kernel image for lowlatency.  This version of it is signed with
  Canonical's UEFI signing key.
@@ -42,7 +42,7 @@ Section: debian-installer
 Priority: extra
 Provides: kernel-signed-image
 Architecture: amd64 ppc64el
-Built-Using: linux (= UNSIGNED_SRC_VERSION)
+Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image generic for the Debian installer
  A kernel image for generic.  This version of it is signed with
  Canonical's UEFI signing key.  It is intended for the Debian installer,
diff --git a/debian/rules b/debian/rules
index 1f2083f..62c132c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ src_abi = $(shell echo "$(src_version)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[
 pre-clean:
  sed <debian/control.stub >debian/control \
  -e "s/ABI/$(src_abi)/g" \
+ -e "s/UNSIGNED_SRC_PACKAGE/$(src_package)/g" \
  -e "s/UNSIGNED_SRC_VERSION/$(src_version)/g"
  rm -rf ./$(src_version) UNSIGNED SIGNED
  rm -f debian/linux-image-*.install \
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 3/6][linux-signed-hwe-edge][linux-signed-hwe][SRU Bionic][SRU Xenial] UBUNTU: Rename "VERSION" template string to more precise "UNSIGNED_SRC_VERSION"

dann frazier-4
In reply to this post by dann frazier-4
BugLink: https://bugs.launchpad.net/bugs/1824016

I'll be adding UNSIGNED_SRC_PACKAGE in the next commit, so this will keep
the names consistent.

Signed-off-by: dann frazier <[hidden email]>
---
 debian/control.stub | 8 ++++----
 debian/rules        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/control.stub b/debian/control.stub
index 7fbc480..7e3bb3f 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -8,7 +8,7 @@ Build-Depends:
  python3,
  python3-apt,
  sbsigntool [amd64],
- HEADERS (>= VERSION),
+ HEADERS (>= UNSIGNED_SRC_VERSION),
 Standards-Version: 3.9.4
 
 Package: linux-image-ABI-generic
@@ -18,7 +18,7 @@ Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux (= VERSION)
+Built-Using: linux (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image generic
  A kernel image for generic.  This version of it is signed with
  Canonical's UEFI/Opal signing key.
@@ -30,7 +30,7 @@ Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux (= VERSION)
+Built-Using: linux (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image lowlatency
  A kernel image for lowlatency.  This version of it is signed with
  Canonical's UEFI signing key.
@@ -41,7 +41,7 @@ Section: debian-installer
 Priority: extra
 Provides: kernel-signed-image
 Architecture: amd64 ppc64el
-Built-Using: linux (= VERSION)
+Built-Using: linux (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image generic for the Debian installer
  A kernel image for generic.  This version of it is signed with
  Canonical's UEFI signing key.  It is intended for the Debian installer,
diff --git a/debian/rules b/debian/rules
index 926c4ae..733f106 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ pre-clean:
  sed <debian/control.stub >debian/control \
  -e "s/HEADERS/$(src_headers)/g" \
  -e "s/ABI/$(src_abi)/g" \
- -e "s/VERSION/$(src_version)/g"
+ -e "s/UNSIGNED_SRC_VERSION/$(src_version)/g"
  rm -rf ./$(src_version) UNSIGNED SIGNED
  rm -f debian/linux-image-*.install \
  debian/linux-image-*.preinst \
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 4/6][linux-signed-hwe-edge][linux-signed-hwe][SRU Bionic][SRU Xenial] UBUNTU: Use the correct source package name in Built-Using field

dann frazier-4
In reply to this post by dann frazier-4
BugLink: https://bugs.launchpad.net/bugs/1824016

Signed-off-by: dann frazier <[hidden email]>
---
 debian/control.stub | 6 +++---
 debian/rules        | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/control.stub b/debian/control.stub
index 7e3bb3f..bf34683 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -18,7 +18,7 @@ Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux (= UNSIGNED_SRC_VERSION)
+Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image generic
  A kernel image for generic.  This version of it is signed with
  Canonical's UEFI/Opal signing key.
@@ -30,7 +30,7 @@ Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux (= UNSIGNED_SRC_VERSION)
+Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image lowlatency
  A kernel image for lowlatency.  This version of it is signed with
  Canonical's UEFI signing key.
@@ -41,7 +41,7 @@ Section: debian-installer
 Priority: extra
 Provides: kernel-signed-image
 Architecture: amd64 ppc64el
-Built-Using: linux (= UNSIGNED_SRC_VERSION)
+Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image generic for the Debian installer
  A kernel image for generic.  This version of it is signed with
  Canonical's UEFI signing key.  It is intended for the Debian installer,
diff --git a/debian/rules b/debian/rules
index 733f106..17f7ab2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,7 @@ pre-clean:
  sed <debian/control.stub >debian/control \
  -e "s/HEADERS/$(src_headers)/g" \
  -e "s/ABI/$(src_abi)/g" \
+ -e "s/UNSIGNED_SRC_PACKAGE/$(src_package)/g" \
  -e "s/UNSIGNED_SRC_VERSION/$(src_version)/g"
  rm -rf ./$(src_version) UNSIGNED SIGNED
  rm -f debian/linux-image-*.install \
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 5/6][linux-signed][SRU Xenial] UBUNTU: Rename "VERSION" template string to more precise "UNSIGNED_SRC_VERSION"

dann frazier-4
In reply to this post by dann frazier-4
BugLink: https://bugs.launchpad.net/bugs/1824016

I'll be adding UNSIGNED_SRC_PACKAGE in the next commit, so this will keep
the names consistent.

Signed-off-by: dann frazier <[hidden email]>
---
 debian/control.stub | 8 ++++----
 debian/rules        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/control.stub b/debian/control.stub
index 69d56d9..ed5fb25 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -9,7 +9,7 @@ Build-Depends:
  python3-apt,
 Build-Depends-Arch:
  sbsigntool [amd64],
- linux-libc-dev (>= VERSION),
+ linux-libc-dev (>= UNSIGNED_SRC_VERSION),
 Standards-Version: 3.9.4
 
 Package: linux-image-ABI-generic
@@ -19,7 +19,7 @@ Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux (= VERSION)
+Built-Using: linux (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image generic
  A kernel image for generic.  This version of it is signed with
  Canonical's UEFI/Opal signing key.
@@ -31,7 +31,7 @@ Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux (= VERSION)
+Built-Using: linux (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image lowlatency
  A kernel image for lowlatency.  This version of it is signed with
  Canonical's UEFI signing key.
@@ -42,7 +42,7 @@ Section: debian-installer
 Priority: extra
 Provides: kernel-signed-image
 Architecture: amd64
-Built-Using: linux (= VERSION)
+Built-Using: linux (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image generic for the Debian installer
  A kernel image for generic.  This version of it is signed with
  Canonical's UEFI signing key.  It is intended for the Debian installer,
diff --git a/debian/rules b/debian/rules
index 844032d..30d3d43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ test:
 pre-clean:
  sed <debian/control.stub >debian/control \
  -e "s/ABI/$(src_abi)/g" \
- -e "s/VERSION/$(src_version)/g"
+ -e "s/UNSIGNED_SRC_VERSION/$(src_version)/g"
  rm -rf ./$(src_version) UNSIGNED SIGNED
  rm -f debian/linux-image-*.install \
  debian/linux-image-*.preinst \
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 6/6][linux-signed][SRU Xenial] UBUNTU: Use the correct source package name in Built-Using field

dann frazier-4
In reply to this post by dann frazier-4
BugLink: https://bugs.launchpad.net/bugs/1824016

Signed-off-by: dann frazier <[hidden email]>
---
 debian/control.stub | 6 +++---
 debian/rules        | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/control.stub b/debian/control.stub
index ed5fb25..c662b3e 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -19,7 +19,7 @@ Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux (= UNSIGNED_SRC_VERSION)
+Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image generic
  A kernel image for generic.  This version of it is signed with
  Canonical's UEFI/Opal signing key.
@@ -31,7 +31,7 @@ Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux (= UNSIGNED_SRC_VERSION)
+Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image lowlatency
  A kernel image for lowlatency.  This version of it is signed with
  Canonical's UEFI signing key.
@@ -42,7 +42,7 @@ Section: debian-installer
 Priority: extra
 Provides: kernel-signed-image
 Architecture: amd64
-Built-Using: linux (= UNSIGNED_SRC_VERSION)
+Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image generic for the Debian installer
  A kernel image for generic.  This version of it is signed with
  Canonical's UEFI signing key.  It is intended for the Debian installer,
diff --git a/debian/rules b/debian/rules
index 30d3d43..a06cf87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ test:
 pre-clean:
  sed <debian/control.stub >debian/control \
  -e "s/ABI/$(src_abi)/g" \
+ -e "s/UNSIGNED_SRC_PACKAGE/$(src_package)/g" \
  -e "s/UNSIGNED_SRC_VERSION/$(src_version)/g"
  rm -rf ./$(src_version) UNSIGNED SIGNED
  rm -f debian/linux-image-*.install \
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH v2 0/6][linux-signed*][SRU Bionic][SRU Cosmic][SRU Bionic] Correct source package in Built-Using control field

Kleber Souza
In reply to this post by dann frazier-4
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 <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH v2 0/6][linux-signed*][SRU Bionic][SRU Cosmic][SRU Bionic] Correct source package in Built-Using control field

Connor Kuehl
In reply to this post by dann frazier-4
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 <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

pEpkey.asc (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v2 0/6][linux-signed*][SRU Bionic][SRU Cosmic][SRU Bionic] Correct source package in Built-Using control field

Khalid Elmously
In reply to this post by dann frazier-4
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
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v2 0/6][linux-signed*][SRU Bionic][SRU Cosmic][SRU Bionic] Correct source package in Built-Using control field

dann frazier-4
On Wed, May 8, 2019 at 11:47 PM Khaled Elmously
<[hidden email]> 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
> > [hidden email]
> > https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v2 0/6][linux-signed*][SRU Bionic][SRU Cosmic][SRU Bionic] Correct source package in Built-Using control field

Khalid Elmously
On 2019-05-09 09:00:08 , dann frazier wrote:

> On Wed, May 8, 2019 at 11:47 PM Khaled Elmously
> <[hidden email]> 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
> > > [hidden email]
> > > https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

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

Khalid Elmously
In reply to this post by dann frazier-4

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
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: 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

Khalid Elmously
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
> > [hidden email]
> > https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED: [[SCRIPT=remove_re|Re: [PATCH v2 0/6][linux-signed*][SRU Bionic][SRU Cosmic][SRU Bionic] Correct source package in Built-Using control field]]

Stefan Bader-2
In reply to this post by dann frazier-4
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


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: 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-4
In reply to this post by Khalid Elmously
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

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team