aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2024-10-25 02:22:25 +0000
committerWarner Losh <imp@FreeBSD.org>2024-10-31 04:05:56 +0000
commit4d3b05a8530e42f7494dd3fbab8d017adb433b14 (patch)
tree2c29466a60674967ed6415cbcbeda0b16eb8db1d
parent843c1b516019efec22295234bdda26b838b1e6b7 (diff)
loader: Change this BIOS tradeoff: Add back zip and use text only
After talking with a number of people about the removal of some things to make the loader fit, readjust things a little. Add back GZIP and BZIP2 compression support. Many of the downstream MFC packaging systems depend on this. This adds back 20k to the size of the loader. Make the boot loader text-only by default. This saves 40k in size. Net, we're 20k smaller. The graphics loader for BIOS is less useful than the zip functionality: You can still boot w/a text only one it and you can build a custom one if you really want it. It's also the default we use for dual console. This should be merged back into stable/14 and stable/13 so it's in the next release for each of these. That way we have only one release (13.4) with the other defaults. MFC After: 3 days Sponsored by: Netflix Reviewed by: olce, rgrimes, emaste Differential Revision: https://reviews.freebsd.org/D47203 (cherry picked from commit 23dee252daf2ff60e521c9c019e64134b63ce90f)
-rw-r--r--share/mk/src.opts.mk2
-rw-r--r--stand/i386/loader/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 774b6fffd3df..22373f8c7af1 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -129,6 +129,7 @@ __DEFAULT_YES_OPTIONS = \
LLD_IS_LD \
LLVM_COV \
LLVM_CXXFILT \
+ LOADER_BIOS_TEXTONLY \
LOADER_GELI \
LOADER_KBOOT \
LOADER_LUA \
@@ -206,7 +207,6 @@ __DEFAULT_NO_OPTIONS = \
DTRACE_TESTS \
EXPERIMENTAL \
HESIOD \
- LOADER_BIOS_TEXTONLY \
LOADER_VERBOSE \
LOADER_VERIEXEC_PASS_MANIFEST \
LLVM_ASSERTIONS \
diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile
index a4aa3a3c4d45..c2037772fc76 100644
--- a/stand/i386/loader/Makefile
+++ b/stand/i386/loader/Makefile
@@ -7,8 +7,8 @@ LOADER_CD9660_SUPPORT?= yes
LOADER_EXT2FS_SUPPORT?= no
LOADER_MSDOS_SUPPORT?= no
LOADER_UFS_SUPPORT?= yes
-LOADER_GZIP_SUPPORT?= no
-LOADER_BZIP2_SUPPORT?= no
+LOADER_GZIP_SUPPORT?= yes
+LOADER_BZIP2_SUPPORT?= yes
.include <bsd.init.mk>