Skip to content

Commit dcfbd00

Browse files
committed
initial extension for RK3588 and kernel modules
1 parent d09a956 commit dcfbd00

File tree

12 files changed

+112
-268
lines changed

12 files changed

+112
-268
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ jobs:
2525
issues: read
2626
packages: write
2727
pull-requests: read
28-
runs-on:
29-
- self-hosted
30-
- pkgs
28+
runs-on: ubuntu-latest
3129
if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/'))
3230
outputs:
3331
labels: ${{ steps.retrieve-pr-labels.outputs.result }}
@@ -43,23 +41,15 @@ jobs:
4341
steps:
4442
- name: checkout
4543
uses: actions/checkout@v4
46-
- name: Unshallow
47-
run: |
48-
git fetch --prune --unshallow
44+
with:
45+
# need history for `git describe` to work for Talos `Makefile`
46+
fetch-depth: 0
47+
fetch-tags: true
4948
- name: Set up Docker Buildx
5049
uses: docker/setup-buildx-action@v3
51-
with:
52-
append: |
53-
- endpoint: tcp://buildkit-arm64.ci.svc.cluster.local:1234
54-
platforms: linux/arm64
55-
driver: remote
56-
endpoint: tcp://localhost:1234
5750
- name: Build
5851
run: |
5952
make
60-
- name: Build nonfree
61-
run: |
62-
make nonfree
6353
- name: Login to registry
6454
if: github.event_name != 'pull_request'
6555
uses: docker/login-action@v3
@@ -73,11 +63,7 @@ jobs:
7363
USERNAME: ${{ github.repository_owner }}
7464
CI_ARGS: --provenance=true
7565
run: |
76-
make PUSH=true
77-
- name: Push nonfree
78-
if: github.event_name != 'pull_request'
79-
run: |
80-
make nonfree PUSH=true
66+
make PUSH=true
8167
- name: Retrieve PR labels
8268
id: retrieve-pr-labels
8369
uses: actions/github-script@v7
@@ -99,8 +85,7 @@ jobs:
9985
USERNAME: ${{ github.repository_owner }}
10086
PUSH: "true"
10187
run: |
102-
curl -sL "https://github.com/google/go-containerregistry/releases/download/v0.18.0/go-containerregistry_Linux_x86_64.tar.gz" > go-containerregistry.tar.gz
103-
tar -zxvf go-containerregistry.tar.gz -C /usr/local/bin/ crane
88+
curl -sL "https://github.com/google/go-containerregistry/releases/download/v0.19.0/go-containerregistry_Linux_x86_64.tar.gz" | tar -zxv -C /usr/local/bin/ crane
10489
make extensions
10590
- name: release-notes
10691
if: startsWith(github.ref, 'refs/tags/')
@@ -112,36 +97,3 @@ jobs:
11297
with:
11398
body_path: _out/RELEASE_NOTES.md
11499
draft: "true"
115-
reproducibility:
116-
runs-on:
117-
- self-hosted
118-
- pkgs
119-
if: contains(fromJSON(needs.default.outputs.labels), 'integration/reproducibility')
120-
needs:
121-
- default
122-
services:
123-
buildkitd:
124-
image: moby/buildkit:v0.12.5
125-
options: --privileged
126-
ports:
127-
- 1234:1234
128-
volumes:
129-
- /var/lib/buildkit/${{ github.repository }}:/var/lib/buildkit
130-
- /usr/etc/buildkit/buildkitd.toml:/etc/buildkit/buildkitd.toml
131-
steps:
132-
- name: checkout
133-
uses: actions/checkout@v4
134-
- name: Unshallow
135-
run: |
136-
git fetch --prune --unshallow
137-
- name: Set up Docker Buildx
138-
uses: docker/setup-buildx-action@v3
139-
with:
140-
append: |
141-
- endpoint: tcp://buildkit-arm64.ci.svc.cluster.local:1234
142-
platforms: linux/arm64
143-
driver: remote
144-
endpoint: tcp://localhost:1234
145-
- name: reproducibility-test
146-
run: |
147-
make reproducibility-test

.github/workflows/slack-notify.yaml

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

.github/workflows/weekly.yaml

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

Makefile

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ifeq ($(GOARCH),x86_64)
1616
GOARCH := amd64
1717
endif
1818
REGISTRY ?= ghcr.io
19-
USERNAME ?= siderolabs
19+
USERNAME ?= nberlee
2020
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
2121
KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
2222
CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest
@@ -35,7 +35,7 @@ BLDR := docker run --rm --user $(shell id -u):$(shell id -g) --volume $(PWD):/sr
3535
# docker build settings
3636

3737
BUILD := docker buildx build
38-
PLATFORM ?= linux/amd64,linux/arm64
38+
PLATFORM ?= linux/arm64
3939
PROGRESS ?= auto
4040
PUSH ?= false
4141
CI_ARGS ?=
@@ -46,47 +46,19 @@ COMMON_ARGS += --platform=$(PLATFORM)
4646
COMMON_ARGS += --build-arg=SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH)
4747
COMMON_ARGS += --build-arg=TAG="$(TAG)"
4848
COMMON_ARGS += --build-arg=PKGS="$(PKGS)"
49+
COMMON_ARGS += --build-arg=PKG_KERNEL="$(PKG_KERNEL)"
4950

5051
# targets defines all the available targets
5152

52-
TARGETS = amdgpu-firmware
53-
TARGETS += amd-ucode
54-
TARGETS += binfmt-misc
55-
TARGETS += bnx2-bnx2x
56-
TARGETS += btrfs
57-
TARGETS += chelsio-drivers
58-
TARGETS += chelsio-firmware
59-
TARGETS += drbd
60-
TARGETS += ecr-credential-provider
61-
TARGETS += fuse3
62-
TARGETS += gasket-driver
63-
TARGETS += gvisor
64-
TARGETS += hello-world-service
65-
TARGETS += i915-ucode
66-
TARGETS += intel-ice-firmware
67-
TARGETS += intel-ucode
68-
TARGETS += iscsi-tools
69-
TARGETS += mdadm
70-
TARGETS += nut-client
71-
TARGETS += nvidia-container-toolkit
72-
TARGETS += nvidia-fabricmanager
73-
TARGETS += nvidia-open-gpu-kernel-modules
74-
TARGETS += qemu-guest-agent
75-
TARGETS += qlogic-firmware
76-
TARGETS += realtek-firmware
77-
TARGETS += stargz-snapshotter
78-
TARGETS += tailscale
79-
TARGETS += thunderbolt
53+
TARGETS = binfmt-misc
54+
TARGETS += rk3588
8055
TARGETS += usb-modem-drivers
81-
TARGETS += util-linux-tools
82-
TARGETS += xe-guest-utilities
83-
TARGETS += zfs
84-
NONFREE_TARGETS = nonfree-kmod-nvidia
8556

8657
# extra variables
8758

8859
EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
8960
PKGS ?= v1.6.0-25-g6868f38
61+
PKG_KERNEL ?= ghcr.io/nberlee/kernel:v1.6.0-27-g2dcb3b4
9062

9163
# help menu
9264

0 commit comments

Comments
 (0)