Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
4 changes: 2 additions & 2 deletions build_debug_docker_j2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ debs/{{ deb }}{{' '}}
{%- endfor -%}
debs/

RUN apt update
RUN apt-get update

RUN dpkg -i \
{% for deb in $2.split(' ') -%}
debs/{{ deb }}{{' '}}
{%- endfor %} || apt -y install -f --no-remove
{%- endfor %} || apt-get -y install -f --no-remove

{% endif %}
{% endif %}
Expand Down
13 changes: 12 additions & 1 deletion rules/snmpd.mk
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ $(SNMPD)_RDEPENDS += $(LIBSNMP)
$(eval $(call add_derived_package,$(LIBSNMP_BASE),$(SNMPD)))

SNMP_DBG = snmp-dbgsym_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb
$(SNMP_DBG)_RDEPENDS += $(SNMP)
$(eval $(call add_derived_package,$(LIBSNMP_BASE),$(SNMP_DBG)))

SNMPD_DBG = snmpd-dbgsym_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb
$(SNMPD_DBG)_RDEPENDS += $(SNMPD)
$(eval $(call add_derived_package,$(LIBSNMP_BASE),$(SNMPD_DBG)))

ifeq ($(BLDENV),trixie)
Expand All @@ -63,8 +65,17 @@ $(LIBSNMP_DBG)_DEPENDS += $(LIBSNMP)
$(LIBSNMP_DBG)_RDEPENDS += $(LIBSNMP)
$(eval $(call add_derived_package,$(LIBSNMP_BASE),$(LIBSNMP_DBG)))

ifeq ($(BLDENV),trixie)
LIBNETSNMPTRAPD40 = libnetsnmptrapd40t64_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb
else
LIBNETSNMPTRAPD40 = libnetsnmptrapd40_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb
endif
$(LIBNETSNMPTRAPD40)_DEPENDS += $(LIBSNMP)
$(LIBNETSNMPTRAPD40)_RDEPENDS += $(LIBSNMP) $(LIBSNMP_BASE)
$(eval $(call add_derived_package,$(LIBSNMP_BASE),$(LIBNETSNMPTRAPD40)))

LIBSNMP_DEV = libsnmp-dev_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb
$(LIBSNMP_DEV)_DEPENDS += $(LIBSNMP)
$(LIBSNMP_DEV)_DEPENDS += $(LIBSNMP) $(LIBNETSNMPTRAPD40)
$(eval $(call add_derived_package,$(LIBSNMP_BASE),$(LIBSNMP_DEV)))

LIBSNMP_PERL = libsnmp-perl_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb
Expand Down
2 changes: 0 additions & 2 deletions sonic-slave-bookworm/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ RUN apt-get update && apt-get install -y eatmydata && eatmydata apt-get install
chrpath \
# For frr build
libc-ares-dev \
libsnmp-dev \
libjson-c-dev \
libsystemd-dev \
libcmocka-dev \
Expand Down Expand Up @@ -445,7 +444,6 @@ RUN apt-get update && apt-get install -y eatmydata && eatmydata apt-get install
pciutils \
dh-dkms \
rpm2cpio \
libsnmp-dev \
libpopt-dev \
libfuse-dev \
{%- if CONFIGURED_ARCH == "arm64" %}
Expand Down
1 change: 1 addition & 0 deletions src/snmpd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ DERIVED_TARGETS = snmptrapd_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
snmpd-dbgsym_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
libsnmp40_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
libsnmp40-dbgsym_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
libnetsnmptrapd40_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
libsnmp-dev_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
libsnmp-perl_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
libsnmp-perl-dbgsym_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
Expand Down
Loading