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

[Accton] Don't include other platforms' python package #8748

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Accton] Don't include other platforms' python package #8748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ccdb9b
[Accton] Don't include other platforms' python package
chiourung Sep 14, 2021
c74b3f0
Merge branch 'master' into accton_platform_deb
chiourung Jul 6, 2022
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: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as4630-54pe/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS4630-54PE platforms',

packages=['as4630_54pe'],
package_dir={'as4630_54pe': 'as4630-54pe/classes'},
package_dir={'as4630_54pe': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as4630-54te/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
description='Module to initialize Accton AS4630-54TE platforms',

packages=['as4630_54te'],
package_dir={'as4630_54te': 'as4630-54te/classes'},
package_dir={'as4630_54te': 'classes'},
)
2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as5712-54x/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS5712-54X platforms',

packages=['as5712_54x'],
package_dir={'as5712_54x': 'as5712-54x/classes'},
package_dir={'as5712_54x': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as5812-54t/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS5812-54X platforms',

packages=['as5812_54t'],
package_dir={'as5812_54t': 'as5812-54t/classes'},
package_dir={'as5812_54t': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as5812-54x/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS5812-54X platforms',

packages=['as5812_54x'],
package_dir={'as5812_54x': 'as5812-54x/classes'},
package_dir={'as5812_54x': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as5835-54t/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS5835-54T platforms',

packages=['as5835_54t'],
package_dir={'as5835_54t': 'as5835-54t/classes'},
package_dir={'as5835_54t': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as5835-54x/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS5835-54X platforms',

packages=['as5835_54x'],
package_dir={'as5835_54x': 'as5835-54x/classes'},
package_dir={'as5835_54x': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as6712-32x/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS6712-32X platforms',

packages=['as6712_32x'],
package_dir={'as6712_32x': 'as6712-32x/classes'},
package_dir={'as6712_32x': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as7312-54x/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS7312-54X platforms',

packages=['as7312_54x'],
package_dir={'as7312_54x': 'as7312-54x/classes'},
package_dir={'as7312_54x': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as7312-54xs/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS7312-54XS platforms',

packages=['as7312_54xs'],
package_dir={'as7312_54xs': 'as7312-54xs/classes'},
package_dir={'as7312_54xs': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as7315-27xb/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS7315-27XB platforms',

packages=['as7315_27xb'],
package_dir={'as7315_27xb': 'as7315-27xb/classes'},
package_dir={'as7315_27xb': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as7326-56x/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS7326-56X platforms',

packages=['as7326_56x'],
package_dir={'as7326_56x': 'as7326-56x/classes'},
package_dir={'as7326_56x': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as7712-32x/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS7712-32X platforms',

packages=['as7712_32x'],
package_dir={'as7712_32x': 'as7712-32x/classes'},
package_dir={'as7712_32x': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as7716-32x/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS7716-32X platforms',

packages=['as7716_32x'],
package_dir={'as7716_32x': 'as7716-32x/classes'},
package_dir={'as7716_32x': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as7716-32xb/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS7716-32XB platforms',

packages=['as7716_32xb'],
package_dir={'as7716_32xb': 'as7716-32xb/classes'},
package_dir={'as7716_32xb': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as7726-32x/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS7726-32X platforms',

packages=['as7726_32x'],
package_dir={'as7726_32x': 'as7726-32x/classes'},
package_dir={'as7726_32x': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as7816-64x/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS7816-64X platforms',

packages=['as7816_64x'],
package_dir={'as7816_64x': 'as7816-64x/classes'},
package_dir={'as7816_64x': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as9716-32d/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
description='Module to initialize Accton AS9716-32D platforms',

packages=['as9716_32d'],
package_dir={'as9716_32d': 'as9716-32d/classes'},
package_dir={'as9716_32d': 'classes'},
)

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-accton/as9726-32d/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
description='Module to initialize Accton AS9726_32D platforms',

packages=['as9726_32d'],
package_dir={'as9726_32d': 'as9726-32d/classes'},
package_dir={'as9726_32d': 'classes'},
)
6 changes: 4 additions & 2 deletions platform/broadcom/sonic-platform-modules-accton/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ build:
#make modules -C $(KERNEL_SRC)/build M=$(MODULE_SRC)
(for mod in $(MODULE_DIRS); do \
make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules; \
$(PYTHON3) $${mod}/setup.py build; \
cd $(MOD_SRC_DIR)/$${mod}; \
$(PYTHON3) setup.py build; \
if [ -f sonic_platform_setup.py ]; then \
$(PYTHON3) sonic_platform_setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}; \
echo "Finished makig whl package for $$mod"; \
Expand Down Expand Up @@ -72,7 +72,9 @@ binary-indep:
cp $(MOD_SRC_DIR)/$${mod}/$(MODULE_DIR)/*.ko debian/$(PACKAGE_PRE_NAME)-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
cp $(MOD_SRC_DIR)/$${mod}/$(UTILS_DIR)/* debian/$(PACKAGE_PRE_NAME)-$${mod}/usr/local/bin/; \
cp $(MOD_SRC_DIR)/$${mod}/$(SERVICE_DIR)/*.service debian/$(PACKAGE_PRE_NAME)-$${mod}/lib/systemd/system/; \
$(PYTHON3) $${mod}/setup.py install --root=$(MOD_SRC_DIR)/debian/$(PACKAGE_PRE_NAME)-$${mod} --install-layout=deb; \
cd $(MOD_SRC_DIR)/$${mod}; \
$(PYTHON3) setup.py install --root=$(MOD_SRC_DIR)/debian/$(PACKAGE_PRE_NAME)-$${mod} --install-layout=deb; \
cd -; \
done)
# Resuming debhelper scripts
dh_testroot
Expand Down
4 changes: 2 additions & 2 deletions platform/broadcom/sonic-platform-modules-accton/minipack/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
from setuptools import setup, Extension
os.listdir

module1 = Extension("fbfpgaio", sources = ["minipack/lib/fbfpgaiomodule.c"])
module1 = Extension("fbfpgaio", sources = ["lib/fbfpgaiomodule.c"])

setup(
name='minipack',
version='1.0',
description='Module to initialize Accton MiniPack platforms',

packages=['minipack'],
package_dir={'minipack': 'minipack/classes'},
package_dir={'minipack': 'classes'},
ext_modules=[module1],

)
Expand Down