summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfisherxu <xufei40@huawei.com>2022-01-17 11:17:15 +0800
committerfisherxu <xufei40@huawei.com>2022-01-17 18:15:17 +0800
commit85dcb04e7b08aab41a750c5a907c47bc0b245aae (patch)
tree40b7f379067af24aa00a357382300317f1525245
parentverify go version when call build.sh script (diff)
downloadkubeedge-85dcb04e7b08aab41a750c5a907c47bc0b245aae.tar.gz
fix make release
Signed-off-by: fisherxu <xufei40@huawei.com>
-rw-r--r--Makefile6
-rwxr-xr-xhack/make-rules/release.sh6
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 8cb43c5c3..c99fd4422 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ ifeq ($(HELP),y)
all: clean
@echo "$$ALL_HELP_INFO"
else
-all: clean
+all:
KUBEEDGE_OUTPUT_SUBPATH=$(OUT_DIR) hack/make-rules/build.sh $(WHAT)
endif
@@ -363,7 +363,7 @@ define RELEASE_HELP_INFO
# make release
# make release HELP=y
# make release WHAT=kubeedge
-# make release WHAT=kubeedge GOARM=GOARM7
+# make release WHAT=kubeedge ARM_VERSION=GOARM7
#
endef
.PHONY: release
@@ -372,5 +372,5 @@ release:
@echo "$$RELEASE_HELP_INFO"
else
release:
- hack/make-rules/release.sh $(WHAT) $(GOARM)
+ hack/make-rules/release.sh $(WHAT) $(ARM_VERSION)
endif
diff --git a/hack/make-rules/release.sh b/hack/make-rules/release.sh
index 3db3a7fe3..11937ded0 100755
--- a/hack/make-rules/release.sh
+++ b/hack/make-rules/release.sh
@@ -57,7 +57,7 @@ function release() {
if [ "${ARCH}" == "amd64" ]; then
hack/make-rules/build.sh edgesite-server edgesite-agent
else
- hack/make-rules/crossbuild.sh edgesite-server edgesite-agent ${GOARM}
+ hack/make-rules/crossbuild.sh edgesite-server edgesite-agent ${ARM_VERSION}
fi
build_edgesite_release $VERSION $ARCH
@@ -66,7 +66,7 @@ function release() {
if [ "${ARCH}" == "amd64" ]; then
hack/make-rules/build.sh keadm
else
- hack/make-rules/crossbuild.sh keadm ${GOARM}
+ hack/make-rules/crossbuild.sh keadm ${ARM_VERSION}
fi
build_keadm_release $VERSION $ARCH
@@ -75,7 +75,7 @@ function release() {
if [ "${ARCH}" == "amd64" ]; then
hack/make-rules/build.sh cloudcore admission edgecore csidriver iptablesmanager
else
- hack/make-rules/crossbuild.sh cloudcore admission edgecore csidriver iptablesmanager ${GOARM}
+ hack/make-rules/crossbuild.sh cloudcore admission edgecore csidriver iptablesmanager ${ARM_VERSION}
fi
build_kubeedge_release $VERSION $ARCH