Skip to content

Commit

Permalink
[build]: Don't build ethtool from source (sonic-net#15856)
Browse files Browse the repository at this point in the history
Why I did it
There is no reason to build deb package ethtool from source code.
We can install the same version from Debian bullseye mirror.

How I did it
Remove ethtool Makefiles from sonic-buildimage.
Install ethtool via apt-get in pmon container.
  • Loading branch information
k-v1 authored Sep 6, 2023
1 parent 204579a commit 1e7db2a
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 49 deletions.
3 changes: 2 additions & 1 deletion dockers/docker-platform-monitor/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ RUN apt-get update && \
iputils-ping \
pciutils \
# smartmontools version should match the installed smartmontools in sonic_debian_extension build template
smartmontools=7.2-1
smartmontools=7.2-1 \
ethtool

# On Arista devices, the sonic_platform wheel is not installed in the container.
# Instead, the installation directory is mounted from the host OS. However, this method
Expand Down
2 changes: 1 addition & 1 deletion rules/docker-platform-monitor.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ DOCKER_PLATFORM_MONITOR_DBG = $(DOCKER_PLATFORM_MONITOR_STEM)-$(DBG_IMAGE_MARK).

$(DOCKER_PLATFORM_MONITOR)_PATH = $(DOCKERS_PATH)/$(DOCKER_PLATFORM_MONITOR_STEM)

$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(SENSORD) $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON) $(ETHTOOL) $(MFT)
$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(SENSORD) $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON) $(MFT)


$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3)
Expand Down
8 changes: 0 additions & 8 deletions rules/ethtool.dep

This file was deleted.

13 changes: 0 additions & 13 deletions rules/ethtool.mk

This file was deleted.

26 changes: 0 additions & 26 deletions src/ethtool/Makefile

This file was deleted.

0 comments on commit 1e7db2a

Please sign in to comment.