Add support for rpm-build as well

Author: Jos Martin

.github/workflows/build-glibc-and-release.yaml

@@ -15,6 +15,10 @@ on:
         required: false
         type: boolean
         default: false
+      dockerfile:
+        required: false
+        type: string
+        default: Dockerfile.debian
 
 jobs:
   build:
@@ -27,7 +31,7 @@ jobs:
       - name: "Build"
         shell: bash
         run: |
-          DOCKER_BUILDKIT=1 docker build --build-arg DIST_BASE=${{ inputs.dist-base }} --build-arg DIST_TAG=${{ inputs.dist-tag }}  --output type=local,dest=. .
+          DOCKER_BUILDKIT=1 docker build --build-arg DIST_BASE=${{ inputs.dist-base }} --build-arg DIST_TAG=${{ inputs.dist-tag }}  -f ${{ inputs.dockerfile }} --output type=local,dest=. .
 
       - name: "Download glibc license info"
         shell: bash

.github/workflows/release-specific.yaml

@@ -17,8 +17,18 @@ on:
         type: string
 
 jobs:
-  build:
+  build-ubuntu:
+    if: github.event.inputs.dist-base == 'ubuntu' || github.event.inputs.dist-base == 'debian'
     uses: mathworks/build-glibc-bz-19329-patch/.github/workflows/build-glibc-and-release.yaml@main
     with: 
       dist-base: ${{ github.event.inputs.dist-base }}
-      dist-tag:  ${{ github.event.inputs.dist-tag }}
+      dist-tag:  ${{ github.event.inputs.dist-tag }}
+      dockerfile: Dockerfile.debian
+
+  build-rhel:
+    if: github.event.inputs.dist-base == 'almalinux' 
+    uses: mathworks/build-glibc-bz-19329-patch/.github/workflows/build-glibc-and-release.yaml@main
+    with: 
+      dist-base: ${{ github.event.inputs.dist-base }}
+      dist-tag:  ${{ github.event.inputs.dist-tag }}
+      dockerfile: Dockerfile.rhel      

Dockerfile

@@ -0,0 +1 @@
+Dockerfile.debian

Dockerfile

@@ -0,0 +1,49 @@
+# Copyright 2021 The MathWorks, Inc.
+ARG BUILD_ROOT=/opt/glibc/src/glibc/
+
+# Default to building for glibc 2.31 in ubuntu:20.04 but by specifying
+# --build-arg RELEASE=18.04 in the docker build phase this will build for 
+# glibc 2.27
+ARG ARCH=
+ARG DIST_BASE=ubuntu
+ARG DIST_TAG=20.04
+FROM ${ARCH}${DIST_BASE}:${DIST_TAG} AS build-stage
+
+ARG DIST_BASE
+ARG DIST_TAG
+ARG OVERRIDE_DIST_RELEASE=false
+
+ENV DEBIAN_FRONTEND="noninteractive" \
+    TZ="Etc/UTC" 
+
+RUN apt-get update && apt-get install --no-install-recommends -y \
+    quilt \ 
+    nano \ 
+    devscripts
+
+ARG PKG_EXT
+ARG BUILD_ROOT
+WORKDIR ${BUILD_ROOT}
+
+# Build glibc in 3 distinct stages
+#  1. Get the build envionment and source code
+#  2. Patch the source code
+#  3. Build the source code
+
+COPY scripts/setup-glibc-build-env-vars.sh ${BUILD_ROOT}/
+COPY scripts/get-glibc-src.sh ${BUILD_ROOT}/
+RUN ./get-glibc-src.sh
+
+COPY patches/debian/ ${BUILD_ROOT}/patches/ 
+COPY scripts/patch-glibc-src.sh ${BUILD_ROOT}/
+RUN ./patch-glibc-src.sh
+
+COPY scripts/build-glibc-src.sh ${BUILD_ROOT}/
+RUN ./build-glibc-src.sh
+
+RUN tar -czf all-packages.tar.gz *.deb
+
+FROM scratch AS release-stage
+ARG BUILD_ROOT
+COPY --from=build-stage ${BUILD_ROOT}/*.deb /build/
+COPY --from=build-stage ${BUILD_ROOT}/all-packages.tar.gz /build/

Dockerfile.debian

@@ -0,0 +1,40 @@
+# Copyright 2021 The MathWorks, Inc.
+ARG BUILD_ROOT=/root/
+ARG RPM_DIR=${BUILD_ROOT}/rpmbuild/RPMS/x86_64/
+
+# Default to building for glibc 2.31 in ubuntu:20.04 but by specifying
+# --build-arg RELEASE=18.04 in the docker build phase this will build for 
+# glibc 2.27
+ARG ARCH=
+ARG DIST_BASE=almalinux
+ARG DIST_TAG=8.5
+FROM ${DIST_BASE}:${DIST_TAG} AS build-stage
+
+RUN dnf install -y --nodocs dnf-plugins-core && \
+    dnf config-manager --enable powertools && \
+    dnf install -y rpm-build  
+
+ARG BUILD_ROOT
+WORKDIR ${BUILD_ROOT}
+
+RUN dnf download --source glibc && \
+    dnf builddep -y --nodocs glibc-*.src.rpm && \
+    rpm -ivh glibc-*.src.rpm
+
+COPY scripts/update-specfile.sh ${BUILD_ROOT}
+COPY patches/rhel ${BUILD_ROOT}/patches
+
+RUN cp patches/2.28/* rpmbuild/SOURCES && \
+    ./update-specfile.sh
+
+RUN rpmbuild --nocheck -bb rpmbuild/SPECS/glibc.spec
+
+ARG RPM_DIR
+WORKDIR ${RPM_DIR}
+
+RUN tar -czf all-packages.tar.gz *.rpm
+
+FROM scratch AS release-stage
+ARG RPM_DIR
+COPY --from=build-stage ${RPM_DIR}/*.rpm /build/
+COPY --from=build-stage ${RPM_DIR}/all-packages.tar.gz /build/

Dockerfile.rhel

@@ -4,7 +4,7 @@ This repository provides a method for working around the sporadic issue seen on
 
 If you are running an ubuntu-based system and can upgrade to **version 21.10 (Impish Indri)** this is the safest and easiest way to alleviate the issue, since that version contains glibc v2.34 in which the underlying issue is completely fixed.
 
-If instead you want to work around this issue, you can use this repository. It provides a build procedure (in an isolated Docker® container) to produce patched versions of the glibc libraries for recent Ubuntu® and Debian® releases. These patched versions [incorporate an initial fix](https://patchwork.ozlabs.org/project/glibc/patch/[email protected]/) proposed on the [libc-alpha mailing list](https://sourceware.org/mailman/listinfo/libc-alpha) that mitigate the issue. In the release area of this repository you can find the debian package build artefacts produced by running the build on Ubuntu 18.04 & 20.04 as well as Debian 9, 10 & 11. You can install these artefacts on an appropriate debian-based machine, virtual machine or docker container, by using `dpkg -i`.
+If instead you want to work around this issue, you can use this repository. It provides a build procedure (in an isolated Docker® container) to produce patched versions of the glibc libraries for recent Almalinux, Ubuntu® and Debian® releases. These patched versions [incorporate an initial fix](https://patchwork.ozlabs.org/project/glibc/patch/[email protected]/) proposed on the [libc-alpha mailing list](https://sourceware.org/mailman/listinfo/libc-alpha) that mitigate the issue. In the release area of this repository you can find the debian package build artefacts produced by running the build on Ubuntu 18.04 & 20.04 as well as Debian 9, 10 & 11. You can install these artefacts on an appropriate debian-based machine, virtual machine or docker container, by using `dpkg -i`. For Almalinux you cand find the appropriate `rpm's` which should also work on UBI and CentOS containers.
 
 ## Bug Description 
 The [assert failure at concurrent pthread_create and dlopen](https://sourceware.org/bugzilla/show_bug.cgi?id=19329) glibc bug was first reported in December 2015 and can affect any process on Linux that creates a thread at the same time as opening a dynamic shared object library. Initially the issue was only observable with reasonable frequency on very large scale machine systems such as high performance computing clusters or cloud scale deployment platforms and so did not receive significant attention. However, early on there were [proposed patches](https://sourceware.org/bugzilla/show_bug.cgi?id=19329) to the library. Large scale systems applied those patches in-house and saw significant benefit. More recently a [proposed complete fix for this](https://sourceware.org/pipermail/libc-alpha/2021-February/122626.html) and a set of related issues has been reviewed by the glibc team and accepted into version 2.34 of glibc (released in August 2021). The 2.34 version of glibc is available in [RHEL 9 beta](https://developers.redhat.com/articles/2021/11/03/red-hat-enterprise-linux-9-beta-here) and [Ubuntu 21.10 (Impish Indri)](https://launchpad.net/ubuntu/+source/glibc). However, there are no plans to backport the fix into previous glibc versions and it is expected that previous versions will be in production use for a significant number of years (e.g. the current end-of-life date for Ubuntu:20.04 is April 2030). 
@@ -50,7 +50,7 @@ libc6:amd64     2.31-0ubuntu9.2
 ```
 
 ## Build procedure 
-To build a specific version of glibc on your own machine you will need a version of `docker` that supports `BUILDKIT` (this feature was added in version 18.09). This repository holds patches for all glibc versions from 2.24 to 2.33 inclusive. Running the build process takes between 10 and 60 mins based on the compute ability of your system.
+To build a specific version of glibc on your own machine you will need a version of `docker` that supports `BUILDKIT` (this feature was added in version 18.09). This repository holds patches for all glibc versions on debian derived systems from 2.24 to 2.33 inclusive, as well as a version for RHEL 8 with glibc 2.28. Running the build process takes between 10 and 60 mins based on the compute ability of your system.
 
 ### Pre-built artefacts
 This repository runs a number of github actions to build artefacts for specific Debian and Ubuntu versions and it is likely that these are all that is needed to patch your system. You can download the matching debian package for your system from the release area.
@@ -71,6 +71,8 @@ This repository runs a number of github actions to build artefacts for specific
     | `ubuntu:18.04` | `ubuntu:bionic` |
     | `ubuntu:20.04` | `ubuntu:focal` |
     | `ubuntu:21.04` | `ubuntu:hirsute` |
+    | `almalinux:8.4` | |
+    | `almalinux:8.5` | |
 
 Here is an example build command (for `debian:9`):
 ```
@@ -87,6 +89,13 @@ libc6_2.28-10.custom_amd64.deb
 libc6_2.31-13+deb11u2.custom_amd64.deb
 ```
 
+When building for Almalinux you must use the `Dockerfile.rhel` rather than the debian `Dockerfile` so the build command is 
+```
+DOCKER_BUILDKIT=1 docker build --build-arg DIST_TAG=8.5 -f Dockerfile.rhel --output type=local,dest=. .
+```
+
+If you have access to a RHEL subscription you should be able to adapt the `Dockerfile.rhel` trivially to include the correct repos to support building the sources directly in a `ubi8` container.
+
 ### Overriding package version string
 The package version extension defaults to `.DIST_BASE.DIST_TAG.custom`, where
 `${DIST_TAG}` defaults to the `VERSION_CODENAME` found in `/etc/os-release`.  This version
@@ -106,6 +115,13 @@ dpkg -i libc6_2.24-11+deb9u4.custom_amd64.deb
 ```
 For your system replace the debian package with the correct version that matches the glibc you already have (see for example the output from `dpkg-query --show libc6:amd64`)
 
+Installing the rpms on a UBI / Almalinux system requires you to install several of the packages at once, for example
+```
+dnf install -y  glibc-2.28-164.custom.el8.x86_64.rpm  \
+                glibc-common-2.28-164.custom.el8.x86_64.rpm \
+                glibc-minimal-langpack-2.28-164.custom.el8.x86_64.rpm
+```
+
 ### Installing in a Docker container
 When building a docker container with a specific patch, assuming the patch is in the top level docker context folder you would have a `Dockerfile` like
 ``` docker