Patchwork [Oneiric] UBUNTU: Remove headers asm symlink entirely

login
register
mail settings
Submitter Tim Gardner
Date April 10, 2012, 3:02 p.m.
Message ID <1334070154-73216-1-git-send-email-tim.gardner@canonical.com>
Download mbox | patch
Permalink /patch/151613/
State New
Headers show

Comments

Tim Gardner - April 10, 2012, 3:02 p.m.
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>
---
 debian/rules.d/2-binary-arch.mk |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
Andy Whitcroft - April 10, 2012, 5:37 p.m.
On Tue, Apr 10, 2012 at 09:02:34AM -0600, Tim Gardner wrote:
> 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>
> ---
>  debian/rules.d/2-binary-arch.mk |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)
> 
> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> index 368a74c..4841830 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)-$* \

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

-apw
Leann Ogasawara - April 10, 2012, 6:27 p.m.
On Tue, 2012-04-10 at 09:02 -0600, Tim Gardner wrote:
> 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>

Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>

> ---
>  debian/rules.d/2-binary-arch.mk |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)
> 
> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> index 368a74c..4841830 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)-$* \
> -- 
> 1.7.9.1
> 
>
Tim Gardner - April 11, 2012, 12:12 p.m.

Patch

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 368a74c..4841830 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)-$* \