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

ntpd: disable autoreconf fixup #24921

Merged
merged 1 commit into from
Sep 10, 2024
Merged

ntpd: disable autoreconf fixup #24921

merged 1 commit into from
Sep 10, 2024

Conversation

bluecmd
Copy link
Contributor

@bluecmd bluecmd commented Sep 4, 2024

Maintainer: @ffontaine @hauke @knthm
Compile tested: x86_64 & octeon, master
Run tested: x86_64 & octeon, master

Description:

Fixes #24918 which got introduced with openwrt c364cb8.

Credit for the fix goes to Hirokazu MORIKAWA.

Test:

bluecmd@oob-lab-sw3:~$ ntpq -p localhost
     remote           refid      st t when poll reach   delay   offset  jitter
==============================================================================
 129.151.196.70  .STEP.          16 u    -   64    0    0.000   +0.000   0.000
 ntp.netnod.se   .STEP.          16 u   19   64    0    0.000   +0.000   0.000
 time.cloudflare .STEP.          16 u   78   64    0    0.000   +0.000   0.000
*ntp7.flashdance 194.58.202.148   2 u    6   64    1    1.080   -0.252   0.079

bluecmd added a commit to sonix-network/openwrt that referenced this pull request Sep 4, 2024
Fixes openwrt#24918 which got introduced with openwrt c364cb8.

Credit for the fix goes to Hirokazu MORIKAWA.

Signed-off-by: Christian Svensson <[email protected]>
@bluecmd bluecmd marked this pull request as ready for review September 4, 2024 11:39
nxhack referenced this pull request in openwrt/openwrt Sep 5, 2024
In Gluon's Github Actions CI, we were occasionally seeing bizarre build
errors that looked like a config.sub file had been corrupted, or changed
while it was being executed.

The cause turned out to be an interaction of the symlinks created by
autoreconf (pointing from individual tools' build dirs into
`staging_dir/host/share/automake-1.16`) and OpenWrt's host-build.mk,
which replaced config.guess and config.sub *after* autoreconf. The
result was that the replacement of these files ended up following the
symlinks and writing the files in `staging_dir/host/share/automake-1.16`
instead of a package's build dir. This could cause other packages' builds
to fail if they were currently executing the scripts while they were
being written.

To fix this, disable autoreconf's symlinking feature, so that modifying
these files in a package's build directory can't accidentally affect the
staged versions.

Link: #15825
Signed-off-by: Matthias Schiffer <[email protected]>
@neheb neheb merged commit de0e7ef into openwrt:master Sep 10, 2024
13 of 15 checks passed
@@ -19,7 +19,6 @@ PKG_LICENSE:=NTP
PKG_LICENSE_FILES:=COPYRIGHT html/copyright.html
PKG_CPE_ID:=cpe:/a:ntp:ntp

PKG_FIXUP:=autoreconf
Copy link
Member

Choose a reason for hiding this comment

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

@neheb Sorry, I've missed this pull request, just noticed it via the closure of #24918, so take this as a kind of post review :)

IMO this is not a proper fix, but rather a workaround. There is probably something wrong with the autofoo (or the package in general) and should be investigated and fixed by other means.

In other words, the PKG_FIXUP:=autoreconf is correct, probably should be default for all packages, because we certainly dont want to use autofoo as being shipped, but generate those by our tools/versions.

Copy link
Member

Choose a reason for hiding this comment

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

Additionally I would like to point out, that those autofoo fixes were backported into 23.05 openwrt/openwrt@d811a09 and openwrt/openwrt@c4c43c6, thus we're looking for some ntpd package fix which might be backported there as well.

Copy link
Contributor

Choose a reason for hiding this comment

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

I’ve done many autoreconf removals here. I see no problem with it.

Copy link
Member

Choose a reason for hiding this comment

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

Is there any better solution for now? Currently, this package is not compiled in OpenWrt 23.05 and it would be great to be fixed there.

Copy link
Member

Choose a reason for hiding this comment

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

Is there any better solution for now?

Not yet openwrt/openwrt#15825 (comment), but likely the autofoo in the package would need to be patched.

this package is not compiled in OpenWrt 23.05

You mean when compiled in the tree? I don't see that package in the faillogs-23.05, but I've checked just few architectures.

@bluecmd bluecmd deleted the patch-1 branch September 11, 2024 07:07
admin-turris pushed a commit to turris-cz/os-build that referenced this pull request Sep 20, 2024
This is workaround currently used in OpenWrt master branch. Proper fix
will probably be introduced in the future.

Ref:
- openwrt/packages#24921
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.

ntpd: fails to compile in master
4 participants