diff --git a/recipes-common/crashupload/crashupload_git.bb b/recipes-common/crashupload/crashupload_git.bb index af742599..c26360df 100644 --- a/recipes-common/crashupload/crashupload_git.bb +++ b/recipes-common/crashupload/crashupload_git.bb @@ -1,51 +1,74 @@ -SUMMARY = "Crashupload application" +SUMMARY = "Crash Upload Utility for RDK Platforms" SECTION = "console/utils" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=175792518e4ac015ab6696d16c4f607e" -PV = "1.0.7" +PV = "2.0.0" PR = "r0" PACKAGE_ARCH = "${MIDDLEWARE_ARCH}" -# To have a possibility to override SRC_URI later, we are introducing the following workaround: -CRASHUPLOAD_SRC_URI ?= "${RDK_GENERIC_ROOT_GIT}/crashupload/generic;module=.;protocol=${RDK_GIT_PROTOCOL};branch=${RDK_GIT_BRANCH}" -SRCREV = "8e7e22d2cb988ea58b9ba9d85b8b0812c6dc77d2" -SRC_URI = "${CMF_GITHUB_ROOT}/crashupload;${CMF_GITHUB_SRC_URI_SUFFIX};module=." -S = "${WORKDIR}/git" +SRC_URI = "${CMF_GITHUB_ROOT}/${BPN}.git;nobranch=1;protocol=${CMF_GIT_PROTOCOL}" +SRCREV = "d62af2db9d7748268353476fcda95c3b342c5428" + +S = "${WORKDIR}/git/c_sourcecode" DEPENDS = "glib-2.0 libsyswrapper" export LINK = "${LD}" -CFLAGS += " \ - -I=${libdir}/glib-2.0/include \ - -I=${includedir}/glib-2.0 \ - " +CFLAGS:append = " \ + -I=${libdir}/glib-2.0/include \ + -I=${includedir}/glib-2.0 \ + -DLIBRDKCERTSELECTOR \ + -DRFC_API_ENABLED \ + -DT2_EVENT_ENABLED \ + -DRDK_LOGGER \ + -DUSE_EXTENDED_LOGGER_INIT \ + " export GLIBS = "-lglib-2.0 -lz" export USE_DBUS = "y" -LDFLAGS += "-Wl,-O1" +LDFLAGS:append = "-Wl,-O1" +LDFLAGS:append = " -lrfcapi -ltelemetry_msgsender -lRdkCertSelector -lrdkconfig" + +inherit autotools systemd coverity pkgconfig -inherit coverity -inherit systemd +DEPENDS:append:client = " \ + curl \ + openssl \ + zlib \ + libarchive \ + libsyswrapper \ + rdk-logger \ + commonutilities \ + rdkcertconfig \ + rfc \ + telemetry \ + " do_install() { install -d ${D}${base_libdir}/rdk install -d ${D}${sysconfdir} ${D}${sysconfdir}/rfcdefaults - install -m 0755 ${S}/uploadDumps.sh ${D}${base_libdir}/rdk + install -m 0755 ${WORKDIR}/git/uploadDumps.sh ${D}${base_libdir}/rdk + install -m 0755 ${WORKDIR}/git/runDumpUpload.sh ${D}${base_libdir}/rdk +} + +do_install:append:client() { + install -d ${D}${bindir} + install -m 0755 ${B}/src/crashupload ${D}${bindir}/crashupload } do_install:append:broadband() { use_sysv="${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'false', 'true', d)}" $use_sysv || install -d ${D}${systemd_unitdir}/system - $use_sysv || install -m 0644 ${S}/coredump-upload.service ${D}${systemd_unitdir}/system/ - $use_sysv || install -m 0644 ${S}/coredump-upload.path ${D}${systemd_unitdir}/system/ - $use_sysv || install -m 0644 ${S}/minidump-on-bootup-upload.service ${D}${systemd_unitdir}/system/ - $use_sysv || install -m 0644 ${S}/minidump-on-bootup-upload.timer ${D}${systemd_unitdir}/system/ + $use_sysv || install -m 0644 ${WORKDIR}/git/coredump-upload.service ${D}${systemd_unitdir}/system/ + $use_sysv || install -m 0644 ${WORKDIR}/git/coredump-upload.path ${D}${systemd_unitdir}/system/ + $use_sysv || install -m 0644 ${WORKDIR}/git/minidump-on-bootup-upload.service ${D}${systemd_unitdir}/system/ + $use_sysv || install -m 0644 ${WORKDIR}/git/minidump-on-bootup-upload.timer ${D}${systemd_unitdir}/system/ install -d ${D}${sysconfdir} - install -m 0755 ${S}/uploadDumpsUtils.sh ${D}${base_libdir}/rdk + install -m 0755 ${WORKDIR}/git/uploadDumpsUtils.sh ${D}${base_libdir}/rdk } SYSTEMD_SERVICE:${PN}:append:broadband = " coredump-upload.service \ @@ -53,9 +76,12 @@ SYSTEMD_SERVICE:${PN}:append:broadband = " coredump-upload.service \ minidump-on-bootup-upload.service \ minidump-on-bootup-upload.timer \ " -RDEPENDS:${PN} += "busybox" + +RDEPENDS:${PN} += "busybox commonutilities" PACKAGE_BEFORE_PN += "${PN}-conf" -FILES:${PN} += "${base_libdir}/rdk/uploadDumps.sh" +FILES:${PN}:append:client = " ${bindir}/crashupload" +FILES:${PN}:append = " ${base_libdir}/rdk/uploadDumps.sh" +FILES:${PN}:append = " ${base_libdir}/rdk/runDumpUpload.sh" FILES:${PN}:append:broadband = " ${base_libdir}/rdk/uploadDumpsUtils.sh" diff --git a/recipes-common/dcmd/dcmd.bb b/recipes-common/dcmd/dcmd.bb index b95f096e..319ec962 100644 --- a/recipes-common/dcmd/dcmd.bb +++ b/recipes-common/dcmd/dcmd.bb @@ -5,15 +5,16 @@ DESCRIPTION = "dcmd" SECTION = "dcmd" DEPENDS += "rbus" +DEPENDS += "commonutilities" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=2441d6cdabdc0f370be5cd8a746eb647" # This tells bitbake where to find the files we're providing on the local filesystem FILESEXTRAPATHS:prepend := "${THISDIR}:" -SRCREV = "03974134e21b316d4053de6574df14b3a423c8d6" +SRCREV = "52ad7e168f07f41c52903ccadd544e803142a0a9" SRC_URI = "${CMF_GITHUB_ROOT}/dcm-agent;${CMF_GITHUB_SRC_URI_SUFFIX}" -PV = "1.2.0" +PV = "2.0.0" PR = "r0" PACKAGE_ARCH = "${MIDDLEWARE_ARCH}" @@ -35,17 +36,32 @@ ASNEEDED = "" CFLAGS:append = " -std=c11 -fPIC -D_GNU_SOURCE -Wall -Werror" +# added for certselector +EXTRA_OECONF:append = " --enable-t2api=yes --enable-iarmevent" LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'enable_maintenance_manager', '-lIARMBus', '', d)}" - DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'enable_maintenance_manager', 'iarmmgrs iarmbus', '', d)}" CFLAGS:append += "${@bb.utils.contains('DISTRO_FEATURES', 'enable_maintenance_manager', '-DHAS_MAINTENANCE_MANAGER', '', d)}" do_install:append () { - + install -d ${D}${bindir} install -d ${D}${systemd_unitdir}/system install -m 0644 ${S}/dcmd.service ${D}${systemd_unitdir}/system + install -d ${D}${includedir} + install -m 0644 ${S}/uploadstblogs/include/*.h ${D}${includedir} } -SYSTEMD_SERVICE:${PN} += "dcmd.service" +inherit breakpad-wrapper +DEPENDS += "breakpad breakpad-wrapper" +BREAKPAD_BIN:append = "logupload" + +PACKAGECONFIG:append = " breakpad" +PACKAGECONFIG[breakpad] = "--enable-breakpad,,breakpad," +LDFLAGS += "-lbreakpadwrapper" +CXXFLAGS += "-DINCLUDE_BREAKPAD" + + +# Add any extra packaging if needed +FILES_${PN} += "${bindir}/logupload" +SYSTEMD_SERVICE:${PN} += "dcmd.service" diff --git a/recipes-common/utils/commonutilities_git.bb b/recipes-common/utils/commonutilities_git.bb index fad1b2a8..34b928ec 100644 --- a/recipes-common/utils/commonutilities_git.bb +++ b/recipes-common/utils/commonutilities_git.bb @@ -3,20 +3,28 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=24691c8ce48996ecd1102d29eab1216e" # To have a possibility to override SRC_URI later, we are introducing the following workaround: -SRCREV = "5c7dfc405cd34da3ab1a1121caf8733ebe35d879" +SRCREV = "9ddea87ee79da7c18a19381c0047ebdbaf58a6e7" SRC_URI = "${CMF_GITHUB_ROOT}/common_utilities;module=.;${CMF_GITHUB_SRC_URI_SUFFIX}" PACKAGE_ARCH = "${MIDDLEWARE_ARCH}" -DEPENDS +=" cjson curl rdk-logger" +DEPENDS +=" cjson curl rdk-logger rdkcertconfig" +#RDEPENDS:{PN} += " rfc" #uncomment the following line to turn on debugging #CFLAGS:append = " -DCURL_DEBUG" # or enable this distro feature CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'debug_curl_cdl', ' -DCURL_DEBUG', '', d)}" +DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'safec', ' safec', " ", d)}" +CFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'safec', ' `pkg-config --cflags libsafec`', '-fPIC', d)}" +CFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'safec', '', ' -DSAFEC_DUMMY_API', d)}" +LDFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'safec', ' `pkg-config --libs libsafec`', '', d)}" + +LDFLAGS:append = " -lsafec -lsecure_wrapper" + CFLAGS:append = " -DRDK_LOGGER" -PV = "1.4.4" +PV = "1.5.0" PR = "r0" S = "${WORKDIR}/git"