From b405ba1d05c851f7ad1cd01bf163c40b8d3d90d7 Mon Sep 17 00:00:00 2001 From: linsongnan Date: Thu, 26 Mar 2026 12:21:40 +0800 Subject: [PATCH 1/2] [fpmsyncd]: add libnexthopgroup in Makefile.am to support rib/fib feature Signed-off-by: linsongnan --- fpmsyncd/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fpmsyncd/Makefile.am b/fpmsyncd/Makefile.am index b61ebdfa930..c55c1ea25fd 100644 --- a/fpmsyncd/Makefile.am +++ b/fpmsyncd/Makefile.am @@ -13,7 +13,7 @@ fpmsyncd_SOURCES = fpmsyncd.cpp fpmlink.cpp routesync.cpp $(top_srcdir)/warmrest fpmsyncd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_ASAN) fpmsyncd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_ASAN) -fpmsyncd_LDADD = $(LDFLAGS_ASAN) -lnl-3 -lnl-route-3 -lswsscommon +fpmsyncd_LDADD = $(LDFLAGS_ASAN) -lnl-3 -lnl-route-3 -lswsscommon -lnexthopgroup if GCOV_ENABLED fpmsyncd_SOURCES += ../gcovpreload/gcovpreload.cpp From 40cbaf1607e23bd2b97c1eff9835715c9b29d261 Mon Sep 17 00:00:00 2001 From: linsongnan Date: Thu, 21 May 2026 16:30:36 +0800 Subject: [PATCH 2/2] [ci]: Add libnexthopgroup to Azure Pipeline build and test dependencies Add libnexthopgroup deb package from sonic-buildimage common_libs as both a compile-time and runtime dependency for VS test docker. Signed-off-by: linsongnan --- .azure-pipelines/build-docker-sonic-vs-template.yml | 12 ++++++++++++ .azure-pipelines/build-template.yml | 2 ++ .azure-pipelines/docker-sonic-vs/Dockerfile | 5 +++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/build-docker-sonic-vs-template.yml b/.azure-pipelines/build-docker-sonic-vs-template.yml index b8d9a5f9518..0fe9927a631 100644 --- a/.azure-pipelines/build-docker-sonic-vs-template.yml +++ b/.azure-pipelines/build-docker-sonic-vs-template.yml @@ -147,6 +147,17 @@ jobs: path: $(Build.ArtifactStagingDirectory)/download patterns: '**/target/debs/${{ parameters.debian_version }}/framework_*.deb' displayName: "Download sonic-buildimage sonic-framework package" + - task: DownloadPipelineArtifact@2 + inputs: + source: specific + project: ${{ parameters.buildimage_artifact_project }} + pipeline: Azure.sonic-buildimage.common_libs + artifact: common-lib + runVersion: 'latestFromBranch' + runBranch: 'refs/heads/${{ parameters.buildimage_artifact_branch }}' + path: $(Build.ArtifactStagingDirectory)/download + patterns: '**/target/debs/${{ parameters.debian_version }}/libnexthopgroup_*.deb' + displayName: "Download sonic-buildimage libnexthopgroup package" - task: DownloadPipelineArtifact@2 inputs: source: specific @@ -168,6 +179,7 @@ jobs: mkdir -p .azure-pipelines/docker-sonic-vs/debs find $(Build.ArtifactStagingDirectory)/download/sairedis -name '*.deb' -exec cp "{}" .azure-pipelines/docker-sonic-vs/debs \; + find $(Build.ArtifactStagingDirectory)/download -name 'libnexthopgroup_*.deb' -exec cp "{}" .azure-pipelines/docker-sonic-vs/debs \; cp -v $(Build.ArtifactStagingDirectory)/download/*.deb .azure-pipelines/docker-sonic-vs/debs if [ -f $(Build.ArtifactStagingDirectory)/download/coverage.info ]; then cp -v $(Build.ArtifactStagingDirectory)/download/coverage.info $(Build.ArtifactStagingDirectory)/ diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index 9fea2827a1d..a68c52e8043 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -172,6 +172,8 @@ jobs: target/debs/${{ parameters.debian_version }}/libnl-nf-3-200_*.deb target/debs/${{ parameters.debian_version }}/libnl-nf-3-dev_*.deb target/debs/${{ parameters.debian_version }}/libyang_*.deb + target/debs/${{ parameters.debian_version }}/libnexthopgroup_*.deb + target/debs/${{ parameters.debian_version }}/libnexthopgroup-dev_*.deb displayName: "Download common libs" - task: DownloadPipelineArtifact@2 inputs: diff --git a/.azure-pipelines/docker-sonic-vs/Dockerfile b/.azure-pipelines/docker-sonic-vs/Dockerfile index 41733ffda13..43dd053a1e5 100644 --- a/.azure-pipelines/docker-sonic-vs/Dockerfile +++ b/.azure-pipelines/docker-sonic-vs/Dockerfile @@ -13,7 +13,7 @@ COPY ["debs", "/debs"] # same, even though contents have changed) are checked between the previous and current layer. RUN dpkg --remove --force-all libswsscommon RUN apt --fix-broken install -y -RUN dpkg --purge python3-swsscommon sonic-db-cli libsaimetadata libsairedis libsaivs syncd-vs swss sonic-eventd libdashapi framework +RUN dpkg --purge python3-swsscommon sonic-db-cli libsaimetadata libsairedis libsaivs syncd-vs swss sonic-eventd libdashapi framework libnexthopgroup RUN apt-get update @@ -43,7 +43,8 @@ RUN apt install -y /debs/libdashapi_1.0.0_amd64.deb \ /debs/libsairedis_1.0.0_amd64.deb \ /debs/libsaivs_1.0.0_amd64.deb \ /debs/syncd-vs_1.0.0_amd64.deb \ - /debs/swss_1.0.0_amd64.deb + /debs/swss_1.0.0_amd64.deb \ + /debs/libnexthopgroup_1.0.0_amd64.deb RUN if [ "$need_dbg" = "y" ] ; then dpkg -i /debs/swss-dbg_1.0.0_amd64.deb ; fi