From 7f39bceabb076b9157cb19c335956f51d5ad6849 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 22 May 2024 15:44:03 +0400 Subject: [PATCH] feat: update Linux firmware to 20240513 Via pkgs update. Signed-off-by: Andrey Smirnov --- .kres.yaml | 2 +- Makefile | 19 +++++++------------ Pkgfile | 2 +- hack/release.toml | 1 + 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.kres.yaml b/.kres.yaml index 1ff50db0..f7051212 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -53,7 +53,7 @@ spec: - name: EXTENSIONS_IMAGE_REF defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG) - name: PKGS - defaultValue: v1.8.0-alpha.0-15-gf9559de + defaultValue: v1.8.0-alpha.0-19-gf350879 - name: PKGS_PREFIX defaultValue: ghcr.io/siderolabs useBldrPkgTagResolver: true diff --git a/Makefile b/Makefile index bf7e0233..d1172985 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-05-13T12:53:55Z by kres ce88e1c. +# Generated on 2024-05-22T11:43:14Z by kres 04ecdaf. # common variables @@ -11,11 +11,7 @@ BRANCH := $(shell git rev-parse --abbrev-ref HEAD) ARTIFACTS := _out IMAGE_TAG ?= $(TAG) OPERATING_SYSTEM := $(shell uname -s | tr '[:upper:]' '[:lower:]') -GOARCH := $(shell uname -m | tr '[:upper:]' '[:lower:]') - -ifeq ($(GOARCH),x86_64) - GOARCH := amd64 -endif +GOARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/') REGISTRY ?= ghcr.io USERNAME ?= siderolabs REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME) @@ -52,7 +48,7 @@ COMMON_ARGS += --build-arg=PKGS_PREFIX="$(PKGS_PREFIX)" # extra variables EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG) -PKGS ?= v1.8.0-alpha.0-15-gf9559de +PKGS ?= v1.8.0-alpha.0-19-gf350879 PKGS_PREFIX ?= ghcr.io/siderolabs # targets defines all the available targets @@ -149,13 +145,13 @@ endef all: $(TARGETS) ## Builds all targets defined. +$(ARTIFACTS): ## Creates artifacts directory. + @mkdir -p $(ARTIFACTS) + .PHONY: clean clean: ## Cleans up all artifacts. @rm -rf $(ARTIFACTS) -$(ARTIFACTS): ## Creates artifacts directory. - @mkdir -p $(ARTIFACTS) - target-%: ## Builds the specified target defined in the Pkgfile. The build result will only remain in the build cache. @$(BUILD) --target=$* $(COMMON_ARGS) $(TARGET_ARGS) $(CI_ARGS) . @@ -232,8 +228,7 @@ help: ## This help menu. @grep -E '^[a-zA-Z%_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' .PHONY: release-notes -release-notes: - mkdir -p $(ARTIFACTS) +release-notes: $(ARTIFACTS) @ARTIFACTS=$(ARTIFACTS) ./hack/release.sh $@ $(ARTIFACTS)/RELEASE_NOTES.md $(TAG) .PHONY: conformance diff --git a/Pkgfile b/Pkgfile index e0ad8190..62f12578 100644 --- a/Pkgfile +++ b/Pkgfile @@ -3,7 +3,7 @@ format: v1alpha2 vars: - LINUX_FIRMWARE_VERSION: "20240410" # update this when updating PKGS_VERSION in Makefile + LINUX_FIRMWARE_VERSION: "20240513" # update this when updating PKGS_VERSION in Makefile DRBD_DRIVER_VERSION: 9.2.9 # update this when updating PKGS_VERSION in Makefile ZFS_DRIVER_VERSION: 2.2.4 # update this when updating PKGS_VERSION in Makefile UTIL_LINUX_VERSION: 2.40.1 # update this when updating PKGS_VERSION in Makefile diff --git a/hack/release.toml b/hack/release.toml index a90683c4..dea13338 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -27,6 +27,7 @@ ecr-credential-provider: 1.30.0 qemu-guest-agent: 8.2.3 mdadm: 4.3 Intel microcode: 20240514 +Linux firmware: 20240513 """