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

Clean up packages #384

Merged
merged 6 commits into from
Jun 11, 2023
Merged

Clean up packages #384

merged 6 commits into from
Jun 11, 2023

Conversation

pktpls
Copy link
Contributor

@pktpls pktpls commented Jun 7, 2023

Maintainer: unclear
Compile tested: x86_64 aarch64_generic
Run tested: not yet

Description:

This cleans up our packages a little. My motivation is that I noticed it's really hard for me to build a mental picture of everything that's going on with all these packages. My guess is that the original intent was modularity, but right now it doesn't gain us anything and only makes our lives harder. It might be a major factor contributing to the slowdown in firmware dev activity.

  • Remove luci-app-olsr2, we never started using it
  • Merge falter-common-olsr into falter-common
  • Merge falter-berlin-lib-guard into falter-common
  • Merge falter-berlin-*-defaults packages into falter-common (except firewall-defaults, see below)

Remaining questions:

  • Can firewall-defaults also be merged into falter-common? It's the only defaults package that's NOT present in all packagesets - the backbone set doesn't use it since it mainly deals with the WAN interface. But maybe it's still okay to have it?
  • I'm in favor of stripping "berlin" from package names, it's just noise.
  • More merging can probably be done with the various uplink/tunnel packages, but that's a topic for another round.

Copy link
Member

@Akira25 Akira25 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

I would have preferred to keep the routing-daemon-stuff in a separate package, but it's perfectly fine to do it in this way too.

@Akira25
Copy link
Member

Akira25 commented Jun 10, 2023

@pktpls before merging, we should fix the liniting errors too.

@Akira25
Copy link
Member

Akira25 commented Jun 10, 2023

I'm on it.

@@ -58,3 +58,4 @@ jobs:
# Change to 'master' if your main branch differs
DEFAULT_BRANCH: master
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
FILTER_REGEX_EXCLUDE: "*/usr/bin/hna.lua*"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

*/usr/bin/hna.lua* => .*/usr/bin/hna\.lua.*

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

resolved in current version. I ommited the one \ though. codium complained, that the backslash would result in invalid YAML-Syntax.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case you could write it as [.] or try using double escaping \\. as otherwise the . matches any single character except for line terminators.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

corrected again. :) Lets see, if the CI takes this.

@Akira25 Akira25 force-pushed the pkgmerge branch 2 times, most recently from b963f15 to ab177d4 Compare June 11, 2023 15:38
@Akira25
Copy link
Member

Akira25 commented Jun 11, 2023

Okay, that works too. Lets merge this. The failing build-pipeline is due to OpenWrt changed their dockerized SDK.

pktpls and others added 6 commits June 11, 2023 19:10
Signed-off-by: Packet Please <pktpls@systemli.org>
Signed-off-by: Packet Please <pktpls@systemli.org>
Signed-off-by: Packet Please <pktpls@systemli.org>
Signed-off-by: Packet Please <pktpls@systemli.org>
Signed-off-by: Packet Please <pktpls@systemli.org>
exclude hna.lua from linter.

Signed-off-by: Martin Hübner <martin.hubner@web.de>
@Akira25
Copy link
Member

Akira25 commented Jun 11, 2023

I am merging this now, because I want to integrate some changes from #328 on this too. Its way easier to do, when this is there first. Please feel free to make a node, if there is something left you'd like to have changed.

@Akira25 Akira25 merged commit 608c30d into freifunk-berlin:master Jun 11, 2023
@Akira25
Copy link
Member

Akira25 commented Jun 11, 2023

cherry-picked -x to 22.03 and 23.05

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