From 10c02afd9c5392d4673a96615bb65cd177e17a84 Mon Sep 17 00:00:00 2001 From: whitequark Date: Thu, 22 Feb 2018 07:22:22 +0000 Subject: [PATCH] conda: merge all board packages except sayma_rtm into one. Fixes #923. --- conda/artiq-board/build.sh | 9 +++++++ .../meta.yaml | 4 ++-- conda/artiq-kasli-master/build.sh | 9 ------- conda/artiq-kasli-master/meta.yaml | 23 ------------------ conda/artiq-kasli-opticlock/build.sh | 9 ------- conda/artiq-kasli-opticlock/meta.yaml | 23 ------------------ conda/artiq-kasli-satellite/build.sh | 9 ------- conda/artiq-kc705-nist_clock/build.sh | 9 ------- conda/artiq-kc705-nist_clock/meta.yaml | 23 ------------------ conda/artiq-kc705-nist_qc2/build.sh | 9 ------- conda/artiq-kc705-nist_qc2/meta.yaml | 23 ------------------ conda/artiq-sayma-standalone/build.sh | 13 ---------- conda/artiq-sayma-standalone/meta.yaml | 24 ------------------- 13 files changed, 11 insertions(+), 176 deletions(-) create mode 100644 conda/artiq-board/build.sh rename conda/{artiq-kasli-satellite => artiq-board}/meta.yaml (79%) delete mode 100644 conda/artiq-kasli-master/build.sh delete mode 100644 conda/artiq-kasli-master/meta.yaml delete mode 100644 conda/artiq-kasli-opticlock/build.sh delete mode 100644 conda/artiq-kasli-opticlock/meta.yaml delete mode 100644 conda/artiq-kasli-satellite/build.sh delete mode 100644 conda/artiq-kc705-nist_clock/build.sh delete mode 100644 conda/artiq-kc705-nist_clock/meta.yaml delete mode 100644 conda/artiq-kc705-nist_qc2/build.sh delete mode 100644 conda/artiq-kc705-nist_qc2/meta.yaml delete mode 100644 conda/artiq-sayma-standalone/build.sh delete mode 100644 conda/artiq-sayma-standalone/meta.yaml diff --git a/conda/artiq-board/build.sh b/conda/artiq-board/build.sh new file mode 100644 index 000000000..3b61b285e --- /dev/null +++ b/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} diff --git a/conda/artiq-kasli-satellite/meta.yaml b/conda/artiq-board/meta.yaml similarity index 79% rename from conda/artiq-kasli-satellite/meta.yaml rename to conda/artiq-board/meta.yaml index 2a23d1bc4..eb13cb0cd 100644 --- a/conda/artiq-kasli-satellite/meta.yaml +++ b/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' diff --git a/conda/artiq-kasli-master/build.sh b/conda/artiq-kasli-master/build.sh deleted file mode 100644 index 2189002d9..000000000 --- a/conda/artiq-kasli-master/build.sh +++ /dev/null @@ -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 diff --git a/conda/artiq-kasli-master/meta.yaml b/conda/artiq-kasli-master/meta.yaml deleted file mode 100644 index a25621b55..000000000 --- a/conda/artiq-kasli-master/meta.yaml +++ /dev/null @@ -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' diff --git a/conda/artiq-kasli-opticlock/build.sh b/conda/artiq-kasli-opticlock/build.sh deleted file mode 100644 index cceb4f7ff..000000000 --- a/conda/artiq-kasli-opticlock/build.sh +++ /dev/null @@ -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 diff --git a/conda/artiq-kasli-opticlock/meta.yaml b/conda/artiq-kasli-opticlock/meta.yaml deleted file mode 100644 index 9d1367546..000000000 --- a/conda/artiq-kasli-opticlock/meta.yaml +++ /dev/null @@ -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' diff --git a/conda/artiq-kasli-satellite/build.sh b/conda/artiq-kasli-satellite/build.sh deleted file mode 100644 index bae8ecedf..000000000 --- a/conda/artiq-kasli-satellite/build.sh +++ /dev/null @@ -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 diff --git a/conda/artiq-kc705-nist_clock/build.sh b/conda/artiq-kc705-nist_clock/build.sh deleted file mode 100644 index 402b0b18f..000000000 --- a/conda/artiq-kc705-nist_clock/build.sh +++ /dev/null @@ -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 diff --git a/conda/artiq-kc705-nist_clock/meta.yaml b/conda/artiq-kc705-nist_clock/meta.yaml deleted file mode 100644 index 1db897a6d..000000000 --- a/conda/artiq-kc705-nist_clock/meta.yaml +++ /dev/null @@ -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' diff --git a/conda/artiq-kc705-nist_qc2/build.sh b/conda/artiq-kc705-nist_qc2/build.sh deleted file mode 100644 index 03479e29f..000000000 --- a/conda/artiq-kc705-nist_qc2/build.sh +++ /dev/null @@ -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 diff --git a/conda/artiq-kc705-nist_qc2/meta.yaml b/conda/artiq-kc705-nist_qc2/meta.yaml deleted file mode 100644 index 009f0b630..000000000 --- a/conda/artiq-kc705-nist_qc2/meta.yaml +++ /dev/null @@ -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' diff --git a/conda/artiq-sayma-standalone/build.sh b/conda/artiq-sayma-standalone/build.sh deleted file mode 100644 index 065201ba1..000000000 --- a/conda/artiq-sayma-standalone/build.sh +++ /dev/null @@ -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 diff --git a/conda/artiq-sayma-standalone/meta.yaml b/conda/artiq-sayma-standalone/meta.yaml deleted file mode 100644 index 8450d3319..000000000 --- a/conda/artiq-sayma-standalone/meta.yaml +++ /dev/null @@ -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'