Skip to content

Commit f313d91

Browse files
committed
test for new 1.9 kernel
1 parent 964f9b3 commit f313d91

File tree

7 files changed

+20
-18
lines changed

7 files changed

+20
-18
lines changed

.github/workflows/githubci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424

2525
- uses: docker/setup-buildx-action@v3
2626
with:
27+
version: v0.19.1
2728
buildkitd-config: .github/buildkitd.toml
2829

2930
- name: Login to GitHub Container Registry

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ COMMON_ARGS += --build-arg=PKGS="$(PKGS)"
5151
# extra variables
5252

5353
PKGS_PREFIX ?= ghcr.io/siderolabs
54-
PKGS ?= v1.8.0
54+
PKGS ?= v1.9.0-alpha.0
5555

5656
# targets defines all the available targets
5757

Pkgfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ format: v1alpha2
44

55
vars:
66
# renovate: datasource=github-tags depName=ARM-software/arm-trusted-firmware
7-
arm_trusted_firmware_version: lts-v2.10.4
8-
arm_trusted_firmware_sha256: ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd
9-
arm_trusted_firmware_sha512: 0b0e634ba7b1bf3d2a0ef429391f9a6c350abe373b0563e3932f0347246b773238593036674cbb958fffce36c7449f9ebb3ee340650a3184c3e052487fae656b
7+
arm_trusted_firmware_version: v2.12.0
8+
arm_trusted_firmware_sha256: 30abf4da07418ad0f840369c3e64dc6a0bc6a936d53a213ce10783f3d1a3430f
9+
arm_trusted_firmware_sha512: 947336e5a9b2504ebea696980c09e2b99a49ec4f84b6dfb25f9ba33d09095cf32ac518c165fcf51db8b3896842bdd954c73d6e887afc5da48803914eae82bc45
1010

1111
# renovate: datasource=github-tags extractVersion=^v(?<version>.*)$ depName=u-boot/u-boot
1212
uboot_version: 2024.01

artifacts/arm-trusted-firmware/rk3588/pkg.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,22 @@ steps:
1919
tar xzf arm-trusted-firmware.tar.gz --strip-components=1
2020
2121
# https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/21840/6 and related chain
22-
for patch in $(find /pkg/patches -type f -name "*.patch" | sort); do
23-
patch -p1 < $patch || (echo "Failed to apply patch $patch" && exit 1)
24-
done
22+
#for patch in $(find /pkg/patches -type f -name "*.patch" | sort); do
23+
# patch -p1 < $patch || (echo "Failed to apply patch $patch" && exit 1)
24+
#done
2525
# rk3588
2626
build:
2727
- |
28+
# https://github.com/ARM-software/arm-trusted-firmware/blob/master/docs/getting_started/initial-build.rst
29+
export CROSS_COMPILE=/toolchain/bin/aarch64-linux-musl-
30+
2831
make realclean
2932
mkdir -p $(pwd)/build/rk3588/release/
3033
3134
# https://salsa.debian.org/debian/arm-trusted-firmware/-/commit/6424a59e08585af7f8a56f1e16ecc6a6b9e4ad7a
3235
# https://salsa.debian.org/debian/arm-trusted-firmware/-/commit/6ed8f61df3b07bb22a68a0fc189ec3b3f7b00dbd
3336
# https://developer.trustedfirmware.org/T996
34-
TF_LDFLAGS=--no-warn-rwx-segments CFLAGS=--param=min-pagesize=0 make -j $(nproc) PLAT=rk3588 DEBUG=0 bl31
37+
CFLAGS=--param=min-pagesize=0 make -j $(nproc) PLAT=rk3588 DEBUG=0 bl31
3538
install:
3639
- |
3740
mkdir -p /rootfs/arm-trusted-firmware/rk3588

installers/pkg.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies:
55
- stage: u-boot
66
platform: linux/arm64
77
- stage: profiles
8-
- image: ghcr.io/nberlee/kernel:v1.8.3
8+
- image: ghcr.io/nberlee/kernel:v1.8.3-1-geddb1cf
99
platform: linux/arm64
1010
from: /dtb/rockchip/rk3588-turing-rk1.dtb
1111
to: /rootfs/artifacts/arm64/dtb/rockchip/rk3588-turing-rk1.dtb

installers/turingrk1/src/go.mod

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
module turingrk1
22

3-
go 1.22.8
4-
5-
toolchain go1.23.2
3+
go 1.22.9
64

75
require (
86
github.com/siderolabs/go-copy v0.1.0
9-
github.com/siderolabs/talos/pkg/machinery v1.8.0-beta.0
10-
golang.org/x/sys v0.24.0
7+
github.com/siderolabs/talos/pkg/machinery v1.8.3
8+
golang.org/x/sys v0.27.0
119
)
1210

1311
require gopkg.in/yaml.v3 v3.0.1 // indirect

installers/turingrk1/src/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
github.com/siderolabs/go-copy v0.1.0 h1:OIWCtSg+rhOtnIZTpT31Gfpn17rv5kwJqQHG+QUEgC8=
22
github.com/siderolabs/go-copy v0.1.0/go.mod h1:4bF2rZOZAR/ags/U4AVSpjFE5RPGdEeSkOq6yR9YOkU=
3-
github.com/siderolabs/talos/pkg/machinery v1.8.0-beta.0 h1:bzZGTL2kuRZ8SYh+dY8H9VeZXP3DFctvHjmqD4zh364=
4-
github.com/siderolabs/talos/pkg/machinery v1.8.0-beta.0/go.mod h1:FE2LBYE14l8U8pcV4bO9W62BhMY+5gDEkmGw01tIRFc=
5-
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
6-
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3+
github.com/siderolabs/talos/pkg/machinery v1.8.3 h1:raK1oLzSMpwpy/AqkeFyBYkJS+QuOnlRMznVl/rZ25k=
4+
github.com/siderolabs/talos/pkg/machinery v1.8.3/go.mod h1:cNR2TELu2T9AzYOHAoNr/7ZS3ZVDLzM/KnuOr4XW4s4=
5+
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
6+
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
77
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
88
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
99
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

0 commit comments

Comments
 (0)