From patchwork Tue Sep 10 11:27:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roger Pau Monne X-Patchwork-Id: 11139229 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1CF831599 for ; Tue, 10 Sep 2019 11:30:08 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EC30D208E4 for ; Tue, 10 Sep 2019 11:30:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="fPHnGfeH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC30D208E4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org 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 X-Inumbo-ID: 1537c232-d3be-11e9-a337-bc764e2007e4 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) 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 (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 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" 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é 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 makefs -B little $output.part $output.tmp +# 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=`stat -f%z $output.efi/EFI/BOOT/bootx64.efi` + size=`expr $size + $size / 2` + makefs -t msdos -o fat_type=32 -o sectors_per_cluster=1 \ + -o volume_label=EFISYS -s $size $target/boot/boot1.efifat $output.efi + rm -rf $output.efi +fi + mkimg -s gpt -b $target/boot/pmbr -p efi:=$target/boot/boot1.efifat \ -p freebsd-boot:=$target/boot/gptboot -p freebsd-ufs:=$output.part \ -p freebsd-swap::1M -o $output