Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:Ledest:erlang:25
erlang
0625-gh-Update-base-OS-versions-to-test-with.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0625-gh-Update-base-OS-versions-to-test-with.patch of Package erlang
From 4194db85ea6133c43a2abd0bfd5087993f72c940 Mon Sep 17 00:00:00 2001 From: Lukas Larsson <lukas@erlang.org> Date: Thu, 12 Oct 2023 21:14:12 +0200 Subject: [PATCH 5/6] gh: Update base OS versions to test with --- .github/dockerfiles/Dockerfile.32-bit | 2 +- .github/dockerfiles/Dockerfile.64-bit | 2 +- .github/dockerfiles/Dockerfile.clang | 2 +- .github/dockerfiles/Dockerfile.cross-compile | 2 +- .github/dockerfiles/Dockerfile.debian-base | 14 +++++++------- .github/dockerfiles/Dockerfile.ubuntu-base | 10 ++++------ .github/scripts/build-base-image.sh | 6 +++--- 7 files changed, 18 insertions(+), 20 deletions(-) diff --git a/.github/dockerfiles/Dockerfile.32-bit b/.github/dockerfiles/Dockerfile.32-bit index b1df0e996c..d14144f743 100644 --- a/.github/dockerfiles/Dockerfile.32-bit +++ b/.github/dockerfiles/Dockerfile.32-bit @@ -13,7 +13,7 @@ RUN cd /buildroot && tar -xzf ./otp.tar.gz WORKDIR /buildroot/otp/ -ENV CFLAGS="-O2 -g -Werror" +ENV CFLAGS="-O2 -g -Werror -DwxSTC_DISABLE_MACRO_DEPRECATIONS=1" ## Configure, check that no application are disabled, then make and then build doc chunks RUN ./configure --with-ssl --prefix=/otp && \ diff --git a/.github/dockerfiles/Dockerfile.64-bit b/.github/dockerfiles/Dockerfile.64-bit index 1cdb8cfd68..07054bc811 100644 --- a/.github/dockerfiles/Dockerfile.64-bit +++ b/.github/dockerfiles/Dockerfile.64-bit @@ -12,7 +12,7 @@ RUN cd /buildroot && tar -xzf ./otp.tar.gz WORKDIR /buildroot/otp/ -ENV CFLAGS="-O2 -g -Werror" +ENV CFLAGS="-O2 -g -Werror -DwxSTC_DISABLE_MACRO_DEPRECATIONS=1" ## Configure (if not cached), check that no application are disabled and then make RUN if [ ! -f Makefile ]; then \ diff --git a/.github/dockerfiles/Dockerfile.clang b/.github/dockerfiles/Dockerfile.clang index 2fe7f110d3..6f2a470380 100644 --- a/.github/dockerfiles/Dockerfile.clang +++ b/.github/dockerfiles/Dockerfile.clang @@ -18,7 +18,7 @@ RUN cd /buildroot && tar -xzf ./otp.tar.gz WORKDIR /buildroot/otp/ ENV CC=clang CXX=clang++ \ - CFLAGS="-O2 -g -Werror" + CFLAGS="-O2 -g -Werror -DwxSTC_DISABLE_MACRO_DEPRECATIONS=1" ## Configure, check that no application are disabled and then make # We need --with-ssl-lib-subdir=lib/x86_64-linux-gnu since clang does not diff --git a/.github/dockerfiles/Dockerfile.cross-compile b/.github/dockerfiles/Dockerfile.cross-compile index c9e9c44855..b654eb1c86 100644 --- a/.github/dockerfiles/Dockerfile.cross-compile +++ b/.github/dockerfiles/Dockerfile.cross-compile @@ -21,7 +21,7 @@ RUN cd $ERL_TOP && CFLAGS="-Wall -O2 -g" ./configure && make && make install ENV HOST=$HOST_TRIP \ CC=$HOST_TRIP-gcc \ CPPFLAGS="--sysroot=/buildroot/sysroot" \ - CFLAGS="--sysroot=/buildroot/sysroot -O2 -g -Werror" \ + CFLAGS="--sysroot=/buildroot/sysroot -O2 -g -Werror -DwxSTC_DISABLE_MACRO_DEPRECATIONS=1" \ CPP=$HOST_TRIP-cpp \ CXX=$HOST_TRIP-g++ \ LD=$CC \ diff --git a/.github/dockerfiles/Dockerfile.debian-base b/.github/dockerfiles/Dockerfile.debian-base index c199469a73..a44a71a898 100644 --- a/.github/dockerfiles/Dockerfile.debian-base +++ b/.github/dockerfiles/Dockerfile.debian-base @@ -1,31 +1,31 @@ ## ## This docker file will build a base image for building Erlang/OTP ## -ARG BASE=debian:bullseye +ARG BASE=debian:bookworm FROM $BASE ## Need to have a second arg here as the first does not expose the $BASE in the script below -ARG BASE=debian:bullseye +ARG BASE=debian:bookworm ARG HOST_TRIP=x86_64-linux-gnu ENV HOST_TRIP=$HOST_TRIP ENV LANG=C.UTF-8 ENV LC_ALL=C.UTF-8 -ENV INSTALL_LIBS="zlib1g-dev libncurses5-dev libssl-dev unixodbc-dev libgmp3-dev libwxgtk3.0-gtk3-dev libwxgtk-webview3.0-gtk3-dev libsctp-dev lksctp-tools" -ENV CROSS_LIBS="zlib1g-dev libncurses5-dev libssl-dev unixodbc-dev libgmp3-dev libwxgtk3.0-gtk3-dev libsctp-dev lksctp-tools" +ENV INSTALL_LIBS="zlib1g-dev libncurses5-dev libssl-dev unixodbc-dev libwxgtk3.2-dev libwxgtk-webview3.2-dev libsctp-dev lksctp-tools" +ENV CROSS_LIBS="$INSTALL_LIBS" ## See https://wiki.debian.org/Multiarch/HOWTO for details on how to install things ## ## 1. Install build-essential to get access to dpkg-architecture ## 2. Use dpkg-architecture to figure out what we are running on ## 3. If the HOST_TRIP does not equal BUILD_TRIP we should cross compile -RUN apt-get update && apt-get -y upgrade && apt-get install -y build-essential && \ +RUN apt-get update && apt-get -y upgrade && apt-get install -y build-essential pkg-config && \ BUILD_TRIP=`dpkg-architecture -t${HOST_TRIP} -qDEB_BUILD_MULTIARCH` && \ BUILD_ARCH=`dpkg-architecture -t${HOST_TRIP} -qDEB_BUILD_ARCH` && \ if [ "$HOST_TRIP" != "$BUILD_TRIP" ]; then \ HOST_ARCH=`dpkg-architecture -t${HOST_TRIP} -qDEB_HOST_ARCH` && \ dpkg --add-architecture $HOST_ARCH && \ - sed -i "s:deb http:deb [arch=$BUILD_ARCH,$HOST_ARCH] http:g" /etc/apt/sources.list; \ + sed -i "s@main\n@main\nArch: $BUILD_ARCH,$HOST_ARCH@g" /etc/apt/sources.list.d/debian.sources; \ fi && \ apt-get update && \ apt-get install -y build-essential m4 autoconf fop xsltproc default-jdk libxml2-utils \ @@ -42,5 +42,5 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y build-essential & cp -r $dir/* `dirname /buildroot/sysroot$dir`; \ done; \ fi && \ - update-alternatives --set wx-config /usr/lib/${BUILD_TRIP}/wx/config/gtk3-unicode-3.0 && \ + update-alternatives --set wx-config /usr/lib/${BUILD_TRIP}/wx/config/gtk3-unicode-3.2 && \ rm -rf /var/lib/apt/lists/* diff --git a/.github/dockerfiles/Dockerfile.ubuntu-base b/.github/dockerfiles/Dockerfile.ubuntu-base index cee5991898..d5c528869d 100644 --- a/.github/dockerfiles/Dockerfile.ubuntu-base +++ b/.github/dockerfiles/Dockerfile.ubuntu-base @@ -33,9 +33,7 @@ RUN echo "Europe/Stockholm" > /etc/timezone && \ ln -snf /usr/share/zoneinfo/$(cat /etc/timezone) /etc/localtime && \ if ! grep ":${gid}:$" /etc/group; then groupadd -g ${gid} localgroup; fi && \ if [ ! -d /home/${USER} ]; then useradd -rm -d /home/${USER} -s /bin/sh -g ${gid} -G ${gid},sudo -u ${uid} ${USER}; fi && \ - echo "${USER} ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/${USER} && \ - echo "/buildroot/** r," >> /etc/apparmor.d/local/usr.sbin.named && \ - echo "/tests/** r," >> /etc/apparmor.d/local/usr.sbin.named + echo "${USER} ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/${USER} ## Java and log4j are used by fop to build documentation COPY --chown=${USER}:${GROUP} dockerfiles/log4j.properties /home/${USER}/ @@ -68,7 +66,7 @@ RUN apt-get install -y git curl && \ ARG EXTRA_LIBS="erlang erlang-doc" RUN apt-get update && apt-get install -y \ unixodbc odbc-postgresql postgresql ssh openssh-server groff-base gdb \ - tinyproxy knot ldnsutils expect vsftpd python emacs nano vim \ + tinyproxy knot ldnsutils expect vsftpd python3 emacs nano vim \ linux-tools-common linux-tools-generic jq \ xvfb libgl1-mesa-dri && \ for lib in ${EXTRA_LIBS}; do apt-get install -y ${lib}; done && \ @@ -77,8 +75,8 @@ RUN apt-get install -y linux-tools-$(uname -r) || true ## We use tmux to test terminals RUN apt-get install -y libevent-dev libutf8proc-dev && \ - cd /tmp && wget https://github.com/tmux/tmux/releases/download/3.2a/tmux-3.2a.tar.gz && \ - tar xvzf tmux-3.2a.tar.gz && cd tmux-3.2a && \ + cd /tmp && wget https://github.com/tmux/tmux/releases/download/3.3a/tmux-3.3a.tar.gz && \ + tar xvzf tmux-3.3a.tar.gz && cd tmux-3.3a && \ ./configure --enable-static --enable-utf8proc && \ make && make install diff --git a/.github/scripts/build-base-image.sh b/.github/scripts/build-base-image.sh index da092a6d06..f4b05e1216 100755 --- a/.github/scripts/build-base-image.sh +++ b/.github/scripts/build-base-image.sh @@ -22,15 +22,15 @@ fi case "${BASE_TAG}" in *i386-debian-base) - BASE="i386/debian:bullseye" + BASE="i386/debian:bookworm" BASE_TYPE=debian-base ;; *debian-base) - BASE="debian:bullseye" + BASE="debian:bookworm" BASE_TYPE=debian-base ;; *ubuntu-base) - BASE="ubuntu:20.04" + BASE="ubuntu:22.04" BASE_TYPE=ubuntu-base ;; esac -- 2.35.3
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
