Fix multi-arch header directory as explained by Aurelien
svn path=/dists/sid/linux-2.6/; revision=17898
This commit is contained in:
parent
3c9caab0a7
commit
fc578c19d5
|
@ -4,8 +4,9 @@ linux-2.6 (3.0.0-2) UNRELEASED; urgency=low
|
||||||
* Add configuration files for s390x architecture.
|
* Add configuration files for s390x architecture.
|
||||||
|
|
||||||
[ Ben Hutchings ]
|
[ Ben Hutchings ]
|
||||||
* linux-libc-dev: Install include/asm under arch-specific directory;
|
* linux-libc-dev: Install include/asm under arch-specific directory
|
||||||
mark package as multi-arch-coinstallable (Multi-Arch: same)
|
(thanks to Aurelien for correcting the directory); mark package as
|
||||||
|
multi-arch-coinstallable (Multi-Arch: same)
|
||||||
* [powerpc] Use libata-based drivers for most PATA controllers
|
* [powerpc] Use libata-based drivers for most PATA controllers
|
||||||
(Closes: #636854):
|
(Closes: #636854):
|
||||||
- Various drivers replaced as for x86 in 2.6.32-10
|
- Various drivers replaced as for x86 in 2.6.32-10
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
SHELL := bash -e
|
SHELL := bash -e
|
||||||
DEB_HOST_ARCH := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_ARCH)
|
DEB_HOST_ARCH := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_ARCH)
|
||||||
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_GNU_TYPE)
|
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_GNU_TYPE)
|
||||||
|
DEB_HOST_MULTIARCH:= $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_MULTIARCH)
|
||||||
DEB_BUILD_ARCH := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_BUILD_ARCH)
|
DEB_BUILD_ARCH := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_BUILD_ARCH)
|
||||||
UPLOADER := $(shell dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p')
|
UPLOADER := $(shell dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p')
|
||||||
|
|
||||||
|
@ -310,8 +311,8 @@ install-libc-dev_$(ARCH):
|
||||||
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
|
# Move include/asm to arch-specific directory
|
||||||
mkdir -p $(OUT_DIR)/$(DEB_HOST_GNU_TYPE)/include
|
mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
|
||||||
mv $(OUT_DIR)/include/asm $(OUT_DIR)/$(DEB_HOST_GNU_TYPE)/include/
|
mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
|
||||||
|
|
||||||
+$(MAKE_SELF) install-base
|
+$(MAKE_SELF) install-base
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue