UBUNTU: [Packaging] Generate linux-doc for only the primary variant

Even though the doc package is generated as SRCPKGNAME-doc in the
control stub, we're really only set up to have a single doc
package. Therefore split out linux-doc into its own control stub,
which will be included in the control file for only the primary
variant.

Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index 088bc785e2800df03ac2aa7042bf5e3fc2c37d2a..2555779662040febe8932ffdc4132af67250e95a 100644 (file)
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -78,19 +78,6 @@ Description: Linux kernel source for version PKGVER with Ubuntu patches
  you do not want this package. Install the appropriate linux-headers
  package instead.
 
-Package: SRCPKGNAME-doc
-Build-Profiles: <!stage1>
-Architecture: all
-Section: doc
-Priority: optional
-Depends: ${misc:Depends}
-Description: Linux kernel specific documentation for version PKGVER
- This package provides the various documents in the PKGVER kernel
- Documentation/ subdirectory.  These document kernel subsystems, APIs, device
- drivers, and so on.  See
- /usr/share/doc/SRCPKGNAME-doc/00-INDEX for a list of what is
- contained in each file.
-
 Package: SRCPKGNAME-headers-PKGVER-ABINUM
 Build-Profiles: <!stage1>
 Architecture: all

diff --git a/debian/control.d/linux-doc.stub b/debian/control.d/linux-doc.stub
new file mode 100644 (file)
index 0000000..a0e0447
--- /dev/null
+++ b/debian/control.d/linux-doc.stub
@@ -0,0 +1,12 @@
+Package: linux-doc
+Build-Profiles: <!stage1>
+Architecture: all
+Section: doc
+Priority: optional
+Depends: ${misc:Depends}
+Description: Linux kernel specific documentation for version PKGVER
+ This package provides the various documents in the PKGVER kernel
+ Documentation/ subdirectory.  These document kernel subsystems, APIs, device
+ drivers, and so on.  See
+ /usr/share/doc/SRCPKGNAME-doc/00-INDEX for a list of what is
+ contained in each file.

diff --git a/debian/rules b/debian/rules
index 47cbe03de04f79028f044a4e8468baa6742f8977..d35898ce2747f388477dc3ec53564999d1920002 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -179,6 +179,9 @@ control_files := $(DEBIAN)/control.stub.in
 ifeq ($(do_libc_dev_package),true)
        control_files += $(DROOT)/control.d/linux-libc-dev.stub
 endif
+ifeq ($(do_doc_package),true)
+       control_files += $(DROOT)/control.d/linux-doc.stub
+endif
 
 # Misc stuff
 .PHONY: $(DEBIAN)/control.stub

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 37574fbbdfdee8de87fcc4a992ce09f0a09fb282..8d02b2d9c6bc9c64a391a2d5cc986d1f1e001335 100644 (file)
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -152,7 +152,11 @@ indep_hdrs_pkg_name=$(src_pkg_name)-headers-$(abi_release)
 # cycle, so its OK to leave 'do_doc_package_content=false' until those build
 # failures get sorted out. Finally, the doc package doesn't really need to be built
 # for developer testing (its kind of slow), so only do it if on a buildd.
+ifneq ($(filter --,$(variants)),)
 do_doc_package=true
+else
+do_doc_package=false
+endif
 do_doc_package_content=true
 ifeq ($(full_build),false)
 do_doc_package_content=false