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

Build linux-libc-dev without multiarch if dpkg does not support it, to support backports 

svn path=/dists/trunk/linux-2.6/; revision=18602
This commit is contained in:
Ben Hutchings 2012-01-23 01:25:31 +00:00
parent dc9b5a35e7
commit d5302538cf
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -11,6 +11,8 @@ linux-2.6 (3.2.1-2) UNRELEASED; urgency=low
* Update Vcs-Browser URL for the switch to ViewVC * Update Vcs-Browser URL for the switch to ViewVC
* Point Vcs-{Svn,Browser} at trunk branch, since the sid branch does * Point Vcs-{Svn,Browser} at trunk branch, since the sid branch does
not always exist not always exist
* Build linux-libc-dev without multiarch if dpkg does not support it,
to support backports
-- Ben Hutchings <ben@decadent.org.uk> Thu, 19 Jan 2012 05:42:57 +0000 -- Ben Hutchings <ben@decadent.org.uk> Thu, 19 Jan 2012 05:42:57 +0000

5
debian/rules.real vendored
View File

@ -296,9 +296,14 @@ 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 {} +
ifneq (,$(DEB_HOST_MULTIARCH))
# Move include/asm to arch-specific directory # Move include/asm to arch-specific directory
mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH) mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/ mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
echo linux-libc-dev:Multi-Arch=same >>debian/$(PACKAGE_NAME).substvars
else
echo linux-libc-dev:Multi-Arch= >>debian/$(PACKAGE_NAME).substvars
endif
+$(MAKE_SELF) install-base +$(MAKE_SELF) install-base

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

@ -4,7 +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 Multi-Arch: ${linux-libc-dev:Multi-Arch}
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.