From 8c8f9d193bf905fb7bbc4acbb75b71ee318d8589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Wed, 11 Dec 2024 11:29:57 -0500 Subject: [PATCH] update sysroot recipes --- .github/workflows/cbake-sysroots.yml | 13 +++++++- recipes/alpine-3.17/Dockerfile | 2 +- .../{fedora-37 => alpine-3.21}/.dockerignore | 0 recipes/alpine-3.21/.gitignore | 1 + recipes/alpine-3.21/Dockerfile | 20 ++++++++++++ recipes/debian-10/Dockerfile | 2 +- .../.dockerignore | 0 recipes/debian-12/.gitignore | 1 + recipes/debian-12/Dockerfile | 28 +++++++++++++++++ recipes/fedora-37/.gitignore | 1 - recipes/fedora-37/Dockerfile | 26 ---------------- recipes/opensuse-15.4/.gitignore | 1 - recipes/opensuse-15.4/Dockerfile | 30 ------------------ recipes/ubuntu-24.04/.dockerignore | 2 ++ recipes/ubuntu-24.04/.gitignore | 1 + recipes/ubuntu-24.04/Dockerfile | 31 +++++++++++++++++++ 16 files changed, 98 insertions(+), 61 deletions(-) rename recipes/{fedora-37 => alpine-3.21}/.dockerignore (100%) create mode 100644 recipes/alpine-3.21/.gitignore create mode 100644 recipes/alpine-3.21/Dockerfile rename recipes/{opensuse-15.4 => debian-12}/.dockerignore (100%) create mode 100644 recipes/debian-12/.gitignore create mode 100644 recipes/debian-12/Dockerfile delete mode 100644 recipes/fedora-37/.gitignore delete mode 100644 recipes/fedora-37/Dockerfile delete mode 100644 recipes/opensuse-15.4/.gitignore delete mode 100644 recipes/opensuse-15.4/Dockerfile create mode 100644 recipes/ubuntu-24.04/.dockerignore create mode 100644 recipes/ubuntu-24.04/.gitignore create mode 100644 recipes/ubuntu-24.04/Dockerfile diff --git a/.github/workflows/cbake-sysroots.yml b/.github/workflows/cbake-sysroots.yml index 21ebb51..864157f 100644 --- a/.github/workflows/cbake-sysroots.yml +++ b/.github/workflows/cbake-sysroots.yml @@ -8,7 +8,18 @@ jobs: fail-fast: false matrix: arch: [ amd64, arm64 ] - distro: [ ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, debian-10, debian-11, rhel8, rhel9, alpine-3.17, fedora-37, opensuse-15.4 ] + distro: + - ubuntu-18.04 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-24.04 + - debian-10 + - debian-11 + - debian-12 + - rhel8 + - rhel9 + - alpine-3.17 + - alpine-3.21 include: - os: linux diff --git a/recipes/alpine-3.17/Dockerfile b/recipes/alpine-3.17/Dockerfile index 7a326d9..dac325e 100644 --- a/recipes/alpine-3.17/Dockerfile +++ b/recipes/alpine-3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.17 +FROM alpine:3.21 RUN apk add --no-cache \ gcc \ diff --git a/recipes/fedora-37/.dockerignore b/recipes/alpine-3.21/.dockerignore similarity index 100% rename from recipes/fedora-37/.dockerignore rename to recipes/alpine-3.21/.dockerignore diff --git a/recipes/alpine-3.21/.gitignore b/recipes/alpine-3.21/.gitignore new file mode 100644 index 0000000..77ade34 --- /dev/null +++ b/recipes/alpine-3.21/.gitignore @@ -0,0 +1 @@ +alpine-3.21-*/ diff --git a/recipes/alpine-3.21/Dockerfile b/recipes/alpine-3.21/Dockerfile new file mode 100644 index 0000000..dac325e --- /dev/null +++ b/recipes/alpine-3.21/Dockerfile @@ -0,0 +1,20 @@ +FROM alpine:3.21 + +RUN apk add --no-cache \ + gcc \ + g++ \ + openssl-dev \ + libxcursor-dev \ + libxkbfile-dev \ + libxinerama-dev \ + libxv-dev \ + libxdamage-dev \ + libxi-dev \ + libxkbcommon-dev \ + cups-dev \ + alsa-lib-dev \ + ffmpeg-dev \ + gst-plugins-base-dev \ + gsm-dev \ + libusb-dev \ + wayland-dev diff --git a/recipes/debian-10/Dockerfile b/recipes/debian-10/Dockerfile index a4a54a1..04af4d7 100644 --- a/recipes/debian-10/Dockerfile +++ b/recipes/debian-10/Dockerfile @@ -26,4 +26,4 @@ RUN apt-get install -y \ libusb-1.0-0-dev \ libudev-dev \ libsdl2-dev \ - libsdl2-ttf-dev + libsdl2-ttf-dev \ No newline at end of file diff --git a/recipes/opensuse-15.4/.dockerignore b/recipes/debian-12/.dockerignore similarity index 100% rename from recipes/opensuse-15.4/.dockerignore rename to recipes/debian-12/.dockerignore diff --git a/recipes/debian-12/.gitignore b/recipes/debian-12/.gitignore new file mode 100644 index 0000000..a8c2886 --- /dev/null +++ b/recipes/debian-12/.gitignore @@ -0,0 +1 @@ +debian-12-*/ diff --git a/recipes/debian-12/Dockerfile b/recipes/debian-12/Dockerfile new file mode 100644 index 0000000..ce782ba --- /dev/null +++ b/recipes/debian-12/Dockerfile @@ -0,0 +1,28 @@ +FROM debian:bookworm-slim + +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -y + +RUN apt-get install -y \ + gcc \ + libssl-dev \ + libpam-dev \ + libkrb5-dev \ + libffi-dev \ + libsystemd-dev \ + libx11-dev \ + libxtst-dev \ + libxcursor-dev \ + libxrandr-dev \ + libgtk2.0-dev \ + libgtk-3-dev \ + libglib2.0-dev \ + libappindicator-dev \ + libappindicator3-dev \ + libnotify-dev \ + libcups2-dev \ + libusb-1.0-0-dev \ + libudev-dev \ + libsdl2-dev \ + libsdl2-ttf-dev diff --git a/recipes/fedora-37/.gitignore b/recipes/fedora-37/.gitignore deleted file mode 100644 index bb9a4ad..0000000 --- a/recipes/fedora-37/.gitignore +++ /dev/null @@ -1 +0,0 @@ -fedora-37-*/ diff --git a/recipes/fedora-37/Dockerfile b/recipes/fedora-37/Dockerfile deleted file mode 100644 index bdeb58b..0000000 --- a/recipes/fedora-37/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM fedora:37 - -RUN yum update -y - -RUN yum install -y \ - gcc \ - zlib-devel \ - openssl-devel \ - pam-devel \ - krb5-devel \ - libffi-devel \ - systemd-devel \ - libX11-devel \ - libXtst-devel \ - libXcursor-devel \ - libXrandr-devel \ - gtk2-devel \ - gtk3-devel \ - glib2-devel \ - libappindicator-devel \ - libnotify-devel \ - cups-devel \ - libusb1-devel \ - libusbx-devel \ - SDL2-devel \ - SDL2_ttf-devel diff --git a/recipes/opensuse-15.4/.gitignore b/recipes/opensuse-15.4/.gitignore deleted file mode 100644 index 899b221..0000000 --- a/recipes/opensuse-15.4/.gitignore +++ /dev/null @@ -1 +0,0 @@ -opensuse-15.4-*/ diff --git a/recipes/opensuse-15.4/Dockerfile b/recipes/opensuse-15.4/Dockerfile deleted file mode 100644 index a53a78c..0000000 --- a/recipes/opensuse-15.4/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM opensuse/leap:15.4 - -RUN zypper install -y \ - gcc \ - zlib-devel \ - libopenssl-devel \ - systemd-devel \ - xorg-x11-devel \ - libXtst-devel \ - libXcursor-devel \ - libXdamage-devel \ - libXext-devel \ - libXfixes-devel \ - libXinerama-devel \ - libxkbcommon-devel \ - libxkbfile-devel \ - libXrandr-devel \ - libXrender-devel \ - libXv-devel \ - wayland-devel \ - alsa-devel \ - libpulse-devel \ - libgsm-devel \ - libjpeg-devel \ - krb5-devel \ - pcsc-lite-devel \ - gstreamer-devel \ - gstreamer-plugins-base-devel \ - cups-devel \ - libudev-devel diff --git a/recipes/ubuntu-24.04/.dockerignore b/recipes/ubuntu-24.04/.dockerignore new file mode 100644 index 0000000..a321af2 --- /dev/null +++ b/recipes/ubuntu-24.04/.dockerignore @@ -0,0 +1,2 @@ +**/ +*.tar.* diff --git a/recipes/ubuntu-24.04/.gitignore b/recipes/ubuntu-24.04/.gitignore new file mode 100644 index 0000000..fc97a4e --- /dev/null +++ b/recipes/ubuntu-24.04/.gitignore @@ -0,0 +1 @@ +ubuntu-22.04-*/ diff --git a/recipes/ubuntu-24.04/Dockerfile b/recipes/ubuntu-24.04/Dockerfile new file mode 100644 index 0000000..241a7e7 --- /dev/null +++ b/recipes/ubuntu-24.04/Dockerfile @@ -0,0 +1,31 @@ +FROM ubuntu:24.04 + +ARG DEBIAN_FRONTEND=noninteractive + +RUN sed -i 's/archive.ubuntu.com/ubuntu.mirrors.ovh.net/g' /etc/apt/sources.list +RUN apt-get update -y + +RUN apt-get install -y \ + gcc \ + libssl-dev \ + libpam-dev \ + libkrb5-dev \ + libffi-dev \ + libsystemd-dev \ + libx11-dev \ + libxtst-dev \ + libxcursor-dev \ + libxrandr-dev \ + libgtk2.0-dev \ + libgtk-3-dev \ + libglib2.0-dev \ + libappindicator3-dev \ + libnotify-dev \ + libcups2-dev \ + libusb-1.0-0-dev \ + libudev-dev \ + libsdl2-dev \ + libsdl2-ttf-dev \ + libsoup-3.0-dev \ + libwebkit2gtk-4.1-dev \ + libvte-2.91-dev