|
1 | 1 | #!/usr/bin/env python3
|
2 | 2 |
|
3 |
| -# Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC") |
| 3 | +# Copyright (C) 2018-2025 Internet Systems Consortium, Inc. ("ISC") |
4 | 4 | #
|
5 | 5 | # This Source Code Form is subject to the terms of the Mozilla Public
|
6 | 6 | # License, v. 2.0. If a copy of the MPL was not distributed with this
|
@@ -552,7 +552,7 @@ def install_pkgs(pkgs, timeout=60, env=None, check_times=False, pkg_cache=None):
|
552 | 552 | env['DEBIAN_FRONTEND'] = 'noninteractive'
|
553 | 553 | cmd = 'sudo apt install --no-install-recommends -y'
|
554 | 554 | elif system == 'freebsd':
|
555 |
| - cmd = 'sudo pkg install -y' |
| 555 | + cmd = 'sudo pkg install --no-repo-update --yes' |
556 | 556 | elif system == 'alpine':
|
557 | 557 | cmd = 'sudo apk add'
|
558 | 558 | elif system == 'arch':
|
@@ -1021,7 +1021,7 @@ def prepare_system(self):
|
1021 | 1021 | self.execute("sudo dnf install -y python36 rpm-build python3-virtualenv", attempts=3)
|
1022 | 1022 | elif self.system == 'freebsd':
|
1023 | 1023 | if self.revision.startswith('13'):
|
1024 |
| - self.execute("sudo pkg install -y python3", attempts=3) |
| 1024 | + self.execute("sudo pkg install --no-repo-update --yes python3", attempts=3) |
1025 | 1025 |
|
1026 | 1026 | # select proper python version for running Hammer inside Vagrant system
|
1027 | 1027 | if self.system == 'freebsd':
|
@@ -1960,13 +1960,6 @@ def link_pg_config():
|
1960 | 1960 |
|
1961 | 1961 | # prepare freebsd
|
1962 | 1962 | elif system == 'freebsd':
|
1963 |
| - # Packages are already upgraded by default when installing a package, |
1964 |
| - # so to avoid mismatching dependency versions, inaccurate dynamic |
1965 |
| - # version fetching and other troubles, clean up local cache and |
1966 |
| - # install an arbitrary package to fetch remote first. |
1967 |
| - execute('sudo pkg clean -a -y') |
1968 |
| - execute('sudo pkg install -y pkg') |
1969 |
| - |
1970 | 1963 | packages = ['autoconf', 'automake', 'bison', 'flex', 'libtool', 'openssl', 'log4cplus', 'boost-libs', 'wget']
|
1971 | 1964 |
|
1972 | 1965 | if revision.startswith('14'):
|
|
0 commit comments