RDKOSS-696: Fix for git version mismatch issue in ipk mode - #131
RDKOSS-696: Fix for git version mismatch issue in ipk mode#131Shalini1516 wants to merge 1 commit into
Conversation
Reason for change:PV values containing SRCPV are derived from SCM revisions and may not match any prebuilt IPK available in the feed. Allowing IPK consumption for SRCPV packages can cause version mismatches or inconsistent builds. Added an early return in check_deps_ipk_mode() to force ipkmode=False when SRCPV is detected, ensuring these recipes are always built from source. Test Procedure: None Risks: low Signed-off-by: ss127 <Shalini_S@comcast.com>
There was a problem hiding this comment.
Pull request overview
This pull request addresses a version mismatch issue in IPK (package) mode by forcing recipes with SRCPV (SCM revision-based versions) to always build from source rather than consuming prebuilt IPK packages. The fix adds an early return in the check_deps_ipk_mode() function to prevent IPK consumption when SRCPV is detected in the version string.
Changes:
- Added SRCPV detection logic to force source mode and prevent IPK consumption for packages with SCM-derived versions
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| return (ipkmode, version_mismatch, same_arch) | ||
|
|
||
| feed_info_dir = d.getVar("FEED_INFO_DIR") | ||
|
|
There was a problem hiding this comment.
Line contains trailing whitespace. Remove the trailing spaces from this blank line.
|
|
||
| # --- Force source mode when version uses SRCPV --- | ||
|
|
||
| if version and ("SRCPV" in version): |
There was a problem hiding this comment.
The check for SRCPV should use the same format as line 904 in this function. Line 904 checks for "${SRCPV}" (with dollar sign and curly braces), which is the BitBake variable expansion syntax. The current check for just "SRCPV" is inconsistent and could match unintended strings. Change the condition to: if version and ("${SRCPV}" in version)
| if version and ("SRCPV" in version): | |
| if version and ("${SRCPV}" in version): |
| # --- Force source mode when version uses SRCPV --- | ||
|
|
There was a problem hiding this comment.
The comment style with dashes is inconsistent with the rest of the file. Most comments in this file use simple hash marks without decorative formatting. Consider simplifying to: "# Force source mode when version uses SRCPV" without the extra blank line below.
| # --- Force source mode when version uses SRCPV --- | |
| # Force source mode when version uses SRCPV |
| feed_info_dir = d.getVar("FEED_INFO_DIR") | ||
|
|
||
| # --- Force source mode when version uses SRCPV --- | ||
|
|
||
| if version and ("SRCPV" in version): | ||
| return (False, False, False) | ||
|
|
There was a problem hiding this comment.
Minor efficiency issue: feed_info_dir is retrieved before checking for SRCPV, but it's not used if the SRCPV check returns early. Consider moving the feed_info_dir retrieval after the SRCPV check to avoid unnecessary variable retrieval.
| feed_info_dir = d.getVar("FEED_INFO_DIR") | |
| # --- Force source mode when version uses SRCPV --- | |
| if version and ("SRCPV" in version): | |
| return (False, False, False) | |
| # --- Force source mode when version uses SRCPV --- | |
| if version and ("SRCPV" in version): | |
| return (False, False, False) | |
| feed_info_dir = d.getVar("FEED_INFO_DIR") |
RDKOSS-696: Fix for git version mismatch issue in ipk mode
Reason for change: PV values containing SRCPV are derived from SCM revisions and may not match any prebuilt IPK available in the feed. Allowing IPK consumption for SRCPV packages can cause version mismatches or inconsistent builds. Added an early return in check_deps_ipk_mode() to force ipkmode=False when SRCPV is detected, ensuring these recipes are always built from source.
Test Procedure: None
Risks: low