From: Kevin Martin <kevinmbecause@gmail.com>
To: Masahiro Yamada <masahiroy@kernel.org>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Nicolas Schier <nicolas@fjasle.eu>,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Kevin Martin <kevinmbecause@gmail.com>
Subject: [PATCH v2 1/2] kbuild: Enable decompression for use by EXTRA_FIRMWARE
Date: Fri, 5 Jan 2024 01:10:01 -0500 [thread overview]
Message-ID: <941a566eb114701685dc44f708f81891b3bd085b.1704353568.git.kevinmbecause@gmail.com> (raw)
In-Reply-To: <cover.1704353568.git.kevinmbecause@gmail.com>
The build system can currently only compress files. This patch adds the
functionality to decompress files. Decompression is needed for building
firmware files into the kernel if those files are compressed on the
filesystem. Compressed firmware files are in use by Gentoo, Fedora, Arch,
and others.
Signed-off-by: Kevin Martin <kevinmbecause@gmail.com>
---
Changes in v2:
- Skipped running 'cat' and now just pass the file names directly.
- Added '--quiet' since 'zstd' started printing the status of each file
now that it knows the file names.
scripts/Makefile.lib | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 1a965fe68..d043be3dc 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -523,6 +523,9 @@ quiet_cmd_xzkern_with_size = XZKERN $@
quiet_cmd_xzmisc = XZMISC $@
cmd_xzmisc = cat $(real-prereqs) | $(XZ) --check=crc32 --lzma2=dict=1MiB > $@
+quiet_cmd_xzdec = XZDEC $@
+ cmd_xzdec = $(XZ) --decompress --stdout $< > $@
+
# ZSTD
# ---------------------------------------------------------------------------
# Appends the uncompressed size of the data using size_append. The .zst
@@ -548,6 +551,9 @@ quiet_cmd_zstd22 = ZSTD22 $@
quiet_cmd_zstd22_with_size = ZSTD22 $@
cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -22 --ultra; $(size_append); } > $@
+quiet_cmd_zstddec = ZSTDDEC $@
+ cmd_zstddec = $(ZSTD) --decompress --force --quiet -o $@ $<
+
# ASM offsets
# ---------------------------------------------------------------------------
--
2.41.0
next prev parent reply other threads:[~2024-01-05 6:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-05 6:10 [PATCH v2 0/2] Enable compressed files in EXTRA_FIRMWARE Kevin Martin
2024-01-05 6:10 ` Kevin Martin [this message]
2024-01-07 11:40 ` [PATCH v2 1/2] kbuild: Enable decompression for use by EXTRA_FIRMWARE Masahiro Yamada
2024-01-05 6:10 ` [PATCH v2 2/2] firmware_loader: Enable compressed files with EXTRA_FIRMWARE Kevin Martin
2024-01-07 9:12 ` Masahiro Yamada
2024-01-09 8:27 ` Kevin Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=941a566eb114701685dc44f708f81891b3bd085b.1704353568.git.kevinmbecause@gmail.com \
--to=kevinmbecause@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nicolas@fjasle.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®