Skip to content

Commit 18e7eea

Browse files
deitchdeitch
authored
riscv64 kernel (linuxkit#4106)
* add riscv64 kernels to kernel/Makefile and kernel/Dockerfile.*, riscv64 kernel config, bump alpine version for kernel builds Signed-off-by: Avi Deitcher <[email protected]> * update bcc to v0.32.0 to include needed fixes Signed-off-by: Avi Deitcher <[email protected]> * bump kernel builder alpine base to version including llvm19 Signed-off-by: Avi Deitcher <[email protected]> * in kernel-bcc, automatically determine python path Signed-off-by: Avi Deitcher <[email protected]> * in kernel-perf, suppress newer gcc errors Signed-off-by: Avi Deitcher <[email protected]> * riscv path in kernel build was incorrect Signed-off-by: Avi Deitcher <[email protected]> * remove bcc compilation from kernel Signed-off-by: Avi Deitcher <[email protected]> * update usages of kernel/6.6.13 to kernel/6.6.71 Signed-off-by: Avi Deitcher <[email protected]> * next run of updating kernel config Signed-off-by: Avi Deitcher <[email protected]> * update test dependencies on kernel hash version Signed-off-by: Avi Deitcher <[email protected]> --------- Signed-off-by: Avi Deitcher <[email protected]>
1 parent efb1396 commit 18e7eea

File tree

127 files changed

+5188
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+5188
-202
lines changed

‎docs/kernels.md

+11-2
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ your local Docker setup.
274274

275275
The process of modifying the kernel configuration is as follows:
276276

277-
1. Create a `linuxkit/kconfig` container image: `make kconfig`. This is not pushed out.
277+
1. Create a `linuxkit/kconfig` container image: `make kconfig`. This is not pushed out. By default, this will be for your local architecture, but you can override it with `make kconfig ARCH=${ARCH}`, e.g. `make kconfig ARCH=arm64`. The image is tagged with the architecture, e.g. `linuxkit/kconfig:arm64`.
278278
1. Run a container based on `linuxkit/kconfig`.
279279
1. In the container, modify the config to suit your needs using normal kernel tools like `make defconfig` or `make menuconfig`.
280280
1. Save the config from the image.
@@ -287,7 +287,11 @@ so that `make menuconfig` and `make defconfig` work correctly.
287287
Run the container as follows:
288288

289289
```sh
290-
docker run --rm -ti -v $(pwd):/src linuxkit/kconfig
290+
docker run --rm -ti -v $(pwd):/src linuxkit/kconfig:aarch64
291+
# or
292+
docker run --rm -ti -v $(pwd):/src linuxkit/kconfig:x86_64
293+
# or
294+
docker run --rm -ti -v $(pwd):/src linuxkit/kconfig:riscv64
291295
```
292296

293297
This will give you a interactive shell where you can modify the kernel
@@ -321,6 +325,11 @@ make ARCH=arm64 defconfig
321325
make ARCH=arm64 oldconfig # or menuconfig
322326
```
323327

328+
It is important to note that sometimes the configuration can be subtly different
329+
when running `make defconfig` across architectures. Of note is that `make ARCH=riscv` on
330+
x86_64 or aarch64 comes out slightly differently than when run natively on riscv64.
331+
Feel free to try it cross, but do not be surprised if it generates outputs that are not the same.
332+
324333
Note that the generated file **must** be final. When you actually build the kernel,
325334
it will check that running `make defconfig` will have no changes. If there are changes,
326335
the build will fail.

‎examples/addbinds.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/cadvisor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/containerd-debug.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# example with volumes, both blank and populated
22
kernel:
3-
image: linuxkit/kernel:6.6.13
3+
image: linuxkit/kernel:6.6.71
44
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
55
init:
66
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/dm-crypt-loop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/dm-crypt.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/docker-for-mac.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is an example for building the open source components of Docker for Mac
22
kernel:
3-
image: linuxkit/kernel:6.6.13
3+
image: linuxkit/kernel:6.6.71
44
cmdline: "console=ttyS0 page_poison=1"
55
init:
66
- linuxkit/vpnkit-expose-port:b30e8456ac128b2ac360329898368b309ea6e477 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host

‎examples/docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/getty.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/hostmount-writeable-overlay.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/influxdb-os.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/logging.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Simple example of using an external logging service
22
kernel:
3-
image: linuxkit/kernel:6.6.13
3+
image: linuxkit/kernel:6.6.71
44
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
55
init:
66
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/minimal.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/node_exporter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/openstack.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=ttyS0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/platform-aws.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=ttyS0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/platform-azure.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=ttyS0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/platform-equinixmetal.arm64.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# for arm64 then the 'ucode' line in the kernel section can be left
66
# out.
77
kernel:
8-
image: linuxkit/kernel:6.6.13
8+
image: linuxkit/kernel:6.6.71
99
cmdline: "console=ttyAMA0"
1010
ucode: ""
1111
onboot:

‎examples/platform-equinixmetal.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: console=ttyS1
44
ucode: intel-ucode.cpio
55
init:
66
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd
77
- linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9
88
- linuxkit/containerd:0854538eb4dedbb45521357633ccb69eef123f54
99
- linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb
10-
- linuxkit/firmware:198a094b6b6efb72e6c731be3ec30e00322323f9
10+
- linuxkit/firmware:d8d2cc5258da630d5b858ebe1fc96886b9281e9e
1111
onboot:
1212
- name: rngd1
1313
image: linuxkit/rngd:1a18f2149e42a0a1cb9e7d37608a494342c26032

‎examples/platform-gcp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=ttyS0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/platform-hetzner.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: console=ttyS1
44
ucode: intel-ucode.cpio
55
init:
66
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd
77
- linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9
88
- linuxkit/containerd:0854538eb4dedbb45521357633ccb69eef123f54
99
- linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb
10-
- linuxkit/firmware:198a094b6b6efb72e6c731be3ec30e00322323f9
10+
- linuxkit/firmware:d8d2cc5258da630d5b858ebe1fc96886b9281e9e
1111
onboot:
1212
- name: rngd1
1313
image: linuxkit/rngd:1a18f2149e42a0a1cb9e7d37608a494342c26032

‎examples/platform-rt-for-vmware.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13-rt
2+
image: linuxkit/kernel:6.6.71-rt
33
cmdline: "console=tty0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/platform-scaleway.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/platform-vmware.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/platform-vultr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=ttyS0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/redis-os.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Minimal YAML to run a redis server (used at DockerCon'17)
22
# connect: nc localhost 6379
33
kernel:
4-
image: linuxkit/kernel:6.6.13
4+
image: linuxkit/kernel:6.6.71
55
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
66
init:
77
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/sshd.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/static-ip.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/swap.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/tpm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/volumes.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# example with volumes, both blank and populated
22
kernel:
3-
image: linuxkit/kernel:6.6.13
3+
image: linuxkit/kernel:6.6.71
44
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
55
init:
66
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/vpnkit-forwarder.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=ttyS0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/vsudd-containerd.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=ttyS0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎examples/wireguard.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: linuxkit/kernel:6.6.13
2+
image: linuxkit/kernel:6.6.71
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
44
init:
55
- linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd

‎kernel/6.6.x/build-args

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
KERNEL_VERSION=6.6.13
1+
KERNEL_VERSION=6.6.71
22
KERNEL_SERIES=6.6.x
3-
BUILD_IMAGE=linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e
3+
BUILD_IMAGE=linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a

0 commit comments

Comments
 (0)