From a87d6ac36ca502bece808e5a5eb7355c84d027d1 Mon Sep 17 00:00:00 2001 From: Justin Date: Wed, 25 Jan 2023 19:41:11 -0500 Subject: [PATCH] fix: properly set socket_vmnet version (#38) Signed-off-by: Justin Alvarez Issue #, if available: https://github.com/runfinch/finch/issues/21 *Description of changes:* Updates the socket_vmnet target to use the submodule which fixes the version issue. *Testing done:* - Tested locally with latest finch main commit: ```shell $ make lima-socket-vmnet $ ./_output/dependencies/lima-socket_vmnet/opt/finch/bin/socket_vmnet --version > v1.1.0-4-g910aaef ``` - [x] I've reviewed the guidance in CONTRIBUTING.md #### License Acceptance By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. Signed-off-by: Justin Alvarez --- Makefile | 19 +++++-------------- hashes/socket_vmnet-1.0.0-alpha.tar.gz.sha512 | 2 -- src/socket_vmnet | 2 +- 3 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 hashes/socket_vmnet-1.0.0-alpha.tar.gz.sha512 diff --git a/Makefile b/Makefile index e2940f2..20f3b9c 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,6 @@ FINCH_OS_x86_DIGEST := $(or $(FINCH_OS_x86_DIGEST),"sha256:9490055bc67d883711352 # From https://dl.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/aarch64/images/ FINCH_OS_AARCH64_URL := $(or $(FINCH_OS_AARCH64_URL),https://deps.runfinch.com/Fedora-Cloud-Base-37-1.7.aarch64-20230124190350.qcow2) FINCH_OS_AARCH64_DIGEST := $(or $(FINCH_OS_AARCH64_DIGEST),"sha256:091a3f2b963f7ce1ec961630e52f59d6cd167b614851bf9abea79566e0f41379") -SOCKET_VMNET_URL := $(or $(SOCKET_VMNET_URL),https://deps.runfinch.com/socket_vmnet-1.0.0-alpha.tar.gz) .DEFAULT_GOAL := all @@ -39,9 +38,6 @@ endif FINCH_OS_IMAGE_LOCATION ?= $(OUTDIR)/os/$(FINCH_OS_BASENAME) FINCH_OS_IMAGE_INSTALLATION_LOCATION ?= $(DEST)/os/$(FINCH_OS_BASENAME) -SOCKET_VMNET_BASENAME := $(notdir $(SOCKET_VMNET_URL)) -SOCKET_VMNET_DEPDIR := $(DOWNLOAD_DIR)/$(basename $(SOCKET_VMNET_BASENAME)) - .PHONY: all all: binaries @@ -54,13 +50,8 @@ download.os: curl -L --fail $(FINCH_OS_IMAGE_URL) > "$(OS_DOWNLOAD_DIR)/$(FINCH_OS_BASENAME)" cd $(OS_DOWNLOAD_DIR) && shasum -a 512 --check $(HASH_DIR)/$(FINCH_OS_BASENAME).sha512 || exit 1 -.PHONY: download.socket_vmnet -download.socket_vmnet: - curl -L --fail $(SOCKET_VMNET_URL) > "$(DOWNLOAD_DIR)/$(SOCKET_VMNET_BASENAME)" - cd $(DOWNLOAD_DIR) && shasum -a 512 --check $(HASH_DIR)/"$(SOCKET_VMNET_BASENAME).sha512" || exit 1 - .PHONY: download -download: download.os download.socket_vmnet +download: download.os .PHONY: lima lima: @@ -79,10 +70,10 @@ lima-template: download rm $(OUTDIR)/lima-template/*.yaml.bak .PHONY: lima-socket-vmnet -lima-socket-vmnet: download.socket_vmnet - mkdir -p $(SOCKET_VMNET_DEPDIR) - tar -zvxf "$(DOWNLOAD_DIR)/$(SOCKET_VMNET_BASENAME)" -C $(SOCKET_VMNET_DEPDIR) --strip-component=1 - cd $(SOCKET_VMNET_DEPDIR) && $(MAKE) PREFIX=$(SOCKET_VMNET_TEMP_PREFIX) install.bin +lima-socket-vmnet: + git submodule update --init --recursive src/socket_vmnet + cd src/socket_vmnet && git clean -f -d + cd src/socket_vmnet && PREFIX=$(SOCKET_VMNET_TEMP_PREFIX) $(MAKE) install.bin .PHONY: install-deps install-deps: lima diff --git a/hashes/socket_vmnet-1.0.0-alpha.tar.gz.sha512 b/hashes/socket_vmnet-1.0.0-alpha.tar.gz.sha512 deleted file mode 100644 index ed92014..0000000 --- a/hashes/socket_vmnet-1.0.0-alpha.tar.gz.sha512 +++ /dev/null @@ -1,2 +0,0 @@ -# https://deps.runfinch.com/socket_vmnet-1.0.0-alpha.tar.gz -4dd2b400580e010f2d7bd177b87e7e12d1914da3ea618b76709c763729de6eb07cc6a09c5e196de9b8fd254ffa683938734e10254cecd6431943b6a5b46864e3 *socket_vmnet-1.0.0-alpha.tar.gz diff --git a/src/socket_vmnet b/src/socket_vmnet index 663d91e..910aaef 160000 --- a/src/socket_vmnet +++ b/src/socket_vmnet @@ -1 +1 @@ -Subproject commit 663d91ef555f316b76e10968b284539b373e127a +Subproject commit 910aaef9a284550fe4dabc5b85cce88d524262b1