summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Burns (alagalah) <alagalah@gmail.com>2016-06-17 12:54:17 -0700
committerFlorin Coras <florin.coras@gmail.com>2016-06-17 22:11:04 +0000
commitf289ca6bc6be76216a23320dab8aa4ce4b284c05 (patch)
tree233c632979bd5918a10f0f30eb9073708d8697bf
parentd65346098daf8967e882d0299679a131769c9be9 (diff)
Updated Makefile so install-dep doesn't prompt
Change-Id: I8e5f4d120c9add636054e740f2a8aa3a0f8bb7d1 Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index c3380e7455e..94ba90d0821 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,7 @@ endif
ifeq ($(findstring y,$(UNATTENDED)),y)
CONFIRM=-y
+FORCE=--force-yes
endif
.PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
@@ -128,11 +129,11 @@ bootstrap: $(BR)/.bootstrap.ok
install-dep:
ifeq ($(OS_ID),ubuntu)
ifeq ($(OS_VERSION_ID),14.04)
- @sudo -E apt-get $(CONFIRM) install software-properties-common
- @sudo -E add-apt-repository $(CONFIRM) ppa:openjdk-r/ppa
+ @sudo -E apt-get $(CONFIRM) $(FORCE) install software-properties-common
+ @sudo -E add-apt-repository ppa:openjdk-r/ppa $(CONFIRM)
@sudo -E apt-get update
endif
- @sudo -E apt-get $(CONFIRM) install $(DEB_DEPENDS)
+ @sudo -E apt-get $(CONFIRM) $(FORCE) install $(DEB_DEPENDS)
else ifneq ("$(wildcard /etc/redhat-release)","")
@sudo yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
@sudo yum install $(CONFIRM) $(RPM_DEPENDS)