Merge branch 'master' of http://git.komect.net/ISG/secogateway

.gitignore

@@ -21,4 +21,8 @@ Product/build/debug/
 .build/
 _install/
 .idea/
+kernel/arm64_rootfs/
+kernel/*arm64_rootfs.tar.gz
+kernel/linux-4.14.83/build/
+		
 /ControlPlatform/web/node_modules

ControlPlatform/cmhi-settings.xml

@@ -1,7 +1,29 @@
 <?xml version="1.0"?>
 
 <settings>
-    <localRepository>E:\mvn_repo2</localRepository>
+    <mirrors>
+        <mirror>
+            <id>odlmirror1</id>
+            <name>opendaylight-release-mirror</name>
+            <mirrorOf>opendaylight-release</mirrorOf>   <!--拦截 pom 文件配置的 repository-->
+            <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-release/</url>
+        </mirror>
+
+        <mirror>
+            <id>odlmirror2</id>
+            <name>opendaylight-snapshot-mirror</name>
+            <mirrorOf>opendaylight-snapshot</mirrorOf>   <!--拦截 pom 文件配置的 repository-->
+            <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-snapshot/</url>
+        </mirror>
+
+        <mirror>
+            <id>aliyunmirror</id>
+            <mirrorOf>central</mirrorOf>  <!--覆盖 Maven 默认的配置的中央仓库-->
+            <name>ALIYUN maven</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+        </mirror>
+
+    </mirrors>
     <servers>
         <!--
 		-->
@@ -22,22 +44,108 @@
         </server>
 
         <server>
-            <id>local-odlrelease</id>
+            <id>cmhi-odlrelease</id>
             <username>aqb</username>
             <password>aqb123</password>
         </server>
         <server>
-            <id>local-odlsnapshot</id>
+            <id>cmhi-odlsnapshot</id>
+            <username>aqb</username>
+            <password>aqb123</password>
+        </server>
+        <server>
+            <id>opendaylight-release</id>
+            <username>aqb</username>
+            <password>aqb123</password>
+        </server>
+        <server>
+            <id>opendaylight-snapshot</id>
             <username>aqb</username>
             <password>aqb123</password>
         </server>
 
     </servers>
     <profiles>
-        <profile>
+        <!--倒序，从上往下合并repositories，合并到最下面的profile，最下面的优先级高-->
+		<profile>
+            <id>cmhiodlsnapshotprofile</id>
+            <repositories>
+                <repository>
+                    <id>cmhi-odlsnapshot</id>
+                    <name>cmhi-odlsnapshot</name>
+                    <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-snapshot/</url>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>cmhi-odlsnapshot</id>
+                    <name>cmhi-odlsnapshot</name>
+                    <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-snapshot/</url>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+		<profile>
+            <id>cmhiodlreleaseprofile</id>
+            <repositories>
+                <repository>
+                    <id>cmhi-odlrelease</id>
+                    <name>cmhi-odlrelease</name>
+                    <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-release/</url>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>cmhi-odlrelease</id>
+                    <name>cmhi-odlrelease</name>
+                    <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-release/</url>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+		<profile>
             <id>dev</id>
+            <!-- 设定远程主仓库，按设定顺序进行查找。 -->
             <repositories>
                 <!--
+                aliyun
+				-->
+                <repository>
+                    <id>ali</id>
+                    <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </repository>
+                <!--
+                公司
 				-->
                 <repository>
                     <id>public-nexus</id>
@@ -71,59 +179,11 @@
                 </repository>
 
             </repositories>
-        </profile>
-        <profile>
-            <id>opendaylight-release</id>
-            <repositories>
-                <repository>
-                    <id>local-odlrelease</id>
-                    <name>local-odlrelease</name>
-                    <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-release/</url>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </repository>
-            </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>local-odlrelease</id>
+                    <id>ali</id>
-                    <name>local-odlrelease</name>
+                    <name>aliyun-pluginRepository</name>
-                    <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-release/</url>
+                    <url>http://maven.aliyun.com/nexus/content/groups/public</url>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-
-        <profile>
-            <id>opendaylight-snapshots</id>
-            <repositories>
-                <repository>
-                    <id>local-odlsnapshot</id>
-                    <name>local-odlsnapshot</name>
-                    <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-snapshot/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>local-odlsnapshot</id>
-                    <name>local-odlsnapshot</name>
-                    <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-snapshot/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -136,7 +196,7 @@
     </profiles>
     <activeProfiles>
         <activeProfile>dev</activeProfile>
-        <activeProfile>opendaylight-release</activeProfile>
+		<activeProfile>cmhiodlreleaseprofile</activeProfile>
-        <activeProfile>opendaylight-snapshots</activeProfile>
+        <activeProfile>cmhiodlsnapshotprofile</activeProfile>
     </activeProfiles>
 </settings>

kernel/arm64_config

@@ -154,7 +154,7 @@ CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
 # CONFIG_CGROUP_DEBUG is not set
-# CONFIG_SOCK_CGROUP_DATA is not set
+CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
@@ -718,6 +718,7 @@ CONFIG_QORIQ_CPUFREQ=y
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
 
 #
 # Networking options
@@ -738,6 +739,7 @@ CONFIG_NET_KEY=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_ROUTE_CLASSID=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -1074,7 +1076,82 @@ CONFIG_LLC=y
 # CONFIG_PHONET is not set
 # CONFIG_6LOWPAN is not set
 # CONFIG_IEEE802154 is not set
-# CONFIG_NET_SCHED is not set
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+# CONFIG_NET_ACT_SAMPLE is not set
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_SKBMOD=m
+# CONFIG_NET_ACT_IFE is not set
+CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
 CONFIG_DNS_RESOLVER=y
 # CONFIG_BATMAN_ADV is not set
@@ -1092,7 +1169,7 @@ CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 # CONFIG_CGROUP_NET_PRIO is not set
-# CONFIG_CGROUP_NET_CLASSID is not set
+CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
 CONFIG_BPF_JIT=y
@@ -1155,8 +1232,8 @@ CONFIG_NET_9P_VIRTIO=y
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
 # CONFIG_NFC is not set
-# CONFIG_PSAMPLE is not set
+CONFIG_PSAMPLE=y
-# CONFIG_NET_IFE is not set
+CONFIG_NET_IFE=y
 # CONFIG_LWTUNNEL is not set
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
@@ -1705,6 +1782,7 @@ CONFIG_NET_CORE=y
 # CONFIG_DUMMY is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_NET_FC is not set
+# CONFIG_IFB is not set
 # CONFIG_NET_TEAM is not set
 CONFIG_MACVLAN=y
 CONFIG_MACVTAP=y
@@ -1837,6 +1915,7 @@ CONFIG_FSL_FM_RX_EXTRA_HEADROOM=64
 # CONFIG_FMAN_PFC is not set
 CONFIG_FSL_SDK_DPAA_ETH=y
 # CONFIG_FSL_DPAA_HOOKS is not set
+# CONFIG_FSL_DPAA_CEETM is not set
 CONFIG_FSL_DPAA_OFFLINE_PORTS=y
 CONFIG_FSL_DPAA_ADVANCED_DRIVERS=y
 # CONFIG_FSL_DPAA_ETH_JUMBO_FRAME is not set
@@ -4552,6 +4631,7 @@ CONFIG_FSL_MC_DPIO=y
 # CONFIG_FSL_QBMAN_DEBUG is not set
 CONFIG_FSL_DPAA2=y
 CONFIG_FSL_DPAA2_ETH=y
+# CONFIG_FSL_DPAA2_ETH_CEETM is not set
 # CONFIG_FSL_DPAA2_ETH_USE_ERR_QUEUE is not set
 CONFIG_FSL_DPAA2_ETH_DEBUGFS=y
 CONFIG_FSL_DPAA2_PTP_CLOCK=y
@@ -6109,6 +6189,10 @@ CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
 CONFIG_RADIX_TREE_MULTIORDER=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y