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

adguardhome: bump to 0.105.1 #14717

Merged
merged 1 commit into from
Feb 20, 2021
Merged

Conversation

dobo90
Copy link
Contributor

@dobo90 dobo90 commented Feb 11, 2021

Maintainer: me
Compile tested: aarch64_generic, NanoPi R2S, OpenWrt SNAPSHOT r15730
Run tested: aarch64_generic, NanoPi R2S, OpenWrt SNAPSHOT r15730

@dobo90
Copy link
Contributor Author

dobo90 commented Feb 11, 2021

Please don't merge it yet. It seems to be running fine but I've noticed that Makefile uses also yarn. Let me run this software for more time and try to dig if yarn is really needed for compilation.

@dobo90
Copy link
Contributor Author

dobo90 commented Feb 12, 2021

I did some digging and AdGuardHome states that yarn is needed for compilation. It serves redesigned incomplete interface on 3001 port.

To make this work with yarn, there are two things missing:

  1. Make host version of node compile with icu
  2. Add yarn package

For now I'll push those missing functionality into this pull request. When it passes CI I'll create one pull request (for node fix) and one issue for including node-yarn package (in order to keep original authorship).

@dobo90 dobo90 force-pushed the adguardhome_v0.105.0 branch 2 times, most recently from 45d74fd to 302c7e6 Compare February 12, 2021 15:21
@dobo90 dobo90 changed the title adguardhome: bump to 0.105.0 [WIP] adguardhome: bump to 0.105.0 Feb 12, 2021
@dobo90
Copy link
Contributor Author

dobo90 commented Feb 12, 2021

Ok, node-yarn fails to build for arm_cortex-a9_vfpv3-d16, arm_cortex-a15_neon-vfpv4 and i386_pentium-mmx targets. I'll try to figure it out. If not I'll reach for @nxhack for help.

@nxhack
Copy link
Contributor

nxhack commented Feb 12, 2021

@dobo90
To build node.js 32bit targets, multilib is required in the host development environment.
However, multilib is not installed in the current OpenWrt CI and buildbot environments.
Therefore, building the 32-bit target will fail.

@nxhack
Copy link
Contributor

nxhack commented Feb 13, 2021

@dobo90
I agree that icu should be enabled for node.js host build. I'm going to change it after testing it upstream.

dobo90 pushed a commit to dobo90/packages that referenced this pull request Feb 15, 2021
Imported from [1]. All credits go to Hirokazu MORIKAWA <morikw2@gmail.com>

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>

As it's problematic to compile this for 32-bit targets (see [2]) I made
this package host-only.

Signed-off-by: Dobroslaw Kijowski <dobo90@gmail.com>

[1]: https://github.com/nxhack/openwrt-node-packages/blob/20b4dabcc85d5da64515b4c55c22d29403ebf11c/node-yarn/Makefile
[2]: openwrt#14717 (comment)
@dobo90 dobo90 force-pushed the adguardhome_v0.105.0 branch from 302c7e6 to b1eed94 Compare February 15, 2021 12:29
@dobo90
Copy link
Contributor Author

dobo90 commented Feb 15, 2021

Hmm, I don't understand one thing: why node is compiled for a target architecture when I specify only node/host and node-yarn/host dependency.
The last revision I've pushed contains host-only Makefile of node-yarn package and CI is fine with it (as apparently node is compiled only for host architecture).

@nxhack,
Are you fine with that approach, that for now we can ship node-yarn host only package recipe? If not, please give me some clues how the problem can be solved. Thanks!

@nxhack
Copy link
Contributor

nxhack commented Feb 15, 2021

The above limitation (lack of multilib) can be avoided by restricting yarn to host build only. However, due to the above limitation, the node module required by adguardhome will not run because the 32bit version of node.js itself is not built.

Of course, if you install multilib and then build OpenWrt by yourself, there is no problem.

@nxhack
Copy link
Contributor

nxhack commented Feb 16, 2021

@dobo90

I tried to build it in my environment.

Am I correct in my understanding that the node.js environment is only needed to build adguardhome itself, and not on the target machien?

If so, I think it's a good idea to limit yarn to host builds.

If that's okay, I'll send a pull request for each package related to node.js.

@dobo90
Copy link
Contributor Author

dobo90 commented Feb 16, 2021

@dobo90

I tried to build it in my environment.

Am I correct in my understanding that the node.js environment is only needed to build adguardhome itself, and not on the target machien?

If so, I think it's a good idea to limit yarn to host builds.

If that's okay, I'll send a pull request for each package related to node.js.

That's correct. Adguardhome needs nodejs and yarn only to build some frontend files (only on the host machine, not the target).
Thanks for your assistance. Please let me know when pull requests are merged so I can rebase this on top of them. Have a great day!

nxhack added a commit to nxhack/packages that referenced this pull request Feb 17, 2021
Made the necessary changes to build the latest version of adguardhome.
See this thread : openwrt#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
nxhack added a commit to nxhack/packages that referenced this pull request Feb 17, 2021
Add the necessary new package to build the latest version of adguardhome.
See this thread : openwrt#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
@nxhack
Copy link
Contributor

nxhack commented Feb 17, 2021

@dobo90

I've sent the necessary pull requests.

* Full changelog available at:
  * https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.105.0
  * https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.105.1
* Add node-yarn/host dependency as it is needed since [1].
* Adjust LDFLAGS to the new ones introduced in [2].
* Invoke targets from make instead of manually running npm and yarn.
* Replace GO_PKG_EXCLUDES with GO_PKG_BUILD_PKG as our intention is to
  build only one specific package (a cosmetic change).

[1]: AdguardTeam/AdGuardHome@5e20ac7#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52R140
[2]: AdguardTeam/AdGuardHome@0d67aa2#diff-82ef468ec5547f1ed424776755a7f87dfec4eba9838d2c2ac02c9881bb67d737R60

Signed-off-by: Dobroslaw Kijowski <dobo90@gmail.com>
@dobo90 dobo90 force-pushed the adguardhome_v0.105.0 branch from b1eed94 to d208610 Compare February 17, 2021 08:48
@dobo90 dobo90 changed the title [WIP] adguardhome: bump to 0.105.0 adguardhome: bump to 0.105.1 Feb 17, 2021
@dobo90
Copy link
Contributor Author

dobo90 commented Feb 17, 2021

It's ready for review. Friendly poke: @neheb, @jefferyto.

@neheb neheb merged commit 03b69a0 into openwrt:master Feb 20, 2021
nxhack added a commit to nxhack/packages that referenced this pull request Feb 26, 2021
Add the necessary new package to build the latest version of adguardhome.
See this thread : openwrt#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
BKPepe pushed a commit that referenced this pull request Feb 26, 2021
Made the necessary changes to build the latest version of adguardhome.
See this thread : #14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
(cherry picked from commit 884761c)
Lienol pushed a commit to Lienol/openwrt-packages that referenced this pull request Mar 13, 2021
Add the necessary new package to build the latest version of adguardhome.
See this thread : openwrt/packages#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Lienol pushed a commit to Lienol/openwrt-packages that referenced this pull request Jun 5, 2021
Made the necessary changes to build the latest version of adguardhome.
See this thread : openwrt/packages#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Lienol pushed a commit to Lienol/openwrt-packages that referenced this pull request Nov 19, 2021
Add the necessary new package to build the latest version of adguardhome.
See this thread : openwrt/packages#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Lienol pushed a commit to Lienol/openwrt-packages that referenced this pull request Nov 19, 2021
Made the necessary changes to build the latest version of adguardhome.
See this thread : openwrt/packages#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Lienol pushed a commit to Lienol/openwrt-packages that referenced this pull request Dec 19, 2021
Add the necessary new package to build the latest version of adguardhome.
See this thread : openwrt/packages#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Lienol pushed a commit to Lienol/openwrt-packages that referenced this pull request Dec 19, 2021
Made the necessary changes to build the latest version of adguardhome.
See this thread : openwrt/packages#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Lienol pushed a commit to Lienol/openwrt-packages that referenced this pull request Feb 11, 2022
Add the necessary new package to build the latest version of adguardhome.
See this thread : openwrt/packages#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Lienol pushed a commit to Lienol/openwrt-packages that referenced this pull request Feb 11, 2022
Made the necessary changes to build the latest version of adguardhome.
See this thread : openwrt/packages#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Lienol pushed a commit to Lienol/openwrt-packages that referenced this pull request Jan 4, 2023
Add the necessary new package to build the latest version of adguardhome.
See this thread : openwrt/packages#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Lienol pushed a commit to Lienol/openwrt-packages that referenced this pull request Jan 4, 2023
Made the necessary changes to build the latest version of adguardhome.
See this thread : openwrt/packages#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Lienol pushed a commit to Lienol/openwrt-packages that referenced this pull request Mar 2, 2024
Add the necessary new package to build the latest version of adguardhome.
See this thread : openwrt/packages#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Lienol pushed a commit to Lienol/openwrt-packages that referenced this pull request Mar 2, 2024
Made the necessary changes to build the latest version of adguardhome.
See this thread : openwrt/packages#14717

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
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.

4 participants