Skip to content

Commit a86cdd8

Browse files
committed
Revert "Backport ethtool to support QSFP-DD (#5725)"
This reverts commit 50e4cc1.
1 parent dd9be59 commit a86cdd8

File tree

6 files changed

+3
-42
lines changed

6 files changed

+3
-42
lines changed

build_debian.sh

+1
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
297297
squashfs-tools \
298298
grub2-common \
299299
rsyslog \
300+
ethtool \
300301
screen \
301302
hping3 \
302303
tcptraceroute \

dockers/docker-platform-monitor/Dockerfile.j2

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ RUN apt-get update && \
2222
rrdtool \
2323
python-smbus \
2424
python3-smbus \
25+
ethtool \
2526
dmidecode \
2627
i2c-tools
2728

rules/docker-platform-monitor.mk

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ DOCKER_PLATFORM_MONITOR_DBG = $(DOCKER_PLATFORM_MONITOR_STEM)-$(DBG_IMAGE_MARK).
66

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

9-
$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(SENSORD) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(PYTHON3_SWSSCOMMON) $(SMARTMONTOOLS) $(ETHTOOL)
9+
$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(SENSORD) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(PYTHON3_SWSSCOMMON) $(SMARTMONTOOLS)
1010

1111
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
1212
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3)
@@ -66,5 +66,4 @@ $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/sensors
6666
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/smartctl
6767
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/iSmart
6868
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/SmartCmd
69-
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/ethtool
7069
$(DOCKER_PLATFORM_MONITOR)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)

rules/ethtool.dep

-8
This file was deleted.

rules/ethtool.mk

-13
This file was deleted.

src/ethtool/Makefile

-19
This file was deleted.

0 commit comments

Comments
 (0)