Fix make dist*.
Automake 1.18 changed the tar detection logic and now defaults to
'ustar'. That format is fine but it results in an empty `am_tar` value
which breaks `make dist*`.
Revert to the old working v7 code/format.
Fix make dist*.
Automake 1.18 changed the tar detection logic and now defaults to
'ustar'. That format is fine but it results in an empty `am_tar` value
which breaks `make dist*`.
Revert to the old working v7 code/format.
(cherry picked from master)
rollbackfs/do_clone_del: Don't force rewrite every file.
cpdup -f forces every file to be rewritten. Using -V is what was
intended in commit 5ada0a83f. But mtime+size is enough for our
purposes so just do to that.
(cherry picked from commit e2d4bee586ede82e31e3a79eda16afec361f0741)
jail -bB UX updates
- poudriere-jail.8: Clarify when -b and -B should be used.
- jail -b: Add validations that -b is only used with `-m src=`
- jail -m src -u: Check if a build was done and give a hint about -b.
- jail -B -u: Make -B a no-op. It is remembered from jail creation.
- jail -B: Add validations that -B is only used with:
* `-b -m src=`
* `-m git` (`-b` is implied and a no-op)
* `-m svn` (`-b` is implied and a no-op)
- We could make `-B -m src=` imply -b but it makes sense to reserve a possible
future behavior of allowing a pre-built pkgbase to be installed
with `-m src`.
- When updating a jail created with -B, we don't need -K passed in again
as it is already known and looked up from the jail info.
Fixes #1231
Fixes #1243
[4 lines not shown]
rollbackfs/do_clone_del: Don't force rewrite every file.
cpdup -f forces every file to be rewritten. Using -V is what was
intended in commit 5ada0a83f. But mtime+size is enough for our
purposes so just do to that.
jail -bB UX updates
- poudriere-jail.8: Clarify when -b and -B should be used.
- jail -b: Add validations that -b is only used with `-m src=`
- jail -m src -u: Check if a build was done and give a hint about -b.
- jail -B -u: Make -B a no-op. It is remembered from jail creation.
- jail -B: Add validations that -B is only used with:
* `-b -m src=`
* `-m git` (`-b` is implied and a no-op)
* `-m svn` (`-b` is implied and a no-op)
- We could make `-B -m src=` imply -b but it makes sense to reserve a possible
future behavior of allowing a pre-built pkgbase to be installed
with `-m src`.
- When updating a jail created with -B, we don't need -K passed in again
as it is already known and looked up from the jail info.
Fixes #1231
Fixes #1243
Merge branch 'pr-1180-release-3.4' into release-3.4
Fixes #1242
Issue #1180
* pr-1180-release-3.4:
jail: Exit with an error if pkg-update(8) fails
jail.sh: uneeded (typo)
jail: Use the right arch for a pkgbase jail
jail: Exit with an error if pkg-update(8) fails
Exit with an error if pkg update fails, for example when the jail is
empty (with only pkg repo configured).
(cherry picked from commit 364c1d2081ff4bd9405c9c277c58da2c60b949fa)
jail.sh: uneeded (typo)
Spelling: uneeded should be unneeded.
(cherry picked from commit ab499733b6d0eb6dd4df46b8a414cb20f8ee4a22)
Conflicts:
src/share/poudriere/jail.sh
jail: Use the right arch for a pkgbase jail
This is currently a problem for anything not amd64 when building pkgbase
jails. Strip the `ARCH` and use only what corresponds to `TARGET_ARCH`.
(cherry picked from commit ec991af0c789bf98737f6c2206e62646b2de6f25)
Conflicts:
src/share/poudriere/jail.sh
Do not run make in jails without src
install_world() calls `make delete-old delete-old-libs`, but a jail
created with upstream pkgbase does not have src and so the command
fails. pkg removes any unneeded files, so there's no need to
delete-old on upstream pkgbase jails.
Signed-off-by: Pat Maddox <pat at patmaddox.com>
Change-Id: Ic11f82d89e6059032138fb73ccb2b2ad6a6a6964
Always set a higher priority for repo overrides
Two configuration files for the same repository, with the same priority
(default to 0) but with a different values for `enabled` result in the
actual value of `enabled` to be dependent of the order of evaluation of
the files. This is likely to cause problem one day. Make sure we set
an explicit priority when overriding repositories.
While here, use conistent syntax/style for the configuration files.
(cherry picked from commit e98aa071fa116c61ef3e7c072bb7f84db4426074)
Conflicts:
src/share/poudriere/common.sh
