Skip to content

Commit 7bed9fa

Browse files
committed
Merge branch 'master' into deploy
2 parents 68d2c30 + a9db669 commit 7bed9fa

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ There are images for various toolchains, they are encoded in the distro name/ver
6363
- `[email protected]`: kernel.org gcc 8.5.0, binutils 2.36.1
6464
- `[email protected]`: kernel.org gcc 8.1.0, binutils 2.30
6565
- `[email protected]`: kernel.org gcc 5.5.0, binutils 2.29.1
66+
- `[email protected]`: Ubuntu 24.04, gcc 13.2.0, binutils 2.42
6667
- `[email protected]`: Ubuntu 22.04, gcc 11.2.0, binutils 2.38
6768
- `[email protected]`: Ubuntu 21.10, gcc 11.2.0, binutils 2.37
6869
- `[email protected]`: Ubuntu 21.04, gcc 10.3.0, binutils 2.36.1

build/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ifeq ($(or ${x86},${isa_3}),)
1010
export UBUNTU_LATEST := 21.10
1111
UBUNTU_DISTROS := ubuntu@${UBUNTU_LATEST}
1212
else
13-
export UBUNTU_LATEST := 23.04
13+
export UBUNTU_LATEST := 24.04
1414
UBUNTU_DISTROS := ubuntu@${UBUNTU_LATEST} [email protected] [email protected]
1515
endif
1616

build/scripts/container-build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ else
178178
# Workaround 303e6218ecec ("selftests: Fix O= and KBUILD_OUTPUT handling for relative paths")
179179
export abs_objtree=$KBUILD_OUTPUT
180180

181-
cmd="make $quiet -j $JFACTOR -C tools/testing/selftests"
181+
cmd="make -k $quiet -j $JFACTOR -C tools/testing/selftests"
182182

183183
if [[ "$1" == "ppctests" ]]; then
184184
TARGETS="powerpc"

build/ubuntu/packages.sh

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ if [[ "$machine" == "ppc64le" ]]; then
2020
PACKAGES+=" libhugetlbfs-dev"
2121
PACKAGES+=" libmnl-dev"
2222
PACKAGES+=" libmount-dev"
23+
PACKAGES+=" liburing-dev"
2324

2425
# For the x86_64 container
2526
if [[ "$major" -ge 21 ]]; then

0 commit comments

Comments
 (0)