From nobody Mon Feb 9 16:32:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1631191784; cv=none; d=zohomail.com; s=zohoarc; b=jpy0VqckM7r4JAc+ClOuFKCNUE7ufbS7Q/w96HbWq34hie/sQ4/GBYI7/HbIvpRJIf5t+y6yMP45Y0e8jOUdpu3kHtTucSR5RkWy7+zAD/Ce/u1EJanM+Oqb3oyDBnPS3q5A/1BIe1kufXS9ALMQs4JEnFFiUHRwdiRxQZx21NY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631191784; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=apPVVY/Or6068NSgAcAK1NyxZlsZ0S/Udfzjsh8c7Lc=; b=JwZ5gHlVIjEYir1NOqeeZTZeLANmjN6+UqN9SJmKVt1+vJ++3Irfp7wNTqqD5f82TFyMTZ0ejQe9YURMuB3l86NASFD3hYaXQMvjLY0ivclZ2kIs/ZBPBQs8K1RFid4lrWR8X0WeNW+laTzH0Ps9JFOg9XOO16BngWRnFSUlayE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1631191784633580.416622484434; Thu, 9 Sep 2021 05:49:44 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.183220.331268 (Exim 4.92) (envelope-from ) id 1mOJUg-0004kR-RJ; Thu, 09 Sep 2021 12:49:30 +0000 Received: by outflank-mailman (output) from mailman id 183220.331268; Thu, 09 Sep 2021 12:49:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mOJUg-0004kK-Nb; Thu, 09 Sep 2021 12:49:30 +0000 Received: by outflank-mailman (input) for mailman id 183220; Thu, 09 Sep 2021 12:49:29 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mOJUf-0004iJ-5N for xen-devel@lists.xenproject.org; Thu, 09 Sep 2021 12:49:29 +0000 Received: from smtp-out1.suse.de (unknown [195.135.220.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 600b41ca-0bd0-4bd4-b3f9-5f9e83374f20; Thu, 09 Sep 2021 12:49:28 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 7D5EE222FA; Thu, 9 Sep 2021 12:49:27 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 242D513CC1; Thu, 9 Sep 2021 12:49:27 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QB9TB9cCOmEyAgAAMHmgww (envelope-from ); Thu, 09 Sep 2021 12:49:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 600b41ca-0bd0-4bd4-b3f9-5f9e83374f20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1631191767; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=apPVVY/Or6068NSgAcAK1NyxZlsZ0S/Udfzjsh8c7Lc=; b=E1vtToLOsUatlm7chF20KBa/molARloaccxU0c3pKL4bDfD7/pgwUnIA6P4vc8qYJDbiRK kNY5hXJyJZLDjEvJZip43BDoF2f+8gbrdmjgl5jC23MCp133QAIJdXIi6bRxU2zuiTGebd WNsnqvVMjYS58fqH0YUQxEKT7qwJIzE= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu , Samuel Thibault Subject: [PATCH v2 1/3] stubdom: fix build with disabled pv-grub Date: Thu, 9 Sep 2021 14:49:22 +0200 Message-Id: <20210909124924.1698-2-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210909124924.1698-1-jgross@suse.com> References: <20210909124924.1698-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1631191785373100002 Content-Type: text/plain; charset="utf-8" Today the build will fail if --disable-pv-grub as a parameter of configure, as the main Makefile will unconditionally try to build a 32-bit pv-grub stubdom. Fix that by introducing a pv-grub32 target in stubdom/Makefile taking care of this situation. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- Makefile | 4 ++-- stubdom/Makefile | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 96d32cfd50..5b5cef3e49 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ build-tools-oxenstored: build-tools-public-headers build-stubdom: mini-os-dir build-tools-public-headers $(MAKE) -C stubdom build ifeq (x86_64,$(XEN_TARGET_ARCH)) - XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom pv-grub + XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom pv-grub32 endif =20 .PHONY: build-docs @@ -143,7 +143,7 @@ install-tools: install-tools-public-headers install-stubdom: mini-os-dir install-tools $(MAKE) -C stubdom install ifeq (x86_64,$(XEN_TARGET_ARCH)) - XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom install-grub + XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom install-grub32 endif =20 .PHONY: tools/firmware/seabios-dir-force-update diff --git a/stubdom/Makefile b/stubdom/Makefile index 06aa69d8bc..b339ae701c 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -531,6 +531,13 @@ vtpmmgr-stubdom: mini-os-$(XEN_TARGET_ARCH)-vtpmmgr vt= pmmgr pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub libxenguest grub DEF_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" DEF_CFLAGS=3D"$(TARGET_CFLAGS)" DEF_L= DFLAGS=3D"$(TARGET_LDFLAGS)" MINIOS_CONFIG=3D"$(CURDIR)/grub/minios.cfg" $(= MAKE) DESTDIR=3D -C $(MINI_OS) OBJ_DIR=3D$(CURDIR)/$< APP_OBJS=3D$(CURDIR)/= grub-$(XEN_TARGET_ARCH)/main.a =20 +.PHONY: pv-grub32 +ifneq ($(filter grub,$(STUBDOM_TARGETS)),) +pv-grub32: pv-grub +else +pv-grub32: +endif + .PHONY: xenstore-stubdom xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxenguest xenstore DEF_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" DEF_CFLAGS=3D"$(TARGET_CFLAGS)" DEF_L= DFLAGS=3D"$(TARGET_LDFLAGS)" MINIOS_CONFIG=3D"$(CURDIR)/xenstore-minios.cfg= " $(MAKE) DESTDIR=3D -C $(MINI_OS) OBJ_DIR=3D$(CURDIR)/$< APP_OBJS=3D$(CURD= IR)/xenstore/xenstored.a @@ -560,6 +567,12 @@ install-grub: pv-grub $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(X= ENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz" =20 +ifneq ($(filter grub,$(STUBDOM_TARGETS)),) +install-grub32: install-grub +else +install-grub32: +endif + install-c: c-stubdom =20 install-caml: caml-stubdom --=20 2.26.2