From bbc99f445c8a528850653b3699a67dde1beaf842 Mon Sep 17 00:00:00 2001 From: Saima Yunus Date: Fri, 10 Jun 2022 19:34:04 -0700 Subject: build: update makefile for ubuntu 22.04 docker executors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Change-Id: I96ead90152f692233da812cdc853792bedb47c3c --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Makefile') 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 -- cgit 1.2.3-korg