From ddeabcb6f68b46bd84d9db6375d8bb60c59c6296 Mon Sep 17 00:00:00 2001 From: Fabian Ruffy Date: Wed, 19 Jul 2023 12:13:32 -0400 Subject: [PATCH 1/4] Try to fix certificate errors. --- tools/ci-build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/ci-build.sh b/tools/ci-build.sh index a4231d800f9..058914917a4 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -100,11 +100,11 @@ if [[ "${DISTRIB_RELEASE}" == "18.04" ]] || [[ "$(which simple_switch 2> /dev/nu export CC=gcc-9 export CXX=g++-9 else - sudo apt-get update && sudo apt-get install -y curl gnupg - echo "deb https://download.opensuse.org/repositories/home:/p4lang/xUbuntu_${DISTRIB_RELEASE}/ /" | sudo tee /etc/apt/sources.list.d/home:p4lang.list - curl -L "https://download.opensuse.org/repositories/home:/p4lang/xUbuntu_${DISTRIB_RELEASE}/Release.key" | sudo apt-key add - - # Try to avoid certificate errors. - sudo apt install ca-certificates + sudo apt-get update && sudo apt-get install -y wget ca-certificates + # Add the p4lang opensuse repository in a secure fashion. + sudo mkdir -p /etc/apt/keyrings/p4lang + wget -O- https://download.opensuse.org/repositories/home:/p4lang/xUbuntu_${DISTRIB_RELEASE}/Release.gpg | gpg --dearmor | sudo tee /etc/apt/keyrings/p4lang/p4lang-release-keyring.gpg > /dev/null + echo "deb [signed-by=/etc/apt/keyrings/p4lang/p4lang-release-keyring.gpg] https://download.opensuse.org/repositories/home:/p4lang/ ../xUbuntu_${DISTRIB_RELEASE} main" | sudo tee /etc/apt/sources.list.d/home:p4lang.list P4C_DEPS+=" p4lang-bmv2" fi From 34ec48357ec8e5be8ace5830c5ee8afeca562144 Mon Sep 17 00:00:00 2001 From: Fabian Ruffy Date: Wed, 19 Jul 2023 15:17:24 -0400 Subject: [PATCH 2/4] Try recommended version. --- tools/ci-build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/ci-build.sh b/tools/ci-build.sh index 058914917a4..d319a8366ae 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -101,10 +101,9 @@ if [[ "${DISTRIB_RELEASE}" == "18.04" ]] || [[ "$(which simple_switch 2> /dev/nu export CXX=g++-9 else sudo apt-get update && sudo apt-get install -y wget ca-certificates - # Add the p4lang opensuse repository in a secure fashion. - sudo mkdir -p /etc/apt/keyrings/p4lang - wget -O- https://download.opensuse.org/repositories/home:/p4lang/xUbuntu_${DISTRIB_RELEASE}/Release.gpg | gpg --dearmor | sudo tee /etc/apt/keyrings/p4lang/p4lang-release-keyring.gpg > /dev/null - echo "deb [signed-by=/etc/apt/keyrings/p4lang/p4lang-release-keyring.gpg] https://download.opensuse.org/repositories/home:/p4lang/ ../xUbuntu_${DISTRIB_RELEASE} main" | sudo tee /etc/apt/sources.list.d/home:p4lang.list + # Add the p4lang opensuse repository. + echo "deb http://download.opensuse.org/repositories/home:/p4lang/xUbuntu_${DISTRIB_RELEASE}/ /" | sudo tee /etc/apt/sources.list.d/home:p4lang.list + curl -fsSL https://download.opensuse.org/repositories/home:p4lang/xUbuntu_${DISTRIB_RELEASE}/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_p4lang.gpg > /dev/null P4C_DEPS+=" p4lang-bmv2" fi From 59516f48fb44a68d76f54c8ad1eb7d42814c01c4 Mon Sep 17 00:00:00 2001 From: Fabian Ruffy Date: Wed, 19 Jul 2023 15:35:19 -0400 Subject: [PATCH 3/4] Also update README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 36160debc96..4497b3b2721 100644 --- a/README.md +++ b/README.md @@ -111,8 +111,8 @@ A p4c package is available in the following repositories for Ubuntu 20.04 and ne ```bash . /etc/os-release -echo "deb https://download.opensuse.org/repositories/home:/p4lang/xUbuntu_${VERSION_ID}/ /" | sudo tee /etc/apt/sources.list.d/home:p4lang.list -curl -L "https://download.opensuse.org/repositories/home:/p4lang/xUbuntu_${VERSION_ID}/Release.key" | sudo apt-key add - +echo "deb http://download.opensuse.org/repositories/home:/p4lang/xUbuntu_${DISTRIB_RELEASE}/ /" | sudo tee /etc/apt/sources.list.d/home:p4lang.list +curl -fsSL https://download.opensuse.org/repositories/home:p4lang/xUbuntu_${DISTRIB_RELEASE}/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_p4lang.gpg > /dev/null sudo apt-get update sudo apt install p4lang-p4c ``` From 2de6b2f4afea5a128468160ffa4c046973f8ebbe Mon Sep 17 00:00:00 2001 From: Fabian Ruffy Date: Wed, 19 Jul 2023 16:42:16 -0400 Subject: [PATCH 4/4] lsb-release instead of os-release. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4497b3b2721..0bd35b82f55 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ p4c has package support for several Ubuntu and Debian distributions. A p4c package is available in the following repositories for Ubuntu 20.04 and newer. ```bash -. /etc/os-release +source /etc/lsb-release echo "deb http://download.opensuse.org/repositories/home:/p4lang/xUbuntu_${DISTRIB_RELEASE}/ /" | sudo tee /etc/apt/sources.list.d/home:p4lang.list curl -fsSL https://download.opensuse.org/repositories/home:p4lang/xUbuntu_${DISTRIB_RELEASE}/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_p4lang.gpg > /dev/null sudo apt-get update