diff --git a/build_debug_docker_j2.sh b/build_debug_docker_j2.sh index 7227b5f6f0d..22f67c14c59 100755 --- a/build_debug_docker_j2.sh +++ b/build_debug_docker_j2.sh @@ -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 %} diff --git a/rules/snmpd.mk b/rules/snmpd.mk index fe0aa9caf91..628629cff85 100644 --- a/rules/snmpd.mk +++ b/rules/snmpd.mk @@ -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) @@ -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 diff --git a/sonic-slave-bookworm/Dockerfile.j2 b/sonic-slave-bookworm/Dockerfile.j2 index 647e7b4ce0f..f60f08d9df5 100644 --- a/sonic-slave-bookworm/Dockerfile.j2 +++ b/sonic-slave-bookworm/Dockerfile.j2 @@ -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 \ @@ -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" %} diff --git a/src/snmpd/Makefile b/src/snmpd/Makefile index 4945e654599..75dedacd08a 100644 --- a/src/snmpd/Makefile +++ b/src/snmpd/Makefile @@ -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 \