Skip to content

Commit a0c8775

Browse files
unixlabspraiskup
authored andcommitted
configs: Navy Linux 8 configuration fixes
Fixes: #1538 Closes: #1550
1 parent 89867dd commit a0c8775

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

docs/Mock-Core-Configs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ distribution.
5555
| [Fedora](https://fedoraproject.org/) | `fedora-*` | [Mock team][] | [Issues](https://github.com/rpm-software-management/mock/issues) |
5656
| [Kylin](https://kylinos.cn/) | `kylin-*` | [@scaronni](https://github.com/scaronni) | NA |
5757
| [Mageia](https://www.mageia.org/en/) | `mageia-*` | [@Conan-Kudo](https://github.com/Conan-Kudo) | [Issues](https://bugs.mageia.org/) |
58-
| [Navy Linux](https://navylinux.org/) | `navy-*` | N/A | N/A |
58+
| [Navy Linux](https://navylinux.org/) | `navy-*` | [@unixlabs](https://github.com/unixlabs) | [issues](https://github.com/navy-linux/issue-tracker/issues) |
5959
| [openEuler](https://www.openeuler.org/en/) | `openeuler-*` | [@Yikun](https://github.com/Yikun) | NA |
6060
| [OpenMandriva](https://www.openmandriva.org/) | `openmandriva-*` | [berolinux](https://github.com/berolinux) | [Issues](https://github.com/OpenMandrivaAssociation/distribution/issues) |
6161
| [openSUSE](https://www.opensuse.org/) | `opensuse-*` | [@Conan-Kudo](https://github.com/Conan-Kudo), [@lkocman](https://github.com/lkocman) | [Issues](https://bugzilla.opensuse.org/) |
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
config_opts['root'] = 'navy-8-x86_64'
2+
config_opts['target_arch'] = 'x86_64'
3+
config_opts['legal_host_arches'] = ('x86_64',)
4+
5+
include('templates/navy-8.tpl')
6+
include('templates/epel-8.tpl')

mock-core-configs/etc/mock/templates/navy-8.tpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ config_opts['releasever'] = '8'
44
config_opts['package_manager'] = 'dnf'
55
config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
66
config_opts['description'] = 'Navy Linux {{ releasever }}'
7-
# FIXME: this might soon stop working because the image is 8.4, see
8-
# https://github.com/rpm-software-management/mock/issues/1171
97
config_opts['bootstrap_image'] = 'docker.io/navylinux/navylinux:latest'
108

119
config_opts['dnf.conf'] = """

mock-core-configs/mock-core-configs.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ BuildArch: noarch
2222
Provides: mock-configs
2323

2424
# distribution-gpg-keys contains GPG keys used by mock configs
25-
Requires: distribution-gpg-keys >= 1.109
25+
Requires: distribution-gpg-keys >= 1.110
2626
# specify minimal compatible version of mock
2727
Requires: mock >= 5.4.post1
2828
Requires: mock-filesystem
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Navy Linux 8 configuration [fixed][issue#1538]

0 commit comments

Comments
 (0)