diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh index 2a0ecf366fc024..f11e12beac78e3 100644 --- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh +++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh @@ -47,9 +47,9 @@ store_pkgdestdir_rundeps() { parse_shlib_needed() { while read -r f; do - lf=${f#${PKGDESTDIR}} + lf=${f#"$PKGDESTDIR"} for x in ${skiprdeps}; do - if [ "$x" = "$lf" -o "$x" = "${lf#$PKGDESTDIR}" ]; then + if [ "$x" = "$lf" ] || [ "$x" = "${lf#"$PKGDESTDIR"}" ]; then found=1 break fi @@ -71,6 +71,35 @@ parse_shlib_needed() { done } +parse_dlopen_elfnote() { + local PYTHON="$(command -v python3)" + while read -r f; do + lf="${f#"$PKGDESTDIR"}" + for x in ${skiprdeps}; do + if [ "$x" = "$lf" ] || [ "$x" = "${lf#"$PKGDESTDIR"}" ]; then + found=1 + break + fi + done + if [ -n "$found" ]; then + msg_normal "Skipping dependency scan for ${lf}\n" >&3 + unset found + continue + fi + read -rn4 elfmagic < "$f" + if [ "$elfmagic" = $'\177ELF' ]; then + if $READELF -n "$f" | grep -q .note.dlopen; then + if [ -n "$PYTHON" ]; then + $OBJCOPY --dump-section .note.dlopen=/dev/stdout "$f" 2>/dev/null | + $PYTHON "${XBPS_COMMONDIR}"/scripts/parse-dlopen-notes.py + else + msg_error "Cannot read dlopen metadata (python3 not available)\n" + fi + fi + fi + done +} + hook() { local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps local _shlib_dir="${XBPS_STATEDIR}/shlib-provides" @@ -95,6 +124,7 @@ hook() { _shlibtmp=$(mktemp) || exit 1 parse_shlib_needed 3>&1 >"$_shlibtmp" <"$depsftmp" + parse_dlopen_elfnote 3>&1 >"$_shlibtmp" <"$depsftmp" rm -f "$depsftmp" verify_deps=$(sort <"$_shlibtmp" | uniq) rm -f "$_shlibtmp" diff --git a/common/scripts/parse-dlopen-notes.py b/common/scripts/parse-dlopen-notes.py new file mode 100644 index 00000000000000..ab925908caaded --- /dev/null +++ b/common/scripts/parse-dlopen-notes.py @@ -0,0 +1,38 @@ +#!/usr/bin/python3 + +import json +import os +import sys + +wordsz = 4 # Elf32_Word and Elf64_Word + +def align_up(v: int) -> int: + if v % wordsz == 0: + return v + return v + (wordsz - (v % wordsz)) + +if __name__ == "__main__": + endian = "little" if os.environ.get("XBPS_TARGET_ENDIAN", "le") == "le" else "big" + shlibs = set() + while True: + try: + namesz = int.from_bytes(sys.stdin.buffer.read(wordsz), byteorder=endian) + descsz = int.from_bytes(sys.stdin.buffer.read(wordsz), byteorder=endian) + type_ = int.from_bytes(sys.stdin.buffer.read(wordsz), byteorder=endian) + + if namesz == 0 and descsz == 0 and type_ == 0: + break + + name = sys.stdin.buffer.read(namesz).decode().rstrip("\0") + desc = sys.stdin.buffer.read(align_up(descsz)).decode().rstrip("\0") + + if name == "FDO" and type_ == 0x407c0c0a: + data = json.loads(desc) + for item in data: + if item.get("priority", "required") in ("recommended", "required"): + shlibs.update(item.get("soname", [])) + except EOFError: + break + + for shlib in shlibs: + print(shlib) diff --git a/common/shlibs b/common/shlibs index 472814c8391525..86024dad9a8c47 100644 --- a/common/shlibs +++ b/common/shlibs @@ -228,7 +228,7 @@ libgirepository-gimarshallingtests-1.0.so libgirepository-1.30_1 libgirepository-everything-1.0.so libgirepository-1.30_1 libgirepository-1.0.so.1 libgirepository-1.30_1 libudev.so.0 libudev0-shim-1_1 -libudev.so.1 eudev-libudev-1.6_1 +libudev.so.1 libudev-261.2_1 libgudev-1.0.so.0 libgudev-230_1 libumockdev.so.0 libumockdev-0.17.6_1 libext2fs.so.2 e2fsprogs-libs-1.41.5_1 diff --git a/etc/defaults.virtual b/etc/defaults.virtual index a00753d72fad1e..195a7535dae891 100644 --- a/etc/defaults.virtual +++ b/etc/defaults.virtual @@ -23,7 +23,6 @@ awk gawk emacs emacs java-environment openjdk8 java-runtime openjdk8-jre -libudev eudev-libudev lightdm-greeter base-chroot-cyclic-solver nodejs-runtime nodejs ntp-daemon chrony diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template index 16b124822b1427..a5854da3e5393f 100644 --- a/srcpkgs/Clightd/template +++ b/srcpkgs/Clightd/template @@ -5,7 +5,7 @@ revision=2 build_style=cmake configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1 -DENABLE_SCREEN=1" hostmakedepends="pkg-config wayland-devel" -makedepends="eudev-libudev-devel libmodule-devel polkit-devel elogind-devel +makedepends="udev-devel libmodule-devel polkit-devel elogind-devel libXrandr-devel libXext-devel libX11-devel ddcutil-devel libjpeg-turbo-devel wayland-devel libdrm-devel libusb-devel libiio-devel" depends="ddcutil" diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 6b11cd5f4987bc..b05115435fb187 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -24,7 +24,7 @@ hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel libnl3-devel polkit-devel ppp-devel libcurl-devel libnvme-devel ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel - libpsl-devel eudev-libudev-devel mobile-broadband-provider-info gnutls-devel + libpsl-devel udev-devel mobile-broadband-provider-info gnutls-devel $(vopt_if gir 'libgirepository-devel python3-gobject') $(vopt_if elogind elogind-devel)" depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info" diff --git a/srcpkgs/QLC+/template b/srcpkgs/QLC+/template index d83f8b5703f450..19a4d62ed92f8a 100644 --- a/srcpkgs/QLC+/template +++ b/srcpkgs/QLC+/template @@ -4,7 +4,7 @@ version=4.14.1 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools" -makedepends="eudev-libudev-devel qt5-devel qt5-declarative-devel +makedepends="udev-devel qt5-devel qt5-declarative-devel qt5-multimedia-devel qt5-script-devel qt5-websockets-devel qt5-serialport-devel qt5-svg-devel qt5-tools-devel alsa-lib-devel libftdi1-devel libusb-compat-devel libsndfile-devel libmad-devel" diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template index e3459e67e97bf4..322f4e866307c7 100644 --- a/srcpkgs/SDL2/template +++ b/srcpkgs/SDL2/template @@ -7,7 +7,7 @@ configure_args="-DSDL_ALSA=ON -DSDL_ESD=OFF -DSDL_RPATH=OFF -DSDL_CLOCK_GETTIME=ON -DSDL_PULSEAUDIO_SHARED=OFF -DSDL_ALSA_SHARED=OFF -DSDL_DBUS=ON" hostmakedepends="pkg-config nasm" -makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel +makedepends="alsa-lib-devel dbus-devel udev-devel libusb-compat-devel libsamplerate-devel" short_desc="Simple DirectMedia Layer (version 2)" maintainer="Orphaned " diff --git a/srcpkgs/SDL3/template b/srcpkgs/SDL3/template index 5d3f800ad094a4..ddc88c5ca28d66 100644 --- a/srcpkgs/SDL3/template +++ b/srcpkgs/SDL3/template @@ -7,7 +7,7 @@ configure_args="-DSDL_ALSA=ON -DSDL_RPATH=OFF -DSDL_CLOCK_GETTIME=ON -DSDL_PULSEAUDIO_SHARED=OFF -DSDL_ALSA_SHARED=OFF -DSDL_DBUS=ON" hostmakedepends="pkg-config nasm" -makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel +makedepends="alsa-lib-devel dbus-devel udev-devel libusb-compat-devel libsamplerate-devel" short_desc="Simple DirectMedia Layer (version 3)" maintainer="Orphaned " diff --git a/srcpkgs/SwayOSD/template b/srcpkgs/SwayOSD/template index aac85a0e22c366..0ff3754b7511a4 100644 --- a/srcpkgs/SwayOSD/template +++ b/srcpkgs/SwayOSD/template @@ -5,7 +5,7 @@ revision=1 build_style=meson build_helper="rust" hostmakedepends="pkg-config ninja sassc cargo glib-devel autoconf automake libtool" -makedepends="gdk-pixbuf-devel cairo-devel pango-devel graphene-devel gtk4-devel gtk4-layer-shell-devel rust-std libevdev-devel libinput-devel eudev-libudev-devel" +makedepends="gdk-pixbuf-devel cairo-devel pango-devel graphene-devel gtk4-devel gtk4-layer-shell-devel rust-std libevdev-devel libinput-devel udev-devel" short_desc="GTK based on screen display for keyboard shortcuts" maintainer="Stefan " license="GPL-3.0-only" diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template index 172123464a89d6..7eaf780a326ec5 100644 --- a/srcpkgs/Waybar/template +++ b/srcpkgs/Waybar/template @@ -14,7 +14,7 @@ configure_args="-Dlibudev=enabled -Dman-pages=enabled $(vopt_feature pipewire wireplumber)" hostmakedepends="cmake pkg-config glib-devel wayland-devel scdoc $(vopt_if dbusmenugtk gobject-introspection)" -makedepends="libevdev-devel libinput-devel wayland-devel gtkmm-devel spdlog eudev-libudev-devel +makedepends="libevdev-devel libinput-devel wayland-devel gtkmm-devel spdlog udev-devel gtk-layer-shell-devel jsoncpp-devel libglib-devel libsigc++-devel fmt-devel chrono-date-devel playerctl-devel upower-devel $(vopt_if pipewire 'wireplumber-devel pipewire-devel') diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template index bbd94503bd55f0..9e0f53d06f0e66 100644 --- a/srcpkgs/apt/template +++ b/srcpkgs/apt/template @@ -7,7 +7,7 @@ configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian -DDOCBOOK_XSL=/usr/share/xsl/docbook" hostmakedepends="dpkg pkg-config docbook-xsl doxygen po4a w3m libxslt triehash" makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel - libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel + libzstd-devel libseccomp-devel udev-devel dpkg-devel gtest-devel libgcrypt-devel xxHash-devel" checkdepends="dpkg runit-void tar" short_desc="APT package management tools" diff --git a/srcpkgs/base-container-full/template b/srcpkgs/base-container-full/template index eed1d97fdc6224..1df070fb5122b3 100644 --- a/srcpkgs/base-container-full/template +++ b/srcpkgs/base-container-full/template @@ -1,12 +1,12 @@ # Template file for 'base-container-full' pkgname=base-container-full version=0.11 -revision=3 +revision=4 metapackage=yes depends="base-files ncurses coreutils findutils diffutils dash bash grep gzip file sed gawk less util-linux which tar man-pages mdocml>=1.13.3 shadow e2fsprogs btrfs-progs xfsprogs f2fs-tools dosfstools kbd - procps-ng tzdata pciutils iana-etc eudev runit-void openssh dhcpcd + procps-ng tzdata pciutils iana-etc udev runit-void openssh dhcpcd iproute2 iputils iw xbps nvi sudo traceroute kmod removed-packages" short_desc="Void Linux base system meta package for containers/chroots" maintainer="Enno Boland " diff --git a/srcpkgs/base-system/template b/srcpkgs/base-system/template index 929eb75c408050..dc5fb0094d14ed 100644 --- a/srcpkgs/base-system/template +++ b/srcpkgs/base-system/template @@ -1,7 +1,7 @@ # Template file for 'base-system' pkgname=base-system version=0.114 -revision=2 +revision=3 metapackage=yes short_desc="Void Linux base system meta package" maintainer="Enno Boland " @@ -14,7 +14,7 @@ depends=" mdocml>=1.13.3 shadow e2fsprogs btrfs-progs xfsprogs f2fs-tools dosfstools procps-ng tzdata pciutils usbutils iana-etc openssh dhcpcd kbd iproute2 iputils iw wpa_supplicant xbps nvi sudo wifi-firmware - void-artwork traceroute ethtool kmod acpid eudev runit-void removed-packages" + void-artwork traceroute ethtool kmod acpid udev runit-void removed-packages" case "$XBPS_TARGET_MACHINE" in *-musl) depends+=" musl";; diff --git a/srcpkgs/bcachefs-tools/template b/srcpkgs/bcachefs-tools/template index 3ed00fe01100a6..4cc3dae3879904 100644 --- a/srcpkgs/bcachefs-tools/template +++ b/srcpkgs/bcachefs-tools/template @@ -8,7 +8,7 @@ make_install_args="ROOT_SBINDIR=/usr/bin" make_use_env=yes hostmakedepends="cargo clang19-devel jq liburcu-devel llvm19 pkg-config" makedepends="rust attr-devel keyutils-devel libaio-devel libblkid-devel - liblz4-devel libscrypt-devel libsodium-devel eudev-libudev-devel liburcu-devel + liblz4-devel libscrypt-devel libsodium-devel udev-devel liburcu-devel libuuid-devel libzstd-devel zlib-devel" short_desc="Userspace tools for bcachefs" maintainer="Orphaned " diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index 088ab798eec13e..8aae26333d7111 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -8,7 +8,7 @@ configure_args="--with-udevdir=/usr/lib/udev --disable-systemd --enable-external-ell --enable-mesh --enable-nfc --enable-experimental --enable-hid2hci" hostmakedepends="automake flex libtool pkg-config python3-docutils" -makedepends="cups-devel eudev-libudev-devel libglib-devel libical-devel +makedepends="cups-devel udev-devel libglib-devel libical-devel readline-devel ell-devel json-c-devel" short_desc="Bluetooth tools and daemons" maintainer="Érico Nogueira " diff --git a/srcpkgs/bolt/template b/srcpkgs/bolt/template index 1d08703c3622c8..072abb72245bb2 100644 --- a/srcpkgs/bolt/template +++ b/srcpkgs/bolt/template @@ -6,7 +6,7 @@ build_style=meson configure_args="-Dman=true -Dsystemd=false" make_dirs="/var/lib/boltd 0755 root root" hostmakedepends="asciidoc glib-devel pkg-config" -makedepends="eudev-libudev-devel libglib-devel polkit-devel" +makedepends="udev-devel libglib-devel polkit-devel" checkdepends="dbus" short_desc="Thunderbolt 3 device manager" maintainer="Enno Boland " diff --git a/srcpkgs/bootiso/template b/srcpkgs/bootiso/template index 40bf112435dc99..5812a2693dedbe 100644 --- a/srcpkgs/bootiso/template +++ b/srcpkgs/bootiso/template @@ -3,7 +3,7 @@ pkgname=bootiso version=4.2.0 revision=3 build_style=gnu-makefile -depends="bash bc binutils curl dosfstools e2fsprogs eudev exfatprogs +depends="bash bc binutils curl dosfstools e2fsprogs udev exfatprogs f2fs-tools file ncurses ntfs-3g rsync syslinux wimlib jq" short_desc="Create a USB bootable device from an ISO image easily and securely" maintainer="Orphaned " diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template index 4104f09ed78f85..11d1fe6c7c93b5 100644 --- a/srcpkgs/btrfs-progs/template +++ b/srcpkgs/btrfs-progs/template @@ -7,7 +7,7 @@ make_check_target=test configure_args="--disable-backtrace --disable-python" hostmakedepends="pkgconf python3-Sphinx python3-sphinx_rtd_theme" makedepends="acl-devel libzstd-devel lzo-devel libblkid-devel libuuid-devel - eudev-libudev-devel zlib-devel + udev-devel zlib-devel $(vopt_if e2fs 'e2fsprogs-devel') $(vopt_if reiserfs 'reiserfsprogs')" short_desc="Btrfs filesystem utilities" maintainer="Enno Boland " diff --git a/srcpkgs/ckb-next/template b/srcpkgs/ckb-next/template index bc590ac91eb2af..4bc72252996595 100644 --- a/srcpkgs/ckb-next/template +++ b/srcpkgs/ckb-next/template @@ -6,7 +6,7 @@ build_style=cmake configure_args="-DDISABLE_UPDATER=1 -DUDEV_RULE_DIRECTORY=/usr/lib/udev/rules.d -DPREFER_QT6=ON" hostmakedepends="qt6-base pkg-config qt6-tools" -makedepends="eudev-libudev-devel qt6-base-devel qt6-qt5compat-devel +makedepends="udev-devel qt6-base-devel qt6-qt5compat-devel quazip-qt6-devel xcb-util-wm-devel pulseaudio-devel" short_desc="Corsair RGB Driver for Linux" diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template index d49446154207f4..7f82106c40798e 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -11,7 +11,7 @@ hostmakedepends="automake libtool pkg-config intltool glib-devel gettext-devel gtk-doc" makedepends="atk-devel pango-devel libXi-devel libXcomposite-devel json-glib-devel libgudev-devel libxkbcommon-devel cogl-devel libinput-devel libevdev-devel - eudev-libudev-devel gtk+3-devel" + udev-devel gtk+3-devel" short_desc="OpenGL based interactive canvas library" maintainer="Orphaned " license="LGPL-2.1-or-later" diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template index 0ecdc16918ddb7..ee1925f0c822f4 100644 --- a/srcpkgs/colord/template +++ b/srcpkgs/colord/template @@ -43,7 +43,7 @@ libcolord_package() { } } colord-devel_package() { - depends="dbus-devel libglib-devel lcms2-devel eudev-libudev-devel + depends="dbus-devel libglib-devel lcms2-devel udev-devel libgusb-devel libcolord>=${version}_${revision}" short_desc+=" - development files" pkg_install() { diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index c316de48626fc5..7fa8ae27067de7 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -8,7 +8,7 @@ configure_args=" --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run/dhcpcd $(vopt_if privsep --privsepuser=_dhcpcd) $(vopt_enable privsep)" hostmakedepends="ntp pkg-config" -makedepends="eudev-libudev-devel" +makedepends="udev-devel" short_desc="RFC2131 compliant DHCP client" maintainer="Orphaned " license="BSD-2-Clause" diff --git a/srcpkgs/direwolf/template b/srcpkgs/direwolf/template index 3f6f35f833d054..20c6709e7ba04f 100644 --- a/srcpkgs/direwolf/template +++ b/srcpkgs/direwolf/template @@ -3,7 +3,7 @@ pkgname=direwolf version=1.8.1 revision=1 build_style=cmake -makedepends="alsa-lib-devel hamlib-devel eudev-libudev-devel" +makedepends="alsa-lib-devel hamlib-devel udev-devel" short_desc="AX.25 packet modem/TNC and APRS encoder/decoder" maintainer="classabbyamp " license="GPL-2.0-or-later" diff --git a/srcpkgs/doom3/template b/srcpkgs/doom3/template index 81f4f44f2aba87..4cdb715af2951a 100644 --- a/srcpkgs/doom3/template +++ b/srcpkgs/doom3/template @@ -2,7 +2,7 @@ pkgname=doom3 version=1.3.1.1304 revision=4 -depends="virtual?libudev alsa-lib libXext desktop-file-utils" +depends="libudev alsa-lib libXext desktop-file-utils" short_desc="Doom 3 for Linux" maintainer="Orphaned " license="Propietary" diff --git a/srcpkgs/dosfstools/template b/srcpkgs/dosfstools/template index edfdf079db8725..3d4829ffa5612c 100644 --- a/srcpkgs/dosfstools/template +++ b/srcpkgs/dosfstools/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--enable-compat-symlinks" hostmakedepends="pkg-config" -makedepends="eudev-libudev-devel" +makedepends="udev-devel" short_desc="DOS filesystem tools" maintainer="Enno Boland " license="GPL-3.0-or-later" diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 098578f1f061c8..3d85115ba4778d 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,20 +1,20 @@ # Template file for 'dracut' pkgname=dracut version=109 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc" conf_files="/etc/dracut.conf" hostmakedepends="pkg-config ruby-asciidoctor" makedepends="libkmod-devel" -depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux" +depends="bash coreutils cpio udev gzip kmod>=3.7 kpartx util-linux" short_desc="Low-level tool for generating an initramfs/initrd image" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" -homepage="https://github.com/dracut-ng/dracut-ng/wiki" -changelog="https://raw.githubusercontent.com/dracut-ng/dracut-ng/master/NEWS.md" -distfiles="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${version}.tar.gz" -checksum=6f5b84c6db4381c5bca59c38b18613037c6aafd1aff8cadea22bb83fb8850bcf +homepage="https://github.com/dracut-ng/dracut/wiki" +changelog="https://raw.githubusercontent.com/dracut-ng/dracut/master/NEWS.md" +distfiles="https://github.com/dracut-ng/dracut/archive/refs/tags/${version}.tar.gz" +checksum=159f83eab58a45885c0c2cc6969c35dc5ebac7b7340e659abe5cc9b8b452bf4b alternatives=" initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm diff --git a/srcpkgs/drbd-utils/template b/srcpkgs/drbd-utils/template index 10574a2bee1164..baa115b2007e5f 100644 --- a/srcpkgs/drbd-utils/template +++ b/srcpkgs/drbd-utils/template @@ -20,8 +20,8 @@ configure_args=" conf_files=" /etc/drbd.conf /etc/drbd.d/global_common.conf" -hostmakedepends="automake libtool flex pkg-config eudev libxslt docbook-xsl po4a" -makedepends="eudev-libudev-devel" +hostmakedepends="automake libtool flex pkg-config udev libxslt docbook-xsl po4a" +makedepends="udev-devel" short_desc="Distributed replicated storage" maintainer="Enno Boland " license="GPL-2.0-or-later" diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index 95be0e7ab03a22..11de852b2cb880 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -28,7 +28,7 @@ makedepends=" gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel) libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel - avahi-libs-devel eudev-libudev-devel libgomp-devel + avahi-libs-devel udev-devel libgomp-devel libsndfile-devel libmount-devel LuaJIT-devel poppler-cpp-devel librsvg-devel libspectre-devel libraw-devel libopenjpeg2-devel libheif-devel libavif-devel lua52-devel openh264-devel libjxl-devel diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template index 3c6c36e349e95b..8ebe98cd131ac9 100644 --- a/srcpkgs/elogind/template +++ b/srcpkgs/elogind/template @@ -11,7 +11,7 @@ configure_args="-Dcgroup-controller=elogind -Ddefault-hierarchy=legacy -Drootlibexecdir=/usr/libexec/elogind" hostmakedepends="docbook-xsl glib-devel gperf gettext libxslt m4 pkg-config python3-Jinja2 shadow" -makedepends="acl-devel eudev-libudev-devel libcap-devel +makedepends="acl-devel udev-devel libcap-devel libglib-devel libseccomp-devel pam-devel" depends="dbus" short_desc="Standalone logind fork" diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template index 1460bcdb133729..ee70d96f32421f 100644 --- a/srcpkgs/eudev/template +++ b/srcpkgs/eudev/template @@ -1,51 +1,24 @@ # Template file for 'eudev' - -_UDEV_VERSION="251" # compatible udev version provided - pkgname=eudev version=3.2.14 -revision=2 -build_style=gnu-configure -configure_args="--enable-hwdb --enable-manpages" -hostmakedepends="pkg-config gperf" -makedepends="libblkid-devel libkmod-devel" -checkdepends="xz tar perl" +revision=3 +metapackage=yes +depends="udev>=261.2_1" short_desc="Fork of systemd-udev (enhanced userland device daemon)" -maintainer="Enno Boland " +maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/eudev-project/eudev" -changelog="https://github.com/eudev-project/eudev/releases" -distfiles="https://github.com/eudev-project/eudev/releases/download/v${version}/eudev-${version}.tar.gz" -checksum=8da4319102f24abbf7fff5ce9c416af848df163b29590e666d334cc1927f006f -conf_files="/etc/udev/udev.conf" -if [ "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then - # requires unshare(2) which is not available in chroot - make_check=no -fi - -post_install() { - mv "${DESTDIR}/etc/udev/hwdb.d" "${DESTDIR}/usr/lib/udev" - vsv udevd -} +short_desc+=" (transitional dummy package)" eudev-libudev-devel_package() { - provides="libudev-devel-${_UDEV_VERSION}_${revision}" - depends="eudev-libudev>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/share/pkgconfig - } + depends="udev-devel>=261.2_1" + short_desc+=" - development files (transitional dummy package)" + metapackage=yes } eudev-libudev_package() { - provides="libudev-${_UDEV_VERSION}_${revision}" - short_desc+=" - runtime library" - pkg_install() { - vmove "usr/lib/*.so.*" - } + depends="libudev>=261.2_1" + short_desc+=" - runtime library (transitional dummy package)" + metapackage=yes } diff --git a/srcpkgs/f3/template b/srcpkgs/f3/template index 6ccab4425ac6bd..3686b057a8dff2 100644 --- a/srcpkgs/f3/template +++ b/srcpkgs/f3/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-makefile make_build_target="all extra" make_install_target="install install-extra" -makedepends="eudev-libudev-devel libparted-devel" +makedepends="udev-devel libparted-devel" short_desc="Test real flash memory capacity" maintainer="0x5c " license="GPL-3.0-or-later" diff --git a/srcpkgs/flashrom/template b/srcpkgs/flashrom/template index 8a4dd657ba1934..cf3bc545f2e71d 100644 --- a/srcpkgs/flashrom/template +++ b/srcpkgs/flashrom/template @@ -5,7 +5,7 @@ revision=1 build_style=meson configure_args="-Duse_internal_dmi=false -Ddocumentation=enabled" hostmakedepends="pkg-config python3-Sphinx" -makedepends="pciutils-devel libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel libjaylink-devel" +makedepends="pciutils-devel libusb-compat-devel libftdi1-devel udev-devel zlib-devel libjaylink-devel" depends="dmidecode" short_desc="Utility for reading, writing, erasing and verifying flash ROM chips" maintainer="Orphaned " @@ -17,7 +17,7 @@ make_check=no # can't run without special setup..? flashrom-devel_package() { depends="${sourcepkg}>=${version}_${revision} pciutils-devel - libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel + libusb-compat-devel libftdi1-devel udev-devel zlib-devel libjaylink-devel python3-Sphinx" short_desc+=" - development files" pkg_install() { diff --git a/srcpkgs/framework-system/template b/srcpkgs/framework-system/template index fd168ca7e2306e..ae0e13973e9c61 100644 --- a/srcpkgs/framework-system/template +++ b/srcpkgs/framework-system/template @@ -6,7 +6,7 @@ archs="x86_64*" build_style=cargo configure_args="-F nvidia" hostmakedepends="pkg-config" -makedepends="libgit2-1.9-devel eudev-libudev-devel" +makedepends="libgit2-1.9-devel udev-devel" short_desc="Tools to interact with the Framework Computer systems" maintainer="Duncaen " license="BSD-3-Clause" diff --git a/srcpkgs/fuse3/template b/srcpkgs/fuse3/template index e61fbe952203a5..9302130ac7fad7 100644 --- a/srcpkgs/fuse3/template +++ b/srcpkgs/fuse3/template @@ -6,7 +6,7 @@ build_style=meson configure_args="--sbindir=bin -Db_lto=false -Dexamples=false -Duseroot=false -Dtests=false -Ddefault_library=both" hostmakedepends="pkg-config" -makedepends="eudev-libudev-devel" +makedepends="udev-devel" short_desc="Filesystem in Userspace 3.x" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template index 63dedf7792078b..de7f777021a99e 100644 --- a/srcpkgs/gnome-bluetooth/template +++ b/srcpkgs/gnome-bluetooth/template @@ -7,7 +7,7 @@ build_style=meson configure_args="-Dgtk_doc=false $(vopt_bool gir introspection)" hostmakedepends="pkg-config gettext glib-devel libxml2" makedepends="gtk4-devel libadwaita-devel gsound-devel libnotify-devel - eudev-libudev-devel upower-devel" + udev-devel upower-devel" depends="bluez" short_desc="GNOME Bluetooth Subsystem" maintainer="Orphaned " diff --git a/srcpkgs/gnome-bluetooth1/template b/srcpkgs/gnome-bluetooth1/template index 7558ed3b5300e9..84f62381513cb5 100644 --- a/srcpkgs/gnome-bluetooth1/template +++ b/srcpkgs/gnome-bluetooth1/template @@ -7,7 +7,7 @@ build_style=meson configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)" hostmakedepends="pkg-config gettext itstool $(vopt_if gir gobject-introspection) glib-devel" makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel - bluez eudev-libudev-devel libcanberra-devel" + bluez udev-devel libcanberra-devel" depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils" checkdepends="python3-dbus" short_desc="GNOME Bluetooth Subsystem" diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index 3d4c129f6ddf05..cde2a8b16073bc 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -7,7 +7,7 @@ build_helper="gir" configure_args="-Dudev=enabled -Dsystemd=disabled -Dintrospection=$(vopt_if gir true false)" hostmakedepends="gettext itstool pkg-config glib-devel" -makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel +makedepends="udev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel libxkbfile-devel libXrandr-devel gdk-pixbuf-devel" depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config" @@ -26,7 +26,7 @@ build_options_default="gir" gnome-desktop-devel_package() { depends="gtk+3-devel gsettings-desktop-schemas-devel gdk-pixbuf-devel iso-codes libX11-devel libglib-devel libseccomp-devel libxkbfile-devel - xkeyboard-config eudev-libudev-devel ${sourcepkg}>=${version}_${revision}" + xkeyboard-config udev-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index 393893a52816dd..4ecf89b0315ea2 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -15,7 +15,7 @@ makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr4-de elogind-devel" depends="hicolor-icon-theme" checkdepends="elogind libnotify python3-dbusmock python3-gobject - python3-pycodestyle which hwids eudev" + python3-pycodestyle which hwids udev" short_desc="GNOME settings daemon" maintainer="Orphaned " license="GPL-3.0-or-later" diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index 1b4aac9c6bf3f8..76b2dfa4141d61 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -8,7 +8,7 @@ make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd make_install_args="$make_build_args" hostmakedepends="pkg-config bc python3-pyserial python3-setuptools libxslt xmlto" -makedepends="eudev-libudev-devel ntp libusb-devel ncurses-devel gtk+3-devel +makedepends="udev-devel ntp libusb-devel ncurses-devel gtk+3-devel pps-tools-devel libcap-devel libbluetooth-devel qt5-devel" short_desc="GPS/AIS receiver monitoring daemon" maintainer="Orphaned " diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template index 5ece3f4dc8d26b..98b49ec044fb50 100644 --- a/srcpkgs/growlight/template +++ b/srcpkgs/growlight/template @@ -6,7 +6,7 @@ build_style=cmake configure_args="$(vopt_bool zfs USE_LIBZFS) $(vopt_bool man USE_PANDOC)" hostmakedepends="pkg-config $(vopt_if man pandoc)" makedepends="libatasmart-devel libblkid-devel libcap-devel cryptsetup-devel - nettle-devel notcurses-devel libpciaccess-devel eudev-libudev-devel zlib-devel + nettle-devel notcurses-devel libpciaccess-devel udev-devel zlib-devel device-mapper-devel pciutils-devel doctest-devel $(vopt_if zfs zfs-devel)" depends="ntfs-3g jfsutils xfsprogs nvme-cli hdparm f2fs-tools btrfs-progs e2fsprogs" short_desc="Block device manager and system installation tool" diff --git a/srcpkgs/guvcview/template b/srcpkgs/guvcview/template index a9d75922e3573b..51221cb113b102 100644 --- a/srcpkgs/guvcview/template +++ b/srcpkgs/guvcview/template @@ -5,7 +5,7 @@ revision=2 build_style=gnu-configure configure_args="--disable-static --disable-debian-menu" hostmakedepends="pkg-config intltool autoconf automake libtool glib-devel" -makedepends="eudev-libudev-devel gtk+3-devel SDL2-devel ffmpeg6-devel libusb-devel +makedepends="udev-devel gtk+3-devel SDL2-devel ffmpeg6-devel libusb-devel pulseaudio-devel v4l-utils-devel portaudio-devel gsl-devel" depends="desktop-file-utils" short_desc="Simple GTK interface for capturing and viewing video from UVC devices" diff --git a/srcpkgs/hidapi/template b/srcpkgs/hidapi/template index 66bc48f737c9b2..9321a914c85566 100644 --- a/srcpkgs/hidapi/template +++ b/srcpkgs/hidapi/template @@ -4,7 +4,7 @@ version=0.14.0 revision=1 build_style=cmake hostmakedepends="pkg-config" -makedepends="eudev-libudev-devel libusb-devel" +makedepends="udev-devel libusb-devel" short_desc="Simple library for communicating with USB and Bluetooth HID devices" maintainer="Orphaned " license="BSD-3-Clause" diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template index 833aa7496e7c89..f2dc64994e5dcd 100644 --- a/srcpkgs/hwloc/template +++ b/srcpkgs/hwloc/template @@ -4,7 +4,7 @@ version=2.13.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="cairo-devel ncurses-devel libxml2-devel eudev-libudev-devel" +makedepends="cairo-devel ncurses-devel libxml2-devel udev-devel" checkdepends="tar" short_desc="Portable abstraction of hierarchical hardware architectures" maintainer="Leah Neukirchen " diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template index 1eea0cb49070d8..03b05f1e49d89e 100644 --- a/srcpkgs/imagescan/template +++ b/srcpkgs/imagescan/template @@ -11,7 +11,7 @@ conf_files="/etc/utsushi/combo.conf" hostmakedepends="ImageMagick pkg-config sane" makedepends="boost-devel-minimal libboost_program_options libboost_filesystem libboost_iostreams libboost_unit_test_framework - eudev-libudev-devel gtkmm2-devel libusb-devel sane-devel" + udev-devel gtkmm2-devel libusb-devel sane-devel" depends="ImageMagick" short_desc="EPSON Image Scan v3 front-end and backend for scanners and all-in-ones" maintainer="Orphaned " diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template index a2f90f50de50a5..53a4a4ee69db20 100644 --- a/srcpkgs/incus/template +++ b/srcpkgs/incus/template @@ -10,7 +10,7 @@ go_package="${go_import_path}/cmd/..." make_check_args="-skip TestConvertNetworkConfig" hostmakedepends="pkg-config" makedepends="lxc-devel acl-devel cowsql-devel raft-devel - libcap-devel libuv-devel sqlite-devel eudev-libudev-devel" + libcap-devel libuv-devel sqlite-devel udev-devel" depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq nftables attr-progs ${pkgname}-client-${version}_${revision}" short_desc="Powerful system container and virtual machine manager" diff --git a/srcpkgs/interception-tools/template b/srcpkgs/interception-tools/template index bed673a48b89b7..34f0d5c02e91d2 100644 --- a/srcpkgs/interception-tools/template +++ b/srcpkgs/interception-tools/template @@ -4,7 +4,7 @@ version=0.6.7 revision=4 build_style=cmake hostmakedepends="pkg-config" -makedepends="boost-headers eudev-libudev-devel libevdev-devel yaml-cpp-devel" +makedepends="boost-headers udev-devel libevdev-devel yaml-cpp-devel" short_desc="Small set of utilities for operating on input events of evdev devices" maintainer="Sergii Bogomolov " license="GPL-3.0-only" diff --git a/srcpkgs/kaffeine/template b/srcpkgs/kaffeine/template index 0de4a7da2c6849..75996e1b610ca9 100644 --- a/srcpkgs/kaffeine/template +++ b/srcpkgs/kaffeine/template @@ -8,7 +8,7 @@ hostmakedepends="extra-cmake-modules gettext pkg-config kcoreaddons" makedepends="kio-devel ksolid-devel vlc-devel libXScrnSaver-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds - $(vopt_if dvb 'v4l-utils-devel eudev-libudev-devel')" + $(vopt_if dvb 'v4l-utils-devel udev-devel')" depends="qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds" short_desc="KDE media player" diff --git a/srcpkgs/keymapper/template b/srcpkgs/keymapper/template index d2ccf875d7bc12..ccb81e62a52122 100644 --- a/srcpkgs/keymapper/template +++ b/srcpkgs/keymapper/template @@ -5,7 +5,7 @@ revision=1 build_style=cmake configure_args="-DVERSION=${version}" hostmakedepends="pkg-config wayland-devel" -makedepends="eudev-libudev-devel libusb-devel libX11-devel dbus-devel wayland-devel libxkbcommon-devel libayatana-appindicator-devel" +makedepends="udev-devel libusb-devel libX11-devel dbus-devel wayland-devel libxkbcommon-devel libayatana-appindicator-devel" short_desc="Cross-platform context-aware key remapper" maintainer="deimonn " license="GPL-3.0-only" diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template index d34909ca7c4af0..8c54818fdf4889 100644 --- a/srcpkgs/kmscon/template +++ b/srcpkgs/kmscon/template @@ -6,7 +6,7 @@ build_style=meson configure_args="-Dwerror=false -Ddocs=enabled" hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt zlib-devel" makedepends="MesaLib-devel pango-devel libtsm-devel libxkbcommon-devel - eudev-libudev-devel libdrm-devel libgbm-devel" + udev-devel libdrm-devel libgbm-devel" depends="xkeyboard-config" checkdepends="check-devel" short_desc="Linux KMS/DRM based virtual Console Emulator" diff --git a/srcpkgs/kodi-addon-peripheral-joystick/template b/srcpkgs/kodi-addon-peripheral-joystick/template index 3f73707dc53f72..821a96b2059e6b 100644 --- a/srcpkgs/kodi-addon-peripheral-joystick/template +++ b/srcpkgs/kodi-addon-peripheral-joystick/template @@ -5,7 +5,7 @@ revision=2 _kodi_release="Matrix" build_style=cmake makedepends="kodi-devel kodi-platform-devel p8-platform-devel - eudev-libudev-devel tinyxml-devel" + udev-devel tinyxml-devel" short_desc="Kodi joystick support (drivers and button maps)" maintainer="Orphaned " license="GPL-2.0-or-later" diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index 422ba2bc5b8230..511e94bf15e143 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -31,7 +31,7 @@ hostmakedepends="automake libtool pkg-config gperf gettext zip nasm yasm python3-devel python3-packaging-bootstrap gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++" -makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel +makedepends="udev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel diff --git a/srcpkgs/kwin-x11/template b/srcpkgs/kwin-x11/template index 7ce48044c2957a..de853478f0e25d 100644 --- a/srcpkgs/kwin-x11/template +++ b/srcpkgs/kwin-x11/template @@ -24,7 +24,7 @@ makedepends="qt6-tools-devel qt6-base-private-devel qt6-sensors-devel kf6-kidletime-devel kf6-kcrash-devel kf6-kwindowsystem-devel knighttime-devel kf6-kdoctools-devel libplasma-devel wayland-devel libcanberra-devel libX11-devel libxkbcommon-devel libdrm-devel - eudev-libudev-devel lcms2-devel freetype-devel fontconfig-devel + udev-devel lcms2-devel freetype-devel fontconfig-devel libqaccessibilityclient-devel libdisplay-info-devel libgbm-devel libei-devel libxkbcommon-devel kf6-knotifications-devel elogind-devel kf6-kdbusaddons-devel" diff --git a/srcpkgs/ldm/template b/srcpkgs/ldm/template index a142dae6803b4f..724801ec5995c1 100644 --- a/srcpkgs/ldm/template +++ b/srcpkgs/ldm/template @@ -4,7 +4,7 @@ version=0.8 revision=1 build_style="gnu-makefile" hostmakedepends="perl pkg-config" -makedepends="libmount-devel eudev-libudev-devel libglib-devel" +makedepends="libmount-devel udev-devel libglib-devel" short_desc="Lightweight device mounter" maintainer="Orphaned " license="MIT" diff --git a/srcpkgs/libatasmart/template b/srcpkgs/libatasmart/template index 7714dcbfe394bc..d22559a399442e 100644 --- a/srcpkgs/libatasmart/template +++ b/srcpkgs/libatasmart/template @@ -5,7 +5,7 @@ revision=5 build_style=gnu-configure configure_args="--sbindir=/usr/bin --disable-static" hostmakedepends="automake libtool pkg-config" -makedepends="eudev-libudev-devel" +makedepends="udev-devel" short_desc="ATA S.M.A.R.T. Reading and Parsing Library" maintainer="Orphaned " license="LGPL-2.1-or-later" diff --git a/srcpkgs/libcanberra/template b/srcpkgs/libcanberra/template index 200053fc6dab69..8faafca9e7c327 100644 --- a/srcpkgs/libcanberra/template +++ b/srcpkgs/libcanberra/template @@ -8,7 +8,7 @@ configure_args="--enable-alsa --enable-null --disable-lynx hostmakedepends="gettext pkg-config gtk-doc" makedepends="gtk+3-devel libvorbis-devel libltdl-devel gstreamer1-devel alsa-lib-devel tdb-devel pulseaudio-devel - eudev-libudev-devel vala-devel" + udev-devel vala-devel" short_desc="XDG Sound Theme and Name Specification library implementation" maintainer="Orphaned " license="LGPL-2.1-or-later" diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template index 41c5985ed4d991..464ec2ff81af78 100644 --- a/srcpkgs/libcec/template +++ b/srcpkgs/libcec/template @@ -5,7 +5,7 @@ revision=6 build_style=cmake configure_args="Python_ADDITIONAL_VERSIONS=${py3_ver}" hostmakedepends="pkg-config libtool swig" -makedepends="eudev-libudev-devel p8-platform-devel +makedepends="udev-devel p8-platform-devel libXrandr-devel python3-devel" short_desc="USB CEC Adapter communication Library" maintainer="Orphaned " @@ -31,7 +31,7 @@ python3-libcec_package() { } libcec-devel_package() { short_desc+=" - development files" - depends="eudev-libudev-devel p8-platform-devel libcec>=${version}_${revision}" + depends="udev-devel p8-platform-devel libcec>=${version}_${revision}" pkg_install() { vmove usr/include vmove "usr/lib/*.so" diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template index aa2d07182b2324..8f58ffc062a360 100644 --- a/srcpkgs/libdrm/template +++ b/srcpkgs/libdrm/template @@ -5,7 +5,7 @@ revision=1 build_style=meson configure_args="-Dudev=true -Dvalgrind=disabled -Dinstall-test-programs=true" hostmakedepends="pkg-config python3-docutils" -makedepends="eudev-libudev-devel libpciaccess-devel" +makedepends="udev-devel libpciaccess-devel" short_desc="Userspace interface to kernel DRM services" maintainer="Orphaned " license="MIT" diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template index d0e6f482fef991..ad0e3dd3b5bd00 100644 --- a/srcpkgs/libfido2/template +++ b/srcpkgs/libfido2/template @@ -5,7 +5,7 @@ revision=1 build_style=cmake configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d" hostmakedepends="pkg-config" -makedepends="eudev-libudev-devel libcbor-devel openssl-devel zlib-devel" +makedepends="udev-devel libcbor-devel openssl-devel zlib-devel" short_desc="Library for FIDO 2.0, including communication with a device over USB" maintainer="Leah Neukirchen " license="BSD-2-Clause" diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template index 178bf59a61693d..3894a532d50420 100644 --- a/srcpkgs/libgudev/template +++ b/srcpkgs/libgudev/template @@ -6,7 +6,7 @@ build_style=meson build_helper="gir" configure_args="$(vopt_feature gir introspection) $(vopt_feature vala vapi)" hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)" -makedepends="libglib-devel eudev-libudev-devel" +makedepends="libglib-devel udev-devel" short_desc="Library providing GObject bindings for libudev" maintainer="Enno Boland " license="LGPL-2.1-or-later" diff --git a/srcpkgs/libinput-debug-gui/template b/srcpkgs/libinput-debug-gui/template index bb7f72e708fb27..f368cc405deee4 100644 --- a/srcpkgs/libinput-debug-gui/template +++ b/srcpkgs/libinput-debug-gui/template @@ -7,7 +7,7 @@ revision=1 build_style=meson configure_args="-Db_ndebug=false -Dtests=false -Ddebug-gui=true" hostmakedepends="pkg-config wayland-devel" -makedepends="libevdev-devel libwacom-devel mtdev-devel eudev-libudev-devel +makedepends="libevdev-devel libwacom-devel mtdev-devel udev-devel gtk4-devel" checkdepends="valgrind check-devel python3-pytest" short_desc="Provides handling input devices in Wayland compositors and X" diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template index 34e753b02f9136..5a28c0a9ad7daf 100644 --- a/srcpkgs/libinput/template +++ b/srcpkgs/libinput/template @@ -6,7 +6,7 @@ revision=1 build_style=meson configure_args="-Db_ndebug=false -Ddebug-gui=false" hostmakedepends="pkg-config" -makedepends="libevdev-devel libwacom-devel mtdev-devel eudev-libudev-devel +makedepends="libevdev-devel libwacom-devel mtdev-devel udev-devel lua54-devel" checkdepends="valgrind check-devel python3-pytest" short_desc="Provides handling input devices in Wayland compositors and X" diff --git a/srcpkgs/libmatemixer/template b/srcpkgs/libmatemixer/template index e4c27a7867cb39..f49dd4ed0ebc37 100644 --- a/srcpkgs/libmatemixer/template +++ b/srcpkgs/libmatemixer/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="--disable-static --enable-pulseaudio --enable-alsa --enable-udev" hostmakedepends="pkg-config gettext" -makedepends="libglib-devel alsa-lib-devel pulseaudio-devel eudev-libudev-devel" +makedepends="libglib-devel alsa-lib-devel pulseaudio-devel udev-devel" short_desc="MATE mixer library" maintainer="Orphaned " license="LGPL-2.1-or-later" diff --git a/srcpkgs/libratbag/template b/srcpkgs/libratbag/template index b63f9bbb9422fa..120b7836d5943f 100644 --- a/srcpkgs/libratbag/template +++ b/srcpkgs/libratbag/template @@ -6,7 +6,7 @@ build_style=meson configure_args="-Dtests=false -Dsystemd-unit-dir='' -Dsystemd=false -Db_ndebug=false" hostmakedepends="pkg-config git swig" -makedepends="elogind-devel eudev-libudev-devel libglib-devel libevdev-devel +makedepends="elogind-devel udev-devel libglib-devel libevdev-devel python3-devel json-glib-devel libunistring-devel" depends="dbus python3-evdev python3-gobject" checkdepends="dbus python3-gobject python3-evdev" diff --git a/srcpkgs/libudev b/srcpkgs/libudev new file mode 120000 index 00000000000000..b95ad750c433cb --- /dev/null +++ b/srcpkgs/libudev @@ -0,0 +1 @@ +udev \ No newline at end of file diff --git a/srcpkgs/libudev0-shim/template b/srcpkgs/libudev0-shim/template index dc7a4d7483c86a..82604e22d70832 100644 --- a/srcpkgs/libudev0-shim/template +++ b/srcpkgs/libudev0-shim/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-makefile make_use_env=yes hostmakedepends="patchelf" -makedepends="eudev-libudev-devel" +makedepends="udev-devel" short_desc="Compability library shim for libudev.so.0" maintainer="Andrew Benson " license="LGPL-2.1-or-later" diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template index e3137d3cc998d3..301d028d470fb8 100644 --- a/srcpkgs/libusb/template +++ b/srcpkgs/libusb/template @@ -4,7 +4,7 @@ version=1.0.29 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="eudev-libudev-devel" +makedepends="udev-devel" short_desc="Library which allows userspace access to USB devices" maintainer="skmpz " license="LGPL-2.1-or-later" diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index bbe424301781bc..9d6d8fe95dd71d 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -10,7 +10,7 @@ hostmakedepends="automake dnsmasq docbook-xsl gettext gettext-devel iptables rpcsvc-proto" makedepends="readline-devel libcap-ng-devel attr-devel gnutls-devel libsasl-devel libcurl-devel libpcap-devel libxml2-devel libparted-devel - device-mapper-devel eudev-libudev-devel libblkid-devel libpciaccess-devel + device-mapper-devel udev-devel libblkid-devel libpciaccess-devel avahi-libs-devel polkit-devel json-c-devel jansson-devel python3-devel libssh2-devel fuse-devel libtirpc-devel libapparmor-devel" depends="iptables dnsmasq" diff --git a/srcpkgs/linux-driver-management/template b/srcpkgs/linux-driver-management/template index 33396a0b9be32a..2667b95c87e6b7 100644 --- a/srcpkgs/linux-driver-management/template +++ b/srcpkgs/linux-driver-management/template @@ -8,7 +8,7 @@ build_style=meson build_helper=gir configure_args="-Dwith-docs=false" hostmakedepends="pkg-config glib-devel" -makedepends="libusb-devel libglib-devel eudev-libudev-devel libgirepository-devel +makedepends="libusb-devel libglib-devel udev-devel libgirepository-devel xorg-server-devel libkmod-devel gobject-introspection" checkdepends="check-devel" short_desc="Distro agnostic Plug'n'Play system for Linux" diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index 2bad1c1516ec49..17e7cc7372cff4 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -5,7 +5,7 @@ revision=8 metapackage=yes hostmakedepends="asciidoc automake flex gettext libtool perl python3-setuptools python3-docutils xmlto pkg-config" -makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel +makedepends="babeltrace-devel binutils-devel elfutils-devel udev-devel libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel slang-devel libaudit-devel libtraceevent-devel libpfm4-devel" diff --git a/srcpkgs/logiops/template b/srcpkgs/logiops/template index 2a837c60d23078..8522e7f7a72a67 100644 --- a/srcpkgs/logiops/template +++ b/srcpkgs/logiops/template @@ -5,7 +5,7 @@ revision=2 _ipcgull_rev=cd0f9a8cefb5b2545e163fceb249fdbcbaf666aa build_style=cmake hostmakedepends="pkg-config" -makedepends="libevdev-devel eudev-libudev-devel libconfig-devel libconfig++-devel +makedepends="libevdev-devel udev-devel libconfig-devel libconfig++-devel glib-devel" short_desc="Unofficial userspace driver for HID++ Logitech devices" maintainer="T0mstone " diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template index de1abb5ae55820..32a0f868f68d99 100644 --- a/srcpkgs/lvm2/template +++ b/srcpkgs/lvm2/template @@ -10,7 +10,7 @@ configure_args="--disable-selinux --enable-readline --enable-pkgconfig --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm --with-default-locking-dir=/run/lock/lvm" hostmakedepends="pkg-config" -makedepends="eudev-libudev-devel libaio-devel libblkid-devel +makedepends="udev-devel libaio-devel libblkid-devel readline-devel thin-provisioning-tools" depends="thin-provisioning-tools" short_desc="Logical Volume Manager 2 utilities" diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template index 4e7365bfa4408d..3f2ad1edb5f802 100644 --- a/srcpkgs/lxd-lts/template +++ b/srcpkgs/lxd-lts/template @@ -12,7 +12,7 @@ go_package="${go_import_path}/lxd ${go_import_path}/lxd-benchmark ${go_import_path}/lxd-user" hostmakedepends="pkg-config git" -makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel" +makedepends="lxc-devel acl-devel dqlite-devel udev-devel" depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs" short_desc="Next generation system container manager (long term support channel)" maintainer="Orphaned " diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template index b5a91f3fadfd88..eb47a2901ca433 100644 --- a/srcpkgs/lxd/template +++ b/srcpkgs/lxd/template @@ -12,7 +12,7 @@ go_package="${go_import_path}/lxd ${go_import_path}/lxd-benchmark ${go_import_path}/lxd-user" hostmakedepends="pkg-config git" -makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel" +makedepends="lxc-devel acl-devel dqlite-devel udev-devel" depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs" short_desc="Next generation system container manager" maintainer="Orphaned " diff --git a/srcpkgs/magpie/patches/fixudev.patch b/srcpkgs/magpie/patches/fixudev.patch deleted file mode 100644 index 93753ae0dbf323..00000000000000 --- a/srcpkgs/magpie/patches/fixudev.patch +++ /dev/null @@ -1,16 +0,0 @@ -Apparently the version limit is only required for systemd udev, it works -just fine with our version of eudev. - -diff --git meson.build meson.build -index dc210e6..6e080ca 100644 ---- a/meson.build -+++ b/meson.build -@@ -168,7 +168,7 @@ endif - - have_libgudev = get_option('udev') - if have_libgudev -- libudev_dep = dependency('libudev', version: udev_req) -+ libudev_dep = dependency('libudev') - gudev_dep = dependency('gudev-1.0', version: gudev_req) - endif - diff --git a/srcpkgs/mdadm/template b/srcpkgs/mdadm/template index 8bffda35ac5c66..bcc00dab856da8 100644 --- a/srcpkgs/mdadm/template +++ b/srcpkgs/mdadm/template @@ -3,7 +3,7 @@ pkgname=mdadm version=4.4 revision=1 hostmakedepends="pkg-config" -makedepends="eudev-libudev-devel" +makedepends="udev-devel" short_desc="Tool for managing/monitoring Linux md device arrays" maintainer="Leah Neukirchen " license="GPL-2.0-or-later" diff --git a/srcpkgs/media-player-info/template b/srcpkgs/media-player-info/template index 1ba835808be703..fa92e3d2766b73 100644 --- a/srcpkgs/media-player-info/template +++ b/srcpkgs/media-player-info/template @@ -4,7 +4,7 @@ version=24 revision=2 build_style=gnu-configure hostmakedepends="pkg-config python3" -makedepends="eudev-libudev-devel" +makedepends="udev-devel" short_desc="Data files describing media player capabilities, for post-HAL systems" maintainer="Orphaned " license="BSD-3-Clause" diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template index 5adb2624d57612..27db2ec77ad871 100644 --- a/srcpkgs/mkinitcpio/template +++ b/srcpkgs/mkinitcpio/template @@ -1,12 +1,12 @@ # Template file for 'mkinitcpio' pkgname=mkinitcpio version=41 -revision=1 +revision=2 build_style=meson configure_args="-Dsystemd=disabled -Dkernel_install=false -Dalpm=false -Dpresets=false -Dvconsole_conf=rc.conf -Dsystemd_hooks=false" -hostmakedepends="asciidoc eudev" -depends="busybox-mkinitcpio bsdtar bash zstd eudev" +hostmakedepends="asciidoc udev" +depends="busybox-mkinitcpio bsdtar bash zstd udev" checkdepends="busybox-mkinitcpio bats-assert lz4 xz zstd lzop parallel ukify" short_desc="Next generation of initramfs creation" maintainer="classabbyamp " diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template index 6bee5857b8ee1c..743cdd1289e23c 100644 --- a/srcpkgs/mplayer/template +++ b/srcpkgs/mplayer/template @@ -4,7 +4,7 @@ version=1.5 revision=3 build_style=configure hostmakedepends="pkg-config yasm" -makedepends="xorgproto eudev-libudev-devel libpng-devel libass-devel +makedepends="xorgproto udev-devel libpng-devel libass-devel libvorbis-devel SDL_image-devel x264-devel jack-devel samba-devel mpg123-devel xcb-util-devel xcb-util-keysyms-devel libsamplerate-devel libXxf86vm-devel libXinerama-devel libXpm-devel libXvMC-devel libXv-devel diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template index bc44eedfecc462..1c8d49a52a6ab9 100644 --- a/srcpkgs/muffin/template +++ b/srcpkgs/muffin/template @@ -18,7 +18,7 @@ makedepends="cinnamon-desktop-devel libSM-devel libinput-devel fribidi-devel libXcursor-devel libXdamage-devel libXext-devel libxkbfile-devel xkeyboard-config libXrender-devel libX11-devel libxcb-devel libXau-devel libXinerama-devel libICE-devel dbus-devel libglvnd-devel - eudev-libudev-devel libgudev-devel wayland-devel libgbm-devel pipewire-devel + udev-devel libgudev-devel wayland-devel libgbm-devel pipewire-devel libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel elogind-devel mutter-devel" depends="zenity" diff --git a/srcpkgs/ndctl/template b/srcpkgs/ndctl/template index f118a3231e90d6..9a9ba55b4c8ef8 100644 --- a/srcpkgs/ndctl/template +++ b/srcpkgs/ndctl/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--disable-docs --without-systemd" hostmakedepends="automake libtool pkg-config xmlto" -makedepends="eudev-libudev-devel json-c-devel libkmod-devel libuuid-devel +makedepends="udev-devel json-c-devel libkmod-devel libuuid-devel bash-completion keyutils-devel" short_desc="Utility library for managing libnvdimm" maintainer="Orphaned " diff --git a/srcpkgs/niri/template b/srcpkgs/niri/template index 823b1f131a7a7c..8967cfff37bc33 100644 --- a/srcpkgs/niri/template +++ b/srcpkgs/niri/template @@ -6,7 +6,7 @@ build_style=cargo build_helper="qemu" configure_args="--no-default-features --features dbus,xdp-gnome-screencast" hostmakedepends="pkg-config clang19-devel" -makedepends="eudev-libudev-devel libxkbcommon-devel libinput-devel libgbm-devel +makedepends="udev-devel libxkbcommon-devel libinput-devel libgbm-devel libdisplay-info-devel pipewire-devel pango-devel libseat-devel clang19-devel gdk-pixbuf-devel graphene-devel gtk4-devel libadwaita-devel" depends="wayland" diff --git a/srcpkgs/ofono/template b/srcpkgs/ofono/template index 420da1875945ad..a4e92c12e5bf68 100644 --- a/srcpkgs/ofono/template +++ b/srcpkgs/ofono/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="--disable-bluez4 --enable-external-ell" conf_files="/etc/ofono/phonesim.conf /etc/dbus-1/system.d/ofono.conf" hostmakedepends="pkg-config" -makedepends="libglib-devel eudev-libudev-devel mobile-broadband-provider-info ell-devel" +makedepends="libglib-devel udev-devel mobile-broadband-provider-info ell-devel" short_desc="Infrastructure for building mobile telephony (GMS/UTMS) applications" maintainer="Orphaned " license="GPL-2.0-or-later" diff --git a/srcpkgs/onboard/template b/srcpkgs/onboard/template index 1c047c2f2d3a62..54dce33662150e 100644 --- a/srcpkgs/onboard/template +++ b/srcpkgs/onboard/template @@ -4,7 +4,7 @@ version=1.4.4+4 revision=1 build_style=python3-pep517 hostmakedepends="intltool python3-setuptools python3-distutils-extra pkg-config glib" -makedepends="python3-devel gtk+3-devel dconf-devel eudev-libudev-devel +makedepends="python3-devel gtk+3-devel dconf-devel udev-devel hunspell-devel libXi-devel libXtst-devel libcanberra-devel libxkbfile-devel" depends="iso-codes python3-gobject python3-cairo python3-dbus" short_desc="Onscreen keyboard useful for everybody" diff --git a/srcpkgs/openfpgaloader/template b/srcpkgs/openfpgaloader/template index dfcfdbece5e333..2090ac9343c6c8 100644 --- a/srcpkgs/openfpgaloader/template +++ b/srcpkgs/openfpgaloader/template @@ -8,7 +8,7 @@ configure_args=" -DENABLE_CMSISDAP=ON -DCMAKE_DISABLE_FIND_PACKAGE_LibFTDI1=ON" hostmakedepends="pkg-config" -makedepends="eudev-libudev-devel hidapi-devel libftdi1-devel libusb-devel zlib-devel" +makedepends="udev-devel hidapi-devel libftdi1-devel libusb-devel zlib-devel" short_desc="Universal utility for programming FPGA" maintainer="Mohamad Alsadhan " license="Apache-2.0" diff --git a/srcpkgs/openobex/template b/srcpkgs/openobex/template index c44154b9fe1ae5..d2e41c00cbe7e1 100644 --- a/srcpkgs/openobex/template +++ b/srcpkgs/openobex/template @@ -4,7 +4,7 @@ version=1.7.2 revision=2 build_style=cmake hostmakedepends="pkg-config libxslt docbook-xsl" -makedepends="libusb-devel libbluetooth-devel eudev-libudev-devel" +makedepends="libusb-devel libbluetooth-devel udev-devel" short_desc="OBEX protocol implementation" maintainer="Orphaned " license="LGPL-2" diff --git a/srcpkgs/oversteer/template b/srcpkgs/oversteer/template index 6c31245912de32..764a4c005ff130 100644 --- a/srcpkgs/oversteer/template +++ b/srcpkgs/oversteer/template @@ -4,7 +4,7 @@ version=0.8.3 revision=2 build_style=meson hostmakedepends="pkg-config gettext desktop-file-utils" -makedepends="eudev-libudev-devel" +makedepends="udev-devel" depends="python3-gobject python3-pyudev python3-xdg python3-evdev python3-matplotlib python3-scipy python3-numpy" short_desc="Graphical Steering Wheel Manager for Linux" diff --git a/srcpkgs/parsec/template b/srcpkgs/parsec/template index 169121d19a7a39..e4c0ef090ed530 100644 --- a/srcpkgs/parsec/template +++ b/srcpkgs/parsec/template @@ -3,7 +3,7 @@ pkgname=parsec version=150.93b revision=2 archs="x86_64" -depends="virtual?libudev libssl3 libX11 libXcursor libXi libSM virtual?libGL libglvnd +depends="libudev libssl3 libX11 libXcursor libXi libSM virtual?libGL libglvnd alsa-lib libjpeg-turbo libpng libcurl libavcodec libXrandr" short_desc="Low latency proprietary game streaming application" maintainer="Kozova1 " diff --git a/srcpkgs/pcsc-acsccid/template b/srcpkgs/pcsc-acsccid/template index 2bc8a9103698a3..f59628566224bf 100644 --- a/srcpkgs/pcsc-acsccid/template +++ b/srcpkgs/pcsc-acsccid/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--enable-udev" hostmakedepends="pkg-config flex perl" -makedepends="pcsclite-devel eudev-libudev-devel libusb-compat-devel" +makedepends="pcsclite-devel udev-devel libusb-compat-devel" depends="pcsclite" short_desc="PC/SC driver to support ACS CCID smart card readers" maintainer="Orphaned " diff --git a/srcpkgs/pcsc-ccid/template b/srcpkgs/pcsc-ccid/template index 41d552e796e1d5..697804329a5b4c 100644 --- a/srcpkgs/pcsc-ccid/template +++ b/srcpkgs/pcsc-ccid/template @@ -5,7 +5,7 @@ revision=1 build_style=meson configure_args="-Dserial=true -Denable-extras=true" hostmakedepends="pkg-config perl flex" -makedepends="zlib-devel pcsclite-devel eudev-libudev-devel libusb-compat-devel" +makedepends="zlib-devel pcsclite-devel udev-devel libusb-compat-devel" short_desc="PC/SC driver to support CCID compliant readers" maintainer="Jose G Perez Taveras " license="LGPL-2.1-or-later" diff --git a/srcpkgs/pcsc-cyberjack/template b/srcpkgs/pcsc-cyberjack/template index 4b6db8c9b32d19..3a1e758829e95a 100644 --- a/srcpkgs/pcsc-cyberjack/template +++ b/srcpkgs/pcsc-cyberjack/template @@ -6,7 +6,7 @@ _versext=SP16 build_style=gnu-configure configure_args="--enable-udev" hostmakedepends="pkg-config" -makedepends="pcsclite-devel eudev-libudev-devel libusb-compat-devel" +makedepends="pcsclite-devel udev-devel libusb-compat-devel" depends="pcsc-ccid" short_desc="Linux drivers for cyberJack® RFID" maintainer="Orphaned " diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template index f0af84a4f1de65..758bf23749efec 100644 --- a/srcpkgs/pcsclite/template +++ b/srcpkgs/pcsclite/template @@ -5,7 +5,7 @@ revision=1 build_style=meson configure_args="-Dlibudev=true -Dlibsystemd=false -Dpolkit=false" hostmakedepends="pkg-config python3 flex perl" -makedepends="eudev-libudev-devel libusb-devel python3-devel" +makedepends="udev-devel libusb-devel python3-devel" depends="python3" short_desc="Middleware to access a smart card using SCard API (PC/SC)" maintainer="Andrew Benson " diff --git a/srcpkgs/phodav/template b/srcpkgs/phodav/template index 73e2f543910f03..4093c08c762d06 100644 --- a/srcpkgs/phodav/template +++ b/srcpkgs/phodav/template @@ -6,7 +6,7 @@ build_style=meson configure_args="-Davahi=enabled -Dgtk_doc=disabled" hostmakedepends="pkg-config gettext" makedepends="libglib-devel libsoup3-devel libxml2-devel avahi-glib-libs-devel - eudev-libudev-devel" + udev-devel" short_desc="GNOME Web Dav implementation" maintainer="Enno Boland " license="LGPL-2.1-or-later" diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template index 40d3f4e2aaaed7..f385f42acbc624 100644 --- a/srcpkgs/plasma-desktop/template +++ b/srcpkgs/plasma-desktop/template @@ -24,7 +24,7 @@ makedepends="kf6-kcrash-devel kf6-kdoctools-devel kf6-kauth-devel xf86-input-evdev-devel xf86-input-libinput-devel qt6-base-private-devel qt6-shadertools-devel qt6-declarative-devel qt6-svg-devel libksysguard-devel kf6-kded-devel kf6-baloo-devel libX11-devel - libcanberra-devel eudev-libudev-devel libxcb-devel xcb-util-image-devel + libcanberra-devel udev-devel libxcb-devel xcb-util-image-devel xorg-server-devel libglib-devel kwin-devel alsa-lib-devel kscreenlocker-devel libwacom-devel qt6-qt5compat-devel" depends="kmenuedit polkit-kde-agent powerdevil systemsettings diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template index 6b28df029204fa..1805e76c32f655 100644 --- a/srcpkgs/plasma-workspace/template +++ b/srcpkgs/plasma-workspace/template @@ -29,7 +29,7 @@ makedepends="qt6-declarative-private-devel libplasma-devel qt6-base-private-deve kf6-kguiaddons-devel kf6-ki18n-devel kf6-kiconthemes-devel kf6-kio-devel kf6-knotifications-devel kf6-kpackage-devel kf6-kparts-devel kf6-ktextwidgets-devel kf6-kcolorscheme-devel kf6-kdoctools-devel - knighttime-devel AppStream-qt-devel eudev-libudev-devel + knighttime-devel AppStream-qt-devel udev-devel wayland-devel icu-devel zlib-devel libcanberra-devel elogind-devel libqalculate-devel kf6-kquickcharts-devel NetworkManager-devel libglib-devel fontconfig-devel libxcb-devel xcb-util-devel diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template index c5e606574bf36c..5b72f990b337d3 100644 --- a/srcpkgs/powerdevil/template +++ b/srcpkgs/powerdevil/template @@ -15,7 +15,7 @@ makedepends="kf6-bluez-qt-devel libkf6screen-devel kf6-networkmanager-qt-devel kf6-kirigami-devel kf6-kitemmodels-devel plasma-activities-devel qcoro-qt6-devel kf6-kconfig-devel kf6-kcrash-devel kf6-kdbusaddons-devel kf6-ki18n-devel kf6-kglobalaccel-devel kf6-krunner-devel - kf6-kwindowsystem-devel libplasma-devel eudev-libudev-devel + kf6-kwindowsystem-devel libplasma-devel udev-devel libxcb-devel plasma-wayland-protocols wayland-devel plasma-workspace-devel ddcutil-devel qt6-base-private-devel" short_desc="Power consumption settings of a Plasma" diff --git a/srcpkgs/probe-rs/template b/srcpkgs/probe-rs/template index d586317b4962c3..71d26f6fa78ec8 100644 --- a/srcpkgs/probe-rs/template +++ b/srcpkgs/probe-rs/template @@ -7,7 +7,7 @@ configure_args="--features remote" make_build_args="--package probe-rs-tools" make_check_args="--workspace --exclude smoke_tester" hostmakedepends="pkg-config" -makedepends="eudev-libudev-devel libzstd-devel" +makedepends="udev-devel libzstd-devel" short_desc="Modern, embedded debugging toolkit, written in Rust" maintainer="Duncaen " license="Apache-2.0 OR MIT" diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index 0f12836e76a342..aa228fcbda2dc1 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled -Dcpp_std=c++17" hostmakedepends="m4 gettext libtool orc-devel perl-XML-Parser pkg-config doxygen" -makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel +makedepends="$(vopt_if avahi avahi-libs-devel) udev-devel fftw-devel jack-devel libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel diff --git a/srcpkgs/python3-hidapi/template b/srcpkgs/python3-hidapi/template index 3ce1995574c5ff..79239491e9bb5e 100644 --- a/srcpkgs/python3-hidapi/template +++ b/srcpkgs/python3-hidapi/template @@ -5,7 +5,7 @@ revision=1 build_style=python3-module make_build_args="--with-libusb" hostmakedepends="python3-setuptools python3-wheel python3-Cython pkg-config" -makedepends="eudev-libudev-devel libusb-devel python3-devel" +makedepends="udev-devel libusb-devel python3-devel" depends="python3 hidapi python3-setuptools" short_desc="Cython interface to the hidapi" maintainer="Mateusz Sylwestrzak " diff --git a/srcpkgs/python3-pyudev/template b/srcpkgs/python3-pyudev/template index f2954828e61347..cdeaca7cfec412 100644 --- a/srcpkgs/python3-pyudev/template +++ b/srcpkgs/python3-pyudev/template @@ -4,7 +4,7 @@ version=0.24.0 revision=4 build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3 python3-six eudev-libudev" +depends="python3 python3-six libudev" checkdepends="$depends python3-pytest python3-mock python3-hypothesis python3-docutils" short_desc="Python bindings to libudev (Python3)" diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index aacbc0ceb6c552..d3027f6f5cfd95 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -10,7 +10,7 @@ metapackage=yes hostmakedepends="cmake clang19 flex perl glib-devel pkg-config python3 re2c ruby which" makedepends="clang19-devel SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel - eudev-libudev-devel ffmpeg6-devel freetds-devel glib-devel gst-plugins-base1-devel + udev-devel ffmpeg6-devel freetds-devel glib-devel gst-plugins-base1-devel gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel libinput-devel libmng-devel libmariadbclient-devel libproxy-devel libvpx-devel libwebp-devel libxkbcommon-devel diff --git a/srcpkgs/qt6-pdf/template b/srcpkgs/qt6-pdf/template index e2aaf0129aebaa..737fc87400e985 100644 --- a/srcpkgs/qt6-pdf/template +++ b/srcpkgs/qt6-pdf/template @@ -13,7 +13,7 @@ hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib icu-devel libevent-devel qt6-tools" makedepends="qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel zlib-devel sqlite-devel libopenjpeg2-devel libglib-devel - eudev-libudev-devel openh264-devel + udev-devel openh264-devel pciutils-devel opus-devel libxslt-devel libxml2-devel ffmpeg6-devel lcms2-devel libwebp-devel icu-devel snappy-devel libevent-devel libvpx-devel minizip-devel tiff-devel libpng-devel harfbuzz-devel diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template index b077740f257239..4dbd3f43716325 100644 --- a/srcpkgs/rdma-core/template +++ b/srcpkgs/rdma-core/template @@ -8,7 +8,7 @@ configure_args="-DENABLE_VALGRIND=OFF -DCMAKE_INSTALL_RUNDIR=/run -DCMAKE_INSTALL_PERLDIR=/usr/share/perl5/vendor_perl" hostmakedepends="pkg-config python3 $(vopt_if docs 'pandoc python3-docutils')" -makedepends="libnl3-devel eudev-libudev-devel python3-devel" +makedepends="libnl3-devel udev-devel python3-devel" short_desc="RDMA core userspace libraries and daemons" maintainer="Orphaned " license="GPL-2.0-or-later, BSD-2-Clause, MIT" diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index bad4965ffb82b8..c8a7f7f707db25 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -11,7 +11,7 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)" conf_files="/etc/retroarch.cfg" hostmakedepends="pkg-config" -makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel +makedepends="alsa-lib-devel udev-devel freetype-devel libusb-devel libxkbcommon-devel mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg6-devel) $(vopt_if jack jack-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader-devel) diff --git a/srcpkgs/rmtfs/template b/srcpkgs/rmtfs/template index d9a1457ec7d629..2fdb3b1b91e2b5 100644 --- a/srcpkgs/rmtfs/template +++ b/srcpkgs/rmtfs/template @@ -4,7 +4,7 @@ version=1.0 revision=1 build_style=gnu-makefile make_use_env=1 -makedepends="qrtr-ns-devel eudev-libudev-devel" +makedepends="qrtr-ns-devel udev-devel" short_desc="Qualcomm Remote Filesystem Service Implementation" maintainer="Orphaned " license="BSD-3-Clause" diff --git a/srcpkgs/solo2-cli/template b/srcpkgs/solo2-cli/template index f447ad1fc56440..69be0317d1b4cc 100644 --- a/srcpkgs/solo2-cli/template +++ b/srcpkgs/solo2-cli/template @@ -4,7 +4,7 @@ version=0.2.2 revision=1 build_style=cargo hostmakedepends="pkg-config" -makedepends="eudev-libudev-devel pcsclite-devel" +makedepends="udev-devel pcsclite-devel" short_desc="CLI tools for SoloKeys Solo 2 security keys" maintainer="Orphaned " license="Apache-2.0" diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template index bae64484088742..0036c41a034eb8 100644 --- a/srcpkgs/spacefm/template +++ b/srcpkgs/spacefm/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="$(vopt_with gtk3)" hostmakedepends="pkg-config intltool" makedepends="$(vopt_if gtk3 gtk+3-devel) - startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel" + startup-notification-devel udev-devel ffmpegthumbnailer-devel" depends="hicolor-icon-theme desktop-file-utils" short_desc="Multi-panel tabbed file manager" maintainer="Orphaned " diff --git a/srcpkgs/startup/template b/srcpkgs/startup/template index 4d9dc8e734d5f6..4a4159d82e9f02 100644 --- a/srcpkgs/startup/template +++ b/srcpkgs/startup/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="--disable-sysvcompat --disable-dconf-bridge --disable-cgroups" make_dirs="/var/log/startup 0750 root adm" hostmakedepends="autoconf automake libtool pkg-config gettext-devel nih-devel" -makedepends="libnih-devel eudev-libudev-devel dbus-devel json-c-devel" +makedepends="libnih-devel udev-devel dbus-devel json-c-devel" checkdepends="python3 dbus" short_desc="Event driven task and service manager" maintainer="Orphaned " diff --git a/srcpkgs/steamos-compositor/template b/srcpkgs/steamos-compositor/template index 8d7fd6a81c29b6..b0ed92874d5d0c 100644 --- a/srcpkgs/steamos-compositor/template +++ b/srcpkgs/steamos-compositor/template @@ -6,7 +6,7 @@ build_style=gnu-configure hostmakedepends="automake pkg-config" makedepends="libXxf86vm-devel libXrender-devel libXcomposite-devel libXdamage-devel libXpm-devel libSM-devel MesaLib-devel - SDL_image-devel eudev-libudev-devel" + SDL_image-devel udev-devel" short_desc="The SteamOS Compositor" maintainer="Orphaned " license="BSD-2-Clause" diff --git a/srcpkgs/system-config-printer/template b/srcpkgs/system-config-printer/template index 54d77b2ec4369d..cec855ff66810f 100644 --- a/srcpkgs/system-config-printer/template +++ b/srcpkgs/system-config-printer/template @@ -7,7 +7,7 @@ pycompile_dirs="usr/share/system-config-printer" configure_args="--with-udev-rules" hostmakedepends="pkg-config gettext python3-devel python3-setuptools xmlto desktop-file-utils" -makedepends="libglib-devel cups-devel eudev-libudev-devel libusb-devel" +makedepends="libglib-devel cups-devel udev-devel libusb-devel" depends="python3-cupshelpers python3-smbc python3-gobject gir-freedesktop libnotify gtk+3 dconf desktop-file-utils libsecret" short_desc="CUPS printer configuration tool and status applet" diff --git a/srcpkgs/thinkpad-scripts/template b/srcpkgs/thinkpad-scripts/template index 5a7718233e87fa..5902f983598971 100644 --- a/srcpkgs/thinkpad-scripts/template +++ b/srcpkgs/thinkpad-scripts/template @@ -5,7 +5,7 @@ revision=8 build_style=python3-module pycompile_module="tps" hostmakedepends="gettext python3-setuptools" -depends="acpid alsa-utils eudev xinput xrandr python3-setuptools" +depends="acpid alsa-utils udev xinput xrandr python3-setuptools" short_desc="Screen rotation, docking, and more for ThinkPad X220 and X230 Tablet" maintainer="Adam Beckmeyer " license="GPL-3.0-or-later" diff --git a/srcpkgs/tinyramfs/template b/srcpkgs/tinyramfs/template index 6f659ace1999e8..3395b7ccf6ebfa 100644 --- a/srcpkgs/tinyramfs/template +++ b/srcpkgs/tinyramfs/template @@ -1,7 +1,7 @@ # Template file for 'tinyramfs' pkgname=tinyramfs version=0.3.0 -revision=2 +revision=3 build_style=gnu-makefile depends="util-linux cpio kmod" short_desc="Tiny initramfs written in POSIX shell" diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template index ac5f8931978def..87451350fe300b 100644 --- a/srcpkgs/touchegg/template +++ b/srcpkgs/touchegg/template @@ -5,7 +5,7 @@ revision=2 build_style=cmake configure_args="-DUSE_SYSTEMD=false" hostmakedepends="pkg-config" -makedepends="eudev-libudev-devel libinput-devel pugixml-devel cairo-devel libX11-devel +makedepends="udev-devel libinput-devel pugixml-devel cairo-devel libX11-devel libXtst-devel libXrandr-devel libXi-devel glib-devel gtk+3-devel" short_desc="Multitouch gesture recognizer" maintainer="Enno Boland " diff --git a/srcpkgs/u2f-hidraw-policy/template b/srcpkgs/u2f-hidraw-policy/template index 26250c88a57135..8d888b298b6129 100644 --- a/srcpkgs/u2f-hidraw-policy/template +++ b/srcpkgs/u2f-hidraw-policy/template @@ -4,7 +4,7 @@ version=1.0.2 revision=2 build_style=gnu-makefile hostmakedepends="pkg-config" -makedepends="eudev-libudev-devel" +makedepends="udev-devel" short_desc="Udev helper and rule to identify U2F tokens" maintainer="Toyam Cox " license="LGPL-2.0-or-later" diff --git a/srcpkgs/udev-devel b/srcpkgs/udev-devel new file mode 120000 index 00000000000000..b95ad750c433cb --- /dev/null +++ b/srcpkgs/udev-devel @@ -0,0 +1 @@ +udev \ No newline at end of file diff --git a/srcpkgs/udev/INSTALL b/srcpkgs/udev/INSTALL new file mode 100644 index 00000000000000..dbc6eaea8e17e8 --- /dev/null +++ b/srcpkgs/udev/INSTALL @@ -0,0 +1,6 @@ +case "$ACTION" in +post) + echo "Updating udev hwdb.bin..." + usr/bin/udev-hwdb update || : + ;; +esac diff --git a/srcpkgs/udev/files/80-net-name-slot.rules b/srcpkgs/udev/files/80-net-name-slot.rules new file mode 100644 index 00000000000000..c5f1b3885b0e5c --- /dev/null +++ b/srcpkgs/udev/files/80-net-name-slot.rules @@ -0,0 +1,14 @@ +# do not edit this file, it will be overwritten on update + +ACTION!="add", GOTO="net_name_slot_end" +SUBSYSTEM!="net", GOTO="net_name_slot_end" +NAME!="", GOTO="net_name_slot_end" + +IMPORT{cmdline}="net.ifnames" +ENV{net.ifnames}=="0", GOTO="net_name_slot_end" + +NAME=="", ENV{ID_NET_NAME_ONBOARD}!="", NAME="$env{ID_NET_NAME_ONBOARD}" +NAME=="", ENV{ID_NET_NAME_SLOT}!="", NAME="$env{ID_NET_NAME_SLOT}" +NAME=="", ENV{ID_NET_NAME_PATH}!="", NAME="$env{ID_NET_NAME_PATH}" + +LABEL="net_name_slot_end" diff --git a/srcpkgs/eudev/files/udevd/run b/srcpkgs/udev/files/udevd/run similarity index 100% rename from srcpkgs/eudev/files/udevd/run rename to srcpkgs/udev/files/udevd/run diff --git a/srcpkgs/eudev/patches/78-sound-card.rules.patch b/srcpkgs/udev/patches/78-sound-card.rules.patch similarity index 95% rename from srcpkgs/eudev/patches/78-sound-card.rules.patch rename to srcpkgs/udev/patches/78-sound-card.rules.patch index d17fac077665b0..7f9f9305ecfc41 100644 --- a/srcpkgs/eudev/patches/78-sound-card.rules.patch +++ b/srcpkgs/udev/patches/78-sound-card.rules.patch @@ -20,8 +20,8 @@ Signed-off-by: Johannes Nixdorf diff --git a/rules/78-sound-card.rules b/rules/78-sound-card.rules index f2fc27739..c49bd1d4e 100644 ---- a/rules/78-sound-card.rules -+++ b/rules/78-sound-card.rules +--- a/rules.d/78-sound-card.rules ++++ b/rules.d/78-sound-card.rules @@ -38,6 +38,8 @@ KERNEL!="card*", GOTO="sound_end" ENV{SOUND_INITIALIZED}="1" diff --git a/srcpkgs/udev/patches/standalone.patch b/srcpkgs/udev/patches/standalone.patch new file mode 100644 index 00000000000000..d80e2ef6c41bca --- /dev/null +++ b/srcpkgs/udev/patches/standalone.patch @@ -0,0 +1,1879 @@ +From 3e898010702477dfa5c32896440d445beb544aaf Mon Sep 17 00:00:00 2001 +From: classabbyamp +Date: Mon, 17 Aug 2026 18:48:33 -0400 +Subject: [PATCH] build udev as a standalone package + +* prevents unnecessary components from building +* renames systemd-udevd to udevd +* renames systemd-hwdb to udev-hwdb +* removes references to documentation that doesn't get built +--- + factory/templates/meson.build | 4 +- + hwdb.d/60-autosuspend.hwdb | 2 +- + hwdb.d/60-evdev.hwdb | 2 +- + hwdb.d/60-input-id.hwdb | 2 +- + hwdb.d/60-keyboard.hwdb | 2 +- + hwdb.d/60-sensor.hwdb | 2 +- + hwdb.d/70-av-production.hwdb | 2 +- + hwdb.d/70-hardware-wallets.hwdb | 2 +- + hwdb.d/70-joystick.hwdb | 2 +- + hwdb.d/70-lights.hwdb | 2 +- + hwdb.d/70-mouse.hwdb | 2 +- + hwdb.d/70-pointingstick.hwdb | 2 +- + hwdb.d/70-software-radio.hwdb | 2 +- + hwdb.d/70-sound-card.hwdb | 2 +- + hwdb.d/70-touchpad.hwdb | 2 +- + hwdb.d/80-ieee1394-unit-function.hwdb | 2 +- + hwdb.d/README | 7 +- + hwdb.d/meson.build | 2 +- + man/hwdb.xml | 4 +- + man/meson.build | 37 +-- + man/rules/meson.build | 2 +- + man/{systemd-hwdb.xml => udev-hwdb.xml} | 19 +- + man/udev.conf.xml | 12 +- + man/udev.xml | 40 +-- + man/udev_device_get_syspath.xml | 1 - + man/udev_device_has_tag.xml | 1 - + man/udev_device_new_from_syspath.xml | 1 - + man/udev_enumerate_add_match_subsystem.xml | 1 - + man/udev_enumerate_new.xml | 1 - + man/udev_enumerate_scan_devices.xml | 1 - + man/udev_list_entry.xml | 1 - + man/udev_monitor_filter_update.xml | 1 - + man/udev_monitor_new_from_netlink.xml | 1 - + man/udev_monitor_receive_device.xml | 1 - + man/udev_new.xml | 10 - + man/udevadm.xml | 82 ++---- + meson.build | 265 +----------------- + rules.d/README | 7 +- + rules.d/meson.build | 8 - + shell-completion/bash/meson.build | 43 +-- + .../bash/{systemd-hwdb => udev-hwdb} | 6 +- + .../zsh/{_systemd-hwdb => _udev-hwdb} | 4 +- + shell-completion/zsh/_udevadm | 14 +- + shell-completion/zsh/meson.build | 36 +-- + src/core/meson.build | 15 - + src/hwdb/hwdb.c | 2 +- + src/hwdb/meson.build | 2 +- + src/libsystemd/sd-hwdb/sd-hwdb.c | 2 +- + src/test/meson.build | 25 +- + src/udev/meson.build | 2 +- + src/udev/udev-config.c | 2 - + src/udev/udevadm-hwdb.c | 4 +- + src/udev/udevadm-wait.c | 2 +- + src/udev/udevd.c | 2 +- + test/meson.build | 2 +- + 55 files changed, 121 insertions(+), 581 deletions(-) + rename man/{systemd-hwdb.xml => udev-hwdb.xml} (77%) + rename shell-completion/bash/{systemd-hwdb => udev-hwdb} (94%) + rename shell-completion/zsh/{_systemd-hwdb => _udev-hwdb} (91%) + +diff --git a/factory/templates/meson.build b/factory/templates/meson.build +index 0f53217a48..02f5ba5d03 100644 +--- a/factory/templates/meson.build ++++ b/factory/templates/meson.build +@@ -6,14 +6,14 @@ custom_target( + input : 'locale.conf.in', + output : 'locale.conf', + command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], +- install : true, ++ install : false, + install_dir : factory_etc_dir) + + custom_target( + input : 'vconsole.conf.in', + output : 'vconsole.conf', + command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], +- install : true, ++ install : false, + install_dir : factory_etc_dir) + + if conf.get('ENABLE_NSS') == 1 +diff --git a/hwdb.d/60-autosuspend.hwdb b/hwdb.d/60-autosuspend.hwdb +index 0e38c0a9a4..73127ff0f9 100644 +--- a/hwdb.d/60-autosuspend.hwdb ++++ b/hwdb.d/60-autosuspend.hwdb +@@ -11,7 +11,7 @@ + # To add local entries, create a new file + # /etc/udev/hwdb.d/61-autosuspend-local.hwdb + # and add your rules there. To load the new rules execute (as root): +-# systemd-hwdb update ++# udev-hwdb update + # udevadm trigger /dev/… + # + # If your changes are generally applicable, send them as a pull request to +diff --git a/hwdb.d/60-evdev.hwdb b/hwdb.d/60-evdev.hwdb +index e1e30700c4..a2ef574fdd 100644 +--- a/hwdb.d/60-evdev.hwdb ++++ b/hwdb.d/60-evdev.hwdb +@@ -33,7 +33,7 @@ + # To add local entries, create a new file + # /etc/udev/hwdb.d/61-evdev-local.hwdb + # and add your rules there. To load the new rules execute (as root): +-# systemd-hwdb update ++# udev-hwdb update + # udevadm trigger /dev/input/eventXX + # where /dev/input/eventXX is the device in question. If in doubt, simply use + # /dev/input/event* to reload all input rules. +diff --git a/hwdb.d/60-input-id.hwdb b/hwdb.d/60-input-id.hwdb +index 700e7ee264..ae19094e50 100644 +--- a/hwdb.d/60-input-id.hwdb ++++ b/hwdb.d/60-input-id.hwdb +@@ -10,7 +10,7 @@ + # To add local entries, create a new file + # /etc/udev/hwdb.d/61-input-id-local.hwdb + # and add your rules there. To load the new rules execute (as root): +-# systemd-hwdb update ++# udev-hwdb update + # udevadm trigger /dev/input/eventXX + # where /dev/input/eventXX is the device in question. If in + # doubt, simply use /dev/input/event* to reload all input rules. +diff --git a/hwdb.d/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb +index 08be116265..0521871923 100644 +--- a/hwdb.d/60-keyboard.hwdb ++++ b/hwdb.d/60-keyboard.hwdb +@@ -46,7 +46,7 @@ + # To add local entries, create a new file + # /etc/udev/hwdb.d/61-keyboard-local.hwdb + # and add your rules there. To load the new rules execute (as root): +-# systemd-hwdb update ++# udev-hwdb update + # udevadm trigger /dev/input/eventXX + # where /dev/input/eventXX is the keyboard in question. If in doubt, simply use + # /dev/input/event* to reload all input rules. +diff --git a/hwdb.d/60-sensor.hwdb b/hwdb.d/60-sensor.hwdb +index 7b57c18748..7d00e43e96 100644 +--- a/hwdb.d/60-sensor.hwdb ++++ b/hwdb.d/60-sensor.hwdb +@@ -23,7 +23,7 @@ + # To add local entries, create a new file + # /etc/udev/hwdb.d/61-sensor-local.hwdb + # and add your rules there. To load the new rules execute (as root): +-# systemd-hwdb update ++# udev-hwdb update + # udevadm trigger -v -p DEVNAME=/dev/iio:deviceXXX + # where /dev/iio:deviceXXX is the device in question. + # +diff --git a/hwdb.d/70-av-production.hwdb b/hwdb.d/70-av-production.hwdb +index 6c0fd6104e..e9f6880d55 100644 +--- a/hwdb.d/70-av-production.hwdb ++++ b/hwdb.d/70-av-production.hwdb +@@ -10,7 +10,7 @@ + # To add local entries, create a new file + # /etc/udev/hwdb.d/71-av-production-local.hwdb + # and add your rules there. To load the new rules execute (as root): +-# systemd-hwdb update ++# udev-hwdb update + # udevadm trigger /dev/… + # + # If your changes are generally applicable, send them as a pull request to +diff --git a/hwdb.d/70-hardware-wallets.hwdb b/hwdb.d/70-hardware-wallets.hwdb +index 56d7cc6e23..fb85fc7329 100644 +--- a/hwdb.d/70-hardware-wallets.hwdb ++++ b/hwdb.d/70-hardware-wallets.hwdb +@@ -7,7 +7,7 @@ + # To add local entries, create a new file + # /etc/udev/hwdb.d/71-hardware-wallets-local.hwdb + # and add your rules there. To load the new rules execute (as root): +-# systemd-hwdb update ++# udev-hwdb update + # udevadm trigger /dev/… + # + # If your changes are generally applicable, send them as a pull request to +diff --git a/hwdb.d/70-joystick.hwdb b/hwdb.d/70-joystick.hwdb +index ec5006332e..91ba5747a8 100644 +--- a/hwdb.d/70-joystick.hwdb ++++ b/hwdb.d/70-joystick.hwdb +@@ -13,7 +13,7 @@ + # To add local entries, create a new file + # /etc/udev/hwdb.d/71-joystick-local.hwdb + # and add your rules there. To load the new rules execute (as root): +-# systemd-hwdb update ++# udev-hwdb update + # udevadm trigger /dev/input/eventXX + # where /dev/input/eventXX is the joystick in question. If in + # doubt, simply use /dev/input/event* to reload all input rules. +diff --git a/hwdb.d/70-lights.hwdb b/hwdb.d/70-lights.hwdb +index af56968abd..7f8d95b7d5 100644 +--- a/hwdb.d/70-lights.hwdb ++++ b/hwdb.d/70-lights.hwdb +@@ -9,7 +9,7 @@ + # To add local entries, create a new file + # /etc/udev/hwdb.d/71-lights-local.hwdb + # and add your rules there. To load the new rules execute (as root): +-# systemd-hwdb update ++# udev-hwdb update + # udevadm trigger /dev/… + # + # If your changes are generally applicable, send them as a pull request to +diff --git a/hwdb.d/70-mouse.hwdb b/hwdb.d/70-mouse.hwdb +index 3009ea2fdc..51bcac6b04 100644 +--- a/hwdb.d/70-mouse.hwdb ++++ b/hwdb.d/70-mouse.hwdb +@@ -28,7 +28,7 @@ + # To add local entries, create a new file + # /etc/udev/hwdb.d/71-mouse-local.hwdb + # and add your rules there. To load the new rules execute (as root): +-# systemd-hwdb update ++# udev-hwdb update + # udevadm trigger /dev/input/eventXX + # where /dev/input/eventXX is the mouse in question. If in doubt, simply use + # /dev/input/event* to reload all input rules. +diff --git a/hwdb.d/70-pointingstick.hwdb b/hwdb.d/70-pointingstick.hwdb +index 6ff228bee6..1a160bf508 100644 +--- a/hwdb.d/70-pointingstick.hwdb ++++ b/hwdb.d/70-pointingstick.hwdb +@@ -37,7 +37,7 @@ + # To add local entries, create a new file + # /etc/udev/hwdb.d/71-pointingstick-local.hwdb + # and add your rules there. To load the new rules execute (as root): +-# systemd-hwdb update ++# udev-hwdb update + # udevadm trigger /dev/input/eventXX + # where /dev/input/eventXX is the pointingstick in question. If in doubt, simply + # use /dev/input/event* to reload all input rules. +diff --git a/hwdb.d/70-software-radio.hwdb b/hwdb.d/70-software-radio.hwdb +index 63af9c77cd..ddffda8249 100644 +--- a/hwdb.d/70-software-radio.hwdb ++++ b/hwdb.d/70-software-radio.hwdb +@@ -8,7 +8,7 @@ + # To add local entries, create a new file + # /etc/udev/hwdb.d/71-software-radio-local.hwdb + # and add your rules there. To load the new rules execute (as root): +-# systemd-hwdb update ++# udev-hwdb update + # udevadm trigger /dev/… + # + # If your changes are generally applicable, send them as a pull request to +diff --git a/hwdb.d/70-sound-card.hwdb b/hwdb.d/70-sound-card.hwdb +index 62d005d61e..dd2ac6e038 100644 +--- a/hwdb.d/70-sound-card.hwdb ++++ b/hwdb.d/70-sound-card.hwdb +@@ -7,7 +7,7 @@ + # To add local entries, create a new file + # /etc/udev/hwdb.d/71-sound-card-local.hwdb + # and add your rules there. To load the new rules execute (as root): +-# systemd-hwdb update ++# udev-hwdb update + # udevadm trigger /dev/… + # + # If your changes are generally applicable, send them as a pull request to +diff --git a/hwdb.d/70-touchpad.hwdb b/hwdb.d/70-touchpad.hwdb +index 8c166d7013..152bec79b8 100644 +--- a/hwdb.d/70-touchpad.hwdb ++++ b/hwdb.d/70-touchpad.hwdb +@@ -13,7 +13,7 @@ + # To add local entries, create a new file + # /etc/udev/hwdb.d/71-touchpad-local.hwdb + # and add your rules there. To load the new rules execute (as root): +-# systemd-hwdb update ++# udev-hwdb update + # udevadm trigger /dev/input/eventXX + # where /dev/input/eventXX is the touchpad in question. If in + # doubt, simply use /dev/input/event* to reload all input rules. +diff --git a/hwdb.d/80-ieee1394-unit-function.hwdb b/hwdb.d/80-ieee1394-unit-function.hwdb +index 62a8dda90b..38579ce764 100644 +--- a/hwdb.d/80-ieee1394-unit-function.hwdb ++++ b/hwdb.d/80-ieee1394-unit-function.hwdb +@@ -21,7 +21,7 @@ + # - ven0x000000units*0x000000:0x000000* + # + # The hexadecimal digits part of the customized key should be lower-case. Linux FireWire subsystem +-# uses lower-case value for attributes of sysfs node, and systemd-hwdb parses the custom key by ++# uses lower-case value for attributes of sysfs node, and udev-hwdb parses the custom key by + # case-sensitive way. On the other hand, it parses kernel alias by case-insensitive way. + # + # The entry should have some of IEEE1394_UNIT_FUNCTION_XXX environment variables to express function +diff --git a/hwdb.d/README b/hwdb.d/README +index 594f5bfe0d..58e9052275 100644 +--- a/hwdb.d/README ++++ b/hwdb.d/README +@@ -3,9 +3,6 @@ of mappings from modalias-like keys (which identify specific hardware devices) + to udev properties. + + Files in this directory are not read by udev directly. Instead, +-man:systemd-hwdb(8) compiles them into a binary database. ++man:udev-hwdb(8) compiles them into a binary database. + +-See man:hwdb(7) for an overview of the configuration file format, and +-man:systemd-udevd.service(8) for a description of the udev daemon. +- +-Use 'systemd-analyze cat-config udev/hwdb.d' to display the effective config. ++See man:hwdb(7) for an overview of the configuration file format. +diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build +index b031bd1d92..61d46f0b2b 100644 +--- a/hwdb.d/meson.build ++++ b/hwdb.d/meson.build +@@ -64,7 +64,7 @@ if conf.get('ENABLE_HWDB') == 1 + install_emptydir(sysconfdir / 'udev/hwdb.d', install_tag : 'hwdb') + + meson.add_install_script(sh, '-c', +- 'test -n "$DESTDIR" || @0@/systemd-hwdb update'.format(bindir), ++ 'test -n "$DESTDIR" || @0@/udev-hwdb update'.format(bindir), + install_tag: 'hwdb') + endif + +diff --git a/man/hwdb.xml b/man/hwdb.xml +index fc8aa92ea6..dca25677c7 100644 +--- a/man/hwdb.xml ++++ b/man/hwdb.xml +@@ -73,7 +73,7 @@ + higher priority. + + The content of all hwdb files is read by +- systemd-hwdb8 ++ udev-hwdb8 + and compiled to a binary database located at /etc/udev/hwdb.bin, + or alternatively /usr/lib/udev/hwdb.bin if you want ship the + compiled database in an immutable image. During runtime, only the binary database +@@ -146,7 +146,7 @@ PROPERTY_WITH_SPACES=some string + + See Also + +- systemd-hwdb8 ++ udev-hwdb8 + + + +diff --git a/man/meson.build b/man/meson.build +index 8a5b446f24..d34d42fe39 100644 +--- a/man/meson.build ++++ b/man/meson.build +@@ -67,6 +67,16 @@ foreach tuple : manpages + endif + endforeach + ++ if stem.contains('systemd') ++ have = false ++ endif ++ if not stem.contains('udev') ++ have = false ++ endif ++ if stem == 'hwdb' ++ have = true ++ endif ++ + if have + file = files(tuple[0] + '.xml') + source_xml_files += file +@@ -126,13 +136,7 @@ systemd_directives_xml = custom_target( + command : [make_directive_index_py, '@OUTPUT@', '@INPUT@']) + + nonindex_xml_files = source_xml_files + [systemd_directives_xml] +-systemd_index_xml = custom_target( +- input : nonindex_xml_files, +- output : 'systemd.index.xml', +- command : [make_man_index_py, '@OUTPUT@'] + nonindex_xml_files) +- +-foreach tuple : xsltproc.found() and have_lxml ? [['systemd.directives', '7', systemd_directives_xml], +- ['systemd.index', '7', systemd_index_xml]] : [] ++foreach tuple : [] + stem = tuple[0] + section = tuple[1] + xml = tuple[2] +@@ -216,25 +220,6 @@ configure_file( + + ############################################################ + +-update_dbus_docs = custom_target( +- output : 'update-dbus-docs', +- command : [update_dbus_docs_py, '--build-dir', meson.project_build_root(), '@INPUT@'], +- input : dbus_docs, +- depends : dbus_programs) +- +-if conf.get('BUILD_MODE_DEVELOPER') == 1 +- test('dbus-docs-fresh', +- update_dbus_docs_py, +- suite : 'dist', +- args : ['--build-dir', meson.project_build_root(), '--test', dbus_docs], +- depends : dbus_programs) +- +- test('check-version-history', +- check_version_history_py, +- suite : 'dist', +- args : source_xml_files) +-endif +- + update_man_rules = custom_target( + output : 'update-man-rules', + command : [update_man_rules_py, +diff --git a/man/rules/meson.build b/man/rules/meson.build +index a3d0650e27..20a581e515 100644 +--- a/man/rules/meson.build ++++ b/man/rules/meson.build +@@ -1061,7 +1061,7 @@ manpages = [ + 'ENABLE_HIBERNATE'], + ['systemd-homed.service', '8', ['systemd-homed'], 'ENABLE_HOMED'], + ['systemd-hostnamed.service', '8', ['systemd-hostnamed'], 'ENABLE_HOSTNAMED'], +- ['systemd-hwdb', '8', [], 'ENABLE_HWDB'], ++ ['udev-hwdb', '8', [], 'ENABLE_HWDB'], + ['systemd-id128', '1', [], ''], + ['systemd-imds-generator', '8', [], 'ENABLE_IMDS'], + ['systemd-imds', '1', ['systemd-imds-import.service'], 'ENABLE_IMDS'], +diff --git a/man/systemd-hwdb.xml b/man/udev-hwdb.xml +similarity index 77% +rename from man/systemd-hwdb.xml +rename to man/udev-hwdb.xml +index ab27643e6e..b9a35fb77c 100644 +--- a/man/systemd-hwdb.xml ++++ b/man/udev-hwdb.xml +@@ -3,34 +3,34 @@ + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> + + +- + + +- systemd-hwdb ++ udev-hwdb + systemd + + + +- systemd-hwdb ++ udev-hwdb + 8 + + + +- systemd-hwdbhardware database management tool ++ udev-hwdbhardware database management tool + + + + +- systemd-hwdb options update ++ udev-hwdb options update + + +- systemd-hwdb options query modalias ++ udev-hwdb options query modalias + + + + Description +- systemd-hwdb expects a command and command ++ udev-hwdb expects a command and command + specific arguments. It manages the binary hardware database. + + +@@ -66,13 +66,13 @@ + + + +- systemd-hwdb ++ <refsect2><title>udev-hwdb + <optional><replaceable>options</replaceable></optional> + update + Update the binary database. + + +- systemd-hwdb ++ <refsect2><title>udev-hwdb + <optional><replaceable>options</replaceable></optional> + query + <replaceable>MODALIAS</replaceable> +@@ -84,7 +84,6 @@ + <refsect1> + <title>See Also + +- systemd1 + hwdb7 + + +diff --git a/man/udev.conf.xml b/man/udev.conf.xml +index 5e42bf304c..05c672c556 100644 +--- a/man/udev.conf.xml ++++ b/man/udev.conf.xml +@@ -41,7 +41,7 @@ + Description + + These files contain configuration options for +- systemd-udevd8. ++ udevd8. + The syntax of these files is very simple: a list + of assignments, one per line. + All empty lines or lines beginning with # are +@@ -117,7 +117,7 @@ + resolve_names= + + +- Specifies when systemd-udevd should resolve names of users and groups. When set to ++ Specifies when udevd should resolve names of users and groups. When set to + (the default), names will be resolved when the rules are parsed. + When set to , names will be resolved for every event. When set to + , names will never be resolved and all devices will be owned by +@@ -133,7 +133,7 @@ + timeout_signal= + + +- Specifies a signal that systemd-udevd will send on worker ++ Specifies a signal that udevd will send on worker + timeouts. Note that both workers and spawned processes will be killed using this + signal. Defaults to . + +@@ -143,16 +143,16 @@ + + + +- In addition, systemd-udevd can be configured ++ In addition, udevd can be configured + by command line options and the kernel command line (see +- systemd-udevd8). ++ udevd8). + + + + + See Also + +- systemd-udevd8 ++ udevd8 + udev7 + udevadm8 + +diff --git a/man/udev.xml b/man/udev.xml +index 9a76db1ecc..b37d0dea05 100644 +--- a/man/udev.xml ++++ b/man/udev.xml +@@ -32,8 +32,7 @@ + names provide a way to reliably identify devices based on their properties or + current configuration. + +- The udev daemon, systemd-udevd.service +- 8, receives device uevents directly from ++ The udev daemon, udevd, receives device uevents directly from + the kernel whenever a device is added or removed from the system, or it changes its + state. When udev receives a device event, it matches its configured set of rules + against various device attributes to identify the device. Rules that match may +@@ -279,9 +278,7 @@ + + arch + +- System's architecture. See in +- systemd.unit5 +- for possible values. ++ System's architecture. + + + +@@ -289,9 +286,7 @@ + + virt + +- System's virtualization environment. See +- systemd-detect-virt1 +- for possible values. ++ System's virtualization environment. + + + +@@ -299,9 +294,7 @@ + + cvm + +- System's confidential virtualization technology. See +- systemd-detect-virt1 +- for possible values. ++ System's confidential virtualization technology. + + + +@@ -410,9 +403,7 @@ + + NAME + +- The name to use for a network interface. See +- systemd.link5 +- for a higher-level mechanism for setting the interface name. ++ The name to use for a network interface. + The name of a device node cannot be changed by udev, only additional + symlinks can be created. + +@@ -538,15 +529,10 @@ + a long period of time may block all further events for this or a dependent device. + + Note that running programs that access the network or mount/unmount filesystems is not +- allowed inside of udev rules, due to the default sandbox that is enforced on +- systemd-udevd.service. ++ allowed inside of udev rules, due to the default sandbox that is enforced. + + Starting daemons or other long-running processes is not allowed; the forked processes, +- detached or not, will be unconditionally killed after the event handling has finished. In order +- to activate long-running processes from udev rules, provide a service unit and pull it in from a +- udev device using the SYSTEMD_WANTS device property. See +- systemd.device5 +- for details. ++ detached or not, will be unconditionally killed after the event handling has finished. + + + +@@ -668,8 +654,8 @@ + in the directory + /run/udev/static_node-tags/tag + pointing at the static device node with the specified name. +- Static device node creation is performed by systemd-tmpfiles +- before systemd-udevd is started. The static nodes might not ++ Static device node creation is performed ++ before udevd is started. The static nodes might not + have a corresponding kernel device; they are used to trigger + automatic kernel module loading when they are accessed. + +@@ -708,7 +694,7 @@ + level name is specified, the maximum log level is changed to that level. When + reset is set, then the previously specified log level is + revoked. Defaults to the log level of the main process of +- systemd-udevd. ++ udevd. + This may be useful when debugging events for certain devices. Note that the + log level is applied when the line including this rule is processed. So, for + debugging, it is recommended that this is specified at earlier place, e.g., the +@@ -909,15 +895,9 @@ SUBSYSTEM=="net", OPTIONS="log_level=debug" + + See Also + +- +- systemd-udevd.service8 +- + + udevadm8 + +- +- systemd.link5 +- + + + +diff --git a/man/udev_device_get_syspath.xml b/man/udev_device_get_syspath.xml +index 43269f9843..5617664446 100644 +--- a/man/udev_device_get_syspath.xml ++++ b/man/udev_device_get_syspath.xml +@@ -191,7 +191,6 @@ + udev_enumerate_new3 + udev_monitor_new_from_netlink3 + udev_list_entry3 +- systemd1 + + + +diff --git a/man/udev_device_has_tag.xml b/man/udev_device_has_tag.xml +index 28cd5f6939..fb0ebd4019 100644 +--- a/man/udev_device_has_tag.xml ++++ b/man/udev_device_has_tag.xml +@@ -177,7 +177,6 @@ + udev_enumerate_new3 + udev_monitor_new_from_netlink3 + udev_list_entry3 +- systemd1 + + + +diff --git a/man/udev_device_new_from_syspath.xml b/man/udev_device_new_from_syspath.xml +index 461ffb8554..4b201c51db 100644 +--- a/man/udev_device_new_from_syspath.xml ++++ b/man/udev_device_new_from_syspath.xml +@@ -191,7 +191,6 @@ + udev_enumerate_new3 + udev_monitor_new_from_netlink3 + udev_list_entry3 +- systemd1 + + + +diff --git a/man/udev_enumerate_add_match_subsystem.xml b/man/udev_enumerate_add_match_subsystem.xml +index 24dbb3579e..54a22b5ced 100644 +--- a/man/udev_enumerate_add_match_subsystem.xml ++++ b/man/udev_enumerate_add_match_subsystem.xml +@@ -142,7 +142,6 @@ + udev_enumerate_scan_devices3 + udev_monitor_new_from_netlink3 + udev_list_entry3 +- systemd1 + + + +diff --git a/man/udev_enumerate_new.xml b/man/udev_enumerate_new.xml +index 4941a229d3..5c6597d3c5 100644 +--- a/man/udev_enumerate_new.xml ++++ b/man/udev_enumerate_new.xml +@@ -90,7 +90,6 @@ + udev_enumerate_scan_devices3 + udev_monitor_new_from_netlink3 + udev_list_entry3 +- systemd1 + + + +diff --git a/man/udev_enumerate_scan_devices.xml b/man/udev_enumerate_scan_devices.xml +index 47912a26f3..5541da256f 100644 +--- a/man/udev_enumerate_scan_devices.xml ++++ b/man/udev_enumerate_scan_devices.xml +@@ -108,7 +108,6 @@ + udev_enumerate_add_match_subsystem3 + udev_monitor_new_from_netlink3 + udev_list_entry3 +- systemd1 + + + +diff --git a/man/udev_list_entry.xml b/man/udev_list_entry.xml +index 46fcde8e1a..2c702c9938 100644 +--- a/man/udev_list_entry.xml ++++ b/man/udev_list_entry.xml +@@ -97,7 +97,6 @@ + udev_device_new_from_syspath3 + udev_enumerate_new3 + udev_monitor_new_from_netlink3 +- systemd1 + + + +diff --git a/man/udev_monitor_filter_update.xml b/man/udev_monitor_filter_update.xml +index 210b664089..6efe664c04 100644 +--- a/man/udev_monitor_filter_update.xml ++++ b/man/udev_monitor_filter_update.xml +@@ -96,7 +96,6 @@ + udev_monitor_new_from_netlink3 + udev_monitor_receive_device3 + udev_list_entry3 +- systemd1 + + + +diff --git a/man/udev_monitor_new_from_netlink.xml b/man/udev_monitor_new_from_netlink.xml +index 9f12d746c0..b1d825fe8d 100644 +--- a/man/udev_monitor_new_from_netlink.xml ++++ b/man/udev_monitor_new_from_netlink.xml +@@ -86,7 +86,6 @@ + udev_monitor_filter_update3 + udev_monitor_receive_device3 + udev_list_entry3 +- systemd1 + + + +diff --git a/man/udev_monitor_receive_device.xml b/man/udev_monitor_receive_device.xml +index 94d2027c60..243c89ea3d 100644 +--- a/man/udev_monitor_receive_device.xml ++++ b/man/udev_monitor_receive_device.xml +@@ -112,7 +112,6 @@ + udev_monitor_new_from_netlink3 + udev_monitor_filter_update3 + udev_list_entry3 +- systemd1 + + + +diff --git a/man/udev_new.xml b/man/udev_new.xml +index 7be4c2211c..b9fa108f7a 100644 +--- a/man/udev_new.xml ++++ b/man/udev_new.xml +@@ -78,14 +78,4 @@ + udev_ref(), and + udev_unref() were added in version 221. + +- +- +- See Also +- +- +- systemd1 +- systemd-udevd.service8 +- +- +- + +diff --git a/man/udevadm.xml b/man/udevadm.xml +index 2a9963cd14..cea30441d5 100644 +--- a/man/udevadm.xml ++++ b/man/udevadm.xml +@@ -86,7 +86,7 @@ + Description + udevadm expects a command and command + specific options. It controls the runtime behavior of +- systemd-udevd, requests kernel events, manages ++ udevd, requests kernel events, manages + the event queue, and provides simple debugging mechanisms. + + +@@ -122,11 +122,7 @@ + + Positional arguments should be used to specify one or more devices. Each one may be a device name + (in which case it must start with /dev/), a sys path (in which case it must start +- with /sys/), a device ID (such as n1, c5:1, +- or b259:1, see +- sd_device_get_device_id3). +- or a systemd device unit name (in which case it must end with .device, see +- systemd.device5). ++ with /sys/). + + + +@@ -589,10 +585,10 @@ + + + When is specified, trigger events for devices +- that are already initialized by systemd-udevd, and skip devices that ++ that are already initialized by udevd, and skip devices that + are not initialized yet. + When is specified, trigger events for devices +- that are not initialized by systemd-udevd yet, and skip devices that ++ that are not initialized by udevd yet, and skip devices that + are already initialized. + Typically, it is essential that applications which intend to use such a match, make + sure a suitable udev rule is installed that sets at least one property on devices that +@@ -649,7 +645,7 @@ + + + +- Before triggering uevents, wait for systemd-udevd daemon to be initialized. ++ Before triggering uevents, wait for udevd daemon to be initialized. + Optionally takes timeout value. Default timeout is 5 seconds. This is equivalent to invoking + udevadm control --ping before udevadm trigger. + +@@ -692,10 +688,6 @@ + + + +- +- See +- systemd-udev-settle.service8 +- for more information. + + + +@@ -708,12 +700,8 @@ + + + +- Signal and wait for systemd-udevd to exit. No option except for ++ Signal and wait for udevd to exit. No option except for + can be specified after this option. +- Note that systemd-udevd.service contains +- and so as a result, this option restarts systemd-udevd. +- If you want to stop systemd-udevd.service, please use the following: +- systemctl stop systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udevd-varlink.socket systemd-udevd.service + + + +@@ -722,7 +710,7 @@ + + + Set the internal log level of +- systemd-udevd. Valid values are the ++ udevd. Valid values are the + numerical syslog priorities or their textual + representations: , + , , +@@ -735,7 +723,7 @@ + + + +- Signal systemd-udevd to stop executing new events. Incoming events ++ Signal udevd to stop executing new events. Incoming events + will be queued. + + +@@ -743,14 +731,14 @@ + + + +- Signal systemd-udevd to enable the execution of events. ++ Signal udevd to enable the execution of events. + + + + + + +- Signal systemd-udevd to reload the rules files and other databases like the kernel ++ Signal udevd to reload the rules files and other databases like the kernel + module index. Reloading rules and databases does not apply any changes to already + existing devices; the new configuration will only be applied to new events. + +@@ -766,15 +754,15 @@ + + + +- Set the maximum number of events, systemd-udevd will handle at the same time. When 0 is ++ Set the maximum number of events, udevd will handle at the same time. When 0 is + specified, then the maximum is determined based on the system resources. + + + + + +- Send a ping message to systemd-udevd and wait for the reply. This may be useful to check that +- systemd-udevd daemon is running. ++ Send a ping message to udevd and wait for the reply. This may be useful to check that ++ udevd daemon is running. + + + +@@ -782,7 +770,7 @@ + + + +- Enable/disable trace logging in systemd-udevd. ++ Enable/disable trace logging in udevd. + + + +@@ -801,7 +789,7 @@ + + + +- The maximum number of seconds to wait for a reply from systemd-udevd. ++ The maximum number of seconds to wait for a reply from udevd. + + + +@@ -838,9 +826,9 @@ + + + Note, this does not imply option. So, if +- systemd-udevd is already running, please consider to also specify ++ udevd is already running, please consider to also specify + to make the copied udev rules files used by +- systemd-udevd. ++ udevd. + + + +@@ -945,7 +933,7 @@ + multiple times. It may be useful for debugging udev rules by copying some udev rules files to a + temporary directory, editing them, and specifying the directory with this option. Files found in + the specified directories have a higher priority than rules files in the default +- udev/rules.d directories used by systemd-udevd. See ++ udev/rules.d directories used by udevd. See + udev7 for more + details about the search paths. + +@@ -1006,9 +994,9 @@ + absolute path to a udev rules file or a directory that contains rules files, or a file name of udev + rules file (e.g. 99-systemd.rules). If a file name is specified, the file will be + searched in the udev/rules.d directories that are processed by +- systemd-udevd, and searched in the current working directory if not found. If no ++ udevd, and searched in the current working directory if not found. If no + files are specified, the udev rules are read from the files located in the same +- udev/rules.d directories that are processed by systemd-udevd. ++ udev/rules.d directories that are processed by udevd. + See udev7 for more + details about the search paths. + +@@ -1024,7 +1012,7 @@ + Specify when udevadm should resolve names of users and groups specified + in udev rules. When set to early (the default), names will be resolved when + the rules are parsed. When set to late, names will not be verified, as +- systemd-udevd resolves names during each event being processed. When set to ++ udevd resolves names during each event being processed. When set to + never, names will never be resolved and relevant rules will be ignored. + + +@@ -1078,9 +1066,9 @@ + absolute path to a udev rules file or a directory that contains rules files, or a file name of udev + rules file (e.g. 99-systemd.rules). If a file name is specified, the file will be + searched in the udev/rules.d directories that are processed by +- systemd-udevd, and searched in the current working directory if not found. If no ++ udevd, and searched in the current working directory if not found. If no + files are specified, the udev rules are read from the files located in the same +- udev/rules.d directories that are processed by systemd-udevd. ++ udev/rules.d directories that are processed by udevd. + See udev7 for more + details about the search paths. + +@@ -1129,12 +1117,12 @@ + + + Wait for devices or device symlinks being created and initialized by +- systemd-udevd. Each device path must start with ++ udevd. Each device path must start with + /dev/ or /sys/, e.g. /dev/sda, + /dev/disk/by-path/pci-0000:3c:00.0-nvme-1-part1, + /sys/devices/pci0000:00/0000:00:1f.6/net/eth0, or + /sys/class/net/eth0. This can take multiple devices. This may be useful for +- waiting for devices being processed by systemd-udevd after e.g. partitioning ++ waiting for devices being processed by udevd after e.g. partitioning + or formatting the devices. + + +@@ -1152,7 +1140,7 @@ + + + +- Check if systemd-udevd initialized devices. Defaults to true. When ++ Check if udevd initialized devices. Defaults to true. When + false, the command only checks if the specified devices exist. Set false to this setting if + there is no udev rules for the specified devices, as the devices will never be considered + as initialized in that case. See Initialized Devices section below for more details. +@@ -1175,7 +1163,7 @@ + + + When specified, also watches the udev event queue, and wait for all queued events +- being processed by systemd-udevd. ++ being processed by udevd. + + + +@@ -1195,14 +1183,6 @@ + are automatically released and its return value is propagated as exit code of udevadm + lock. + +- This tool is in particular useful to ensure that +- systemd-udevd.service8 +- does not probe a block device while changes are made to it, for example partitions created or file +- systems formatted. Note that many tools that interface with block devices natively support taking +- relevant locks, see for example +- sfdisk8's +- switch. +- + The command expects at least one block device specified via or + , and a command line to execute as arguments. + +@@ -1247,8 +1227,7 @@ + + + Specifies how long to wait at most until all locks can be taken. Takes a value in +- seconds, or in the usual supported time units, see +- systemd.time7. If ++ seconds, or in the usual supported time units. If + specified as zero the lock is attempted and if not successful the invocation will immediately + fail. If passed as infinity (the default) the invocation will wait indefinitely + until the lock can be acquired. If the lock cannot be taken in the specified time the specified +@@ -1297,7 +1276,7 @@ + Format a File System + + Take a lock on the backing block device while creating a file system, to ensure that +- systemd-udevd does not probe or announce the new superblock before it is ++ udevd does not probe or announce the new superblock before it is + comprehensively written: + + # udevadm lock --device=/dev/sda1 mkfs.ext4 /dev/sda1 +@@ -1315,7 +1294,7 @@ + Copy in a File System + + Take a lock on the backing block device while copying in a prepared file system image, to ensure +- that systemd-udevd does not probe or announce the new superblock before it is fully ++ that udevd does not probe or announce the new superblock before it is fully + written: + + # udevadm lock -d /dev/sda1 dd if=fs.raw of=/dev/sda1 +@@ -1356,7 +1335,6 @@ $ udevadm test /dev/input/event3 --json=pretty 2>/dev/null | jq .node.symlinks + See Also + + udev7 +- systemd-udevd.service8 + udev.conf5 + + +diff --git a/meson.build b/meson.build +index 438ce4f5f5..e1eacfe065 100644 +--- a/meson.build ++++ b/meson.build +@@ -765,7 +765,7 @@ if time_epoch <= 0 + endif + if time_epoch == '' + NEWS = files('NEWS') +- time_epoch = run_command(stat, '-c', '%Y', NEWS, ++ time_epoch = run_command(stat, '-c', '%m', NEWS, + check : false) + if time_epoch.returncode() != 0 + # If the above fails, maybe the stat(1) uses BSD-style syntax +@@ -1999,126 +1999,9 @@ subdir('src/libsystemd-network') + # hwdb requires 'udev_link_with' and 'udev_rpath' + subdir('src/udev') + +-subdir('src/ac-power') +-subdir('src/analyze') +-subdir('src/ask-password') +-subdir('src/backlight') +-subdir('src/battery-check') +-subdir('src/binfmt') +-subdir('src/bless-boot') +-subdir('src/boot') +-subdir('src/bootctl') +-subdir('src/busctl') +-subdir('src/cgls') +-subdir('src/cgtop') +-subdir('src/coredump') +-subdir('src/creds') +-subdir('src/cryptenroll') +-subdir('src/cryptsetup') +-subdir('src/debug-generator') +-subdir('src/delta') +-subdir('src/detect-virt') +-subdir('src/dissect') +-subdir('src/environment-d-generator') +-subdir('src/escape') +-subdir('src/factory-reset') +-subdir('src/firstboot') +-subdir('src/fsck') +-subdir('src/fstab-generator') +-subdir('src/getty-generator') +-subdir('src/gpt-auto-generator') +-subdir('src/growfs') +-subdir('src/hibernate-resume') +-subdir('src/home') +-subdir('src/hostname') + subdir('src/hwdb') +-subdir('src/id128') +-subdir('src/import') +-subdir('src/imds') # Note, we are not alphabetically here, since we want to use a variable from src/import/ here +-subdir('src/integritysetup') +-subdir('src/journal') +-subdir('src/journal-remote') +-subdir('src/kernel-install') +-subdir('src/keyutil') +-subdir('src/locale') +-subdir('src/login') +-subdir('src/machine') +-subdir('src/machine-id-setup') +-subdir('src/measure') +-subdir('src/modules-load') +-subdir('src/mount') +-subdir('src/mountfsd') +-subdir('src/mstack') +-subdir('src/mute-console') +-subdir('src/network') +-subdir('src/notify') +-subdir('src/nspawn') +-subdir('src/nsresourced') +-subdir('src/nss-myhostname') +-subdir('src/nss-mymachines') +-subdir('src/nss-resolve') +-subdir('src/nss-systemd') +-subdir('src/oom') +-subdir('src/path') +-subdir('src/pcrextend') +-subdir('src/pcrlock') +-subdir('src/portable') +-subdir('src/pstore') +-subdir('src/ptyfwd') +-subdir('src/quotacheck') +-subdir('src/random-seed') +-subdir('src/remount-fs') +-subdir('src/repart') +-subdir('src/report') +-subdir('src/reply-password') +-subdir('src/resolve') +-subdir('src/rfkill') +-subdir('src/rpm') +-subdir('src/run') +-subdir('src/run-generator') +-subdir('src/sbsign') +-subdir('src/shutdown') +-subdir('src/sleep') +-subdir('src/socket-activate') +-subdir('src/socket-proxy') +-subdir('src/ssh-generator') +-subdir('src/stdio-bridge') +-subdir('src/storage') +-subdir('src/storagetm') +-subdir('src/sulogin-shell') +-subdir('src/sysctl') +-subdir('src/sysext') +-subdir('src/sysinstall') +-subdir('src/system-update-generator') +-subdir('src/systemctl') +-subdir('src/sysupdate') +-subdir('src/sysusers') +-subdir('src/timedate') +-subdir('src/timesync') +-subdir('src/tmpfiles') +-subdir('src/tpm2-setup') +-subdir('src/tty-ask-password-agent') +-subdir('src/update-done') +-subdir('src/update-utmp') +-subdir('src/user-sessions') +-subdir('src/userdb') +-subdir('src/validatefs') +-subdir('src/varlinkctl') +-subdir('src/vconsole') +-subdir('src/veritysetup') +-subdir('src/vmspawn') +-subdir('src/volatile-root') +-subdir('src/vpick') +-subdir('src/xdg-autostart-generator') +- +-subdir('src/systemd') + + subdir('src/test') +-subdir('src/fuzz') +-subdir('src/ukify/test') # needs to be last for test_env variable +-subdir('test/fuzz') +- +-subdir('mime') + + alias_target('devel', libsystemd_pc, libudev_pc, systemd_pc, udev_pc) + +@@ -2132,10 +2015,6 @@ foreach test : libsystemd_tests + executables += test_template + test + endforeach + +-foreach fuzzer : simple_fuzzers +- executables += fuzz_template + { 'sources' : [fuzzer] } +-endforeach +- + foreach dict : executables + name = dict.get('name', '') + if name == '' +@@ -2200,17 +2079,6 @@ foreach dict : executables + endforeach + endif + +- if is_fuzz +- include_directories += include_directories('src/fuzz') +- foreach key, val : fuzz_additional_kwargs +- if key == 'sources' +- exe_sources += val +- else +- kwargs += { key : [ kwargs.get(key, []), val ] } +- endif +- endforeach +- endif +- + build_by_default = dict.get('build_by_default', + have_standalone_binaries or not is_standalone) + +@@ -2276,45 +2144,8 @@ foreach dict : executables + is_parallel : dict.get('parallel', true)) + endif + endif +- +- if is_fuzz +- fuzzer_exes += exe +- +- if want_tests != 'false' and want_fuzz_tests +- fuzz_ins = fuzz_regression_tests.get(name, {}) +- foreach directive : fuzz_ins.get('directives', []) +- tt = '@0@_@1@'.format(name, fs.name(directive.full_path())) +- if tt.substring(45) != '' +- error('Directive sample name is too long:', directive.full_path()) +- endif +- +- test(tt, +- exe, +- suite : 'fuzz', +- args : directive.full_path(), +- env : ['UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1'], +- timeout : 60, +- depends : directive) +- endforeach +- foreach file : fuzz_ins.get('files', []) +- tt = '@0@_@1@'.format(name, fs.name(file)) +- if tt.substring(45) != '' +- error('Fuzz sample name is too long:', fs.name(file)) +- endif +- +- test(tt, +- exe, +- suite : 'fuzz', +- env : ['UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1'], +- timeout : 60, +- args : file) +- endforeach +- endif +- endif + endforeach + +-alias_target('fuzzers', fuzzer_exes) +- + ##################################################################### + + test_dlopen = executables_by_name.get('test-dlopen') +@@ -2465,44 +2296,13 @@ endif + + ############################################################ + +-subdir('rules.d') +-subdir('test') +- + ##################################################################### + +-subdir('docs/var-log') ++subdir('rules.d') + subdir('hwdb.d') + subdir('man') +-subdir('modprobe.d') +-subdir('network') +-subdir('presets') +-subdir('profile.d') + subdir('shell-completion/bash') + subdir('shell-completion/zsh') +-subdir('sysctl.d') +-subdir('sysusers.d') +-subdir('tmpfiles.d') +-subdir('units') +- +-install_subdir('factory/etc', +- install_dir : factorydir) +-subdir('factory/templates') +- +-if install_sysconfdir +- install_data('xorg/50-systemd-user.sh', +- install_dir : xinitrcdir) +-endif +-install_data('LICENSE.GPL2', +- 'LICENSE.LGPL2.1', +- 'NEWS', +- 'README', +- 'docs/ENVIRONMENT.md', +- 'docs/TRANSIENT-SETTINGS.md', +- 'docs/UIDS-GIDS.md', +- install_dir : docdir) +- +-install_subdir('LICENSES', +- install_dir : docdir) + + ##################################################################### + +@@ -2595,53 +2395,6 @@ endif + + alias_target('gensources', generated_sources) + +-clang_tidy = find_program('clang-tidy', required : false) +-if meson.version().version_compare('>=1.4.0') +- uniq = {} +- +- foreach source : sources +- if uniq.has_key(source.full_path()) +- continue +- endif +- uniq += {source.full_path(): source} +- endforeach +- +- # TODO: Use uniq.values() when we can rely on meson 1.10.0. +- sources = [] +- foreach path, file : uniq +- sources += [file] +- endforeach +- +- foreach source : sources +- if systemd_headers.contains(source) +- continue +- endif +- +- if not source.full_path().endswith('.c') and not source.full_path().endswith('.h') +- continue +- endif +- +- inputs = [source] +- +- header = source.full_path().replace('.c', '.h') +- if fs.exists(header) and header != source.full_path() and header != libudev_h_path +- inputs += header +- endif +- +- foreach input : inputs +- if clang_tidy.found() +- test( +- 'clang-tidy-@0@'.format(fs.name(input)), +- clang_tidy, +- args : ['-p', meson.project_build_root(), input], +- suite : 'clang-tidy', +- depends : generated_sources, +- ) +- endif +- endforeach +- endforeach +-endif +- + spatch = find_program('spatch', required : false) + if spatch.found() + coccinelle_exclude = [ +@@ -2691,7 +2444,6 @@ run_target( + + alias_target('man', man) + alias_target('html', html) +-alias_target('update-dbus-docs', update_dbus_docs) + alias_target('update-man-rules', update_man_rules) + + if not meson.is_cross_build() +@@ -2717,18 +2469,11 @@ udev_targets = [] + foreach bin : udev_binaries + udev_targets += executables_by_name.get(bin, []) + endforeach +-alias_target('udev', buildable_rules, udev_targets, udev_units) ++alias_target('udev', buildable_rules, udev_targets) + + if conf.get('ENABLE_HWDB') == 1 +- alias_target('hwdb', auto_suspend_rules, executables_by_name.get('systemd-hwdb'), hwdb_units) +-endif +- +-alt_time_epoch = run_command('date', '-Is', '-u', '-d', f'@@time_epoch@', check : false) +-if alt_time_epoch.returncode() != 0 +- # If the above fails, maybe the date(1) uses BSD-style syntax +- alt_time_epoch = run_command('date', '-Iseconds', '-u', '-r', f'@time_epoch@', check : true) ++ alias_target('hwdb', auto_suspend_rules, executables_by_name.get('udev-hwdb')) + endif +-alt_time_epoch = alt_time_epoch.stdout().strip() + + summary({ + 'split bin-sbin' : split_bin, +@@ -2785,7 +2530,6 @@ summary({ + 'default journal storage mode' : conf.get('JOURNAL_STORAGE_DEFAULT'), + 'default user $PATH' : default_user_path != '' ? default_user_path : '(same as system services)', + 'systemd service watchdog' : service_watchdog == '' ? 'disabled' : service_watchdog, +- 'time epoch' : f'@time_epoch@ (@alt_time_epoch@)', + 'TPM2 nvpcr base' : run_command(sh, '-c', 'printf 0x%x @0@'.format(get_option('tpm2-nvpcr-base')), check : true).stdout(), + 'IMDS networking' : get_option('imds-network'), + }) +@@ -2916,7 +2660,6 @@ foreach tuple : [ + ['debug siphash'], + ['trace logging', conf.get('LOG_TRACE') == 1], + ['slow tests', want_slow_tests], +- ['fuzz tests', want_fuzz_tests], + ['install tests', install_tests], + ['link-udev-shared', get_option('link-udev-shared')], + ['link-systemctl-shared', get_option('link-systemctl-shared')], +diff --git a/rules.d/README b/rules.d/README +index 08edb4da55..58871daa77 100644 +--- a/rules.d/README ++++ b/rules.d/README +@@ -1,8 +1,5 @@ +-Files in this directory contain configuration for systemd-udevd.service, a ++Files in this directory contain configuration for udevd, a + daemon that manages symlinks to device nodes, permissions of devices nodes, + emits device events for userspace, and renames network interfaces. + +-See man:udev(7) for an overview of the configuration file format, and +-man:systemd-udevd.service(8) for a description of service itself. +- +-Use 'systemd-analyze cat-config udev/rules.d' to display the effective config. ++See man:udev(7) for an overview of the configuration file format. +diff --git a/rules.d/meson.build b/rules.d/meson.build +index aa469ef7a7..e936f5b11f 100644 +--- a/rules.d/meson.build ++++ b/rules.d/meson.build +@@ -45,9 +45,6 @@ rules = [ + + [files('70-memory.rules'), + conf.get('HAVE_DMI') == 1], +- +- [files('70-power-switch.rules'), +- conf.get('ENABLE_LOGIND') == 1] + ] + + all_rules = [] +@@ -67,11 +64,6 @@ rules_in = [ + ['50-udev-default.rules'], + ['60-persistent-storage.rules'], + ['64-btrfs.rules'], +- ['99-systemd.rules'], +- +- ['70-uaccess.rules', conf.get('ENABLE_LOGIND') == 1 and conf.get('HAVE_ACL') == 1], +- ['71-seat.rules', conf.get('ENABLE_LOGIND') == 1], +- ['73-seat-late.rules', conf.get('ENABLE_LOGIND') == 1], + + ['90-vconsole.rules', conf.get('ENABLE_VCONSOLE') == 1], + ] +diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build +index cddf742059..1f240bb0cf 100644 +--- a/shell-completion/bash/meson.build ++++ b/shell-completion/bash/meson.build +@@ -16,51 +16,12 @@ custom_target( + input : 'systemctl.in', + output : 'systemctl', + command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], +- install : true, ++ install : false, + install_dir : bashcompletiondir) + + foreach item : [ +- ['bootctl', ''], +- ['busctl', ''], +- ['coredumpctl', 'ENABLE_COREDUMP'], +- ['homectl', 'ENABLE_HOMED'], +- ['hostnamectl', 'ENABLE_HOSTNAMED'], +- ['importctl', 'ENABLE_IMPORTD'], +- ['journalctl', ''], +- ['kernel-install', 'ENABLE_KERNEL_INSTALL'], +- ['localectl', 'ENABLE_LOCALED'], +- ['loginctl', 'ENABLE_LOGIND'], +- ['machinectl', 'ENABLE_MACHINED'], +- ['networkctl', 'ENABLE_NETWORKD'], +- ['oomctl', 'ENABLE_OOMD'], +- ['portablectl', 'ENABLE_PORTABLED'], +- ['resolvectl', 'ENABLE_RESOLVE'], +- ['run0', ''], +- ['storagectl', ''], +- ['systemd-analyze', ''], +- ['systemd-cat', ''], +- ['systemd-cgls', ''], +- ['systemd-cgtop', ''], +- ['systemd-confext', 'ENABLE_SYSEXT'], +- ['systemd-creds', ''], +- ['systemd-cryptenroll', 'HAVE_LIBCRYPTSETUP'], +- ['systemd-delta', ''], +- ['systemd-detect-virt', ''], +- ['systemd-dissect', 'HAVE_BLKID'], +- ['systemd-hwdb', 'ENABLE_HWDB'], +- ['systemd-id128', ''], +- ['systemd-nspawn', 'ENABLE_NSPAWN'], +- ['systemd-path', ''], +- ['systemd-resolve', 'ENABLE_RESOLVE'], +- ['systemd-run', ''], +- ['systemd-sysext', 'ENABLE_SYSEXT'], +- ['systemd-sysinstall', 'ENABLE_SYSINSTALL'], +- ['systemd-vmspawn', 'ENABLE_VMSPAWN'], +- ['systemd-vpick', ''], +- ['timedatectl', 'ENABLE_TIMEDATED'], ++ ['udev-hwdb', 'ENABLE_HWDB'], + ['udevadm', ''], +- ['userdbctl', 'ENABLE_USERDB'], +- ['varlinkctl', ''], + ] + + if item[1] == '' or conf.get(item[1]) == 1 +diff --git a/shell-completion/bash/systemd-hwdb b/shell-completion/bash/udev-hwdb +similarity index 94% +rename from shell-completion/bash/systemd-hwdb +rename to shell-completion/bash/udev-hwdb +index a401bbf1c7..9085002a7c 100644 +--- a/shell-completion/bash/systemd-hwdb ++++ b/shell-completion/bash/udev-hwdb +@@ -1,5 +1,5 @@ + # shellcheck shell=bash +-# systemd-hwdb(8) completion -*- shell-script -*- ++# udev-hwdb(8) completion -*- shell-script -*- + # SPDX-License-Identifier: LGPL-2.1-or-later + # + # This file is part of systemd. +@@ -24,7 +24,7 @@ __contains_word() { + done + } + +-_systemd_hwdb() { ++_udev_hwdb() { + local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword + local i verb comps + +@@ -73,4 +73,4 @@ _systemd_hwdb() { + return 0 + } + +-complete -F _systemd_hwdb systemd-hwdb ++complete -F _udev_hwdb udev-hwdb +diff --git a/shell-completion/zsh/_systemd-hwdb b/shell-completion/zsh/_udev-hwdb +similarity index 91% +rename from shell-completion/zsh/_systemd-hwdb +rename to shell-completion/zsh/_udev-hwdb +index 92238d63ad..d9771253bc 100644 +--- a/shell-completion/zsh/_systemd-hwdb ++++ b/shell-completion/zsh/_udev-hwdb +@@ -1,4 +1,4 @@ +-#compdef systemd-hwdb ++#compdef udev-hwdb + # SPDX-License-Identifier: LGPL-2.1-or-later + + local context state state_descr line +@@ -24,7 +24,7 @@ _arguments -s -A '-*' "$opt_common[@]" \ + + case $state in + command) +- _describe -t command 'systemd-hwdb command' hwdb_commands && ret=0 ++ _describe -t command 'udev-hwdb command' hwdb_commands && ret=0 + ;; + option-or-argument) + case $words[1] in +diff --git a/shell-completion/zsh/_udevadm b/shell-completion/zsh/_udevadm +index 7e717d30a3..dff1599f90 100644 +--- a/shell-completion/zsh/_udevadm ++++ b/shell-completion/zsh/_udevadm +@@ -61,16 +61,16 @@ _udevadm_control(){ + _arguments \ + '(-)'{-h,--help}'[Show help]' \ + '(-)'{-V,--version}'[Show package version]' \ +- '(-e --exit)'{-e,--exit}'[Signal and wait for systemd-udevd to exit.]' \ +- '(-l --log-level)'{-l,--log-level=}'[Set the internal log level of systemd-udevd.]:LEVEL:(err info debug)' \ +- '(-s --stop-exec-queue)'{-s,--stop-exec-queue}'[Signal systemd-udevd to stop executing new events. Incoming events will be queued.]' \ +- '(-S --start-exec-queue)'{-S,--start-exec-queue}'[Signal systemd-udevd to enable the execution of events.]' \ +- '(-R --reload)'{-R,--reload}'[Signal systemd-udevd to reload the rules files and other databases like the kernel module index.]' \ ++ '(-e --exit)'{-e,--exit}'[Signal and wait for udevd to exit.]' \ ++ '(-l --log-level)'{-l,--log-level=}'[Set the internal log level of udevd.]:LEVEL:(err info debug)' \ ++ '(-s --stop-exec-queue)'{-s,--stop-exec-queue}'[Signal udevd to stop executing new events. Incoming events will be queued.]' \ ++ '(-S --start-exec-queue)'{-S,--start-exec-queue}'[Signal udevd to enable the execution of events.]' \ ++ '(-R --reload)'{-R,--reload}'[Signal udevd to reload the rules files and other databases like the kernel module index.]' \ + '(-p --property)'{-p,--property=}'[Set a global property for all events.]:KEY=VALUE' \ + '(-m --children-max=)'{-m,--children-max=}'[Set the maximum number of events.]:N' \ + '--trace=[Enable/disable trace logging.]:BOOL' \ + '--revert[Revert previously set configurations.]' \ +- '(-t --timeout=)'{-t,--timeout=}'[The maximum number of seconds to wait for a reply from systemd-udevd.]:SECONDS' ++ '(-t --timeout=)'{-t,--timeout=}'[The maximum number of seconds to wait for a reply from udevd.]:SECONDS' + } + + (( $+functions[_udevadm_monitor] )) || +@@ -148,7 +148,7 @@ _udevadm_wait(){ + '(- *)'{-h,--help}'[Print help]' \ + '(- *)'{-V,--version}'[Print version of the program]' \ + '--timeout=[Maximum number of seconds to wait for the devices being created.]:SEC' \ +- '--initialized=[Wait for devices being initialized by systemd-udevd.]:boolean:(yes no)' \ ++ '--initialized=[Wait for devices being initialized by udevd.]:boolean:(yes no)' \ + '--removed[Wait for devices being removed.]' \ + '--settle[Also wait for udev queue being empty.]' \ + '*::devpath:_files -W /dev' +diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build +index f10ba7be61..f214f4d81d 100644 +--- a/shell-completion/zsh/meson.build ++++ b/shell-completion/zsh/meson.build +@@ -11,44 +11,12 @@ custom_target( + input : '_systemctl.in', + output : '_systemctl', + command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], +- install : true, ++ install : false, + install_dir : zshcompletiondir) + + foreach item : [ +- ['_bootctl', ''], +- ['_busctl', ''], +- ['_coredumpctl', 'ENABLE_COREDUMP'], +- ['_hostnamectl', 'ENABLE_HOSTNAMED'], +- ['_journalctl', ''], +- ['_kernel-install', 'ENABLE_KERNEL_INSTALL'], +- ['_localectl', 'ENABLE_LOCALED'], +- ['_loginctl', 'ENABLE_LOGIND'], +- ['_machinectl', 'ENABLE_MACHINED'], +- ['_networkctl', 'ENABLE_NETWORKD'], +- ['_oomctl', 'ENABLE_OOMD'], +- ['_resolvectl', 'ENABLE_RESOLVE'], +- ['_run0', ''], +- ['_sd_bus_address', ''], +- ['_sd_hosts_or_user_at_host', ''], +- ['_sd_machines', 'ENABLE_MACHINED'], +- ['_sd_outputmodes', ''], +- ['_sd_unit_files', ''], +- ['_storagectl', ''], +- ['_systemd', ''], +- ['_systemd-analyze', ''], +- ['_systemd-delta', ''], +- ['_systemd-hwdb', 'ENABLE_HWDB'], +- ['_systemd-id128', ''], +- ['_systemd-inhibit', 'ENABLE_LOGIND'], +- ['_systemd-nspawn', ''], +- ['_systemd-path', ''], +- ['_systemd-run', ''], +- ['_systemd-sysinstall', 'ENABLE_SYSINSTALL'], +- ['_systemd-tmpfiles', 'ENABLE_TMPFILES'], +- ['_timedatectl', 'ENABLE_TIMEDATED'], ++ ['_udev-hwdb', 'ENABLE_HWDB'], + ['_udevadm', ''], +- ['_userdbctl', ''], +- ['_varlinkctl', ''], + ] + + if item[1] == '' or conf.get(item[1]) == 1 +diff --git a/src/core/meson.build b/src/core/meson.build +index af50a2a4fa..14a0e1f330 100644 +--- a/src/core/meson.build ++++ b/src/core/meson.build +@@ -294,21 +294,6 @@ install_emptydir(systemgeneratordir) + install_emptydir(userenvgeneratordir) + install_emptydir(usergeneratordir) + +-if install_sysconfdir +- install_emptydir(pkgsysconfdir / 'system') +- install_emptydir(pkgsysconfdir / 'user') +- +- assert(sysconfdir / 'systemd' == pkgsysconfdir) +- install_symlink('user', +- pointing_to : '../../systemd/user', +- install_dir : sysconfdir / 'xdg/systemd') +-endif +- +-assert(fs.parent(sbindir) / 'lib/systemd' == libexecdir) +-install_symlink('init', +- pointing_to : '../lib/systemd/systemd', +- install_dir : sbindir) +- + ############################################################ + + core_test_template = test_template + { +diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c +index 4d2d6fe8c4..4161259e49 100644 +--- a/src/hwdb/hwdb.c ++++ b/src/hwdb/hwdb.c +@@ -35,7 +35,7 @@ static int help(void) { + _cleanup_(table_unrefp) Table *options = NULL, *verbs = NULL; + int r; + +- r = terminal_urlify_man("systemd-hwdb", "8", &link); ++ r = terminal_urlify_man("udev-hwdb", "8", &link); + if (r < 0) + return log_oom(); + +diff --git a/src/hwdb/meson.build b/src/hwdb/meson.build +index 57ace3ad44..96c0b185d0 100644 +--- a/src/hwdb/meson.build ++++ b/src/hwdb/meson.build +@@ -2,7 +2,7 @@ + + executables += [ + executable_template + { +- 'name' : 'systemd-hwdb', ++ 'name' : 'udev-hwdb', + 'public' : true, + 'conditions' : ['ENABLE_HWDB'], + 'sources' : files('hwdb.c'), +diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c +index 938d02f3b7..1640785361 100644 +--- a/src/libsystemd/sd-hwdb/sd-hwdb.c ++++ b/src/libsystemd/sd-hwdb/sd-hwdb.c +@@ -413,7 +413,7 @@ static int hwdb_new(const char *path, sd_hwdb **ret) { + + if (!hwdb->f) + return log_debug_errno(SYNTHETIC_ERRNO(ENOENT), +- "hwdb.bin does not exist, please run 'systemd-hwdb update'."); ++ "hwdb.bin does not exist, please run 'udev-hwdb update'."); + } + + if (fstat(fileno(hwdb->f), &hwdb->st) < 0) +diff --git a/src/test/meson.build b/src/test/meson.build +index 5d96b2fe74..978dfa5edf 100644 +--- a/src/test/meson.build ++++ b/src/test/meson.build +@@ -26,18 +26,6 @@ endif + + generate_sym_test_py = files('generate-sym-test.py') + +-test_libsystemd_sym_c = custom_target( +- input : [libsystemd_sym_path, +- systemd_headers, +- libsystemd_sources], +- output : 'test-libsystemd-sym.c', +- command : [generate_sym_test_py, +- libsystemd_sym_path, +- libsystemd_dir_path, +- systemd_headers], +- capture : true, +- build_by_default : want_tests != 'false') +- + test_libudev_sym_c = custom_target( + input : [libudev_sym_path, + libudev_h_path, +@@ -50,7 +38,7 @@ test_libudev_sym_c = custom_target( + capture : true, + build_by_default : want_tests != 'false') + +-generated_sources += [test_libsystemd_sym_c, test_libudev_sym_c] ++generated_sources += [test_libudev_sym_c] + + ############################################################ + +@@ -425,11 +413,6 @@ executables += [ + 'sources' : files('test-reread-partition-table-manual.c'), + 'type' : 'manual', + }, +- test_template + { +- 'sources' : files('test-sbat.c'), +- 'conditions' : ['ENABLE_BOOTLOADER'], +- 'c_args' : f'-I@efi_config_h_dir@', +- }, + test_template + { + 'sources' : files('test-seccomp.c'), + 'dependencies' : libseccomp_cflags, +@@ -479,12 +462,6 @@ executables += [ + }, + + # Symbol tests +- test_template + { +- 'name' : 'test-libsystemd-sym', +- 'sources' : [test_libsystemd_sym_c], +- 'link_with' : libsystemd, +- 'suite' : 'libsystemd', +- }, + test_template + { + 'name' : 'test-libudev-sym', + 'sources' : [test_libudev_sym_c], +diff --git a/src/udev/meson.build b/src/udev/meson.build +index b5140a626a..cb8fc3097a 100644 +--- a/src/udev/meson.build ++++ b/src/udev/meson.build +@@ -256,7 +256,7 @@ executables += [ + }, + ] + +-install_symlink('systemd-udevd', ++install_symlink('udevd', + pointing_to : libexecdir_to_bin + 'udevadm', + install_dir : libexecdir, + install_tag : 'udev') +diff --git a/src/udev/udev-config.c b/src/udev/udev-config.c +index c108985c4d..50b00f1b2f 100644 +--- a/src/udev/udev-config.c ++++ b/src/udev/udev-config.c +@@ -165,8 +165,6 @@ static int help(void) { + r = table_print_or_warn(options); + if (r < 0) + return r; +- +- help_man_page_reference("systemd-udevd.service", "8"); + return 0; + } + +diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c +index 0a38e6ee06..0b4a09154d 100644 +--- a/src/udev/udevadm-hwdb.c ++++ b/src/udev/udevadm-hwdb.c +@@ -32,7 +32,7 @@ static int help(void) { + + printf("\nNOTE:\n" + "The sub-command 'hwdb' is deprecated, and is left for backwards compatibility.\n" +- "Please use systemd-hwdb instead.\n"); ++ "Please use udev-hwdb instead.\n"); + return 0; + } + +@@ -90,7 +90,7 @@ int verb_hwdb_main(int argc, char *argv[], uintptr_t _data, void *userdata) { + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Either --update or --test must be used."); + +- log_notice("udevadm hwdb is deprecated. Use systemd-hwdb instead."); ++ log_notice("udevadm hwdb is deprecated. Use udev-hwdb instead."); + + if (arg_update && !hwdb_bypass()) { + r = hwdb_update(arg_root, arg_hwdb_bin_dir, arg_strict, true); +diff --git a/src/udev/udevadm-wait.c b/src/udev/udevadm-wait.c +index 08c142d5eb..54d57f98d7 100644 +--- a/src/udev/udevadm-wait.c ++++ b/src/udev/udevadm-wait.c +@@ -343,7 +343,7 @@ static int parse_argv(int argc, char *argv[]) { + break; + + OPTION_LONG("initialized", "BOOL", +- "Wait for devices being initialized by systemd-udevd"): ++ "Wait for devices being initialized by udevd"): + r = parse_boolean(opts.arg); + if (r < 0) + return log_error_errno(r, "Failed to parse --initialized= parameter: %s", opts.arg); +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 4cbc481c76..ca2e207ead 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -67,7 +67,7 @@ int run_udevd(int argc, char *argv[]) { + if (arg_daemonize) { + pid_t pid; + +- log_info("Starting systemd-udevd version " GIT_VERSION); ++ log_info("Starting udevd version " GIT_VERSION); + + /* connect /dev/null to stdin, stdout, stderr */ + if (log_get_max_level() < LOG_DEBUG) { +diff --git a/test/meson.build b/test/meson.build +index fd3dba3a60..8284b24615 100644 +--- a/test/meson.build ++++ b/test/meson.build +@@ -40,7 +40,7 @@ endif + ############################################################ + + if want_tests != 'false' and conf.get('ENABLE_HWDB') == 1 +- exe = executables_by_name.get('systemd-hwdb') ++ exe = executables_by_name.get('udev-hwdb') + test('hwdb-test', + files('hwdb-test.sh'), + suite : 'dist', +-- +2.55.0 + diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template new file mode 100644 index 00000000000000..5bc89152dae3f2 --- /dev/null +++ b/srcpkgs/udev/template @@ -0,0 +1,94 @@ +# Template file for 'udev' +pkgname=udev +version=261.2 +revision=1 +build_style=meson +configure_args="-Dacl=enabled -Dadm-group=false -Danalyze=false + -Dapparmor=disabled -Daudit=disabled -Dbacklight=false -Dbinfmt=false + -Dbootloader=disabled -Dbpf-framework=disabled -Dbzip2=disabled + -Dcoredump=false -Ddbus=disabled -Defi=false -Delfutils=disabled + -Denvironment-d=false -Dfdisk=disabled -Dgcrypt=disabled -Dglib=disabled + -Dgshadow=false -Dgnutls=disabled -Dhibernate=false -Dhostnamed=false + -Didn=false -Dima=false -Dinitrd=false -Dfirstboot=false + -Dkernel-install=false -Dldconfig=false -Dlibcryptsetup=disabled + -Dlibcurl=disabled -Dlibfido2=disabled -Dlibidn2=disabled -Dlocaled=false + -Dlogind=false -Dlz4=disabled -Dmachined=false -Dmicrohttpd=disabled -Dnetworkd=false + -Dnss-myhostname=false -Dnss-resolve=disabled -Dnss-systemd=false -Doomd=false + -Dopenssl=disabled -Dp11kit=disabled -Dpam=disabled -Dpcre2=disabled + -Dpolkit=disabled -Dportabled=false -Dpstore=false -Dpwquality=disabled + -Drandomseed=false -Dresolve=false -Drfkill=false -Dseccomp=disabled + -Dselinux=disabled -Dsmack=false -Dsysext=false -Dsysusers=false + -Dtimedated=false -Dtimesyncd=false -Dtmpfiles=false -Dtpm=false + -Dqrencode=disabled -Dquotacheck=false -Duserdb=false -Dukify=disabled + -Dutmp=false -Dvconsole=false -Dwheel-group=false -Dxdg-autostart=false + -Dxkbcommon=disabled -Dxz=disabled -Dzlib=disabled -Dzstd=disabled -Dhwdb=true + -Dman=enabled -Dstandalone-binaries=true -Dstatic-libudev=true -Dtests=false + -Dlink-boot-shared=false -Dlink-journalctl-shared=false + -Dlink-networkd-shared=false -Dlink-systemctl-shared=false + -Dlink-timesyncd-shared=false -Dlink-udev-shared=false -Dsplit-bin=false + -Dsysvinit-path= -Drpmmacrosdir=no -Dpamconfdir=no -Dvmspawn=disabled + -Dtime-epoch=${SOURCE_DATE_EPOCH:-0} -Dlibc=${XBPS_TARGET_LIBC}" +conf_files="/etc/udev/udev.conf" +hostmakedepends="docbook-xsl gperf libxslt perl pkg-config python3-Jinja2" +makedepends="acl-devel libkmod-devel libcap-devel libblkid-devel libmount-devel" +short_desc="Standalone build of systemd-udev" +maintainer="classabbyamp " +license="LGPL-2.1-or-later" +homepage="https://systemd.io" +distfiles="https://github.com/systemd/systemd/archive/refs/tags/v${version}.tar.gz" +checksum=ed1059ff964f5df35b6056434cc17cc83f86dc913f10489948a0b19b6081c5ec + +# cause the removal of eudev +conflicts="eudev>=0" +replaces="eudev>=0" +# prevent dependency not satisfied errors in xbps-pkgdb +# while packages still depend on eudev (and subpackages) +# XXX: in the future, rebuild remaining dependents of eudev and remove this +provides="eudev-${version}_${revision}" + +if [ "$XBPS_TARGET_LIBC" = musl ]; then + makedepends+=" libucontext-devel" +fi + +post_install() { + # clean up + for f in etc/systemd usr/lib/systemd 'usr/lib/libsystemd.*' \ + usr/lib/pkgconfig/libsystemd.pc usr/share/pkgconfig/systemd.pc \ + usr/share/dbus-1 usr/share/polkit-1 + do + rm -r ${DESTDIR}/$f + done + + # predictable interface names + vinstall "${FILESDIR}/80-net-name-slot.rules" 0644 usr/lib/udev/rules.d + + # add udev daemon + ln -s udevadm "$DESTDIR/usr/bin/udevd" + vsv udevd +} + +libudev_package() { + short_desc+=" - runtime library" + conflicts="eudev-libudev>=0" + replaces="eudev-libudev>=0" + provides="eudev-libudev-${version}_${revision}" + pkg_install() { + vmove "usr/lib/*.so.*" + } +} + +udev-devel_package() { + depends="lib${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + conflicts="eudev-libudev-devel>=0" + replaces="eudev-libudev-devel>=0" + provides="eudev-libudev-devel-${version}_${revision}" + pkg_install() { + vmove usr/share/man/man3 + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template index 4846f5deb79992..61f6b7eed7ae79 100644 --- a/srcpkgs/udevil/template +++ b/srcpkgs/udevil/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="--disable-systemd" conf_files="/etc/udevil/udevil.conf" hostmakedepends="pkg-config intltool" -makedepends="libglib-devel eudev-libudev-devel" +makedepends="libglib-devel udev-devel" short_desc="CLI which mounts and unmounts removable devices without a password" maintainer="Orphaned " license="GPL-3.0-or-later" diff --git a/srcpkgs/udftools/template b/srcpkgs/udftools/template index 9cbe55489301db..3f7629e44410b4 100644 --- a/srcpkgs/udftools/template +++ b/srcpkgs/udftools/template @@ -4,7 +4,7 @@ version=2.3 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="ncurses-devel readline-devel eudev-libudev-devel" +makedepends="ncurses-devel readline-devel udev-devel" short_desc="Linux tools for UDF filesystems and DVD/CD-R(W) drives" maintainer="Pierre Allegraud " license="GPL-2.0-or-later" diff --git a/srcpkgs/umockdev/template b/srcpkgs/umockdev/template index 1439c8e603dd5e..ab0825c427d2d3 100644 --- a/srcpkgs/umockdev/template +++ b/srcpkgs/umockdev/template @@ -5,8 +5,8 @@ revision=1 build_style=meson build_helper="gir" hostmakedepends="pkg-config vala" -makedepends="vala-devel eudev-libudev-devel libpcap-devel gobject-introspection" -checkdepends="eudev which gphoto2 libgudev-devel python3-gobject usbutils xz" +makedepends="vala-devel udev-devel libpcap-devel gobject-introspection" +checkdepends="udev which gphoto2 libgudev-devel python3-gobject usbutils xz" short_desc="Mock hardware devices for creating unit tests and bug reporting" maintainer="oreo639 " license="LGPL-2.1-or-later" diff --git a/srcpkgs/usbutils/template b/srcpkgs/usbutils/template index d58a07e58b654e..82b640c95ba315 100644 --- a/srcpkgs/usbutils/template +++ b/srcpkgs/usbutils/template @@ -4,7 +4,7 @@ version=019 revision=1 build_style=meson hostmakedepends="pkg-config" -makedepends="eudev-libudev-devel libusb-devel" +makedepends="udev-devel libusb-devel" depends="hwids" short_desc="Linux USB utilities" maintainer="Enno Boland " diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index f28ae2c76f3cbb..36b36e459094d2 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -10,7 +10,7 @@ configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall- --with-udev --without-python --enable-write" hostmakedepends="gettext pkg-config" makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel - eudev-libudev-devel sqlite-devel" + udev-devel sqlite-devel" depends="libfdisk>=${version}_1<=${version}_9999 libblkid>=${version}_1<=${version}_9999 libmount>=${version}_1<=${version}_9999 diff --git a/srcpkgs/v4l-utils/template b/srcpkgs/v4l-utils/template index 04321740e34e13..0d228ac3c720a0 100644 --- a/srcpkgs/v4l-utils/template +++ b/srcpkgs/v4l-utils/template @@ -5,7 +5,7 @@ revision=1 build_style=meson configure_args="-Dqv4l2=disabled -Dudevdir=/usr/lib/udev -Dgconv=disabled" hostmakedepends="perl pkg-config gettext-devel" -makedepends="libjpeg-turbo-devel libsysfs-devel eudev-libudev-devel alsa-lib-devel +makedepends="libjpeg-turbo-devel libsysfs-devel udev-devel alsa-lib-devel libX11-devel" short_desc="Userspace tools and libraries for Video 4 Linux" maintainer="Orphaned " diff --git a/srcpkgs/way-displays/template b/srcpkgs/way-displays/template index 3413ccdf2bdc3f..28e50b4089d14c 100644 --- a/srcpkgs/way-displays/template +++ b/srcpkgs/way-displays/template @@ -6,7 +6,7 @@ build_style=gnu-makefile make_build_args="PREFIX_ETC=/" make_install_args="PREFIX_ETC=/" hostmakedepends="pkg-config wayland-devel" -makedepends="wayland-devel yaml-cpp-devel wlroots-devel eudev-libudev-devel" +makedepends="wayland-devel yaml-cpp-devel wlroots-devel udev-devel" short_desc="Auto Manage Your Wayland Displays" maintainer="dvar " license="MIT" diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template index cea4074bafc168..98c63fa5788a7a 100644 --- a/srcpkgs/weston/template +++ b/srcpkgs/weston/template @@ -8,7 +8,7 @@ configure_args="-Dtests=false $(vopt_bool vaapi deprecated-backend-drm-screencas hostmakedepends="pkg-config wayland-devel wayland-protocols glslang" makedepends="libpng-devel wayland-devel wayland-protocols libxkbcommon-devel pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel - poppler-glib-devel pam-devel lcms2-devel eudev-libudev-devel libdrm-devel + poppler-glib-devel pam-devel lcms2-devel udev-devel libdrm-devel libinput-devel libxcb-devel libXcursor-devel dbus-devel libevdev-devel xorg-server-xwayland neatvnc-devel libseat-devel pipewire-devel gst-plugins-base1-devel libdisplay-info-devel freerdp-devel diff --git a/srcpkgs/wlroots0.18/template b/srcpkgs/wlroots0.18/template index 94b858a7c3abf4..bec56513b4ef41 100644 --- a/srcpkgs/wlroots0.18/template +++ b/srcpkgs/wlroots0.18/template @@ -8,7 +8,7 @@ build_style=meson configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false" hostmakedepends="pkg-config wayland-devel glslang hwids" -_devel_depends="lcms2-devel libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel +_devel_depends="lcms2-devel libgbm-devel libglvnd-devel libseat-devel udev-devel libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols vulkan-loader-devel xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel libdisplay-info-devel libliftoff-devel" diff --git a/srcpkgs/wlroots0.19/template b/srcpkgs/wlroots0.19/template index 2baee262ffffc1..910eaf1a95e458 100644 --- a/srcpkgs/wlroots0.19/template +++ b/srcpkgs/wlroots0.19/template @@ -8,7 +8,7 @@ build_style=meson configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false" hostmakedepends="pkg-config wayland-devel glslang hwids" -_devel_depends="lcms2-devel libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel +_devel_depends="lcms2-devel libgbm-devel libglvnd-devel libseat-devel udev-devel libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols vulkan-loader-devel xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel libdisplay-info-devel libliftoff-devel" diff --git a/srcpkgs/wlroots0.20/template b/srcpkgs/wlroots0.20/template index 1a7e863dffa856..fa9162138a5e3e 100644 --- a/srcpkgs/wlroots0.20/template +++ b/srcpkgs/wlroots0.20/template @@ -8,7 +8,7 @@ build_style=meson configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false" hostmakedepends="pkg-config wayland-devel glslang hwids" -_devel_depends="lcms2-devel libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel +_devel_depends="lcms2-devel libgbm-devel libglvnd-devel libseat-devel udev-devel libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols vulkan-loader-devel xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel libdisplay-info-devel libliftoff-devel" diff --git a/srcpkgs/wluma/template b/srcpkgs/wluma/template index 736088ea72c32f..b5f1a0a8a3f53a 100644 --- a/srcpkgs/wluma/template +++ b/srcpkgs/wluma/template @@ -4,7 +4,7 @@ version=4.11.0 revision=1 build_style=cargo hostmakedepends="pkg-config clang cargo" -makedepends="eudev-libudev-devel v4l-utils-devel wayland-devel vulkan-loader-devel +makedepends="udev-devel v4l-utils-devel wayland-devel vulkan-loader-devel dbus-devel" short_desc="Automatic brightness adjustment based on screen contents and ALS" maintainer="Emil Miler " diff --git a/srcpkgs/xboxdrv/template b/srcpkgs/xboxdrv/template index 8a3be97f63c33c..830deebb3f4e3f 100644 --- a/srcpkgs/xboxdrv/template +++ b/srcpkgs/xboxdrv/template @@ -5,7 +5,7 @@ revision=4 build_style=scons make_build_args=BUILD=custom hostmakedepends="pkg-config glib-devel dbus-glib-devel" -makedepends="boost-headers libX11-devel eudev-libudev-devel +makedepends="boost-headers libX11-devel udev-devel libusb-devel dbus-glib-devel glib-devel" short_desc="Xbox Gamepad Userspace Driver" maintainer="Andrea Brancaleoni " diff --git a/srcpkgs/xbps-triggers/files/hwdb.d-dir b/srcpkgs/xbps-triggers/files/hwdb.d-dir index c651f0001a5af8..85729c7a04fc92 100755 --- a/srcpkgs/xbps-triggers/files/hwdb.d-dir +++ b/srcpkgs/xbps-triggers/files/hwdb.d-dir @@ -1,6 +1,6 @@ #!/bin/sh # -# Updates hardware database +# Updates hardware database # # Arguments: $ACTION = [run/targets] # $TARGET = [post-install/pre-remove] @@ -14,19 +14,20 @@ PKGNAME="$3" VERSION="$4" UPDATE="$5" -udevadm=usr/bin/udevadm - case "$ACTION" in targets) echo "post-install pre-remove" ;; run) - if [ ! -x $udevadm ]; then + echo "Updating udev hardware database ..." + if [ -x usr/bin/udev-hwdb ]; then + usr/bin/udev-hwdb --root=. update + elif [ -x usr/bin/udevadm ]; then + usr/bin/udevadm hwdb --root=. --update + else exit 0 fi - echo "Updating udev hardware database ..." - $udevadm hwdb --root=. --update ;; *) exit 1 diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index f46503b994d7a1..187fab65d69eaf 100644 --- a/srcpkgs/xbps-triggers/template +++ b/srcpkgs/xbps-triggers/template @@ -1,6 +1,6 @@ # Template file for 'xbps-triggers' pkgname=xbps-triggers -version=0.131 +version=0.132 revision=1 bootstrap=yes short_desc="XBPS triggers for Void Linux" diff --git a/srcpkgs/xf86-input-wacom/template b/srcpkgs/xf86-input-wacom/template index 7281d769834dd2..682baf651858e3 100644 --- a/srcpkgs/xf86-input-wacom/template +++ b/srcpkgs/xf86-input-wacom/template @@ -4,7 +4,7 @@ version=1.2.4 revision=1 build_style=meson hostmakedepends="pkg-config" -makedepends="xorg-server-devel libXrandr-devel libXinerama-devel libXi-devel eudev-libudev-devel" +makedepends="xorg-server-devel libXrandr-devel libXinerama-devel libXi-devel udev-devel" depends="virtual?xserver-abi-input-24_1" short_desc="Xorg Wacom tablet input driver" maintainer="classabbyamp " diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template index 7d7836ac74c584..b6d59453379f66 100644 --- a/srcpkgs/xf86-video-amdgpu/template +++ b/srcpkgs/xf86-video-amdgpu/template @@ -4,7 +4,7 @@ version=23.0.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel +makedepends="xorgproto udev-devel libpciaccess-devel libdrm-devel pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros" depends="virtual?xserver-abi-video-25_1 mesa-dri" short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)" diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template index fd54216846405b..851b37645d06b2 100644 --- a/srcpkgs/xf86-video-ati/template +++ b/srcpkgs/xf86-video-ati/template @@ -4,7 +4,7 @@ version=22.0.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="xorgproto eudev-libudev-devel libpciaccess-devel +makedepends="xorgproto udev-devel libpciaccess-devel libdrm-devel pixman-devel MesaLib-devel xorg-server-devel" depends="virtual?xserver-abi-video-25_1 mesa-dri" short_desc="Xorg ATI Radeon video driver" diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template index 974343567bc9dc..22238998fee33d 100644 --- a/srcpkgs/xf86-video-nouveau/template +++ b/srcpkgs/xf86-video-nouveau/template @@ -4,7 +4,7 @@ version=1.0.18 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="eudev-libudev-devel libdrm-devel xorg-server-devel" +makedepends="udev-devel libdrm-devel xorg-server-devel" depends="virtual?xserver-abi-video-25_1 mesa-dri" short_desc="Xorg opensource NVIDIA video driver" maintainer="Orphaned " diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template index 71577f00021b7c..836b3071759f7d 100644 --- a/srcpkgs/yambar/template +++ b/srcpkgs/yambar/template @@ -4,7 +4,7 @@ version=1.11.0 revision=1 build_style=meson hostmakedepends="flex pkg-config scdoc wayland-devel" -makedepends="alsa-lib-devel eudev-libudev-devel libxcb-devel libyaml-devel +makedepends="alsa-lib-devel udev-devel libxcb-devel libyaml-devel pixman-devel fcft-devel json-c-devel libmpdclient-devel tllist wayland-devel wayland-protocols xcb-util-devel xcb-util-cursor-devel xcb-util-wm-devel pipewire-devel"