From fdf1ec312d61dcab96ad23653e986fa12c792b88 Mon Sep 17 00:00:00 2001 From: "neethu.arambilsunny@sky.uk" Date: Thu, 1 May 2025 13:43:57 +0100 Subject: [PATCH 1/7] message --- conf/include/generic-srcrev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/include/generic-srcrev.inc b/conf/include/generic-srcrev.inc index 2f4c7519..6e1fafca 100644 --- a/conf/include/generic-srcrev.inc +++ b/conf/include/generic-srcrev.inc @@ -73,4 +73,4 @@ SRCREV:pn-ttxdecoder = "${SRCREV:pn-subttxrend-app}" SRCREV:pn-texttrack = "01cb3d2c77cef91fb132176dc611071628349af5" SRCREV:pn-rdkcertconfig = "9bc36349fcb52101387fcc0adc1f20b14d8b5114" - +//test From cabce3054520a2beeec87c4050b6e973ae7e8fd6 Mon Sep 17 00:00:00 2001 From: neethuas379 Date: Thu, 1 May 2025 18:51:58 +0530 Subject: [PATCH 2/7] Update generic-srcrev.inc --- conf/include/generic-srcrev.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf/include/generic-srcrev.inc b/conf/include/generic-srcrev.inc index 6e1fafca..7f8e2c87 100644 --- a/conf/include/generic-srcrev.inc +++ b/conf/include/generic-srcrev.inc @@ -72,5 +72,3 @@ SRCREV:pn-dvbsubdecoder= "${SRCREV:pn-subttxrend-app}" SRCREV:pn-ttxdecoder = "${SRCREV:pn-subttxrend-app}" SRCREV:pn-texttrack = "01cb3d2c77cef91fb132176dc611071628349af5" SRCREV:pn-rdkcertconfig = "9bc36349fcb52101387fcc0adc1f20b14d8b5114" - -//test From 077fd77cbbf256aeb2abf4df7685d6bf76519ce4 Mon Sep 17 00:00:00 2001 From: "neethu.arambilsunny@sky.uk" Date: Thu, 1 May 2025 13:43:57 +0100 Subject: [PATCH 3/7] message --- conf/include/generic-srcrev-override.inc | 2 -- conf/include/generic-srcrev.inc | 2 +- conf/layer.conf | 1 - .../workaround/git-history-reset/devicesettings_git.bbappend | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 conf/include/generic-srcrev-override.inc delete mode 100644 recipes-bringup/workaround/git-history-reset/devicesettings_git.bbappend diff --git a/conf/include/generic-srcrev-override.inc b/conf/include/generic-srcrev-override.inc deleted file mode 100644 index 4399dbdc..00000000 --- a/conf/include/generic-srcrev-override.inc +++ /dev/null @@ -1,2 +0,0 @@ - -SRCREV_devicesettings = "2a32343a876ee2a1c09a6f7334492ef22031243a" diff --git a/conf/include/generic-srcrev.inc b/conf/include/generic-srcrev.inc index 7f8e2c87..460bea0d 100644 --- a/conf/include/generic-srcrev.inc +++ b/conf/include/generic-srcrev.inc @@ -12,7 +12,7 @@ SRCREV_aamp = "7947fca517ae5089d65eb19dbd0fd47b6b223575" SRCREV_iarmbus = "6ed35ebb886a8ac01812d8bfe5b4c3a89f9ace38" SRCREV:pn-iarmmgrs = "ef4b29a09838980c088eff91fa48d269bd105582" SRCREV:pn-rdk-gstreamer-utils = "ceb1e846dc1c959dae401db6036bd133fecc9d52" -SRCREV_devicesettings = "440e4ab907ce5c3c9a168aa393fb13b7868ef768" +SRCREV_devicesettings = "49bf73fecb283bc4d5219a7ec2e0d795aa87a730" SRCREV:pn-bluetooth-mgr = "b3cab06b83eace1b77847eb78a20af7bf105e229" SRCREV:pn-bluetooth-core = "84c23498a6633e668bc347dd18c6e7817e51aec8" SRCREV_rdmgeneric = "3ae2700d6dd44ae04406180dca94b3f87fdf23e5" diff --git a/conf/layer.conf b/conf/layer.conf index 986b9074..05d122aa 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -21,6 +21,5 @@ require include/generic-middleware.inc #TODO Remove this work around once compile time waringing turned errors are solved SECURITY_CFLAGS:remove = " -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Wno-error=format-security -Wno-error=unused-result" -require include/generic-srcrev-override.inc require include/sky-override.inc diff --git a/recipes-bringup/workaround/git-history-reset/devicesettings_git.bbappend b/recipes-bringup/workaround/git-history-reset/devicesettings_git.bbappend deleted file mode 100644 index 7d227e7d..00000000 --- a/recipes-bringup/workaround/git-history-reset/devicesettings_git.bbappend +++ /dev/null @@ -1 +0,0 @@ -SRC_URI = "${RDKE_GITHUB_ROOT}/devicesettings;${RDKE_GITHUB_SRC_URI_SUFFIX};name=devicesettings" From a9e1d8a142d6a5f1e7d358202b27ed76f21777b2 Mon Sep 17 00:00:00 2001 From: neethuas379 Date: Fri, 2 May 2025 10:09:23 +0530 Subject: [PATCH 4/7] Update generic-srcrev.inc --- conf/include/generic-srcrev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/include/generic-srcrev.inc b/conf/include/generic-srcrev.inc index 460bea0d..722b5330 100644 --- a/conf/include/generic-srcrev.inc +++ b/conf/include/generic-srcrev.inc @@ -12,7 +12,7 @@ SRCREV_aamp = "7947fca517ae5089d65eb19dbd0fd47b6b223575" SRCREV_iarmbus = "6ed35ebb886a8ac01812d8bfe5b4c3a89f9ace38" SRCREV:pn-iarmmgrs = "ef4b29a09838980c088eff91fa48d269bd105582" SRCREV:pn-rdk-gstreamer-utils = "ceb1e846dc1c959dae401db6036bd133fecc9d52" -SRCREV_devicesettings = "49bf73fecb283bc4d5219a7ec2e0d795aa87a730" +SRCREV_devicesettings = "3b54d9a6c758615908a455f48e1f15b72d8bd112" SRCREV:pn-bluetooth-mgr = "b3cab06b83eace1b77847eb78a20af7bf105e229" SRCREV:pn-bluetooth-core = "84c23498a6633e668bc347dd18c6e7817e51aec8" SRCREV_rdmgeneric = "3ae2700d6dd44ae04406180dca94b3f87fdf23e5" From 41469bb07411f77b6c1890ab8badef88a975420e Mon Sep 17 00:00:00 2001 From: neethuas379 Date: Fri, 2 May 2025 20:09:01 +0530 Subject: [PATCH 5/7] Update generic-srcrev.inc --- conf/include/generic-srcrev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/include/generic-srcrev.inc b/conf/include/generic-srcrev.inc index 722b5330..28a9fc03 100644 --- a/conf/include/generic-srcrev.inc +++ b/conf/include/generic-srcrev.inc @@ -12,7 +12,7 @@ SRCREV_aamp = "7947fca517ae5089d65eb19dbd0fd47b6b223575" SRCREV_iarmbus = "6ed35ebb886a8ac01812d8bfe5b4c3a89f9ace38" SRCREV:pn-iarmmgrs = "ef4b29a09838980c088eff91fa48d269bd105582" SRCREV:pn-rdk-gstreamer-utils = "ceb1e846dc1c959dae401db6036bd133fecc9d52" -SRCREV_devicesettings = "3b54d9a6c758615908a455f48e1f15b72d8bd112" +SRCREV_devicesettings = "bf0109d70d3a35b7af266a2877e510eea45db930" SRCREV:pn-bluetooth-mgr = "b3cab06b83eace1b77847eb78a20af7bf105e229" SRCREV:pn-bluetooth-core = "84c23498a6633e668bc347dd18c6e7817e51aec8" SRCREV_rdmgeneric = "3ae2700d6dd44ae04406180dca94b3f87fdf23e5" From 7537841311cba1eb88b6cb096d33bc80d577c8fd Mon Sep 17 00:00:00 2001 From: "neethu.arambilsunny@sky.uk" Date: Wed, 7 May 2025 17:55:57 +0100 Subject: [PATCH 6/7] message --- conf/include/generic-srcrev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/include/generic-srcrev.inc b/conf/include/generic-srcrev.inc index 28a9fc03..488e6a22 100644 --- a/conf/include/generic-srcrev.inc +++ b/conf/include/generic-srcrev.inc @@ -12,7 +12,7 @@ SRCREV_aamp = "7947fca517ae5089d65eb19dbd0fd47b6b223575" SRCREV_iarmbus = "6ed35ebb886a8ac01812d8bfe5b4c3a89f9ace38" SRCREV:pn-iarmmgrs = "ef4b29a09838980c088eff91fa48d269bd105582" SRCREV:pn-rdk-gstreamer-utils = "ceb1e846dc1c959dae401db6036bd133fecc9d52" -SRCREV_devicesettings = "bf0109d70d3a35b7af266a2877e510eea45db930" +SRCREV_devicesettings = "11465b5f3933dec585359415b096047fafbad997" SRCREV:pn-bluetooth-mgr = "b3cab06b83eace1b77847eb78a20af7bf105e229" SRCREV:pn-bluetooth-core = "84c23498a6633e668bc347dd18c6e7817e51aec8" SRCREV_rdmgeneric = "3ae2700d6dd44ae04406180dca94b3f87fdf23e5" From 74f1173dbec2ed5a221af8e905f4722cf08cb343 Mon Sep 17 00:00:00 2001 From: "neethu.arambilsunny@sky.uk" Date: Wed, 7 May 2025 17:55:57 +0100 Subject: [PATCH 7/7] message --- recipes-bringup/workaround/aamp/aamp_git.bbappend | 3 +++ recipes-bringup/workaround/iarmmgrs/iarmmgrs_git.bbappend | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes-bringup/workaround/aamp/aamp_git.bbappend b/recipes-bringup/workaround/aamp/aamp_git.bbappend index 6c6e5a41..b328790c 100644 --- a/recipes-bringup/workaround/aamp/aamp_git.bbappend +++ b/recipes-bringup/workaround/aamp/aamp_git.bbappend @@ -1,3 +1,6 @@ +DEPENDS:append = " rdk-hal-logging " +LDFLAGS += "-lrdkHalLogging" + DEPENDS:remove += " playready-cdm-rdk " INSANE_SKIP:${PN} += "dev-deps" diff --git a/recipes-bringup/workaround/iarmmgrs/iarmmgrs_git.bbappend b/recipes-bringup/workaround/iarmmgrs/iarmmgrs_git.bbappend index 48414dd9..74de40d1 100644 --- a/recipes-bringup/workaround/iarmmgrs/iarmmgrs_git.bbappend +++ b/recipes-bringup/workaround/iarmmgrs/iarmmgrs_git.bbappend @@ -1,5 +1,7 @@ # Do not reboot on dsmgr crash till bring up is complete +DEPENDS:append = " rdk-hal-logging " +LDFLAGS += "-lrdkHalLogging" do_install:append() { sed -i '/^OnFailure=reboot-notifier@%i.service/d' ${D}${systemd_unitdir}/system/dsmgr.service }