X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=96db6004e84e08d72aa15ee945295fe332ff69e9;hb=03aae9637922023dd77955cb15caafb7ce309200;hp=7816338694116ee4c2f33e385d6744b6521da2cf;hpb=776ee6748a6110bbdc3b727fb6cd1ce3c1594e35;p=vpp.git diff --git a/Makefile b/Makefile index 78163386941..96db6004e84 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 @@ -679,7 +686,7 @@ checkstyle-python: @make -C test checkstyle-python-all .PHONY: checkstyle-all -checkstyle-all: checkstyle-commit checkstyle checkstyle-python +checkstyle-all: checkstyle-commit checkstyle checkstyle-python docs-spell .PHONY: fixstyle fixstyle: