[smartmontools] Install smartmontools with apt-get and upgrade it to 7.2-1 (#10087)
Why I did it Smartmontools 6.6 has an issue with reading SMART info of nvme SSD Smartmontools can be installed with apt-get, no need to build and install How I did it Use apt-get to install smartmontools 7.2-1 Remove previous make files for smartmontools 6.6 How to verify it verify with "smartctl" can read out correct SMART info on NVME ssd. verify "show platform ssdhealth" can still work Signed-off-by: Kebo Liu <kebol@nvidia.com>
This commit is contained in:
parent
78e867a794
commit
fe0a7693f4
@ -328,7 +328,7 @@ sudo cp $IMAGE_CONFIGS/monit/restart_service $FILESYSTEM_ROOT/usr/bin/
|
|||||||
sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/restart_service
|
sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/restart_service
|
||||||
|
|
||||||
# Install custom-built smartmontools
|
# Install custom-built smartmontools
|
||||||
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/smartmontools_*.deb
|
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install smartmontools=7.2-1
|
||||||
|
|
||||||
# Install custom-built openssh sshd
|
# Install custom-built openssh sshd
|
||||||
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/openssh-server_*.deb
|
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/openssh-server_*.deb
|
||||||
|
1
slave.mk
1
slave.mk
@ -974,7 +974,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
|
|||||||
$(LIBNSS_TACPLUS) \
|
$(LIBNSS_TACPLUS) \
|
||||||
$(MONIT) \
|
$(MONIT) \
|
||||||
$(OPENSSH_SERVER) \
|
$(OPENSSH_SERVER) \
|
||||||
$(SMARTMONTOOLS) \
|
|
||||||
$(PYTHON_SWSSCOMMON) \
|
$(PYTHON_SWSSCOMMON) \
|
||||||
$(PYTHON3_SWSSCOMMON) \
|
$(PYTHON3_SWSSCOMMON) \
|
||||||
$(SONIC_UTILITIES_DATA) \
|
$(SONIC_UTILITIES_DATA) \
|
||||||
|
@ -279,9 +279,6 @@ RUN apt-get update && apt-get install -y \
|
|||||||
librrd8 \
|
librrd8 \
|
||||||
librrd-dev \
|
librrd-dev \
|
||||||
rrdtool \
|
rrdtool \
|
||||||
# For smartmontools 6.6-1
|
|
||||||
automake1.11 \
|
|
||||||
libselinux1-dev \
|
|
||||||
# For kdump-tools
|
# For kdump-tools
|
||||||
liblzo2-dev \
|
liblzo2-dev \
|
||||||
# For iptables
|
# For iptables
|
||||||
|
@ -291,9 +291,6 @@ RUN apt-get update && apt-get install -y \
|
|||||||
librrd8 \
|
librrd8 \
|
||||||
librrd-dev \
|
librrd-dev \
|
||||||
rrdtool \
|
rrdtool \
|
||||||
# For smartmontools 6.6-1
|
|
||||||
automake1.11 \
|
|
||||||
libselinux1-dev \
|
|
||||||
# For kdump-tools
|
# For kdump-tools
|
||||||
liblzo2-dev \
|
liblzo2-dev \
|
||||||
# For iptables
|
# For iptables
|
||||||
|
@ -272,9 +272,6 @@ RUN apt-get update && apt-get install -y \
|
|||||||
librrd8 \
|
librrd8 \
|
||||||
librrd-dev \
|
librrd-dev \
|
||||||
rrdtool \
|
rrdtool \
|
||||||
# For smartmontools 6.6-1
|
|
||||||
automake1.11 \
|
|
||||||
libselinux1-dev \
|
|
||||||
# For kdump-tools
|
# For kdump-tools
|
||||||
liblzo2-dev \
|
liblzo2-dev \
|
||||||
# For iptables
|
# For iptables
|
||||||
@ -315,9 +312,6 @@ RUN sudo augtool --autosave "set /files/etc/dpkg/dpkg.cfg/force-confdef"
|
|||||||
## do not modify the current configuration file, the new version is installed with a .dpkg-dist suffix
|
## do not modify the current configuration file, the new version is installed with a .dpkg-dist suffix
|
||||||
RUN sudo augtool --autosave "set /files/etc/dpkg/dpkg.cfg/force-confold"
|
RUN sudo augtool --autosave "set /files/etc/dpkg/dpkg.cfg/force-confold"
|
||||||
|
|
||||||
# For smartmontools 6.6-1
|
|
||||||
RUN apt-get -t stretch-backports install -y debhelper
|
|
||||||
|
|
||||||
# For linux build
|
# For linux build
|
||||||
RUN apt-get -y build-dep linux
|
RUN apt-get -y build-dep linux
|
||||||
|
|
||||||
|
3
src/smartmontools/.gitignore
vendored
3
src/smartmontools/.gitignore
vendored
@ -1,3 +0,0 @@
|
|||||||
*
|
|
||||||
!.gitignore
|
|
||||||
!Makefile
|
|
@ -1,19 +0,0 @@
|
|||||||
SHELL = /bin/bash
|
|
||||||
.ONESHELL:
|
|
||||||
.SHELLFLAGS += -e
|
|
||||||
|
|
||||||
|
|
||||||
MAIN_TARGET = smartmontools_$(SMARTMONTOOLS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
|
|
||||||
|
|
||||||
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
|
|
||||||
rm -rf smartmontools-$(SMARTMONTOOLS_VERSION_MAJOR)
|
|
||||||
wget -O smartmontools_$(SMARTMONTOOLS_VERSION_MAJOR).orig.tar.gz -N "https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_$(SMARTMONTOOLS_VERSION_MAJOR).orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r"
|
|
||||||
wget -O smartmontools_$(SMARTMONTOOLS_VERSION_FULL).dsc -N "https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_$(SMARTMONTOOLS_VERSION_FULL).dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r"
|
|
||||||
wget -O smartmontools_$(SMARTMONTOOLS_VERSION_FULL).debian.tar.xz -N "https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_$(SMARTMONTOOLS_VERSION_FULL).debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r"
|
|
||||||
dpkg-source -x smartmontools_$(SMARTMONTOOLS_VERSION_FULL).dsc
|
|
||||||
|
|
||||||
pushd smartmontools-$(SMARTMONTOOLS_VERSION_MAJOR)
|
|
||||||
dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
|
|
||||||
popd
|
|
||||||
|
|
||||||
mv $* $(DEST)/
|
|
Loading…
Reference in New Issue
Block a user