summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaima Yunus <yunus.saima.99@gmail.com>2022-06-10 19:34:04 -0700
committerDave Wallace <dwallacelf@gmail.com>2022-06-13 19:46:48 +0000
commitbbc99f445c8a528850653b3699a67dde1beaf842 (patch)
treed7bb97415ab611889b786b73bb3a3647c60d69a9
parent5f6422db9cdc2b6127e1214a7adddf5e7e15e0e8 (diff)
build: update makefile for ubuntu 22.04 docker executors
* apt '—force-yes' is deprecated in the version of apt in Ubuntu 22.04 * several Ubuntu-22.04-specific packages (e.g. python3-virtualenv, libssl-dev, clang clang-format-11) are needed in the current VPP installation as well Type: fix Signed-off-by: Saima Yunus <yunus.saima.99@gmail.com> Change-Id: I96ead90152f692233da812cdc853792bedb47c3c
-rw-r--r--Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 78163386941..69d7a41e1de 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,14 @@ DEB_DEPENDS += nasm
LIBFFI=libffi6 # works on all but 20.04 and debian-testing
-ifeq ($(OS_VERSION_ID),20.04)
+ifeq ($(OS_VERSION_ID),22.04)
+ DEB_DEPENDS += python3-virtualenv
+ DEB_DEPENDS += libssl-dev
+ DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
+ DEB_DEPENDS += clang clang-format-11
+ LIBFFI=libffi7
+ DEB_DEPENDS += enchant-2 # for docs
+else ifeq ($(OS_VERSION_ID),20.04)
DEB_DEPENDS += python3-virtualenv
DEB_DEPENDS += libssl-dev
DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
@@ -186,7 +193,7 @@ endif
ifeq ($(findstring y,$(UNATTENDED)),y)
CONFIRM=-y
-FORCE=--force-yes
+FORCE=--allow-downgrades --allow-remove-essential --allow-change-held-packages
endif
TARGETS = vpp