Closed thochstein closed 4 weeks ago
Thanks, @otavio. Can you backport to scarthgap?
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
It seems it does not apply cleanly. Could you prepare the backport manually?
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 functiondo_install:append()
.