FreeBSD/poudriere 2634d29 — src/share/poudriere image_zsnapshot.sh

image -t zsnapshot: Remove stale files from the previous image

With -i, files removed from the world were left behind in the new image.

Fixes: dd61d5134c ("do_clone: Stop overwriting - move that to do_clone_del")
(cherry picked from commit c10dc9a7fc71d6049254c39a5ad71b91886cb1c0)

Conflicts:
        src/share/poudriere/image_zsnapshot.sh
DeltaFile
+1-1src/share/poudriere/image_zsnapshot.sh
+1-11 files

FreeBSD/poudriere 6af2445 — src/share/poudriere jail.sh

jail -u -m src=: Remove stale files from the /usr/src copy

Files removed from the src tree were left behind in the jail's /usr/src.

Issue #1299
Fixes: dd61d5134c ("do_clone: Stop overwriting - move that to do_clone_del")

(cherry picked from commit 0ceb8092c18377bd45e69baa581e2a214b9cae2b)

Conflicts:
        src/share/poudriere/jail.sh
DeltaFile
+4-2src/share/poudriere/jail.sh
+4-21 files

FreeBSD/poudriere 6083094 — src/share/poudriere jail.sh, src/share/poudriere/include fs.sh

install_from_src, clonefs: Check mktemp and quote cpignore paths

Drop unneeded -u to mktemp.
DeltaFile
+5-4src/share/poudriere/jail.sh
+4-3src/share/poudriere/include/fs.sh
+9-72 files

FreeBSD/poudriere 6b2c433 — src/share/poudriere jail.sh

install_from_src: Initialize cpignore locals
DeltaFile
+2-0src/share/poudriere/jail.sh
+2-01 files

FreeBSD/poudriere a848a69 — src/share/poudriere jail.sh

jail -m src=: Check SRC_BASE for a user-supplied .cpignore

cpdup -x reads .cpignore from the source tree, not the jail's copy.

Fixes: 3c7cf843ac ("jail -c -m src: Respect existing .cpignore properly")
DeltaFile
+2-1src/share/poudriere/jail.sh
+2-11 files

FreeBSD/poudriere c10dc9a — src/share/poudriere image_zsnapshot.sh

image -t zsnapshot: Remove stale files from the previous image

With -i, files removed from the world were left behind in the new image.

Fixes: dd61d5134c ("do_clone: Stop overwriting - move that to do_clone_del")
DeltaFile
+1-1src/share/poudriere/image_zsnapshot.sh
+1-11 files

FreeBSD/poudriere 0ceb809 — src/share/poudriere jail.sh

jail -u -m src=: Remove stale files from the /usr/src copy

Files removed from the src tree were left behind in the jail's /usr/src.

Issue #1299
Fixes: dd61d5134c ("do_clone: Stop overwriting - move that to do_clone_del")
DeltaFile
+1-1src/share/poudriere/jail.sh
+1-11 files

FreeBSD/poudriere ba4466e — src/share/poudriere jail.sh

jail: Fix when updating a pkgbase jail the version is never updated

Fixes #1291
PR #1395

(cherry picked from commit dbf89c7ce079b2c80a7de7ba5b724711d1f34960)
DeltaFile
+1-0src/share/poudriere/jail.sh
+1-01 files

FreeBSD/poudriere 77afa83 — src/share/poudriere jail.sh

Merge pull request #1395 from brd/jail-upgrade-pkgbase-update-version

jail: Fix when updating a pkgbase jail the version is never updated
DeltaFile
+1-0src/share/poudriere/jail.sh
+1-01 files

FreeBSD/poudriere 77d1c4a — test git_tree_dirty.sh git_get_hash_and_dirty.sh

Merge pull request #1391 from svmhdvn/push-zwxvmoqspnvk

test/git*: use 'cp -R' to copy portstree to tmpdir
DeltaFile
+10-0test/common.sh
+1-6test/git_tree_dirty.sh
+1-6test/git_get_hash_and_dirty.sh
+12-123 files

FreeBSD/poudriere 2cb459d — src/man poudriere-jail.8

poudriere-jail.8: Now there are pkgbase src packages so remove outdated line

(cherry picked from commit fd8e1fd46b7085268fc3c14dc4c4be6ea8697d0d)

Conflicts:
        src/man/poudriere-jail.8

PR #1394
DeltaFile
+1-4src/man/poudriere-jail.8
+1-41 files

FreeBSD/poudriere f178781 — src/man poudriere-jail.8

Merge pull request #1394 from brd/jail-8-pkgbase-src-exists

poudriere-jail.8: Now there are pkgbase src packages so remove outdated info
DeltaFile
+1-4src/man/poudriere-jail.8
+1-41 files

FreeBSD/poudriere 7c46213 — test runtest.sh

runtests: Quick needs more than 120 without ccache
DeltaFile
+1-1test/runtest.sh
+1-11 files

FreeBSD/poudriere 4031930 — src/share/poudriere jail.sh

Merge PR #1400

jail: When creating or upgrading a pkgbase jail support -v properly
DeltaFile
+28-7src/share/poudriere/jail.sh
+28-71 files

FreeBSD/poudriere 2c3f86e — test-ports/omnibus/ports-mgmt/poudriere-devel-IGNORED-and-skipped/files patch-Makefile.in, test-ports/omnibus/ports-mgmt/poudriere-devel-IGNORED/files patch-Makefile.in

Merge remote-tracking branch 'origin/master' into pr-1400

Conflicts:
        src/share/poudriere/jail.sh
DeltaFile
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-dep-INVALID/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-dep-IGNORED/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-dep-FOO/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-dep-DEFAULT/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-IGNORED/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-IGNORED-and-skipped/files/patch-Makefile.in
+192-018 files not shown
+600-2024 files

FreeBSD/poudriere 2f31816 — src/share/poudriere jail.sh

_pkgbase_get_osversion: avoid pipefail
DeltaFile
+3-1src/share/poudriere/jail.sh
+3-11 files

FreeBSD/poudriere 2fcdf78 — src/share/poudriere jail.sh

Merge pull request #1408 from skhal/skip-pkg-repo-update-in-pkg-install

jail.sh: skip repo update when install packages in pkgbase
DeltaFile
+3-3src/share/poudriere/jail.sh
+3-31 files

FreeBSD/poudriere b0f0c86 — src/share/poudriere jail.sh ports.sh

Merge pull request #1386 from michael-o/fix-ptname-hyphen-warning-v2

ports, jail: Warn instead of erroring on hyphenated PTNAME/JAILNAME
DeltaFile
+13-5src/share/poudriere/common.sh
+1-3src/share/poudriere/ports.sh
+2-0src/share/poudriere/jail.sh
+16-83 files

FreeBSD/poudriere 828228e — src/share/poudriere jail.sh ports.sh

ports, jail: Warn instead of erroring on hyphenated PTNAME/JAILNAME

Downgrade the ports-tree hyphen check from a hard err() to a warning,
consistent with the existing SETNAME hyphen warning. Extract the
hyphen check into a shared check_name_hyphen() helper in common.sh and
apply it uniformly at the point each identifier is established:
jail creation, jail rename, and ports tree creation. SETNAME keeps its
existing call in jail_start(), since a set has no separate creation
step -- its first use in a build is effectively its creation.

The warning intentionally doesn't name a specific mechanism (e.g. the
previous "-z" claim for ports tree names): no code path splits a
hyphenated name back into components during normal creation or build
handling. The only place a joined name is ever decomposed is
for_each_build()'s fallback for build logs predating separate
jailname/ptname/setname metadata (2013, a2300607), which no longer
applies to any name established from this point forward. Warning only
at creation time reflects that once a name exists, cautioning about it
again on every later build is not actionable.

    [2 lines not shown]
DeltaFile
+13-5src/share/poudriere/common.sh
+1-3src/share/poudriere/ports.sh
+2-0src/share/poudriere/jail.sh
+16-83 files

FreeBSD/poudriere 3a76942 — test common.bulk.sh

tests: use 14.5-RELEASE for test jail

This fixes `make check`.

(cherry picked from commit a2dbc12484f41cc482f1caa2d0c1cb0e022270f7)

Conflicts:
        test/common.bulk.sh
DeltaFile
+1-1test/common.bulk.sh
+1-11 files

FreeBSD/poudriere 5ba8498 — test common.bulk.sh

Merge pull request #1390 from svmhdvn/push-kqnxkmstkppm

tests: use 14.5-RELEASE for test jail
DeltaFile
+1-1test/common.bulk.sh
+1-11 files

FreeBSD/poudriere 2fb00ef — test-ports/omnibus/ports-mgmt/poudriere-devel-IGNORED-and-skipped/files patch-Makefile.in, test-ports/omnibus/ports-mgmt/poudriere-devel-IGNORED/files patch-Makefile.in

test-ports: backport bmake .ALLSRC fix to poudriere-devel 3.1.99.20170601

(cherry picked from commit 049e16ed897381f7d99aba9e35efd2ac1af7bc7b)
DeltaFile
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-dep-FOO/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-dep-DEFAULT/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-IGNORED/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-IGNORED-and-skipped/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-dep-INVALID/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-dep-IGNORED/files/patch-Makefile.in
+192-012 files not shown
+567-018 files

FreeBSD/poudriere f8fb8c4 — test-ports/omnibus/ports-mgmt/poudriere-devel-IGNORED-and-skipped/files patch-Makefile.in, test-ports/omnibus/ports-mgmt/poudriere-devel-IGNORED/files patch-Makefile.in

Merge pull request #1392 from svmhdvn/push-vwuxomrswrvz

test-ports: backport bmake .ALLSRC fix to poudriere-devel
DeltaFile
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-dep-FOO/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-dep-IGNORED/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-dep-INVALID/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-IGNORED/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-IGNORED-and-skipped/files/patch-Makefile.in
+32-0test-ports/omnibus/ports-mgmt/poudriere-devel-dep-DEFAULT/files/patch-Makefile.in
+192-012 files not shown
+567-018 files

FreeBSD/poudriere 7edaef6 — src/share/poudriere jail.sh

jail.sh: skip repo update when install packages in pkgbase

pkg-install(8) manual states that the command updates pkg repositories
unless it is told not to do so:

- use `-U` flag
- set flag `REPO_AUTOUPDATE=no`

`install_from_pkgbase` first updates the repositories and then installs
base + other packages with pkg-install(8).

This change disables the repository update in pkg-install(8)

NO_ISSUE
DeltaFile
+3-3src/share/poudriere/jail.sh
+3-31 files

FreeBSD/poudriere 3b268b3 — test logging.sh

Merge pull request #1406 from svmhdvn/push-mtxkkmnlwyxk

test/logging.sh: fix check_pids on wrong PID
DeltaFile
+3-1test/logging.sh
+3-11 files

FreeBSD/poudriere ccd5816 — test logging.sh

test/logging.sh: fix check_pids on wrong PID
DeltaFile
+3-1test/logging.sh
+3-11 files

FreeBSD/poudriere eedabab — test locked_mkdir.sh

Merge pull request #1405 from svmhdvn/push-pwrvvtmkzwqk

test/locked_mkdir.sh: fix test run with an unprivileged user
DeltaFile
+6-3test/locked_mkdir.sh
+6-31 files

FreeBSD/poudriere f977888 — test locked_mkdir.sh

test/locked_mkdir.sh: fix test run with an unprivileged user
DeltaFile
+6-3test/locked_mkdir.sh
+6-31 files

FreeBSD/poudriere abeb1b2 — src/share/poudriere common.sh

Merge pull request #1403 from skhal/print-jail-params-in-jstart-err-message

common.sh: fix variable escapes in failed jstart error messages
DeltaFile
+4-4src/share/poudriere/common.sh
+4-41 files

FreeBSD/poudriere 9aaca98 — src/share/poudriere common.sh

common.sh: fix variable escapes in failed jstart error messages

A failed jstart error message includes jail parameters. This change
fixes the message to output actual values for `network` and
`JAIL_PARAMS`:

    [00:00:05] [05] [00:00:00] Error: /usr/local/share/poudriere/bulk.sh:jstart:23:jstart: Failed to start jail 151amd64-default-job-05 network='ip4.addr=127.0.0.1 ip6.addr=::1' JAIL_PARAMS='allow.chflags allow.mlock'

instead of old, invalid line:

    [00:00:05] [05] [00:00:00] Error: /usr/local/share/poudriere/bulk.sh:jstart:23:jstart: Failed to start jail 151amd64-default-job-05 network=${network} JAIL_PARAMS=${JAIL_PARAMS}

NO_ISSUE
DeltaFile
+4-4src/share/poudriere/common.sh
+4-41 files