-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
RDKE-34 Add westeros to vendor layer #2
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#Temporary until westeros.inc get updated to latest in common layer. Refer Comcast jira RDK-49476 | ||
include westeros.inc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#Temporary until westeros.inc get updated to latest in common layer. Refer Comcast jira RDK-49476 | ||
include westeros.inc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#Temporary until westeros.inc get updated to latest in common layer. Refer Comcast jira RDK-49476 | ||
include westeros.inc | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
# bbappend for raspberryPi | ||
# | ||
include westeros.inc | ||
|
||
PACKAGECONFIG = "incapp inctest increndergl incsbprotocol xdgv4" | ||
PACKAGECONFIG_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'modules', '', d)}" | ||
|
||
# enable Linux DMA buffer for RPi4 | ||
PACKAGECONFIG_append_raspberrypi4 = " incldbprotocol" | ||
|
||
CXXFLAGS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '-DWESTEROS_PLATFORM_DRM', '-DWESTEROS_PLATFORM_RPI -DWESTEROS_INVERTED_Y -DBUILD_WAYLAND -I${STAGING_INCDIR}/interface/vmcs_host/linux', d)} " | ||
CXXFLAGS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '-DUSE_MESA', '', d)}" | ||
|
||
inherit systemd update-rc.d | ||
|
||
CXXFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'enable_ermgr', ' -DUSE_ESSRMGR_UDS_IMPL', '', d)}" | ||
|
||
do_configure_prepend () { | ||
sed -i -e 's/-lwesteros_simplebuffer_client/-lwesteros_compositor -lwesteros_simplebuffer_client/g' ${S}/rpi/westeros-sink/Makefile.am | ||
} | ||
|
||
do_compile_prepend () { | ||
export WESTEROS_COMPOSITOR_EXTRA_LIBS="${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '-lEGL -lGLESv2', '-lEGL -lGLESv2 -lbcm_host', d)}" | ||
} | ||
|
||
do_install_append () { | ||
|
||
# install systemd services for auto start | ||
if [ "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "yes", "no", d)}" = "yes" ]; then | ||
install -D -m 0644 ${S}/systemd/westeros.service ${D}${systemd_unitdir}/system/westeros.service | ||
else | ||
install -D -m 0755 ${S}/systemd/westeros.sysvinit ${D}${sysconfdir}/init.d/westeros | ||
fi | ||
install -D -m 0755 ${S}/systemd/westeros-init ${D}${bindir}/westeros-init | ||
|
||
# Appending required environment variable for westeros | ||
install -D -m 0644 ${S}/systemd/westeros-env ${D}${sysconfdir}/default/westeros-env | ||
|
||
# defining environment variable for westeros | ||
echo "XDG_RUNTIME_DIR=/run" >> ${D}${sysconfdir}/default/westeros-env | ||
echo "WAYLAND_DISPLAY=wayland-0" >> ${D}${sysconfdir}/default/westeros-env | ||
|
||
if [ "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "yes", "no", d)}" = "yes" ]; then | ||
sed -i '/Compositor/ a After=lircd.service lircd.socket' ${D}${systemd_unitdir}/system/westeros.service | ||
fi | ||
sed -i '/^exec/i MODULE=/usr/lib/libresolutionmodule.so.0.0.0' ${D}${bindir}/westeros-init | ||
sed -i 's/$RENDERER/$RENDERER --module $MODULE/g' ${D}${bindir}/westeros-init | ||
# westeros service is not required when RDK Shell is enabled | ||
if [ "${@bb.utils.contains('DISTRO_FEATURES', 'rdkshell', 'yes', 'no', d)}" = "yes" ]; then | ||
rm -rf ${D}${systemd_unitdir} | ||
fi | ||
} | ||
|
||
do_install_append_rasberrypi4 () { | ||
sed -i '/exec/i export WESTEROS_DRM_CARD=/dev/dri/card1' ${D}${bindir}/westeros-init | ||
} | ||
|
||
LDFLAGS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-lvchostif', d)}" | ||
|
||
INITSCRIPT_NAME = "westeros" | ||
INITSCRIPT_PARAMS = "defaults" | ||
|
||
SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'rdkshell', '', 'westeros.service', d)}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
#Temporary until westeros.inc get updated to latest in common layer. Refer Comcast jira RDK-49476 | ||
LICENSE = "Apache-2.0" | ||
|
||
PV = "1.0+gitr${SRCPV}" | ||
|
||
SRC_URI = "${WESTEROS_URI}" | ||
SRCREV = "${WESTEROS_SRCREV}" | ||
|
||
WESTEROS_URI ?= "${CMF_GIT_ROOT}/components/opensource/westeros;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_MASTER_BRANCH};name=westeros" | ||
# Tip of westeros master as of Mar 7, 2024 | ||
WESTEROS_SRCREV = "04c096cb3df0bc0797f5b6bc568e1d11b62dcb5b" | ||
|
||
LICENSE_LOCATION ?= "${S}/LICENSE" | ||
LIC_FILES_CHKSUM = "file://${LICENSE_LOCATION};md5=8fb65319802b0c15fc9e0835350ffa02" | ||
|
||
SRCREV_FORMAT = "westeros" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be good to cross check to merge this into https://github.com/rdkcentral/meta-rdk-raspberrypi/pull/8/files#diff-b212da302fcc6157b1e63844ded8e6193bf624588cf6b9c6defa47ce3520e805