Use wpeframework install path for the permission settings (#514)

WebPlatformForEmbedded · Jun 7, 2023 · 3d974cf · 3d974cf
1 parent bcbfc04
commit 3d974cf
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/package/cobalt/cobalt.mk b/package/cobalt/cobalt.mk
@@ -58,7 +58,7 @@ export COBALT_EXECUTABLE_TYPE = executable
 endif
 
 ifeq ($(BR2_PACKAGE_COBALT_USE_WPEFRAMEWORK_DATA_PATH), y)
-export COBALT_DATA_PATH = $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/Cobalt
+export COBALT_DATA_PATH = $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_INSTALL_PATH)")/Cobalt
 COBALT_DATA_INSTALL_PATH = $(TARGET_DIR)/$(COBALT_DATA_PATH)
 COBALT_DATA_SRC_PATH = content/data/*
 else

diff --git a/package/wpe/wpeframework-netflix/wpeframework-netflix.mk b/package/wpe/wpeframework-netflix/wpeframework-netflix.mk
@@ -169,7 +169,7 @@ ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP),"")
 WPEFRAMEWORK_CDMI_GROUP=,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")
 endif
 WPEFRAMEWORK_NETFLIX_USER=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_NETFLIX_USER)") -1 $(WPEFRAMEWORK_NETFLIX_USER_GROUP) -1 * - - $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_PLATFORM_VIDEO_DEVICE_GROUP)"),$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)")$(WPEFRAMEWORK_CDMI_GROUP) netflix
-WPEFRAMEWORK_NETFLIX_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/Netflix r 0550 root $(subst ",,$(WPEFRAMEWORK_NETFLIX_USER_GROUP)") - - - - -
+WPEFRAMEWORK_NETFLIX_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_INSTALL_PATH)")/Netflix r 0550 root $(subst ",,$(WPEFRAMEWORK_NETFLIX_USER_GROUP)") - - - - -
 endif
 
 ifneq ($(WPEFRAMEWORK_NETFLIX_USER_GROUP),"")

diff --git a/package/wpe/wpeframework-plugins/wpeframework-plugins.mk b/package/wpe/wpeframework-plugins/wpeframework-plugins.mk
@@ -170,7 +170,7 @@ ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP),"")
 WPEFRAMEWORK_CDMI_GROUP=,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")
 endif
 WPEFRAMEWORK_COBALT_USER=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_COBALT_USER)") -1 $(WPEFRAMEWORK_COBALT_USER_GROUP) -1 * - - $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_PLATFORM_VIDEO_DEVICE_GROUP)"),$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)")$(WPEFRAMEWORK_CDMI_GROUP) cobalt
-WPEFRAMEWORK_COBALT_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/Cobalt r 0550 root $(subst ",,$(WPEFRAMEWORK_COBALT_USER_GROUP)") - - - - -
+WPEFRAMEWORK_COBALT_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_INSTALL_PATH)")/Cobalt r 0550 root $(subst ",,$(WPEFRAMEWORK_COBALT_USER_GROUP)") - - - - -
 endif
 ifneq ($(WPEFRAMEWORK_COBALT_USER_GROUP),"")
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_COBALT_GROUP=$(WPEFRAMEWORK_COBALT_USER_GROUP)

diff --git a/package/wpe/wpeframework-rdkservices/wpeframework-rdkservices.mk b/package/wpe/wpeframework-rdkservices/wpeframework-rdkservices.mk
@@ -145,7 +145,7 @@ else
 WPEFRAMEWORK_CDMI_USER=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")
 endif
 WPEFRAMEWORK_CDMI_USER_GROUP=$(WPEFRAMEWORK_CDMI_USER) -1 $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)") -1 * - - root,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)") opencdm
-WPEFRAMEWORK_CDMI_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/OCDM d 0550 root $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)") - - - - -
+WPEFRAMEWORK_CDMI_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_INSTALL_PATH)")/OCDM d 0550 root $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)") - - - - -
 endif
 ifneq ($(WPEFRAMEWORK_CDMI_USER),"")
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_USER=$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_USER)
@@ -295,7 +295,7 @@ ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP),"")
 WPEFRAMEWORK_CDMI_GROUP=,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")
 endif
 WPEFRAMEWORK_WEBKITBROWSER_USER=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_USER)") -1 $(WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP) -1 * - - $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_PLATFORM_VIDEO_DEVICE_GROUP)"),$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)")$(WPEFRAMEWORK_CDMI_GROUP) webkit browser
-WPEFRAMEWORK_WEBKITBROWSER_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/WebKitBrowser r 0440 root $(subst ",,$(WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP)") - - - - -
+WPEFRAMEWORK_WEBKITBROWSER_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_INSTALL_PATH)")/WebKitBrowser r 0440 root $(subst ",,$(WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP)") - - - - -
 endif
 ifneq ($(WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP),"")
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_GROUP=$(WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP)

diff --git a/package/wpe/wpeframework/Config.in b/package/wpe/wpeframework/Config.in
@@ -88,6 +88,10 @@ config BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH
     string "data path"
     default "/usr/share/WPEFramework"
 
+config BR2_PACKAGE_WPEFRAMEWORK_INSTALL_PATH
+    string "install path"
+    default "/usr/share/WPEFramework"
+
 config BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PATH
     string "system path"
     default "/usr/lib/wpeframework/plugins"

diff --git a/package/wpe/wpeframework/wpeframework.mk b/package/wpe/wpeframework/wpeframework.mk
@@ -32,7 +32,7 @@ WPEFRAMEWORK_CONF_OPTS += -DETHERNETCARD_NAME=$(BR2_PACKAGE_WPEFRAMEWORK_ETHERNE
 
 ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_GROUP),"")
 WPEFRAMEWORK_USER_STRING=- - $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)") -1 * - - - general $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)") group
-WPEFRAMEWORK_USER_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)") d 0550 root $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)") - - - - -
+WPEFRAMEWORK_USER_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_INSTALL_PATH)") d 0550 root $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)") - - - - -
 WPEFRAMEWORK_PERSISTENT_ROOT_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_PERSISTENT_PATH)") d 0755 root root - - - - -
 WPEFRAMEWORK_PERSISTENT_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_PERSISTENT_PATH)/WPEFramework") d 0770 root $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)") - - - - -