Skip to content
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

Jump to bottom

[2018011] Remapping S6000 platform files under Vendor (DellEmc) specific directory #3274

Merged
merged 1 commit into from
Aug 2, 2019
Merged

[2018011] Remapping S6000 platform files under Vendor (DellEmc) specific directory #3274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions platform/broadcom/platform-modules-dell.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
13 changes: 0 additions & 13 deletions platform/broadcom/platform-modules-s6000.mk
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion platform/broadcom/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 5 additions & 1 deletion platform/broadcom/sonic-platform-modules-dell/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Expand All @@ -20,3 +20,7 @@ Architecture: amd64
Depends: linux-image-4.9.0-9-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
0 ...-s6000/debian/platform-modules-s6000.init → ...s-dell/debian/platform-modules-s6000.init
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6000.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
s6000/systemd/platform-modules-s6000.service etc/systemd/system
common/io_rd_wr.py usr/local/bin
7 changes: 7 additions & 0 deletions platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6000.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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#
6 changes: 5 additions & 1 deletion platform/broadcom/sonic-platform-modules-dell/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

%:
Expand Down Expand Up @@ -36,6 +36,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:
Expand Down
0 ...dcom/sonic-platform-modules-s6000/LICENSE → ...sonic-platform-modules-dell/s6000/LICENSE
View file
Open in desktop
File renamed without changes.
0 .../sonic-platform-modules-s6000/MAINTAINERS → ...c-platform-modules-dell/s6000/MAINTAINERS
View file
Open in desktop
File renamed without changes.
0 ...om/sonic-platform-modules-s6000/README.md → ...nic-platform-modules-dell/s6000/README.md
View file
Open in desktop
File renamed without changes.
0 ...c-platform-modules-s6000/modules/Makefile → ...tform-modules-dell/s6000/modules/Makefile
View file
Open in desktop
File renamed without changes.
0 ...dules-s6000/modules/dell_s6000_platform.c → ...-dell/s6000/modules/dell_s6000_platform.c
View file
Open in desktop
File renamed without changes.
0 ...platform-modules-s6000/scripts/reset-qsfp → ...orm-modules-dell/s6000/scripts/reset-qsfp
View file
Open in desktop
File renamed without changes.
0 ...tform-modules-s6000/scripts/set-fan-speed → ...-modules-dell/s6000/scripts/set-fan-speed
View file
Open in desktop
File renamed without changes.
0 ...00/systemd/platform-modules-s6000.service → ...00/systemd/platform-modules-s6000.service
View file
Open in desktop
File renamed without changes.
50 changes: 0 additions & 50 deletions platform/broadcom/sonic-platform-modules-s6000/.gitignore
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions platform/broadcom/sonic-platform-modules-s6000/debian/changelog
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion platform/broadcom/sonic-platform-modules-s6000/debian/compat
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions platform/broadcom/sonic-platform-modules-s6000/debian/control
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions platform/broadcom/sonic-platform-modules-s6000/debian/copyright
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion platform/broadcom/sonic-platform-modules-s6000/debian/platform-modules-s6000.install
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions platform/broadcom/sonic-platform-modules-s6000/debian/rules
View file
Open in desktop

This file was deleted.