Skip to content

Commit 4c37370

Browse files
authored
Merge pull request #1264 from conda-forge/beckermr-patch-1
DOC add info on os version
2 parents 8dd8e5a + 374173c commit 4c37370

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

src/maintainer/conda_forge_yml.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Top-level fields
3636
* linux
3737
* linux_aarch64
3838
* linux_ppc64le
39+
* os_version
3940
* osx
4041
* provider
4142
* recipe_dir
@@ -248,6 +249,16 @@ Currently only:
248249
linux_ppc64le:
249250
enabled: False
250251
252+
os_version
253+
----------
254+
This key is used to set the OS versions for ``linux_*`` platforms. Valid entries map a linux platform and arch to either ``cos6``
255+
or ``cos7``. Currently ``cos6`` is the default for ``linux-64``. All other linux architectures use CentOS 7. Here is an example that enables CentOS 7 on ``linux-64`` builds
256+
257+
.. code-block:: yaml
258+
259+
os_version:
260+
linux_64: cos7
261+
251262
osx
252263
---
253264
The macOSX-specific configuration options. This is largely an internal setting.

src/maintainer/knowledge_base.rst

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,23 +1065,13 @@ put the following in your build section.
10651065
- {{ compiler('c') }}
10661066
- sysroot_linux-64 2.17 # [linux64]
10671067
1068-
You also need to use a newer docker image by setting the following in the ``conda_build_config.yaml``
1068+
You also need to use a newer docker image by setting the following in the ``conda-forge.yml``
10691069
of your recipe and rerendering.
10701070

10711071
.. code-block:: yaml
10721072
1073-
cudnn: # [linux64]
1074-
- undefined # [linux64]
1075-
cuda_compiler_version: # [linux64]
1076-
- None # [linux64]
1077-
docker_image: # [linux64]
1078-
- condaforge/linux-anvil-cos7-x86_64 # [linux64]
1079-
cdt_name: # [linux64]
1080-
- cos7 # [linux64]
1081-
1082-
The extra ``cuda_compiler_version`` key is needed because we currently zip that
1083-
key with ``docker_image``. Also ``cdt_name`` ensures the CDTs match the CentOS
1084-
version. If this changes in the future, then this extra key may not be needed.
1073+
os_version:
1074+
linux_64: cos7
10851075
10861076
Finally, note that the ``aarch64`` and ``ppc64le`` platforms already use CentOS 7.
10871077

0 commit comments

Comments
 (0)