RDKEMW-16976 : Integrate entservices-resourcemanager into middleware builds

recipes-extended/entservices/entservices-infra.bb

@@ -2,7 +2,7 @@ SUMMARY = "ENTServices Infra plugin"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9adde9d5cb6e9c095d3e3abf0e9500f1"
 
-PV = "3.24.1"
+PV = "3.24.3"
 PR = "r0"
 
 S = "${WORKDIR}/git"
@@ -47,8 +47,7 @@ SELECTED_OPTIMIZATION:append = " -Wno-deprecated-declarations"
 
 # ----------------------------------------------------------------------------
 
-PACKAGECONFIG ?= " resourcemanager \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'enable_bolt_apps', '', 'rdknativescript', d)} \
+PACKAGECONFIG ?= " ${@bb.utils.contains('DISTRO_FEATURES', 'enable_bolt_apps', '', 'rdknativescript', d)} \
     javascriptcore \          
     texttospeechmonitor \    
     ${@bb.utils.contains('DISTRO_FEATURES', 'rdkshell',             'rdkshell', '', d)} \
@@ -72,7 +71,6 @@ EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'RDKTV_APP_HIBERNATE',
 # ----------------------------------------------------------------------------
 
 PACKAGECONFIG[erm]                  = "-DBUILD_ENABLE_ERM=ON,-DBUILD_ENABLE_ERM=OFF,essos,essos"
-PACKAGECONFIG[resourcemanager]      = "-DPLUGIN_RESOURCEMANAGER=ON,-DPLUGIN_RESOURCEMANAGER=OFF,"
 PACKAGECONFIG[analytics]            = "-DPLUGIN_ANALYTICS=ON,-DPLUGIN_ANALYTICS=OFF, entservices-apis, entservices-apis"
 PACKAGECONFIG[rdkshell]             = "-DPLUGIN_RDKSHELL=ON,-DPLUGIN_RDKSHELL=OFF,rdkshell entservices-apis,rdkshell entservices-apis"
 PACKAGECONFIG[rialtodac]            = "-DRIALTO_IN_DAC_FEATURE=ON,-DRIALTO_IN_DAC_FEATURE=OFF,rialto,rialto-servermanager-lib"

recipes-extended/entservices/entservices-resourcemanager.bb

@@ -0,0 +1,91 @@
+SUMMARY = "ENTServices ResourceManager plugin"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9adde9d5cb6e9c095d3e3abf0e9500f1"
+
+PV = "1.0.1"
+PR = "r0"
+
+S = "${WORKDIR}/git"
+inherit cmake pkgconfig
+
+SRCREV = "${PV}"
+SRC_URI = "${CMF_GITHUB_ROOT}/entservices-resourcemanager;${CMF_GITHUB_SRC_URI_SUFFIX} \
+           file://rdkservices.ini \
+           file://0001-RDKTV-20749-Revert-Merge-pull-request-3336-from-npol.patch \
+          "
+
+PACKAGE_ARCH = "${MIDDLEWARE_ARCH}"
+TOOLCHAIN = "gcc"
+DISTRO_FEATURES_CHECK = "wpe_r4_4 wpe_r4"
+EXTRA_OECMAKE += "${@bb.utils.contains_any('DISTRO_FEATURES', '${DISTRO_FEATURES_CHECK}', ' -DUSE_THUNDER_R4=ON', '', d)}"
+
+EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'wpe_security_util_disable', ' -DDISABLE_SECURITY_TOKEN=ON', '', d)}"
+
+DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'RDKE_PLATFORM_TV', "tvsettings-hal-headers ", "", d)}"
+DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'RDKE_PLATFORM_TV', "virtual/vendor-tvsettings-hal ", "", d)}"
+DEPENDS += "wpeframework wpeframework-tools-native wpeframework-clientlibraries rfc"
+RDEPENDS:${PN} += "wpeframework rfc"
+DEPENDS += "packager-headers"
+
+CXXFLAGS += " -I${STAGING_DIR_TARGET}${includedir}/wdmp-c/ "
+CXXFLAGS += " -I${STAGING_DIR_TARGET}${includedir}/trower-base64/ "
+CXXFLAGS += " -DRFC_ENABLED "
+
+CXXFLAGS += " -DNET_DEFINED_INTERFACES_ONLY -DNET_NO_LINK_LOCAL_ANNOUNCE "
+CXXFLAGS += " -Wall -Werror "
+CXXFLAGS:remove_morty = " -Wall -Werror "
+SELECTED_OPTIMIZATION:append = " -Wno-deprecated-declarations"
+
+# ----------------------------------------------------------------------------
+
+PACKAGECONFIG ?= "resourcemanager erm"
+
+inherit features_check
+EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'disable_security_agent', ' -DENABLE_SECURITY_AGENT=OFF ', '  ', d)}"
+
+# ----------------------------------------------------------------------------
+
+PACKAGECONFIG[resourcemanager] = "-DPLUGIN_RESOURCEMANAGER=ON,-DPLUGIN_RESOURCEMANAGER=OFF,"
+PACKAGECONFIG[erm]             = "-DBUILD_ENABLE_ERM=ON,-DBUILD_ENABLE_ERM=OFF,essos,essos"
+
+# ----------------------------------------------------------------------------
+
+EXTRA_OECMAKE += " \
+    -DBUILD_REFERENCE=${SRCREV} \
+    -DBUILD_SHARED_LIBS=ON \
+    -DSECAPI_LIB=sec_api \
+"
+
+EXTRA_OECMAKE += " \
+    -DBUILD_AMLOGIC=ON \
+    -DBUILD_LLAMA=ON \
+"
+
+python () {
+    dri_device_name = d.getVar('DRI_DEVICE_NAME')
+    if dri_device_name:
+        d.appendVar('OECMAKE_CXX_FLAGS', ' -DDEFAULT_DEVICE=\'\\"{}\\"\' '.format(dri_device_name))
+}
+
+do_install:append() {
+    install -d ${D}${sysconfdir}/rfcdefaults
+    if ${@bb.utils.contains_any("DISTRO_FEATURES", "rdkshell_ra second_form_factor", "true", "false", d)}
+    then
+      install -m 0644 ${WORKDIR}/rdkservices.ini ${D}${sysconfdir}/rfcdefaults/
+    fi
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'thunder_startup_services', 'true', 'false', d)} == 'true'; then
+        if [ -d "${D}/etc/WPEFramework/plugins" ]; then
+            find ${D}/etc/WPEFramework/plugins/ -type f | xargs sed -i -r 's/"autostart"[[:space:]]*:[[:space:]]*true/"autostart":false/g'
+        fi
+    fi
+}
+
+# ----------------------------------------------------------------------------
+
+FILES_SOLIBSDEV = ""
+# Keep explicit plugin file entries to avoid installed-vs-shipped QA on unversioned plugin .so files.
+FILES:${PN} += "${libdir}/wpeframework/plugins/libWPEFrameworkResourceManager.so"
+FILES:${PN} += "${libdir}/wpeframework/plugins/*.so ${libdir}/*.so ${datadir}/WPEFramework/*"
+
+INSANE_SKIP:${PN} += "libdir staticdev dev-so"
+INSANE_SKIP:${PN}-dbg += "libdir"