[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: support for making linux-libc-dev coinstallable under multiarch



On Fri, 2011-04-08 at 12:10 -0700, Steve Langasek wrote:
> Hello,
> 
> This is the patch from bug #750585 on the linux package, which I've just
> gotten a freeze exception for; I've been told to send it to the mailing list
> for sign off.  Please include this in the linux package for natty.

I suppose we should be doing something similar in Debian?

Ben.

> diff --git a/debian.master/changelog b/debian.master/changelog
> index 285002d..193fd33 100644
> --- a/debian.master/changelog
> +++ b/debian.master/changelog
> @@ -1,3 +1,13 @@
> +linux (2.6.38-8.40ubuntu1) UNRELEASED; urgency=low
> +
> +  * debian/rules.d/0-common-vars.mk: set DEB_HOST_MULTIARCH.
> +  * debian.master/control.stub.in: build-dep on dpkg-dev (>= 1.16.0~ubuntu4)
> +    for the above.
> +  * debian/rules.d/2-binary-arch.mk: move /usr/include/asm to multiarch path.
> +  * debian.master/control.stub.in: mark linux-libc-dev Multi-Arch: same.
> +
> + -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 02 Apr 2011 02:05:54 -0700
> +
>  linux (2.6.38-8.40) natty; urgency=low
>  
>    [ Brad Figg ]
> diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
> index f86299e..6037196 100644
> --- a/debian.master/control.stub.in
> +++ b/debian.master/control.stub.in
> @@ -3,7 +3,7 @@ Section: devel
>  Priority: optional
>  Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
>  Standards-Version: 3.8.4.0
> -Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], device-tree-compiler [powerpc], libelf-dev, binutils-dev, rsync, libdw-dev
> +Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], device-tree-compiler [powerpc], libelf-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4)
>  Build-Depends-Indep: xmlto, docbook-utils, ghostscript, transfig, bzip2, sharutils, asciidoc
>  Build-Conflicts: findutils (= 4.4.1-1ubuntu1)
>  Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-natty.git
> @@ -72,6 +72,7 @@ Depends: ${misc:Depends}
>  Conflicts: libc6-dev (<< 2.3.2.ds1-6), libc6.1-dev (<< 2.3.2.ds1-6), dvb-dev (<< 1.0.1-6), amd64-libs-dev (<= 1.1), SRCPKGNAME-kernel-headers
>  Replaces: libc6-dev (<< 2.3.2.ds1-6), libc6.1-dev (<< 2.3.2.ds1-6), dvb-dev (<< 1.0.1-6), SRCPKGNAME-kernel-headers, libdrm-dev
>  Provides: SRCPKGNAME-kernel-headers
> +Multi-Arch: same
>  Description: Linux Kernel Headers for development
>   This package provides headers from the Linux kernel.  These headers
>   are used by the installed headers for GNU glibc and other system
> diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
> index dd9daff..f27787b 100644
> --- a/debian/rules.d/0-common-vars.mk
> +++ b/debian/rules.d/0-common-vars.mk
> @@ -96,6 +96,7 @@ endif
>  # committing changes to the top level Makefile
>  SUBLEVEL       := $(shell echo $(release) | awk -F. '{print $$3}')
>  
> +DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
>  DEB_HOST_GNU_TYPE  = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
>  DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
>  DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> index 9765ef7..cf112cd 100644
> --- a/debian/rules.d/2-binary-arch.mk
> +++ b/debian/rules.d/2-binary-arch.mk
> @@ -245,6 +245,8 @@ install-arch-headers:
>                 find . -name '.' -o -name '.*' -prune -o -print | \
>                  cpio -pvd --preserve-modification-time \
>                         $(headers_dir)/usr/include/ )
> +       mkdir $(headers_dir)/usr/include/$(DEB_HOST_MULTIARCH)
> +       mv $(headers_dir)/usr/include/asm $(headers_dir)/usr/include/$(DEB_HOST_MULTIARCH)/
>  
>         rm -rf $(headers_tmp)
>   
-- 
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: