From 646315f25b44b92c94b16101341ab2fc17746191 Mon Sep 17 00:00:00 2001 From: Lawrence Lee Date: Tue, 9 Jun 2026 20:27:24 +0000 Subject: [PATCH] Revert "[fpmsyncd]: add libnexthopgroup in Makefile.am to support rib/fib (#4394)" This reverts commit e6c482ca9be6c8af6f643dc62d0fd32f3097424f. Signed-off-by: Lawrence Lee --- .azure-pipelines/build-docker-sonic-vs-template.yml | 12 ------------ .azure-pipelines/build-template.yml | 2 -- .azure-pipelines/docker-sonic-vs/Dockerfile | 5 ++--- fpmsyncd/Makefile.am | 2 +- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/.azure-pipelines/build-docker-sonic-vs-template.yml b/.azure-pipelines/build-docker-sonic-vs-template.yml index 975729f06de..e76d4c56ee3 100644 --- a/.azure-pipelines/build-docker-sonic-vs-template.yml +++ b/.azure-pipelines/build-docker-sonic-vs-template.yml @@ -151,17 +151,6 @@ 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 @@ -183,7 +172,6 @@ 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 c64eb2580a5..99faf0757a5 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -176,8 +176,6 @@ 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 }}/libyang3_*.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 43dd053a1e5..41733ffda13 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 libnexthopgroup +RUN dpkg --purge python3-swsscommon sonic-db-cli libsaimetadata libsairedis libsaivs syncd-vs swss sonic-eventd libdashapi framework RUN apt-get update @@ -43,8 +43,7 @@ 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/libnexthopgroup_1.0.0_amd64.deb + /debs/swss_1.0.0_amd64.deb RUN if [ "$need_dbg" = "y" ] ; then dpkg -i /debs/swss-dbg_1.0.0_amd64.deb ; fi diff --git a/fpmsyncd/Makefile.am b/fpmsyncd/Makefile.am index c55c1ea25fd..b61ebdfa930 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 -lnexthopgroup +fpmsyncd_LDADD = $(LDFLAGS_ASAN) -lnl-3 -lnl-route-3 -lswsscommon if GCOV_ENABLED fpmsyncd_SOURCES += ../gcovpreload/gcovpreload.cpp