Remapping S6000 platform files under Vendor (DellEmc) specific direct…

…ory (#3079)

platform/broadcom/platform-modules-dell.mk

@@ -1,26 +1,36 @@
-# Dell Z9100, S6100, Z9264F Platform modules
+# Dell S6000, Z9100, S6100, Z9264F Platform modules
 
-DELL_Z9264F_PLATFORM_MODULE_VERSION = 1.1
+DELL_S6000_PLATFORM_MODULE_VERSION = 1.1
 DELL_Z9100_PLATFORM_MODULE_VERSION = 1.1
 DELL_S6100_PLATFORM_MODULE_VERSION = 1.1
+DELL_Z9264F_PLATFORM_MODULE_VERSION = 1.1
 
-export DELL_Z9264F_PLATFORM_MODULE_VERSION
+export DELL_S6000_PLATFORM_MODULE_VERSION
 export DELL_Z9100_PLATFORM_MODULE_VERSION
 export DELL_S6100_PLATFORM_MODULE_VERSION
+export DELL_Z9264F_PLATFORM_MODULE_VERSION
+
 
+# Dell Z9100 Platform modules
 DELL_Z9100_PLATFORM_MODULE = platform-modules-z9100_$(DELL_Z9100_PLATFORM_MODULE_VERSION)_amd64.deb
 $(DELL_Z9100_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-dell
 $(DELL_Z9100_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
 $(DELL_Z9100_PLATFORM_MODULE)_PLATFORM = x86_64-dell_z9100_c2538-r0
 SONIC_DPKG_DEBS += $(DELL_Z9100_PLATFORM_MODULE)
 
+# Dell S6100 Platform modules
 DELL_S6100_PLATFORM_MODULE = platform-modules-s6100_$(DELL_S6100_PLATFORM_MODULE_VERSION)_amd64.deb
 $(DELL_S6100_PLATFORM_MODULE)_PLATFORM = x86_64-dell_s6100_c2538-r0
 $(eval $(call add_extra_package,$(DELL_Z9100_PLATFORM_MODULE),$(DELL_S6100_PLATFORM_MODULE)))
 
+# Dell Z9264F Platform modules
 DELL_Z9264F_PLATFORM_MODULE = platform-modules-z9264f_$(DELL_Z9264F_PLATFORM_MODULE_VERSION)_amd64.deb
 $(DELL_Z9264F_PLATFORM_MODULE)_PLATFORM = x86_64-dellemc_z9264f_c3538-r0
 $(eval $(call add_extra_package,$(DELL_Z9100_PLATFORM_MODULE),$(DELL_Z9264F_PLATFORM_MODULE)))
 
+# Dell S6000 Platform modules
+DELL_S6000_PLATFORM_MODULE = platform-modules-s6000_$(DELL_S6000_PLATFORM_MODULE_VERSION)_amd64.deb
+$(DELL_S6000_PLATFORM_MODULE)_PLATFORM = x86_64-dell_s6000_s1220-r0
+$(eval $(call add_extra_package,$(DELL_Z9100_PLATFORM_MODULE),$(DELL_S6000_PLATFORM_MODULE)))
 
 SONIC_STRETCH_DEBS += $(DELL_Z9100_PLATFORM_MODULE)

platform/broadcom/rules.mk

@@ -1,6 +1,5 @@
 include $(PLATFORM_PATH)/sai-modules.mk
 include $(PLATFORM_PATH)/sai.mk
-include $(PLATFORM_PATH)/platform-modules-s6000.mk
 include $(PLATFORM_PATH)/platform-modules-dell.mk
 include $(PLATFORM_PATH)/platform-modules-arista.mk
 include $(PLATFORM_PATH)/platform-modules-ingrasys.mk

platform/broadcom/sonic-platform-modules-dell/debian/control

@@ -5,7 +5,7 @@ Maintainer: Dell Team <support@dell.com>
 Build-Depends: debhelper (>= 8.0.0), bzip2
 Standards-Version: 3.9.3
 
-Package: platform-modules-z9264f
+Package: platform-modules-s6000
 Architecture: amd64
 Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
@@ -20,3 +20,7 @@ Architecture: amd64
 Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
+Package: platform-modules-z9264f
+Architecture: amd64
+Depends: linux-image-4.9.0-9-2-amd64
+Description: kernel modules for platform devices such as fan, led, sfp

platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6000.install

@@ -0,0 +1,2 @@
+s6000/systemd/platform-modules-s6000.service etc/systemd/system
+common/io_rd_wr.py usr/local/bin

platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6000.postinst

@@ -0,0 +1,7 @@
+# postinst script for S6000
+
+# Enable Dell-S6000-platform-service
+depmod -a 
+systemctl enable platform-modules-s6000.service
+systemctl start platform-modules-s6000.service
+#DEBHELPER#

platform/broadcom/sonic-platform-modules-dell/debian/rules

@@ -5,7 +5,7 @@ export INSTALL_MOD_DIR:=extra
 KVERSION   ?= $(shell uname -r)
 KERNEL_SRC :=  /lib/modules/$(KVERSION)
 MOD_SRC_DIR:= $(shell pwd)
-MODULE_DIRS:= s6100 z9100 z9264f
+MODULE_DIRS:= s6000 z9100 s6100 z9264f 
 COMMON_DIR := common
 
 %:
@@ -30,6 +30,10 @@ override_dh_auto_install:
 			$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
 		cp $(MOD_SRC_DIR)/$${mod}/modules/*.ko \
 			debian/platform-modules-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
+		if [ $$mod = "s6000" ]; then \
+			dh_installdirs -pplatform-modules-$${mod} usr/local/bin ; \
+			cp -r $(MOD_SRC_DIR)/$${mod}/scripts/* debian/platform-modules-$${mod}/usr/local/bin; \
+		fi; \
 	done)
 
 override_dh_usrlocal: