Skip to content

Revert "[fpmsyncd]: add libnexthopgroup in Makefile.am to support rib/fib" #4657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prsunny merged 1 commit into from
Jun 10, 2026
+3 −18
Merged

Revert "[fpmsyncd]: add libnexthopgroup in Makefile.am to support rib/fib" #4657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .azure-pipelines/build-docker-sonic-vs-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)/
Expand Down
2 changes: 0 additions & 2 deletions .azure-pipelines/build-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions .azure-pipelines/docker-sonic-vs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion fpmsyncd/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading