svn commit: r324646 - in head/sys/boot/efi: boot1 libefi loader

[Alastair Hogge]

On Mon, 16 Oct 2017-10-16 03:59:12 Warner Losh wrote:
> Author: imp
> Date: Mon Oct 16 03:59:11 2017
> New Revision: 324646
> URL: https://svnweb.freebsd.org/changeset/base/324646
> 
> Log:
>   Unify boot1 with loader
> 
>   Refactor boot1 to use the same I/O code as /boot/loader uses. Refactor
>   to use the common efi_main.c.
> 
>   Submitted by: Eric McCorkle
>   Differential Revision: https://reviews.freebsd.org/D10447
> 

Hi Warner & Eric, thanks for the top stuff, however, I think at least one
ZFS compile time option was missed:

cc -target x86_64-unknown-freebsd12.0 --sysroot=/tmp/direwolf/usr/src/tmp -B/tmp/direwolf/usr/src/tmp/usr/bin  -O2 -pipe -ffreestanding -Wformat -mno-mmx -mno-sse -mno-avx -msoft-float -fshort-wchar -mno-red-zone -mno-aes -march=bd
ver2  -DLOADER_UFS_SUPPORT -DLOADER_DISK_SUPPORT -DLOADER_GPT_SUPPORT -DLOADER_MBR_SUPPORT -DLOADER_GELI_SUPPORT -I/usr/src/sys/boot/libsa -I/usr/src/sys/boot/common -I. -I/usr/src/sys/boot/efi/boot1/../include -I/usr/src/sys/boot/
efi/boot1/../include/amd64 -I/usr/src/sys/boot/efi/boot1/../../../contrib/dev/acpica/include -I/usr/src/sys/boot/efi/boot1/../../.. -DEFI_UFS_BOOT -I/usr/src/sys/boot/efi/boot1/../../common -fPIC -ffreestanding -Wformat -mno-mmx -m
no-sse -mno-avx -msoft-float -fshort-wchar -mno-red-zone -mno-aes -MD  -MF.depend.boot1.o -MTboot1.o -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpoin
ter-arith -Wno-uninitialized -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-unu
sed-local-typedef -Wno-address-of-packed-member -Wno-format -Qunused-arguments  -c /usr/src/sys/boot/efi/boot1/boot1.c -o boot1.o                                                                                                      
/usr/src/sys/boot/efi/boot1/boot1.c:269:1: error: no previous prototype for function 'efi_zfs_is_preferred' [-Werror,-Wmissing-prototypes]                                                                                             
efi_zfs_is_preferred(EFI_HANDLE *h)

> Added:
>   head/sys/boot/efi/libefi/efi_main.c   (contents, props changed)
>      - copied, changed from r324645, head/sys/boot/efi/loader/efi_main.c
> Deleted:
>   head/sys/boot/efi/boot1/boot_module.h
>   head/sys/boot/efi/boot1/ufs_module.c
>   head/sys/boot/efi/boot1/zfs_module.c
>   head/sys/boot/efi/loader/efi_main.c
> Modified:
>   head/sys/boot/efi/boot1/Makefile
>   head/sys/boot/efi/boot1/boot1.c
>   head/sys/boot/efi/libefi/Makefile
>   head/sys/boot/efi/loader/Makefile

 [leading diff removed]

> -/*
> - * devpath_last returns the last non-path end node in devpath.
> - */
> -static EFI_DEVICE_PATH *
> -devpath_last(EFI_DEVICE_PATH *devpath)
> +bool
> +efi_zfs_is_preferred(EFI_HANDLE *h)
>  {
> +         return (check_preferred(h));
> +}

Should this function be conditional on #ifdef EFI_ZFS_BOOT? There could be others,
however, my buildworld has stumbled here for the moment, and I am hitting the
horizontal now.

To good health
-- 
Only fools are quoted.
		-- Anonymous
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20171017/db2aea7d/attachment.sig>