matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[platform/nephos] Optimize the code to reduce changes due to the kernel upgrade (#4332)

Browse Source 
- bug fix : Fixed an issue which the nps ko file was not loaded due to the wrong service file name
- Optimize the code to reduce changes due to the kernel upgrade
- Remove nephos ko file loaded in swss.service.j2 because it has loaded at syncd.service.j2
This commit is contained in:
simonJi2018 2020-05-21 17:21:07 +08:00 committed by GitHub
parent d4b89b1909
commit 0b6253baa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/build_templates/per_namespace/swss.service.j2
View File

@ -8,8 +8,6 @@ After=topology.service
{% endif %} {% endif %}
{% if sonic_asic_platform == 'broadcom' %} {% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules.service Requires=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-11-2-amd64.service
{% endif %} {% endif %}
Requires=updategraph.service Requires=updategraph.service
After=updategraph.service After=updategraph.service

4
files/build_templates/per_namespace/syncd.service.j2
View File

@ -11,8 +11,8 @@ After=topology.service
Requires=opennsl-modules.service Requires=opennsl-modules.service
After=opennsl-modules.service After=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %} {% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-11-2-amd64.service Requires=nps-modules.service
After=nps-modules-4.9.0-11-2-amd64.service After=nps-modules.service
{% endif %} {% endif %}
Requires=updategraph.service Requires=updategraph.service
After=updategraph.service After=updategraph.service

20
platform/nephos/nephos-modules.mk
View File

@ -1,25 +1,9 @@
# Nephos Platform modules # Nephos Platform modules
VERSION = 1.0.1 NPS_PLATFORM_MODULE_VERSION = 1.0.1
ifneq ($(NEPHOS_SAI_DEB_LOCAL_URL), ) NEPHOS_MODULE = nephos-modules_$(NPS_PLATFORM_MODULE_VERSION)_amd64.deb
SDK_FROM_LOCAL = y
else
SDK_FROM_LOCAL = n
endif
SDK_VERSION = 3.0.0
LINUX_VER = 4.9.0-11-2
SDK_COMMIT_ID = 529202
ifeq ($(SAI_FROM_LOCAL), y)
NEPHOS_MODULE = nps-modules-$(LINUX_VER)_$(SDK_VERSION)_$(SDK_COMMIT_ID)_amd64.deb
$(NEPHOS_MODULE)_PATH = $(NEPHOS_SAI_DEB_LOCAL_URL)
SONIC_COPY_DEBS += $(NEPHOS_MODULE)
else
NEPHOS_MODULE = nephos-modules_$(VERSION)_amd64.deb
$(NEPHOS_MODULE)_SRC_PATH = $(PLATFORM_PATH)/nephos-modules $(NEPHOS_MODULE)_SRC_PATH = $(PLATFORM_PATH)/nephos-modules
$(NEPHOS_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) $(NEPHOS_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
SONIC_DPKG_DEBS += $(NEPHOS_MODULE) SONIC_DPKG_DEBS += $(NEPHOS_MODULE)
endif

2
platform/nephos/nephos-modules/modules/init.d/nps-modules-4.9-amd64 → platform/nephos/nephos-modules/modules/init.d/nps-modules
View File

@ -45,7 +45,7 @@ force-reload|restart)
;; ;;
*) *)
echo "Usage: /etc/init.d/nps-modules-4.9.0-11-2-amd64.init {start|stop}" echo "Usage: /etc/init.d/nps-modules {start|stop}"
exit 1 exit 1
;; ;;
esac esac

4
platform/nephos/nephos-modules/modules/service/nps-modules-4.9-amd64.service → platform/nephos/nephos-modules/modules/service/nps-modules.service
View File

@ -5,8 +5,8 @@ Before=syncd.service
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=-/etc/init.d/nps-modules-4.9-amd64 start ExecStart=-/etc/init.d/nps-modules start
ExecStop=-/etc/init.d/nps-modules-4.9-amd64 stop ExecStop=-/etc/init.d/nps-modules stop
RemainAfterExit=yes RemainAfterExit=yes
[Install] [Install]