Skip to content

Commit a87d6ac

Browse files
authored
fix: properly set socket_vmnet version (#38)
Signed-off-by: Justin Alvarez <alvajus@amazon.com> Issue #, if available: runfinch/finch#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 <alvajus@amazon.com>
1 parent ee0737f commit a87d6ac

File tree

3 files changed

+6
-17
lines changed

3 files changed

+6
-17
lines changed

Makefile

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ FINCH_OS_x86_DIGEST := $(or $(FINCH_OS_x86_DIGEST),"sha256:9490055bc67d883711352
1818
# From https://dl.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/aarch64/images/
1919
FINCH_OS_AARCH64_URL := $(or $(FINCH_OS_AARCH64_URL),https://deps.runfinch.com/Fedora-Cloud-Base-37-1.7.aarch64-20230124190350.qcow2)
2020
FINCH_OS_AARCH64_DIGEST := $(or $(FINCH_OS_AARCH64_DIGEST),"sha256:091a3f2b963f7ce1ec961630e52f59d6cd167b614851bf9abea79566e0f41379")
21-
SOCKET_VMNET_URL := $(or $(SOCKET_VMNET_URL),https://deps.runfinch.com/socket_vmnet-1.0.0-alpha.tar.gz)
2221

2322
.DEFAULT_GOAL := all
2423

@@ -39,9 +38,6 @@ endif
3938
FINCH_OS_IMAGE_LOCATION ?= $(OUTDIR)/os/$(FINCH_OS_BASENAME)
4039
FINCH_OS_IMAGE_INSTALLATION_LOCATION ?= $(DEST)/os/$(FINCH_OS_BASENAME)
4140

42-
SOCKET_VMNET_BASENAME := $(notdir $(SOCKET_VMNET_URL))
43-
SOCKET_VMNET_DEPDIR := $(DOWNLOAD_DIR)/$(basename $(SOCKET_VMNET_BASENAME))
44-
4541
.PHONY: all
4642
all: binaries
4743

@@ -54,13 +50,8 @@ download.os:
5450
curl -L --fail $(FINCH_OS_IMAGE_URL) > "$(OS_DOWNLOAD_DIR)/$(FINCH_OS_BASENAME)"
5551
cd $(OS_DOWNLOAD_DIR) && shasum -a 512 --check $(HASH_DIR)/$(FINCH_OS_BASENAME).sha512 || exit 1
5652

57-
.PHONY: download.socket_vmnet
58-
download.socket_vmnet:
59-
curl -L --fail $(SOCKET_VMNET_URL) > "$(DOWNLOAD_DIR)/$(SOCKET_VMNET_BASENAME)"
60-
cd $(DOWNLOAD_DIR) && shasum -a 512 --check $(HASH_DIR)/"$(SOCKET_VMNET_BASENAME).sha512" || exit 1
61-
6253
.PHONY: download
63-
download: download.os download.socket_vmnet
54+
download: download.os
6455

6556
.PHONY: lima
6657
lima:
@@ -79,10 +70,10 @@ lima-template: download
7970
rm $(OUTDIR)/lima-template/*.yaml.bak
8071

8172
.PHONY: lima-socket-vmnet
82-
lima-socket-vmnet: download.socket_vmnet
83-
mkdir -p $(SOCKET_VMNET_DEPDIR)
84-
tar -zvxf "$(DOWNLOAD_DIR)/$(SOCKET_VMNET_BASENAME)" -C $(SOCKET_VMNET_DEPDIR) --strip-component=1
85-
cd $(SOCKET_VMNET_DEPDIR) && $(MAKE) PREFIX=$(SOCKET_VMNET_TEMP_PREFIX) install.bin
73+
lima-socket-vmnet:
74+
git submodule update --init --recursive src/socket_vmnet
75+
cd src/socket_vmnet && git clean -f -d
76+
cd src/socket_vmnet && PREFIX=$(SOCKET_VMNET_TEMP_PREFIX) $(MAKE) install.bin
8677

8778
.PHONY: install-deps
8879
install-deps: lima

hashes/socket_vmnet-1.0.0-alpha.tar.gz.sha512

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/socket_vmnet

Submodule socket_vmnet updated 1 file

0 commit comments

Comments
 (0)