Rebase#2346
Conversation
There was a problem hiding this comment.
Pull request overview
This PR performs a version rebase of the sysint component, updating it from version 4.2.0 to 4.2.1. The changes add support for dnsmasq configuration within NetworkManager by creating a new directory and installing a dnsmasq configuration file.
Key Changes:
- Version bump from 4.2.0 to 4.2.1 with corresponding SRCREV update
- Addition of NetworkManager dnsmasq.d directory and dnsmasq-dobby.conf configuration file
- Updated package file list to include the new dnsmasq configuration
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| install -m 0755 ${S}/lib/rdk/NM_Dispatcher.sh ${D}${sysconfdir}/NetworkManager/dispatcher.d | ||
| install -m 0755 ${S}/lib/rdk/NM_preDown.sh ${D}${sysconfdir}/NetworkManager/dispatcher.d/pre-down.d | ||
| install -m 0755 ${S}/etc/10-unmanaged-devices ${D}${sysconfdir}/NetworkManager/conf.d/10-unmanaged-devices.conf | ||
| install -m 0755 ${S}/etc/dnsmasq-dobby.conf ${D}${sysconfdir}/NetworkManager/dnsmasq.d/dnsmasq-dobby.conf |
There was a problem hiding this comment.
Inconsistent indentation detected. This line uses spaces for indentation, while the surrounding lines in this section use tabs. Please change the leading spaces to a tab character to match the indentation style of lines 251, 252, and 253. Additionally, the file mode 0755 (executable) is inappropriate for a configuration file. Configuration files should use mode 0644 (read-only for non-owners) instead.
| FILES:${PN} += " /HrvInitScripts/*" | ||
| FILES:${PN} += "${sysconfdir}/NetworkManager/dispatcher.d/NM_Dispatcher.sh" | ||
| FILES:${PN} += "${sysconfdir}/NetworkManager/dispatcher.d/pre-down.d/NM_preDown.sh" | ||
| FILES:${PN} += "${sysconfdir}/NetworkManager/dnsmasq.d/dnsmasq-dobby.conf" |
There was a problem hiding this comment.
This FILES:${PN} entry may be redundant since line 314 already includes '${sysconfdir}/*', which would encompass all files under ${sysconfdir}/NetworkManager/dnsmasq.d/. However, if this explicit entry is intentional for documentation or clarity purposes to match the pattern used for other NetworkManager files (lines 318-319), this is acceptable.
| FILES:${PN} += "${sysconfdir}/NetworkManager/dnsmasq.d/dnsmasq-dobby.conf" |
| # For NetworkManager | ||
| install -d ${D}${sysconfdir}/NetworkManager | ||
| install -d ${D}${sysconfdir}/NetworkManager/conf.d | ||
| install -d ${D}${sysconfdir}/NetworkManager/dnsmasq.d |
There was a problem hiding this comment.
Inconsistent indentation detected. This line uses spaces for indentation, while the surrounding lines in this section use tabs. Please change the leading spaces to a tab character to match the indentation style of lines 246, 247, 249, and 250.
| install -d ${D}${sysconfdir}/NetworkManager/dnsmasq.d | |
| install -d ${D}${sysconfdir}/NetworkManager/dnsmasq.d |
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| install -m 0755 ${S}/lib/rdk/NM_Dispatcher.sh ${D}${sysconfdir}/NetworkManager/dispatcher.d | ||
| install -m 0755 ${S}/lib/rdk/NM_preDown.sh ${D}${sysconfdir}/NetworkManager/dispatcher.d/pre-down.d | ||
| install -m 0755 ${S}/etc/10-unmanaged-devices ${D}${sysconfdir}/NetworkManager/conf.d/10-unmanaged-devices.conf | ||
| install -m 0755 ${S}/etc/dnsmasq-dobby.conf ${D}${sysconfdir}/NetworkManager/dnsmasq.d/dnsmasq-dobby.conf |
There was a problem hiding this comment.
The indentation uses spaces instead of tabs, which is inconsistent with the surrounding code in this section. The file uses tabs for indentation elsewhere (see lines 246-247, 249-253, 255-256), so this line should use tabs to maintain consistency.
|
All contributors have signed the CLA ✍️ ✅ |
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 10 out of 10 changed files in this pull request and generated 4 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| DEPENDS:append = "${@bb.utils.contains('BLE_ENABLED', 'true', ' bluetooth-mgr', '', d)}" | ||
| LDFLAGS:append = "${@bb.utils.contains('BLE_ENABLED', 'true', ' -lBTMgr', '', d)}" | ||
|
|
||
| EXTRA_OECMAKE:append = "${@bb.utils.contains('BLE_ENABLED', 'true', ' -DBLE_ENABLED=ON', ' -DBLE_ENABLED=OFF', d)}" |
There was a problem hiding this comment.
The introduction of the BLE_ENABLED variable provides better control over BLE support independently from general DISTRO_FEATURES bluetooth. However, line 106 now adds '-DBLE_ENABLED=OFF' when BLE_ENABLED is not 'true', which is a behavior change. Previously, when bluetooth was not in DISTRO_FEATURES, the -DBLE_ENABLED flag was simply omitted. Ensure that explicitly setting -DBLE_ENABLED=OFF doesn't cause any build or runtime issues if the CMake build system previously assumed the absence of the flag meant OFF.
| EXTRA_OECMAKE:append = "${@bb.utils.contains('BLE_ENABLED', 'true', ' -DBLE_ENABLED=ON', ' -DBLE_ENABLED=OFF', d)}" | |
| EXTRA_OECMAKE:append = "${@bb.utils.contains('BLE_ENABLED', 'true', ' -DBLE_ENABLED=ON', '', d)}" |
| if [ "${MACHINE}" = "es1-rtk-xumo" ]; then | ||
| if [ -f ${D}${base_libdir}/rdk/startStunnel.sh ]; then | ||
| bbnote "Disabling SHORTS" | ||
| sed -i 's/`tr181 Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.SHORTS.Enable 2>&1 > \/dev\/null`/\"false\"/' ${D}${base_libdir}/rdk/startStunnel.sh |
There was a problem hiding this comment.
The bbnote message "Disabling SHORTS" will be logged during the build, but the actual sed command result is not checked for success or failure. Consider adding error checking after the sed command to verify that the modification was successful, for example: 'if grep -q '"false"' ${D}${base_libdir}/rdk/startStunnel.sh; then bbnote "Successfully disabled SHORTS"; else bbwarn "Failed to disable SHORTS"; fi'
| sed -i 's/`tr181 Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.SHORTS.Enable 2>&1 > \/dev\/null`/\"false\"/' ${D}${base_libdir}/rdk/startStunnel.sh | |
| sed -i 's/`tr181 Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.SHORTS.Enable 2>&1 > \/dev\/null`/\"false\"/' ${D}${base_libdir}/rdk/startStunnel.sh | |
| if grep -q '"false"' ${D}${base_libdir}/rdk/startStunnel.sh; then | |
| bbnote "Successfully disabled SHORTS" | |
| else | |
| bbwarn "Failed to disable SHORTS in ${D}${base_libdir}/rdk/startStunnel.sh" | |
| fi |
| if [ "${MACHINE}" = "es1-rtk-xumo" ]; then | ||
| if [ -f ${D}${base_libdir}/rdk/startStunnel.sh ]; then | ||
| bbnote "Disabling SHORTS" | ||
| sed -i 's/`tr181 Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.SHORTS.Enable 2>&1 > \/dev\/null`/\"false\"/' ${D}${base_libdir}/rdk/startStunnel.sh |
There was a problem hiding this comment.
The sed command uses single quotes around the replacement text which contains a backtick-enclosed command substitution. The escaped backticks within the single-quoted string may not work as intended. Consider using double quotes with proper escaping or testing this sed command to ensure it correctly replaces the tr181 command with the literal string "false".
| sed -i 's/`tr181 Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.SHORTS.Enable 2>&1 > \/dev\/null`/\"false\"/' ${D}${base_libdir}/rdk/startStunnel.sh | |
| sed -i 's/`tr181 Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.SHORTS.Enable 2>&1 > \/dev\/null`/false/' ${D}${base_libdir}/rdk/startStunnel.sh |
| ${@bb.utils.contains('DISTRO_FEATURES', 'DAC-sec', 'ocicontainersec', '', d)} \ | ||
| ${@bb.utils.contains('DISTRO_FEATURES', 'rdkshell', 'rdkshell', '', d)} \ | ||
| ${@bb.utils.contains('DISTRO_FEATURES', 'rdkshell enable_rialto', 'rdkshellrialto', '', d)} \ |
There was a problem hiding this comment.
The fbsettings plugin configuration was removed from entservices-infra.bb (line 76 in the old code), and the corresponding service file wpeframework-fbsettings.service was replaced with wpeframework-appgatewaycommon.service in thunderstartupservices.bb. However, the new entservices-appgateway.bb file includes appgateway, appnotifications, and appgatewaycommon plugins, but not fbsettings. Verify that fbsettings functionality is either deprecated, merged into appgatewaycommon, or intentionally removed, and that all dependent services are correctly updated.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 20 out of 20 changed files in this pull request and generated 4 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| appmanager \ | ||
| texttospeechmonitor \ | ||
| preinstallmanager \ | ||
| javascriptcore \ |
There was a problem hiding this comment.
There is trailing whitespace at the end of this line. Trailing whitespace should be removed to maintain clean code formatting.
| texttospeechmonitor \ | ||
| preinstallmanager \ | ||
| javascriptcore \ | ||
| texttospeechmonitor \ |
There was a problem hiding this comment.
There is trailing whitespace at the end of this line. Trailing whitespace should be removed to maintain clean code formatting.
| ${@bb.utils.contains('DISTRO_FEATURES', 'opencdm', 'opencdmi', '', d)} \ | ||
| ${@bb.utils.contains('DISTRO_FEATURES', 'rialto_in_dac', 'rialtodac', '', d)} \ | ||
| downloadmanager \ | ||
| ${@bb.utils.contains('DISTRO_FEATURES', 'rialto_in_dac', 'rialtodac', '', d)} \ |
There was a problem hiding this comment.
There is trailing whitespace at the end of this line. Trailing whitespace should be removed to maintain clean code formatting.
| usersettings \ | ||
| ocicontainer \ | ||
| runtimemanager \ | ||
| ocicontainer \ |
There was a problem hiding this comment.
There is trailing whitespace at the end of this line. Trailing whitespace should be removed to maintain clean code formatting.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 23 out of 23 changed files in this pull request and generated 4 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| usersettings \ | ||
| ocicontainer \ | ||
| runtimemanager \ | ||
| ocicontainer \ |
There was a problem hiding this comment.
Line 62 has trailing whitespace after the backslash. This should be removed as trailing whitespace after line continuation characters can cause parsing issues in BitBake recipes.
| appmanager \ | ||
| texttospeechmonitor \ | ||
| preinstallmanager \ | ||
| javascriptcore \ |
There was a problem hiding this comment.
Line 65 has trailing whitespace after the backslash. This should be removed as trailing whitespace after line continuation characters can cause parsing issues in BitBake recipes.
| texttospeechmonitor \ | ||
| preinstallmanager \ | ||
| javascriptcore \ | ||
| texttospeechmonitor \ |
There was a problem hiding this comment.
Line 66 has trailing whitespace after the backslash. This should be removed as trailing whitespace after line continuation characters can cause parsing issues in BitBake recipes.
| ${@bb.utils.contains('DISTRO_FEATURES', 'opencdm', 'opencdmi', '', d)} \ | ||
| ${@bb.utils.contains('DISTRO_FEATURES', 'rialto_in_dac', 'rialtodac', '', d)} \ | ||
| downloadmanager \ | ||
| ${@bb.utils.contains('DISTRO_FEATURES', 'rialto_in_dac', 'rialtodac', '', d)} \ |
There was a problem hiding this comment.
Line 73 has trailing whitespace after the backslash. This should be removed as trailing whitespace after line continuation characters can cause parsing issues in BitBake recipes.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 39 out of 39 changed files in this pull request and generated 6 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| # BLE support BEGIN | ||
|
|
||
| RDEPENDS:${PN}:append = "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', ' bluez5', '', d)}" | ||
| BLE_ENABLED ??= "true" |
There was a problem hiding this comment.
The default value for BLE_ENABLED is set to 'true', but this changes the previous behavior where BLE was only enabled when 'bluetooth' was in DISTRO_FEATURES. This unconditional default could enable BLE on systems that don't have bluetooth in DISTRO_FEATURES, which may not be the intended behavior. Consider setting the default based on DISTRO_FEATURES to maintain backward compatibility: BLE_ENABLED ??= \"${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'true', 'false', d)}\"
| BLE_ENABLED ??= "true" | |
| BLE_ENABLED ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'true', 'false', d)}" |
|
|
||
| S = "${WORKDIR}/git" | ||
| inherit cmake pkgconfig | ||
|
|
There was a problem hiding this comment.
Setting SRCREV to ${PV} assumes that git tags exactly match the PV value. This is fragile and will break if the tag format differs (e.g., 'v3.18.2' vs '3.18.2'). Consider using an explicit SRCREV hash or adding a comment documenting the tag naming convention.
| # Upstream git tags match PV exactly (e.g. "3.18.2", not "v3.18.2"); keep SRCREV tied to PV. |
| @@ -0,0 +1,59 @@ | |||
| SUMMARY = "ENTServices AVOutput plugin" | |||
| LICENSE = "CLOSED" | |||
There was a problem hiding this comment.
The LICENSE is set to 'CLOSED', but there's no LIC_FILES_CHKSUM for this closed license. For closed-source software, you should typically still provide a LIC_FILES_CHKSUM or document why it's omitted. This is inconsistent with the other entservices recipes which use Apache-2.0.
| LICENSE = "CLOSED" | |
| LICENSE = "CLOSED" | |
| # Closed-source component; no distributable license file is present in the source tree. | |
| # LIC_FILES_CHKSUM is intentionally left empty to document this exception. | |
| LIC_FILES_CHKSUM = "" |
| DEPENDS:append = "${@bb.utils.contains('BLE_ENABLED', 'true', ' bluetooth-mgr', '', d)}" | ||
| LDFLAGS:append = "${@bb.utils.contains('BLE_ENABLED', 'true', ' -lBTMgr', '', d)}" | ||
|
|
||
| EXTRA_OECMAKE:append = "${@bb.utils.contains('BLE_ENABLED', 'true', ' -DBLE_ENABLED=ON', ' -DBLE_ENABLED=OFF', d)}" |
There was a problem hiding this comment.
The CMake flag includes both ON and OFF cases explicitly. However, the OFF case is redundant - if the flag isn't passed, CMake will default to OFF. Consider simplifying to only pass the flag when enabled: EXTRA_OECMAKE:append = \"${@bb.utils.contains('BLE_ENABLED', 'true', ' -DBLE_ENABLED=ON', '', d)}\"
| EXTRA_OECMAKE:append = "${@bb.utils.contains('BLE_ENABLED', 'true', ' -DBLE_ENABLED=ON', ' -DBLE_ENABLED=OFF', d)}" | |
| EXTRA_OECMAKE:append = "${@bb.utils.contains('BLE_ENABLED', 'true', ' -DBLE_ENABLED=ON', '', d)}" |
|
|
||
| AUDIO_CONTROL ?= "false" | ||
| EXTRA_OECMAKE:append = "${@bb.utils.contains('AUDIO_CONTROL', 'true', ' -DFACTORY_AUDIO_CONTROL=ON', '', d)}" | ||
| EXTRA_OECMAKE:append = "${@bb.utils.contains('BUILD_FACTORY_TEST', 'true', ' -DBUILD_FACTORY_TEST=ON', ' -DBUILD_FACTORY_TEST=OFF', d)}" |
There was a problem hiding this comment.
Similar to BLE_ENABLED, explicitly passing OFF is redundant. Consider simplifying to only pass ON when needed: EXTRA_OECMAKE:append = \"${@bb.utils.contains('BUILD_FACTORY_TEST', 'true', ' -DBUILD_FACTORY_TEST=ON', '', d)}\"
| EXTRA_OECMAKE:append = "${@bb.utils.contains('BUILD_FACTORY_TEST', 'true', ' -DBUILD_FACTORY_TEST=ON', ' -DBUILD_FACTORY_TEST=OFF', d)}" | |
| EXTRA_OECMAKE:append = "${@bb.utils.contains('BUILD_FACTORY_TEST', 'true', ' -DBUILD_FACTORY_TEST=ON', '', d)}" |
| if [ "${MACHINE}" = "es1-rtk-xumo" ]; then | ||
| if [ -f ${D}${base_libdir}/rdk/startStunnel.sh ]; then | ||
| bbnote "Disabling SHORTS" | ||
| sed -i 's/`tr181 Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.SHORTS.Enable 2>&1 > \/dev\/null`/\"false\"/' ${D}${base_libdir}/rdk/startStunnel.sh |
There was a problem hiding this comment.
The sed command uses complex escaping and backtick substitution patterns. This is fragile and hard to maintain. Consider using a simpler approach or adding a comment explaining what SHORTS feature is being disabled and why it's necessary for es1-rtk-xumo specifically.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 40 out of 40 changed files in this pull request and generated 4 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| inherit cmake pkgconfig | ||
|
|
||
| SRCREV = "c0587d76355e53401ac8370c88b5b7c3415fbc4c" | ||
| SRCREV = "${PV}" |
There was a problem hiding this comment.
Using PV as SRCREV (line 11) assumes that the git repository uses version tags (e.g., '3.18.2') as commit references. This pattern can be fragile if the repository uses different tagging conventions or if tags are moved/deleted. Consider using an explicit git commit hash for SRCREV to ensure build reproducibility.
| SRCREV = "${PV}" | |
| SRCREV = "0123456789abcdef0123456789abcdef01234567" |
| ocicontainer \ | ||
| messagecontrol \ | ||
| rdknativescript \ | ||
| javascriptcore \ | ||
| packagemanager \ | ||
| lifecyclemanager \ | ||
| storagemanager \ | ||
| appmanager \ | ||
| texttospeechmonitor \ | ||
| preinstallmanager \ | ||
| javascriptcore \ | ||
| texttospeechmonitor \ | ||
| migration \ |
There was a problem hiding this comment.
Lines 62, 65, and 66 have trailing whitespace after the backslash continuation characters. While this doesn't break functionality in BitBake, it's inconsistent with the rest of the PACKAGECONFIG list and violates best practices for clean code formatting.
| if [ "${MACHINE}" = "es1-rtk-xumo" ]; then | ||
| if [ -f ${D}${base_libdir}/rdk/startStunnel.sh ]; then | ||
| bbnote "Disabling SHORTS" | ||
| sed -i 's/`tr181 Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.SHORTS.Enable 2>&1 > \/dev\/null`/\"false\"/' ${D}${base_libdir}/rdk/startStunnel.sh | ||
| fi | ||
| fi |
There was a problem hiding this comment.
The sed command on line 62 uses a complex regex to replace a backtick-enclosed command with a hardcoded string. This is fragile and could break if the source file format changes. Consider documenting why SHORTS needs to be disabled for es1-rtk-xumo, and whether this should be a configurable feature rather than a machine-specific hardcode.
| @@ -0,0 +1,59 @@ | |||
| SUMMARY = "ENTServices AVOutput plugin" | |||
| LICENSE = "CLOSED" | |||
There was a problem hiding this comment.
The new entservices-avoutput.bb recipe uses 'CLOSED' license (line 2), which indicates proprietary/closed-source code. However, it depends on multiple open-source components. Ensure this is intentional and complies with your organization's licensing policies, especially since other entservices recipes use 'Apache-2.0'.
| LICENSE = "CLOSED" | |
| LICENSE = "Apache-2.0" |
- Revert rialto version - Revert rialto-gstreamer version
RDKEMW-17821 : Sceneset changes to include new preinstall changes.
RDKEMW-16160: Handle widevine14 for xi6
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 208 out of 208 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
RDK-61007: Updated new service file for networkconnectionstats plugin
…1.1.14 RDKEMW-17520: Control Manager component release v1.1.14
Reason for Change: NetworkManager release v2.2.0 with following fixes - Added new method to connection to specific known SSID - Extended WiFiConnect method to support BSSID and specific Band - Defaulted to use RDKLogger and avoided redundant logging for few methods - Added Minimal Ethernet Connection Profile for migration handling - General improvements on RPC methods & crash resilience Test Procedure: NA Priority:P1 Risks: Medium Signed-off-by: Gururaaja ESR<Gururaja_ErodeSriranganRamlingham@comcast.com>
…ideo into topic/RDKEMW-10793
Change-Id: I01fce7da85f78bf1597f30f63f527c59ea3fa1e8
RDKEMW-17603: Subtec release 1.8.0
RDKEMW-10793: Networkmanager plugin release v2.2.0
RDKEMW-17675: App Managers 0.4.0.1 Release Integration
| + # If autostart was not found, set default startmode to Deactivated | ||
| + if not autostart_found: | ||
| + result.add('startmode', 'Deactivated') | ||
| if isEmpty: |
RDKEMW-17411 : [develop] Rialto version upgradation v0.19.1
No description provided.