https-dns-proxy: prepare migration to APK #23716
Merged
+9
−6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BKPepe
reviewed
Mar 23, 2024
| @@ -300,7 +300,9 @@ service_triggers() { | |||
| local wan wan6 i | |||
| local procd_trigger_wan6 | |||
| if [ "$on_boot_trigger" = '1' ]; then | |||
| output "Setting $serviceName raw_trigger for 'interface.*.up'" | |||
stangri
force-pushed
the
master-https-dns-proxy
branch
2 times, most recently
from
dbd1f12
to
f1dccc1
Compare
stangri
commented
Mar 23, 2024
| @@ -5,7 +5,7 @@ | |||
| return SW_VERSION; | |||
| #else | |||
| - return "2023.10.10-atLeast"; // update date sometimes, like 1-2 times a year | |||
| + return "2023-11-19-1"; // update date sometimes, like 1-2 times a year | |||
| + return "2023.11.19$(subst(.,-,$(PKG_VERSION)))-r1"; // update date sometimes, like 1-2 times a year | |||
There was a problem hiding this comment.
I'll fix that later today or tomorrow.
stangri
force-pushed
the
master-https-dns-proxy
branch
from
f1dccc1
to
811a004
Compare
BKPepe
reviewed
Mar 24, 2024
Comment on lines
+9
to
+10
| PKG_SOURCE_DATE:=$(subst(.,-,$(PKG_VERSION))) | ||
| PKG_SOURCE_RELEASE:=$(subst(r,,$(PKG_RELEASE))) |
There was a problem hiding this comment.
@aparcar Is this wanted behavior? I think there will be several exceptions like this.
While looking at your treewide commit in the main repo: openwrt/openwrt@e8725a9
It sounds like we can drop those two lines as they are not required. Is that right?
Signed-off-by: Stan Grishin <stangri@melmac.ca>
stangri
force-pushed
the
master-https-dns-proxy
branch
from
811a004
to
b8a8c48
Compare
BKPepe
reviewed
Mar 24, 2024
| procd_add_raw_trigger "interface.*.up" 3000 "/etc/init.d/${packageName}" restart 'on_interface_up' | ||
| output_okn |
There was a problem hiding this comment.
Not relevant anyhow to APK migration. If it is not going to be addressed and you will still merge it, I will revert it.
|
@1715173329 , @feckert Could you please look at this pull request? :) Would be great to have someone, who will share the same opinion on this one. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Maintainer: me
Compile tested: x86_64, Sophos XG-135r3, OpenWrt 23.05.2