Merge pull request #256 from siemens/jan/stable-V01.02

BaochengSu · web-flow · commit 883c59cbf5be · 2022-01-26T18:48:31.000+08:00
Fill stable branch
diff --git a/conf/distro/iot2050-debian.conf b/conf/distro/iot2050-debian.conf
@@ -1,9 +1,10 @@
 #
-# Copyright (c) Siemens AG, 2019-2021
+# Copyright (c) Siemens AG, 2019-2022
 #
 # Authors:
 #  Le Jin <le.jin@siemens.com>
 #  Jan Kiszka <jan.kiszka@siemens.com>
+#  Su Baocheng <baocheng.su@siemens.com>
 #
 # This file is subject to the terms and conditions of the MIT License.  See
 # COPYING.MIT file in the top-level directory.
@@ -15,7 +16,8 @@ DISTRO_NAME = "IOT2050 Debian System"
 
 HOSTNAME ??= "iot2050-debian"
 
-PREFERRED_VERSION_u-boot-iot2050 ?= "2021.04"
+PREFERRED_VERSION_u-boot-iot2050-pg1 ?= "2021.04"
+PREFERRED_VERSION_u-boot-iot2050-pg2 ?= "2021.04"
 PREFERRED_VERSION_linux-iot2050 ?= "5.10.%"
 PREFERRED_VERSION_linux-iot2050-rt ?= "5.10.%"
 
diff --git a/conf/machine/iot2050.conf b/conf/machine/iot2050.conf
@@ -1,8 +1,9 @@
 #
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019-2022
 #
 # Authors:
 #  Le Jin <le.jin@siemens.com>
+#  Su Baocheng <baocheng.su@siemens.com>
 #
 # This file is subject to the terms and conditions of the MIT License.  See
 # COPYING.MIT file in the top-level directory.
@@ -11,6 +12,7 @@
 DISTRO_ARCH ?= "arm64"
 
 PREFERRED_PROVIDER_u-boot-${MACHINE} ?= "u-boot-iot2050-pg2"
+PREFERRED_PROVIDER_u-boot-${MACHINE}-config ?= "u-boot-iot2050-pg2"
 
 KERNEL_NAME ?= "iot2050"
 
diff --git a/recipes-kernel/linux/files/iot2050_defconfig_extra.cfg b/recipes-kernel/linux/files/iot2050_defconfig_extra.cfg
@@ -160,6 +160,7 @@ CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
+CONFIG_BRIDGE_NETFILTER=m
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_NAT=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
@@ -185,3 +186,8 @@ CONFIG_NET_CLS_POLICE=y
 CONFIG_USB_NET_QMI_WWAN=m
 CONFIG_USB_NET_HUAWEI_CDC_NCM=m
 CONFIG_USB_NET_CDC_MBIM=m
+
+CONFIG_BPF_SYSCALL=y
+CONFIG_CGROUP_BPF=y
+
+CONFIG_WIREGUARD=m
diff --git a/recipes-security/openssl/openssl_latest.bb b/recipes-security/openssl/openssl_latest.bb

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`	`1`	`#`
`2`		`-# Copyright (c) Siemens AG, 2019-2021`
	`2`	`+# Copyright (c) Siemens AG, 2019-2022`
`3`	`3`	`#`
`4`	`4`	`# Authors:`
`5`	`5`	`# Le Jin <[email protected]>`
`6`	`6`	`# Jan Kiszka <[email protected]>`
	`7`	`+# Su Baocheng <[email protected]>`
`7`	`8`	`#`
`8`	`9`	`# This file is subject to the terms and conditions of the MIT License. See`
`9`	`10`	`# COPYING.MIT file in the top-level directory.`
`@@ -15,7 +16,8 @@ DISTRO_NAME = "IOT2050 Debian System"`
`15`	`16`
`16`	`17`	`HOSTNAME ??= "iot2050-debian"`
`17`	`18`
`18`		`-PREFERRED_VERSION_u-boot-iot2050 ?= "2021.04"`
	`19`	`+PREFERRED_VERSION_u-boot-iot2050-pg1 ?= "2021.04"`
	`20`	`+PREFERRED_VERSION_u-boot-iot2050-pg2 ?= "2021.04"`
`19`	`21`	`PREFERRED_VERSION_linux-iot2050 ?= "5.10.%"`
`20`	`22`	`PREFERRED_VERSION_linux-iot2050-rt ?= "5.10.%"`
`21`	`23`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`#`
`2`		`-# Copyright (c) Siemens AG, 2019`
	`2`	`+# Copyright (c) Siemens AG, 2019-2022`
`3`	`3`	`#`
`4`	`4`	`# Authors:`
`5`	`5`	`# Le Jin <[email protected]>`
	`6`	`+# Su Baocheng <[email protected]>`
`6`	`7`	`#`
`7`	`8`	`# This file is subject to the terms and conditions of the MIT License. See`
`8`	`9`	`# COPYING.MIT file in the top-level directory.`
`@@ -11,6 +12,7 @@`
`11`	`12`	`DISTRO_ARCH ?= "arm64"`
`12`	`13`
`13`	`14`	`PREFERRED_PROVIDER_u-boot-${MACHINE} ?= "u-boot-iot2050-pg2"`
	`15`	`+PREFERRED_PROVIDER_u-boot-${MACHINE}-config ?= "u-boot-iot2050-pg2"`
`14`	`16`
`15`	`17`	`KERNEL_NAME ?= "iot2050"`
`16`	`18`