diff options
| author | Tim Gardner <tim.gardner@canonical.com> | 2012-04-05 11:35:43 -0600 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2012-05-21 06:46:21 -0700 |
| commit | 132e8bd689d8aa6b1d0e9da5c081692c7a090451 (patch) | |
| tree | 015460aab61db4537cfe43187b19adffb97b8390 | |
| parent | a0aedae18b6a084dec90575282a4ac1235219470 (diff) | |
UBUNTU: [Config] Fix invalid linux-headers link
BugLink: http://bugs.launchpad.net/bugs/974403
https://lists.ubuntu.com/archives/kernel-team/2012-March/019679.html
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Acked-by: Herton Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
| -rw-r--r-- | debian.master/rules.d/amd64.mk | 1 | ||||
| -rw-r--r-- | debian.master/rules.d/armel.mk | 1 | ||||
| -rw-r--r-- | debian.master/rules.d/armhf.mk | 1 | ||||
| -rw-r--r-- | debian.master/rules.d/i386.mk | 1 | ||||
| -rw-r--r-- | debian.master/rules.d/powerpc.mk | 1 | ||||
| -rw-r--r-- | debian.master/rules.d/ppc64.mk | 1 | ||||
| -rw-r--r-- | 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 be03af7aaab..23d455337e9 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 8aa3b1e747d..52db1c086e5 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 aacc08f7608..7269910a041 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 a219546e4cb..9f9656e1889 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-pae virtual build_image = bzImage diff --git a/debian.master/rules.d/powerpc.mk b/debian.master/rules.d/powerpc.mk index 05ee4692cec..3119d04ca1b 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 1faffd9bc07..294ff381d2e 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 52b2e57bea9..60b83d2cd3d 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)-$* \ |