| Message ID | 1485288320-30278-1-git-send-email-kamal@canonical.com |
|---|---|
| State | New |
| Headers | show |
Applied to Zesty and unstable
Applied to Trusty. -- Ben
Applied to xenial and yakkety master-next branches. Thanks. Cascardo.
On Tue, Jan 24, 2017 at 12:05:20PM -0800, Kamal Mostafa wrote: > This long-standing oversight in our debian rules hardcodes the string "linux" > instead of using the $(src_pkg_name) for just one of the generated .deb package > names: linux-headers-x.x.x-x. Lets fix it in the generic branches > (T,X,Y,Z,unstable) so that we won't have to keep applying this patch to each of > the derivative/custom kernels. > > -----8<----- > > Ignore: yes > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > debian/rules.d/0-common-vars.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk > index 1c87ebd..ccc65dc 100644 > --- a/debian/rules.d/0-common-vars.mk > +++ b/debian/rules.d/0-common-vars.mk > @@ -126,7 +126,7 @@ stampdir := $(CURDIR)/debian/stamps > bin_pkg_name=linux-image-$(abi_release) > extra_pkg_name=linux-image-extra-$(abi_release) > hdrs_pkg_name=linux-headers-$(abi_release) > -indep_hdrs_pkg_name=linux-headers-$(abi_release) > +indep_hdrs_pkg_name=$(src_pkg_name)-headers-$(abi_release) > > # > # The generation of content in the doc package depends on both 'AUTOBUILD=' and Whilst this is a good idea in principle, care would need to be taken applying it. Though many of the derivates carry this exact patch the LTS backport kernels do not. If we apply this and change the default we need to apply the inverse to those LTS kernels. -apw
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 1c87ebd..ccc65dc 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -126,7 +126,7 @@ stampdir := $(CURDIR)/debian/stamps bin_pkg_name=linux-image-$(abi_release) extra_pkg_name=linux-image-extra-$(abi_release) hdrs_pkg_name=linux-headers-$(abi_release) -indep_hdrs_pkg_name=linux-headers-$(abi_release) +indep_hdrs_pkg_name=$(src_pkg_name)-headers-$(abi_release) # # The generation of content in the doc package depends on both 'AUTOBUILD=' and
This long-standing oversight in our debian rules hardcodes the string "linux" instead of using the $(src_pkg_name) for just one of the generated .deb package names: linux-headers-x.x.x-x. Lets fix it in the generic branches (T,X,Y,Z,unstable) so that we won't have to keep applying this patch to each of the derivative/custom kernels. -----8<----- Ignore: yes Signed-off-by: Kamal Mostafa <kamal@canonical.com> --- debian/rules.d/0-common-vars.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)