From d64d962c3e9cd1fb85584b81c275c484cd571b0c Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Mon, 4 Jan 2016 16:52:53 -0700 Subject: [PATCH] remove redundant udev rules, update entry points --- conda/artiq/build.sh | 10 ---------- conda/artiq/meta.yaml | 1 + misc/99-kc705.rules | 2 -- misc/99-papilio.rules | 1 - setup.py | 1 + 5 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 misc/99-kc705.rules delete mode 100644 misc/99-papilio.rules diff --git a/conda/artiq/build.sh b/conda/artiq/build.sh index 1bbc544de..b2b5e3dd0 100755 --- a/conda/artiq/build.sh +++ b/conda/artiq/build.sh @@ -3,13 +3,3 @@ ARTIQ_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq $PYTHON setup.py install --single-version-externally-managed --record=record.txt - -# install scripts - -cp artiq/frontend/artiq_flash.sh $PREFIX/bin - -# install udev rules - -mkdir -p $ARTIQ_PREFIX/misc -cp misc/99-papilio.rules $ARTIQ_PREFIX/misc/ -cp misc/99-kc705.rules $ARTIQ_PREFIX/misc/ diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index 3670c0076..e486c3d95 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -22,6 +22,7 @@ build: - artiq_mkfs = artiq.frontend.artiq_mkfs:main - artiq_rpctool = artiq.frontend.artiq_rpctool:main - artiq_run = artiq.frontend.artiq_run:main + - artiq_flash = artiq.frontend.artiq_flash:main - lda_controller = artiq.frontend.lda_controller:main - novatech409b_controller = artiq.frontend.novatech409b_controller:main - pdq2_client = artiq.frontend.pdq2_client:main diff --git a/misc/99-kc705.rules b/misc/99-kc705.rules deleted file mode 100644 index d67f64afd..000000000 --- a/misc/99-kc705.rules +++ /dev/null @@ -1,2 +0,0 @@ -ATTR{idVendor}=="1443", MODE:="666" -ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Digilent", MODE:="666" diff --git a/misc/99-papilio.rules b/misc/99-papilio.rules deleted file mode 100644 index aae2a97c1..000000000 --- a/misc/99-papilio.rules +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", MODE="0666" diff --git a/setup.py b/setup.py index 1a9b8516b..c68b6c04c 100755 --- a/setup.py +++ b/setup.py @@ -32,6 +32,7 @@ scripts = [ "artiq_mkfs=artiq.frontend.artiq_mkfs:main", "artiq_rpctool=artiq.frontend.artiq_rpctool:main", "artiq_run=artiq.frontend.artiq_run:main", + "artiq_flash=artiq.frontend.artiq_flash:main", "lda_controller=artiq.frontend.lda_controller:main", "novatech409b_controller=artiq.frontend.novatech409b_controller:main", "pdq2_client=artiq.frontend.pdq2_client:main",