Skip to content

Commit

Permalink
feat: update Linux firmware to 20240513
Browse files Browse the repository at this point in the history
Via pkgs update.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
  • Loading branch information
smira committed May 22, 2024
1 parent 44a6ab1 commit 7f39bce
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 7 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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) .

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Pkgfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions hack/release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
"""


Expand Down

0 comments on commit 7f39bce

Please sign in to comment.