* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/arduino-builder/, dev-embedded/arduino-builder/files/
@ 2018-03-06 19:59 Amy Liffey
0 siblings, 0 replies; 3+ messages in thread
From: Amy Liffey @ 2018-03-06 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 6f7c88534233109f8f50dab0fbdc6adb5ae8add0
Author: Virgil Dupras <hsoft <AT> hardcoded <DOT> net>
AuthorDate: Mon Feb 12 20:23:28 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Mar 6 19:58:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f7c8853
dev-embedded/arduino-builder: add package
This package is needed for the bump to dev-embedded/arduino to 1.8.5.
Mostly based on maurerpe's fine work at
https://github.com/maurerpe/arduino-overlay/tree/master/dev-embedded/arduino-builder
but with a "vendor" approach to golang dependencies.
Bug: https://bugs.gentoo.org/525882
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-embedded/arduino-builder/Manifest | 4 ++
.../arduino-builder/arduino-builder-1.3.25.ebuild | 79 ++++++++++++++++++++++
.../arduino-builder-1.3.25-platform-paths.patch | 19 ++++++
dev-embedded/arduino-builder/metadata.xml | 11 +++
4 files changed, 113 insertions(+)
diff --git a/dev-embedded/arduino-builder/Manifest b/dev-embedded/arduino-builder/Manifest
new file mode 100644
index 00000000000..0f558b37b90
--- /dev/null
+++ b/dev-embedded/arduino-builder/Manifest
@@ -0,0 +1,4 @@
+DIST arduino-builder-1.3.25.tar.gz 206905 BLAKE2B 6770b89607c1563b68a79d34e6e214586106c63a4b3c854b4f85a4b9eb2fc24ce5d4a97c29b0c05c19b6834e103f3c3c574bd8cefed0eb684d8aab7e4c71ee7f SHA512 3740530800f8a3cfe1fe20a91579e6b632b76c2c4ace68c7b178a2d234032d5887abee3d0360c3039f2fec912a0d5cabe948bf930a7d9ea23221625456ad5357
+DIST github.com-go-errors-errors-a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz 7835 BLAKE2B f4092b4ef5ebf996cb3c20183868dbdd154ea7cf02a4fd5a3375a3193e9ccacad08f0b6681b456786524b729ffb8c0b5c8af6ceec630eec22326d0fe1e00eb22 SHA512 b1d5e7c6f30f94f8a41b10d32b7f4ce7de8394f74ede6c14fb1f267a0514b24bc3bc7659c3baf6eacf424cea8451e7e57f5f72acc568342e90a447bd02f3e262
+DIST github.com-jstemmer-go-junit-report-833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz 6901 BLAKE2B 6138ac40810ad000a4336ffbca3bc5c1d0e96854c7918fb2aad9f7b2596ac66f285ac8c519e30b6e97cdb0009b31ab73b83ff2e1db2f464c2d88f2c1045a6bd9 SHA512 00f38f51c5f761b5a3e60a6e6b602f1246a746f081f2d8946d01387234270544692c6af54d0e69919c1af8aa753f848eeecc4421f2ddf881f21522ccf5545d75
+DIST github.com-stretchr-testify-1661650f989674e3e5bcdcb805536e5d31481526.tar.gz 81099 BLAKE2B 592a7c114b01bc5b1982135f310aa8619c2888ac36ccb5d876a38655a13f7dc4d468a7a42a44cf9cf69fc7bd6769a9ba010b48089d5ce866dcd564e20487e04a SHA512 f10255b0f47237c7583626a3bb213ca67d0db92c2a1531cc31dac089cdb13139b01647809503313a26f3e53a64a98cebc3bf9c4e1bd1ed975d9b81aa516ab5af
diff --git a/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
new file mode 100644
index 00000000000..0930e5240c0
--- /dev/null
+++ b/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="arduino.cc/arduino-builder/..."
+
+EGO_VENDOR=(
+ "github.com/go-errors/errors a41850380601eeb43f4350f7d17c6bbd8944aaf8"
+ "github.com/jstemmer/go-junit-report 833f8ea2b99d36d5f018698333834f3df200a0c2"
+ "github.com/stretchr/testify 1661650f989674e3e5bcdcb805536e5d31481526"
+)
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="A command line tool for compiling Arduino sketches"
+HOMEPAGE="https://github.com/arduino/arduino-builder"
+SRC_URI="https://github.com/arduino/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_VENDOR_URI}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-devel/crossdev
+ dev-embedded/avrdude
+ dev-embedded/arduino-ctags"
+
+DEPEND=">=dev-lang/go-1.9.2"
+
+src_unpack() {
+ golang-vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+ # As we know, golang packages have to be compiled from namespace-aware paths which is the whole
+ # point of the EGO_PN dance. arduino-builder goes a step further by re-creating its own
+ # namespace inside its source package, messing up with our build process which can't find
+ # packages. Also, our source package contains multiple namespaces which further messes with
+ # messes with our vendoring process (each namespace needs its own vendor directory).
+ # We do the following to try to work around this mess. It looks like upstream reworked this
+ # in its master branch so we should be able to remove this in the upcoming major release.
+
+ local deeppath="${S}/src/${EGO_PN%/...}"
+ for pkgname in builder properties timeutils; do
+ ln -s "${deeppath}/src/arduino.cc/${pkgname}" "${S}/src/arduino.cc/${pkgname}"
+ done
+ ln -s "${deeppath}/vendor/github.com" "${S}/src/github.com"
+
+ # path paths so that they point to system ctags and avrdude
+ eapply "${FILESDIR}/arduino-builder-1.3.25-platform-paths.patch"
+
+ default
+}
+
+src_install() {
+ # we unfortunately have to copy/paste the contents of golang-build_src_install() here because
+ # we *don't* want to call golang_install_pkgs() which installs all static libraries we've
+ # built. All we want is to install the final executable.
+
+ set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+ echo "$@"
+ "$@" || die
+
+ # END OF COPY/PASTE
+
+ dobin bin/arduino-builder
+
+ # In addition to the binary, we also want to install these two files below. They are needed by
+ # the dev-embedded/arduino which copies those files in its "hardware" folder.
+ insinto "/usr/share/${PN}"
+ cd "src/arduino.cc/builder/hardware" || die
+ doins "platform.txt"
+ doins "platform.keys.rewrite.txt"
+}
+
+pkg_postinst() {
+ [ ! -x /usr/bin/avr-gcc ] && ewarn "Missing avr-gcc; you need to crossdev -s4 avr"
+}
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch
new file mode 100644
index 00000000000..854dc886af0
--- /dev/null
+++ b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch
@@ -0,0 +1,19 @@
+diff --git a/src/arduino.cc/builder/hardware/platform.txt b/src/arduino.cc/builder/hardware/platform.txt
+index ca8df1f..17ce03f 100644
+--- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/hardware/platform.txt
++++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/hardware/platform.txt
+@@ -1,11 +1,11 @@
+ # ctags
+ # ------------------------------
+-tools.ctags.path={runtime.tools.ctags.path}
+-tools.ctags.cmd.path={path}/ctags
++tools.ctags.path=/usr/bin
++tools.ctags.cmd.path={path}/arduino-ctags
+ tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
+
+ # additional entries
+-tools.avrdude.path={runtime.tools.avrdude.path}
++tools.avrdude.path=/usr/bin
+
+ preproc.macros.flags=-w -x c++ -E -CC
+ #preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
diff --git a/dev-embedded/arduino-builder/metadata.xml b/dev-embedded/arduino-builder/metadata.xml
new file mode 100644
index 00000000000..c6ee565672f
--- /dev/null
+++ b/dev-embedded/arduino-builder/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">arduino/arduino-builder</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/arduino-builder/, dev-embedded/arduino-builder/files/
@ 2018-10-09 17:34 Virgil Dupras
0 siblings, 0 replies; 3+ messages in thread
From: Virgil Dupras @ 2018-10-09 17:34 UTC (permalink / raw
To: gentoo-commits
commit: b128d56fed349c13bdbf670b4cfe9c4e56b3284f
Author: Michael Perlov <perlovka <AT> gmail <DOT> com>
AuthorDate: Mon Oct 8 15:17:12 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Tue Oct 9 17:34:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b128d56f
dev-embedded/arduino-builder: version bump to 1.4.1
Bug: https://bugs.gentoo.org/666146
Signed-off-by: Michael Perlov <perlovka <AT> gmail.com>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10105
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
dev-embedded/arduino-builder/Manifest | 8 +++
.../arduino-builder/arduino-builder-1.4.1.ebuild | 68 ++++++++++++++++++++++
.../arduino-builder-1.4.1-platform-paths.patch | 19 ++++++
3 files changed, 95 insertions(+)
diff --git a/dev-embedded/arduino-builder/Manifest b/dev-embedded/arduino-builder/Manifest
index 0f558b37b90..0284217c8dc 100644
--- a/dev-embedded/arduino-builder/Manifest
+++ b/dev-embedded/arduino-builder/Manifest
@@ -1,4 +1,12 @@
DIST arduino-builder-1.3.25.tar.gz 206905 BLAKE2B 6770b89607c1563b68a79d34e6e214586106c63a4b3c854b4f85a4b9eb2fc24ce5d4a97c29b0c05c19b6834e103f3c3c574bd8cefed0eb684d8aab7e4c71ee7f SHA512 3740530800f8a3cfe1fe20a91579e6b632b76c2c4ace68c7b178a2d234032d5887abee3d0360c3039f2fec912a0d5cabe948bf930a7d9ea23221625456ad5357
+DIST arduino-builder-1.4.1.tar.gz 220058 BLAKE2B b993ad508b81b3f05bb24747a63ac7b826739265aabc0437be403ca7154e6f3b580dacf235979fa4b395c6cc8c978e2cbdcab072822bd8fe61e42074ca4323e8 SHA512 d72f63d4235531310c412b096d154977d7d6ea2746e8703c8208e33e7bf3cac416817ccb5fbc47248bfe4a5858fa3a91117919b8cb636261c5cec28b8bc415bc
+DIST github.com-arduino-go-paths-helper-751652ddd9f0a98650e681673c2c73937002e889.tar.gz 14609 BLAKE2B f8a5b54f9898db7ea02d8aad779fc32cb6b21e430c84c5f77b985f9a23dc62de95a6a366956b7861b6b4b261ff5f30d3b20c92e51b256ed6f223a309a644302d SHA512 6116531448270b502187cd91d2a0847a8791c53b65729766291f1ddaa9bc2ce95b0d24a54dc895ad62e2d04c092081ce46300101b9f371db78b0204a541c8252
+DIST github.com-arduino-go-properties-map-ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41.tar.gz 16406 BLAKE2B f6afeb160114bfb221c882d1b2c8e7f6d6841585affbf349c82c421500d28cf2b09b28bef960048c357fac69ef5432cecc0a0098f7a4929aa0d3d566cbe56bd1 SHA512 5327e207b4a1a978585345d498f4af39bdd716686c058dacebada113cc07066834ebe19eb8f4d8388d400755dca7e8656bc053e7d8804a1d7e04a1cc6c4414ea
+DIST github.com-arduino-go-timeutils-d1dd9e313b1bfede35fe0bbf46d612e16a50e04e.tar.gz 8086 BLAKE2B d2e558b3c88e084c99cd0dd0ccaa0859e21b53671d4d28f57cce505f7fda0f89fdde7a08bcf7d2e4d8b57e4a760bdc608e97f0c27542fd0a396a548494bb7351 SHA512 e573f448c4b0b17882be98516abcdbbc4174e3ab041ce1390bc7e3e365932f1a4c7fe63cebf4e82b43bec5d5f4748511fa608a777a0cbc18b29e224041884fb8
+DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8
DIST github.com-go-errors-errors-a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz 7835 BLAKE2B f4092b4ef5ebf996cb3c20183868dbdd154ea7cf02a4fd5a3375a3193e9ccacad08f0b6681b456786524b729ffb8c0b5c8af6ceec630eec22326d0fe1e00eb22 SHA512 b1d5e7c6f30f94f8a41b10d32b7f4ce7de8394f74ede6c14fb1f267a0514b24bc3bc7659c3baf6eacf424cea8451e7e57f5f72acc568342e90a447bd02f3e262
+DIST github.com-golang-protobuf-aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz 332903 BLAKE2B b05fa3e3316bd6adbad623ab239795172ee70c38380873ee52a32c10f8f3e750c26b27fc43da4a290d82eda5723fd56063bffe01fdedb2d3a65bf5349abdb376 SHA512 80407835aef3553f655c35e89aa884038c90a3667460af1db60b069ae31e870efc59d6907743ee080d85e167c20d778440b9a6d19ff79f9055bc666c8314fe30
+DIST github.com-google-go-genproto-af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.gz 2323831 BLAKE2B a614c74b60f8e347b47c8686807228ea76b021a918fc732b69293c8b59c1bc5396e320cbce6db87ab43b9a4fd649d19779874934bdd667f7cabf03165439c54a SHA512 a6524f31e8c4775195c245ffbe54c7f770591d46663ea86b8120ffd8efb3cf9269569fbf457b0d0272dc47177ccf3b413e858c2b437ee9892b5ac6698d07ed4d
+DIST github.com-grpc-grpc-go-8dea3dc473e90c8179e519d91302d0597c0ca1d1.tar.gz 506815 BLAKE2B 498909d0704b46d54571ad1f87d7636fafdf48f11fbf53e5e8ec6cd16aa6cd57cdfaedd8a7c00cd33ff60c99b0ab0dbf3f9c8df28155c75b2ceeaada3afabf92 SHA512 37970d20ce358d5186a9a152b1a0b1af816f7d53de8f2c35c901e8533e8191125e08ca60e1177bbab5e2585a1fa6e0fa9785ac70caadc5aa0fa58c189d26ca95
DIST github.com-jstemmer-go-junit-report-833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz 6901 BLAKE2B 6138ac40810ad000a4336ffbca3bc5c1d0e96854c7918fb2aad9f7b2596ac66f285ac8c519e30b6e97cdb0009b31ab73b83ff2e1db2f464c2d88f2c1045a6bd9 SHA512 00f38f51c5f761b5a3e60a6e6b602f1246a746f081f2d8946d01387234270544692c6af54d0e69919c1af8aa753f848eeecc4421f2ddf881f21522ccf5545d75
DIST github.com-stretchr-testify-1661650f989674e3e5bcdcb805536e5d31481526.tar.gz 81099 BLAKE2B 592a7c114b01bc5b1982135f310aa8619c2888ac36ccb5d876a38655a13f7dc4d468a7a42a44cf9cf69fc7bd6769a9ba010b48089d5ce866dcd564e20487e04a SHA512 f10255b0f47237c7583626a3bb213ca67d0db92c2a1531cc31dac089cdb13139b01647809503313a26f3e53a64a98cebc3bf9c4e1bd1ed975d9b81aa516ab5af
diff --git a/dev-embedded/arduino-builder/arduino-builder-1.4.1.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.4.1.ebuild
new file mode 100644
index 00000000000..c9c446bec65
--- /dev/null
+++ b/dev-embedded/arduino-builder/arduino-builder-1.4.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/arduino/arduino-builder/..."
+
+EGO_VENDOR=(
+ "github.com/arduino/go-properties-map ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41"
+ "github.com/arduino/go-timeutils d1dd9e313b1bfede35fe0bbf46d612e16a50e04e"
+ "github.com/arduino/go-paths-helper 751652ddd9f0a98650e681673c2c73937002e889"
+ "github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
+ "github.com/go-errors/errors a41850380601eeb43f4350f7d17c6bbd8944aaf8"
+ "github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
+ "github.com/jstemmer/go-junit-report 833f8ea2b99d36d5f018698333834f3df200a0c2"
+ "github.com/stretchr/testify 1661650f989674e3e5bcdcb805536e5d31481526"
+ "google.golang.org/grpc 8dea3dc473e90c8179e519d91302d0597c0ca1d1 github.com/grpc/grpc-go"
+ "google.golang.org/genproto af9cb2a35e7f169ec875002c1829c9b315cddc04 github.com/google/go-genproto"
+)
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="A command line tool for compiling Arduino sketches"
+HOMEPAGE="https://github.com/arduino/arduino-builder"
+SRC_URI="https://github.com/arduino/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_VENDOR_URI}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-devel/crossdev
+ dev-embedded/avrdude
+ dev-embedded/arduino-ctags"
+
+DEPEND=">=dev-lang/go-1.9.2
+ dev-go/go-net
+ dev-go/go-text"
+
+PATCHES=("${FILESDIR}/arduino-builder-1.4.1-platform-paths.patch")
+
+src_unpack() {
+ golang-vcs-snapshot_src_unpack
+}
+
+src_install() {
+ # we unfortunately have to copy/paste the contents of golang-build_src_install() here because
+ # we *don't* want to call golang_install_pkgs() which installs all static libraries we've
+ # built. All we want is to install the final executable.
+
+ set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+ echo "$@"
+ "$@" || die
+
+ # END OF COPY/PASTE
+
+ dobin bin/arduino-builder
+ # In addition to the binary, we also want to install these two files below. They are needed by
+ # the dev-embedded/arduino which copies those files in its "hardware" folder.
+ insinto "/usr/share/${PN}"
+ cd "src/github.com/arduino/arduino-builder/hardware" || die
+ doins "platform.txt"
+ doins "platform.keys.rewrite.txt"
+}
+
+pkg_postinst() {
+ [ ! -x /usr/bin/avr-gcc ] && ewarn "Missing avr-gcc; you need to crossdev -s4 avr"
+}
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch
new file mode 100644
index 00000000000..be1f2b5edda
--- /dev/null
+++ b/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch
@@ -0,0 +1,19 @@
+diff --git a/src/arduino.cc/builder/hardware/platform.txt b/src/arduino.cc/builder/hardware/platform.txt
+index ca8df1f..17ce03f 100644
+--- a/src/github.com/arduino/arduino-builder/hardware/platform.txt
++++ b/src/github.com/arduino/arduino-builder/hardware/platform.txt
+@@ -1,11 +1,11 @@
+ # ctags
+ # ------------------------------
+-tools.ctags.path={runtime.tools.ctags.path}
+-tools.ctags.cmd.path={path}/ctags
++tools.ctags.path=/usr/bin
++tools.ctags.cmd.path={path}/arduino-ctags
+ tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
+
+ # additional entries
+-tools.avrdude.path={runtime.tools.avrdude.path}
++tools.avrdude.path=/usr/bin
+
+ preproc.macros.flags=-w -x c++ -E -CC
+ #preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/arduino-builder/, dev-embedded/arduino-builder/files/
@ 2018-10-15 18:30 Virgil Dupras
0 siblings, 0 replies; 3+ messages in thread
From: Virgil Dupras @ 2018-10-15 18:30 UTC (permalink / raw
To: gentoo-commits
commit: 7455a74803721727671c69e21c3287d9efd8bd1c
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 18:30:08 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 18:30:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7455a748
dev-embedded/arduino-builder: skip broken tests
Some tests require network and fail within a network sandbox.
Closes: https://bugs.gentoo.org/668528
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../arduino-builder/arduino-builder-1.3.25.ebuild | 3 +-
.../arduino-builder/arduino-builder-1.4.1.ebuild | 5 +-
.../files/arduino-builder-1.3.25-skip-tests.patch | 109 +++++++++++++++++
.../files/arduino-builder-1.4.1-skip-tests.patch | 129 +++++++++++++++++++++
4 files changed, 244 insertions(+), 2 deletions(-)
diff --git a/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
index 0930e5240c0..4ffdc5d8fdc 100644
--- a/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
+++ b/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -48,6 +48,7 @@ src_prepare() {
# path paths so that they point to system ctags and avrdude
eapply "${FILESDIR}/arduino-builder-1.3.25-platform-paths.patch"
+ eapply "${FILESDIR}/arduino-builder-1.3.25-skip-tests.patch"
default
}
diff --git a/dev-embedded/arduino-builder/arduino-builder-1.4.1.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.4.1.ebuild
index c9c446bec65..078347f5234 100644
--- a/dev-embedded/arduino-builder/arduino-builder-1.4.1.ebuild
+++ b/dev-embedded/arduino-builder/arduino-builder-1.4.1.ebuild
@@ -36,7 +36,10 @@ DEPEND=">=dev-lang/go-1.9.2
dev-go/go-net
dev-go/go-text"
-PATCHES=("${FILESDIR}/arduino-builder-1.4.1-platform-paths.patch")
+PATCHES=(
+ "${FILESDIR}/arduino-builder-1.4.1-platform-paths.patch"
+ "${FILESDIR}/arduino-builder-1.4.1-skip-tests.patch"
+)
src_unpack() {
golang-vcs-snapshot_src_unpack
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch
new file mode 100644
index 00000000000..4ed170061c1
--- /dev/null
+++ b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch
@@ -0,0 +1,109 @@
+Skip tests that can't run on Gentoo because of the network sandbox
+diff --git a/src/arduino.cc/builder/test/hardware_loader_test.go b/src/arduino.cc/builder/test/hardware_loader_test.go
+index c9ea1d5..e7c68d2 100644
+--- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/hardware_loader_test.go
++++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/hardware_loader_test.go
+@@ -41,6 +41,7 @@ import (
+ )
+
+ func TestLoadHardware(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware"},
+ }
+@@ -85,6 +86,7 @@ func TestLoadHardware(t *testing.T) {
+ }
+
+ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
+ }
+@@ -155,6 +157,7 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
+ }
+
+ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{"downloaded_board_manager_stuff"},
+ }
+@@ -203,6 +206,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
+ }
+
+ func TestLoadLotsOfHardware(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{"downloaded_board_manager_stuff", "downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
+ }
+diff --git a/src/arduino.cc/builder/test/helper_tools_downloader.go b/src/arduino.cc/builder/test/helper_tools_downloader.go
+index 3642510..e6391b6 100644
+--- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/helper_tools_downloader.go
++++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/helper_tools_downloader.go
+@@ -83,6 +83,7 @@ type Core struct {
+ }
+
+ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
++ t.Skip("Gentoo skips tests requiring network");
+ cores := []Core{
+ Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.10"},
+ Core{Maintainer: "arduino", Arch: "sam", Version: "1.6.7"},
+@@ -165,6 +166,7 @@ func patchFiles(t *testing.T) {
+ }
+
+ func download(t *testing.T, cores, boardsManagerCores, boardsManagerRedBearCores []Core, tools, toolsMultipleVersions, boardsManagerTools, boardsManagerRFduinoTools []Tool, libraries []Library) {
++ t.Skip("Gentoo skips tests requiring network");
+ allCoresDownloaded, err := allCoresAlreadyDownloadedAndUnpacked(HARDWARE_FOLDER, cores)
+ NoError(t, err)
+ if allCoresDownloaded &&
+diff --git a/src/arduino.cc/builder/test/target_board_resolver_test.go b/src/arduino.cc/builder/test/target_board_resolver_test.go
+index 274eb92..d6973e3 100644
+--- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/target_board_resolver_test.go
++++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/target_board_resolver_test.go
+@@ -39,6 +39,7 @@ import (
+ )
+
+ func TestTargetBoardResolverUno(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ FQBN: "arduino:avr:uno",
+@@ -64,6 +65,7 @@ func TestTargetBoardResolverUno(t *testing.T) {
+ }
+
+ func TestTargetBoardResolverDue(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ FQBN: "arduino:sam:arduino_due_x",
+@@ -89,6 +91,7 @@ func TestTargetBoardResolverDue(t *testing.T) {
+ }
+
+ func TestTargetBoardResolverMega1280(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ FQBN: "arduino:avr:mega:cpu=atmega1280",
+@@ -115,6 +118,7 @@ func TestTargetBoardResolverMega1280(t *testing.T) {
+ }
+
+ func TestTargetBoardResolverMega2560(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ FQBN: "arduino:avr:mega:cpu=atmega2560",
+@@ -141,6 +145,7 @@ func TestTargetBoardResolverMega2560(t *testing.T) {
+ }
+
+ func TestTargetBoardResolverCustomYun(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
+ FQBN: "my_avr_platform:avr:custom_yun",
+@@ -167,6 +172,7 @@ func TestTargetBoardResolverCustomYun(t *testing.T) {
+ }
+
+ func TestTargetBoardResolverCustomCore(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
+ FQBN: "watterott:avr:attiny841:core=spencekonde,info=info",
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch
new file mode 100644
index 00000000000..f66e829e4b0
--- /dev/null
+++ b/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch
@@ -0,0 +1,129 @@
+Skip tests that can't run on Gentoo because of the network sandbox
+diff --git a/test/hardware_loader_test.go b/test/hardware_loader_test.go
+index 147396e..da6c8ef 100644
+--- a/src/github.com/arduino/arduino-builder/test/hardware_loader_test.go
++++ b/src/github.com/arduino/arduino-builder/test/hardware_loader_test.go
+@@ -41,6 +41,7 @@ import (
+ )
+
+ func TestLoadHardware(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware"},
+ }
+@@ -85,6 +86,7 @@ func TestLoadHardware(t *testing.T) {
+ }
+
+ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
+ }
+@@ -155,6 +157,7 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
+ }
+
+ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{"downloaded_board_manager_stuff"},
+ }
+@@ -203,6 +206,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
+ }
+
+ func TestLoadLotsOfHardware(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{"downloaded_board_manager_stuff", "downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
+ }
+diff --git a/test/helper_tools_downloader.go b/test/helper_tools_downloader.go
+index 49aa847..ba77a57 100644
+--- a/src/github.com/arduino/arduino-builder/test/helper_tools_downloader.go
++++ b/src/github.com/arduino/arduino-builder/test/helper_tools_downloader.go
+@@ -83,6 +83,7 @@ type Core struct {
+ }
+
+ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
++ t.Skip("Gentoo skips tests requiring network");
+ cores := []Core{
+ Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.10"},
+ Core{Maintainer: "arduino", Arch: "sam", Version: "1.6.7"},
+@@ -177,6 +178,7 @@ func patchFiles(t *testing.T) {
+ }
+
+ func download(t *testing.T, cores, boardsManagerCores, boardsManagerRedBearCores []Core, tools, toolsMultipleVersions, boardsManagerTools, boardsManagerRFduinoTools []Tool, libraries []Library) {
++ t.Skip("Gentoo skips tests requiring network");
+ allCoresDownloaded, err := allCoresAlreadyDownloadedAndUnpacked(HARDWARE_FOLDER, cores)
+ NoError(t, err)
+ if allCoresDownloaded &&
+diff --git a/test/target_board_resolver_test.go b/test/target_board_resolver_test.go
+index 49e0abe..7a50fe1 100644
+--- a/src/github.com/arduino/arduino-builder/test/target_board_resolver_test.go
++++ b/src/github.com/arduino/arduino-builder/test/target_board_resolver_test.go
+@@ -39,6 +39,7 @@ import (
+ )
+
+ func TestTargetBoardResolverUno(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ FQBN: "arduino:avr:uno",
+@@ -64,6 +65,7 @@ func TestTargetBoardResolverUno(t *testing.T) {
+ }
+
+ func TestTargetBoardResolverDue(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ FQBN: "arduino:sam:arduino_due_x",
+@@ -89,6 +91,7 @@ func TestTargetBoardResolverDue(t *testing.T) {
+ }
+
+ func TestTargetBoardResolverMega1280(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ FQBN: "arduino:avr:mega:cpu=atmega1280",
+@@ -115,6 +118,7 @@ func TestTargetBoardResolverMega1280(t *testing.T) {
+ }
+
+ func TestTargetBoardResolverMega2560(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ FQBN: "arduino:avr:mega:cpu=atmega2560",
+@@ -141,6 +145,7 @@ func TestTargetBoardResolverMega2560(t *testing.T) {
+ }
+
+ func TestTargetBoardResolverCustomYun(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
+ FQBN: "my_avr_platform:avr:custom_yun",
+@@ -167,6 +172,7 @@ func TestTargetBoardResolverCustomYun(t *testing.T) {
+ }
+
+ func TestTargetBoardResolverCustomCore(t *testing.T) {
++ t.Skip("Can't run on Gentoo")
+ ctx := &types.Context{
+ HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
+ FQBN: "watterott:avr:attiny841:core=spencekonde,info=info",
+diff --git a/test/wipeout_build_path_if_build_options_changed_test.go b/test/wipeout_build_path_if_build_options_changed_test.go
+index 51bfe80..8501fb6 100644
+--- a/src/github.com/arduino/arduino-builder/test/wipeout_build_path_if_build_options_changed_test.go
++++ b/src/github.com/arduino/arduino-builder/test/wipeout_build_path_if_build_options_changed_test.go
+@@ -42,6 +42,7 @@ import (
+ )
+
+ func TestWipeoutBuildPathIfBuildOptionsChanged(t *testing.T) {
++ t.Skip("Can't run in Gentoo")
+ ctx := &types.Context{}
+
+ buildPath := SetupBuildPath(t, ctx)
+@@ -73,6 +74,7 @@ func TestWipeoutBuildPathIfBuildOptionsChanged(t *testing.T) {
+ }
+
+ func TestWipeoutBuildPathIfBuildOptionsChangedNoPreviousBuildOptions(t *testing.T) {
++ t.Skip("Can't run in Gentoo")
+ ctx := &types.Context{}
+
+ buildPath := SetupBuildPath(t, ctx)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-15 18:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-09 17:34 [gentoo-commits] repo/gentoo:master commit in: dev-embedded/arduino-builder/, dev-embedded/arduino-builder/files/ Virgil Dupras
-- strict thread matches above, loose matches on Subject: below --
2018-10-15 18:30 Virgil Dupras
2018-03-06 19:59 Amy Liffey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox