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 1 commit
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
2 changes: 2 additions & 0 deletions recipes-core/packagegroups/packagegroup-oss-layer.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ RDEPENDS:${PN} += "\
dnsmasq \
dosfstools \
essos \
essosrmgr \
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 remove essosrmgr from oss packagegroup

fcgi \
findutils \
gawk \
Expand Down Expand Up @@ -354,6 +355,7 @@ RDEPENDS:${PN}:remove += "\
cairo \
dropbear \
essos \
essosrmgr \
gstreamer1.0 \
gstreamer1.0-libav \
gstreamer1.0-meta-base \
Expand Down
42 changes: 42 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,42 @@
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"
SRC_URI += "file://01-essosResManager.diff"

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"


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 = ""

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"
Comment on lines 17 to 46
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 uses SYSTEMD_SERVICE and installs systemd service files but does not inherit from the systemd class. The systemd class should be added to the inherit line (line 15) to ensure proper systemd integration. Without this, systemd-related variables and functions may not work correctly. See recipes-extended/mdns/mdns_1556.80.2.bb:31 for an example of proper systemd inheritance.

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 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"

Loading