Re: [Xen-devel] [GIT PULL v2] remove xend and libxen for 4.5

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Wed, 2014-04-09 at 08:49 +0200, Olaf Hering wrote:
> On Fri, Apr 04, Ian Campbell wrote:
> 
> > These patches are too big for the list, hence sending as a pull request.
> > Below are the commit messages followed by the pull request itself.
> > 
> > Since last time I've rebased, removed some .*ignore cruft and some of
> > the more obvious docs. I've also added a second patch to remove libxen
> > which is a client library for an early draft of the XenAPI.
> 
> xen-unstable 28728:90a351780970 fails for me:

Looks like some stray CONFIG_XENDs remained after rebasing for v2.

However you should also have rerun configure so CONFIG_XEND should not
be set anyway. The following takes care of the first issue.

8<-----------------------

From 883904df317cd10724cfa81681232721f36c5499 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date: Wed, 9 Apr 2014 09:26:23 +0100
Subject: [PATCH] docs: remove stray CONFIG_XENDs

These were added by 7dbfc2f8b054 "docs: Honour --{en, dis}able-xend when
building docs" between v1 and the (eventually committed) v2 of 9e8672f1c36d
"tools: remove xend and associated python modules" and were missed when
rebasing for v2.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 config/Docs.mk.in |    3 ---
 docs/Makefile     |    2 --
 2 files changed, 5 deletions(-)

diff --git a/config/Docs.mk.in b/config/Docs.mk.in
index 03fac60..a2a72fd 100644
--- a/config/Docs.mk.in
+++ b/config/Docs.mk.in
@@ -12,6 +12,3 @@ POD2HTML            := @POD2HTML@
 POD2TEXT            := @POD2TEXT@
 MARKDOWN            := @MARKDOWN@
 PERL                := @PERL@
-
-# Subsets of documentation to build
-CONFIG_XEND         := @xend@
diff --git a/docs/Makefile b/docs/Makefile
index 7cd7440..5153bcb 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -9,10 +9,8 @@ DOC_ARCHES      := arm x86_32 x86_64
 # Documentation sources to build
 MAN1SRC-y := $(wildcard man/xl*.pod.1)
 MAN1SRC-y += $(wildcard man/xenstore*.pod.1)
-MAN1SRC-$(CONFIG_XEND) += man/xm.pod.1
 
 MAN5SRC-y := $(wildcard man/xl*.pod.5)
-MAN5SRC-$(CONFIG_XEND) += man/xend-config.sxp.pod.5 man/xmdomain.cfg.pod.5
 
 MARKDOWNSRC-y := $(wildcard misc/*.markdown)
 
-- 
1.7.10.4




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel