Patchwork [Oneiric] UBUNTU: [Config] Fix invalid linux-headers link

login
register
mail settings
Submitter Tim Gardner
Date April 5, 2012, 7:43 p.m.
Message ID <1333654991-61166-1-git-send-email-tim.gardner@canonical.com>
Download mbox | patch
Permalink /patch/151012/
State New
Headers show

Comments

Tim Gardner - April 5, 2012, 7:43 p.m.
BugLink: http://bugs.launchpad.net/bugs/974403
https://lists.ubuntu.com/archives/kernel-team/2012-March/019679.html

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 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(-)
Leann Ogasawara - April 5, 2012, 8:36 p.m.
On Thu, 2012-04-05 at 13:43 -0600, Tim Gardner wrote:
> BugLink: http://bugs.launchpad.net/bugs/974403
> https://lists.ubuntu.com/archives/kernel-team/2012-March/019679.html
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

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

> ---
>  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 37ab0b1..363b6d0 100644
> --- a/debian.master/rules.d/amd64.mk
> +++ b/debian.master/rules.d/amd64.mk
> @@ -1,6 +1,5 @@
>  build_arch	= x86_64
>  header_arch	= $(build_arch)
> -asm_link	= x86
>  defconfig	= defconfig
>  flavours	= generic server virtual
>  build_image	= bzImage
> diff --git a/debian.master/rules.d/armel.mk b/debian.master/rules.d/armel.mk
> index d10efa3..1bed9b2 100644
> --- a/debian.master/rules.d/armel.mk
> +++ b/debian.master/rules.d/armel.mk
> @@ -1,6 +1,5 @@
>  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 e4f365c..99ac955 100644
> --- a/debian.master/rules.d/armhf.mk
> +++ b/debian.master/rules.d/armhf.mk
> @@ -1,6 +1,5 @@
>  build_arch	= arm
>  header_arch	= arm
> -asm_link	= arm
>  defconfig	= defconfig
>  flavours	=
>  build_image	= zImage
> diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk
> index 0e91a23..6049bcd 100644
> --- a/debian.master/rules.d/i386.mk
> +++ b/debian.master/rules.d/i386.mk
> @@ -1,6 +1,5 @@
>  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 2f8c18e..1fe8809 100644
> --- a/debian.master/rules.d/powerpc.mk
> +++ b/debian.master/rules.d/powerpc.mk
> @@ -1,6 +1,5 @@
>  build_arch	= powerpc
>  header_arch	= $(build_arch)
> -asm_link	= $(build_arch)
>  defconfig	= pmac32_defconfig
>  flavours	= powerpc powerpc-smp powerpc64-smp
>  build_image	= vmlinux
> diff --git a/debian.master/rules.d/ppc64.mk b/debian.master/rules.d/ppc64.mk
> index ad90ae7..1206ce9 100644
> --- a/debian.master/rules.d/ppc64.mk
> +++ b/debian.master/rules.d/ppc64.mk
> @@ -1,6 +1,5 @@
>  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 3ccac7c..368a74c 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)-$* \
> -- 
> 1.7.9.1
> 
>
Herton Ronaldo Krzesinski - April 5, 2012, 9:20 p.m.
On Thu, Apr 05, 2012 at 01:43:11PM -0600, Tim Gardner wrote:
> BugLink: http://bugs.launchpad.net/bugs/974403
> https://lists.ubuntu.com/archives/kernel-team/2012-March/019679.html
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  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 37ab0b1..363b6d0 100644
> --- a/debian.master/rules.d/amd64.mk
> +++ b/debian.master/rules.d/amd64.mk
> @@ -1,6 +1,5 @@
>  build_arch	= x86_64
>  header_arch	= $(build_arch)
> -asm_link	= x86
>  defconfig	= defconfig
>  flavours	= generic server virtual
>  build_image	= bzImage
> diff --git a/debian.master/rules.d/armel.mk b/debian.master/rules.d/armel.mk
> index d10efa3..1bed9b2 100644
> --- a/debian.master/rules.d/armel.mk
> +++ b/debian.master/rules.d/armel.mk
> @@ -1,6 +1,5 @@
>  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 e4f365c..99ac955 100644
> --- a/debian.master/rules.d/armhf.mk
> +++ b/debian.master/rules.d/armhf.mk
> @@ -1,6 +1,5 @@
>  build_arch	= arm
>  header_arch	= arm
> -asm_link	= arm
>  defconfig	= defconfig
>  flavours	=
>  build_image	= zImage
> diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk
> index 0e91a23..6049bcd 100644
> --- a/debian.master/rules.d/i386.mk
> +++ b/debian.master/rules.d/i386.mk
> @@ -1,6 +1,5 @@
>  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 2f8c18e..1fe8809 100644
> --- a/debian.master/rules.d/powerpc.mk
> +++ b/debian.master/rules.d/powerpc.mk
> @@ -1,6 +1,5 @@
>  build_arch	= powerpc
>  header_arch	= $(build_arch)
> -asm_link	= $(build_arch)
>  defconfig	= pmac32_defconfig
>  flavours	= powerpc powerpc-smp powerpc64-smp
>  build_image	= vmlinux
> diff --git a/debian.master/rules.d/ppc64.mk b/debian.master/rules.d/ppc64.mk
> index ad90ae7..1206ce9 100644
> --- a/debian.master/rules.d/ppc64.mk
> +++ b/debian.master/rules.d/ppc64.mk
> @@ -1,6 +1,5 @@
>  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 3ccac7c..368a74c 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)-$* \
> -- 
> 1.7.9.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>
Tim Gardner - April 9, 2012, 1:41 p.m.

Patch

diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk
index 37ab0b1..363b6d0 100644
--- a/debian.master/rules.d/amd64.mk
+++ b/debian.master/rules.d/amd64.mk
@@ -1,6 +1,5 @@ 
 build_arch	= x86_64
 header_arch	= $(build_arch)
-asm_link	= x86
 defconfig	= defconfig
 flavours	= generic server virtual
 build_image	= bzImage
diff --git a/debian.master/rules.d/armel.mk b/debian.master/rules.d/armel.mk
index d10efa3..1bed9b2 100644
--- a/debian.master/rules.d/armel.mk
+++ b/debian.master/rules.d/armel.mk
@@ -1,6 +1,5 @@ 
 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 e4f365c..99ac955 100644
--- a/debian.master/rules.d/armhf.mk
+++ b/debian.master/rules.d/armhf.mk
@@ -1,6 +1,5 @@ 
 build_arch	= arm
 header_arch	= arm
-asm_link	= arm
 defconfig	= defconfig
 flavours	=
 build_image	= zImage
diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk
index 0e91a23..6049bcd 100644
--- a/debian.master/rules.d/i386.mk
+++ b/debian.master/rules.d/i386.mk
@@ -1,6 +1,5 @@ 
 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 2f8c18e..1fe8809 100644
--- a/debian.master/rules.d/powerpc.mk
+++ b/debian.master/rules.d/powerpc.mk
@@ -1,6 +1,5 @@ 
 build_arch	= powerpc
 header_arch	= $(build_arch)
-asm_link	= $(build_arch)
 defconfig	= pmac32_defconfig
 flavours	= powerpc powerpc-smp powerpc64-smp
 build_image	= vmlinux
diff --git a/debian.master/rules.d/ppc64.mk b/debian.master/rules.d/ppc64.mk
index ad90ae7..1206ce9 100644
--- a/debian.master/rules.d/ppc64.mk
+++ b/debian.master/rules.d/ppc64.mk
@@ -1,6 +1,5 @@ 
 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 3ccac7c..368a74c 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)-$* \