summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarco Varlese <marco.varlese@suse.com>2017-10-06 15:07:08 +0200
committerDave Wallace <dwallacelf@gmail.com>2017-10-09 02:41:01 +0000
commitc2e63feb6209ef504753fe2c975cf61b1c31b5cf (patch)
tree3e7d73fd78cd195c8e5d7c43d4c51a1d8707e83e /src
parente9aebf9db548b940c77f7c5826a1260d1931e75d (diff)
Allow use of /etc/os-release file
The top-level Makefile in VPP already uses the file /etc/os-release to recognize which OS the build is being performed on. The scripts for vagrant images instead were still using different files for different distros and adding a new distro to be supported causes issues with the extra-logic to deal with it. This patch aligns the vagrant scripts to use the same approach followed by the top-level Makefile and simplifies the steps to identify / update the OS and build / run VPP. Change-Id: I539f4a7c27b3fef70ed1c12b0276049bc47dc289 Signed-off-by: Marco Varlese <marco.varlese@suse.com>
Diffstat (limited to 'src')
-rw-r--r--src/m4/ax_vpp_find_jdk8.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/src/m4/ax_vpp_find_jdk8.m4 b/src/m4/ax_vpp_find_jdk8.m4
index 382a6c80e8f..94b785038f7 100644
--- a/src/m4/ax_vpp_find_jdk8.m4
+++ b/src/m4/ax_vpp_find_jdk8.m4
@@ -20,7 +20,7 @@ do
break
fi
- for dir in $(find /usr/lib/jvm/* -maxdepth 0 -type d); do
+ for dir in $(find /usr/lib*/jvm/* -maxdepth 0 -type d); do
AC_MSG_CHECKING([${dir} for Java 8 compiler])
JAVA_VERSION=$(${dir}/bin/javac -source 8 -version 2>&1)
if test 0 -eq "$?"; then