From patchwork Fri Apr 8 19:10:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Langasek X-Patchwork-Id: 90407 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 9D80CB6F82 for ; Sat, 9 Apr 2011 05:10:54 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Q8H4s-0004sb-5Y; Fri, 08 Apr 2011 19:10:42 +0000 Received: from becquer.dodds.net ([207.224.24.209]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Q8H4q-0004sM-BL for kernel-team@lists.ubuntu.com; Fri, 08 Apr 2011 19:10:40 +0000 Received: from virgil.dodds.net (unknown [192.168.15.11]) by becquer.dodds.net (Postfix) with ESMTPA id EAB8D251D9 for ; Fri, 8 Apr 2011 12:10:38 -0700 (PDT) Received: by virgil.dodds.net (Postfix, from userid 1000) id E2DF940FED; Fri, 8 Apr 2011 12:10:34 -0700 (PDT) Date: Fri, 8 Apr 2011 12:10:34 -0700 From: Steve Langasek To: kernel-team@lists.ubuntu.com Subject: support for making linux-libc-dev coinstallable under multiarch Message-ID: <20110408191034.GB4818@virgil.dodds.net> Mail-Followup-To: Steve Langasek , kernel-team@lists.ubuntu.com MIME-Version: 1.0 User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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. Thanks, 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 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 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)