Skip to content

Commit d5238ae

Browse files
authored
[pcie.yaml] Move pcie configuration file path to platform directory (#6475)
- Why I did it The pcie configuration file location is under plugin directory not under platform directory. #6437 - How I did it Move all pcie.yaml configuration file from plugin to platform directory. Remove unnecessary timer to start pcie-check.service Move pcie-check.service to sonic-host-services - How to verify it Verify on the device
1 parent ce3b2cb commit d5238ae

File tree

15 files changed

+11
-14
lines changed

15 files changed

+11
-14
lines changed

.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ platform/**/*-none-any.whl
5656
platform/**/.pybuild
5757
platform/**/debian/*
5858
platform/**/build
59+
platform/**/*.ko
60+
platform/**/*.mod.c
61+
platform/**/*.mod.o
62+
platform/**/*.o
63+
platform/**/*.d
64+
platform/**/*.cmd
65+
platform/**/*.order
5966
platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/ipmihelper.py
6067
platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_ich.c
6168
platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_s6100_lpc.c

files/build_templates/pcie-check.timer

-9
This file was deleted.

files/build_templates/sonic_debian_extension.j2

-4
Original file line numberDiff line numberDiff line change
@@ -507,10 +507,6 @@ sudo cp $IMAGE_CONFIGS/constants/constants.yml $FILESYSTEM_ROOT/etc/sonic/
507507
sudo cp $IMAGE_CONFIGS/sudoers/sudoers $FILESYSTEM_ROOT/etc/
508508
sudo cp $IMAGE_CONFIGS/sudoers/sudoers.lecture $FILESYSTEM_ROOT/etc/
509509

510-
# Copy systemd timer configuration
511-
sudo cp $BUILD_TEMPLATES/pcie-check.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
512-
sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable pcie-check.timer
513-
514510
# Copy pcie-check service files
515511
sudo cp $IMAGE_CONFIGS/pcie-check/pcie-check.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
516512
echo "pcie-check.service" | sudo tee -a $GENERATED_SERVICE_FILE

files/image_config/pcie-check/pcie-check.service

+3
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ After=rc.local.service database.service
55
[Service]
66
Type=simple
77
ExecStart=/usr/bin/pcie-check.sh
8+
9+
[Install]
10+
WantedBy=multi-user.target

files/image_config/pcie-check/pcie-check.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function check_and_rescan_pcie_devices()
1919
PCIE_CHK_CMD='sudo pcieutil check | grep "$RESULTS"'
2020
PLATFORM=$(sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
2121

22-
if [ ! -f /usr/share/sonic/device/$PLATFORM/plugins/pcie.yaml ]; then
22+
if [ ! -f /usr/share/sonic/device/$PLATFORM/pcie.yaml ]; then
2323
debug "pcie.yaml does not exist! Can't check PCIe status!"
2424
exit
2525
fi

0 commit comments

Comments
 (0)