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

Fix hbd some more #6

Closed
wants to merge 3 commits into from
Closed

Conversation

kesslerm
Copy link

Various upstream packages had seen commits that broke the turris build patches.

…ort.patch

Upstream commit 0ba56ae4466e4320d744bb0c959fdae70b7fc941
introduced PKG_CPE_ID.

Signed-off-by: Magnus Kessler <[email protected]>
Upstream commit bb3247d1b237911c7e9579c35d698371b329ae85
introduced /etc/sshd_config.d for site configuration

Signed-off-by: Magnus Kessler <[email protected]>
…ease-number.patch

Rebase on top of upstream commit ec9d61450ee9831a28ec712166a791fffd0888b3

Signed-off-by: Magnus Kessler <[email protected]>
@kesslerm
Copy link
Author

There is some overlap with #5. Both contain the same patch for Python3.

@BKPepe
Copy link
Contributor

BKPepe commented Sep 28, 2023

Yeah, but no one cares about it for more than 2 weeks. Pretty easy patch with small diff and Turris guys doesn't even have time to look at it. So bad. It doesn't look good. Rather I will keep contributing to upstream, where at least someone will appreciate that.

@BKPepe
Copy link
Contributor

BKPepe commented Oct 3, 2023

@elkablo just created similar PR on their GitLab with his own changes:

When three people are doing the same stuff. 😆 😆

@elkablo
Copy link
Contributor

elkablo commented Oct 3, 2023

@kesslerm you need to create such merge requests on turris' gitlab, not on the github mirror. I did not receive any information about this existing here :(

@kesslerm
Copy link
Author

kesslerm commented Oct 3, 2023

Thanks @elkablo for merging your version of the above patches into the hbd branch. Any sign that a future release is still being worked on is very welcome.

Regarding merge requests via GitHub, I followed the instructions in the documentation, that state:

All our public repositories are mirrored to GitHub. If you have an account on GitHub, you can use it to fork one of our projects hosted on this server and create a pull request there.

If contributions via GitHub are no longer welcome or practical, please amend the documentation accordingly.

Just recently, though, I contributed another set of patches via GitHub, and even announced this current set on the projects GitLab tracker. Please let me know if there is a more efficient way to get external contributions integrated in a timely manner.

I'm going to close this pull request as done.

@kesslerm kesslerm closed this Oct 3, 2023
@BKPepe
Copy link
Contributor

BKPepe commented Oct 3, 2023

To be honest, contributing as an external contributor to CZ.NIC GitLab is tricky due to spam what is going on, and because of that, people are suffering from it. In the previous internal tracker (trac), there was really long issue on how to improve behavior and how to allow external contributors to OSS projects, which CZ.NIC does. No conclusion has been made. Then it was transfered or moved else where, but still nothing improved.

So now people need to ask Turris or, rather CZ.NIC GitLab administrators to allow forking repositories, etc. It isn't very easy. Steps:

  1. Create an account
  2. Create an issue or reach anyone from Turris to allow forking for that acc
    Turris will reach CZ.NIC GitLab administrator to allow it.
    Wait for their response
  3. If yes, start contributing

Reference:
https://gitlab.nic.cz/turris/user-docs/-/commit/a89cdf00398e133ad71497514407e1eba7985082

So, yeah. Sending PRs via GitHub is a lot easier.

@elkablo
Copy link
Contributor

elkablo commented Oct 4, 2023

@kesslerm hmm. OK, in the future I shall try to look at merge requests on github as well.

@kesslerm kesslerm deleted the fix-hbd-some-more branch October 5, 2023 07:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants