diff --git a/temp/eudev-compat/78-sound-card.rules_Import_ID_PATH_early.patch b/temp/eudev-compat/78-sound-card.rules_Import_ID_PATH_early.patch deleted file mode 100644 index d17fac077..000000000 --- a/temp/eudev-compat/78-sound-card.rules_Import_ID_PATH_early.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 917ae648f61681257000c3a1f0aca3fbd646563a Mon Sep 17 00:00:00 2001 -From: Johannes Nixdorf -Date: Fri, 22 Dec 2023 10:27:08 +0100 -Subject: [PATCH] 78-sound-card.rules: Import ID_PATH early - -Pipewire requires ID_PATH to use the same device names as with systemd's -udev. Some rules, such as the ones in asahi-audio [1] use those names, and -fail if they don't match [2]. - -On systemd's udev this is instead imported in 71-seat.rules, which we don't -have. - -[1]: https://github.com/AsahiLinux/asahi-audio -[2]: https://github.com/AsahiLinux/asahi-audio/issues/16 - -Signed-off-by: Johannes Nixdorf ---- - rules/78-sound-card.rules | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -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 -@@ -38,6 +38,8 @@ KERNEL!="card*", GOTO="sound_end" - ENV{SOUND_INITIALIZED}="1" - - IMPORT{builtin}="hwdb" -+IMPORT{builtin}="path_id" -+ - SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id" - SUBSYSTEMS=="usb", GOTO="skip_pci" - -@@ -62,8 +64,6 @@ LABEL="skip_pci" - ENV{ID_SERIAL}=="?*", ENV{ID_USB_INTERFACE_NUM}=="?*", ENV{ID_ID}="$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_USB_INTERFACE_NUM}" - ENV{ID_SERIAL}=="?*", ENV{ID_USB_INTERFACE_NUM}=="", ENV{ID_ID}="$env{ID_BUS}-$env{ID_SERIAL}" - --IMPORT{builtin}="path_id" -- - # The values used here for $SOUND_FORM_FACTOR and $SOUND_CLASS should be kept - # in sync with those defined for PulseAudio's src/pulse/proplist.h - # PA_PROP_DEVICE_FORM_FACTOR, PA_PROP_DEVICE_CLASS properties. diff --git a/temp/eudev-compat/APKBUILD b/temp/eudev-compat/APKBUILD deleted file mode 100644 index 9325ee27e..000000000 --- a/temp/eudev-compat/APKBUILD +++ /dev/null @@ -1,120 +0,0 @@ -# Forked from Alpine, oh my eyes 😭 - -pkgname=eudev-compat -_pkgver=3.2.14 -pkgver=9999$_pkgver -pkgrel=0 -pkgdesc="init system agnostic fork of systemd-udev" -url="https://github.com/eudev-project/eudev" -arch="all" -license="GPL-2.0-or-later" -depends="udev-init-scripts" -replaces="udev" -provides="udev=176 systemd-udevd=257.7-r1 eudev=257.7-r1" -provider_priority=1000 -makedepends=" - gperf - glib-dev - linux-headers - kmod-dev - gobject-introspection-dev - util-linux-dev - " -checkdepends="tree xz perl" -subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc - $pkgname-netifnames::noarch $pkgname-rule-generator::noarch $pkgname-hwids" -triggers="eudev-compat.trigger=/usr/lib/udev/rules.d eudev-compat-hwids.trigger=/lib/udev/hwdb.d:/usr/lib/udev/hwdb.d" -source="https://github.com/eudev-project/eudev/releases/download/v$_pkgver/eudev-$_pkgver.tar.gz - default-rules.patch - load-fbcon.patch - no-sgx.patch - 78-sound-card.rules_Import_ID_PATH_early.patch - udev-postmount.initd - " -builddir="$srcdir"/eudev-"$_pkgver" - -prepare() { - default_prepare - update_config_sub -} - -build() { - CFLAGS="$CFLAGS -flto=auto" \ - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --enable-manpages \ - --enable-kmod \ - --bindir=/bin \ - --sbindir=/sbin - make -} - -check() { - make check -} - -package() { - make DESTDIR="$pkgdir" sharepkgconfigdir=/usr/lib/pkgconfig \ - install - - install -Dm755 "$srcdir"/udev-postmount.initd \ - "$pkgdir"/etc/init.d/udev-postmount -} - -dev() { - replaces="udev-dev" - default_dev -} - -libs() { - default_libs - pkgdesc="Dynamic library to access udev device information" - replaces="libudev" - depends="" -} - -netifnames() { - pkgdesc="udev rules for systemd-style interface names" - depends="!$pkgname-rule-generator" - - amove usr/lib/udev/rules.d/80-net-name-slot.rules -} - -generator() { - pkgdesc="generate udev net persistance rules" - depends="!$pkgname-netifnames" - - # Since we didn't enable rules-generator which disables netifnames, we - # install the rule-generator files. - sed -i 's/"write_net_rules"/"\/usr\/lib\/udev\/rule_generator\/write_net_rules"/' \ - "$builddir"/rule_generator/75-persistent-net-generator.rules - install -Dm644 "$builddir"/rule_generator/75-persistent-net-generator.rules \ - "$subpkgdir"/usr/lib/udev/rules.d/75-persistent-net-generator.rules - install -Dm755 "$builddir"/rule_generator/write_net_rules \ - "$subpkgdir"/usr/lib/udev/rule_generator/write_net_rules - install -Dm755 "$builddir"/rule_generator/rule_generator.functions \ - "$subpkgdir"/usr/lib/udev/rule_generator.functions -} - -hwids() { - pkgdesc="Hardware identification databases (from eudev)" - provides="hwids-udev=$pkgver-r$pkgrel" - install_if="hwdata eudev=$pkgver-r$pkgrel" - - mkdir -p "$subpkgdir"/usr/lib/udev - mv -v "$pkgdir"/etc/udev/hwdb.d "$subpkgdir"/usr/lib/udev -} - -sha512sums=" -1e7593b53c5508a99fe7ff5d24d1d09b3753d9cfba086e7d8cc6ab80cc88013ec687dc4f1eac7b7889051f4e5fd5c40d2b87f5f2d948479d679c8836014d08e0 eudev-3.2.14.tar.gz -683e3c26ca4f058303f8db7d4977e436d728386ee6866719c4f11ff31db27572d3f486f51d3173310e1ec2cf995fa4c396f2415bdf45dabdd80e6e55e798a314 default-rules.patch -ff5928fd555e095d9f3234dd004ac4c5925405d308777e9b018e8e03112cd109935b51d75a3bc4a2a1018eb486e8a5e5ef6ee978860002a8fff93b116e9721f5 load-fbcon.patch -1558800e4132ed2c10b37805fca044ff3129cdfebec71d3e758143fab9ffda824e86d52960926a9042b21fc22f0cda8fe6690484913bd7c3dc4436af92923efe no-sgx.patch -8872f124267485d682dea9c7c47aaa8c228aadef90981c430af7ca7f7025b344d2c3c07c653241190a3f44096aa1d3aff990dd05210f5b278d999d6fede659b5 78-sound-card.rules_Import_ID_PATH_early.patch -8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 udev-postmount.initd -" diff --git a/temp/eudev-compat/default-rules.patch b/temp/eudev-compat/default-rules.patch deleted file mode 100644 index 0786a9826..000000000 --- a/temp/eudev-compat/default-rules.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/rules/50-udev-default.rules -+++ b/rules/50-udev-default.rules -@@ -73,5 +73,6 @@ KERNEL=="rfkill", MODE="0664" - KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun" - - KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse" -+KERNEL=="kvm", GROUP="kvm", MODE="0660" - - LABEL="default_end" diff --git a/temp/eudev-compat/eudev-compat-hwids.trigger b/temp/eudev-compat/eudev-compat-hwids.trigger deleted file mode 100644 index b1516251b..000000000 --- a/temp/eudev-compat/eudev-compat-hwids.trigger +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -udevadm hwdb --update - -exit 0 diff --git a/temp/eudev-compat/eudev-compat.trigger b/temp/eudev-compat/eudev-compat.trigger deleted file mode 100644 index f200c38c5..000000000 --- a/temp/eudev-compat/eudev-compat.trigger +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -S /run/udev/control ]; then - udevadm control --reload -fi - -exit 0 diff --git a/temp/eudev-compat/load-fbcon.patch b/temp/eudev-compat/load-fbcon.patch deleted file mode 100644 index e5e404a48..000000000 --- a/temp/eudev-compat/load-fbcon.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- eudev-3.2.1/rules/80-drivers.rules.orig 2017-01-24 11:00:53.174192908 +0200 -+++ eudev-3.2.1/rules/80-drivers.rules 2017-01-24 11:04:01.886714118 +0200 -@@ -8,6 +8,7 @@ - SUBSYSTEM=="memstick", RUN{builtin}+="kmod load ms_block mspro_block" - SUBSYSTEM=="i2o", RUN{builtin}+="kmod load i2o_block" - SUBSYSTEM=="module", KERNEL=="parport_pc", RUN{builtin}+="kmod load ppdev" -+SUBSYSTEM=="graphics", RUN{builtin}+="kmod load fbcon" - KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", RUN{builtin}+="kmod load sm_ftl" - - LABEL="drivers_end" diff --git a/temp/eudev-compat/no-sgx.patch b/temp/eudev-compat/no-sgx.patch deleted file mode 100644 index e06ae141b..000000000 --- a/temp/eudev-compat/no-sgx.patch +++ /dev/null @@ -1,17 +0,0 @@ -see https://gitlab.alpinelinux.org/alpine/aports/-/issues/15043 -we don't have sgx support --- -diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules -index ff50cb8..2cbd96e 100644 ---- a/rules/50-udev-default.rules -+++ b/rules/50-udev-default.rules -@@ -39,9 +39,6 @@ SUBSYSTEM=="cec", GROUP="video" - SUBSYSTEM=="drm", KERNEL=="renderD*", GROUP="video", MODE="0666" - SUBSYSTEM=="kfd", GROUP="video", MODE="0666" - --SUBSYSTEM=="misc", KERNEL=="sgx_enclave", GROUP="sgx", MODE="0660" --SUBSYSTEM=="misc", KERNEL=="sgx_vepc", GROUP="sgx", MODE="0660" -- - # When using static_node= with non-default permissions, also update - # tmpfiles.d/static-nodes-permissions.conf.in to keep permissions synchronized. - diff --git a/temp/eudev-compat/udev-postmount.initd b/temp/eudev-compat/udev-postmount.initd deleted file mode 100644 index f1f94f489..000000000 --- a/temp/eudev-compat/udev-postmount.initd +++ /dev/null @@ -1,55 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() -{ - need localmount - keyword -vserver -lxc -} - -dir_writeable() -{ - touch "$1"/.test.$$ 2>/dev/null && rm "$1"/.test.$$ -} - -# store persistent-rules that got created while booting -# when / was still read-only -store_persistent_rules() -{ - # create /etc/udev/rules.d if it does not exist and /etc/udev is writable - [ -d /etc/udev/rules.d ] || \ - dir_writeable /etc/udev && \ - mkdir -p /etc/udev/rules.d - - # only continue if rules-directory is writable - dir_writeable /etc/udev/rules.d || return 0 - - local file dest - for file in /run/udev/tmp-rules--*; do - dest=${file##*tmp-rules--} - [ "$dest" = '*' ] && break - type=${dest##70-persistent-} - type=${type%%.rules} - ebegin "Saving udev persistent ${type} rules to /etc/udev/rules.d" - cat "$file" >> /etc/udev/rules.d/"$dest" && rm -f "$file" - eend $? "Failed moving persistent rules!" - done -} - -start() -{ - # check if this system uses udev - [ -d /run/udev ] || return 0 - - # store persistent-rules that got created while booting - # when / was still read-only - store_persistent_rules -} - -stop() -{ - return 0 -} - -# vim:ts=4