diff options
| author |   Laszlo Kiraly <laszlo.kiraly@est.tech> | 2022-09-02 14:08:36 +0200 |
|---|---|---|
| committer |   Beno�t Ganne <bganne@cisco.com> | 2022-09-07 13:04:14 +0000 |
| commit | 987318e0d12d8d5cb9706974e7117696f81b2bf1 (patch) | |
| tree | 1ebc1cbb5e7f6fae6ccdb16f3f25f4a954debe00 /extras/rpm | |
| parent | 5085d8a9456f4a75fcb8b7d263202e6ac3a7a441 (diff) | |
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>
Diffstat (limited to 'extras/rpm')
| -rw-r--r-- | extras/rpm/opensuse/Dockerfile | 3 | ||||
| -rw-r--r-- | extras/rpm/opensuse/vpp.spec | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/extras/rpm/opensuse/Dockerfile b/extras/rpm/opensuse/Dockerfile index 47ca27134a4..34a39ea7765 100644 --- 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 b562eac67ba..d9a582ebddd 100644 --- 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} |