diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2 index 2459e28589..45b210d1ee 100644 --- a/dockers/docker-ptf/Dockerfile.j2 +++ b/dockers/docker-ptf/Dockerfile.j2 @@ -159,7 +159,7 @@ ENV PATH="/usr/local/go/bin:$HOME/go/bin:$PATH" RUN GRPCURL_VERSION=v1.9.3 \ && git clone --depth 1 --branch "${GRPCURL_VERSION}" https://github.com/fullstorydev/grpcurl.git /tmp/grpcurl \ && cd /tmp/grpcurl \ - && go get google.golang.org/grpc@v1.79.3 \ + && go get google.golang.org/grpc@v1.82.1 \ && go get github.com/go-jose/go-jose/v4@latest \ && go get golang.org/x/crypto@latest golang.org/x/net@latest golang.org/x/text@latest golang.org/x/sys@latest golang.org/x/oauth2@latest \ && go mod tidy \ @@ -218,7 +218,7 @@ debs/{{ deb }}{{' '}} {% else %} RUN apt-get update # Install p4lang packages for DASH SAI support first and python-saithrift -RUN apt install -y --reinstall ./debs/p4lang-pi_0.1.1-1_amd64.deb ./debs/p4lang-bmv2_1.15.0-9_amd64.deb ./debs/p4lang-p4c_1.2.4.2-2_amd64.deb ./debs/python-saithrift_0.9.4_amd64.deb +RUN apt install -y --reinstall ./debs/p4lang-pi_0.1.1-1_amd64.deb ./debs/p4lang-bmv2_1.15.0-9_amd64.deb ./debs/p4lang-p4c_1.2.4.2-3_amd64.deb ./debs/python-saithrift_0.9.4_amd64.deb {% endif %} diff --git a/rules/p4lang.mk b/rules/p4lang.mk index e5ad612710..3fb59fbcda 100644 --- a/rules/p4lang.mk +++ b/rules/p4lang.mk @@ -30,7 +30,7 @@ SONIC_MAKE_DEBS += $(P4LANG_BMV2) # p4lang-p4c P4LANG_P4C_VERSION = 1.2.4.2 -P4LANG_P4C_VERSION_FULL = $(P4LANG_P4C_VERSION)-2 +P4LANG_P4C_VERSION_FULL = $(P4LANG_P4C_VERSION)-3 export P4LANG_P4C_VERSION export P4LANG_P4C_VERSION_FULL diff --git a/src/sonic-host-services b/src/sonic-host-services index 99190e163e..c3bf111179 160000 --- a/src/sonic-host-services +++ b/src/sonic-host-services @@ -1 +1 @@ -Subproject commit 99190e163e28a5e55aa782c961f59e1fcc51888c +Subproject commit c3bf11117921af474cfc5381fb1a8bffb519026f