ripe-atlas: follow-up changes after PR which added package - #30067
ripe-atlas: follow-up changes after PR which added package#30067commodo wants to merge 3 commits into
Conversation
947aeba to
70f7e06
Compare
openssh-client and openssh-keygen already depend on libopenssl, so listing it explicitly in ripe-atlas-common is redundant. Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
Update to the latest upstream ripe-atlas-software-probe release. Drop 001-uname.patch: upstream now calls `uname -n` instead of `hostname -s` for the generic ssh-key creation, so the patch is included in this release. Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
OpenWrt puts the compiler-driver flag -fuse-ld= in TARGET_LDFLAGS, but the bundled busybox hands LDFLAGS straight to ld, which rejects it and aborts the build on newer binutils. Filter -fuse-ld=% out of TARGET_LDFLAGS; it is a no-op in the common case, since busybox already links with the default bfd. Fixes: openwrt#30083 Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
70f7e06 to
cb42070
Compare
openwrt-ai
left a comment
openwrt-ai
left a comment
There was a problem hiding this comment.
Reviewed 1 new commit (cb42070). One inline finding on the busybox -fuse-ld= workaround — the commit message matches its diff.
Generated by Claude Code
| # The bundled busybox feeds LDFLAGS straight to ld, which rejects the | ||
| # -fuse-ld= compiler flag OpenWrt puts in TARGET_LDFLAGS; drop it here. | ||
| TARGET_LDFLAGS:=$(filter-out -fuse-ld=%,$(TARGET_LDFLAGS)) |
There was a problem hiding this comment.
Filtering only -fuse-ld=% treats a symptom, not the cause, so this likely does not close #30083. The bundled kbuild tree links built-in.o with $(LD) -nostdlib $(ld_flags) -r; busybox normally defines LD = $(CC) -nostdlib, but OpenWrt's default MAKE_FLAGS passes LD="$(TARGET_LD)" on the make command line, and TARGET_LD is ld.$(TARGET_LINKER) — the raw linker. This package sets no MAKE_FLAGS/MAKE_VARS of its own, so LDFLAGS reaches ld.bfd verbatim, and -fuse-ld=bfd is only one of several compiler-driver-only flags in there:
hardening.mk:22adds$(FPIC) -specs=$(INCLUDE_DIR)/hardened-ld-pie.specsunderCONFIG_PKG_ASLR_PIE_ALL—-specs=triggers the exact sameld.bfd: -f may not be used without -sharedmessage this patch is chasing.package.mk:57adds-flto=auto -fuse-linker-pluginunderCONFIG_USE_LTO.package.mk:52adds-Wl,--gc-sections, whichldalso does not understand.
The issue reporter tested this commit and reports the same failure, which matches the above. Restoring busybox's own LD looks like the more complete fix, e.g. instead of the filter-out:
# The bundled probe-busybox kbuild tree links built-in.o with "$(LD) -r" and
# passes LDFLAGS straight to it. It expects LD to be the compiler driver
# (busybox's own "LD = $(CC) -nostdlib"), but OpenWrt's MAKE_FLAGS point LD at
# ld.bfd, which chokes on -fuse-ld=/-specs=/-flto=/-Wl,... Restore the default.
MAKE_FLAGS += LD="$(TARGET_CC) -nostdlib"(the later command-line assignment wins over the one in MAKE_FLAGS). Since I can't build this here, could you confirm which variant actually builds on the reporter's config before landing?
Generated by Claude Code
There was a problem hiding this comment.
Pull request overview
This PR is a small follow-up for the net/ripe-atlas package, updating it to a newer upstream release and adjusting build packaging details to better fit the OpenWrt build environment.
Changes:
- Bump
ripe-atlasfrom5110to5120(with updated source hash). - Drop the now-unneeded
unamepatch (likely incorporated upstream). - Filter
-fuse-ld=out ofTARGET_LDFLAGSto avoid failures with the bundled busybox build, and remove an explicitlibopenssldependency (still transitively pulled via OpenSSH packages).
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| net/ripe-atlas/Makefile | Version/hash bump; adjust linker flags for bundled busybox; dependency cleanup. |
| net/ripe-atlas/patches/001-uname.patch | Removes a patch that is presumably upstreamed in the newer release. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
📦 Package Details
Maintainer: @tiagogaspar8
Description:
Folow-up after PR #30030
🧪 Run Testing Details
✅ Formalities