From c1d5cc47d754557bea9bcaaa73ecb08d3f0a64c3 Mon Sep 17 00:00:00 2001 From: Artem Savkov Date: Mon, 20 Jan 2020 11:40:56 +0100 Subject: [PATCH] Fix epel ccache installation ccache version in epel updates from time to time so instead of using a direct link install epel repo and install ccache without specifying the version. Suggested-by: Joe Lawrence Signed-off-by: Artem Savkov --- README.md | 4 +++- test/integration/lib.sh | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5d430a1..0c9e2ce 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,9 @@ sudo debuginfo-install kernel-${UNAME%.*} sudo yum install gcc-plugin-devel # optional, but highly recommended -sudo yum install https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm +sudo yum install "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" +sudo yum install ccache +sudo yum remove -y epel-release # If you no longer want epel repos ccache --max-size=5G ``` diff --git a/test/integration/lib.sh b/test/integration/lib.sh index 9c106f6..49305d5 100644 --- a/test/integration/lib.sh +++ b/test/integration/lib.sh @@ -66,7 +66,9 @@ kpatch_rhel_dependencies() [ "${arch}" == "x86_64" ] && sudo yum install -y pesign [ "${arch}" == "ppc64le" ] && sudo yum install -y gcc-plugin-devel - sudo yum install -y "https://dl.fedoraproject.org/pub/epel/7/${arch}/Packages/c/ccache-3.3.4-1.el7.${arch}.rpm" + sudo yum install -y "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + sudo yum install -y ccache + sudo yum remove -y epel-release } kpatch_centos_dependencies() @@ -84,7 +86,9 @@ kpatch_centos_dependencies() sudo yum-builddep -y "kernel-${kernel_version%.*}" sudo debuginfo-install -y "kernel-${kernel_version%.*}" - sudo yum install -y "https://dl.fedoraproject.org/pub/epel/7/${arch}/Packages/c/ccache-3.3.4-1.el7.${arch}.rpm" + sudo yum install -y "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + sudo yum install -y ccache + sudo yum remove -y epel-release } kpatch_dependencies()