From: Dave Wallace Date: Thu, 24 Sep 2020 16:30:46 +0000 (-0400) Subject: build: remove OS distros which are EOL X-Git-Tag: v21.06-rc0~460 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=1e26143d0e044606db902565b29883beec459ae0;p=vpp.git build: remove OS distros which are EOL Type: fix Signed-off-by: Dave Wallace Change-Id: If80ff6bfbd42779a663af1e7dcfff80d75f47f1e --- diff --git a/Makefile b/Makefile index 6a4886ff667..5af0d5707e0 100644 --- a/Makefile +++ b/Makefile @@ -83,10 +83,6 @@ else ifeq ($(OS_VERSION_ID),20.04) DEB_DEPENDS += libssl-dev DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) LIBFFI=libffi7 -else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) - DEB_DEPENDS += libssl-dev - DEB_DEPENDS += python-dev python-all python-pip python-virtualenv - APT_ARGS = -t jessie-backports else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9) DEB_DEPENDS += libssl1.0-dev DEB_DEPENDS += python-all python-pip @@ -278,13 +274,6 @@ bootstrap: .PHONY: install-dep install-dep: ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) -ifeq ($(OS_VERSION_ID),14.04) - @sudo -E apt-get $(CONFIRM) $(FORCE) install software-properties-common -endif -ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) - @grep -q jessie-backports /etc/apt/sources.list /etc/apt/sources.list.d/* 2> /dev/null \ - || ( echo "Please install jessie-backports" ; exit 1 ) -endif @sudo -E apt-get update @sudo -E apt-get $(APT_ARGS) $(CONFIRM) $(FORCE) install $(DEB_DEPENDS) else ifneq ("$(wildcard /etc/redhat-release)","")