119
edits
(add info to generate patches in moz-central applied to vendored moz-libwebrc from github) |
(instructions for patches on top of upstream github moz-libwebrtc commit) |
||
Line 169: | Line 169: | ||
=== patches on top of upstream github moz-libwebrtc commit === | === patches on top of upstream github moz-libwebrtc commit === | ||
* easiest way | |||
git diff -r edd7f9e94d -r mozilla-modifications-rel86 | |||
* more useful for rebasing on top of upstream commits | |||
git branch mozpatches edd7f9e94d | |||
git checkout mozpatches | |||
git format-patch -k edd7f9e94d..mozilla-modifications-rel86 | |||
git am *.patch # applies to branch mozpatches | |||
* in both cases, due to an anomaly during the previous vendoring operation an additional patch must be applied to match the vendored commit in moz-central | |||
[[File:Vendor-fixup.patch.zip]] | |||
curl -o vendor-fixup.patch.zip https://wiki.mozilla.org/images/2/29/Vendor-fixup.patch.zip | |||
unzip vendor-fixup.patch.zip | |||
patch -p1 < vendor-fixup.patch |
edits