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

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

Comments

Tim Gardner - April 5, 2012, 5:35 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(-)
Tim Gardner - April 5, 2012, 5:48 p.m.
Proposing for Precise
Leann Ogasawara - April 5, 2012, 6:29 p.m.
On Thu, 2012-04-05 at 11:35 -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 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)-$* \
> -- 
> 1.7.9.1
> 
>
Herton Ronaldo Krzesinski - April 5, 2012, 7:25 p.m.
On Thu, Apr 05, 2012 at 11:35:43AM -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 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)-$* \
> -- 
> 1.7.9.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>
Tim Gardner - April 5, 2012, 7:39 p.m.

Andy Whitcroft - April 10, 2012, 9:35 a.m.
On Thu, Apr 05, 2012 at 11:29:21AM -0700, Leann Ogasawara wrote:
> > @@ -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)

I do not understand why we would link asm to asm-generic.  asm-generic
is for use by architectures which chose to not override a specific file.
I don't think this link makes sense?

> >  	# The build symlink
> >  	install -d debian/$(basepkg)-$*/lib/modules/$(abi_release)-$*
> >  	ln -s /usr/src/$(basepkg)-$* \

-apw
Tim Gardner - April 10, 2012, 11:48 a.m.
On 04/10/2012 03:35 AM, Andy Whitcroft wrote:
> On Thu, Apr 05, 2012 at 11:29:21AM -0700, Leann Ogasawara wrote:
>>> @@ -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)
> 
> I do not understand why we would link asm to asm-generic.  asm-generic
> is for use by architectures which chose to not override a specific file.
> I don't think this link makes sense?
> 

So you think we should drop the link altogether ?

rtg

Patch

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)-$* \