ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Cleanup python2 from suse build and uplift opensuse version

Browse Source 
- 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>
This commit is contained in:
Laszlo Kiraly
2022-09-02 14:08:36 +02:00
committed by Beno�t Ganne
parent 5085d8a945
commit 987318e0d1
3 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@ -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 = autoconf automake ccache check-devel chrpath
RPM_SUSE_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja python3-ply 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 = glibc-devel-static libnuma-devel libelf-devel
RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel libuuid-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 = python3-devel python3-pip python3-rpm-macros
RPM_SUSE_PYTHON_DEPS += python-rpm-macros 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_ID),opensuse-leap)
ifeq ($(OS_VERSION_ID),15.3) RPM_SUSE_DEVEL_DEPS += xmlto openssl-devel asciidoc git nasm
RPM_SUSE_DEVEL_DEPS += curl libstdc++-devel bison gcc-c++ zlib-devel xmlto RPM_SUSE_PYTHON_DEPS += python3 python3-ply python3-virtualenv
RPM_SUSE_DEVEL_DEPS += lsb-release RPM_SUSE_PLATFORM_DEPS += distribution-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
endif endif
RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS) 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 dnf install $(CONFIRM) $(RPM_DEPENDS)
@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib
endif 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 refresh
@sudo -E zypper install -y $(RPM_SUSE_DEPENDS) @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
else else

3
extras/rpm/opensuse/Dockerfile
View File

@ -1,11 +1,12 @@
# Run from top of vpp repo with command: # Run from top of vpp repo with command:
# docker build -f extras/rpm/opensuse/Dockerfile . # docker build -f extras/rpm/opensuse/Dockerfile .
ARG SUSE_VERSION=15.3 ARG SUSE_VERSION=15.4
FROM opensuse/leap:${SUSE_VERSION} as vppbuild FROM opensuse/leap:${SUSE_VERSION} as vppbuild
COPY . /vpp COPY . /vpp
WORKDIR /vpp WORKDIR /vpp
RUN zypper refresh
RUN zypper install -y make sudo RUN zypper install -y make sudo
COPY . . COPY . .
RUN UNATTENDED=y make install-dep RUN UNATTENDED=y make install-dep

6
extras/rpm/opensuse/vpp.spec
View File

@ -46,12 +46,10 @@ BuildRequires: libtool
BuildRequires: lsb-release BuildRequires: lsb-release
BuildRequires: make BuildRequires: make
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: python-devel
BuildRequires: python-pip
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
BuildRequires: python2-ply
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-pip BuildRequires: python3-pip
BuildRequires: python3-ply
BuildRequires: shadow BuildRequires: shadow
Conflicts: otherproviders(vpp-any) Conflicts: otherproviders(vpp-any)
Provides: %{name}-any = %{version} Provides: %{name}-any = %{version}
@ -126,7 +124,7 @@ Group: Development/Libraries/Python
Requires: %{lname} = %{version} Requires: %{lname} = %{version}
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: %{name}-devel = %{version} Requires: %{name}-devel = %{version}
Requires: python-setuptools Requires: python3-setuptools
Conflicts: otherproviders(%{name}-any-python-api) Conflicts: otherproviders(%{name}-any-python-api)
Provides: %{name}-any-python-api = %{version} Provides: %{name}-any-python-api = %{version}