diff --git a/files/build_templates/per_namespace/swss.service.j2 b/files/build_templates/per_namespace/swss.service.j2 index 53d6b4497d..352d1593a6 100644 --- a/files/build_templates/per_namespace/swss.service.j2 +++ b/files/build_templates/per_namespace/swss.service.j2 @@ -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 diff --git a/files/build_templates/per_namespace/syncd.service.j2 b/files/build_templates/per_namespace/syncd.service.j2 index b2922e0d12..0c9bf073e9 100644 --- a/files/build_templates/per_namespace/syncd.service.j2 +++ b/files/build_templates/per_namespace/syncd.service.j2 @@ -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 diff --git a/platform/nephos/nephos-modules.mk b/platform/nephos/nephos-modules.mk index 0dd7e29718..5e055537a4 100644 --- a/platform/nephos/nephos-modules.mk +++ b/platform/nephos/nephos-modules.mk @@ -1,25 +1,9 @@ # 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 diff --git a/platform/nephos/nephos-modules/modules/init.d/nps-modules-4.9-amd64 b/platform/nephos/nephos-modules/modules/init.d/nps-modules similarity index 92% rename from platform/nephos/nephos-modules/modules/init.d/nps-modules-4.9-amd64 rename to platform/nephos/nephos-modules/modules/init.d/nps-modules index a6deb4217a..d6f841ee02 100755 --- a/platform/nephos/nephos-modules/modules/init.d/nps-modules-4.9-amd64 +++ b/platform/nephos/nephos-modules/modules/init.d/nps-modules @@ -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 diff --git a/platform/nephos/nephos-modules/modules/service/nps-modules-4.9-amd64.service b/platform/nephos/nephos-modules/modules/service/nps-modules.service similarity index 63% rename from platform/nephos/nephos-modules/modules/service/nps-modules-4.9-amd64.service rename to platform/nephos/nephos-modules/modules/service/nps-modules.service index fc45a597d7..22aa9a7510 100644 --- a/platform/nephos/nephos-modules/modules/service/nps-modules-4.9-amd64.service +++ b/platform/nephos/nephos-modules/modules/service/nps-modules.service @@ -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]