This fixes the CPACK workflow failures for Ubuntu and RHEL (#368)

* Add texinfo to Ubuntu and RHEL docker files * Add the `bison` package to Ubuntu dockerfile * Update the CI docker files too. --------- Signed-off-by: David Galiffi <[email protected]>
ROCm · Aug 2, 2024 · d0d9749 · d0d9749
1 parent c11abc4
commit d0d9749
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/docker/Dockerfile.rhel b/docker/Dockerfile.rhel
@@ -14,8 +14,8 @@ ENV PATH /usr/local/bin:${PATH}
 ENV LIBRARY_PATH ${LIBRARY_PATH}:/opt/amdgpu/lib64
 
 RUN yum groupinstall -y "Development Tools" && \
-    yum install -y epel-release && \
-    yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip wget zlib-devel which && \
+    yum install -y epel-release && crb enable && \
+    yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel && \
     yum clean all && \
     python3 -m pip install 'cmake==3.21.4'
 

diff --git a/docker/Dockerfile.rhel.ci b/docker/Dockerfile.rhel.ci
@@ -17,8 +17,8 @@ ARG ELFUTILS_DOWNLOAD_VERSION="0.186"
 ARG NJOBS="12"
 
 RUN yum groupinstall -y "Development Tools" && \
-    yum install -y epel-release && \
-    yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip wget zlib-devel which && \
+    yum install -y epel-release && crb enable && \
+    yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel  && \
     yum clean all && \
     python3 -m pip install 'cmake==3.21.4'
 

diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu
@@ -23,7 +23,7 @@ ENV PATH ${HOME}/.local/bin:${PATH}
 
 RUN apt-get update && \
     apt-get dist-upgrade -y && \
-    apt-get install -y build-essential cmake libnuma1 wget gnupg2 m4 bash-completion git-core autoconf libtool autotools-dev python3-pip lsb-release libpapi-dev libpfm4-dev libudev1 libopenmpi-dev rpm librpm-dev curl apt-utils && \
+    apt-get install -y apt-utils autoconf autotools-dev bash-completion bison build-essential cmake curl git-core gnupg2 libnuma1 libopenmpi-dev libpapi-dev libpfm4-dev librpm-dev libtool libudev1 lsb-release m4 python3-pip rpm texinfo wget && \
     python3 -m pip install 'cmake==3.21.4'
 
 RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \

diff --git a/docker/Dockerfile.ubuntu.ci b/docker/Dockerfile.ubuntu.ci
@@ -27,7 +27,7 @@ COPY ./dyninst-source /tmp/dyninst
 
 RUN apt-get update && \
     apt-get dist-upgrade -y && \
-    apt-get install -y autoconf autotools-dev bash-completion build-essential bzip2 cmake curl environment-modules git-core gnupg2 gzip libiberty-dev libpapi-dev libpfm4-dev libtool locales lsb-release m4 python3-pip unzip wget zip zlib1g-dev && \
+    apt-get install -y autoconf autotools-dev bash-completion bison build-essential bzip2 cmake curl environment-modules git-core gnupg2 gzip libiberty-dev libpapi-dev libpfm4-dev libtool locales lsb-release m4 python3-pip texinfo unzip wget zip zlib1g-dev && \
     python3 -m pip install 'cmake==3.18.4' && \
     apt-get autoclean && \
     locale -a && \