Skip to content

Commit 111d94f

Browse files
Divya-563Divya-563
committed
Merge branch 'main' into R4
2 parents bbd33da + 49c76f6 commit 111d94f

File tree

6 files changed

+40
-28
lines changed

6 files changed

+40
-28
lines changed

‎package/cobalt/cobalt.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export COBALT_EXECUTABLE_TYPE = executable
5757
endif
5858

5959
ifeq ($(BR2_PACKAGE_COBALT_USE_WPEFRAMEWORK_DATA_PATH), y)
60-
export COBALT_DATA_PATH = "$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/Cobalt"
60+
export COBALT_DATA_PATH = $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/Cobalt
6161
COBALT_DATA_INSTALL_PATH = $(TARGET_DIR)/$(COBALT_DATA_PATH)
6262
COBALT_DATA_SRC_PATH = content/data/*
6363
else

‎package/wpe/wpeframework-amazon/wpeframework-amazon.mk‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,15 @@ WPEFRAMEWORK_AMAZON_USER_GROUP=amazon
4242
else
4343
WPEFRAMEWORK_AMAZON_USER_GROUP=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP)")
4444
endif
45-
WPEFRAMEWORK_AMAZON_USER=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_USER)") -1 $(WPEFRAMEWORK_AMAZON_USER_GROUP) -1 * - - $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_PLATFORM_VIDEO_DEVICE_GROUP)"),$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)"),$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)") amazon
46-
WPEFRAMEWORK_AMAZON_PERMISSION=$(subst ",,$(WPEFRAMEWORK_AMAZON_DATA_PATH)") r 0550 root $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP)") - - - - -
45+
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP),"")
46+
WPEFRAMEWORK_CDMI_GROUP=,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")
47+
endif
48+
WPEFRAMEWORK_AMAZON_USER=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_USER)") -1 $(WPEFRAMEWORK_AMAZON_USER_GROUP) -1 * - - $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_PLATFORM_VIDEO_DEVICE_GROUP)"),$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)")$(WPEFRAMEWORK_CDMI_GROUP) amazon
49+
WPEFRAMEWORK_AMAZON_PERMISSION=$(subst ",,$(WPEFRAMEWORK_AMAZON_DATA_PATH)") r 0550 root $(subst ",,$(WPEFRAMEWORK_AMAZON_USER_GROUP)") - - - - -
4750
endif
4851

49-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP),"")
50-
WPEFRAMEWORK_AMAZON_CONF_OPTS += -DPLUGIN_AMAZON_PRIME_GROUP=$(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP)
52+
ifneq ($(WPEFRAMEWORK_AMAZON_USER_GROUP),"")
53+
WPEFRAMEWORK_AMAZON_CONF_OPTS += -DPLUGIN_AMAZON_PRIME_GROUP=$(WPEFRAMEWORK_AMAZON_USER_GROUP)
5154
endif
5255

5356
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_CA_BUNDLE_PATH),"")

‎package/wpe/wpeframework-netflix/Config.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,13 @@ config BR2_PACKAGE_WPEFRAMEWORK_PLUGIN_NETFLIX_DEVICE_KEYS
173173
config BR2_PACKAGE_WPEFRAMEWORK_NETFLIX_USER
174174
string "user"
175175
help
176-
The user that amazon prime should use (root is not allowed)
176+
The user that netflix user should use
177177

178178
config BR2_PACKAGE_WPEFRAMEWORK_NETFLIX_GROUP
179179
string "group"
180180
default BR2_PACKAGE_WPEFRAMEWORK_NETFLIX_USER
181181
help
182-
The group that amazon prime user should use (root is not allowed)
182+
The group that netflix user should use
183183

184184
endif
185185

‎package/wpe/wpeframework-netflix/wpeframework-netflix.mk‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,15 @@ WPEFRAMEWORK_NETFLIX_USER_GROUP=netflix
165165
else
166166
WPEFRAMEWORK_NETFLIX_USER_GROUP=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_NETFLIX_GROUP)")
167167
endif
168-
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)"),$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)") netflix
169-
WPEFRAMEWORK_NETFLIX_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/Netflix r 0550 root $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_NETFLIX_GROUP)") - - - - -
168+
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP),"")
169+
WPEFRAMEWORK_CDMI_GROUP=,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")
170+
endif
171+
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
172+
WPEFRAMEWORK_NETFLIX_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/Netflix r 0550 root $(subst ",,$(WPEFRAMEWORK_NETFLIX_USER_GROUP)") - - - - -
170173
endif
171174

172-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_NETFLIX_GROUP),"")
173-
WPEFRAMEWORK_NETFLIX_CONF_OPTS += -DPLUGIN_NETFLIX_GROUP=$(BR2_PACKAGE_WPEFRAMEWORK_NETFLIX_GROUP)
175+
ifneq ($(WPEFRAMEWORK_NETFLIX_USER_GROUP),"")
176+
WPEFRAMEWORK_NETFLIX_CONF_OPTS += -DPLUGIN_NETFLIX_GROUP=$(WPEFRAMEWORK_NETFLIX_USER_GROUP)
174177
endif
175178

176179
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS),y)

‎package/wpe/wpeframework-plugins/wpeframework-plugins.mk‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,14 @@ WPEFRAMEWORK_COBALT_USER_GROUP=cobalt
164164
else
165165
WPEFRAMEWORK_COBALT_USER_GROUP=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_COBALT_GROUP)")
166166
endif
167-
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)"),$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)") cobalt
168-
WPEFRAMEWORK_COBALT_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/Cobalt r 0550 root $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_COBALT_GROUP)") - - - - -
167+
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP),"")
168+
WPEFRAMEWORK_CDMI_GROUP=,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")
169169
endif
170-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_COBALT_GROUP),"")
171-
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_COBALT_GROUP=$(BR2_PACKAGE_WPEFRAMEWORK_COBALT_GROUP)
170+
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
171+
WPEFRAMEWORK_COBALT_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/Cobalt r 0550 root $(subst ",,$(WPEFRAMEWORK_COBALT_USER_GROUP)") - - - - -
172+
endif
173+
ifneq ($(WPEFRAMEWORK_COBALT_USER_GROUP),"")
174+
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_COBALT_GROUP=$(WPEFRAMEWORK_COBALT_USER_GROUP)
172175
endif
173176

174177
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_COBALT_SINGLE_PLAYBACKRATE),y)

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

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -131,19 +131,19 @@ ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_STORAGE_LOCATION),"")
131131
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += \
132132
-DPLUGIN_OPENCDMI_WIDEVINE_STORAGE_LOCATION="$(call qstrip,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_STORAGE_LOCATION))"
133133
endif
134-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_USER),"")
135-
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_USER=$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_USER)
136134
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP),"")
137-
WPEFRAMEWORK_CDMI_USER_GROUP=ocdm
135+
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_GROUP=$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)
136+
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_CONNECTOR="/tmp/ocdm|0770,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")"
137+
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_USER),"")
138+
WPEFRAMEWORK_CDMI_USER=ocdm
138139
else
139-
WPEFRAMEWORK_CDMI_USER_GROUP=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")
140+
WPEFRAMEWORK_CDMI_USER=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")
140141
endif
141-
WPEFRAMEWORK_CDMI_USER=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_USER)") -1 $(WPEFRAMEWORK_CDMI_USER_GROUP) -1 * - - root,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)") opencdm
142-
WPEFRAMEWORK_CDMI_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/OCDM d 0550 root $(subst ",,$(WPEFRAMEWORK_CDMI_USER_GROUP)") - - - - -
142+
WPEFRAMEWORK_CDMI_USER_GROUP=$(WPEFRAMEWORK_CDMI_USER) -1 $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)") -1 * - - root,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)") opencdm
143+
WPEFRAMEWORK_CDMI_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/OCDM d 0550 root $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)") - - - - -
143144
endif
144-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP),"")
145-
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_GROUP=$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)
146-
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_CONNECTOR="/tmp/ocdm|0770,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")"
145+
ifneq ($(WPEFRAMEWORK_CDMI_USER),"")
146+
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_USER=$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_USER)
147147
endif
148148
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_CLEARKEY),y)
149149
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_CLEARKEY=ON
@@ -286,11 +286,14 @@ WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP=wpewebkit
286286
else
287287
WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_GROUP)")
288288
endif
289-
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)"),$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)") webkit browser
289+
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP),"")
290+
WPEFRAMEWORK_CDMI_GROUP=,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")
291+
endif
292+
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
290293
WPEFRAMEWORK_WEBKITBROWSER_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/WebKitBrowser r 0440 root $(subst ",,$(WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP)") - - - - -
291294
endif
292-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_GROUP),"")
293-
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_GROUP=$(BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_GROUP)
295+
ifneq ($(WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP),"")
296+
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_GROUP=$(WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP)
294297
endif
295298
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BROWSER_RESOLUTION_720P),y)
296299
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_RESOLUTION=720p
@@ -392,7 +395,7 @@ endif
392395
endif
393396

394397
define WPEFRAMEWORK_RDKSERVICES_USERS
395-
${WPEFRAMEWORK_CDMI_USER}
398+
${WPEFRAMEWORK_CDMI_USER_GROUP}
396399
${WPEFRAMEWORK_WEBKITBROWSER_USER}
397400
endef
398401

0 commit comments

Comments
 (0)