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

Add build-root/*.rpm to .gitignore

Browse Source 
Change-Id: I88398b5e538271efa4657851bf53c9b76a56b432
Signed-off-by: Ed Warnicke <eaw@cisco.com>
This commit is contained in:
Ed Warnicke
2016-03-22 16:09:29 -05:00
committed by Gerrit Code Review
parent aca36e1bd2
commit 84eda9de0b
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,6 +8,7 @@
/build-root/path_setup
/build-root/build-config.mk
/build-root/*.deb
/build-root/*.rpm
/build-root/*.changes
/build-config.mk
/dpdk/*.tar.gz

11
Makefile
View File

@ -26,6 +26,11 @@ DEB_DEPENDS = curl build-essential autoconf automake bison libssl-dev ccache
DEB_DEPENDS += debhelper dkms openjdk-7-jdk git libtool libganglia1-dev libapr1-dev
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
RPM_DEPENDS_GROUPS = 'Development Tools'
RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel
RPM_DEPENDS += openssl-devel epel-release apr-devel
EPEL_DEPENDS = libconfuse-devel ganglia-devel
ifneq ("$(wildcard $(STARTUP_DIR)/startup.conf),"")
STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
endif
@ -104,8 +109,12 @@ bootstrap: $(BR)/.bootstrap.ok
install-dep:
ifeq ("$(shell lsb_release -si)", "Ubuntu")
@sudo apt-get -y install $(DEB_DEPENDS)
else ifneq ("$(wildcard /etc/redhat-release)","")
@sudo yum groupinstall -y $(RPM_DEPENDS_GROUPS)
@sudo yum install -y $(RPM_DEPENDS)
@sudo yum install -y --enablerepo=epel $(EPEL_DEPENDS)
else
$(error "This option currently works only on Ubuntu systems")
$(error "This option currently works only on Ubuntu or Centos systems")
endif
define make