Skip to content

Commit 8247399

Browse files
rnavmpe
authored andcommitted
build: Add korg v13.1.0 image
Gcc v13.1.0 cross-toolchain is available from kernel.org. Add support for building the kernel with it. We have to use ubuntu 23.04 due to library dependencies from the build. Ubuntu 23.04 also now adds a default user 'ubuntu' with uid 1000. That uid is commonly used in user accounts on most distros, so it causes an issue with the subsequent useradd command in the Dockerfile. Delete the 'ubuntu' user as a workaround for the same.
1 parent 7babc1b commit 8247399

4 files changed

Lines changed: 5 additions & 1 deletion

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ Different toolchains
5151

5252
There are images for various toolchains, they are encoded in the distro name/version.
5353

54+
- `korg@13.1.0`: kernel.org gcc 13.1.0, binutils 2.40
5455
- `korg@12.2.0`: kernel.org gcc 12.2.0, binutils 2.39
5556
- `korg@12.1.0`: kernel.org gcc 12.1.0, binutils 2.38
5657
- `korg@11.3.0`: kernel.org gcc 11.3.0, binutils 2.38

build/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ endif
1717
UBUNTU_DISTROS += ubuntu@20.04 ubuntu@18.04 ubuntu@16.04 ubuntu
1818

1919
FEDORA_DISTROS := fedora@${FEDORA_LATEST} fedora@37 fedora@36 fedora@35 fedora@34 fedora@33 fedora@31 fedora
20-
KORG_DISTROS := korg@12.2.0 korg@12.1.0 korg@11.3.0 korg@11.1.0 korg@10.3.0 korg@9.4.0 korg@9.3.0 korg@8.5.0 korg@8.1.0 korg@5.5.0
20+
KORG_DISTROS := korg@13.1.0 korg@12.2.0 korg@12.1.0 korg@11.3.0 korg@11.1.0 korg@10.3.0 korg@9.4.0 korg@9.3.0 korg@8.5.0 korg@8.1.0 korg@5.5.0
2121
ALL_DISTROS := ${UBUNTU_DISTROS} ${KORG_DISTROS} ${FEDORA_DISTROS}
2222
DOCS_DISTRO := docs@${UBUNTU_LATEST}
2323
X86_DISTROS := ubuntu@${UBUNTU_LATEST} ubuntu

build/korg/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ RUN /tmp/make-links.sh ${compiler_version} && rm /tmp/make-links.sh
5454
ARG uid
5555
ARG gid
5656

57+
RUN userdel -r ubuntu || true
5758
RUN groupadd --gid $gid linuxppc
5859
RUN useradd --uid $uid --gid $gid linuxppc
5960
USER linuxppc

build/scripts/image.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ elif [[ "$distro" == "korg" ]]; then
123123
# Use an older distro for the 5.x toolchains.
124124
if [[ "$version" == 5.* ]]; then
125125
from="docker.io/ubuntu:16.04"
126+
elif [[ "$version" == 13.* ]]; then
127+
from="docker.io/ubuntu:23.04"
126128
else
127129
from="docker.io/ubuntu:20.04"
128130
fi

0 commit comments

Comments
 (0)