matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[centec]: Adding missing changes for centec x86 platform (#4611)

Browse Source 
PR #4605 has two changes that are missing, fix them.
This commit is contained in:
taochengyi 2020-05-20 00:22:35 +08:00 committed by GitHub
parent 9084ac50fb
commit cde69bafa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/centec/sonic-platform-modules-e582/debian/rules
View File

@ -5,7 +5,7 @@ export INSTALL_MOD_DIR:=extra
KVERSION ?= $(shell uname -r) KVERSION ?= $(shell uname -r)
KERNEL_SRC := /lib/modules/$(KVERSION) KERNEL_SRC := /lib/modules/$(KVERSION)
MOD_SRC_DIR:= $(shell pwd) MOD_SRC_DIR:= $(shell pwd)
MODULE_DIRS:= 48x6q 48x2q4z ../centec-dal MODULE_DIRS:= 48x6q 48x2q4z
%: %:
dh $@ dh $@
@ -14,6 +14,7 @@ override_dh_auto_build:
(for mod in $(MODULE_DIRS); do \ (for mod in $(MODULE_DIRS); do \
make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules; \ make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules; \
done) done)
make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/../centec-dal
override_dh_auto_install: override_dh_auto_install:
(for mod in $(MODULE_DIRS); do \ (for mod in $(MODULE_DIRS); do \
@ -21,6 +22,7 @@ override_dh_auto_install:
$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \ $(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
cp -f $(MOD_SRC_DIR)/$${mod}/modules/*.ko \ cp -f $(MOD_SRC_DIR)/$${mod}/modules/*.ko \
debian/platform-modules-e582-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \ debian/platform-modules-e582-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
cp -f $(MOD_SRC_DIR)/../centec-dal/*.ko debian/platform-modules-e582-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
done) done)
override_dh_usrlocal: override_dh_usrlocal:
@ -32,4 +34,6 @@ override_dh_clean:
rm -rf $(MOD_SRC_DIR)/$${mod}/modules/*.ko; \ rm -rf $(MOD_SRC_DIR)/$${mod}/modules/*.ko; \
rm -rf debian/platform-modules-e582-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR)/*.ko; \ rm -rf debian/platform-modules-e582-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR)/*.ko; \
done) done)
make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/../centec-dal clean; \
rm -rf $(MOD_SRC_DIR)/../centec-dal/*.ko

22
platform/centec/sonic-platform-modules-embedway/debian/rules
View File

@ -5,31 +5,21 @@ export INSTALL_MOD_DIR:=extra
KVERSION ?= $(shell uname -r) KVERSION ?= $(shell uname -r)
KERNEL_SRC := /lib/modules/$(KVERSION) KERNEL_SRC := /lib/modules/$(KVERSION)
MOD_SRC_DIR:= $(shell pwd) MOD_SRC_DIR:= $(shell pwd)
MODULE_DIRS:= ../centec-dal
%: %:
dh $@ dh $@
override_dh_auto_build: override_dh_auto_build:
(for mod in $(MODULE_DIRS); do \ make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/../centec-dal
make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules; \
done)
override_dh_auto_install: override_dh_auto_install:
(for mod in $(MODULE_DIRS); do \ dh_installdirs -pplatform-modules-embedway-es6220 \
dh_installdirs -pplatform-modules-embedway-$${mod} \ $(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \ cp -f $(MOD_SRC_DIR)/../centec-dal/*.ko debian/platform-modules-embedway-es6220/$(KERNEL_SRC)/$(INSTALL_MOD_DIR)
cp -f $(MOD_SRC_DIR)/$${mod}/modules/*.ko \
debian/platform-modules-embedway-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
done)
override_dh_usrlocal: override_dh_usrlocal:
override_dh_clean: override_dh_clean:
dh_clean dh_clean
(for mod in $(MODULE_DIRS); do \ make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/../centec-dal clean; \
make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules clean; \ rm -rf $(MOD_SRC_DIR)/../centec-dal/*.ko
rm -rf $(MOD_SRC_DIR)/$${mod}/modules/*.ko; \
rm -rf debian/platform-modules-embedway-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR)/*.ko; \
done)