diff options
| author |   Marco Varlese <marco.varlese@suse.de> | 2018-08-21 11:51:19 +0200 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-08-21 14:46:28 +0000 |
| commit | aa839cab981c345801798caec373ec8cda86195f (patch) | |
| tree | 45969947d975086d0d455a662ffeeb7ee0be1165 | |
| parent | a74ee1f7aa48507d9d9fc5f7c9ac1dad32fe4acc (diff) | |
SUSE: rpm-packaging fixes
Change-Id: Ic7ddc34bbb2fe414d41a083efd8caf35a12488ab
Signed-off-by: Marco Varlese <marco.varlese@suse.de>
| -rw-r--r-- | extras/rpm/Makefile | 9 | ||||
| -rw-r--r-- | extras/rpm/vpp-suse.spec | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/extras/rpm/Makefile b/extras/rpm/Makefile index 4bbeab55e60..423c4207b02 100644 --- a/extras/rpm/Makefile +++ b/extras/rpm/Makefile @@ -26,7 +26,14 @@ PC=% all: RPM -ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID)) +# SUSE rolling-release (a.k.a. Tumbleweed) +ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID)) +SPEC_FILE='vpp-suse.spec' +# SUSE osleap15 +else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID)) +SPEC_FILE='vpp-suse.spec' +# SUSE leap42.x +else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID)) SPEC_FILE='vpp-suse.spec' else SPEC_FILE='vpp.spec' diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec index 3da2383218c..e1b9bd73c9b 100644 --- a/extras/rpm/vpp-suse.spec +++ b/extras/rpm/vpp-suse.spec @@ -157,7 +157,7 @@ This package contains the python bindings for the vpp api export VPP_BUILD_USER=suse export VPP_BUILD_HOST=SUSE -make V=1 PLATFORM=vpp build-release +make V=1 PLATFORM=vpp vpp_uses_cmake=no build-release cd %{_vpp_build_dir}/../src/vpp-api/python && %{py2_build} |