Skip to content
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

weston-init: Fix RDP support #1898

Merged
merged 1 commit into from
Aug 19, 2024
Merged

Conversation

thochstein
Copy link
Contributor

The modification of the weston.ini command line necessary for RDP support is missing. The problem is the weston.ini template contains @bindir@, while the sed operation for the modification contains ${bindir}.

Fix the problem by moving the replacement of @bindir@ to the top of the function do_install:append().

The modification of the weston.ini command line necessary for RDP
support is missing. The problem is the weston.ini template contains
`@bindir@`, while the sed operation for the modification contains
`${bindir}`.

Fix the problem by moving the replacement of `@bindir@` to the top of
the function `do_install:append()`.

Signed-off-by: Tom Hochstein <[email protected]>
@otavio otavio merged commit 1686f9b into Freescale:master Aug 19, 2024
@thochstein thochstein deleted the weston-init branch August 19, 2024 17:15
@thochstein
Copy link
Contributor Author

Thanks, @otavio. Can you backport to scarthgap?

Copy link
Contributor

Backport failed for scarthgap, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin scarthgap
git worktree add -d .worktree/backport-1898-to-scarthgap origin/scarthgap
cd .worktree/backport-1898-to-scarthgap
git checkout -b backport-1898-to-scarthgap
ancref=$(git merge-base e4a09a4c5a1a10ec0ed96facaa9a8b1a2f506d7b 1963104c4ad7367686c910c70a07cbc7df3cd6c5)
git cherry-pick -x $ancref..1963104c4ad7367686c910c70a07cbc7df3cd6c5

@otavio
Copy link
Member

otavio commented Aug 19, 2024

It seems it does not apply cleanly. Could you prepare the backport manually?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants