From patchwork Mon Oct 10 18:48:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 9369857 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 803516048F for ; Mon, 10 Oct 2016 18:51:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 739AA29660 for ; Mon, 10 Oct 2016 18:51:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6564D299C2; Mon, 10 Oct 2016 18:51:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DF8DA29660 for ; Mon, 10 Oct 2016 18:51:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btfd6-0001XZ-Pf; Mon, 10 Oct 2016 18:48:52 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btfd5-0001XT-Nx for xen-devel@lists.xenproject.org; Mon, 10 Oct 2016 18:48:51 +0000 Received: from [193.109.254.147] by server-1.bemta-6.messagelabs.com id 8E/44-01767-292EBF75; Mon, 10 Oct 2016 18:48:50 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHIsWRWlGSWpSXmKPExsXSO6nOVXfSo9/ hBufvC1t83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBmN+z8wFyyXr9h06ARzA+MnyS5GTg4hgTYm idcH0rsYuYDsL4wSW+feYIVwNjJK/G79zAjhdDNKXP59kQmipUhi2r7j7CA2i4CqxLRnU4E6O DjYBEwk3qxyBAmLCChL9P76zQLSyyywl0ni5bv1zCA1wgLuEq9nuoPU8AqYSyw6M5MFYv4iZo lfh7exQCQEJU7OfAJmMwtoSdz495IJpJdZQFpi+T8OkDCngL1Ey7PbYCWiQLsW9/ewgdgSAoY Spx9uY5zAKDQLyaRZSCbNQpi0gJF5FaNGcWpRWWqRrrGBXlJRZnpGSW5iZo6uoYGZXm5qcXFi empOYlKxXnJ+7iZGYDgzAMEOxr9rAw8xSnIwKYnyat38HS7El5SfUpmRWJwRX1Sak1p8iFGGg 0NJgnfpA6CcYFFqempFWmYOMLJg0hIcPEoivDUgad7igsTc4sx0iNQpRkUpcd4NIAkBkERGaR 5cGyyaLzHKSgnzMgIdIsRTkFqUm1mCKv+KUZyDUUmYdxvIFJ7MvBK46a+AFjMBLWZZ/ANkcUk iQkqqgXH+cf33mwq3ngn7q2nFf77Wo2XbgbZNFuY8NxwD+F3eaM7xnje7/rDKRdMHaowejo/f 9zKu9PAWDLC8d1ipWIa7tOGT3zeuB5lW6lsP9vG8r3bXSvO5cNB2gv+BTUo7GXRfX90z4d4XJ lajG//2PRA1Tel+fTEk5uSnqfNf5O8udhATfKDZYKfEUpyRaKjFXFScCABoEpGA4QIAAA== X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1476125328!54929685!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10945 invoked from network); 10 Oct 2016 18:48:50 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-13.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 Oct 2016 18:48:50 -0000 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u9AImhNN025563 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 10 Oct 2016 18:48:44 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.13.8/8.14.4) with ESMTP id u9AImhqS011271 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 10 Oct 2016 18:48:43 GMT Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u9AImaAw003364; Mon, 10 Oct 2016 18:48:42 GMT Received: from char.us.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 10 Oct 2016 11:48:36 -0700 Received: by char.us.oracle.com (Postfix, from userid 1000) id 43B696A0DD4; Mon, 10 Oct 2016 14:48:35 -0400 (EDT) Date: Mon, 10 Oct 2016 14:48:35 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20161010184835.GA28607@char.us.oracle.com> References: <57D17990020000780010D10A@prv-mh.provo.novell.com> <20160908162145.GC26186@localhost.localdomain> <57E162290200007800110B26@prv-mh.provo.novell.com> <20160921155902.GA13567@x230.dumpdata.com> <57E2CBA50200007800111381@prv-mh.provo.novell.com> <20160921161712.GA3853@char.us.oracle.com> <57FB5F300200007800115F5F@prv-mh.provo.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <57FB5F300200007800115F5F@prv-mh.provo.novell.com> User-Agent: Mutt/1.6.2 (2016-07-01) X-Source-IP: userv0021.oracle.com [156.151.31.71] Cc: Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , xen-devel Subject: Re: [Xen-devel] [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP On Mon, Oct 10, 2016 at 01:28:16AM -0600, Jan Beulich wrote: > >>> On 07.10.16 at 19:57, wrote: > > On Wed, 21 Sep 2016, Konrad Rzeszutek Wilk wrote: > >> On Wed, Sep 21, 2016 at 10:04:21AM -0600, Jan Beulich wrote: > >> > >>> On 21.09.16 at 17:59, wrote: > >> > > The fix can be done two ways: > >> > > a) See if xen.efi.map exists and then copy it > >> > > b) Or link xen.efi.map to xen-syms.map (similar to how xen.efi is linked > >> > > against xen). > >> > > > >> > > The patch chooses the latter. > >> > > >> > Well, if the ARM maintainers like that ... I don't really see a point in > >> > installing the same file twice without its second incarnation having a > >> > specific purpose. > >> > >> I also have the a) part ready, which is simple: > >> > >> > >> diff --git a/xen/Makefile b/xen/Makefile > >> index e989a20..678f188 100644 > >> --- a/xen/Makefile > >> +++ b/xen/Makefile > >> @@ -67,7 +67,9 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) > >> if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \ > >> [ -d $(D)$(EFI_DIR) ] || $(INSTALL_DIR) $(D)$(EFI_DIR); \ > >> $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_DIR)/$(T)-$(XEN_FULLVERSION).efi; \ > >> - $(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \ > >> + if [ -e $(TARGET).efi.map ]; then \ > >> + $(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \ > >> + fi; \ > >> ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \ > >> ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \ > >> ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \ > >> > >> Either fix works. > > > > This is fine. > > > > Reviewed-by: Stefano Stabellini > > But I hope only with indentation properly cleaned up. Like this: From cc3edf6c2614fa69ab1d33c38a44a10c0f4a50e8 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Wed, 21 Sep 2016 11:39:44 -0400 Subject: [PATCH v2] Makefile: fix (again) EFI part of "symbols: Generate an xen-sym.map This is a follow-up to commit d14fffcc6a7c054db9e337026a3c850152244ac4 "fix EFI part of "symbols: Generate an xen-sym.map" which fixed most of the issues. However we still have an issue - The file being installed (xen.efi.map) does not exist in an ARM64 build (the xen.efi is linked againts xen). The fix can be done two ways: a) See if xen.efi.map exists and then copy it b) Or link xen.efi.map to xen-syms.map (similar to how xen.efi is linked against xen). The patch chooses the first. Reviewed-by: Stefano Stabellini Reported-by: Jan Beulich Signed-off-by: Konrad Rzeszutek Wilk --- Cc: Julien Grall Cc: Stefano Stabellini v1: First submission v2: Use the b) instead of a) option. Fix indentations. --- xen/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index c511330..54a3bc8 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -67,7 +67,9 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \ [ -d $(D)$(EFI_DIR) ] || $(INSTALL_DIR) $(D)$(EFI_DIR); \ $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_DIR)/$(T)-$(XEN_FULLVERSION).efi; \ - $(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \ + if [ -e $(TARGET).efi.map ]; then \ + $(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \ + fi; \ ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \ ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \ ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \