From patchwork Thu Jun 17 17:03:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 56074 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 34576B7D48 for ; Fri, 18 Jun 2010 03:04:04 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OPIVS-0001vD-QS; Thu, 17 Jun 2010 18:03:58 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OPIVQ-0001v4-US for kernel-team@lists.ubuntu.com; Thu, 17 Jun 2010 18:03:56 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OPIVQ-0000l0-PA for ; Thu, 17 Jun 2010 18:03:56 +0100 Received: from [85.210.146.14] (helo=localhost) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1OPIVQ-0002TN-BK for kernel-team@lists.ubuntu.com; Thu, 17 Jun 2010 18:03:56 +0100 Date: Thu, 17 Jun 2010 18:03:55 +0100 From: Andy Whitcroft To: Ubuntu Kernel Team Subject: [Maverick] replace xmldoclinks patch with upstream version Message-ID: <20100617170355.GE4361@shadowen.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com We are carrying a patch to fix documentation generation in our tree. Having pushed this upstream the upstream fix as applied is somewhat different and will cause issues when that upstream fix comes back to us via mainline. Therefore it seems appropriate to revert the patch we have and pull in the updated one from there. This branch does that. For Maverick. The following changes since commit 5aa677ba666d3ef81594e7a21eb9505ed4871d64: Leann Ogasawara (1): UBUNTU: Ubuntu-2.6.35-4.5 are available in the git repository at: git://kernel.ubuntu.com/apw/ubuntu-maverick xmldoclinks Andy Whitcroft (1): Revert "[Upstream] docbook: need xmldoclinks for all doc types" Ben Hutchings (1): docbook: need xmldoclinks for all doc types Documentation/DocBook/Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) -apw commit 321e097aa09e8a69912b6126665bc124d442be79 Author: Ben Hutchings Date: Thu Jun 17 18:00:59 2010 +0100 docbook: need xmldoclinks for all doc types $ rm -rf build $ mkdir build $ cp .config build $ make O=build htmldocs ... xmlto: linux-2.6/build/Documentation/DocBook/media.xml does not validate (status 3) xmlto: Fix document syntax or use --skip-validation option linux-2.6/build/Documentation/DocBook/media.xml:4: warning: failed to load external entity "linux-2.6/build/Documentation/DocBook/media-entities.tmpl" We need the xmldoclinks built for any document types built from the XML sources. Signed-off-by: Ben Hutchings Acked-by: Andy Whitcroft Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Andy Whitcroft diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index c7e5dc7..f8f0e4a 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -35,7 +35,7 @@ PS_METHOD = $(prefer-db2x) PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs xmldoclinks BOOKS := $(addprefix $(obj)/,$(DOCBOOKS)) -xmldocs: $(BOOKS) xmldoclinks +xmldocs: $(BOOKS) sgmldocs: xmldocs PS := $(patsubst %.xml, %.ps, $(BOOKS)) @@ -95,7 +95,7 @@ define rule_docproc ) > $(dir $@).$(notdir $@).cmd endef -%.xml: %.tmpl FORCE +%.xml: %.tmpl xmldoclinks FORCE $(call if_changed_rule,docproc) ###