diff --git a/Dockerfile b/Dockerfile index 72944d3..2378547 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,6 @@ ARG ARCHTAG FROM docker.io/library/archlinux:base-$ARCHTAG AS base -# Monkey patch glibc to avoid issues with old kernels on hosts -RUN --mount=type=bind,target=/mp,source=build-aux/docker-glibc-workaround.sh /mp - # Setup Caleb’s hosted Arch repository with prebuilt dependencies RUN pacman-key --init && pacman-key --populate RUN sed -i /etc/pacman.conf -e \ diff --git a/Makefile.am b/Makefile.am index 0c91d55..585e114 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,7 @@ fontship_SOURCES = Cargo.toml build.rs src/main.rs $(_fontship_libs) $(_fontship EXTRA_fontship_SOURCES = Cargo.lock EXTRA_DIST = requirements.txt EXTRA_DIST += build-aux/action-updater.js build-aux/cargo-updater.js build-aux/git-version-gen -EXTRA_DIST += Dockerfile build-aux/bootstrap-docker.sh build-aux/docker-glibc-workaround.sh hooks/build +EXTRA_DIST += Dockerfile build-aux/bootstrap-docker.sh hooks/build BUILT_SOURCES = .version CLEANFILES = $(BUILT_SOURCES) .version-prev $(bin_PROGRAMS) diff --git a/build-aux/docker-glibc-workaround.sh b/build-aux/docker-glibc-workaround.sh deleted file mode 100755 index b44a9e0..0000000 --- a/build-aux/docker-glibc-workaround.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env sh -set -e - -# Temporary workaround for glibc 2.33 having new syscalls that are not -# whitelisted yet in some older Docker host environments including the engines -# on GitHub Actions and Docker Hub. -# -# Arch Linux bug report: -# https://gitlab.archlinux.org/archlinux/archlinux-docker/-/issues/56 -# -# Upstream GitHub issue (also affects Docker Hub): -# https://github.com/actions/virtual-environments/issues/2658 -# -# Dockerfile workaround thanks to: -# https://github.com/lxqt/lxqt-panel/pull/1562 -# -# Patched glibc sources here: -# https://github.com/archlinuxcn/repo/tree/master/archlinuxcn/glibc-linux4 - -cd /tmp - -pkgfile='glibc-linux4-2.33-4-x86_64.pkg.tar.zst' -sha256sum='a89f4d23ae7cde78b4258deec4fcda975ab53c8cda8b5e0a0735255c0cdc05cc' - -check_checksum () { - echo "$sha256sum $pkgfile" | sha256sum -c -} - -check_checksum || - curl -LO "https://repo.archlinuxcn.org/x86_64/$pkgfile" && - check_checksum - -bsdtar -C / -xvf "$pkgfile" 2>/dev/null - -sed -e '/^HoldPkg/s/^/#/' -i /etc/pacman.conf - -pacman --noconfirm --dbonly -Rdd glibc -pacman --noconfirm --overwrite '*' -Udd "$pkgfile" - -sed -e '/^#\?IgnorePkg/{s/^#//;s/$/ glibc/}' -i /etc/pacman.conf - -rm "$pkgfile"