Re: git: dc6c193bb4a6 - main - loader.efi: Add xz decompression

On 7/11/26 14:30, Warner Losh wrote:
> The branch main has been updated by imp:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=dc6c193bb4a67e2e9ee97d1e3ac3e2950bd16979
> 
> commit dc6c193bb4a67e2e9ee97d1e3ac3e2950bd16979
> Author:     Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2026-07-11 14:44:40 +0000
> Commit:     Warner Losh <imp@FreeBSD.org>
> CommitDate: 2026-07-11 19:28:47 +0000
> 
>      loader.efi: Add xz decompression
>      
>      We can now decompress .xz compressed memory disks, like
>      FreeBSD-15.1-RELEASE-amd64-disc1.iso.xz
>      
>      Sponsored by:           Netflix
>      Differential Revision:  https://reviews.freebsd.org/D58073
> ---
>   stand/defs.mk                               |   5 ++
>   stand/efi/loader/Makefile                   |   2 +-
>   stand/efi/loader/decompress.c               | 101 ++++++++++++++++++++++++++--
>   stand/efi/loader/decompress.h               |   2 +-
>   stand/libsa/Makefile                        |   7 ++
>   sys/contrib/xz-embedded/freebsd/xz_config.h |  11 +--
>   6 files changed, 117 insertions(+), 11 deletions(-)
> 
[...]
> diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile
> index a0bc47f343b5..ab7a0f5a59f2 100644
> --- a/stand/libsa/Makefile
> +++ b/stand/libsa/Makefile
> @@ -110,6 +110,13 @@ SRCS+=	${i}
>   SRCS+=	lz4.c
>   CFLAGS.lz4.c+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4
>   
> +# xz decompression
> +.PATH: ${XZ_DIR}/linux/lib/xz
> +.for i in xz_crc32.c xz_crc64.c xz_dec_bcj.c xz_dec_lzma2.c xz_dec_stream.c xz.c
> +CFLAGS.${i}+=${XZ_CFLAGS}
> +SRCS+=	${i}
> +.endfor
> +
>   # io routines
>   SRCS+=	closeall.c dev.c ioctl.c nullfs.c stat.c mount.c \
>   	fstat.c close.c lseek.c open.c read.c write.c readdir.c preload.c

xz.c doesn't seem to come from xz-embedded, was it supposed to be added here?  This seems to have broken the build.

Thanks,

Kyle Evans