linux-doc: Build an empty package when the nodoc profile is used

Wiki page BuildProfileSpec says the set of binary packages can change,
but policy says not (since 4.0.0).
This commit is contained in:
Ben Hutchings 2017-09-30 12:26:27 +01:00
parent 51100af154
commit fe5c3cbe60
4 changed files with 10 additions and 7 deletions

2
debian/changelog vendored
View File

@ -18,6 +18,8 @@ linux (4.13.4-1~exp1) UNRELEASED; urgency=medium
* ALSA: Enable SND_OSSEMUL, a new dependency of SND_{MIXER,PCM}_OSS * ALSA: Enable SND_OSSEMUL, a new dependency of SND_{MIXER,PCM}_OSS
* [armel] rtc: Disable RTC_NVMEM * [armel] rtc: Disable RTC_NVMEM
* [x86] hyperv-daemons: Use pid file name in init script status operation * [x86] hyperv-daemons: Use pid file name in init script status operation
* Update policy version to 4.1.1:
- linux-doc: Build an empty package when the nodoc profile is used
[ Uwe Kleine-König ] [ Uwe Kleine-König ]
* [arm64] really enable NET_DSA_MV88E6XXX for Espressobin * [arm64] really enable NET_DSA_MV88E6XXX for Espressobin

5
debian/rules vendored
View File

@ -16,11 +16,6 @@ ifdef DEBIAN_KERNEL_JOBS
MAKEFLAGS += -j$(DEBIAN_KERNEL_JOBS) MAKEFLAGS += -j$(DEBIAN_KERNEL_JOBS)
endif endif
BUILD_STAGE1 := $(filter stage1,$(DEB_BUILD_PROFILES)) BUILD_STAGE1 := $(filter stage1,$(DEB_BUILD_PROFILES))
ifneq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
# This only disables building the linux-doc and linux-manual packages.
# The rules for tools packages check separately for the 'nodoc' profile.
MAKEFLAGS += DO_DOCS=False
endif
ifneq (,$(filter pkg.linux.notools,$(DEB_BUILD_PROFILES))) ifneq (,$(filter pkg.linux.notools,$(DEB_BUILD_PROFILES)))
MAKEFLAGS += DO_TOOLS=False MAKEFLAGS += DO_TOOLS=False
endif endif

8
debian/rules.real vendored
View File

@ -67,7 +67,9 @@ binary-arch-flavour: install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
ifneq ($(DO_DOCS),False) ifneq ($(DO_DOCS),False)
binary-indep: install-doc binary-indep: install-doc
build-indep: $(STAMPS_DIR)/build-doc ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
build-indep: $(STAMPS_DIR)/build-doc
endif
endif endif
binary-indep: install-source binary-indep: install-source
binary-indep: install-support binary-indep: install-support
@ -191,11 +193,13 @@ $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR):
$(STAMPS_DIR)/build-doc: DIR=$(BUILD_DIR)/build-doc $(STAMPS_DIR)/build-doc: DIR=$(BUILD_DIR)/build-doc
$(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source $(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
mkdir -p '$(BUILD_DIR)' mkdir -p '$(BUILD_DIR)'
rm -rf '$(DIR)' rm -rf '$(DIR)'
$(call copy_source,$(DIR)) $(call copy_source,$(DIR))
+$(MAKE_CLEAN) -C '$(DIR)' xmldocs +$(MAKE_CLEAN) -C '$(DIR)' xmldocs
+$(MAKE_CLEAN) -C '$(DIR)' htmldocs mandocs +$(MAKE_CLEAN) -C '$(DIR)' htmldocs mandocs
endif
@$(stamp) @$(stamp)
install-base: install-base:
@ -223,6 +227,7 @@ install-doc: OUT_DIR = $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)
install-doc: DH_OPTIONS = -p$(PACKAGE_NAME) install-doc: DH_OPTIONS = -p$(PACKAGE_NAME)
install-doc: $(STAMPS_DIR)/build-doc install-doc: $(STAMPS_DIR)/build-doc
dh_prep dh_prep
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
mkdir -p $(OUT_DIR) mkdir -p $(OUT_DIR)
set -o pipefail; \ set -o pipefail; \
find CREDITS MAINTAINERS README Documentation \ find CREDITS MAINTAINERS README Documentation \
@ -247,6 +252,7 @@ install-doc: $(STAMPS_DIR)/build-doc
ln -sr "$$dest.gz" "$$link.gz"; \ ln -sr "$$dest.gz" "$$link.gz"; \
fi; \ fi; \
done done
endif
+$(MAKE_SELF) install-base +$(MAKE_SELF) install-base
install-manual: PACKAGE_NAME = $(SOURCE_PACKAGE_NAME)-manual-$(VERSION) install-manual: PACKAGE_NAME = $(SOURCE_PACKAGE_NAME)-manual-$(VERSION)

View File

@ -1,5 +1,5 @@
Package: @source_package@-doc-@version@ Package: @source_package@-doc-@version@
Build-Profiles: <!stage1 !nodoc> Build-Profiles: <!stage1>
Architecture: all Architecture: all
Depends: ${misc:Depends} Depends: ${misc:Depends}
Section: doc Section: doc