occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

conda: mark the artiq-build output package as noarch, not toplevel. 

This also changes `noarch: python` to `noarch: generic` since
this is semantically correct; the bitstream/firmware packages
contain no Python code.

Fixes #960.
This commit is contained in:
whitequark 2018-03-15 23:16:51 +00:00
parent 4b5a78e231
commit c4bfc83b38
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conda/artiq-board/meta.yaml
View File

@ -6,7 +6,6 @@ source:
git_url: ../.. git_url: ../..
build: build:
noarch: python
number: {{ environ["GIT_DESCRIBE_NUMBER"] }} number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }} string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
script_env: script_env:
@ -16,6 +15,7 @@ build:
outputs: outputs:
- name: artiq-{{ environ["ARTIQ_TARGET"] }}-{{ environ["ARTIQ_VARIANT"] }} - name: artiq-{{ environ["ARTIQ_TARGET"] }}-{{ environ["ARTIQ_VARIANT"] }}
noarch: generic
files: files:
- lib - lib