From 832fb139a0a7076d50a63c29b2ebe02bf07ea8af Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 15 Jun 2017 15:58:09 +0800 Subject: [PATCH] Revert "conda: use new noarch system for board packages as well" Never missing an opportunity to be awful, conda helps itself with the .fbi files and merrily patches the strings inside them that contain paths resembling the conda build folder, resulting of course in corrupption and CRC errors. This reverts commit c856b225790f2c2a04ab37b4f69858c4ba641ac3. --- conda/artiq-kc705-nist_clock/meta.yaml | 2 +- conda/artiq-kc705-nist_qc2/meta.yaml | 2 +- conda/artiq-kc705-phaser/meta.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/artiq-kc705-nist_clock/meta.yaml b/conda/artiq-kc705-nist_clock/meta.yaml index 47111dbb2..ed7c3b320 100644 --- a/conda/artiq-kc705-nist_clock/meta.yaml +++ b/conda/artiq-kc705-nist_clock/meta.yaml @@ -6,7 +6,7 @@ source: git_url: ../.. build: - noarch: generic + noarch_python: true number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }} diff --git a/conda/artiq-kc705-nist_qc2/meta.yaml b/conda/artiq-kc705-nist_qc2/meta.yaml index 9e545a830..e54280cf5 100644 --- a/conda/artiq-kc705-nist_qc2/meta.yaml +++ b/conda/artiq-kc705-nist_qc2/meta.yaml @@ -6,7 +6,7 @@ source: git_url: ../.. build: - noarch: generic + noarch_python: true number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }} diff --git a/conda/artiq-kc705-phaser/meta.yaml b/conda/artiq-kc705-phaser/meta.yaml index 5cfc26335..41465da74 100644 --- a/conda/artiq-kc705-phaser/meta.yaml +++ b/conda/artiq-kc705-phaser/meta.yaml @@ -6,7 +6,7 @@ source: git_url: ../.. build: - noarch: generic + noarch_python: true number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }}