Skip to content

Commit

Permalink
neonvm-kernel: Switch to version 6.6.64 (#1174)
Browse files Browse the repository at this point in the history
This commit updates the kernel and switches from 6.1.x to 6.6.x LTS
branch.

As of 2024-12-09, www.kernel.org says this is the most recent version of
the 6.6.x LTS branch.

Basically just followed the instructions in neonvm-kernel/README.md,
copying in linux-config-ARCH-6.6.64 as .config, and .config back to
/host once done with menuconfig.

Trying this as a possible solution to
neondatabase/cloud#20195
  • Loading branch information
petuhovskiy authored Dec 10, 2024
1 parent 5b1fb31 commit 1081596
Show file tree
Hide file tree
Showing 3 changed files with 619 additions and 293 deletions.
14 changes: 7 additions & 7 deletions neonvm-kernel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ with the following sequence of actions:
2. Then, inside the container, run:
```sh
cd linux-$NEW_VERSION
cp /host/linux-config-amd64-6.1.92 .config # Copy current config in
cp /host/linux-config-amd64-6.6.64 .config # Copy current config in
make menuconfig ARCH=x86_64
# do nothing; just save and exit, overwriting .config
cp .config /host/linux-config-amd64-$NEW_VERSION # NOTE: Different from existing!
```
3. Back on the host, finish with:
```sh
# compare the two versions
diff linux-config-amd64-6.1.92 linux-config-amd64-$NEW_VERSION
diff linux-config-amd64-6.6.64 linux-config-amd64-$NEW_VERSION
# If all looks good, delete the old version. This is required so auto-selection works.
rm linux-config-amd64-6.1.92
rm linux-config-amd64-6.6.64
```

### On arm64 (aarch64 ARM)
Expand All @@ -53,17 +53,17 @@ with the following sequence of actions:
2. Then, inside the container, run:
```sh
cd linux-$NEW_VERSION
cp /host/linux-config-aarch64-6.1.92 .config # Copy current config in
cp /host/linux-config-aarch64-6.6.64 .config # Copy current config in
make menuconfig ARCH=arm64
# do nothing; just save and exit, overwriting .config
cp .config /host/linux-config-aarch64-$NEW_VERSION # NOTE: Different from existing!
```
3. Back on the host, finish with:
```sh
# compare the two versions
diff linux-config-aarch64-6.1.92 linux-config-aarch64-$NEW_VERSION
diff linux-config-aarch64-6.6.64 linux-config-aarch64-$NEW_VERSION
# If all looks good, delete the old version. This is required so auto-selection works.
rm linux-config-aarch64-6.1.92
rm linux-config-aarch64-6.6.64
```

Afterwards, it's probably also good to do a search-and-replace repo-wide to update all places that
Expand All @@ -74,7 +74,7 @@ mention the old kernel version.
To adjust the kernel config, try the following from this directory:

```sh
docker build --build-arg KERNEL_VERSION=6.1.92 --platform linux/x86_64 --target build-deps -t kernel-build-deps -f Dockerfile.kernel-builder .
docker build --build-arg KERNEL_VERSION=6.6.64 --platform linux/x86_64 --target build-deps -t kernel-build-deps -f Dockerfile.kernel-builder .
docker run --rm -v $PWD:/host --name kernel-build -it kernel-build-deps bash
# inside that bash shell, do the menuconfig, then copy-out the config to /host
```
Loading

0 comments on commit 1081596

Please sign in to comment.