Skip to content

Commit

Permalink
Makefile: Bump linuxkit to version 1.5.3
Browse files Browse the repository at this point in the history
Bump linuxkit to version 1.5.3 in order to get a new feature that supports
--tag in build.yml. This version also introduces some changes that
requires some adjusts in the Makefile:

1. Introduces different verbose levels (this commit sets to level 2 to keep
   the same amount of information provided by the current version)
2. Remove --arch parameter from cache command (in favor of a --platform
   docker style parameter)

Signed-off-by: Renê de Souza Pinto <[email protected]>
  • Loading branch information
rene committed Dec 24, 2024
1 parent 0769a20 commit 00e9fb3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ DASH_V :=
QUIET := @
SET_X := :
ifeq ($(V),1)
DASH_V := -v
DASH_V := -v 2
QUIET :=
SET_X := set -x
endif
Expand All @@ -316,7 +316,7 @@ PARSE_PKGS=$(if $(strip $(EVE_HASH)),EVE_HASH=)$(EVE_HASH) DOCKER_ARCH_TAG=$(DOC
LINUXKIT=$(BUILDTOOLS_BIN)/linuxkit
# linuxkit version. This **must** be a published semver version so it can be downloaded already compiled from
# the release page at https://github.com/linuxkit/linuxkit/releases
LINUXKIT_VERSION=v1.5.2
LINUXKIT_VERSION=v1.5.3
LINUXKIT_SOURCE=https://github.com/linuxkit/linuxkit
LINUXKIT_OPTS=$(if $(strip $(EVE_HASH)),--hash) $(EVE_HASH) $(if $(strip $(EVE_REL)),--release) $(EVE_REL)
LINUXKIT_PKG_TARGET=build
Expand Down Expand Up @@ -535,7 +535,7 @@ $(BSP_IMX_PART): PKG=bsp-imx
$(EFI_PART) $(BOOT_PART) $(INITRD_IMG) $(IPXE_IMG) $(BIOS_IMG) $(UBOOT_IMG) $(BSP_IMX_PART): $(LINUXKIT) | $(INSTALLER)
mkdir -p $(dir $@)
$(LINUXKIT) pkg build --pull --platforms linux/$(ZARCH) pkg/$(PKG) # running linuxkit pkg build _without_ force ensures that we either pull it down or build it.
cd $(dir $@) && $(LINUXKIT) cache export --arch $(DOCKER_ARCH_TAG) --format filesystem --outfile - $(shell $(LINUXKIT) pkg show-tag pkg/$(PKG)) | tar xvf - $(notdir $@)
cd $(dir $@) && $(LINUXKIT) cache export --platform linux/$(DOCKER_ARCH_TAG) --format filesystem --outfile - $(shell $(LINUXKIT) pkg show-tag pkg/$(PKG)) | tar xvf - $(notdir $@)
$(QUIET): $@: Succeeded

# run swtpm if TPM flag defined
Expand Down Expand Up @@ -896,7 +896,7 @@ endif
## exports an image from the linuxkit cache to stdout
cache-export: image-set outfile-set $(LINUXKIT)
$(eval IMAGE_TAG_OPT := $(if $(IMAGE_NAME),--name $(IMAGE_NAME),))
$(LINUXKIT) $(DASH_V) cache export --format docker --arch $(ZARCH) --outfile $(OUTFILE) $(IMAGE_TAG_OPT) $(IMAGE)
$(LINUXKIT) $(DASH_V) cache export --format docker --platform linux/$(ZARCH) --outfile $(OUTFILE) $(IMAGE_TAG_OPT) $(IMAGE)

## export an image from linuxkit cache and load it into docker.
cache-export-docker-load: $(LINUXKIT)
Expand Down

0 comments on commit 00e9fb3

Please sign in to comment.