Skip to content

Commit 4979877

Browse files
authored
Merge pull request #5802 from twz123/makefile-riscv64
Add initial RISC-V support to Makefile
2 parents b5065e1 + 868dfae commit 4979877

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

Makefile

+10-6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ ifneq (, $(filter $(HOST_HARDWARE), aarch64 arm64))
88
HOST_ARCH := arm64
99
else ifneq (, $(filter $(HOST_HARDWARE), armv8l armv7l arm))
1010
HOST_ARCH := arm
11+
else ifneq (, $(filter $(HOST_HARDWARE), riscv64))
12+
HOST_ARCH := riscv64
1113
else
1214
ifeq (, $(filter $(HOST_HARDWARE), x86_64 amd64 x64))
1315
$(warning unknown machine hardware name $(HOST_HARDWARE), assuming amd64)
@@ -237,12 +239,14 @@ lint: lint-copyright lint-go
237239
airgap-images.txt: k0s $(GO_ENV_REQUISITES)
238240
$(GO_ENV) ./k0s airgap list-images --all > '$@'
239241

240-
airgap-image-bundle-linux-amd64.tar: TARGET_PLATFORM := linux/amd64
241-
airgap-image-bundle-linux-arm64.tar: TARGET_PLATFORM := linux/arm64
242-
airgap-image-bundle-linux-arm.tar: TARGET_PLATFORM := linux/arm/v7
242+
airgap-image-bundle-linux-amd64.tar: TARGET_PLATFORM := linux/amd64
243+
airgap-image-bundle-linux-arm64.tar: TARGET_PLATFORM := linux/arm64
244+
airgap-image-bundle-linux-arm.tar: TARGET_PLATFORM := linux/arm/v7
245+
airgap-image-bundle-linux-riscv64.tar: TARGET_PLATFORM := linux/riscv64
243246
airgap-image-bundle-linux-amd64.tar \
244247
airgap-image-bundle-linux-arm64.tar \
245-
airgap-image-bundle-linux-arm.tar: .k0sbuild.image-bundler.stamp airgap-images.txt
248+
airgap-image-bundle-linux-arm.tar \
249+
airgap-image-bundle-linux-riscv64.tar: .k0sbuild.image-bundler.stamp airgap-images.txt
246250
$(DOCKER) run --rm -i --privileged \
247251
-e TARGET_PLATFORM='$(TARGET_PLATFORM)' \
248252
'$(shell cat .k0sbuild.image-bundler.stamp)' < airgap-images.txt > '$@'
@@ -261,7 +265,7 @@ $(smoketests): k0s
261265
smoketests: $(smoketests)
262266

263267
.PHONY: check-unit
264-
ifneq (, $(filter $(HOST_ARCH), arm))
268+
ifneq (, $(filter $(HOST_ARCH), arm riscv64))
265269
check-unit: GO_TEST_RACE ?=
266270
else
267271
check-unit: GO_TEST_RACE ?= -race
@@ -285,7 +289,7 @@ clean-airgap-image-bundles: IID_FILES = .k0sbuild.image-bundler.stamp
285289
clean-airgap-image-bundles:
286290
$(clean-iid-files)
287291
-rm airgap-images.txt
288-
-rm airgap-image-bundle-linux-amd64.tar airgap-image-bundle-linux-arm64.tar airgap-image-bundle-linux-arm.tar
292+
-rm airgap-image-bundle-linux-amd64.tar airgap-image-bundle-linux-arm64.tar airgap-image-bundle-linux-arm.tar airgap-image-bundle-linux-riscv64.tar
289293

290294
.PHONY: clean
291295
clean: clean-gocache clean-docker-image clean-airgap-image-bundles

0 commit comments

Comments
 (0)