PktUART driver for MESA

.gitattributes

@@ -1,2 +1,6 @@
 *.po merge=pofile
 *.pot merge=pofile
+
+# Don't export git artifacts into tarball archives
+.gitignore	export-ignore
+.gitattributes	export-ignore

.gitignore

@@ -11,24 +11,59 @@ build-stamp
 *.mod.c
 *.cmd
 .tmp*
-# Ignore generated html files, 
-/docs/src/*/*.html
 # Except Gcode quick-ref cards (en,de,sp,fr) which are maintained by hand
-!docs/html/gcode*.html
-# Ignore all LyX files, we're done with them now. 
+# Ignore all LyX files, we're done with them now.
 *.lyx
 debian/*.debhelper.log
 rtlib/Module.symvers
 share/*/*.desktop
 share/menus/CNC.menu
 share/desktop-directories/cnc.directory
 src/modules.order
-docs/html/drivers
 /configs/*/emc.nml
 !/configs/common/emc.nml
-/docs/src/source-highlight/local
+/man/man1/linuxcnc.1
 lib/python/gremlin.py
 lib/python/touchy
+tests/*/skip
+tests/*/*/skip
+tests/*/*/*/skip
+/rtlib/
+/libexec/
+/etc/
+tests/rtapi.0/rtapi_test
+tests/bitops.0/bitops
+#
+# emacs droppings
+*~
+\#*\#
+.\#*
+core.*
 configs/sim/gmoccapy/*.pref
 configs/sim/gmoccapy/gmoccapy_plasma/*.pref
-
+# Miscellaneous generated files (Rob)
+cscope
+cscope.*
+*.kdev*
+oprofile*
+*.log
+position.txt
+*.9comp
+**/DOTGIT
+src/machinetalk/generated/*
+lib/python/*_pb2.py
+lib/python/pb2json.py
+lib/python/google/
+lib/python/nanopb_generator.py
+lib/python/protoc-gen-nanopb
+lib/python/machinekit/__init__.py
+lib/python/machinekit/config.py
+tests/*/*/*/NUM_PINS_FOUND
+src/machinekitcfg.py-tmp
+scripts/machinekit.ini.tmpl
+src/objects/*
+debian/linuxcnc-*.files
+src/hal/cython/machinekit/*.c
+# mk-build-deps artifact
+/machinekit-build-deps_*.deb
+.directory

.travis.yml

@@ -0,0 +1,57 @@
+sudo: required
+
+notifications:
+  email: 
+    on_success: never
+    on_failure: always
+  webhooks:
+    urls:
+      - $GITTER_IM_URL
+    on_success: change
+    on_failure: always
+    on_start: never
+
+language: bash
+
+services:
+  - docker
+
+before_install:
+  - gem install package_cloud
+  - .travis/get_sftp_key.sh 
+
+env:
+  global:
+    - ROOT=/opt/rootfs
+    - JOBS=2
+    - SFTP_DEPLOY_PORT="${SFTP_DEPLOY_PORT:-22}"
+    - SFTP_DEPLOY_USER="${SFTP_DEPLOY_USER:-travis}"
+    - SFTP_DEPLOY_ADDR="${SFTP_DEPLOY_ADDR:-empty}"
+    - CCACHE_REPO="${CCACHE_REPO:-kinsamanka/mk-ccache}"
+  matrix:
+    - TAG=wheezy-64    CMD=run_tests
+    - TAG=jessie-64    CMD=run_tests
+    - TAG=wheezy-64    CMD=build_deb
+    - TAG=wheezy-32    CMD=build_deb
+    - TAG=wheezy-armhf CMD=build_deb FLAV=posix
+    - TAG=wheezy-armhf CMD=build_deb FLAV=xenomai
+    - TAG=wheezy-armhf CMD=build_deb FLAV=rt_preempt
+    - TAG=jessie-64    CMD=build_deb
+    - TAG=jessie-32    CMD=build_deb
+    - TAG=jessie-armhf CMD=build_deb FLAV=posix
+    - TAG=jessie-armhf CMD=build_deb FLAV=xenomai
+    - TAG=jessie-armhf CMD=build_deb FLAV=rt_preempt
+
+before_script:
+  - .travis/get_ccache.sh
+
+script:
+  - .travis/docker_run.sh
+
+after_success:
+  - .travis/save_ccache.sh
+  - .travis/send_binaries.sh
+  - .travis/upload_packagecloud.sh
+
+after_script:
+  - .travis/send_status.sh

.travis/build_deb.sh

@@ -0,0 +1,110 @@
+#!/bin/bash -ex
+
+# this script is run inside a docker container
+cd ${ROOTFS}${MACHINEKIT_PATH}
+
+# Verbose build
+if ${MK_PACKAGE_VERBOSE}; then
+    DEBUILD_OPTS+=" -eDH_VERBOSE=1"
+fi
+
+# enable ccache
+DEBUILD_OPTS+=" -eCCACHE_DIR=/ccache --prepend-path=/usr/lib/ccache"
+
+# Supplied variables for package configuration
+MAJOR_MINOR_VERSION="${MAJOR_MINOR_VERSION:-0.1}"
+PKGSOURCE="${PKGSOURCE:-travis.${TRAVIS_REPO_SLUG/\//.}}"
+DEBIAN_SUITE="${DEBIAN_SUITE:-experimental}"
+REPO_URL="${REPO_URL:-https://github.com/machinekit/machinekit}"
+
+# Compute version
+if ${IS_PR}; then
+    # Use build timestamp (now) as pkg version patchlevel
+    TIMESTAMP="$(date +%s)"
+    PR_OR_BRANCH="pr${TRAVIS_PULL_REQUEST}"
+    COMMIT_URL="${REPO_URL}/pull/${TRAVIS_PULL_REQUEST}"
+else
+    # Use merge commit timestamp as pkg version patchlevel
+    TIMESTAMP="$COMMIT_TIMESTAMP"
+    PR_OR_BRANCH="${TRAVIS_BRANCH}"
+    COMMIT_URL="${REPO_URL}/commit/${TRAVIS_COMMIT:0:8}"
+fi
+
+# sanitize upstream version
+UPSTREAM=${PKGSOURCE}.${PR_OR_BRANCH}
+# remove dash
+UPSTREAM=${UPSTREAM//-/}
+# remove underscore
+UPSTREAM=${UPSTREAM//_/}
+
+VERSION="${MAJOR_MINOR_VERSION}.${TIMESTAMP}"
+
+# Compute release
+SHA1SHORT="${TRAVIS_COMMIT:0:8}"
+RELEASE="1${UPSTREAM}.git${SHA1SHORT}~1${DISTRO}"
+
+# Generate debian/changelog entry
+#
+# https://www.debian.org/doc/debian-policy/ch-source.html#s-dpkgchangelog
+mv debian/changelog debian/changelog.old
+cat > debian/changelog <<EOF
+machinekit (${VERSION}-${RELEASE}) ${DEBIAN_SUITE}; urgency=low
+
+  * Travis CI rebuild for ${DISTRO}, ${PR_OR_BRANCH}, commit ${SHA1SHORT}
+    - ${COMMIT_URL}
+
+ -- ${COMMITTER_NAME} <${COMMITTER_EMAIL}>  $(date -R)
+
+EOF
+cat debian/changelog # debug output
+cat debian/changelog.old >> debian/changelog
+
+# build unsigned packages and sources on amd64
+DEBUILD_OPTS+=" -eDEB_BUILD_OPTIONS=parallel=${JOBS} -us -uc -j${JOBS}"
+if test ${MARCH} = 64; then
+    # create upstream tarball only on amd64
+    (
+	cd ${ROOTFS}${MACHINEKIT_PATH}
+	git archive HEAD | bzip2 -z > \
+            ../machinekit_${VERSION}.orig.tar.bz2
+    )
+else
+    # the rest will be binaries only
+    DEBUILD_OPTS+=" -b"
+fi
+
+case "${FLAV}" in
+   "posix") FLAV_OPTS="-p"
+   ;;
+   "rt_preempt") FLAV_OPTS="-r"
+   ;;
+   "xenomai") FLAV_OPTS="-x"
+   ;;
+   *) FLAV_OPTS="-prx"
+   ;;
+esac
+export FLAV_OPTS
+
+# build debs
+export DEBUILD_OPTS
+proot-helper /bin/sh -exc 'cd ${MACHINEKIT_PATH}; \
+    ./debian/configure ${FLAV_OPTS} ; \
+    debuild ${DEBUILD_OPTS}'
+
+# copy results
+mkdir ${ROOTFS}/${MACHINEKIT_PATH}/deploy
+chmod 0777 ${ROOTFS}/${MACHINEKIT_PATH}/deploy
+cd ${ROOTFS}/${MACHINEKIT_PATH}/../
+cp *deb *changes ${ROOTFS}/${MACHINEKIT_PATH}/deploy
+
+# copy source
+if test ${MARCH} = 64; then
+    cp *bz2 *dsc ${ROOTFS}/${MACHINEKIT_PATH}/deploy
+fi
+
+chmod 0666 ${ROOTFS}/${MACHINEKIT_PATH}/deploy/*
+
+# display ccache stats
+CCACHE_DIR=/ccache proot-helper ccache -s
+# reset ccache stats
+CCACHE_DIR=/ccache proot-helper ccache -z > /dev/null

.travis/build_rip.sh

@@ -0,0 +1,15 @@
+#!/bin/sh -ex
+
+# this script is run inside a docker container
+
+# rip build
+proot-helper ${TRAVIS_PATH}/build_rip_helper.sh
+
+# tar the chroot directory
+tar czf /tmp/rootfs.tgz -C ${ROOTFS} .
+cp /tmp/rootfs.tgz ${ROOTFS}${TRAVIS_PATH}/mk_runtests
+
+# display ccache stats
+CCACHE_DIR=/ccache proot-helper ccache -s
+# reset ccache stats
+CCACHE_DIR=/ccache proot-helper ccache -z > /dev/null

.travis/build_rip_helper.sh

@@ -0,0 +1,23 @@
+#!/bin/sh -ex
+
+# Verbose build
+if ${MK_BUILD_VERBOSE}; then
+    VERBOSE="V=1"
+fi
+
+# enable ccache
+export CCACHE_DIR=/ccache 
+export PATH=/usr/lib/ccache:$PATH
+
+cd ${MACHINEKIT_PATH}/src
+./autogen.sh
+./configure \
+     --with-posix \
+     --without-rt-preempt \
+     --without-xenomai \
+     --without-xenomai-kernel \
+     --without-rtai-kernel
+make -j${JOBS} ${VERBOSE}
+useradd -m -s /bin/bash mk
+chown -R mk:mk ../
+make setuid ${VERBOSE}

.travis/docker_run.sh

@@ -0,0 +1,79 @@
+#!/bin/bash -ex
+cd "$(dirname $0)/.."
+
+MACHINEKIT_PATH="/usr/src/machinekit"
+TRAVIS_PATH="$MACHINEKIT_PATH/.travis"
+DOCKER_CONTAINER=${DOCKER_CONTAINER:-"kinsamanka/machinekit_builder"}
+COMMITTER_NAME="$(git log -1 --pretty=format:%an)"
+COMMITTER_EMAIL="$(git log -1 --pretty=format:%ae)"
+COMMIT_TIMESTAMP="$(git log -1 --pretty=format:%at)"
+DISTRO=${TAG%-*}
+MARCH=${TAG#*-}
+test ${TRAVIS_PULL_REQUEST} = false && IS_PR=false || IS_PR=true
+# Verbose RIP build output:  "true" or "false"
+MK_BUILD_VERBOSE=${MK_BUILD_VERBOSE:-"false"}
+# Verbose package build output:  "true" or "false"
+MK_PACKAGE_VERBOSE=${MK_PACKAGE_VERBOSE:-"false"}
+# Verbose regression test debug output:  "true" or "false"
+MK_DEBUG_TESTS=${MK_DEBUG_TESTS:-"false"}
+
+cmd=${CMD}
+if [ ${CMD} == "run_tests" ];
+then
+    cmd=build_rip
+fi
+
+# only allow x64 builds for PR's to speed up the process
+if test ${TRAVIS_PULL_REQUEST} != 'false'; then
+    if test ${MARCH} != '64'; then
+        exit 0
+    fi
+fi
+
+# run build step
+docker run \
+    -v $(pwd):/opt/rootfs/${MACHINEKIT_PATH} \
+    -v $(pwd)/.travis:/travis \
+    -v $(pwd)/../ccache:/opt/rootfs/ccache \
+    -e FLAV="${FLAV}" \
+    -e JOBS=${JOBS} \
+    -e TAG=${TAG} \
+    -e DISTRO=${DISTRO} \
+    -e MARCH=${MARCH} \
+    -e MACHINEKIT_PATH=${MACHINEKIT_PATH} \
+    -e TRAVIS_PATH=${TRAVIS_PATH} \
+    -e COMMITTER_NAME="${COMMITTER_NAME}" \
+    -e COMMITTER_EMAIL="${COMMITTER_EMAIL}" \
+    -e COMMIT_TIMESTAMP=${COMMIT_TIMESTAMP} \
+    -e MK_BUILD_VERBOSE="${MK_BUILD_VERBOSE}" \
+    -e MK_PACKAGE_VERBOSE="${MK_PACKAGE_VERBOSE}" \
+    -e IS_PR="${IS_PR}" \
+    -e MAJOR_MINOR_VERSION \
+    -e PKGSOURCE \
+    -e DISTRO \
+    -e DEBIAN_SUITE \
+    -e GITHUB_URL \
+    -e TRAVIS_REPO_SLUG \
+    -e TRAVIS_PULL_REQUEST \
+    -e TRAVIS_COMMIT \
+    -e TRAVIS_BRANCH \
+    -e LC_ALL="POSIX" \
+    ${DOCKER_CONTAINER}:${TAG} \
+    /travis/${cmd}.sh
+
+if test ${cmd} = build_rip; then
+    # PR:  Run regression tests
+    #
+    # tests are run under a new container instead of chrooting
+    # this will allow us to run docker without using privileged mode
+
+    # create container using RIP rootfs
+    docker build -t mk_runtest .travis/mk_runtests
+
+    # run regressions
+    docker run --rm=true \
+	-e MACHINEKIT_PATH=${MACHINEKIT_PATH} \
+	-e MK_DEBUG_TESTS=${MK_DEBUG_TESTS} \
+	-e LC_ALL="POSIX" \
+	 mk_runtest /run_tests.sh
+fi

.travis/get_ccache.sh

@@ -0,0 +1,17 @@
+#!/bin/bash -ex
+
+branch="${TAG}/${CMD}"
+if [ ! -z ${FLAV+x} ]; then
+    branch+="/${FLAV}"
+fi
+
+res=$(git ls-remote git://github.com/${CCACHE_REPO})
+
+# fetch if ccache is available
+if [[ "${res}" = *"${branch}"* ]]; then
+    git clone -b ${branch} --depth=1 git://github.com/${CCACHE_REPO} ../ccache
+    # delete git directory, no need for history
+    rm -rf ../ccache/.git
+else # empty ccache
+    mkdir ../ccache
+fi