linux-{doc,manual,source,support}: Mark as capable of satisfying relations from foreign packages (Multi-Arch: foreign) (Closes: #679202)
svn path=/dists/sid/linux/; revision=19223
This commit is contained in:
Ben Hutchings
parent
b31cabb10b
commit
4a2ff091e9
|
|
@ -6,6 +6,8 @@ linux (3.2.21-3) UNRELEASED; urgency=low
|
|||
* apparmor: remove advertising the support of network rules from
|
||||
compat iface (Closes: #676515)
|
||||
* xen/netfront: teardown the device before unregistering it (Closes: #675190)
|
||||
* linux-{doc,manual,source,support}: Mark as capable of satisfying
|
||||
relations from foreign packages (Multi-Arch: foreign) (Closes: #679202)
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Wed, 27 Jun 2012 02:56:49 +0100
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,13 @@ ifneq (,$(filter experimental UNRELEASED,$(DISTRIBUTION)))
|
|||
export KW_CHECK_NONFATAL = y
|
||||
endif
|
||||
|
||||
# Set Multi-Arch fields only when built in a suite that supports it
|
||||
ifneq (,$(DEB_HOST_MULTIARCH))
|
||||
DEFINE_MULTIARCH = -Vlinux:Multi-Arch=$(1)
|
||||
else
|
||||
DEFINE_MULTIARCH = -Vlinux:Multi-Arch=
|
||||
endif
|
||||
|
||||
include debian/rules.defs
|
||||
|
||||
stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@
|
||||
|
|
@ -191,7 +198,7 @@ install-doc: $(STAMPS_DIR)/build-doc
|
|||
| \
|
||||
cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)/html'
|
||||
gzip -9qfr $(OUT_DIR)/Documentation
|
||||
+$(MAKE_SELF) install-base
|
||||
+$(MAKE_SELF) install-base GENCONTROL_ARGS='$(call DEFINE_MULTIARCH,foreign)'
|
||||
|
||||
install-manual: PACKAGE_NAME = linux-manual-$(VERSION)
|
||||
install-manual: DIR=$(BUILD_DIR)/build-doc
|
||||
|
|
@ -199,7 +206,7 @@ install-manual: DH_OPTIONS = -p$(PACKAGE_NAME)
|
|||
install-manual: $(STAMPS_DIR)/build-doc
|
||||
dh_prep
|
||||
find $(DIR)/Documentation/DocBook/man/ -name '*.9' | xargs dh_installman
|
||||
+$(MAKE_SELF) install-base
|
||||
+$(MAKE_SELF) install-base GENCONTROL_ARGS='$(call DEFINE_MULTIARCH,foreign)'
|
||||
|
||||
install-headers_$(ARCH): PACKAGE_NAMES = linux-headers-$(ABINAME)-all linux-headers-$(ABINAME)-all-$(ARCH)
|
||||
install-headers_$(ARCH): DH_OPTIONS = $(foreach p, $(PACKAGE_NAMES), -p$(p))
|
||||
|
|
@ -311,12 +318,9 @@ ifneq (,$(DEB_HOST_MULTIARCH))
|
|||
# Move include/asm to arch-specific directory
|
||||
mkdir -p $(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 GENCONTROL_ARGS='$(call DEFINE_MULTIARCH,same)'
|
||||
|
||||
install-support: PACKAGE_NAME = linux-support-$(ABINAME)
|
||||
install-support: DH_OPTIONS = -p$(PACKAGE_NAME)
|
||||
|
|
@ -331,7 +335,7 @@ install-support:
|
|||
cp debian/lib/python/debian_linux/*.py $(PACKAGE_DIR)$(PACKAGE_ROOT)/lib/python/debian_linux
|
||||
dh_python2
|
||||
dh_link $(PACKAGE_ROOT) /usr/src/$(PACKAGE_NAME)
|
||||
+$(MAKE_SELF) install-base
|
||||
+$(MAKE_SELF) install-base GENCONTROL_ARGS='$(call DEFINE_MULTIARCH,foreign)'
|
||||
|
||||
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
|
||||
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION)
|
||||
|
|
@ -501,6 +505,6 @@ install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2 $(foreach F
|
|||
dh_testdir
|
||||
dh_testroot
|
||||
dh_install '$^' /usr/src
|
||||
+$(MAKE_SELF) install-base
|
||||
+$(MAKE_SELF) install-base GENCONTROL_ARGS='$(call DEFINE_MULTIARCH,foreign)'
|
||||
|
||||
# vim: filetype=make
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ Depends: ${misc:Depends}
|
|||
Provides: linux-kernel-headers
|
||||
Replaces: linux-kernel-headers
|
||||
Conflicts: linux-kernel-headers
|
||||
Multi-Arch: ${linux-libc-dev:Multi-Arch}
|
||||
Multi-Arch: ${linux:Multi-Arch}
|
||||
Description: Linux support headers for userspace development
|
||||
This package provides userspaces headers from the Linux kernel. These headers
|
||||
are used by the installed headers for GNU glibc and other system libraries.
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ Provides: linux-source
|
|||
Depends: binutils, bzip2, ${misc:Depends}
|
||||
Recommends: libc6-dev | libc-dev, gcc, make
|
||||
Suggests: libncurses-dev | ncurses-dev, libqt4-dev
|
||||
Multi-Arch: ${linux:Multi-Arch}
|
||||
Description: Linux kernel source for version @version@ with Debian patches
|
||||
This package provides source code for the Linux kernel version @version@.
|
||||
This source closely tracks official Linux kernel releases. Debian's
|
||||
|
|
@ -16,6 +17,7 @@ Package: linux-doc-@version@
|
|||
Architecture: all
|
||||
Depends: ${misc:Depends}
|
||||
Section: doc
|
||||
Multi-Arch: ${linux:Multi-Arch}
|
||||
Description: Linux kernel specific documentation for version @version@
|
||||
This package provides the various README files and HTML documentation for
|
||||
the Linux kernel version @version@. Plenty of information, including the
|
||||
|
|
@ -31,6 +33,7 @@ Section: doc
|
|||
Provides: linux-manual
|
||||
Conflicts: linux-manual
|
||||
Replaces: linux-manual
|
||||
Multi-Arch: ${linux:Multi-Arch}
|
||||
Description: Linux kernel API manual pages for version @version@
|
||||
This package provides the Kernel Hacker's Guide in the form of
|
||||
manual pages, describing the kernel API functions. They
|
||||
|
|
@ -45,6 +48,7 @@ Package: linux-support-@abiname@
|
|||
Architecture: all
|
||||
Section: devel
|
||||
Depends: ${python:Depends}, ${misc:Depends}
|
||||
Multi-Arch: ${linux:Multi-Arch}
|
||||
Description: Support files for Linux @upstreamversion@
|
||||
This package provides support files for the Linux kernel build,
|
||||
e.g. scripts to handle ABI information and for generation of
|
||||
|
|
|
|||
Loading…
Reference in New Issue