Skip to content

add OpenWRT Makefile#111

Open
honwen wants to merge 1 commit intoAdguardTeam:masterfrom
honwen:master
Open

add OpenWRT Makefile#111
honwen wants to merge 1 commit intoAdguardTeam:masterfrom
honwen:master

Conversation

@honwen
Copy link
Copy Markdown
Contributor

@honwen honwen commented Nov 22, 2020

@ameshkov ameshkov requested review from ainar-g and ameshkov November 23, 2020 10:56
@ameshkov
Copy link
Copy Markdown
Member

Tbh, I am not fully sure about the service part.

Wouldn't it be better to implement #39 using kardianos/service (just like we do in AdGuard Home), and reuse it?
Also, I think that implementing dnsproxy configuration should be done prior to this task.

@honwen
Copy link
Copy Markdown
Contributor Author

honwen commented Nov 23, 2020

As Said in AdguardTeam/AdGuardHome#1348, kardianos/service does not match the initscripts standard of openwrt, and openwrt require a makefile to add preinstalled packages to the final image.

@ameshkov
Copy link
Copy Markdown
Member

@honwen sure, and here's what we do in AGH to handle this:
https://github.com/AdguardTeam/AdGuardHome/blob/master/internal/home/service.go#L456

Search for util.IsOpenWRT there to see the necessary changes.

@dhewg
Copy link
Copy Markdown

dhewg commented Jul 20, 2021

This is an OpenWRT package, it doesn't belong here.
But the package has been added already: openwrt/packages#16130

On the good side, while this one downloaded a binary release, the merged package compiles the go sources.
But the merged one doesn't ship a init/uci config yet, while this one does.

@honwen / @1715173329 maybe you're interested to get that merged?

@1715173329
Copy link
Copy Markdown

@dhewg
Copy link
Copy Markdown

dhewg commented Jul 22, 2021

Nice! There're a few small things I'd change, but it's not up to me ;)
Let's discuss that in a openwrt/packages PR so other reviewers will see that too!

@codecov-commenter
Copy link
Copy Markdown

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 66.04%. Comparing base (2f7a50c) to head (03631ce).
⚠️ Report is 413 commits behind head on master.
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@           Coverage Diff           @@
##           master     #111   +/-   ##
=======================================
  Coverage   66.04%   66.04%           
=======================================
  Files          37       37           
  Lines        2194     2194           
=======================================
  Hits         1449     1449           
  Misses        543      543           
  Partials      202      202           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

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.

5 participants