Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions conf/template/bblayers.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,4 @@ BBLAYERS =+ " \
${@d.getVar('MANIFEST_PATH_REGION_CONFIG') if d.getVar('MANIFEST_PATH_REGION_CONFIG') is not None and os.path.isfile(d.getVar('MANIFEST_PATH_REGION_CONFIG') + '/conf/layer.conf') else ''} \
"
BBLAYERS =+ "${@d.getVar('MANIFEST_PATH_META_MIXIN') if d.getVar('MANIFEST_PATH_META_MIXIN') is not None and os.path.isfile(d.getVar('MANIFEST_PATH_META_MIXIN') + '/conf/layer.conf') else ''}"
BBLAYERS =+ "${@d.getVar('MANIFEST_PATH_META_CLANG') if d.getVar('MANIFEST_PATH_META_CLANG') is not None and os.path.isfile(d.getVar('MANIFEST_PATH_META_CLANG') + '/conf/layer.conf') else ''}"
68 changes: 44 additions & 24 deletions recipes-common/crashupload/crashupload_git.bb
Original file line number Diff line number Diff line change
@@ -1,61 +1,81 @@
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 = "e4b80deef60735bfa3ed3cfe2766554c97a91e0b"

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 \
-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"

inherit autotools systemd coverity pkgconfig

inherit coverity
inherit systemd
DEPENDS:append:client = " \
openssl \
libarchive \
rdk-logger \
commonutilities \
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 \
coredump-upload.path \
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"
4 changes: 2 additions & 2 deletions recipes-common/dcmd/dcmd.bb
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ 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 = "fe481721a205019871267cc69564b0befd47cc86"
SRCREV = "86c47550324d871f804446459dbb0a30814d5a2a"
SRC_URI = "${CMF_GITHUB_ROOT}/dcm-agent;${CMF_GITHUB_SRC_URI_SUFFIX}"
PV = "2.0.0"
PV = "2.0.3"
PR = "r0"
PACKAGE_ARCH = "${MIDDLEWARE_ARCH}"

Expand Down
4 changes: 2 additions & 2 deletions recipes-common/rbus/rbus.bb
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ed63516ecab9f06e324238dd2b259549"

SRC_URI = "git://github.com/rdkcentral/rbus.git;branch=release"

SRCREV = "2f82b00b264673a42a9c878a6d10b82a37cbdfab"
SRCREV = "45f5d1e40d2596b50634f89a2037aaaedb1291d0"
SRCREV_FORMAT = "base"

PV = "2.9.0"
PV = "2.11.0"
PR = "r0"

PACKAGE_ARCH = "${MIDDLEWARE_ARCH}"
Expand Down
4 changes: 2 additions & 2 deletions recipes-common/rfc/rfc_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ PACKAGECONFIG ??= "rfctool"
PACKAGECONFIG[rfctool] = "--enable-rfctool=yes"

PV = "1.2.1"
PR = "r0"
PR = "r1"

SRCREV = "5c94e13903e76ded4b0780ca5b3c0e358362b489"
SRCREV = "904a9167f2cbe87dc34d342e32f5ca16b177432c"
SRC_URI = "${CMF_GITHUB_ROOT}/rfc;${CMF_GITHUB_SRC_URI_SUFFIX};name=rfc"
PACKAGE_ARCH = "${MIDDLEWARE_ARCH}"
S = "${WORKDIR}/git"
Expand Down
4 changes: 2 additions & 2 deletions recipes-common/telemetry/telemetry_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SECTION = "console/utils"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e"

SRCREV = "b4171d7741714e1d003abf83c9b4763f7911dbea"
SRCREV = "5660e9c1811f366837dffb529f93d052c2613857"
SRC_URI = "${CMF_GITHUB_ROOT}/telemetry;${CMF_GITHUB_SRC_URI_SUFFIX}"
PACKAGE_ARCH = "${MIDDLEWARE_ARCH}"

Expand All @@ -14,7 +14,7 @@ DEPENDS += "rdk-logger"
RDEPENDS:${PN} += "curl cjson glib-2.0 rbus"


PV = "1.7.4"
PV = "1.8.0"
PR = "r0"

S = "${WORKDIR}/git"
Expand Down
6 changes: 3 additions & 3 deletions recipes-common/utils/commonutilities_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ 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 = "7f22cb07a1ed27cec888d0db143bc13e817f407c"
SRCREV = "aea4d385f7358ea3d6d5952a985577101db52ddc"
SRC_URI = "${CMF_GITHUB_ROOT}/common_utilities;module=.;${CMF_GITHUB_SRC_URI_SUFFIX}"

PACKAGE_ARCH = "${MIDDLEWARE_ARCH}"
Expand All @@ -24,8 +24,8 @@ LDFLAGS:append = " -lsafec -lsecure_wrapper"

CFLAGS:append = " -DRDK_LOGGER"

PV = "1.5.0"
PR = "r0"
PV = "1.5.1"
PR = "r1"
Copy link

Copilot AI Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When PV (package version) is updated, PR (package revision) should typically be reset to "r0". Here PV changed from 1.5.0 to 1.5.1, but PR was incremented to "r1" instead of being reset to "r0". This is inconsistent with the pattern used in other files in this PR (telemetry, rbus, dcmd, crashupload) where PR is reset to "r0" when PV changes.

Suggested change
PR = "r1"
PR = "r0"

Copilot uses AI. Check for mistakes.

S = "${WORKDIR}/git"

Expand Down
Loading