From 4eb4564a5ead94e3f1d844fbcd4b3f3022fa3095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 27 Jan 2023 12:45:19 +0100 Subject: [PATCH 1/3] CCv0: runtime-rs: Don't try to build on Power MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As done for s390x, let's just skip the runtime-rs build for Power. Fixes: #6142 Signed-off-by: Fabiano Fidêncio (cherry picked from commit 4e2db96ef76d48de3bd8cff119d27b64a478f75d) --- src/runtime-rs/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile index ffe7a934bc..23e963f786 100644 --- a/src/runtime-rs/Makefile +++ b/src/runtime-rs/Makefile @@ -28,6 +28,13 @@ default: test: @echo "s390x not support currently" exit 0 +else ifeq ($(ARCH), powerpc64le) +default: + @echo "PowerPC 64 LE is not currently supported" + exit 0 +test: + @echo "PowerPC 64 LE is not currently supported" + exit 0 else ##TARGET default: build code default: runtime show-header From 4aac40b92a5b15b8dbbb994594e2811eec242527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 27 Jan 2023 12:49:19 +0100 Subject: [PATCH 2/3] CCv0: runtime-rs: Improve s390x error message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Nothing much to add, let's just make the message more clear. Signed-off-by: Fabiano Fidêncio (cherry picked from commit c0713553597660be7d999446a815a05cf831c0f3) --- src/runtime-rs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile index 23e963f786..ce0ba74cc6 100644 --- a/src/runtime-rs/Makefile +++ b/src/runtime-rs/Makefile @@ -23,10 +23,10 @@ ARCH_FILE = $(ARCH_DIR)/$(ARCH)$(ARCH_FILE_SUFFIX) ifeq ($(ARCH), s390x) default: - @echo "s390x not support currently" + @echo "s390x is not currently supported" exit 0 test: - @echo "s390x not support currently" + @echo "s390x is not currently supported" exit 0 else ifeq ($(ARCH), powerpc64le) default: From e546e9532e75d3bb632894295def99ea1e6b34b5 Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Mon, 13 Feb 2023 20:56:00 +0100 Subject: [PATCH 3/3] CCv0: runtime-rs: Include target install in conditional branch A Makefile target `install` should be included in the conditional branch as default and test. Signed-off-by: Hyounggyu Choi (cherry picked from commit 4139d68d516c2272c76cc042d4b885a22621e526) --- src/runtime-rs/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile index ce0ba74cc6..b50ed39917 100644 --- a/src/runtime-rs/Makefile +++ b/src/runtime-rs/Makefile @@ -28,6 +28,9 @@ default: test: @echo "s390x is not currently supported" exit 0 +install: + @echo "s390x is not currently supported" + exit 0 else ifeq ($(ARCH), powerpc64le) default: @echo "PowerPC 64 LE is not currently supported" @@ -35,12 +38,16 @@ default: test: @echo "PowerPC 64 LE is not currently supported" exit 0 +install: + @echo "PowerPC 64 LE is not currently supported" + exit 0 else ##TARGET default: build code default: runtime show-header ##TARGET test: run cargo tests test: @cargo test --all --target $(TRIPLE) $(EXTRA_RUSTFEATURES) -- --nocapture +install: install-runtime install-configs endif ifeq (,$(realpath $(ARCH_FILE))) @@ -491,8 +498,6 @@ codecov: check_tarpaulin codecov-html: check_tarpaulin cargo tarpaulin $(TARPAULIN_ARGS) -o Html -install: install-runtime install-configs - install-runtime: runtime install -D $(TARGET_PATH) $(DESTDIR)$(BINDIR)/$(notdir $(TARGET_PATH))