From cde69bafa95c6edcc3178e3f81f14a3138376d11 Mon Sep 17 00:00:00 2001
From: taochengyi <54564117+taocy001@users.noreply.github.com>
Date: Wed, 20 May 2020 00:22:35 +0800
Subject: [PATCH] [centec]: Adding missing changes for centec x86 platform
 (#4611)

PR #4605 has two changes that are missing, fix them.
---
 .../sonic-platform-modules-e582/debian/rules  |  6 ++++-
 .../debian/rules                              | 22 +++++--------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/platform/centec/sonic-platform-modules-e582/debian/rules b/platform/centec/sonic-platform-modules-e582/debian/rules
index 90a9c5642b..b726f62c8c 100755
--- a/platform/centec/sonic-platform-modules-e582/debian/rules
+++ b/platform/centec/sonic-platform-modules-e582/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:= 48x6q 48x2q4z ../centec-dal
+MODULE_DIRS:= 48x6q 48x2q4z
 
 %:
 	dh $@
@@ -14,6 +14,7 @@ override_dh_auto_build:
 	(for mod in $(MODULE_DIRS); do \
 		make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules; \
 	done)
+	make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/../centec-dal
 
 override_dh_auto_install:
 	(for mod in $(MODULE_DIRS); do \
@@ -21,6 +22,7 @@ override_dh_auto_install:
 			$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
 		cp -f $(MOD_SRC_DIR)/$${mod}/modules/*.ko \
 			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)
 
 override_dh_usrlocal:
@@ -32,4 +34,6 @@ override_dh_clean:
 		rm -rf $(MOD_SRC_DIR)/$${mod}/modules/*.ko; \
 		rm -rf debian/platform-modules-e582-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR)/*.ko; \
 	done)
+	make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/../centec-dal clean; \
+		rm -rf $(MOD_SRC_DIR)/../centec-dal/*.ko
 
diff --git a/platform/centec/sonic-platform-modules-embedway/debian/rules b/platform/centec/sonic-platform-modules-embedway/debian/rules
index 20716d0620..250c0861e1 100755
--- a/platform/centec/sonic-platform-modules-embedway/debian/rules
+++ b/platform/centec/sonic-platform-modules-embedway/debian/rules
@@ -5,31 +5,21 @@ export INSTALL_MOD_DIR:=extra
 KVERSION   ?= $(shell uname -r)
 KERNEL_SRC :=  /lib/modules/$(KVERSION)
 MOD_SRC_DIR:= $(shell pwd)
-MODULE_DIRS:= ../centec-dal
 
 %:
 	dh $@
 
 override_dh_auto_build:
-	(for mod in $(MODULE_DIRS); do \
-		make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules; \
-	done)
+	make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/../centec-dal
 
 override_dh_auto_install:
-	(for mod in $(MODULE_DIRS); do \
-		dh_installdirs -pplatform-modules-embedway-$${mod} \
-			$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
-		cp -f $(MOD_SRC_DIR)/$${mod}/modules/*.ko \
-			debian/platform-modules-embedway-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
-	done)
+	dh_installdirs -pplatform-modules-embedway-es6220 \
+		$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
+	cp -f $(MOD_SRC_DIR)/../centec-dal/*.ko debian/platform-modules-embedway-es6220/$(KERNEL_SRC)/$(INSTALL_MOD_DIR)
 
 override_dh_usrlocal:
 
 override_dh_clean:
 	dh_clean
-	(for mod in $(MODULE_DIRS); do \
-		make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules clean; \
-		rm -rf $(MOD_SRC_DIR)/$${mod}/modules/*.ko; \
-		rm -rf debian/platform-modules-embedway-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR)/*.ko; \
-	done)
-
+	make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/../centec-dal clean; \
+		rm -rf $(MOD_SRC_DIR)/../centec-dal/*.ko