From patchwork Fri Feb 10 12:19:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 726527 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3vKYsW5Pt4z9ry7; Fri, 10 Feb 2017 23:19:27 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ccAAc-0003pE-EM; Fri, 10 Feb 2017 12:19:22 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1ccAAX-0003oT-On for kernel-team@lists.ubuntu.com; Fri, 10 Feb 2017 12:19:17 +0000 Received: from 1.general.cascardo.us.vpn ([10.172.70.58] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1ccAAX-0004xZ-2H for kernel-team@lists.ubuntu.com; Fri, 10 Feb 2017 12:19:17 +0000 From: Thadeu Lima de Souza Cascardo To: kernel-team@lists.ubuntu.com Subject: [lts-xenial, lts-trusty PATCH] Revert "UBUNTU: [debian] derive indep_hdrs_pkg_name from src_pkg_name" Date: Fri, 10 Feb 2017 10:19:08 -0200 Message-Id: <20170210121908.18810-1-cascardo@canonical.com> X-Mailer: git-send-email 2.9.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com 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 Acked-by: Andy Whitcroft --- 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