summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2021-11-12 15:55:44 -0500
committerDamjan Marion <dmarion@me.com>2021-11-16 15:50:09 +0000
commitfc283bc0403d1c26d130c4332f3ac317d3734cda (patch)
tree5d1441105aa8149eea263c06e2482496c71bc4c5
parent7fe006965ec03304d694e965d6acdeb12248d989 (diff)
build: Remove ubuntu-18.04 install dependencies
- Per agreement at VPP community meeting, end support for ubuntu-18.04 Type: make Signed-off-by: Dave Wallace <dwallacelf@gmail.com> Change-Id: I20ae1531e571ba0aad233d47c2e5b73ee3f964b6
-rw-r--r--Makefile8
1 files changed, 2 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 4bd4d6d9fc6..dc81830c318 100644
--- a/Makefile
+++ b/Makefile
@@ -76,11 +76,7 @@ DEB_DEPENDS += enchant # for docs
LIBFFI=libffi6 # works on all but 20.04 and debian-testing
-ifeq ($(OS_VERSION_ID),18.04)
- DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
- DEB_DEPENDS += libssl-dev
- DEB_DEPENDS += clang-9 clang-format-10
-else ifeq ($(OS_VERSION_ID),20.04)
+ifeq ($(OS_VERSION_ID),20.04)
DEB_DEPENDS += python3-virtualenv
DEB_DEPENDS += libssl-dev
DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
@@ -708,7 +704,7 @@ pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps
$(call banner,"Building $(PKG) packages")
@make pkg-$(PKG)
-MAKE_VERIFY_GATE_OS ?= ubuntu-18.04
+MAKE_VERIFY_GATE_OS ?= ubuntu-20.04
.PHONY: verify
verify: pkg-verify
ifeq ($(OS_ID)-$(OS_VERSION_ID),$(MAKE_VERIFY_GATE_OS))