Merge branch 'main' into R3

Author: Divya-563

board/raspberrypi/rpi23-linux-5.10.config

@@ -41,7 +41,6 @@ CONFIG_VMSPLIT_2G=y
 # CONFIG_CPU_SW_DOMAIN_PAN is not set
 CONFIG_UACCESS_WITH_MEMCPY=y
 # CONFIG_ATAGS is not set
-# CONFIG_STACKPROTECTOR_PER_TASK is not set
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y

package/wpe/wpeframework-plugins/Config.in

@@ -403,13 +403,23 @@ config BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_PLATFORMNAME
 
 endif
 
-config BR2_PACKAGE_WPEFRAMEWORK_DEVICEIDENTIFICATION
+menuconfig BR2_PACKAGE_WPEFRAMEWORK_DEVICEIDENTIFICATION
     select BR2_PACKAGE_WPEFRAMEWORK_RDKSERVICES
-    depends on BR2_PACKAGE_HAS_NEXUS
     bool "DeviceIdentification"
     default y
     help
-      DeviceIdentification Plugin (Nexus OTP)
+      DeviceIdentification Plugin
+
+if BR2_PACKAGE_WPEFRAMEWORK_DEVICEIDENTIFICATION
+
+config BR2_PACKAGE_WPEFRAMEWORK_DEVICEIDENTIFICATION_INTERFACE_NAME
+    string "InterfaceName"
+    default "eth0"
+    help
+      Name of interface, which has to be used for the device id generation
+      in case of generic implementation
+
+endif
 
 config BR2_PACKAGE_WPEFRAMEWORK_DISPLAYINFO
     select BR2_PACKAGE_WPEFRAMEWORK_PLUGINS
@@ -1088,6 +1098,10 @@ config BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_INJECTEDBUNDLE_INTERFACES
     bool "injectedbundle"
     default y
 
+config BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROW_EXTENSION_DIRECTORY
+    string "extension directory name"
+    default "Extension"
+
 config BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_STARTURL
     string "start-url"
     default "about:blank"

package/wpe/wpeframework-rdkservices/wpeframework-rdkservices.mk

@@ -174,6 +174,7 @@ endif
 ifeq  ($(BR2_PACKAGE_WPEFRAMEWORK_DEVICEIDENTIFICATION),y)
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_DEVICEIDENTIFICATION=ON
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += [email protected]:WebPlatformForEmbedded/DeviceIdentification-brcm.git
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DINTERFACE_NAME=$(BR2_PACKAGE_WPEFRAMEWORK_DEVICEIDENTIFICATION_INTERFACE_NAME)
 endif
 
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER),y)
@@ -182,6 +183,7 @@ WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER=ON
 ifneq ($(BR2_PACKAGE_WPEWEBKIT_ALTERNATIVE_EXEC_PATH),"")
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_ALTERNATIVE_EXEC_PATH="$(call qstrip,$(BR2_PACKAGE_WPEWEBKIT_ALTERNATIVE_EXEC_PATH))"
 endif
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_EXTENSION_DIRECTORY=$(BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROW_EXTENSION_DIRECTORY)
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_TAB),y)
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_AMAZON_HYBRID=ON
 endif