conda: merge all board packages except sayma_rtm into one.

Fixes #923.

conda/artiq-board/build.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+SOC_PREFIX=$SP_DIR/artiq/binaries/${ARTIQ_TARGET}-${ARTIQ_VARIANT}
+mkdir -p ${SOC_PREFIX}
+
+V=1 $PYTHON -m artiq.gateware.targets.${ARTIQ_TARGET} -V ${ARTIQ_VARIANT}
+cp artiq_${ARTIQ_TARGET}/${ARTIQ_VARIANT}/gateware/top.bit ${SOC_PREFIX}
+cp artiq_${ARTIQ_TARGET}/${ARTIQ_VARIANT}/software/bootloader/bootloader.bin ${SOC_PREFIX}
+cp artiq_${ARTIQ_TARGET}/${ARTIQ_VARIANT}/software/runtime/runtime.{elf,fbi} ${SOC_PREFIX}

conda/artiq-board/meta.yaml

@@ -1,5 +1,5 @@
 package:
-  name: artiq-kasli-satellite
+  name: artiq-{{ environ.get("ARTIQ_TARGET") }}-{{ environ.get("ARTIQ_VARIANT") }}
   version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
 
 source:
@@ -20,4 +20,4 @@ requirements:
 about:
   home: https://m-labs.hk/artiq
   license: LGPL
-  summary: 'Bitstream, BIOS and satellite manager for the Kasli DRTIO satellite'
+  summary: 'Bitstream, BIOS and runtime for the {{ environ.get("ARTIQ_TARGET") }}-{{ environ.get("ARTIQ_VARIANT") }} board variant'

conda/artiq-kasli-master/build.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-SOC_PREFIX=$SP_DIR/artiq/binaries/kasli-master
-mkdir -p $SOC_PREFIX
-
-V=1 $PYTHON -m artiq.gateware.targets.kasli -V master
-cp artiq_kasli/master/gateware/top.bit $SOC_PREFIX
-cp artiq_kasli/master/software/bootloader/bootloader.bin $SOC_PREFIX
-cp artiq_kasli/master/software/runtime/runtime.{elf,fbi} $SOC_PREFIX

conda/artiq-kasli-master/meta.yaml

@@ -1,23 +0,0 @@
-package:
-  name: artiq-kasli-master
-  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
-
-source:
-  git_url: ../..
-
-build:
-  noarch: python
-  ignore_prefix_files: True
-  number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
-  string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }}
-
-requirements:
-  build:
-    - artiq-dev {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-  run:
-    - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-
-about:
-  home: https://m-labs.hk/artiq
-  license: LGPL
-  summary: 'Bitstream, BIOS and runtime for the Kasli DRTIO master'

conda/artiq-kasli-opticlock/build.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-SOC_PREFIX=$SP_DIR/artiq/binaries/kasli-opticlock
-mkdir -p $SOC_PREFIX
-
-V=1 $PYTHON -m artiq.gateware.targets.kasli -V opticlock
-cp artiq_kasli/opticlock/gateware/top.bit $SOC_PREFIX
-cp artiq_kasli/opticlock/software/bootloader/bootloader.bin $SOC_PREFIX
-cp artiq_kasli/opticlock/software/runtime/runtime.{elf,fbi} $SOC_PREFIX

conda/artiq-kasli-opticlock/meta.yaml

@@ -1,23 +0,0 @@
-package:
-  name: artiq-kasli-opticlock
-  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
-
-source:
-  git_url: ../..
-
-build:
-  noarch: python
-  ignore_prefix_files: True
-  number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
-  string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }}
-
-requirements:
-  build:
-    - artiq-dev {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-  run:
-    - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-
-about:
-  home: https://m-labs.hk/artiq
-  license: LGPL
-  summary: 'Bitstream, BIOS and runtime for the opticlock variant of Kasli'

conda/artiq-kasli-satellite/build.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-SOC_PREFIX=$SP_DIR/artiq/binaries/kasli-satellite
-mkdir -p $SOC_PREFIX
-
-V=1 $PYTHON -m artiq.gateware.targets.kasli -V satellite
-cp artiq_kasli/satellite/gateware/top.bit $SOC_PREFIX
-cp artiq_kasli/satellite/software/bootloader/bootloader.bin $SOC_PREFIX
-cp artiq_kasli/satellite/software/satman/satman.{elf,fbi} $SOC_PREFIX

conda/artiq-kc705-nist_clock/build.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-SOC_PREFIX=$SP_DIR/artiq/binaries/kc705-nist_clock
-mkdir -p $SOC_PREFIX
-
-V=1 $PYTHON -m artiq.gateware.targets.kc705 -V nist_clock
-cp artiq_kc705/nist_clock/gateware/top.bit $SOC_PREFIX
-cp artiq_kc705/nist_clock/software/bootloader/bootloader.bin $SOC_PREFIX
-cp artiq_kc705/nist_clock/software/runtime/runtime.{elf,fbi} $SOC_PREFIX

conda/artiq-kc705-nist_clock/meta.yaml

@@ -1,23 +0,0 @@
-package:
-  name: artiq-kc705-nist_clock
-  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
-
-source:
-  git_url: ../..
-
-build:
-  noarch: python
-  ignore_prefix_files: True
-  number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
-  string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }}
-
-requirements:
-  build:
-    - artiq-dev {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-  run:
-    - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-
-about:
-  home: https://m-labs.hk/artiq
-  license: LGPL
-  summary: 'Bitstream, BIOS and runtime for NIST_CLOCK on the KC705 board'

conda/artiq-kc705-nist_qc2/build.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-SOC_PREFIX=$SP_DIR/artiq/binaries/kc705-nist_qc2
-mkdir -p $SOC_PREFIX
-
-V=1 $PYTHON -m artiq.gateware.targets.kc705 -V nist_qc2
-cp artiq_kc705/nist_qc2/gateware/top.bit $SOC_PREFIX
-cp artiq_kc705/nist_qc2/software/bootloader/bootloader.bin $SOC_PREFIX
-cp artiq_kc705/nist_qc2/software/runtime/runtime.{elf,fbi} $SOC_PREFIX

conda/artiq-kc705-nist_qc2/meta.yaml

@@ -1,23 +0,0 @@
-package:
-  name: artiq-kc705-nist_qc2
-  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
-
-source:
-  git_url: ../..
-
-build:
-  noarch: python
-  ignore_prefix_files: True
-  number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
-  string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }}
-
-requirements:
-  build:
-    - artiq-dev {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-  run:
-    - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-
-about:
-  home: https://m-labs.hk/artiq
-  license: LGPL
-  summary: 'Bitstream, BIOS and runtime for NIST_QC2 on the KC705 board'

conda/artiq-sayma-standalone/build.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-RTM_PREFIX=$SP_DIR/artiq/binaries/sayma_rtm
-
-SOC_PREFIX=$SP_DIR/artiq/binaries/sayma-standalone
-mkdir -p $SOC_PREFIX
-
-$PYTHON -m artiq.gateware.targets.sayma_amc -V standalone \
-  --rtm-csr-csv $RTM_PREFIX/rtm_csr.csv
-cp artiq_sayma/standalone/gateware/top.bit $SOC_PREFIX
-cp artiq_sayma/standalone/software/bootloader/bootloader.bin $SOC_PREFIX
-cp artiq_sayma/standalone/software/runtime/runtime.{elf,fbi} $SOC_PREFIX
-cp $RTM_PREFIX/rtm.bit $SOC_PREFIX

conda/artiq-sayma-standalone/meta.yaml

@@ -1,24 +0,0 @@
-package:
-  name: artiq-sayma-standalone
-  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
-
-source:
-  git_url: ../..
-
-build:
-  noarch: python
-  ignore_prefix_files: True
-  number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
-  string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }}
-
-requirements:
-  build:
-    - artiq-dev {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-    - artiq-sayma_rtm {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-  run:
-    - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-
-about:
-  home: https://m-labs.hk/artiq
-  license: LGPL
-  summary: 'Bitstream, BIOS and runtime for stand-alone Sayma AMC'