diff --git a/Jenkinsfiles/Linux b/Jenkinsfiles/Linux index 3afc48e8..ff29dbe7 100644 --- a/Jenkinsfiles/Linux +++ b/Jenkinsfiles/Linux @@ -15,7 +15,7 @@ pipeline { make -j 8 WERROR=1 make -j 8 WERROR=1 test cd Pal/ipc/linux - make + make KERNELDIR=/lib/modules/4.4.0-161-generic/build ''' } } diff --git a/Jenkinsfiles/Linux-18.04 b/Jenkinsfiles/Linux-18.04 index 74d6fa90..a8ff62ab 100644 --- a/Jenkinsfiles/Linux-18.04 +++ b/Jenkinsfiles/Linux-18.04 @@ -9,8 +9,8 @@ pipeline { make -j 8 WERROR=1 make -j 8 WERROR=1 test # We can't build this on 18.04 in our current pipeline - #cd Pal/ipc/linux - #make + cd Pal/ipc/linux + make KERNELDIR=/lib/modules/4.15.0-20-generic/build ''' } } diff --git a/Jenkinsfiles/ubuntu-16.04.dockerfile b/Jenkinsfiles/ubuntu-16.04.dockerfile index 30a4b92b..8700f595 100644 --- a/Jenkinsfiles/ubuntu-16.04.dockerfile +++ b/Jenkinsfiles/ubuntu-16.04.dockerfile @@ -15,8 +15,7 @@ RUN apt-get update \ libexpat1-dev \ libpcre3-dev \ libxml2-dev \ - linux-headers-generic \ - linux-headers-$(uname -r) \ + linux-headers-4.4.0-161-generic \ net-tools \ python \ python-protobuf \ diff --git a/Jenkinsfiles/ubuntu-18.04.dockerfile b/Jenkinsfiles/ubuntu-18.04.dockerfile index 6a740ccc..0c599817 100644 --- a/Jenkinsfiles/ubuntu-18.04.dockerfile +++ b/Jenkinsfiles/ubuntu-18.04.dockerfile @@ -10,12 +10,13 @@ RUN apt-get update && apt-get install -y \ bison \ gettext \ git \ + libelf-dev \ libexpat1 \ libexpat1-dev \ libomp-dev \ libpcre3-dev \ libxml2-dev \ - linux-headers-generic \ + linux-headers-4.15.0-20-generic \ net-tools \ python \ python-protobuf \