From nobody Thu Apr 25 07:42:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1568114998; cv=none; d=zoho.com; s=zohoarc; b=YkDmJ745GS6rCFJZDY8FaLsOmbpwA6u27RAdHqEPhNROEgbQCBi5Tr2guWLLe9d68ttxEVQyk4+rPT+tmvD7yC30P/yeyWm5eRO0x9D9/dB8k6ti4GKWebJBOvCsyjh5mKvJ3yqy0OGFB9BmnaimRM4YGUMpsrWF8E4ZQD0+ufU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568114998; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=Ms3FLptQGd1W+Si4nSV5bMxlpTyagoRVwlW2ClsN7ko=; b=Nx8MfFV8Y3tGP6YxZrIshDY6ZaPichg3PZQbUVmNgSEDPYJB9gg0mmDiR10DP2loJ887Puxx4glJwVXTKGB6t1UCU/y8/wb9iKT/O7BpN32JSCWEybypFRU3p1wcf3jm2yCmUoGQQCKvjRhUJTAkIxSFWwGw6U4SxUqo1YJdhks= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1568114997775249.73738389334198; Tue, 10 Sep 2019 04:29:57 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i7eJm-0004CH-Jy; Tue, 10 Sep 2019 11:28:18 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i7eJl-0004CC-Nr for xen-devel@lists.xenproject.org; Tue, 10 Sep 2019 11:28:17 +0000 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1537c232-d3be-11e9-a337-bc764e2007e4; Tue, 10 Sep 2019 11:28:17 +0000 (UTC) X-Inumbo-ID: 1537c232-d3be-11e9-a337-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1568114897; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=bE8F89plhYcMb91WDZDkqQ5dfmHYrn79mGqUY1ferlM=; b=fPHnGfeH2hUDgVHO2xRVdL3241koRWT7TNuGBFHz5oGZMYgm8i3Fhlfh L4Ch1U0k4hIFyVDQVXs8KQXcJ1utLPaS8v7M/I1031LCOwvg3vmCo+tXS ifdtwe2vrcnYClL+2TtQlyiS3T5gAzGt9ps2XiO2x2qvo4HQNqCbid12q k=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=roger.pau@citrix.com; spf=Pass smtp.mailfrom=roger.pau@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of roger.pau@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.hc3370-68.iphmx.com: domain of roger.pau@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: /3rBKYw756JVmZWgEzNPk0QLkn1eRRzisWUccutIRBnLAXIRS3YQnDwI2u9IHyaCFCUicMwmuB NQO2A298drC7Nm+Ymq0BCxe/mbb3E0GwZjzHNAR7Id9JkXT8LkClbUL78lon9ZUx+jtxKltA9g R5ye+JDm8t135M1CiWfzaVPw2ZdNYCt6oc3RvqNbBFnFxzAK/lWOdLG32JiwI1VffMkT91x3Ax SUQIP6usxQnxmd8dA7NZkJI3moZidPH2CMaqgifhZvig4Bs04ClZCan+TlDSGcynjAxvSWoOce Hp0= X-SBRS: 2.7 X-MesageID: 5369321 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.64,489,1559534400"; d="scan'208";a="5369321" From: Roger Pau Monne To: Date: Tue, 10 Sep 2019 13:27:53 +0200 Message-ID: <20190910112753.34545-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] freebsd-build: fix building efifat after r351831 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson , Roger Pau Monne Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) FreeBSD revisions after r351831 no longer automatically build an efifat partition image, and makefs should be used instead if such file is required. Do this and add logic to build the efifat partition ourselves if it's not present in the output of the build. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Ian Jackson --- Cc: Ian Jackson --- ts-freebsd-build | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ts-freebsd-build b/ts-freebsd-build index bdf666eb..a34d3ae7 100755 --- a/ts-freebsd-build +++ b/ts-freebsd-build @@ -189,6 +189,18 @@ gzip $output.tmp/boot/kernel/kernel =20 makefs -B little $output.part $output.tmp =20 +# NB: since r351831 efifat files are no longer automatically generated. +if [ ! -f $target/boot/boot1.efifat ]; then + # Create an EFI partition using the FAT filesystem + mkdir -p $output.efi/EFI/BOOT + cp $target/boot/loader.efi $output.efi/EFI/BOOT/bootx64.efi + size=3D`stat -f%z $output.efi/EFI/BOOT/bootx64.efi` + size=3D`expr $size + $size / 2` + makefs -t msdos -o fat_type=3D32 -o sectors_per_cluster=3D1 \ + -o volume_label=3DEFISYS -s $size $target/boot/boot1.efifat $outpu= t.efi + rm -rf $output.efi +fi + mkimg -s gpt -b $target/boot/pmbr -p efi:=3D$target/boot/boot1.efifat \ -p freebsd-boot:=3D$target/boot/gptboot -p freebsd-ufs:=3D$output.part= \ -p freebsd-swap::1M -o $output --=20 2.22.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel