alt-orchestra/talos
1
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases Wiki Activity

fix: copy missing modules.* files

Browse Source 
Copy missing `modules.order`, `modules.builtin` and
`modules.builtin.modinfo` files so tools can read them.

Signed-off-by: Noel Georgi <git@frezbo.dev>
This commit is contained in:
Noel Georgi 2023-06-09 01:20:50 +05:30
parent f5e3272fce
commit a34a948985
No known key found for this signature in database
GPG Key ID: 21A9F444075C9E36
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -491,6 +491,8 @@ WORKDIR /staging
COPY hack/modules-amd64.txt .
COPY --from=pkg-kernel-amd64 /lib/modules lib/modules
RUN <<EOF
set -euo pipefail
KERNEL_VERSION=$(ls lib/modules)
xargs -a modules-amd64.txt -I {} install -D lib/modules/${KERNEL_VERSION}/{} /build/lib/modules/${KERNEL_VERSION}/{}
@ -506,6 +508,8 @@ WORKDIR /staging
COPY hack/modules-arm64.txt .
COPY --from=pkg-kernel-arm64 /lib/modules lib/modules
RUN <<EOF
set -euo pipefail
KERNEL_VERSION=$(ls lib/modules)
xargs -a modules-arm64.txt -I {} install -D lib/modules/${KERNEL_VERSION}/{} /build/lib/modules/${KERNEL_VERSION}/{}
@ -1087,7 +1091,7 @@ COPY ./hack/module-sig-verify ./hack/module-sig-verify
COPY ./hack/structprotogen ./hack/structprotogen
# fail always to get the output back
RUN --mount=type=cache,target=/.cache <<EOF
for project in pkg/machinery . hack/cloud-image-uploader hack/docgen hack/gotagsrewrite hack/module-sig-verify hack/structprotogen; do
for project in pkg/machinery . hack/cloud-image-uploader hack/docgen hack/gotagsrewrite hack/module-sig-verify hack/structprotogen hack/ukify; do
echo -e "\n>>>> ${project}:" && \
(cd "${project}" && go list -u -m -json all | go-mod-outdated -update -direct)
done

2
Makefile
View File

@ -14,7 +14,7 @@ NAME = Talos
ARTIFACTS := _out
TOOLS ?= ghcr.io/siderolabs/tools:v1.5.0-alpha.0-14-ge0c76c0
PKGS ?= v1.5.0-alpha.0-24-g1eefa66
PKGS ?= v1.5.0-alpha.0-25-ga56d15a
EXTRAS ?= v1.5.0-alpha.0-1-ga73d524
# renovate: datasource=github-tags depName=golang/go
GO_VERSION ?= 1.20

3
hack/modules-amd64.txt
View File

@ -1,3 +1,6 @@
modules.order
modules.builtin
modules.builtin.modinfo
kernel/drivers/infiniband/sw/rxe/rdma_rxe.ko
kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko
kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko

3
hack/modules-arm64.txt
View File

@ -1,3 +1,6 @@
modules.order
modules.builtin
modules.builtin.modinfo
kernel/drivers/infiniband/sw/rxe/rdma_rxe.ko
kernel/drivers/irqchip/irq-imx-mu-msi.ko
kernel/drivers/mailbox/bcm-flexrm-mailbox.ko

2
pkg/machinery/gendata/data/pkgs
View File

@ -1 +1 @@
v1.5.0-alpha.0-24-g1eefa66
v1.5.0-alpha.0-25-ga56d15a