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

openSUSE build fix

Browse Source 
* Fixed package dependency
* Fixed bash unary operation error

Change-Id: I782dda8ffd807931241fa6034c110f5fedbeca8e
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
This commit is contained in:
Marco Varlese
2017-09-22 17:53:53 +02:00
committed by Chris Luke
parent b66201f761
commit dc33d4ccb3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -108,7 +108,7 @@ else ifeq ($(findstring y,$(AESNI)),y)
endif
RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel
RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool make openssl-devel
RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel python3
ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))

8
extras/vagrant/build.sh
View File

@ -72,12 +72,14 @@ fi
# Build and install packaging
$SUDOCMD make bootstrap
if [ $DISTRIB_ID == "Ubuntu" ]; then
if [ "$DISTRIB_ID" == "Ubuntu" ]; then
$SUDOCMD make pkg-deb
elif [ $DISTRIB_ID == "debian" ]; then
elif [ "$DISTRIB_ID" == "debian" ]; then
$SUDOCMD make pkg-deb
elif [ $DISTRIB_ID == "CentOS" ]; then
elif [ "$DISTRIB_ID" == "CentOS" ]; then
(cd $VPP_DIR/vnet ;$SUDOCMD aclocal;$SUDOCMD automake -a)
$SUDOCMD make pkg-rpm
elif [ "$DISTRIB_ID" == "opensuse" ]; then
$SUDOCMD make build-release
fi