From nobody Sun Jul 12 04:03:46 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gyX4N1J6Lz6kdk8; Sun, 12 Jul 2026 04:03:48 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gyX4N0dVXz3KRG; Sun, 12 Jul 2026 04:03:48 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783829028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=po1Fnw5fAIJ/MCfpgSnmi+RWnwGLPGHXiLBG3kqoP6Y=; b=Il+d0S5i+G0HZBsC0VNZs/JSTFOwy1vL2WA/LYDMEr0DUBIu1fi2ynUzz9dD6zxZoNC8ZE fWN8Mr84xDxefrJoTBwXlu8fsEvznz+RX3elsAFZAM1OEBvwmhUgIyZV2vgG26xjudUzc+ oYZwXpj1tFhqOxh+8YRo7B5mFaX8eAcg+qXJXfneFGM+75XeciCg7ENEcu8AKWm5QZrVN7 jTw6tOaZqEVPWHjISlbedfUJjv4fL4Hl7lVe+VktvyYsvvOTpdsPx9w+pj8uOvy6u6QyNH MIWUkSl10HG5uhy3s7oyQWwP7gi419FCCosxKjpx2CW/cUvyEEuuA65eli4ekw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783829028; a=rsa-sha256; cv=none; b=UIQ7oJZPqM1BclJ9idGIFvdT9csa29p6GgkR3wWUSpNmbKK4/I++bb+ehlPbnOa/v7ZkRQ k3vvlEuhRW5eIIbvAP6M8g0ueGV14HrgqR5sUayCtsSFV2NWH+Ty0pCHspKPQ4OpomdBmj Zm3Ft2pKIKIa24RyrBgG299mtw++902U7MYLIuS4wdWQa8teVkDTvBmbTMjMWYCAVWvzrI UrT0QNOW53Tvq3XGAMoLRFcenP9McLubuoFHMeDKH1gupo0gOZViz9LMJrkQ8o40oGswWk ujwlzcq6XQvGN00Pwobm3wCE/7RT3Ntee3XFsAmylI7DGxqtrMjXnt4J61JP6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783829028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=po1Fnw5fAIJ/MCfpgSnmi+RWnwGLPGHXiLBG3kqoP6Y=; b=lGlreR7ohUrIlcO80avuqiR7ENF6R6jKWK7pcVzK4N08LdQNbyyU5+gIFkk8Ha1yb1w0I7 cYR7d68wFo30l80ty7pHpAgxICekiN0evV7dB8aMIH9E8m6NAxunc3oWwT0UIh0omMHAhy DI7PapzjSd4ydCWONWt/WQCHk4qXisfqoORMZ1G3O/jZdUMBi2+JxWA7i+Qwrx8GsKJJNS 72KbkQSbGcwitX/rsJsLqkxIW3dUqmotrOtakTxUG//BKcYIIYDA235KtCUCR4kILNYJIe Wy/XVIvp85o71FnY1Z8n1x1JXDuhFj+4rJtHvpgpGfo/yZGKpJem2L1QMH3x9A== Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gyX4M4431zsMW; Sun, 12 Jul 2026 04:03:47 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: Date: Sat, 11 Jul 2026 23:03:46 -0500 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: dc6c193bb4a6 - main - loader.efi: Add xz decompression To: Warner Losh Cc: Warner Losh , src-committers , "" , "" References: <6a5299d0.26e5e.70437550@gitrepo.freebsd.org> <26111ffb-259b-40b3-8f3b-2a0faa4bf51a@FreeBSD.org> Content-Language: en-US From: Kyle Evans In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 7/11/26 22:55, Warner Losh wrote: > > > On Sat, Jul 11, 2026 at 9:38 PM Kyle Evans > wrote: > > On 7/11/26 22:31, Warner Losh wrote: > > > > > > On Sat, Jul 11, 2026, 8:04 PM Kyle Evans >> wrote: > > > >     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 > >      > AuthorDate: 2026-07-11 14:44:40 +0000 > >      > Commit:     Warner Losh > >      > 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. > > > > > > Yes. I did. A later commit fixed it. xz.c is just malloc and free for the stand env. > > > > Hi, > > Did it get missed in a push?  It still seems to be broken as of > 7e06c33151e76, and Jenkins seems to agree with that assessment: > > https://ci.freebsd.org/job/FreeBSD-main-amd64-build/35969/console > > > Oh Yes. I did it hours ago, but it looks like it didn't get pushed. df9d6403caa6 fixes it. My > apologies for leaving things broken for so long. > Ah, whoops- thanks!