Browse Source

Update Docker image to Ubuntu 24.04.

v2
Christoph Scholtes 1 year ago
parent
commit
faace11e53
2 changed files with 15 additions and 5 deletions
  1. +2
    -3
      Dockerfile
  2. +13
    -2
      Makefile

+ 2
- 3
Dockerfile View File

@@ -1,11 +1,10 @@
FROM ubuntu:22.04
FROM ubuntu:24.04
ENV LANG C.UTF-8

ARG JOBS

# Create unprivileged user to build toolchains and plugins
RUN groupadd -g 1000 build
RUN useradd --create-home --uid 1000 --gid 1000 --shell /bin/bash build
RUN useradd --non-unique --create-home --uid 1000 --gid 1000 --shell /bin/bash build

# Install make to run make
ENV DEBIAN_FRONTEND=noninteractive


+ 13
- 2
Makefile View File

@@ -47,6 +47,16 @@ $(crosstool-ng):
toolchain-lin := $(LOCAL_DIR)/x86_64-ubuntu16.04-linux-gnu
toolchain-lin: $(toolchain-lin)
$(toolchain-lin): $(crosstool-ng)
# Build a newer version of texinfo because version 7.1 in Ubuntu 24.04 has issues.
# This is needed to build glibc for the GNU/Linux based toolchain.
git clone https://git.savannah.gnu.org/git/texinfo.git
cd texinfo && git checkout 60d3edc4b74b4e1e5ef55e53de394d3b65506c47
cd texinfo && ./autogen.sh
cd texinfo && ./configure --prefix="$(LOCAL_DIR)"
cd texinfo && make -j $(JOBS)
cd texinfo && make install -j $(JOBS)
rm -rf texinfo

ct-ng x86_64-ubuntu16.04-linux-gnu
CT_PREFIX="$(LOCAL_DIR)" ct-ng build$(JOBS_CT_NG)
rm -rf .build .config build.log
@@ -114,7 +124,7 @@ $(toolchain-mac):
rm -rf osxcross


CPPCHECK_VERSION := 2.13.0
CPPCHECK_VERSION := 2.14.0
cppcheck := $(LOCAL_DIR)/cppcheck/bin/cppcheck
cppcheck: $(cppcheck)
$(cppcheck):
@@ -302,7 +312,8 @@ dep-ubuntu:
coreutils \
zstd \
markdown \
libarchive-tools
libarchive-tools \
gettext


dep-arch-linux:


Loading…
Cancel
Save