Skip to content

Instantly share code, notes, and snippets.

@PolynomialDivision
Created June 25, 2020 11:07
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save PolynomialDivision/34c118841dfee9d62588024a7314affb to your computer and use it in GitHub Desktop.
Save PolynomialDivision/34c118841dfee9d62588024a7314affb to your computer and use it in GitHub Desktop.
To test the changes I did you have to clone openwrt
git clone https://git.openwrt.org/openwrt/openwrt.git
After that you have to copy the feeds.conf.default in openwrt-git-folder to
cp feeds.conf.default feeds.conf
after that add to feeds.conf
src-git freifunk https://github.com/freifunk/openwrt-packages.git
src-git freifunkberlin https://github.com/freifunk-berlin/firmware-packages.git
Then do
./scripts/feeds update -a
./scripts/feeds install -a
after that go to
cd feeds/freifunkberlin
and after that go to https://github.com/freifunk-berlin/firmware/milestone/13 and look at the linked PRs in the issues.
Go to some PR, go to commits, click on the commit hash and copy the url, e.g.
https://github.com/freifunk-berlin/firmware-packages/pull/206/commits/58ba513300873e77f25f514093fc01769b2c3576
add '.patch' to that url, e.g.
https://github.com/freifunk-berlin/firmware-packages/pull/206/commits/58ba513300873e77f25f514093fc01769b2c3576.patch
Now you apply the patch to the freifunkberlin feed by doing
curl [URL with .patch] | git am
e.g.
curl https://github.com/freifunk-berlin/firmware-packages/pull/206/commits/58ba513300873e77f25f514093fc01769b2c3576.patch | git am
Now you have applied one commit of the PR. If the PR is only one commit, then you are already done.
Here is some list, I will update
curl https://github.com/freifunk-berlin/firmware-packages/pull/206/commits/58ba513300873e77f25f514093fc01769b2c3576.patch | git am
curl https://github.com/freifunk-berlin/firmware-packages/commit/ca668e492c17d3e046a7ee58c31202f6c5b28627.patch | git am
curl https://github.com/freifunk-berlin/firmware-packages/commit/45d382a3c6ab166d017f20946b6bee49daf6944c.patch | git am
@SvenRoederer
Copy link

SvenRoederer commented Jun 25, 2020

I think it would be more easy to do in the feeds/freifunkberlin

git cherry-pick <commit>

or

git merge <PR-branch>

seems more natural than downloading the patches via web, if you have them in your checkout of the repo already.

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