Skip to content

Commit f8541c9

Browse files
Herrie82Tofee
authored andcommitted
com.webos.service.pdm|db8|notificationmgr: Fix LS2 permission errors
Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
1 parent 71fece0 commit f8541c9

6 files changed

Lines changed: 128 additions & 0 deletions

File tree

meta-luneos/recipes-webos/com.webos.service.pdm/com.webos.service.pdm.bb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ inherit pkgconfig
3232
SRC_URI = "${WEBOSOSE_GIT_REPO_COMPLETE} \
3333
file://0001-NfcDeviceHandler-Fix-incorrect-name.patch \
3434
file://0002-Remove-the-Android-Auto-bits.patch \
35+
file://0003-com.webos.service.pdm.perm.json-Fix-incorrect-permis.patch \
3536
"
3637

3738
S = "${WORKDIR}/git"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From ac2a6cfce2ffbd58026f2939fccbc05cd68d3d78 Mon Sep 17 00:00:00 2001
2+
From: Herrie <Github.com@herrie.org>
3+
Date: Fri, 19 Jan 2024 06:46:43 +0100
4+
Subject: [PATCH] com.webos.service.pdm.perm.json: Fix incorrect permission
5+
6+
Fixes:
7+
8+
WARNING: luneos-dev-image-1.0-r0 do_validate_ls2_acg: 'applicationmanager.launcher' being used in:
9+
WARNING: luneos-dev-image-1.0-r0 do_validate_ls2_acg: com.webos.service.pdm.perm.json
10+
11+
Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
12+
---
13+
Upstream-Status: Pending
14+
15+
files/sysbus/com.webos.service.pdm.perm.json.in | 2 +-
16+
1 file changed, 1 insertion(+), 1 deletion(-)
17+
18+
diff --git a/files/sysbus/com.webos.service.pdm.perm.json.in b/files/sysbus/com.webos.service.pdm.perm.json.in
19+
index 411217f..3d5a682 100644
20+
--- a/files/sysbus/com.webos.service.pdm.perm.json.in
21+
+++ b/files/sysbus/com.webos.service.pdm.perm.json.in
22+
@@ -1,7 +1,7 @@
23+
{
24+
"com.webos.service.pdm":[
25+
"account.query",
26+
- "applicationmanager.launcher",
27+
+ "application.launcher",
28+
"settings.query",
29+
"notification.operation",
30+
"notification.management",

meta-luneos/recipes-webos/db8/db8.bb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ EXTRA_OECMAKE:append:class-native = " -DWEBOS_CONFIG_BUILD_TESTS:BOOL=FALSE -DUS
4040

4141
SRC_URI = "${WEBOSOSE_GIT_REPO_COMPLETE} \
4242
file://0001-com.palm.db.role.json.in-More-generic-app-access.patch \
43+
file://0002-db-Update-db8.groups.json-for-test-API-s.patch \
4344
"
4445

4546
S = "${WORKDIR}/git"
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
From 6fefe7fe50225c23150abbb6acbc78314397705f Mon Sep 17 00:00:00 2001
2+
From: Herrie <Github.com@herrie.org>
3+
Date: Fri, 19 Jan 2024 06:07:43 +0100
4+
Subject: [PATCH] db: Update db8.groups.json for test API's
5+
6+
Fixes:
7+
8+
WARNING: Found 2 group(s) that appear only in api-permissions.d, consider define them in groups.d
9+
WARNING: === LIST BEGIN: Groups used in api-permissions.d but not defined in groups.d ===
10+
WARNING: database.test
11+
12+
Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
13+
---
14+
Upstream-Status: Pending
15+
16+
files/sysbus/dynamic/db8.groups.json | 5 +++--
17+
files/sysbus/static/db8.groups.json | 5 +++--
18+
2 files changed, 6 insertions(+), 4 deletions(-)
19+
20+
diff --git a/files/sysbus/dynamic/db8.groups.json b/files/sysbus/dynamic/db8.groups.json
21+
index 7e4bed8..8ff9d8e 100644
22+
--- a/files/sysbus/dynamic/db8.groups.json
23+
+++ b/files/sysbus/dynamic/db8.groups.json
24+
@@ -1,5 +1,5 @@
25+
{
26+
- "allowedNames": ["com.palm.db","com.palm.tempdb","com.webos.mediadb","com.webos.epgdb", "com.webos.keymgrdb"],
27+
+ "allowedNames": ["com.palm.db","com.palm.tempdb","com.webos.mediadb","com.webos.epgdb", "com.webos.keymgrdb", "com.webos.db8.test.*"],
28+
"database.operation":["dev"],
29+
"database.profiling":["dev"],
30+
"database.management":["oem"],
31+
@@ -14,5 +14,6 @@
32+
"mediadatabase.management":["oem"],
33+
"keymgrdatabase.operation":["oem"],
34+
"keymgrdatabase.profiling":["oem"],
35+
- "keymgrdatabase.management":["oem"]
36+
+ "keymgrdatabase.management":["oem"],
37+
+ "database.test":["dev"]
38+
}
39+
\ No newline at end of file
40+
diff --git a/files/sysbus/static/db8.groups.json b/files/sysbus/static/db8.groups.json
41+
index d73d812..01d6ec0 100644
42+
--- a/files/sysbus/static/db8.groups.json
43+
+++ b/files/sysbus/static/db8.groups.json
44+
@@ -1,5 +1,5 @@
45+
{
46+
- "allowedNames": ["com.palm.db","com.palm.tempdb","com.webos.mediadb","com.webos.epgdb", "com.webos.keymgrdb"],
47+
+ "allowedNames": ["com.palm.db","com.palm.tempdb","com.webos.mediadb","com.webos.epgdb", "com.webos.keymgrdb", "com.webos.db8.test.*"],
48+
"database.operation":["dev"],
49+
"database.profiling":["dev"],
50+
"database.management":["oem"],
51+
@@ -14,5 +14,6 @@
52+
"mediadatabase.management":["oem"],
53+
"keymgrdatabase.operation":["oem"],
54+
"keymgrdatabase.profiling":["oem"],
55+
- "keymgrdatabase.management":["oem"]
56+
+ "keymgrdatabase.management":["oem"],
57+
+ "database.test":["dev"]
58+
}
59+
\ No newline at end of file

meta-luneos/recipes-webos/notificationmgr/notificationmgr.bb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ SRC_URI = "${WEBOSOSE_GIT_REPO_COMPLETE} \
3030
file://0002-Revert-97e68e38b489ab103e68b63672b5444ee7a05d49.patch \
3131
file://0003-com.webos.notification.role.json.in-Fix-permission-i.patch \
3232
file://0004-NotificationService.h-Add-back-bits-required-by-Lune.patch \
33+
file://0005-com.webos.notification.perm.json-Fix-incorrect-value.patch \
3334
"
3435
S = "${WORKDIR}/git"
3536

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 1e6dd8a74125e78dc87521fb2cd161719600092a Mon Sep 17 00:00:00 2001
2+
From: Herrie <Github.com@herrie.org>
3+
Date: Fri, 19 Jan 2024 06:56:43 +0100
4+
Subject: [PATCH] com.webos.notification.perm.json: Fix incorrect values
5+
6+
We don't have tv.settings and we need application.launcher for call to SAM/launch.
7+
8+
Fixes:
9+
10+
WARNING: luneos-dev-image-1.0-r0 do_validate_ls2_acg: 'tv.settings' being used in:
11+
WARNING: luneos-dev-image-1.0-r0 do_validate_ls2_acg: com.webos.notification.perm.json
12+
WARNING: luneos-dev-image-1.0-r0 do_validate_ls2_acg: 'applicationmanager.query' being used in:
13+
WARNING: luneos-dev-image-1.0-r0 do_validate_ls2_acg: com.webos.notification.perm.json
14+
15+
Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
16+
---
17+
files/sysbus/com.webos.notification.perm.json.in | 5 ++---
18+
1 file changed, 2 insertions(+), 3 deletions(-)
19+
20+
diff --git a/files/sysbus/com.webos.notification.perm.json.in b/files/sysbus/com.webos.notification.perm.json.in
21+
index 47f7bec..c8d78ae 100644
22+
--- a/files/sysbus/com.webos.notification.perm.json.in
23+
+++ b/files/sysbus/com.webos.notification.perm.json.in
24+
@@ -1,10 +1,9 @@
25+
{
26+
"com.webos.notification": [
27+
+ "application.launcher",
28+
"application.operation",
29+
- "applicationmanager.query",
30+
"database.operation",
31+
"settings.query",
32+
- "time.query",
33+
- "tv.settings"
34+
+ "time.query"
35+
]
36+
}

0 commit comments

Comments
 (0)