options: Improve performance by loading ports_env.
This is normally handled by jail_start() but poudriere-options does not use a
jail. Call setup_ports_env() directly like poudriere-distclean does.
Fixes #1335
(cherry picked from commit b8937a8306487fd94142b31315c6e15f5eb17000)
Conflicts:
src/share/poudriere/options.sh
Fix some fallout from removing DEPENDS_ARGS.
The have_ports_feature() was broken before and did not properly
have FLAVORS set where listed_ports() was used.
(cherry picked from commit af0f63dfcee7dfb2824e421cf3e80c865d4091a7)
options: Improve performance by loading ports_env.
This is normally handled by jail_start() but poudriere-options does not use a
jail. Call setup_ports_env() directly like poudriere-distclean does.
Fixes #1335
testport: do not check the parent directory of a port does not have Mk
The check originates from d72e70f and is not a comprehensive check that
directory is a valid port directory anyway. But it breaks a custom port
tree (built on top of FreeBSD ports) that has some internal Mk
directories.
Fixes: #1319
(cherry picked from commit 8cfc9bfbfe90d8ff00a67d3121bb9a255f8e48f0)
Conflicts:
src/share/poudriere/testport.sh
testport: do not check the parent directory of a port does not have Mk
The check originates from d72e70f and is not a comprehensive check that
directory is a valid port directory anyway. But it breaks a custom port
tree (built on top of FreeBSD ports) that has some internal Mk
directories.
Fixes: #1319
rquery: fix usage to be compatible with all pkg versions
(cherry picked from commit a4691fe33959b31c64ad5a38c1c992050968ff5e)
Conflicts:
src/share/poudriere/common.sh
Issue #1326
pkgbase: Fix building packages
When updating a jail we first make buildworld/buildkernel and then
we make update-packages.
Since the src.conf/make.conf is now clean after building, if a user have
some custom option in them make update-packages will not know this and will
try to build packages with some non-existant files.
Fixes: 256f4f17a120 ("jail -cu: Don't include build-time make.conf files into jail's clean snapshot")
(cherry picked from commit 50f21876f11ef7703494d3083715653b7df90fbd)
Conflicts:
src/share/poudriere/jail.sh
Issue #1317