debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

linux-libc-dev: Multi-arch support 

Install include/asm under arch-specific directory.
Mark package as multi-arch-coinstallable (Multi-Arch: same).

svn path=/dists/trunk/linux-2.6/; revision=17868
This commit is contained in:
Ben Hutchings 2011-07-29 15:43:29 +00:00
parent c05bfa9ae0
commit 7faadf0a48
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -3,6 +3,10 @@ linux-2.6 (3.0.0-2) UNRELEASED; urgency=low
[ Aurelien Jarno ] [ Aurelien Jarno ]
* Add configuration files for s390x architecture. * Add configuration files for s390x architecture.
[ Ben Hutchings ]
* linux-libc-dev: Install include/asm under arch-specific directory;
mark package as multi-arch-coinstallable (Multi-Arch: same)
-- Ben Hutchings <ben@decadent.org.uk> Wed, 27 Jul 2011 23:58:10 +0200 -- Ben Hutchings <ben@decadent.org.uk> Wed, 27 Jul 2011 23:58:10 +0200
linux-2.6 (3.0.0-1) unstable; urgency=low linux-2.6 (3.0.0-1) unstable; urgency=low

4
debian/rules.real vendored
View File

@ -306,6 +306,10 @@ install-libc-dev_$(ARCH):
rm -rf $(OUT_DIR)/include/drm $(OUT_DIR)/include/scsi rm -rf $(OUT_DIR)/include/drm $(OUT_DIR)/include/scsi
find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} + find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} +
# Move include/asm to arch-specific directory
mkdir -p $(OUT_DIR)/$(DEB_HOST_GNU_TYPE)/include
mv $(OUT_DIR)/include/asm $(OUT_DIR)/$(DEB_HOST_GNU_TYPE)/include/
+$(MAKE_SELF) install-base +$(MAKE_SELF) install-base

1
debian/templates/control.libc-dev.in vendored
View File

@ -4,6 +4,7 @@ Depends: ${misc:Depends}
Provides: linux-kernel-headers Provides: linux-kernel-headers
Replaces: linux-kernel-headers Replaces: linux-kernel-headers
Conflicts: linux-kernel-headers Conflicts: linux-kernel-headers
Multi-Arch: same
Description: Linux support headers for userspace development Description: Linux support headers for userspace development
This package provides userspaces headers from the Linux kernel. These headers This package provides userspaces headers from the Linux kernel. These headers
are used by the installed headers for GNU glibc and other system libraries. are used by the installed headers for GNU glibc and other system libraries.