summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfisherxu <xufei40@huawei.com>2019-08-31 18:27:34 +0800
committerfisherxu <xufei40@huawei.com>2019-09-04 12:00:47 +0800
commit6dca09afaa3ef1cae96b4b89afd7505d271c76f9 (patch)
tree2ba3fb255a1bc49c6507f94f1f0cbe1acfddd644
parentadd local-up kubeedge script (diff)
downloadkubeedge-6dca09afaa3ef1cae96b4b89afd7505d271c76f9.tar.gz
add _output to .gitignore
-rw-r--r--.gitignore1
-rw-r--r--Makefile4
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index df163d97b..e96fcc6a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ cloud/admission
edge/edgecore
edgesite/edgesite
keadm/keadm
+_output
diff --git a/Makefile b/Makefile
index 50fbaef9a..c0d5d0081 100644
--- a/Makefile
+++ b/Makefile
@@ -24,12 +24,12 @@ all:
$(MAKE) -C edgesite
else ifeq ($(WHAT),keadm)
all:
-# make all WHAT=keadm, build keadm binary
+# make all WHAT=keadm
cd keadm && $(MAKE)
else
# invalid entry
all:
- @echo $S"invalid option please choose to build either cloud, edge, keadm, edgesite or all together"
+ @echo $S"invalid option please choose to build either cloudcore, admission, edgecore, keadm, edgesite or all together"
endif
# unit tests