diff --git a/build_debian.sh b/build_debian.sh index 662efde9f9..3559560b1e 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -297,6 +297,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in squashfs-tools \ grub2-common \ rsyslog \ + ethtool \ screen \ hping3 \ tcptraceroute \ diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2 index e86f4ad001..fc46dc6a52 100755 --- a/dockers/docker-platform-monitor/Dockerfile.j2 +++ b/dockers/docker-platform-monitor/Dockerfile.j2 @@ -22,6 +22,7 @@ RUN apt-get update && \ rrdtool \ python-smbus \ python3-smbus \ + ethtool \ dmidecode \ i2c-tools diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk index b650f74a17..547fbf6081 100644 --- a/rules/docker-platform-monitor.mk +++ b/rules/docker-platform-monitor.mk @@ -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) $(PYTHON_SWSSCOMMON) $(PYTHON3_SWSSCOMMON) $(SMARTMONTOOLS) $(ETHTOOL) +$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(SENSORD) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(PYTHON3_SWSSCOMMON) $(SMARTMONTOOLS) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3) @@ -66,5 +66,4 @@ $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/sensors $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/smartctl $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/iSmart $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/SmartCmd -$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/ethtool $(DOCKER_PLATFORM_MONITOR)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/ethtool.dep b/rules/ethtool.dep deleted file mode 100644 index 15a9608404..0000000000 --- a/rules/ethtool.dep +++ /dev/null @@ -1,8 +0,0 @@ -SPATH := $($(ETHTOOL)_SRC_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/ethtool.mk rules/ethtool.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(SPATH)) - -$(ETHTOOL)_CACHE_MODE := GIT_CONTENT_SHA -$(ETHTOOL)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(ETHTOOL)_DEP_FILES := $(DEP_FILES) diff --git a/rules/ethtool.mk b/rules/ethtool.mk deleted file mode 100644 index b79eaad7af..0000000000 --- a/rules/ethtool.mk +++ /dev/null @@ -1,13 +0,0 @@ -# ethtool - -ETHTOOL_VERSION_BASE = 5.9 -export ETHTOOL_VERSION_BASE - -ETHTOOL = ethtool_$(ETHTOOL_VERSION_BASE)-1_amd64.deb -$(ETHTOOL)_SRC_PATH = $(SRC_PATH)/ethtool -SONIC_MAKE_DEBS += $(ETHTOOL) - -ETHTOOL_DBG = ethtool-dbgsym_$(ETHTOOL_VERSION_BASE)-1_amd64.deb -$(eval $(call add_extra_package,$(ETHTOOL),$(ETHTOOL_DBG))) - -export ETHTOOL ETHTOOL_DBG diff --git a/src/ethtool/Makefile b/src/ethtool/Makefile deleted file mode 100644 index 2f5a3acc94..0000000000 --- a/src/ethtool/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -.ONESHELL: -SHELL = /bin/bash -.SHELLFLAGS += -e - -MAIN_TARGET = $(ETHTOOL) -DERIVED_TARGET = $(ETHTOOL_DBG) - -$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : - # Obtaining the ethtool debian package - rm -rf ethtool* - git clone https://salsa.debian.org/kernel-team/ethtool/ - pushd ethtool - git checkout tags/debian/1%$(ETHTOOL_VERSION_BASE)-1 - # Build package - dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR) - popd - mv $(DERIVED_TARGET) $* $(DEST)/ - -$(addprefix $(DEST)/, $(DERIVED_TARGET)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)