Skip to content

RDKEVD-4868 : Westeros Upgrade to 2.0.0 #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sajnanazeer wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

RDKEVD-4868 : Westeros Upgrade to 2.0.0 #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b293775
:RDKEMW-6929 : Westeros refactoring
sajnanazeer Sep 29, 2025
1c1b5c1
Update Westeros to 2.0.0
Sajnakn Jan 30, 2026
3dadeda
Update westeros to 2.0.0
Sajnakn Feb 3, 2026
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
48 changes: 48 additions & 0 deletions recipes-graphics/essosrmgr/essosrmgr.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
LICENSE = "Apache-2.0"
Copy link

Copilot AI Jan 23, 2026

Choose a reason for hiding this comment

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

This new recipe is missing a SUMMARY field. While not strictly required, a SUMMARY is a standard field that provides a brief description of the package. All other recipe files in this PR have SUMMARY fields (westeros.bb, westeros-simpleshell.bb, westeros-simplebuffer.bb, essos.bb), so this should be added for consistency.

Copilot uses AI. Check for mistakes.
Copy link
Contributor

@maniselva006c maniselva006c Feb 2, 2026

Choose a reason for hiding this comment

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

Please move this recipe to vendor layer

LIC_FILES_CHKSUM = "file://COPYING;md5=1d13a8bfca16dbdad01fe5f270451aaa \
file://LICENSE;md5=1d13a8bfca16dbdad01fe5f270451aaa"
Copy link

@mhughesacn mhughesacn Jan 23, 2026

Choose a reason for hiding this comment

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

COPYING is a soft link to LICENSE so the second checksum isn't needed.


SRC_URI = "${CMF_GIT_ROOT}/rdk/components/generic/ermgr;protocol=${CMF_GIT_PROTOCOL};branch=rdk-next;nobranch=1;name=essosrmgr"

Copy link

Copilot AI Jan 23, 2026

Choose a reason for hiding this comment

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

The recipe is missing SRCREV and PV (package version) variables. Without SRCREV, the build system won't know which specific commit to checkout from the git repository, making builds non-reproducible. Consider adding these variables to pin to a specific version.

Suggested change
PV = "1.0+git${SRCPV}"
SRCREV = "abcdef1234567890abcdef1234567890abcdef12"

Copilot uses AI. Check for mistakes.
S = "${WORKDIR}/git"

PV = "1.99+gitr${SRCPV}"
SRCREV_westeros = "c539ce0a7044b4396c36cdb609067c5d3b1761bf"
Copy link

Copilot AI Feb 3, 2026

Choose a reason for hiding this comment

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

The SRCREV variable is named SRCREV_westeros but this recipe is for essosrmgr from the ermgr repository. This naming is inconsistent and potentially confusing. It should be named SRCREV_essosrmgr or just SRCREV to match the actual component and repository being fetched.

Suggested change
SRCREV_westeros = "c539ce0a7044b4396c36cdb609067c5d3b1761bf"
SRCREV_essosrmgr = "c539ce0a7044b4396c36cdb609067c5d3b1761bf"

Copilot uses AI. Check for mistakes.
Copy link

Copilot AI Feb 3, 2026

Choose a reason for hiding this comment

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

The SRC_URI uses ;name=essosrmgr but the SRCREV variable is named SRCREV_westeros. These names should match - either both should use 'essosrmgr' or both should use 'westeros'. The mismatch could cause BitBake to not properly associate the SRCREV with the source URI.

Suggested change
SRCREV_westeros = "c539ce0a7044b4396c36cdb609067c5d3b1761bf"
SRCREV_essosrmgr = "c539ce0a7044b4396c36cdb609067c5d3b1761bf"

Copilot uses AI. Check for mistakes.


DEPENDS = "wayland virtual/egl libxkbcommon westeros"

REQUIRED_DISTRO_FEATURES += "wayland"

inherit autotools pkgconfig features_check

Copy link

Copilot AI Feb 3, 2026

Choose a reason for hiding this comment

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

The PACKAGECONFIG flags appear to have inverted logic. Typically, the first argument enables a feature and the second disables it. Here, --disable-essoswesterosfree is used when the feature is enabled, and --enable-essoswesterosfree is used when disabled. This seems counterintuitive. Please verify that these configure flags are correct and match the intended behavior. If the flags have unusual semantics (e.g., "free" means disabled), consider adding a comment explaining this.

Suggested change
# Note: the "*free" configure options mean "free from Westeros/ResMgr".
# When the PACKAGECONFIG feature is enabled, we pass --disable-essoswesterosfree /
# --disable-essosresmgrfree to turn OFF the "*free" mode and thus enable integration.
# When the feature is disabled, we pass --enable-essoswesterosfree /
# --enable-essosresmgrfree to build a variant that is free of Westeros/ResMgr.

Copilot uses AI. Check for mistakes.
PACKAGECONFIG ??= "westeros resmgr"
PACKAGECONFIG[westeros] = "--disable-essoswesterosfree,--enable-essoswesterosfree,westeros-simpleshell virtual/westeros-soc"
PACKAGECONFIG[resmgr] = "--disable-essosresmgrfree,--enable-essosresmgrfree"

# Specify any options you want to pass to the configure script using EXTRA_OECONF:
EXTRA_OECONF = ""

RPROVIDES:${PN} = "ermgr"
RREPLACES:${PN} = "ermgr"
RCONFLICTS:${PN} = "ermgr"

acpaths = "-I cfg"

do_install:append() {

install -d ${D}${systemd_unitdir}/system
install -m 0644 ${S}/conf/ermgr.service ${D}${systemd_unitdir}/system

if ${@bb.utils.contains('DISTRO_FEATURES', 'use_westeros_essrmgr_uds', 'true', 'false', d)}; then
sed -i "/^Before=/ s/ audioserver.service tvserver.service$//" ${D}${systemd_unitdir}/system/ermgr.service
sed -i "/^WantedBy=/ s/ui-init.target$/wpeframework.service/" ${D}${systemd_unitdir}/system/ermgr.service
fi
# appsservice expects ERM UDS in /tmp folder
sed -i "/^Environment=\"XDG_RUNTIME_DIR/ s/run\"$/tmp\"/" ${D}${systemd_unitdir}/system/ermgr.service

}

SYSTEMD_SERVICE:${PN} += "ermgr.service"
Copy link

Copilot AI Feb 3, 2026

Choose a reason for hiding this comment

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

The recipe uses SYSTEMD_SERVICE:${PN} and systemd_unitdir variables but does not inherit systemd or systemd_service classes. Without inheriting the systemd class, the systemd service file will not be properly installed or enabled. Add "systemd" to the inherit line (line 17) to ensure proper systemd integration.

Copilot uses AI. Check for mistakes.
FILES:${PN} += "${systemd_unitdir}/system/*.service"

17 changes: 12 additions & 5 deletions recipes-graphics/westeros/essos.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
include westeros.inc

SUMMARY = "Essos is a library making it simple to create applications that run either as native EGL or Wayland clients."
LICENSE = "Apache-2.0"
LICENSE_LOCATION = "${S}/../LICENSE"
LICENSE_LOCATION = "${S}/LICENSE"
LIC_FILES_CHKSUM = "file://${LICENSE_LOCATION};md5=8fb65319802b0c15fc9e0835350ffa02"

SRC_URI = "git://github.com/rdkcentral/essos;protocol=https;nobranch=1"

Copy link

Copilot AI Jan 23, 2026

Choose a reason for hiding this comment

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

The recipe is missing SRCREV and PV (package version) variables. Without SRCREV, the build system won't know which specific commit to checkout from the git repository, making builds non-reproducible. Consider adding these variables to pin to a specific version.

Suggested change
# Pin to a specific git revision for reproducible builds
SRCREV = "abcdef1234567890abcdef1234567890abcdef12"
PV = "1.0+git${SRCPV}"

Copilot uses AI. Check for mistakes.
PV = "1.0+gitr${SRCPV}"
# Tip of westeros master as of Jan 12 2026 Westeros 2.0.0
Copy link

Copilot AI Feb 3, 2026

Choose a reason for hiding this comment

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

The comment says "Tip of westeros master as of Jan 12 2026 Westeros 2.0.0" but this is in the essos.bb file with an essos repository. The comment should reference "essos" instead of "westeros" to avoid confusion. Additionally, verify the date is accurate (see similar comment in other files).

Suggested change
# Tip of westeros master as of Jan 12 2026 Westeros 2.0.0
# Tip of essos master as of Jan 12 2026 Essos 2.0.0

Copilot uses AI. Check for mistakes.
SRCREV_westeros = "f1c893419a8f2387d995ef56bbad7072b4d80337"
Comment on lines +9 to +10
Copy link

Copilot AI Feb 3, 2026

Choose a reason for hiding this comment

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

The SRCREV variable is named SRCREV_westeros but this recipe is for essos from the essos repository. This naming is inconsistent and potentially confusing. It should be named SRCREV_essos or just SRCREV to match the repository being fetched.

Suggested change
# Tip of westeros master as of Jan 12 2026 Westeros 2.0.0
SRCREV_westeros = "f1c893419a8f2387d995ef56bbad7072b4d80337"
# Tip of essos master as of Jan 12 2026
SRCREV = "f1c893419a8f2387d995ef56bbad7072b4d80337"

Copilot uses AI. Check for mistakes.

S = "${WORKDIR}/git"

S = "${WORKDIR}/git/essos"
DEPENDS = "wayland virtual/egl libxkbcommon essosrmgr westeros"
Copy link

Copilot AI Feb 3, 2026

Choose a reason for hiding this comment

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

The DEPENDS line adds essosrmgr and westeros as dependencies. However, this creates a circular dependency: essos depends on essosrmgr, and essosrmgr (lines 13, 20 in essosrmgr.bb) depends on westeros and westeros-simpleshell. Additionally, westeros.bb should be built before essos. Please verify this dependency order is correct and won't cause build issues. If essosrmgr is not strictly required for the essos build, consider making it a runtime dependency (RDEPENDS) instead.

Copilot uses AI. Check for mistakes.

Comment on lines +14 to 15
Copy link

Copilot AI Jan 23, 2026

Choose a reason for hiding this comment

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

Potential circular dependency issue: essos depends on both essosrmgr and westeros (line 10), while essosrmgr depends on westeros (line 11 of essosrmgr.bb). Additionally, westeros depends on westeros-simpleshell and westeros-simplebuffer. This dependency chain should be reviewed to ensure there are no actual circular dependencies that would prevent builds from completing. Consider whether essosrmgr truly needs to be a direct dependency here or if it should be a runtime dependency instead.

Suggested change
DEPENDS = "wayland virtual/egl libxkbcommon essosrmgr westeros"
DEPENDS = "wayland virtual/egl libxkbcommon westeros"
RDEPENDS:${PN} += "essosrmgr"

Copilot uses AI. Check for mistakes.
DEPENDS = "wayland virtual/egl libxkbcommon"
DEBIAN_NOAUTONAME:${PN} = "1"

REQUIRED_DISTRO_FEATURES += "wayland"

Expand Down
11 changes: 8 additions & 3 deletions recipes-graphics/westeros/westeros-simplebuffer.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
include westeros.inc

SUMMARY = "This receipe compiles the westeros compositor simple-buffer component"
SUMMARY = "This recipe compiles the westeros compositor simple-buffer component"

LICENSE = "Apache-2.0"

S = "${WORKDIR}/git/simplebuffer"

Copy link

Copilot AI Jan 23, 2026

Choose a reason for hiding this comment

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

The recipe is missing SRCREV and PV (package version) variables that were previously defined in westeros.inc. Without SRCREV, the build system won't know which specific commit to checkout from the git repository, making builds non-reproducible. Consider adding these variables to pin to a specific version.

Suggested change
PV = "1.0+git${SRCPV}"
SRCREV = "0123456789abcdef0123456789abcdef01234567"

Copilot uses AI. Check for mistakes.
SRC_URI = "git://github.com/rdkcentral/westeros;protocol=https;nobranch=1"

PV = "1.0+gitr${SRCPV}"
# Tip of westeros master as of Jan 12 2026 Westeros 2.0.0
SRCREV_westeros = "0228f9e85fd0c44b85cf4af532c627dbf3d9b518"
Comment on lines +7 to +11
Copy link

Copilot AI Feb 3, 2026

Choose a reason for hiding this comment

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

The SRC_URI does not specify a ;name= parameter, but SRCREV_westeros is used with a named suffix. For proper BitBake operation, when using a named SRCREV like SRCREV_westeros, the SRC_URI should include ;name=westeros to associate them. Alternatively, use just SRCREV without a suffix if only one source is being fetched. This mismatch could cause BitBake to not properly use the specified SRCREV.

Copilot uses AI. Check for mistakes.

LICENSE_LOCATION = "${S}/../LICENSE"
LIC_FILES_CHKSUM = "file://${LICENSE_LOCATION};md5=8fb65319802b0c15fc9e0835350ffa02"

DEPENDS = "wayland glib-2.0 wayland-native"

Expand Down
11 changes: 8 additions & 3 deletions recipes-graphics/westeros/westeros-simpleshell.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
include westeros.inc

SUMMARY = "This receipe compiles the westeros compositor simple-shell component"
SUMMARY = "This recipe compiles the westeros compositor simple-shell component"

LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${LICENSE_LOCATION};md5=8fb65319802b0c15fc9e0835350ffa02"

S = "${WORKDIR}/git/simpleshell"

Copy link

Copilot AI Jan 23, 2026

Choose a reason for hiding this comment

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

The recipe is missing SRCREV and PV (package version) variables that were previously defined in westeros.inc. Without SRCREV, the build system won't know which specific commit to checkout from the git repository, making builds non-reproducible. Consider adding these variables to pin to a specific version.

Suggested change
SRCREV = "1234567890abcdef1234567890abcdef12345678"
PV = "1.0+git${SRCPV}"

Copilot uses AI. Check for mistakes.
SRC_URI = "git://github.com/rdkcentral/westeros;protocol=https;nobranch=1"

PV = "1.0+gitr${SRCPV}"
# Tip of westeros master as of Jan 12 2026 Westeros 2.0.0
SRCREV_westeros = "0228f9e85fd0c44b85cf4af532c627dbf3d9b518"
Copy link

Copilot AI Feb 3, 2026

Choose a reason for hiding this comment

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

The SRC_URI does not specify a ;name= parameter, but SRCREV_westeros is used with a named suffix. For proper BitBake operation, when using a named SRCREV like SRCREV_westeros, the SRC_URI should include ;name=westeros to associate them. Alternatively, use just SRCREV without a suffix if only one source is being fetched. This mismatch could cause BitBake to not properly use the specified SRCREV.

Suggested change
SRCREV_westeros = "0228f9e85fd0c44b85cf4af532c627dbf3d9b518"
SRCREV = "0228f9e85fd0c44b85cf4af532c627dbf3d9b518"

Copilot uses AI. Check for mistakes.

DEPENDS = "wayland glib-2.0 wayland-native"

LICENSE_LOCATION = "${S}/../LICENSE"
Comment on lines 4 to 16
Copy link

Copilot AI Jan 23, 2026

Choose a reason for hiding this comment

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

LICENSE_LOCATION is defined on line 12 but used on line 4 in LIC_FILES_CHKSUM. While BitBake may handle this due to lazy evaluation, it's better practice to define variables before they are referenced for clarity and to match the pattern in other files like westeros-simplebuffer.bb.

Copilot uses AI. Check for mistakes.
Expand Down
16 changes: 14 additions & 2 deletions recipes-graphics/westeros/westeros.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
include westeros.inc
Copy link
Contributor

@maniselva006c maniselva006c Feb 2, 2026

Choose a reason for hiding this comment

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

The westeros recipe is used for both community and comcast platforms. Please update the URL , version , sha in westeros.inc file


SUMMARY = "This receipe compiles the westeros compositor component"
Copy link

Copilot AI Jan 23, 2026

Choose a reason for hiding this comment

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

Spelling error: "receipe" should be "recipe".

Suggested change
SUMMARY = "This receipe compiles the westeros compositor component"
SUMMARY = "This recipe compiles the westeros compositor component"

Copilot uses AI. Check for mistakes.

LICENSE = "Apache-2.0"
LICENSE_LOCATION = "${S}/LICENSE"
LIC_FILES_CHKSUM = "file://${LICENSE_LOCATION};md5=8fb65319802b0c15fc9e0835350ffa02"

SRC_URI = "git://github.com/rdkcentral/westeros;protocol=https;nobranch=1"
Copy link

Copilot AI Jan 23, 2026

Choose a reason for hiding this comment

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

The recipe is missing SRCREV and PV (package version) variables that were previously defined in westeros.inc. Without SRCREV, the build system won't know which specific commit to checkout from the git repository, making builds non-reproducible. Consider adding these variables to pin to a specific version.

Suggested change
SRC_URI = "git://github.com/rdkcentral/westeros;protocol=https;nobranch=1"
SRC_URI = "git://github.com/rdkcentral/westeros;protocol=https;nobranch=1"
SRCREV = "${AUTOREV}"
PV = "1.0+git${SRCPV}"

Copilot uses AI. Check for mistakes.

PV = "1.0+gitr${SRCPV}"
# Tip of westeros master as of Jan 12 2026 Westeros 2.0.0
SRCREV_westeros = "0228f9e85fd0c44b85cf4af532c627dbf3d9b518"
Copy link

Copilot AI Feb 3, 2026

Choose a reason for hiding this comment

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

The SRC_URI does not specify a ;name= parameter, but SRCREV_westeros is used with a named suffix. For proper BitBake operation, when using a named SRCREV like SRCREV_westeros, the SRC_URI should include ;name=westeros to associate them. Alternatively, use just SRCREV without a suffix if only one source is being fetched. This mismatch could cause BitBake to not properly use the specified SRCREV.

Suggested change
SRCREV_westeros = "0228f9e85fd0c44b85cf4af532c627dbf3d9b518"
SRCREV = "0228f9e85fd0c44b85cf4af532c627dbf3d9b518"

Copilot uses AI. Check for mistakes.

PACKAGECONFIG ??= "incapp inctest increndergl incsbprotocol xdgv4"
PACKAGECONFIG[incapp] = "--enable-app=yes"
Expand Down Expand Up @@ -36,3 +42,9 @@ do_compile:prepend() {
oe_runmake -C ${S}/linux-dmabuf/protocol
oe_runmake -C ${S}/linux-expsync/protocol
}

do_install:append() {
install -m 0644 ${S}/*.h ${D}${includedir}/
Copy link

Copilot AI Feb 3, 2026

Choose a reason for hiding this comment

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

The install command uses a wildcard pattern ${S}/*.h to copy all .h files from the source root directory. This is fragile because it will fail if there are no .h files matching the pattern, and it's unclear which specific header files should be installed. Consider explicitly listing the required header files or verifying that this pattern matches the intended files. If the intent is to install headers from a specific subdirectory, the path should be more specific.

Suggested change
install -m 0644 ${S}/*.h ${D}${includedir}/
install -d ${D}${includedir}
for header in ${S}/*.h; do
if [ -e "$header" ]; then
install -m 0644 "$header" ${D}${includedir}/
fi
done

Copilot uses AI. Check for mistakes.
}

FILES_${PN}-dev += "${includedir}/*.h"
Copy link

Copilot AI Jan 23, 2026

Choose a reason for hiding this comment

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

The FILES variable syntax uses the deprecated style FILES_${PN}. The modern syntax is FILES:${PN}, which is used consistently in other recipes in this codebase (see recipes-graphics/westeros/essos.bb:21, recipes-graphics/essosrmgr/essosrmgr.bb:41). Update this to use the colon syntax for consistency.

Copilot uses AI. Check for mistakes.
Copy link

Copilot AI Feb 3, 2026

Choose a reason for hiding this comment

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

The variable uses the old-style underscore syntax FILES_${PN}-dev instead of the modern BitBake override syntax FILES:${PN}-dev. All other recipe files in the codebase (e.g., recipes-graphics/drm/libdrm_2.4.100.bb, recipes-graphics/essosrmgr/essosrmgr.bb, recipes-graphics/westeros/essos.bb:27) consistently use the colon syntax. This should be changed to FILES:${PN}-dev for consistency with established codebase conventions.

Copilot uses AI. Check for mistakes.