build: Cleanup python2 from suse build and uplift opensuse version

 - default to opensuse-leap 15.4, no python2 support in this version
 - deprecate version openSUSE 15.0, openSUSE 15.3 still supported

Type: make

Signed-off-by: Laszlo Kiraly <laszlo.kiraly@est.tech>
Change-Id: Ic7178ff5238e2669bc45166c1f13d3f077f6069b
Signed-off-by: Laszlo Kiraly <laszlo.kiraly@est.tech>

diff --git a/Makefile b/Makefile
index 96db600..4cd9e9b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -164,25 +164,18 @@ RPM_DEPENDS_DEBUG += yum-plugin-auto-update-debug-info
 RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath
 RPM_SUSE_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja python3-ply
 
-RPM_SUSE_DEVEL_DEPS = glibc-devel-static libnuma-devel libelf-devel nasm
-RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel libuuid-devel
+RPM_SUSE_DEVEL_DEPS = glibc-devel-static libnuma-devel libelf-devel
+RPM_SUSE_DEVEL_DEPS += libopenssl-devel libuuid-devel lsb-release
+RPM_SUSE_DEVEL_DEPS += curl libstdc++-devel bison gcc-c++ zlib-devel
 
-RPM_SUSE_PYTHON_DEPS = python-devel python3-devel python-pip python3-pip
-RPM_SUSE_PYTHON_DEPS += python-rpm-macros python3-rpm-macros
+RPM_SUSE_PYTHON_DEPS = python3-devel python3-pip python3-rpm-macros
 
-RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build
+RPM_SUSE_PLATFORM_DEPS = shadow rpm-build
 
 ifeq ($(OS_ID),opensuse-leap)
-ifeq ($(OS_VERSION_ID),15.3)
-       RPM_SUSE_DEVEL_DEPS += curl libstdc++-devel bison gcc-c++ zlib-devel xmlto
-       RPM_SUSE_DEVEL_DEPS += lsb-release
-       RPM_SUSE_DEVEL_DEPS += asciidoc git
-       RPM_SUSE_PYTHON_DEPS += python3 python2-ply
-endif
-ifeq ($(OS_VERSION_ID),15.0)
-       RPM_SUSE_DEVEL_DEPS += gcc git curl
-       RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv
-endif
+       RPM_SUSE_DEVEL_DEPS += xmlto openssl-devel asciidoc git nasm
+       RPM_SUSE_PYTHON_DEPS += python3 python3-ply python3-virtualenv
+       RPM_SUSE_PLATFORM_DEPS += distribution-release
 endif
 
 RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS)
@@ -340,7 +333,7 @@ else ifeq ($(OS_ID),fedora)
        @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS)
        @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib
 endif
-else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID))
+else ifeq ($(filter opensuse-leap-15.3 opensuse-leap-15.4 ,$(OS_ID)-$(OS_VERSION_ID)),$(OS_ID)-$(OS_VERSION_ID))
        @sudo -E zypper refresh
        @sudo -E zypper install  -y $(RPM_SUSE_DEPENDS)
 else

diff --git a/extras/rpm/opensuse/Dockerfile b/extras/rpm/opensuse/Dockerfile
index 47ca271..34a39ea 100644 (file)
--- a/extras/rpm/opensuse/Dockerfile
+++ b/extras/rpm/opensuse/Dockerfile
@@ -1,11 +1,12 @@
 # Run from top of vpp repo with command:
 # docker build -f extras/rpm/opensuse/Dockerfile .
 
-ARG SUSE_VERSION=15.3
+ARG SUSE_VERSION=15.4
 
 FROM opensuse/leap:${SUSE_VERSION} as vppbuild
 COPY . /vpp
 WORKDIR /vpp
+RUN zypper refresh
 RUN zypper install -y make sudo
 COPY . .
 RUN UNATTENDED=y make install-dep

diff --git a/extras/rpm/opensuse/vpp.spec b/extras/rpm/opensuse/vpp.spec
index b562eac..d9a582e 100644 (file)
--- a/extras/rpm/opensuse/vpp.spec
+++ b/extras/rpm/opensuse/vpp.spec
@@ -46,12 +46,10 @@ BuildRequires:  libtool
 BuildRequires:  lsb-release
 BuildRequires:  make
 BuildRequires:  openssl-devel
-BuildRequires:  python-devel
-BuildRequires:  python-pip
 BuildRequires:  python-rpm-macros
-BuildRequires:  python2-ply
 BuildRequires:  python3-devel
 BuildRequires:  python3-pip
+BuildRequires:  python3-ply
 BuildRequires:  shadow
 Conflicts:      otherproviders(vpp-any)
 Provides:       %{name}-any = %{version}
@@ -126,7 +124,7 @@ Group:          Development/Libraries/Python
 Requires:       %{lname} = %{version}
 Requires:       %{name} = %{version}
 Requires:       %{name}-devel = %{version}
-Requires:       python-setuptools
+Requires:       python3-setuptools
 Conflicts:      otherproviders(%{name}-any-python-api)
 Provides:       %{name}-any-python-api = %{version}