Updated Makefile so install-dep doesn't prompt 46/1646/2
authorKeith Burns (alagalah) <alagalah@gmail.com>
Fri, 17 Jun 2016 19:54:17 +0000 (12:54 -0700)
committerFlorin Coras <florin.coras@gmail.com>
Fri, 17 Jun 2016 22:11:04 +0000 (22:11 +0000)
Change-Id: I8e5f4d120c9add636054e740f2a8aa3a0f8bb7d1
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
Makefile

index c3380e7..94ba90d 100644 (file)
--- 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)