| 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 | expand |
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
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
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!
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.
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
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"><<a href="mailto:apw@canonical.com" target="_blank">apw@canonical.com</a>></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> > Use the SRCPKGNAME macro instead of hardcoded "linux" in the Depends for<br> > linux-headers-PKGVER-ABINUM-<wbr>FLAVOUR, to provide the correct package name<br> > for derivative kernels with a different SRCPKGNAME.<br> ><br> > Ignore: yes<br> ><br> > Signed-off-by: Kamal Mostafa <<a href="mailto:kamal@canonical.com">kamal@canonical.com</a>><br> > ---<br> > debian.master/control.d/<wbr>flavour-control.stub | 2 +-<br> > 1 file changed, 1 insertion(+), 1 deletion(-)<br> ><br> > diff --git a/debian.master/control.d/<wbr>flavour-control.stub b/debian.master/control.d/<wbr>flavour-control.stub<br> > index 6206071..cb14fea 100644<br> > --- a/debian.master/control.d/<wbr>flavour-control.stub<br> > +++ b/debian.master/control.d/<wbr>flavour-control.stub<br> > @@ -74,7 +74,7 @@ Build-Profiles: <!stage1><br> > Architecture: ARCH<br> > Section: devel<br> > Priority: optional<br> > -Depends: ${misc:Depends}, linux-headers-PKGVER-ABINUM, ${shlibs:Depends}<br> > +Depends: ${misc:Depends}, SRCPKGNAME-headers-PKGVER-<wbr>ABINUM, ${shlibs:Depends}<br> > Provides: linux-headers, linux-headers-3.0<br> > Description: Linux kernel headers for version PKGVER on DESC<br> > 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'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>
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>
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
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
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(-)