rebase#787
Open
sindhu-krishnan wants to merge 50 commits into
Open
Conversation
* RDKEMW-14594: Update to Dobby v3.17.0 * RDKEMW-14594: Update Dobby to v3.17.0 --------- Co-authored-by: B-Larsen <brandon_larsen2@comcast.com>
RDKEMW-13941: Update Dobby to v3.17.0
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates Yocto recipes to newer upstream revisions, including a reboot-manager update that adds additional systemd units and logging/rotation integration, and a Dobby upgrade to the next release branch.
Changes:
- Bump
reboot-managerto PV 2.1.0 / newSRCREV, add syslog-ng metadata, add logrotate config for an additional log, and install/enable new systemd units and helper scripts. - Bump
Dobbysource branch/revision and PV to 3.17.0.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| recipes-support/reboot-manager/reboot-manager.bb | Version/SRCREV bump plus new syslog-ng + logrotate config and installation of new systemd units/scripts. |
| recipes-containers/dobby/dobby.inc | Updates Dobby branch, PV, and SRCREV to v3.17.0. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| install -m 0644 ${S}/services/update-reboot-info.service ${D}${systemd_unitdir}/system | ||
|
|
||
| if [ "${ENABLE_SYSLOGNG}" = "true" ]; then | ||
| echo "SYSLOG_NG_ENABLED=true" >> ${D}${sysconfdir}/device-middleware.properties |
There was a problem hiding this comment.
In the syslog-ng enabled branch, the recipe appends to ${D}${sysconfdir}/device-middleware.properties without ensuring ${D}${sysconfdir} exists, which can make do_install fail when that directory isn’t created elsewhere. Also, the rest of this repo’s syslog-ng enablement writes SYSLOG_NG_ENABLED into /etc/device.properties (see recipes-core/images/syslog-ng-config.inc), so device-middleware.properties looks inconsistent and may not be consumed by existing components; consider writing to ${D}${sysconfdir}/device.properties instead (or document why a different file is required).
Suggested change
| echo "SYSLOG_NG_ENABLED=true" >> ${D}${sysconfdir}/device-middleware.properties | |
| install -d ${D}${sysconfdir} | |
| echo "SYSLOG_NG_ENABLED=true" >> ${D}${sysconfdir}/device.properties |
…utdown_order RDKEMW-15317: ensure proper shutdown order of ctrlm-main
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
Comments suppressed due to low confidence (1)
recipes-extended/remotedebugger/remotedebugger.bb:12
- The in-file comment "# Release version - 1.3.2" is now out of sync with PV (1.3.3). Please update/remove it to avoid confusion about what version this recipe is tracking.
SRCREV = "7151d208ced521de7ee7dee66cca6aea951e95b3"
SRC_URI = "${CMF_GITHUB_ROOT}/remote_debugger;${CMF_GITHUB_SRC_URI_SUFFIX};name=generic"
SRCREV_FORMAT = "generic"
# Release version - 1.3.2
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+60
to
+63
| if [ "${ENABLE_SYSLOGNG}" = "true" ]; then | ||
| echo "SYSLOG_NG_ENABLED=true" >> ${D}${sysconfdir}/device-middleware.properties | ||
| install -D -m 0644 ${S}/systemd_units/after_syslog-ng.conf ${D}${systemd_unitdir}/system/reboot-reason-logger.service.d/reboot-reason-logger.conf | ||
| fi |
There was a problem hiding this comment.
The do_install append writes to ${D}${sysconfdir}/device-middleware.properties but the recipe never ensures ${D}${sysconfdir} exists, so the echo can fail on a clean install. Also, this repo’s syslog-ng config generator updates ${sysconfdir}/device.properties (not device-middleware.properties), and ENABLE_SYSLOGNG isn’t defined anywhere in this layer—consider keying this logic off DISTRO_FEATURES (syslog-ng) and writing to the same properties file if that’s the intended integration point.
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+59
to
+61
| if [ "${ENABLE_SYSLOGNG}" = "true" ]; then | ||
| echo "SYSLOG_NG_ENABLED=true" >> ${D}${sysconfdir}/device-middleware.properties | ||
| fi |
There was a problem hiding this comment.
The echo ... >> ${D}${sysconfdir}/device-middleware.properties will fail if ${D}${sysconfdir} doesn't exist (this recipe doesn't create it anywhere). Create ${D}${sysconfdir} (e.g., via install -d) before writing to a file under it.
RDKEMW-17480: Back merge MW 8.6.1.0 release branch to develop
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 16 out of 16 changed files in this pull request and generated 8 comments.
Comments suppressed due to low confidence (1)
recipes-support/chrony/files/chrony-conf-update.sh:117
- This uses the same predictable /tmp/rdk_chrony.conf.$$ path for a root-owned rewrite. If that path is pre-created or raced by another user, the script can overwrite an unintended file; use a secure temporary file here as well.
strip_makestep_only() {
local conf_file="$1"
local tmp_conf="/tmp/rdk_chrony.conf.$$"
awk '!/^[[:space:]]*makestep[[:space:]]/' \
|
|
||
| Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). | ||
|
|
||
| #### [1.18.0](https://github.com/rdkcentral/meta-rdk/compare/1.17.1...1.18.0) |
Comment on lines
+217
to
+221
| printf "pool %s%s%s minpoll %s maxpoll %s\n" \ | ||
| "$host" "$maxsources_opt" "$iburst_opt" "$s_minpoll" "$s_maxpoll" >> "$CHRONY_CONF" | ||
| else | ||
| printf "%s %s iburst minpoll %s maxpoll %s\n" "$directive" "$host" "$minPoll" "$maxPoll" >> "$CHRONY_CONF" | ||
| printf "server %s%s minpoll %s maxpoll %s\n" \ | ||
| "$host" "$iburst_opt" "$s_minpoll" "$s_maxpoll" >> "$CHRONY_CONF" |
Comment on lines
+54
to
+58
| settings1=`/lib/rdk/getPartnerProperty.sh ntpHost1Settings` | ||
| settings2=`/lib/rdk/getPartnerProperty.sh ntpHost2Settings` | ||
| settings3=`/lib/rdk/getPartnerProperty.sh ntpHost3Settings` | ||
| settings4=`/lib/rdk/getPartnerProperty.sh ntpHost4Settings` | ||
| settings5=`/lib/rdk/getPartnerProperty.sh ntpHost5Settings` |
| settings4=`/lib/rdk/getPartnerProperty.sh ntpHost4Settings` | ||
| settings5=`/lib/rdk/getPartnerProperty.sh ntpHost5Settings` | ||
|
|
||
| maxstep=`/lib/rdk/getPartnerProperty.sh ntpMakestep` |
Comment on lines
+158
to
+162
| if ! ( [ "$hostName" ] || [ "$hostName2" ] || [ "$hostName3" ] || [ "$hostName4" ] || [ "$hostName5" ] ); then | ||
| if [ -n "$maxstep" ]; then | ||
| ntpLog "No partner NTP URLs found; updating makestep from TR-181 and retaining build-time server config" | ||
| strip_makestep_only "$CHRONY_CONF" | ||
| write_makestep |
Comment on lines
+99
to
+103
| strip_dynamic_entries() { | ||
| local conf_file="$1" | ||
| local tmp_conf="/tmp/rdk_chrony.conf.$$" | ||
|
|
||
| ntpLog "Retrieve NTP Server URL from /lib/rdk/getPartnerProperty.sh..." | ||
| while [ "$attempts" -le "$max_attempts" ]; do | ||
| # Remove all server, pool, and makestep lines so every run starts from a |
Comment on lines
+143
to
+147
| ntpLog "Retrieve NTP Server URL from /lib/rdk/getPartnerProperty.sh..." | ||
| get_ntp_hosts | ||
|
|
||
| if [ "$minPoll" -gt "$maxPoll" ]; then | ||
| ntpLog "ERROR: minPoll ($minPoll) is greater than maxPoll ($maxPoll), resetting both to defaults ($DEFAULT_MINPOLL/$DEFAULT_MAXPOLL)" | ||
| minPoll="$DEFAULT_MINPOLL" | ||
| maxPoll="$DEFAULT_MAXPOLL" | ||
| if ! ( [ "$hostName" ] || [ "$hostName2" ] || [ "$hostName3" ] || [ "$hostName4" ] || [ "$hostName5" ] ); then | ||
| ntpLog "TR-181 returned empty NTP server list; falling back to /opt/secure/RFC/bootstrap.ini..." |
| - Rebased develop [`#753`](https://github.com/rdkcentral/meta-rdk/pull/753) | ||
| - RDKEMW-15567: Backmerge release branch to develop for MW 8.5.3.0 [`#744`](https://github.com/rdkcentral/meta-rdk/pull/744) | ||
| - RDKEMW-14720 : Unify Reboot Manager Codebase with >90% L1/L2 Coverage [`#708`](https://github.com/rdkcentral/meta-rdk/pull/708) | ||
| - RDKEMW-14646: Add meminsight and processmoniter tool [`#636`](https://github.com/rdkcentral/meta-rdk/pull/636) |
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 17 out of 17 changed files in this pull request and generated 3 comments.
Comments suppressed due to low confidence (3)
recipes-support/chrony/files/chrony-conf-update.sh:166
- This path does not actually restore the build-time default servers after a prior run with partner URLs.
strip_dynamic_entriesremoves the defaultserverlines from/etc/rdk_chrony.confwhen partner URLs are present, and this later no-hosts branch exits without repopulating them, so a transient empty TR-181/bootstrap result can leave stale partner servers in place rather than the new defaults described here.
# If no partner URLs are available (even after bootstrap), update only the
# makestep directive if configured via TR-181, keeping the build-time default
# server lines untouched.
if ! ( [ "$hostName" ] || [ "$hostName2" ] || [ "$hostName3" ] || [ "$hostName4" ] || [ "$hostName5" ] ); then
if [ -n "$maxstep" ]; then
ntpLog "No partner NTP URLs found; updating makestep from TR-181 and retaining build-time server config"
strip_makestep_only "$CHRONY_CONF"
write_makestep
else
ntpLog "No partner NTP URLs found; retaining build-time default configuration in $CHRONY_CONF"
fi
exit 0
recipes-support/chrony/files/chrony-conf-update.sh:200
- Missing
ntpHost*Settingsnow disablesiburst, whereas the previous generated entries and the new build-time defaults always includediburst. That makes older/partial partner configurations fall back to slower initial synchronization despite the comment saying missing fields use defaults; consider preserving the previous default unless the setting explicitly disables it.
# Normalise iburst: only literal "true" enables it
[ "$s_iburst" = "true" ] || s_iburst="false"
recipes-support/chrony/files/chrony-conf-update.sh:148
- This now falls back after a single empty
getPartnerProperty.shread. The previous retry loop waited up to five attempts before using bootstrap values; without that grace period, a transiently empty TR-181 response during service startup can lock chronyd into bootstrap/default servers for this run even though partner NTP values become available moments later.
ntpLog "Retrieve NTP Server URL from /lib/rdk/getPartnerProperty.sh..."
get_ntp_hosts
if ! ( [ "$hostName" ] || [ "$hostName2" ] || [ "$hostName3" ] || [ "$hostName4" ] || [ "$hostName5" ] ); then
ntpLog "TR-181 returned empty NTP server list; falling back to /opt/secure/RFC/bootstrap.ini..."
get_ntp_hosts_from_bootstrap
|
|
||
| Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). | ||
|
|
||
| #### [1.18.0](https://github.com/rdkcentral/meta-rdk/compare/1.17.1...1.18.0) |
| - Rebased develop [`#753`](https://github.com/rdkcentral/meta-rdk/pull/753) | ||
| - RDKEMW-15567: Backmerge release branch to develop for MW 8.5.3.0 [`#744`](https://github.com/rdkcentral/meta-rdk/pull/744) | ||
| - RDKEMW-14720 : Unify Reboot Manager Codebase with >90% L1/L2 Coverage [`#708`](https://github.com/rdkcentral/meta-rdk/pull/708) | ||
| - RDKEMW-14646: Add meminsight and processmoniter tool [`#636`](https://github.com/rdkcentral/meta-rdk/pull/636) |
Comment on lines
+54
to
+60
| settings1=`/lib/rdk/getPartnerProperty.sh ntpHost1Settings` | ||
| settings2=`/lib/rdk/getPartnerProperty.sh ntpHost2Settings` | ||
| settings3=`/lib/rdk/getPartnerProperty.sh ntpHost3Settings` | ||
| settings4=`/lib/rdk/getPartnerProperty.sh ntpHost4Settings` | ||
| settings5=`/lib/rdk/getPartnerProperty.sh ntpHost5Settings` | ||
|
|
||
| maxstep=`/lib/rdk/getPartnerProperty.sh ntpMakestep` |
| install -d ${D}${systemd_unitdir}/system | ||
| install -m 0644 ${S}/services/update-reboot-info.path ${D}${systemd_unitdir}/system | ||
| install -m 0644 ${S}/services/update-reboot-info.service ${D}${systemd_unitdir}/system | ||
|
|
Comment on lines
+101
to
+108
| # Registers cleanup_lock via trap so the lock is always released on exit. | ||
| # Exits with code 0 (not an error) if another instance already holds the lock. | ||
| acquire_lock() { | ||
| if ! mkdir "$LOCK_DIR" >/dev/null 2>&1; then | ||
| log "Another upload instance is already running; exiting." | ||
| exit 0 | ||
| fi | ||
| trap cleanup_lock EXIT INT TERM |
Comment on lines
+464
to
+467
| if [ "$UPLOAD_INTERVAL" -eq 0 ]; then | ||
| UPLOAD_INTERVAL=900 | ||
| log "No upload interval configured; defaulting to 900 seconds." | ||
| fi |
| [Service] | ||
| Type=oneshot | ||
| Type=simple | ||
| RemainAfterExit=yes |
Comment on lines
+24
to
+25
| Type=oneshot | ||
| RemainAfterExit=yes |
RDKEMW-18969: Update bluetooth components to latest for gaming change…
RDKEMW-19074 : Meminsight csv files fail to get uploaded at configure
RDKEMW-18230: Create vdevice manifest with middleware compontents
Comment on lines
+59
to
+61
| if [ "${ENABLE_SYSLOGNG}" = "true" ]; then | ||
| echo "SYSLOG_NG_ENABLED=true" >> ${D}${sysconfdir}/device-middleware.properties | ||
| fi |
Comment on lines
+55
to
+56
| install -d ${D}/lib/rdk | ||
| install -m 0755 ${WORKDIR}/upload_MemReports.sh ${D}/lib/rdk/upload_MemReports.sh |
Comment on lines
+91
to
+94
| FILES:${PN} += "${systemd_unitdir}/system/meminsight-upload.service" | ||
| FILES:${PN} += "${systemd_unitdir}/system/meminsight-upload.path" | ||
| FILES:${PN} += "/lib/rdk/upload_MemReports.sh" | ||
|
|
Comment on lines
+24
to
26
| Type=simple | ||
| RemainAfterExit=yes | ||
| EnvironmentFile=-/tmp/meminsight.env |
RDKEMW-19370 : Integrate RFC 1.2.6 Release for RDKE Devices
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.