aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Warnicke <eaw@cisco.com>2016-03-22 16:09:29 -0500
committerGerrit Code Review <gerrit@fd.io>2016-03-25 20:28:48 +0000
commit84eda9de0bb3798a86c2c1dac11dd861916a1615 (patch)
treef11171832482407d346ee4f663503aec4ec9ce93
parentaca36e1bd2efe07c43e4c9e3385651afc53a0fe8 (diff)
Add build-root/*.rpm to .gitignore
Change-Id: I88398b5e538271efa4657851bf53c9b76a56b432 Signed-off-by: Ed Warnicke <eaw@cisco.com>
-rw-r--r--.gitignore1
-rw-r--r--Makefile11
2 files changed, 11 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index b2e2c62e8d3..5d1a597acc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/Makefile b/Makefile
index 9b387552db1..109ed6d4258 100644
--- a/Makefile
+++ b/Makefile
@@ -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