diff options
| author | Steve Langasek <steve.langasek@ubuntu.com> | 2011-04-08 12:10:34 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-10-17 09:48:13 -0600 |
| commit | 22d7ada4bf9958d90633504a65650365ed4c4bc8 (patch) | |
| tree | 64b29dd95234f7f79a1a3e1307a66d0ad7e86c58 | |
| parent | c86fb440eae364f756f97663421e1cb6163f806e (diff) | |
UBUNTU: [Config] Make linux-libc-dev coinstallable under multiarch
BugLink: http://bugs.launchpad.net/bugs/750585
Signed-off-by: Steve Langasek <slangasek@ubuntu.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
| -rw-r--r-- | debian.master/control.stub.in | 3 | ||||
| -rw-r--r-- | debian/rules.d/0-common-vars.mk | 1 | ||||
| -rw-r--r-- | debian/rules.d/2-binary-arch.mk | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index f86299eb962..60371960064 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 66fcec37e89..05a6ad74b91 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 9765ef740e9..cf112cde34c 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) |