Skip to contentSkip to conversation

freebsd-build: fix building efifat after r351831

PATCH In review Roger Pau Monne 2 participants 2 messages Sep 10, 2019 – Sep 12, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 freebsd-build: fix building efifat after r351831

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.

---
Cc: Ian Jackson <[email protected]>

---
 ts-freebsd-build | 12 ++++++++++++
 1 file changed, 12 insertions(+)
ts-freebsd-build +12 -0
index bdf666eb..a34d3ae7 100755
@@ -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
Signature · 7 lines
2.22.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Acked-by on v1 1/1
#1 lore raw

Roger Pau Monne writes ("[PATCH] freebsd-build: fix building efifat after r351831"):

Quoted 6 lines

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.

And pushed to pretest, thanks.

Ian.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel