Add profile for Ubiquiti Edgerouter X

[robimarko]

Initial ERX support

[mitar]

Please fix so that tests do not fail.

[robimarko]

Finally got it to build without errors

[mitar]

While this is passing tests, can you still make sure that code style matches other files? Pay close attention to newlines and code structure.

[robimarko]

I compared this with one of your templates and I think that now it matches

[robimarko]

I have tried to make changes to comply with your requests

[robimarko]

Here is output from swconfig on Lede ERX SWCONFIG.txt

[kostko]

Can you also paste the output of uci show network?

[robimarko]

Sure,here it is ERX UCI.txt

[robimarko]

I have finally got around to fixing switch configuration. Now it should be correct as per LEDE

Had to fix syntax a bit

[kostko]

Looks good (note that we haven't yet built LEDE for ramips_mt7621), it would just be nice if you could squash all your commits into a single one and change the commit message to devices: Add profile for Ubiquiti Edgerouter X. Do you know how to squash commits?

[robimarko]

Unfortunatelly not.

[kostko]

Please first rebase on development as there have been some updates to that branch (802.11ac support).

[robimarko]

Should be done.

[kostko]

Ok, so you merged instead of rebasing, which introduced yet more commits :-)

Are you using the command-line Git client? If so, do the following to correctly rebase your commits and squash them.

First get the latest changes and rebase (instead of merge):

git fetch origin
git rebase origin/development

Then squash your last 10 commits by running:

git rebase -i HEAD~10

This will open an editor that will enable you to interactively update the commits, sorted from oldest to newest. For the first one, keep the pick command. For all the next ones change pick to squash. Save and exit the editor.

Then, the editor will stop for squashing commits. Edit the commit message to say devices: Add profile for Ubiquiti Edgerouter X. (e.g., remove all the other lines). Save and exit the editor.

This should now give you a single commit in your history containing all your changes (check this with git log). Once you are sure that everything is correct, run git push -f to overwrite your PR branch.

I can do all of this for you, but I would like you to learn how to do this yourself, so it will be easier next time.

[robimarko]

I am trying but I can find commits for Edgerouter X,only UAP

[kostko]

Be sure that you are on the correct branch before doing anything. To switch to this branch do git checkout patch-1 before all other commands.

[robimarko]

Now it should be done

[kostko]

Nope, something does not seem right? You seem to have combined the two different branches into one? Just use git rebase -i HEAD~10 to remove the commits that should not be there (remove the lines with invalid commits). But before doing that, make sure you are on the correct branch.

[kostko]

Also it seems that you don't have the correct e-mail address configured in git?

[robimarko]

I dont get how could I combine two branches? I used patch-1 branch and then squashed commits into one. I used same email as in my github account

[mitar]

I think the problem is that @robimarko is working on development branch for #36.

@robimarko, please do not now just close this or the other pull request and open new ones, but fix them instead. Learn to do that.

[robimarko]

Proper PR done. Check PR #39