From 693b7026a8da00d4b325f1cde09959d88696b294 Mon Sep 17 00:00:00 2001 From: Sachin Date: Sat, 18 Jun 2016 15:28:08 +0530 Subject: Enhanced RPM build process to make rpm for any given platform - Currently default rpm.spec only look for "install-vpp-native" Change-Id: Iaa78c46ae62d2747bda6ffc1189cb8ac6d578bd8 Signed-off-by: Sachin --- build-data/platforms.mk | 3 ++- build-root/rpm/vpp.spec | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build-data/platforms.mk b/build-data/platforms.mk index 8a18ec14d5c..625006b474f 100644 --- a/build-data/platforms.mk +++ b/build-data/platforms.mk @@ -72,6 +72,7 @@ install-rpm: $(patsubst %,%-find-source,$(ROOT_PACKAGES)) $(ROOT_PACKAGES)) || exit 1; \ \ cd rpm ; \ - rpmbuild -bb --define "_topdir $$PWD" vpp.spec ; \ + rpmbuild -bb --define "_topdir $$PWD" --define \ + "_install_dir $(INSTALL_PREFIX)$(ARCH)" vpp.spec ; \ mv $$(find RPMS -name \*.rpm -type f) .. diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec index b02b2bfe8ef..4a666e68aa4 100644 --- a/build-root/rpm/vpp.spec +++ b/build-root/rpm/vpp.spec @@ -1,4 +1,4 @@ -%define _vpp_install_dir ../install-vpp-native +%define _vpp_install_dir ../%{_install_dir} %define _vpp_build_dir ../build-tool-native %define _unitdir /lib/systemd/system %define _topdir %(pwd) -- cgit 1.2.3-korg