Skip to content

Commit

Permalink
Merge branch 'master' into deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
mpe committed Jul 6, 2024
2 parents 68d2c30 + a9db669 commit 7bed9fa
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ There are images for various toolchains, they are encoded in the distro name/ver
- `[email protected]`: kernel.org gcc 8.5.0, binutils 2.36.1
- `[email protected]`: kernel.org gcc 8.1.0, binutils 2.30
- `[email protected]`: kernel.org gcc 5.5.0, binutils 2.29.1
- `[email protected]`: Ubuntu 24.04, gcc 13.2.0, binutils 2.42
- `[email protected]`: Ubuntu 22.04, gcc 11.2.0, binutils 2.38
- `[email protected]`: Ubuntu 21.10, gcc 11.2.0, binutils 2.37
- `[email protected]`: Ubuntu 21.04, gcc 10.3.0, binutils 2.36.1
Expand Down
2 changes: 1 addition & 1 deletion build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ifeq ($(or ${x86},${isa_3}),)
export UBUNTU_LATEST := 21.10
UBUNTU_DISTROS := ubuntu@${UBUNTU_LATEST}
else
export UBUNTU_LATEST := 23.04
export UBUNTU_LATEST := 24.04
UBUNTU_DISTROS := ubuntu@${UBUNTU_LATEST} [email protected] [email protected]
endif

Expand Down
2 changes: 1 addition & 1 deletion build/scripts/container-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ else
# Workaround 303e6218ecec ("selftests: Fix O= and KBUILD_OUTPUT handling for relative paths")
export abs_objtree=$KBUILD_OUTPUT

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

if [[ "$1" == "ppctests" ]]; then
TARGETS="powerpc"
Expand Down
1 change: 1 addition & 0 deletions build/ubuntu/packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ if [[ "$machine" == "ppc64le" ]]; then
PACKAGES+=" libhugetlbfs-dev"
PACKAGES+=" libmnl-dev"
PACKAGES+=" libmount-dev"
PACKAGES+=" liburing-dev"

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

0 comments on commit 7bed9fa

Please sign in to comment.