diff mbox

[lts-xenial,lts-trusty] Revert "UBUNTU: [debian] derive indep_hdrs_pkg_name from src_pkg_name"

Message ID 20170210121908.18810-1-cascardo@canonical.com
State New
Headers show

Commit Message

Thadeu Lima de Souza Cascardo Feb. 10, 2017, 12:19 p.m. UTC
BugLink: http://bugs.launchpad.net/bugs/1663558

LTS backport packages have a different naming, and must diverge from their
master branches, by using a hardcoded "linux-headers".

Though other branches carried this reverted patch, the LTS branches did not,
which caused the linux-headers packages to be empty on the LTS branches.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
---
 debian/rules.d/0-common-vars.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tim Gardner Feb. 10, 2017, 12:41 p.m. UTC | #1

Marcelo Henrique Cerri Feb. 10, 2017, 1:10 p.m. UTC | #2

Andy Whitcroft Feb. 11, 2017, 4:33 p.m. UTC | #3
On Fri, Feb 10, 2017 at 10:19:08AM -0200, Thadeu Lima de Souza Cascardo wrote:
> BugLink: http://bugs.launchpad.net/bugs/1663558
> 
> LTS backport packages have a different naming, and must diverge from their
> master branches, by using a hardcoded "linux-headers".
> 
> Though other branches carried this reverted patch, the LTS branches did not,
> which caused the linux-headers packages to be empty on the LTS branches.
> 
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@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 5dff469..18acad8 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=$(src_pkg_name)-headers-$(abi_release)
> +indep_hdrs_pkg_name=linux-headers-$(abi_release)
>  
>  #
>  # The generation of content in the doc package depends on both 'AUTOBUILD=' and

Acked-by: Andy Whitcroft <apw@canonical.com>

These need to be applied and respun urgently.

-apw
Thadeu Lima de Souza Cascardo Feb. 13, 2017, 11:21 a.m. UTC | #4
Applied to trusty lts-xenial and precise lts-trusty.

Thanks.
Cascardo.
diff mbox

Patch

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 5dff469..18acad8 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=$(src_pkg_name)-headers-$(abi_release)
+indep_hdrs_pkg_name=linux-headers-$(abi_release)
 
 #
 # The generation of content in the doc package depends on both 'AUTOBUILD=' and