From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 10 Apr 2012 14:36:22 +0000 (-0600)
Subject: UBUNTU: Remove headers asm symlink entirely
X-Git-Url: http://git.alex.org.uk

UBUNTU: Remove headers asm symlink entirely

BugLink: http://bugs.launchpad.net/bugs/974403

"UBUNTU: [Config] Fix invalid linux-headers link" moved the erroneous
symlink from asm-$ARCH to asm-generic. As it turns out, the asm symlink
is superfluous, so just remove it entirely.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 8308925..66b4e51 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -189,9 +189,6 @@ ifeq ($(arch),powerpc)
 endif
 	# Script to symlink everything up
 	$(SHELL) $(DROOT)/scripts/link-headers "$(hdrdir)" "$(basepkg)" "$*"
-	# Setup the proper asm symlink
-	rm -f $(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)-$* \