Merge branch 'agent-release-9-7-0' into agent-master-3

.travis-scripts/linux/build.sh

@@ -27,9 +27,9 @@ else
 	export CC="gcc-4.8"
 	export CXX="g++-4.8"
 fi
-wget https://s3.amazonaws.com/download.draios.com/dependencies/cmake-3.3.2.tar.gz
-tar -xzf cmake-3.3.2.tar.gz
-cd cmake-3.3.2
+wget https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4.tar.gz
+tar -xzf cmake-3.16.4.tar.gz
+cd cmake-3.16.4
 ./bootstrap --prefix=/usr
 make
 sudo make install

driver/bpf/quirks.h

@@ -37,4 +37,11 @@ or GPL2.txt for full copies of the license.
 #define asm_volatile_goto(...) asm volatile("invalid use of asm_volatile_goto")
 #endif
 
+/* Ditto for asm_inline (new in Linux 5.4)
+ */
+#ifdef asm_inline
+#undef asm_inline
+#define asm_inline asm
+#endif
+
 #endif

probe-builder/Dockerfile

@@ -0,0 +1,19 @@
+FROM centos:7
+
+RUN yum -y install \
+	curl \
+	dpkg-deb \
+	epel-release \
+	git \
+	jq \
+	kpartx \
+	python-lxml \
+	wget \
+	&& yum -y install jq \
+	&& yum clean all
+
+RUN curl -fsSL https://get.docker.io | bash
+
+ADD . /builder
+WORKDIR /builder
+ENTRYPOINT [ "/builder/main-builder-entrypoint.sh" ]

probe-builder/Dockerfile.centos-gcc4.4

@@ -0,0 +1,18 @@
+FROM centos:6
+
+RUN yum -y install \
+	wget \
+	git \
+	gcc \
+	gcc-c++ \
+	autoconf \
+	bison \
+	flex \
+	make \
+	cmake \
+	elfutils-devel \
+	python-lxml && yum clean all
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]

probe-builder/Dockerfile.centos-gcc4.8

@@ -0,0 +1,18 @@
+FROM centos:7
+
+RUN yum -y install \
+	wget \
+	git \
+	gcc \
+	gcc-c++ \
+	autoconf \
+	bison \
+	flex \
+	make \
+	cmake \
+	elfutils-devel \
+	python-lxml && yum clean all
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]

probe-builder/Dockerfile.centos-gcc7.3

@@ -0,0 +1,20 @@
+FROM fedora:27
+
+RUN yum -y install \
+	wget \
+	git \
+	gcc \
+	gcc-c++ \
+	autoconf \
+	bison \
+	flex \
+	make \
+	cmake \
+	elfutils-devel \
+	findutils \
+	kmod \
+	python-lxml && yum clean all
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]

probe-builder/Dockerfile.centos-gcc8.3

@@ -0,0 +1,20 @@
+FROM fedora:29
+
+RUN yum -y install \
+	wget \
+	git \
+	gcc \
+	gcc-c++ \
+	autoconf \
+	bison \
+	flex \
+	make \
+	cmake \
+	elfutils-devel \
+	findutils \
+	kmod \
+	python-lxml && yum clean all
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]

probe-builder/Dockerfile.centos-gcc9.2

@@ -0,0 +1,20 @@
+FROM fedora:31
+
+RUN yum -y install \
+	wget \
+	git \
+	gcc \
+	gcc-c++ \
+	autoconf \
+	bison \
+	flex \
+	make \
+	cmake \
+	elfutils-devel \
+	findutils \
+	kmod \
+	python-lxml && yum clean all
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]

probe-builder/Dockerfile.coreos-old

@@ -0,0 +1,20 @@
+FROM centos:7
+
+RUN yum -y install \
+	wget \
+	git \
+	gcc \
+	gcc-c++ \
+	autoconf \
+	bison \
+	flex \
+	make \
+	cmake \
+	elfutils-devel \
+	bc \
+	openssl-devel \
+	python-lxml && yum clean all
+
+ADD builder-entrypoint-coreos.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint-coreos.sh" ]

probe-builder/Dockerfile.debian-gcc4.9

@@ -0,0 +1,16 @@
+FROM debian:jessie
+
+RUN apt-get update && apt-get -y --no-install-recommends install \
+	cmake \
+	g++ \
+	git \
+	kmod \
+	libc6-dev \
+	make \
+	pkg-config \
+	&& apt-get clean
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]
+

probe-builder/Dockerfile.debian-gcc6.3

@@ -0,0 +1,16 @@
+FROM debian:stretch
+
+RUN apt-get update && apt-get -y --no-install-recommends install \
+	cmake \
+	g++ \
+	git \
+	kmod \
+	libc6-dev \
+	make \
+	pkg-config \
+	&& apt-get clean
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]
+

probe-builder/Dockerfile.debian-gcc8.3

@@ -0,0 +1,16 @@
+FROM debian:buster
+
+RUN apt-get update && apt-get -y --no-install-recommends install \
+	cmake \
+	g++ \
+	git \
+	kmod \
+	libc6-dev \
+	make \
+	pkg-config \
+	&& apt-get clean
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]
+

probe-builder/Dockerfile.ol6

@@ -0,0 +1,17 @@
+FROM oraclelinux:6
+
+RUN yum -y install \
+	wget \
+	git \
+	gcc \
+	gcc-c++ \
+	autoconf \
+	make \
+	cmake \
+	libdtrace-ctf \
+	elfutils-devel \
+	python-lxml && yum clean all
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]

probe-builder/Dockerfile.ol7

@@ -0,0 +1,18 @@
+FROM oraclelinux:7
+
+RUN yum -y install \
+	wget \
+	git \
+	gcc \
+	gcc-c++ \
+	autoconf \
+	make \
+	cmake \
+	libdtrace-ctf \
+	elfutils-libelf-devel \
+	file \
+	python-lxml && yum clean all
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]

probe-builder/Dockerfile.toolkit

@@ -0,0 +1,5 @@
+FROM alpine
+
+RUN apk add rpm2cpio multipath-tools
+ADD toolkit-entrypoint.sh /toolkit-entrypoint.sh
+ENTRYPOINT ["/toolkit-entrypoint.sh"]

probe-builder/Dockerfile.ubuntu-gcc4.8

@@ -0,0 +1,15 @@
+FROM ubuntu:14.04
+
+RUN apt-get update && apt-get -y --no-install-recommends install \
+	cmake \
+	g++ \
+	git \
+	libc6-dev \
+	libelf-dev \
+	make \
+	pkg-config \
+	&& apt-get clean
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]

probe-builder/Dockerfile.ubuntu-gcc5.4

@@ -0,0 +1,17 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && apt-get -y --no-install-recommends install \
+	cmake \
+	g++ \
+	git \
+	kmod \
+	libc6-dev \
+	libelf-dev \
+	make \
+	pkg-config \
+	&& apt-get clean
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]
+

probe-builder/Dockerfile.ubuntu-gcc7.4

@@ -0,0 +1,17 @@
+FROM ubuntu:18.04
+
+RUN apt-get update && apt-get -y --no-install-recommends install \
+	cmake \
+	g++ \
+	git \
+	kmod \
+	libc6-dev \
+	libelf-dev \
+	make \
+	pkg-config \
+	&& apt-get clean
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]
+

probe-builder/Dockerfile.ubuntu-gcc8.3

@@ -0,0 +1,17 @@
+FROM ubuntu:19.04
+
+RUN apt-get update && apt-get -y --no-install-recommends install \
+	cmake \
+	g++ \
+	git \
+	kmod \
+	libc6-dev \
+	libelf-dev \
+	make \
+	pkg-config \
+	&& apt-get clean
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]
+

probe-builder/Dockerfile.ubuntu-gcc9.2

@@ -0,0 +1,16 @@
+FROM ubuntu:19.10
+
+RUN apt-get update && apt-get -y --no-install-recommends install \
+	cmake \
+	g++ \
+	git \
+	kmod \
+	libc6-dev \
+	libelf-dev \
+	make \
+	pkg-config \
+	&& apt-get clean
+
+ADD builder-entrypoint.sh /
+WORKDIR /build/probe
+ENTRYPOINT [ "/builder-entrypoint.sh" ]