From patchwork Thu Apr 5 17:35:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 150998 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 93B69B7060 for ; Fri, 6 Apr 2012 03:35:58 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SFqb2-0000ug-6E; Thu, 05 Apr 2012 17:35:44 +0000 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SFqaz-0000qf-4U for kernel-team@lists.ubuntu.com; Thu, 05 Apr 2012 17:35:41 +0000 Received: from salmon.rtg.net (mail.tpi.com [70.99.223.143]) by mail.tpi.com (Postfix) with ESMTP id DA1413154F4 for ; Thu, 5 Apr 2012 10:34:53 -0700 (PDT) Received: by salmon.rtg.net (Postfix, from userid 1000) id E258D20428; Thu, 5 Apr 2012 11:35:43 -0600 (MDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] Fix invalid linux-headers link Date: Thu, 5 Apr 2012 11:35:43 -0600 Message-Id: <1333647343-79402-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.9.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/974403 https://lists.ubuntu.com/archives/kernel-team/2012-March/019679.html Signed-off-by: Tim Gardner Acked-by: Leann Ogasawara --- debian.master/rules.d/amd64.mk | 1 - debian.master/rules.d/armel.mk | 1 - debian.master/rules.d/armhf.mk | 1 - debian.master/rules.d/i386.mk | 1 - debian.master/rules.d/powerpc.mk | 1 - debian.master/rules.d/ppc64.mk | 1 - debian/rules.d/2-binary-arch.mk | 2 +- 7 files changed, 1 insertions(+), 7 deletions(-) diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index be03af7..23d4553 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -1,7 +1,6 @@ human_arch = 64 bit x86 build_arch = x86_64 header_arch = $(build_arch) -asm_link = x86 defconfig = defconfig flavours = generic virtual build_image = bzImage diff --git a/debian.master/rules.d/armel.mk b/debian.master/rules.d/armel.mk index 8aa3b1e..52db1c0 100644 --- a/debian.master/rules.d/armel.mk +++ b/debian.master/rules.d/armel.mk @@ -1,7 +1,6 @@ human_arch = ARM (soft float) build_arch = arm header_arch = arm -asm_link = arm defconfig = defconfig flavours = omap build_image = zImage diff --git a/debian.master/rules.d/armhf.mk b/debian.master/rules.d/armhf.mk index aacc08f..7269910 100644 --- a/debian.master/rules.d/armhf.mk +++ b/debian.master/rules.d/armhf.mk @@ -1,7 +1,6 @@ human_arch = ARM (hard float) build_arch = arm header_arch = arm -asm_link = arm defconfig = defconfig flavours = omap build_image = zImage diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk index 6e5d301..ac4d024 100644 --- a/debian.master/rules.d/i386.mk +++ b/debian.master/rules.d/i386.mk @@ -1,7 +1,6 @@ human_arch = 32 bit x86 build_arch = i386 header_arch = x86_64 -asm_link = x86 defconfig = defconfig flavours = generic generic-pae virtual build_image = bzImage diff --git a/debian.master/rules.d/powerpc.mk b/debian.master/rules.d/powerpc.mk index 05ee469..3119d04 100644 --- a/debian.master/rules.d/powerpc.mk +++ b/debian.master/rules.d/powerpc.mk @@ -1,7 +1,6 @@ human_arch = PowerPC (32 bit userspace) build_arch = powerpc header_arch = $(build_arch) -asm_link = $(build_arch) defconfig = pmac32_defconfig flavours = powerpc-smp powerpc64-smp build_image = vmlinux diff --git a/debian.master/rules.d/ppc64.mk b/debian.master/rules.d/ppc64.mk index 1faffd9..294ff38 100644 --- a/debian.master/rules.d/ppc64.mk +++ b/debian.master/rules.d/ppc64.mk @@ -1,7 +1,6 @@ human_arch = PowerPC (64 bit userspace) build_arch = powerpc header_arch = $(build_arch) -asm_link = $(build_arch) defconfig = ppc64_defconfig flavours = powerpc64-smp build_image = vmlinux diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 52b2e57..60b83d2 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -191,7 +191,7 @@ endif $(SHELL) $(DROOT)/scripts/link-headers "$(hdrdir)" "$(basepkg)" "$*" # Setup the proper asm symlink rm -f $(hdrdir)/include/asm - ln -s asm-$(asm_link) $(hdrdir)/include/asm + (cd $(hdrdir)/include; ln -s asm-generic asm) # The build symlink install -d debian/$(basepkg)-$*/lib/modules/$(abi_release)-$* ln -s /usr/src/$(basepkg)-$* \