Skip to content

Commit da8483d

Browse files
MonekaLakshmiMonekaLakshmi
authored
Merge pull request #1780 from rdkcentral/develop
Rebase with develop
2 parents 814409c + ae2ebbd commit da8483d

File tree

2 files changed

+31
-29
lines changed

2 files changed

+31
-29
lines changed

‎conf/include/generic-pkgrev.inc‎

Lines changed: 22 additions & 21 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

@@ -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,7 +148,7 @@ 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

@@ -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}"

‎conf/include/generic-srcrev.inc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ SRCREV:pn-ctrlm-main = "512407a852d5aae9a5340a30264585532b4a91da"
55
SRCREV:pn-ctrlm-headers = "${SRCREV:pn-ctrlm-main}"
66
SRCREV:pn-xr-voice-sdk = "b628e1ac2b8b149e87de650ca87d6b78969521c4"
77
SRCREV:pn-xr-voice-sdk-headers = "${SRCREV:pn-xr-voice-sdk}"
8-
SRCREV_hdmicec = "5b86137db794ae939eab1ef37497dd6695911bf4"
8+
SRCREV_hdmicec = "b407684e91a936a07fadf4ef393505a5d06db890"
99
SRCREV:pn-rmfosal = "ea4f0df1edd73cc2d45d453ad445cb2536799684"
1010
SRCREV:pn-audiocapturemgr = "29f81aa9d1c749221a606002a31d669b030028ad"
1111
SRCREV_aamp = "34a029accd6fa7e3d49f44af5fb30d4cdc43257c"
12-
SRCREV_iarmbus = "6ed35ebb886a8ac01812d8bfe5b4c3a89f9ace38"
13-
SRCREV:pn-iarmmgrs = "e7c386e3e9027c39fdc071c4bf07dbb32026237c"
12+
SRCREV_iarmbus = "6dd8bd51b96cec8df3416fd162cee3dd2c089a26"
13+
SRCREV:pn-iarmmgrs = "8cc5174ebe2e40c48d808d6a7571499e9f539720"
14+
SRCREV:pn-iarmmgrs-hal-headers = "${SRCREV:pn-iarmmgrs}"
1415
SRCREV:pn-rdk-gstreamer-utils = "ea9c7ec1a810053619596123f5bd6fd22b3215f4"
1516
SRCREV_devicesettings = "43478032d2ad20097fb13491cbc42acc2fbb77ce"
1617
SRCREV:pn-bluetooth-mgr = "b284d24692988285e449252829eacc78214634b5"
@@ -25,22 +26,21 @@ SRCREV:pn-libsyswrapper = "5143ba5b92f5dc77b436837d51f2f612d5846b7b"
2526
SRCREV:pn-commonutilities = "e4992be3b8e522da464dd70c8446fd46be293bf0"
2627
SRCREV_rdkfw = "cd0731c8a95e371a984b245cd35d3e9728ae7a80"
2728
SRCREV:pn-rdkperf = "d802d561c4a2a4456403d572da75e73032d48d91"
28-
SRCREV:pn-iarm-query-powerstate = "5ca9d73a72e3fd16363a8d7f39ab8b1e50cffe84"
29+
SRCREV:pn-iarm-query-powerstate = "bccda2514f8c123b3a24c72cf37b519b7623b270"
2930
SRCREV:pn-iarm-set-powerstate = "${SRCREV:pn-iarm-query-powerstate}"
30-
SRCREV:pn-iarmmgrs-hal-headers = "${SRCREV:pn-iarmmgrs}"
31+
SRCREV:pn-iarm-event-sender = "${SRCREV:pn-iarm-query-powerstate}"
32+
SRCREV_key-simulator = "${SRCREV:pn-iarm-query-powerstate}"
33+
SRCREV_mfr-utils = "${SRCREV:pn-iarm-query-powerstate}"
3134
SRCREV:pn-rfc = "83b232e15e2f5bbd1b3dd9597b7f2e9086bd8c80"
3235
SRCREV:pn-sysint = "288fc773372f3a8922149db7675b9cfc58e5ec03"
3336
SRCREV_tr69hostif = "0358f905d10b8a70c0bf959de692670f8d599ba4"
3437
SRCREV:pn-hdmicecheader = "5201b2f759b4ca8fd2a6f5db838d528f6477db0c"
3538
SRCREV:pn-tr69hostif-headers = "c8e31c2b5ca1412805dc90edbab392cdd9134cdd"
3639
SRCREV:pn-dobby = "59381966b7251d46a28ef7897a290662ca6009cb"
37-
SRCREV_key-simulator = "${SRCREV:pn-iarm-query-powerstate}"
3840
SRCREV:pn-memcr = "f46af4008d19cb527d5cede22bf0a3d0c7a8ed02"
3941
SRCREV:pn-gst-plugins-rdk = "2a713a366153cf38dcf7bbced0b0c9de828c34c7"
4042
SRCREV:pn-wpeframework-ui = "ae6d061a6a08d97ad3ad8821c422b4f45aeeced1"
41-
SRCREV_mfr-utils = "${SRCREV:pn-iarm-query-powerstate}"
4243
SRCREV:pn-tts = "53206b1d1ce346dc4c7bdbe1b9767bcfe866a478"
43-
SRCREV:pn-iarm-event-sender = "${SRCREV:pn-iarm-query-powerstate}"
4444
SRCREV:pn-packagemanager = "38729b8edfc3ddaba0b3625c19bcd2dd1a05b027"
4545
SRCREV_systemtimemgrifc = "f327d55479d559bfb94803d2e6d60501ab32f9f2"
4646
SRCREV_systemtimemgrfactory="f327d55479d559bfb94803d2e6d60501ab32f9f2"
@@ -72,3 +72,4 @@ SRCREV:pn-ttxdecoder = "${SRCREV:pn-subttxrend-app}"
7272
SRCREV:pn-rdkcertconfig = "e0e35743f7e96ad0595ac25b11d829b766f7062b"
7373
SRCREV:pn-packager-lisa = "2d11311d51f28b3b0b39715aca3c404333a98470"
7474
SRCREV:pn-entservices-infra = "242f968501b8e4d9203cd38e568594263792b75f"
75+
SRCREV:pn-xdial = "206d13783924f8ea90d48dbbcc9c199e45ffa783"

0 commit comments

Comments
 (0)