Commit graph

18 commits

Author SHA1 Message Date
Sebastian Kuzminsky
92b991a002 Merge remote-tracking branch 'origin/2.6' into 2.7
Conflicts:
	scripts/platform-is-supported
2016-06-20 09:21:44 -06:00
Sebastian Kuzminsky
84c4f9c3cb platform-is-supported: detect os in a more portable way
This will help handle other OSes, like FreeBSD, in the future.

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
2016-06-19 17:32:56 -06:00
Sebastian Kuzminsky
3a1f40b2c9 buildbot: this branch works under Jessie's RTAI (5.0-test1)
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
2015-12-27 15:46:01 -07:00
Sebastian Kuzminsky
e87fc67414 Merge remote-tracking branch 'origin/2.6' into 2.7 2015-12-12 12:37:27 -07:00
Sebastian Kuzminsky
74aac1da59 buildbot: dont try to build on Jessie RTAI
Debian Jessie uses RTAI 5.0, which requires some tweaks to LinuxCNC to
work right.

This branch of LinuxCNC does not have those tweaks, so this commit teaches
the platform-is-supported script not to try to build this branch under
Jessie/RTAI on the buildbot.

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
2015-12-12 12:36:12 -07:00
Jeff Epler
6e7f9ab678 Merge branch '2.6' into 2.7
Conflicts:
	debian/configure
	debian/rules.in
	docs/src/common/overleaf.txt
	scripts/platform-is-supported
2015-08-30 21:24:22 -05:00
Sebastian Kuzminsky
dbc5af7cda Merge remote-tracking branch 'origin/2.6' into 2.7
Conflicts:
	scripts/platform-is-supported
2015-08-29 11:11:13 -06:00
Sebastian Kuzminsky
4489852091 Revert "turn off buildbot builds on jessie temporarily"
This reverts commit 421500399c.

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
2015-08-29 09:54:55 -06:00
Sebastian Kuzminsky
421500399c turn off buildbot builds on jessie temporarily
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
2015-08-29 08:53:56 -06:00
Jeff Epler
350a019ef3 platform-is-supported: armhf is reported as arm
.. by DEB_HOST_ARCH_CPU.  DEB_HOST_ARCH reports armhf.  I don't know what
the difference is.
2014-09-16 18:47:40 -05:00
Sebastian Kuzminsky
8e587197bd Merge remote-tracking branch 'origin/2.6'
Conflicts:
	scripts/platform-is-supported
2014-08-19 16:35:59 -06:00
Sebastian Kuzminsky
3b8317c05a platform-is-supported: "arch" has components "os" and "cpu", consider both
On Debian distributions running the Linux kernel, "DEB_HOST_ARCH"
is the same as "DEB_HOST_ARCH_CPU" (the Linux kernel is implied).
But on Debian kFreeBSD, DEB_HOST_ARCH includes both DEB_HOST_ARCH_OS
and DEB_HOST_ARCH_CPU.  This commit lets platform-is-supported consider
both components of the arch.

2.6 (this version) requires DEB_HOST_ARCH_OS to be "linux".
2014-08-19 16:27:41 -06:00
Sebastian Kuzminsky
b3d38ac4d3 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	VERSION
2014-08-07 17:20:28 -06:00
Sebastian Kuzminsky
8b88a71889 master now supports the armhf architecture 2014-08-06 17:39:26 -06:00
Sebastian Kuzminsky
6ec6995aeb master now supports rtpreempt 2014-08-06 17:38:38 -06:00
Jeff Epler
44e1d1081f scripts: Note GPL license on files 2014-07-28 09:12:39 -05:00
Sebastian Kuzminsky
2d8d6e0313 master doesnt build on hardy right now
The problem is the xhc-hb04 driver, which uses libusb-1.0-0-dev, which
was added to Ubuntu in Lucid.

This commit disables Hardy builds on the buildbot, but a better fix is
probably to just disable the xhc-hb04 driver on Hardy.  That requires
some involved changes to both debian/configure and src/configure.
2014-03-03 18:19:36 -07:00
Sebastian Kuzminsky
af3ada1505 add scripts/platform-is-supported
This script knows what architectures, distros, release, and realtime
kernels are supported by the branch it's in.  The buildbot runs this
script on each buildslave to decide which ones to try to build on.
2014-03-03 14:33:25 -07:00