Skip to content

Commit a717aaa

Browse files
authored
Merge pull request #1800 from rdkcentral/develop
Rebase
2 parents d59ef5b + 39bb6ab commit a717aaa

File tree

2 files changed

+46
-26
lines changed

2 files changed

+46
-26
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Fossid Stateless Diff Scan
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
7+
permissions:
8+
contents: read
9+
pull-requests: read
10+
11+
jobs:
12+
call-fossid-workflow:
13+
if: ${{ ! github.event.pull_request.head.repo.fork }}
14+
uses: rdkcentral/build_tools_workflows/.github/workflows/[email protected]
15+
secrets:
16+
FOSSID_CONTAINER_USERNAME: ${{ secrets.FOSSID_CONTAINER_USERNAME }}
17+
FOSSID_CONTAINER_PASSWORD: ${{ secrets.FOSSID_CONTAINER_PASSWORD }}
18+
FOSSID_HOST_USERNAME: ${{ secrets.FOSSID_HOST_USERNAME }}
19+
FOSSID_HOST_TOKEN: ${{ secrets.FOSSID_HOST_TOKEN }}

conf/include/generic-pkgrev.inc

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ PV:pn-cpeabs = "2.0.0"
1010
PR:pn-cpeabs = "r0"
1111
PACKAGE_ARCH:pn-cpeabs = "${MIDDLEWARE_ARCH}"
1212

13-
PV:pn-hdmicec = "1.0.5"
13+
PV:pn-hdmicec = "1.0.7"
1414
PR:pn-hdmicec = "r0"
1515
PACKAGE_ARCH:pn-hdmicec = "${MIDDLEWARE_ARCH}"
1616

17-
PV:pn-iarmbus = "1.0.1"
17+
PV:pn-iarmbus = "1.0.2"
1818
PR:pn-iarmbus = "r0"
1919
PACKAGE_ARCH:pn-iarmbus = "${MIDDLEWARE_ARCH}"
2020

21-
PV:pn-iarmmgrs = "1.1.2"
21+
PV:pn-iarmmgrs = "1.1.3"
2222
PR:pn-iarmmgrs = "r0"
2323
PACKAGE_ARCH:pn-iarmmgrs = "${MIDDLEWARE_ARCH}"
2424

@@ -34,15 +34,15 @@ PV:pn-rmfosal = "1.0.0"
3434
PR:pn-rmfosal = "r3"
3535
PACKAGE_ARCH:pn-rmfosal = "${MIDDLEWARE_ARCH}"
3636

37-
PV:pn-rbus = "2.6.0"
38-
PR:pn-rbus = "r7"
37+
PV:pn-rbus = "2.9.0"
38+
PR:pn-rbus = "r0"
3939
PACKAGE_ARCH:pn-rbus = "${MIDDLEWARE_ARCH}"
4040

4141
PV:pn-rfc = "1.1.6"
4242
PR:pn-rfc = "r0"
4343
PACKAGE_ARCH:pn-rfc = "${MIDDLEWARE_ARCH}"
4444

45-
PV:pn-tr69hostif = "1.2.4"
45+
PV:pn-tr69hostif = "1.2.5"
4646
PR:pn-tr69hostif = "r0"
4747
PACKAGE_ARCH:pn-tr69hostif = "${MIDDLEWARE_ARCH}"
4848

@@ -62,7 +62,7 @@ PV:pn-dcmd = "1.2.0"
6262
PR:pn-dcmd = "r0"
6363
PACKAGE_ARCH:pn-dcmd = "${MIDDLEWARE_ARCH}"
6464

65-
PV:pn-tr69hostif-headers = "1.2.0"
65+
PV:pn-tr69hostif-headers = "1.2.5"
6666
PR:pn-tr69hostif-headers = "r0"
6767
PACKAGE_ARCH:pn-tr69hostif-headers = "${MIDDLEWARE_ARCH}"
6868

@@ -102,19 +102,28 @@ PV:pn-rdkfwupgrader = "1.3.0"
102102
PR:pn-rdkfwupgrader = "r0"
103103
PACKAGE_ARCH:pn-rdkfwupgrader = "${MIDDLEWARE_ARCH}"
104104

105-
106-
PV:pn-iarm-event-sender = "1.0.4"
107-
PR:pn-iarm-event-sender = "r0"
108-
PACKAGE_ARCH:pn-iarm-event-sender = "${MIDDLEWARE_ARCH}"
109-
110-
PV:pn-iarm-query-powerstate = "1.0.6"
105+
# All of these iarm-query-powerstate, iarm-set-powerstate, iarm-event-sender,
106+
# key-simulator and mfr-utils use sys_mon_tools repo.
107+
PV:pn-iarm-query-powerstate = "1.0.7"
111108
PR:pn-iarm-query-powerstate = "r0"
112109
PACKAGE_ARCH:pn-iarm-query-powerstate = "${MIDDLEWARE_ARCH}"
113110

114-
PV:pn-iarm-set-powerstate = "1.0.4"
115-
PR:pn-iarm-set-powerstate = "r0"
111+
PV:pn-iarm-set-powerstate = "${PV:pn-iarm-query-powerstate}"
112+
PR:pn-iarm-set-powerstate = "${PR:pn-iarm-query-powerstate}"
116113
PACKAGE_ARCH:pn-iarm-set-powerstate = "${MIDDLEWARE_ARCH}"
117114

115+
PV:pn-iarm-event-sender = "${PV:pn-iarm-query-powerstate}"
116+
PR:pn-iarm-event-sender = "${PR:pn-iarm-query-powerstate}"
117+
PACKAGE_ARCH:pn-iarm-event-sender = "${MIDDLEWARE_ARCH}"
118+
119+
PV:pn-key-simulator = "${PV:pn-iarm-query-powerstate}"
120+
PR:pn-key-simulator = "${PR:pn-iarm-query-powerstate}"
121+
PACKAGE_ARCH:pn-key-simulator = "${MIDDLEWARE_ARCH}"
122+
123+
PV:pn-mfr-utils = "${PV:pn-iarm-query-powerstate}"
124+
PR:pn-mfr-utils = "${PR:pn-iarm-query-powerstate}"
125+
PACKAGE_ARCH:pn-mfr-utils = "${MIDDLEWARE_ARCH}"
126+
118127
PV:pn-jquery = "1.0.0"
119128
PR:pn-jquery = "r2"
120129
PACKAGE_ARCH:pn-jquery = "${MIDDLEWARE_ARCH}"
@@ -139,15 +148,15 @@ PV:pn-entservices-infra = "1.8.2"
139148
PR:pn-entservices-infra = "r0"
140149
PACKAGE_ARCH:pn-entservices-infra = "${MIDDLEWARE_ARCH}"
141150

142-
PV:pn-entservices-inputoutput = "1.4.7"
151+
PV:pn-entservices-inputoutput = "1.4.9"
143152
PR:pn-entservices-inputoutput = "r0"
144153
PACKAGE_ARCH:pn-entservices-inputoutput = "${MIDDLEWARE_ARCH}"
145154

146155
PV:pn-entservices-mediaanddrm = "1.3.6"
147156
PR:pn-entservices-mediaanddrm = "r0"
148157
PACKAGE_ARCH:pn-entservices-mediaanddrm = "${MIDDLEWARE_ARCH}"
149158

150-
PV:pn-entservices-peripherals = "1.0.12"
159+
PV:pn-entservices-peripherals = "1.0.16"
151160
PR:pn-entservices-peripherals = "r0"
152161
PACKAGE_ARCH:pn-entservices-peripherals = "${MIDDLEWARE_ARCH}"
153162

@@ -257,18 +266,14 @@ PACKAGE_ARCH_pn-webconfig-framework = "${MIDDLEWARE_ARCH}"
257266

258267
PACKAGE_ARCH:pn-rdksysctl = "${MIDDLEWARE_ARCH}"
259268

260-
PV:pn-xdial = "3.0.1"
269+
PV:pn-xdial = "1.0.0"
261270
PR:pn-xdial = "r0"
262271
PACKAGE_ARCH:pn-xdial = "${MIDDLEWARE_ARCH}"
263272

264273
PV:pn-sysint = "3.0.5"
265274
PR:pn-sysint = "r0"
266275
PACKAGE_ARCH:pn-sysint = "${MIDDLEWARE_ARCH}"
267276

268-
PV:pn-key-simulator = "1.0.4"
269-
PR:pn-key-simulator = "r0"
270-
PACKAGE_ARCH:pn-key-simulator = "${MIDDLEWARE_ARCH}"
271-
272277
PR:pn-bluez5 = "r5"
273278
PACKAGE_ARCH:pn-bluez5 = "${MIDDLEWARE_ARCH}"
274279

@@ -295,10 +300,6 @@ PV:pn-wpeframework-ui = "1.0.0"
295300
PR:pn-wpeframework-ui = "r0"
296301
PACKAGE_ARCH:pn-wpeframework-ui = "${MIDDLEWARE_ARCH}"
297302

298-
PV:pn-mfr-utils = "1.0.4"
299-
PR:pn-mfr-utils = "r0"
300-
PACKAGE_ARCH:pn-mfr-utils = "${MIDDLEWARE_ARCH}"
301-
302303
PV:pn-packagemanager = "4.4.1"
303304
PR:pn-packagemanager = "r0"
304305
PACKAGE_ARCH:pn-packagemanager = "${MIDDLEWARE_ARCH}"

0 commit comments

Comments
 (0)