this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[deb,rpm] Remove python2 dep

[ci] Allow Dockerfiles to be reused for different base images

+25 -6
+21 -3
ci/Debian.Dockerfile
··· 1 1 # this Dockerfile must be built using the following command: 2 2 # docker build -f ../ci/Debian.Dockerfile . 3 3 # this command must be run while in the `debian` directory in the root of the repo. 4 - FROM ubuntu:jammy 4 + ARG BASE_IMAGE=ubuntu:jammy 5 + FROM $BASE_IMAGE 5 6 LABEL name=darling-build-image version=0.1.0 6 7 ARG DEBIAN_FRONTEND="noninteractive" 7 8 ARG CI_UID=1111 8 9 ARG CI_GID=1111 9 10 RUN cp /etc/apt/sources.list /etc/apt/sources.list.d/sources-src.list && sed -i 's|deb http|deb-src http|g' /etc/apt/sources.list.d/sources-src.list 10 11 RUN apt-get -y update 11 - RUN apt-get -y install cmake clang bison flex libfuse-dev libudev-dev pkg-config libc6-dev-i386 gcc-multilib libcairo2-dev libgl1-mesa-dev libglu1-mesa-dev libtiff5-dev libfreetype6-dev git git-lfs libelf-dev libxml2-dev libegl1-mesa-dev libfontconfig1-dev libbsd-dev libxrandr-dev libxcursor-dev libgif-dev libavutil-dev libpulse-dev libavformat-dev libavcodec-dev libswresample-dev libdbus-1-dev libxkbfile-dev libssl-dev python2 llvm-dev libvulkan-dev && apt clean -y 12 - RUN apt-get -y install lsb-release lsb-core && apt clean -y 12 + RUN apt-get -y install cmake clang bison flex libfuse-dev libudev-dev pkg-config libc6-dev-i386 gcc-multilib libcairo2-dev libgl1-mesa-dev libglu1-mesa-dev libtiff5-dev libfreetype6-dev git git-lfs libelf-dev libxml2-dev libegl1-mesa-dev libfontconfig1-dev libbsd-dev libxrandr-dev libxcursor-dev libgif-dev libavutil-dev libpulse-dev libavformat-dev libavcodec-dev libswresample-dev libdbus-1-dev libxkbfile-dev libssl-dev llvm-dev libvulkan-dev && apt clean -y 13 + RUN apt-get -y install lsb-release && apt clean -y 13 14 RUN groupadd -g "${CI_GID}" ci 14 15 RUN useradd -u "${CI_UID}" -g "${CI_GID}" -m ci 15 16 RUN apt-get -y install devscripts equivs debhelper && apt clean -y ··· 17 18 RUN mk-build-deps -i -r -t "apt-get --no-install-recommends -y" /control && apt clean -y 18 19 RUN rm /control 19 20 RUN apt-get -y install ccache && apt clean -y 21 + RUN apt-get -y install wget gpg ca-certificates && apt clean -y 22 + 23 + RUN if [ "$(clang --version | head -n 1 | cut -d ' ' -f 3 | cut -d '.' -f 1)" -lt 11 ]; then \ 24 + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \ 25 + echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs) main" >> /etc/apt/sources.list.d/llvm.list && \ 26 + echo "deb-src http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs) main" >> /etc/apt/sources.list.d/llvm.list && \ 27 + apt-get update; \ 28 + fi 29 + 30 + RUN if [ "$(cmake --version | head -n 1 | cut -d ' ' -f 3 | awk '{print $1"\n3.20"}' | sort -Vr | head -n 1)" = "3.20" ]; then \ 31 + wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \ 32 + echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null && \ 33 + apt-get update; \ 34 + fi 35 + 36 + RUN apt-get install -y --only-upgrade clang cmake && apt clean -y 37 + 20 38 RUN mkdir -p /ccache 21 39 RUN mkdir -p /src/mnt 22 40 RUN chown -R ci:ci /src
+2 -1
ci/RPM.Dockerfile
··· 1 1 # this Dockerfile must be built using the following command: 2 2 # docker build -f ../ci/RPM.Dockerfile . 3 3 # this command must be run while in the `rpm` directory in the root of the repo. 4 - FROM fedora:37 4 + ARG BASE_IMAGE=fedora:37 5 + FROM $BASE_IMAGE 5 6 LABEL name=darling-build-image-fedora version=0.1.0 6 7 ARG CI_UID=1111 7 8 ARG CI_GID=1111
+1 -1
debian/control
··· 3 3 Section: misc 4 4 Priority: optional 5 5 Standards-Version: 4.4.0 6 - Build-Depends: cmake, clang | clang-9, bison, flex, libfuse-dev, libudev-dev, pkg-config, libc6-dev-i386, linux-headers-amd64|linux-headers-generic, gcc-multilib, libcairo2-dev, libgl1-mesa-dev, libtiff5-dev, libfreetype6-dev, libelf-dev, libxml2-dev, libegl1-mesa-dev, libglu1-mesa-dev, libfontconfig1-dev, libbsd-dev, debhelper, ninja-build, python2, libxrandr-dev, libxcursor-dev, libgif-dev, libavcodec-dev, libavformat-dev, libswresample-dev, libavutil-dev, libpulse-dev, libavformat-dev, libavcodec-dev, libdbus-1-dev, libxkbfile-dev, libcap-dev, llvm-dev, libvulkan-dev, libcap2-bin 6 + Build-Depends: cmake, clang | clang-9, bison, flex, libfuse-dev, libudev-dev, pkg-config, libc6-dev-i386, linux-headers-amd64|linux-headers-generic, gcc-multilib, libcairo2-dev, libgl1-mesa-dev, libtiff5-dev, libfreetype6-dev, libelf-dev, libxml2-dev, libegl1-mesa-dev, libglu1-mesa-dev, libfontconfig1-dev, libbsd-dev, debhelper, ninja-build, libxrandr-dev, libxcursor-dev, libgif-dev, libavcodec-dev, libavformat-dev, libswresample-dev, libavutil-dev, libpulse-dev, libavformat-dev, libavcodec-dev, libdbus-1-dev, libxkbfile-dev, libcap-dev, llvm-dev, libvulkan-dev, libcap2-bin 7 7 8 8 Package: darling 9 9 Architecture: amd64
+1 -1
rpm/SPECS/darling.spec
··· 32 32 BuildRequires: cairo-devel freetype-devel(x86-64) fontconfig-devel(x86-64) 33 33 BuildRequires: freetype-devel(x86-32) fontconfig-devel(x86-32) make 34 34 BuildRequires: libjpeg-turbo-devel(x86-64) libtiff-devel(x86-64) 35 - BuildRequires: libjpeg-turbo-devel(x86-32) libtiff-devel(x86-32) 35 + BuildRequires: libjpeg-turbo-devel(x86-32) 36 36 BuildRequires: libglvnd-devel mesa-libGL-devel mesa-libEGL-devel 37 37 BuildRequires: libxml2-devel elfutils-libelf-devel 38 38 BuildRequires: libbsd-devel