Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lguohan merged 5 commits into from
May 21, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8184f3d
[platform/nephos] Optimize the code to reduce changes due to the kern…
simonJi2018 Mar 26, 2020
21720b6
Merge remote-tracking branch 'upstream/master'
simonJi2018 Apr 1, 2020
0cb7842
[bugfix] remove files/build_templates/single_instance/syncd.service.j2
simonJi2018 Apr 1, 2020
6df351d
[bugfix] remove files/build_templates/single_instance/syncd.service.j2
simonJi2018 Apr 1, 2020
cabc6c9
Mergg branch 'master' of https://github.com/simonJi2018/sonic-buildimage
simonJi2018 Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions files/build_templates/per_namespace/swss.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ After=topology.service
{% endif %}
{% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-11-2-amd64.service
{% endif %}
Requires=updategraph.service
After=updategraph.service
Expand Down
4 changes: 2 additions & 2 deletions files/build_templates/per_namespace/syncd.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ After=topology.service
Requires=opennsl-modules.service
After=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-11-2-amd64.service
After=nps-modules-4.9.0-11-2-amd64.service
Requires=nps-modules.service
After=nps-modules.service
{% endif %}
Requires=updategraph.service
After=updategraph.service
Expand Down
20 changes: 2 additions & 18 deletions platform/nephos/nephos-modules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,10 @@
# Nephos Platform modules

VERSION = 1.0.1
NPS_PLATFORM_MODULE_VERSION = 1.0.1

ifneq ($(NEPHOS_SAI_DEB_LOCAL_URL), )
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 = nephos-modules_$(NPS_PLATFORM_MODULE_VERSION)_amd64.deb
$(NEPHOS_MODULE)_SRC_PATH = $(PLATFORM_PATH)/nephos-modules
$(NEPHOS_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
SONIC_DPKG_DEBS += $(NEPHOS_MODULE)
endif

SONIC_STRETCH_DEBS += $(NEPHOS_MODULE)
2 changes: 1 addition & 1 deletion ...ules/modules/init.d/nps-modules-4.9-amd64 → ...nephos-modules/modules/init.d/nps-modules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
esac
Expand Down
4 changes: 2 additions & 2 deletions ...les/service/nps-modules-4.9-amd64.service → ...dules/modules/service/nps-modules.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Before=syncd.service

[Service]
Type=oneshot
ExecStart=-/etc/init.d/nps-modules-4.9-amd64 start
ExecStop=-/etc/init.d/nps-modules-4.9-amd64 stop
ExecStart=-/etc/init.d/nps-modules start
ExecStop=-/etc/init.d/nps-modules stop
RemainAfterExit=yes

[Install]
Expand Down