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
4 changes: 2 additions & 2 deletions conf/machine/include/middleware.inc
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ RDK_MW_ARCH ??= "${MACHINE}"
MIDDLEWARE_ARCH = "${RDK_MW_ARCH}-middleware"
PACKAGE_EXTRA_ARCHS:append = " ${MIDDLEWARE_ARCH}"

RELEASE_NUM = "8.4.4.8"
RELEASE_NUM = "hotfix/RDKEMW-16179"
Copy link

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

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

RELEASE_NUM is now set to a hotfix branch-style value (hotfix/RDKEMW-16179) instead of a release version. Because this include is shared configuration, hardcoding a temporary hotfix identifier here makes the layer non-reproducible for other releases and may break downstream consumers that expect a numeric release (and the embedded / changes the feed URL structure). Consider making this overrideable (e.g., RELEASE_NUM ?= ...) and/or introducing a separate variable for hotfix feeds so production builds can keep using the normal release number by default.

Suggested change
RELEASE_NUM = "hotfix/RDKEMW-16179"
RELEASE_NUM ?= "hotfix/RDKEMW-16179"

Copilot uses AI. Check for mistakes.

MW_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
MW_IPK_PATH ?= "middleware-dbg/${RELEASE_NUM}"
Copy link

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

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

Switching the default feed path from middleware-rel/... to middleware-dbg/... will redirect all middleware package feeds to the debug artifact area. Given this layer is named middleware-release (see conf/layer.conf), this looks like it could unintentionally pull non-release artifacts into normal builds. If this is only needed for the hotfix, consider scoping it (e.g., via a separate hotfix variable or a conditional) so the default remains the release feed.

Suggested change
MW_IPK_PATH ?= "middleware-dbg/${RELEASE_NUM}"
MW_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
MW_IPK_DEBUG_PATH ?= "middleware-dbg/${RELEASE_NUM}"

Copilot uses AI. Check for mistakes.
Comment on lines +8 to +10
Copy link

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

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

PR title mentions a "Dobby patch for removing swap limits", but the changes here only repoint middleware/OSS IPK feed URLs to a hotfix/debug location. If the swap-limit removal is expected to happen via the artifacts in that feed, it would help to clarify this in the PR description (or rename the PR) so reviewers can verify the right behavior is being pulled in.

Copilot uses AI. Check for mistakes.
MW_IPK_SERVER_PATH ?= "${RDK_ARTIFACTS_BASE_URL}/${MW_IPK_PATH}/${RDK_MW_ARCH}/ipks/${BUILD_VARIANT}"

IPK_FEED_URIS += " \
Expand Down
2 changes: 1 addition & 1 deletion conf/machine/include/oss_mw.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ MW_EXTENSION = "-middleware"
MW_OSS = "${@get_oss_arch(d)}${MW_EXTENSION}"
PACKAGE_EXTRA_ARCHS:append = " ${MW_OSS} "
OPKG_ARCH_PRIORITY:${MW_OSS} = "205"
MW_OSS_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
MW_OSS_IPK_PATH ?= "middleware-dbg/${RELEASE_NUM}"
Copy link

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

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

This changes the OSS middleware feed path to middleware-dbg/${RELEASE_NUM}. If middleware-dbg is intended only for debugging/hotfix validation, consider keeping OSS feeds on middleware-rel (or gating this change behind the same condition as the hotfix) to avoid pulling debug artifacts into standard images.

Suggested change
MW_OSS_IPK_PATH ?= "middleware-dbg/${RELEASE_NUM}"
MW_OSS_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"

Copilot uses AI. Check for mistakes.
MW_OSS_IPK_SERVER_PATH = "${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/${MW_OSS}/ipks/${BUILD_VARIANT}"
IPK_FEED_URIS += " ${MW_OSS}##${MW_OSS_IPK_SERVER_PATH} "
Loading