From patchwork Wed Aug 13 11:37:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 35351 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0265E203C5 for ; Wed, 13 Aug 2014 11:41:42 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id et14sf80031421pad.10 for ; Wed, 13 Aug 2014 04:41:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:in-reply-to:message-id :references:user-agent:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=YgWcADdqBB3gjTlqYWl31lINt7DKVvUpHMTPuZswBWU=; b=ih3/QScl9teN2fkHEybKCscMfgZ/ojdoaCsojDOlhTx1gXDMn5UmclfesgCOR1rj+E AeC84U8MHpFwMYgKVVWmDB6gpG/PPZ6es3TFdAYdOiNLXkJxe453lMBkwkSbv3aO90rU bzRnFugG9EGNSGNoh0O1eXFsYsCu4Y2ux4ZgkFqVRfTUtZEjRsBS+/Vr/+h8yDMLWR2A JAT/itD/CvdDvYlnVpJHBt9g2XHx/WNfNag1mSWc2zop1LWPtK7T6D1g5aqC0Lul6Mlo Ad87oUKPWCucX2OVIPNC1iLZbPy2oLXa2VNWoVUvhSc3tvP8x/iqZasNrjJpH+JKTDSk AG7g== X-Gm-Message-State: ALoCoQlNzQz5uMe38V5omXvAhjv92anHSP1WmFFPew2iG+10FgPV4jSVgu9FlSm5Ll5+kj6RqPv1 X-Received: by 10.68.219.226 with SMTP id pr2mr2196822pbc.4.1407930102321; Wed, 13 Aug 2014 04:41:42 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.141 with SMTP id s13ls496863qga.6.gmail; Wed, 13 Aug 2014 04:41:42 -0700 (PDT) X-Received: by 10.220.200.71 with SMTP id ev7mr3066814vcb.24.1407930102193; Wed, 13 Aug 2014 04:41:42 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id qp3si914784vcb.31.2014.08.13.04.41.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Aug 2014 04:41:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ik5so14598028vcb.6 for ; Wed, 13 Aug 2014 04:41:42 -0700 (PDT) X-Received: by 10.52.234.228 with SMTP id uh4mr2537654vdc.34.1407930102106; Wed, 13 Aug 2014 04:41:42 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp323607vcb; Wed, 13 Aug 2014 04:41:41 -0700 (PDT) X-Received: by 10.43.53.198 with SMTP id vr6mr3317529icb.74.1407930100777; Wed, 13 Aug 2014 04:41:40 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id m4si3486267igx.47.2014.08.13.04.41.40 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 13 Aug 2014 04:41:40 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHWu9-0005kc-Is; Wed, 13 Aug 2014 11:39:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHWu8-0005kX-Qi for xen-devel@lists.xensource.com; Wed, 13 Aug 2014 11:39:44 +0000 Received: from [85.158.139.211:65346] by server-14.bemta-5.messagelabs.com id B4/D5-12422-08E4BE35; Wed, 13 Aug 2014 11:39:44 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1407929981!11108265!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5209 invoked from network); 13 Aug 2014 11:39:43 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Aug 2014 11:39:43 -0000 X-IronPort-AV: E=Sophos;i="5.01,856,1400025600"; d="scan'208";a="161935517" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Wed, 13 Aug 2014 07:39:16 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1XHWtg-0000Hj-QT; Wed, 13 Aug 2014 12:39:16 +0100 Date: Wed, 13 Aug 2014 12:37:58 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Ian Jackson In-Reply-To: <21475.44023.75000.685175@mariner.uk.xensource.com> Message-ID: References: <1406907139-16800-1-git-send-email-stefano.stabellini@eu.citrix.com> <21474.16719.839599.709043@mariner.uk.xensource.com> <21475.26389.402798.866488@mariner.uk.xensource.com> <21475.44023.75000.685175@mariner.uk.xensource.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-DLP: MIA1 Cc: xen-devel@lists.xensource.com, Ian.Campbell@citrix.com, Stefano Stabellini Subject: Re: [Xen-devel] [PATCH v4 1/3] Move xenstore and libxc public headers to include subdir X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: stefano.stabellini@eu.citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: On Thu, 7 Aug 2014, Ian Jackson wrote: > Stefano Stabellini writes ("Re: [Xen-devel] [PATCH v4 1/3] Move xenstore and libxc public headers to include subdir"): > > I needed to make a couple of more libxc to libxc/include substitutions > > under tools/ocaml. > > The appended patch should work. > > I have also pushed: > > > > git://xenbits.xen.org/people/sstabellini/xen-unstable.git public_headers_v5 > > It seems that the 32-bit stubdom build is still broken: > > In file included from xc_core.c:64:0: > xg_private.h:30:21: fatal error: xenctrl.h: No such file or directory Somehow I missed this email until today. I modified the stubdom and mini-os Makefiles (below is the incremental diff): I have also pushed everything: git://xenbits.xen.org/people/sstabellini/xen-unstable.git public_headers_v6 diff --git a/extras/mini-os/Config.mk b/extras/mini-os/Config.mk index d61877b..4852443 100644 --- a/extras/mini-os/Config.mk +++ b/extras/mini-os/Config.mk @@ -46,7 +46,7 @@ DEF_CPPFLAGS += -D__MINIOS__ ifeq ($(libc),y) DEF_CPPFLAGS += -DHAVE_LIBC DEF_CPPFLAGS += -isystem $(MINI-OS_ROOT)/include/posix -DEF_CPPFLAGS += -isystem $(XEN_ROOT)/tools/xenstore +DEF_CPPFLAGS += -isystem $(XEN_ROOT)/tools/xenstore/include endif ifneq ($(LWIPDIR),) diff --git a/stubdom/Makefile b/stubdom/Makefile index 6bea68b..ffebc0d 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -306,12 +306,14 @@ mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET) mkdir -p libxc-$(XEN_TARGET_ARCH) [ -h libxc-$(XEN_TARGET_ARCH)/Makefile ] || ( cd libxc-$(XEN_TARGET_ARCH) && \ ln -sf $(XEN_ROOT)/tools/libxc/*.h . && \ + ln -sf $(XEN_ROOT)/tools/libxc/include/*.h . && \ ln -sf $(XEN_ROOT)/tools/libxc/*.c . && \ ln -sf $(XEN_ROOT)/tools/libxc/Makefile . ) mkdir -p xenstore [ -h xenstore/Makefile ] || ( cd xenstore && \ ln -sf $(XEN_ROOT)/tools/xenstore/*.c . && \ ln -sf $(XEN_ROOT)/tools/xenstore/*.h . && \ + ln -sf $(XEN_ROOT)/tools/xenstore/include/*.h . && \ ln -sf $(XEN_ROOT)/tools/xenstore/Makefile . ) $(MAKE) DESTDIR= -C $(MINI_OS) links touch mk-headers-$(XEN_TARGET_ARCH) diff --git a/stubdom/grub/Makefile b/stubdom/grub/Makefile index 6bd2c4c..934cc4c 100644 --- a/stubdom/grub/Makefile +++ b/stubdom/grub/Makefile @@ -5,7 +5,7 @@ vpath %.c ../grub-upstream BOOT=$(OBJ_DIR)/boot-$(XEN_TARGET_ARCH).o -DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libxc -I$(XEN_ROOT)/tools/include -I. +DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libxc/include -I$(XEN_ROOT)/tools/include -I. DEF_CPPFLAGS += -I../grub-upstream/stage1 DEF_CPPFLAGS += -I../grub-upstream/stage2 DEF_CPPFLAGS += -I../grub-upstream/netboot