summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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)