linuxkpi: Move string_helpers.h to string_choices.h
Chace Linux change fca76071bab2 ("lib/string_helpers: Split out
string_choices.h") from v6.5. Everything that we implemented from
string_helpers.h has moved, so rename the file, update the include
guards, and add a new dummy string_helpers.h that just #includes it.
This matches Linux for the functionality that we have.
Reviewed by: bz
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D52606
release: use sets to select base packages
The introduction of package sets allows us to replace the current
fragile string matching with this simpler and more robust alternative.
Sponsored by: The FreeBSD Foundation
MFC after: 3 seconds
Reviewed by: emaste, ivy
Differential Revision: https://reviews.freebsd.org/D52592
(cherry picked from commit 6cdca18d79b9e247d8a34e266fe2215e4bfa1b05)
packages: Add a mandoc package
Move mandoc to its own package so users can install it independently of
-utilities. Put the package in the minimal set, since we also ship
manpages in minimal and "man" is a basic Unix utility.
Add a pkg-triggers(5) hook to run makewhatis when new manpages are
installed, so that apropos(1) works. This depends on a new pkg(8)
feature expected to be in in the upcoming 2.3.2 release; in the mean
time, this is a no-op (i.e., having an older pkg doesn't break anything,
it just won't run the trigger).
MFC after: 3 seconds
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D52564
(cherry picked from commit ea5e50c2985bea029e7b30ecee773a59fe22cd68)
bsdinstall: Use package sets for pkgbase install
Update the pkgbase component selection dialogue to take the components
list from the meta-package sets available on the install media, except
for "kernel" which is still handled magically.
Always install "minimal", and by default select "base", "kernel-dbg"
and any libcompat sets (e.g., lib32) if they're available.
Replace the various "dbg" options with a single "debug" component that
installs the debug symbols for all the components the user selected,
except for kernel since we handle that separately and it's common to
want kernel debugs symbols without userland debug symbols.
MFC after: 3 seconds
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D52558
(cherry picked from commit 55ba5550d25d58144007ae02b07450ec8cda7ee5)
packages: Remove the tests-dev package
We don't want a tests-dev package, because this means set-devel depends
on tests-dev, which transitively depends on tests, which means you can't
install set-devel without also getting tests.
The only real "dev" files in tests-dev are from ATF (libprivateatf),
so move that to its own package and add a dependency from tests.
Also move Kyua to its own package, since this might be useful for
running tests even when the user doesn't want the whole set of base
tests installed.
Add a dependency from -tests to both -atf and -kyua, and a dependency
on -set-base, since the tests won't work without the full base system
installed.
The remaining "dev" files in tests are actually test artifacts, not real
development libraries. Add a new NO_DEV_PACKAGE option to bsd.lib.mk,
[12 lines not shown]
packages: remove tests from base set
Create a new tests package set to hold the tests, which are not useful
to all users and don't belong in the base set.
Reviewed by: emaste, ivy
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D52574
(cherry picked from commit 36edc5014f633c1f00031f5fc5a291f8cdd46d83)
packages: Move kernel-man to the minimal set
Currently this is in the "kernels" set, which doesn't make sense
because it's not a kernel.
Move it to the "minimal" set, on the basis that minimal already includes
a bunch of manpages, and a user who installs with minimal expects that
e.g. "man ix" will work.
MFC after: 3 seconds
Reported by: des
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D52560
(cherry picked from commit a2783fb75401c85f5ae815a1349fbad8e7ab7b3c)
packages: Add minimal-jail set
This is minimal, but without bootloader, hardware and networking support
that's typically not required in jails.
This requires extending the 'set' annotation to be a comma-separated
list, so that packages can be in multiple sets.
MFC after: 3 seconds
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D52591
(cherry picked from commit 9b7bddfd082d1df2b4c97e7ec974d1d67e98a1de)
share/man/man[49]: Set PACKAGE=kernel-man
When MANSPLITPKG is disabled (which is now the default), the kernel
manpages in sections 4 and 9 are installed in the -kernel package
instead of the -kernel-man package, because bsd.man.mk doesn't add
the -man suffix.
Since we already have handling for kernel-man in generate-ucl.lua,
set PACKAGE=kernel-man to make sure they're always in the right
package.
To avoid creating -kernel-man-man when WITH_MANSPLITPKG is enabled,
add some logic to bsd.man.mk (suggested by kevans) to avoid adding
the -man suffix if the package already has a -man suffix, and while
here, ensure ${__group}PACKAGE is always defined.
MFC after: 3 seconds
Reviewed by: des, bapt
Differential Revision: https://reviews.freebsd.org/D52525
[2 lines not shown]
packages: Mark all sets as vital
At least "minimal" must be vital, because it's required for a functional
system. For example, we might create new packages in the future which
are required for the multi-user system and are part of the minimal set,
so it's important that users don't remove set-minimal to ensure they get
those new packages.
For the other sets, it's debatable whether they should be vital or not,
but let's start out with the assumption that if the user installed a
set, they should have to have to explicit request it be removed. This
means if, for example, they install set-devel, then remove lldb, pkg
won't remove set-devel and cause the next "pkg autoremove" to remove
everything else that was in set-devel.
We might want to adjust this later (or possibly adjust the behaviour
of pkg(8) itself) based on user feedback.
While here, fix a typo in the description of the devel set.
[7 lines not shown]
packages: remove src from base set
The FreeBSD-src package is the largest single pkgbase package at 158M
currently. Remove it and FreeBSD-src-sys (87M) from the base set as
they are not useful to all users.
Reviewed by: emaste, ivy
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D52573
(cherry picked from commit 87a78d9618ab5430b12dd5c54ec61fcaeb8f0655)
bridge: Do outbound VLAN filtering in bridge_enqueue
Outbound VLAN filtering wasn't being done for host-originated frames,
because bridge_output was missing a call to bridge_vfilter_out, like
in bridge_forward and bridge_broadcast.
Rather than adding another call, move the filtering to bridge_enqueue,
which ensures all frames will be filtered. This slightly changes the
observable behaviour since we now do pfil before vlan filtering, but
that's probably closer to what users expect anyway.
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D52380
(cherry picked from commit 6a888f62413a1a6117f5053f124c97277ed18484)
packages: Use LIB_PACKAGE for zfs and ufs packages
Commit f9513c334ff7 moved the shared libraries for ZFS and UFS into
separate packages (libzfs and libufs), which resulted in a rather
large number of packages being created, e.g. for ZFS:
FreeBSD-libzfs
FreeBSD-libzfs-dbg
FreeBSD-libzfs-dbg-lib32
FreeBSD-libzfs-dev
FreeBSD-libzfs-dev-lib32
FreeBSD-libzfs-lib32
FreeBSD-zfs
FreeBSD-zfs-dbg
FreeBSD-zfs-dbg-lib32
FreeBSD-zfs-dev
FreeBSD-zfs-dev-lib32
FreeBSD-zfs-lib32
FreeBSD-zfs-man
[18 lines not shown]
packages: Turn off MANSPLITPKG by default
Manpages are very small, and having a separate manpages package for
every base package is quite annoying for users. Turn this option
off by default.
Discussed with: bapt
Reviewed by: manu, emaste
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D52417
(cherry picked from commit a8a18eeb5e1711ad27c3ee20eb342b73d3badffa)
packages: Add meta-package sets
Add several metapackages which contain no files themselves, but depend
on other packages. This allows the user to install a system by using
a set like "FreeBSD-set-minimal" instead of having to know which
specific packages are required, and it means if we add more package
in the future, existing installations will get them automatically as
long as they were installed using a set.
The defined sets are significantly less granular than the actual
packages; the assumption is that users who want a very specific set of
packages installed can do that manually, while sets are intended more
for typical users who just want to install FreeBSD.
The following sets are defined:
* minimal: the set of packages required to boot the system and bring
up a multi-user UNIX system. This includes hardware support,
networking (wireless, DHCP), basic functionality like syslogd, cron
[42 lines not shown]
bsdinstall: Use package sets for pkgbase install
Update the pkgbase component selection dialogue to take the components
list from the meta-package sets available on the install media, except
for "kernel" which is still handled magically.
Always install "minimal", and by default select "base", "kernel-dbg"
and any libcompat sets (e.g., lib32) if they're available.
Replace the various "dbg" options with a single "debug" component that
installs the debug symbols for all the components the user selected,
except for kernel since we handle that separately and it's common to
want kernel debugs symbols without userland debug symbols.
MFC after: 3 seconds
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D52558
release: use sets to select base packages
The introduction of package sets allows us to replace the current
fragile string matching with this simpler and more robust alternative.
Sponsored by: The FreeBSD Foundation
MFC after: 3 seconds
Reviewed by: emaste, ivy
Differential Revision: https://reviews.freebsd.org/D52592
release: Allow pkg build on "wrong" major
While we usually build FreeBSD releases on the same major version, we
do need to be able to e.g. build 15 on 16. Tell the ports tree that
we know what we're doing. (We don't, not really, but we can at least
pretend...)
MFC after: 6 hours
Sponsored by: https://www.patreon.com/cperciva
