Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 950753 - sys-apps/systemd-utils-256.12: musl patchset does not apply
Summary: sys-apps/systemd-utils-256.12: musl patchset does not apply
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo systemd Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2025-03-07 15:19 UTC by Violet Purcell
Modified: 2025-03-10 01:31 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
build.log (build.log,6.83 KB, text/x-log)
2025-03-07 15:19 UTC, Violet Purcell
Details
Refreshed 0019-Adjust-for-musl-headers.patch (0019-Adjust-for-musl-headers.patch,15.83 KB, patch)
2025-03-09 23:40 UTC, Brahmajit Das
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Violet Purcell 2025-03-07 15:19:12 UTC
Created attachment 920330 [details]
build.log

musl patchset broke again.

emerge --info:
Portage 3.0.67 (python 3.13.2-final-0, default/linux/arm64/23.0/musl/llvm, [unavailable], musl-1.2.5-r5, 6.12.12-asahi-1 aarch64)
=================================================================
System uname: Linux-6.12.12-asahi-1-aarch64-with-libc
KiB Mem:    32386912 total,   5462048 free
KiB Swap:   67108848 total,  67108848 free
Head commit of repository gentoo: 5af075ad0048b2c11b8e45596ea57ffd6065a57f

Head commit of repository asahi: ef3c36bfd027aa13857b85489a4ec7e9244f68ce

Head commit of repository guru: da0804520e618047cbbb1f3e981f3c76d1f75d00

Head commit of repository haskell: 4dcc32dd23504b5a9295e99511babac403be3d74

Head commit of repository llvm: 23529e68f86f813257878527b3a1c06a271b8640

Head commit of repository the-anime-team: 1588263ca0486be5047f5527811423d94f4636f7

Head commit of repository vimproved: d480245ab44e5358338c769bb3d9c93b5f0e3fbb

Head commit of repository vimsys: 64bfe9ed5aecf3c63dcb2dd7bcd90dd179ace386

sh dash 0.5.12-r1
ld LLD 20.1.0 (compatible with GNU linkers)
ccache version 4.10.2 [disabled]
app-misc/pax-utils:       1.3.8::gentoo
app-shells/bash:          5.2_p37::gentoo
dev-build/autoconf:       2.72-r1::gentoo
dev-build/automake:       1.16.5-r2::gentoo, 1.17-r2::gentoo
dev-build/cmake:          3.31.6::gentoo
dev-build/libtool:        2.5.4::gentoo
dev-build/make:           4.4.1-r100::gentoo
dev-build/meson:          1.7.0::gentoo
dev-java/java-config:     2.3.4::gentoo
dev-lang/perl:            5.40.1::gentoo
dev-lang/python:          3.12.9::gentoo, 3.13.2::gentoo, 3.13.2-r100::gentoo
dev-lang/rust:            1.83.0-r2::gentoo, 1.84.0-r1::gentoo, 1.84.1-r1::gentoo, 1.85.0-r1::gentoo
dev-util/ccache:          4.10.2-r1::gentoo
llvm-core/clang:          18.1.8-r6::gentoo, 19.1.7::gentoo, 20.1.0-r1::llvm
llvm-core/lld:            18.1.8::gentoo, 19.1.7::gentoo, 20.1.0::llvm
llvm-core/llvm:           18.1.8-r6::gentoo, 19.1.7::gentoo, 20.1.0::llvm
sys-apps/baselayout:      2.17::gentoo
sys-apps/openrc:          0.60.1::gentoo
sys-apps/sandbox:         2.45::gentoo
sys-kernel/linux-headers: 6.13::gentoo (virtual/os-headers)
sys-libs/musl:            1.2.5-r5::vimsys
Repositories:

gentoo
    location: /var/db/repos/gentoo
    sync-type: git
    sync-uri: https://github.com/gentoo/gentoo.git
    priority: -1000
    volatile: False

asahi
    location: /var/db/repos/asahi
    sync-type: git
    sync-uri: https://github.com/chadmed/asahi-overlay.git
    masters: gentoo
    volatile: False

crossdev
    location: /var/db/repos/crossdev
    masters: gentoo
    volatile: False

guru
    location: /var/db/repos/guru
    sync-type: git
    sync-uri: https://github.com/gentoo/guru.git
    masters: gentoo
    volatile: False

haskell
    location: /var/db/repos/haskell
    sync-type: git
    sync-uri: https://github.com/gentoo-haskell/gentoo-haskell.git
    masters: gentoo
    volatile: False

llvm
    location: /var/db/repos/llvm
    sync-type: git
    sync-uri: https://codeberg.org/vimproved/llvm-overlay.git
    masters: gentoo
    volatile: False

the-anime-team
    location: /var/db/repos/the-anime-team
    sync-type: git
    sync-uri: https://github.com/an-anime-team/gentoo-ebuilds.git
    masters: gentoo
    volatile: False

vimproved
    location: /var/db/repos/vimproved
    sync-type: git
    sync-uri: https://codeberg.org/vimproved/overlay.git
    masters: gentoo
    volatile: False

vimsys
    location: /var/db/repos/vimsys
    sync-type: git
    sync-uri: https://codeberg.org/vimproved/vimsys.git
    masters: gentoo vimproved
    volatile: False

Installed sets: @common, @desktop, @devel, @games, @hwprofile-asahi, @openrc
ACCEPT_KEYWORDS="arm64 ~arm64"
ACCEPT_LICENSE="@FREE"
ADDR2LINE="llvm-addr2line"
AR="llvm-ar"
AS="clang -c"
CBUILD="aarch64-unknown-linux-musl"
CC="clang"
CFLAGS="-mcpu=native -O3 -pipe -flto=thin"
CHOST="aarch64-unknown-linux-musl"
CONFIG_PROTECT="/etc /usr/share/config /usr/share/gnupg/qualified.txt /var/bind"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c"
CPP="clang-cpp"
CXX="clang++"
CXXFLAGS="-mcpu=native -O3 -pipe -flto=thin"
DISTDIR="/var/cache/distfiles"
EMERGE_DEFAULT_OPTS="--with-bdeps=y"
ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GDK_PIXBUF_MODULE_FILE GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR XDG_STATE_HOME"
FCFLAGS="-O2"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs binpkg-multi-instance buildpkg-live candy config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync merge-wait network-sandbox news parallel-fetch pid-sandbox pkgdir-index-trusted preserve-libs protect-owned qa-unresolved-soname-deps sandbox strict strict-keepdir unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync warn-on-large-env xattr"
FFLAGS="-O2"
GENTOO_MIRRORS="https://mirrors.rit.edu/gentoo/"
INSTALL_MASK="charset.alias /usr/share/locale/locale.alias"
LANG="en_US.UTF-8"
LD="ld.lld"
LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--as-needed"
LEX="reflex"
LIBTOOL="rclibtool"
MAKEOPTS="-j12 LIBTOOL=rclibtool"
NM="llvm-nm"
OBJCOPY="llvm-objcopy"
OBJDUMP="llvm-objdump"
PKGDIR="/var/cache/binpkgs"
PORTAGE_COMPRESS="gzip"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/var/tmp"
RANLIB="llvm-ranlib"
READELF="llvm-readelf"
RUSTFLAGS="-C target-cpu=native"
SHELL="/bin/zsh"
STRINGS="llvm-strings"
STRIP="llvm-strip"
USE="acl arm64 bzip2 clang crypt elogind iconv ipv6 libtirpc llvm-libunwind ncurses nls opengl openmp pam pcre pic readline seccomp ssl test-rust udev unicode vulkan wayland xattr zlib" ADA_TARGET="gcc_14" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_anon authn_dbm authn_file authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir env expires ext_filter file_cache filter headers include info log_config logio mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_ARM="edsp vfp vfpv3 vfpv4 vfp-d32 aes sha1 sha2 crc32 asimddp i8mm v8" ELIBC="musl" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax navcom oceanserver oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 tsip tripmate tnt ublox" GUILE_SINGLE_TARGET="3-0" GUILE_TARGETS="3-0" INPUT_DEVICES="libinput" KERNEL="linux" L10N="en en-US" LCD_DEVICES="bayrad cfontz glk hd44780 lb216 lcdm001 mtxorb text" LLVM_SLOT="19" LLVM_TARGETS="AArch64" LUA_SINGLE_TARGET="luajit" LUA_TARGETS="luajit" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php8-2" POSTGRES_TARGETS="postgres16" PYTHON_SINGLE_TARGET="python3_13" PYTHON_TARGETS="python3_12 python3_13" RUBY_TARGETS="ruby34" VIDEO_CARDS="asahi" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipp2p iface geoip fuzzy condition tarpit sysrq proto logmark ipmark dhcpmac delude chaos account"
YACC="byacc"
Unset:  ARFLAGS, ASFLAGS, CCLD, CONFIG_SHELL, CPPFLAGS, CTARGET, CXXFILT, ELFEDIT, EXTRA_ECONF, F77FLAGS, FC, GCOV, GPROF, LC_ALL, LFLAGS, LINGUAS, MAKE, MAKEFLAGS, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, PYTHONPATH, SIZE, YFLAGS
Comment 1 Holger Hoffstätte 2025-03-08 09:46:48 UTC
Things were moved around in this commit:
https://github.com/systemd/systemd/commit/0deb12a857271ac88cdaf4cf2104703e8809ec8b
Comment 2 Brahmajit Das 2025-03-09 23:40:57 UTC
Created attachment 920448 [details, diff]
Refreshed 0019-Adjust-for-musl-headers.patch
Comment 3 Brahmajit Das 2025-03-09 23:47:26 UTC
Sam, Floppym, mind taking in the patch (since it's coming from d.g.o.)
Thanks!
Comment 4 Brahmajit Das 2025-03-09 23:50:03 UTC
basically src/shared/linux/ethtool.h was moved/renamed to src/basic/linux/ethtool.h
Comment 5 Larry the Git Cow gentoo-dev 2025-03-10 01:31:52 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4264abb800d195916c4b8a52ad90bba4622ebb12

commit 4264abb800d195916c4b8a52ad90bba4622ebb12
Author:     Mike Gilbert <floppym@gentoo.org>
AuthorDate: 2025-03-10 01:29:21 +0000
Commit:     Mike Gilbert <floppym@gentoo.org>
CommitDate: 2025-03-10 01:29:30 +0000

    sys-apps/systemd-utils: fix musl patch
    
    Thanks to Brahmajit Das for updating the patch.
    
    Closes: https://bugs.gentoo.org/950753
    Signed-off-by: Mike Gilbert <floppym@gentoo.org>

 sys-apps/systemd-utils/Manifest                    | 1 +
 sys-apps/systemd-utils/systemd-utils-256.12.ebuild | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)