Skip to content

Commit d25a59e

Browse files
HaseenaSainulHaseenaSainul
authored
User:Group settings for thunder: create ocdm user:group only ocdm:group is enabled (#474)
1 parent 1d81af5 commit d25a59e

File tree

5 files changed

+39
-27
lines changed

5 files changed

+39
-27
lines changed

‎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
@@ -130,19 +130,19 @@ ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_STORAGE_LOCATION),"")
130130
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += \
131131
-DPLUGIN_OPENCDMI_WIDEVINE_STORAGE_LOCATION="$(call qstrip,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_STORAGE_LOCATION))"
132132
endif
133-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_USER),"")
134-
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_USER=$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_USER)
135133
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP),"")
136-
WPEFRAMEWORK_CDMI_USER_GROUP=ocdm
134+
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_GROUP=$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)
135+
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_CONNECTOR="/tmp/ocdm|0770,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")"
136+
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_USER),"")
137+
WPEFRAMEWORK_CDMI_USER=ocdm
137138
else
138-
WPEFRAMEWORK_CDMI_USER_GROUP=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")
139+
WPEFRAMEWORK_CDMI_USER=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")
139140
endif
140-
WPEFRAMEWORK_CDMI_USER=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_USER)") -1 $(WPEFRAMEWORK_CDMI_USER_GROUP) -1 * - - root,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)") opencdm
141-
WPEFRAMEWORK_CDMI_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/OCDM d 0550 root $(subst ",,$(WPEFRAMEWORK_CDMI_USER_GROUP)") - - - - -
141+
WPEFRAMEWORK_CDMI_USER_GROUP=$(WPEFRAMEWORK_CDMI_USER) -1 $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)") -1 * - - root,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)") opencdm
142+
WPEFRAMEWORK_CDMI_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/OCDM d 0550 root $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)") - - - - -
142143
endif
143-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP),"")
144-
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_GROUP=$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)
145-
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_CONNECTOR="/tmp/ocdm|0770,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")"
144+
ifneq ($(WPEFRAMEWORK_CDMI_USER),"")
145+
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_USER=$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_USER)
146146
endif
147147
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_CLEARKEY),y)
148148
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_OPENCDMI_CLEARKEY=ON
@@ -285,11 +285,14 @@ WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP=wpewebkit
285285
else
286286
WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_GROUP)")
287287
endif
288-
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
288+
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP),"")
289+
WPEFRAMEWORK_CDMI_GROUP=,$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)")
290+
endif
291+
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
289292
WPEFRAMEWORK_WEBKITBROWSER_PERMISSION=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/WebKitBrowser r 0440 root $(subst ",,$(WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP)") - - - - -
290293
endif
291-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_GROUP),"")
292-
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_GROUP=$(BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_GROUP)
294+
ifneq ($(WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP),"")
295+
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_GROUP=$(WPEFRAMEWORK_WEBKITBROWSER_USER_GROUP)
293296
endif
294297
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BROWSER_RESOLUTION_720P),y)
295298
WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_RESOLUTION=720p
@@ -391,7 +394,7 @@ endif
391394
endif
392395

393396
define WPEFRAMEWORK_RDKSERVICES_USERS
394-
${WPEFRAMEWORK_CDMI_USER}
397+
${WPEFRAMEWORK_CDMI_USER_GROUP}
395398
${WPEFRAMEWORK_WEBKITBROWSER_USER}
396399
endef
397400

0 commit comments

Comments
 (0)