[XZAB] UBUNTU: [debian] use SRCPKGNAME in linux-headers Depends

Message ID 1513809899-28480-1-git-send-email-kamal@canonical.com
State New
Headers show
Series
  • [XZAB] UBUNTU: [debian] use SRCPKGNAME in linux-headers Depends
Related show

Commit Message

Kamal Mostafa Dec. 20, 2017, 10:44 p.m.
Use the SRCPKGNAME macro instead of hardcoded "linux" in the Depends for
linux-headers-PKGVER-ABINUM-FLAVOUR, to provide the correct package name
for derivative kernels with a different SRCPKGNAME.

Ignore: yes

Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 debian.master/control.d/flavour-control.stub | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Khaled Elmously Dec. 20, 2017, 11:06 p.m. | #1
Original Message  
From: Kamal Mostafa
Sent: Wednesday, December 20, 2017 5:45 PM
To: kernel-team@lists.ubuntu.com
Subject: [PATCH][XZAB] UBUNTU: [debian] use SRCPKGNAME in linux-headers Depends

Use the SRCPKGNAME macro instead of hardcoded "linux" in the Depends for
linux-headers-PKGVER-ABINUM-FLAVOUR, to provide the correct package name
for derivative kernels with a different SRCPKGNAME.

Ignore: yes

Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
debian.master/control.d/flavour-control.stub | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
index 6206071..cb14fea 100644
--- a/debian.master/control.d/flavour-control.stub
+++ b/debian.master/control.d/flavour-control.stub
@@ -74,7 +74,7 @@ Build-Profiles: <!stage1>
Architecture: ARCH
Section: devel
Priority: optional
-Depends: ${misc:Depends}, linux-headers-PKGVER-ABINUM, ${shlibs:Depends}
+Depends: ${misc:Depends}, SRCPKGNAME-headers-PKGVER-ABINUM, ${shlibs:Depends}
Provides: linux-headers, linux-headers-3.0
Description: Linux kernel headers for version PKGVER on DESC
This package provides kernel header files for version PKGVER on
Marcelo Henrique Cerri Jan. 2, 2018, 12:13 p.m. | #2
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Seth Forshee Jan. 3, 2018, 11:01 p.m. | #3
On Wed, Dec 20, 2017 at 02:44:59PM -0800, Kamal Mostafa wrote:
> Use the SRCPKGNAME macro instead of hardcoded "linux" in the Depends for
> linux-headers-PKGVER-ABINUM-FLAVOUR, to provide the correct package name
> for derivative kernels with a different SRCPKGNAME.
> 
> Ignore: yes
> 
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>

Applied to bionic/master-next, thanks!
Seth Forshee Jan. 3, 2018, 11:32 p.m. | #4
On Wed, Jan 03, 2018 at 05:01:30PM -0600, Seth Forshee wrote:
> On Wed, Dec 20, 2017 at 02:44:59PM -0800, Kamal Mostafa wrote:
> > Use the SRCPKGNAME macro instead of hardcoded "linux" in the Depends for
> > linux-headers-PKGVER-ABINUM-FLAVOUR, to provide the correct package name
> > for derivative kernels with a different SRCPKGNAME.
> > 
> > Ignore: yes
> > 
> > Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> 
> Applied to bionic/master-next, thanks!

Oh, and also applied to unstable/master.
Andy Whitcroft Jan. 4, 2018, 8:08 a.m. | #5
On Wed, Dec 20, 2017 at 02:44:59PM -0800, Kamal Mostafa wrote:
> Use the SRCPKGNAME macro instead of hardcoded "linux" in the Depends for
> linux-headers-PKGVER-ABINUM-FLAVOUR, to provide the correct package name
> for derivative kernels with a different SRCPKGNAME.
> 
> Ignore: yes
> 
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> ---
>  debian.master/control.d/flavour-control.stub | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
> index 6206071..cb14fea 100644
> --- a/debian.master/control.d/flavour-control.stub
> +++ b/debian.master/control.d/flavour-control.stub
> @@ -74,7 +74,7 @@ Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: devel
>  Priority: optional
> -Depends: ${misc:Depends}, linux-headers-PKGVER-ABINUM, ${shlibs:Depends}
> +Depends: ${misc:Depends}, SRCPKGNAME-headers-PKGVER-ABINUM, ${shlibs:Depends}
>  Provides: linux-headers, linux-headers-3.0
>  Description: Linux kernel headers for version PKGVER on DESC
>   This package provides kernel header files for version PKGVER on

This will have fallout for derivative branches.  Some will already carry
this patch, some will rely on it not being applied.  Keep this in mind
when building and testing derivatives after application to the master.

-apw
Kamal Mostafa Jan. 6, 2018, 7:49 p.m. | #6
On Thu, Jan 4, 2018 at 12:08 AM, Andy Whitcroft <apw@canonical.com> wrote:

> On Wed, Dec 20, 2017 at 02:44:59PM -0800, Kamal Mostafa wrote:
> > Use the SRCPKGNAME macro instead of hardcoded "linux" in the Depends for
> > linux-headers-PKGVER-ABINUM-FLAVOUR, to provide the correct package name
> > for derivative kernels with a different SRCPKGNAME.
> >
> > Ignore: yes
> >
> > Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> > ---
> >  debian.master/control.d/flavour-control.stub | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/debian.master/control.d/flavour-control.stub
> b/debian.master/control.d/flavour-control.stub
> > index 6206071..cb14fea 100644
> > --- a/debian.master/control.d/flavour-control.stub
> > +++ b/debian.master/control.d/flavour-control.stub
> > @@ -74,7 +74,7 @@ Build-Profiles: <!stage1>
> >  Architecture: ARCH
> >  Section: devel
> >  Priority: optional
> > -Depends: ${misc:Depends}, linux-headers-PKGVER-ABINUM, ${shlibs:Depends}
> > +Depends: ${misc:Depends}, SRCPKGNAME-headers-PKGVER-ABINUM,
> ${shlibs:Depends}
> >  Provides: linux-headers, linux-headers-3.0
> >  Description: Linux kernel headers for version PKGVER on DESC
> >   This package provides kernel header files for version PKGVER on
>
> This will have fallout for derivative branches.  Some will already carry
> this patch, some will rely on it not being applied.  Keep this in mind
> when building and testing derivatives after application to the master.
>

Hmmm.   I hadn't thought about derivatives which might rely on it *not*
being applied.  Do you know of one/some that you imagine would have a
problem with it?

Thanks,

 -Kamal
<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jan 4, 2018 at 12:08 AM, Andy Whitcroft <span dir="ltr">&lt;<a href="mailto:apw@canonical.com" target="_blank">apw@canonical.com</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Wed, Dec 20, 2017 at 02:44:59PM -0800, Kamal Mostafa wrote:<br>
&gt; Use the SRCPKGNAME macro instead of hardcoded &quot;linux&quot; in the Depends for<br>
&gt; linux-headers-PKGVER-ABINUM-<wbr>FLAVOUR, to provide the correct package name<br>
&gt; for derivative kernels with a different SRCPKGNAME.<br>
&gt;<br>
&gt; Ignore: yes<br>
&gt;<br>
&gt; Signed-off-by: Kamal Mostafa &lt;<a href="mailto:kamal@canonical.com">kamal@canonical.com</a>&gt;<br>
&gt; ---<br>
&gt;  debian.master/control.d/<wbr>flavour-control.stub | 2 +-<br>
&gt;  1 file changed, 1 insertion(+), 1 deletion(-)<br>
&gt;<br>
&gt; diff --git a/debian.master/control.d/<wbr>flavour-control.stub b/debian.master/control.d/<wbr>flavour-control.stub<br>
&gt; index 6206071..cb14fea 100644<br>
&gt; --- a/debian.master/control.d/<wbr>flavour-control.stub<br>
&gt; +++ b/debian.master/control.d/<wbr>flavour-control.stub<br>
&gt; @@ -74,7 +74,7 @@ Build-Profiles: &lt;!stage1&gt;<br>
&gt;  Architecture: ARCH<br>
&gt;  Section: devel<br>
&gt;  Priority: optional<br>
&gt; -Depends: ${misc:Depends}, linux-headers-PKGVER-ABINUM, ${shlibs:Depends}<br>
&gt; +Depends: ${misc:Depends}, SRCPKGNAME-headers-PKGVER-<wbr>ABINUM, ${shlibs:Depends}<br>
&gt;  Provides: linux-headers, linux-headers-3.0<br>
&gt;  Description: Linux kernel headers for version PKGVER on DESC<br>
&gt;   This package provides kernel header files for version PKGVER on<br>
<br>
This will have fallout for derivative branches.  Some will already carry<br>
this patch, some will rely on it not being applied.  Keep this in mind<br>
when building and testing derivatives after application to the master.<br></blockquote><div><br></div><div>Hmmm.   I hadn&#39;t thought about derivatives which might rely on it *not* being applied.  Do you know of one/some that you imagine would have a problem with it?<br></div><div><br></div><div>Thanks,</div><div><br></div><div> -Kamal</div><div><br></div></div></div></div>
Khaled Elmously Jan. 30, 2018, 5:38 a.m. | #7
On 2017-12-20 14:44:59 , Kamal Mostafa wrote:
> Use the SRCPKGNAME macro instead of hardcoded "linux" in the Depends for
> linux-headers-PKGVER-ABINUM-FLAVOUR, to provide the correct package name
> for derivative kernels with a different SRCPKGNAME.
> 
> Ignore: yes
> 
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> ---
>  debian.master/control.d/flavour-control.stub | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
> index 6206071..cb14fea 100644
> --- a/debian.master/control.d/flavour-control.stub
> +++ b/debian.master/control.d/flavour-control.stub
> @@ -74,7 +74,7 @@ Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: devel
>  Priority: optional
> -Depends: ${misc:Depends}, linux-headers-PKGVER-ABINUM, ${shlibs:Depends}
> +Depends: ${misc:Depends}, SRCPKGNAME-headers-PKGVER-ABINUM, ${shlibs:Depends}
>  Provides: linux-headers, linux-headers-3.0
>  Description: Linux kernel headers for version PKGVER on DESC
>   This package provides kernel header files for version PKGVER on

Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
Khaled Elmously Feb. 17, 2018, 4:49 a.m. | #8
Applied to xenial and artful

On 2017-12-20 14:44:59 , Kamal Mostafa wrote:
> Use the SRCPKGNAME macro instead of hardcoded "linux" in the Depends for
> linux-headers-PKGVER-ABINUM-FLAVOUR, to provide the correct package name
> for derivative kernels with a different SRCPKGNAME.
> 
> Ignore: yes
> 
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> ---
>  debian.master/control.d/flavour-control.stub | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
> index 6206071..cb14fea 100644
> --- a/debian.master/control.d/flavour-control.stub
> +++ b/debian.master/control.d/flavour-control.stub
> @@ -74,7 +74,7 @@ Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: devel
>  Priority: optional
> -Depends: ${misc:Depends}, linux-headers-PKGVER-ABINUM, ${shlibs:Depends}
> +Depends: ${misc:Depends}, SRCPKGNAME-headers-PKGVER-ABINUM, ${shlibs:Depends}
>  Provides: linux-headers, linux-headers-3.0
>  Description: Linux kernel headers for version PKGVER on DESC
>   This package provides kernel header files for version PKGVER on
> -- 
> 2.7.4
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

Patch

diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
index 6206071..cb14fea 100644
--- a/debian.master/control.d/flavour-control.stub
+++ b/debian.master/control.d/flavour-control.stub
@@ -74,7 +74,7 @@  Build-Profiles: <!stage1>
 Architecture: ARCH
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-headers-PKGVER-ABINUM, ${shlibs:Depends}
+Depends: ${misc:Depends}, SRCPKGNAME-headers-PKGVER-ABINUM, ${shlibs:Depends}
 Provides: linux-headers, linux-headers-3.0
 Description: Linux kernel headers for version PKGVER on DESC
  This package provides kernel header files for version PKGVER on