summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2021-11-03 17:11:34 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2021-11-05 16:21:06 -0400
commit952855bbc5aae73162a6dc2908883615cb39e41e (patch)
treeaf917177467998594ce487050f4621055e8332cf
parent4433d8a4ceba42f645be784f43dfc99b198e19ac (diff)
downloadabslibre-952855bbc5aae73162a6dc2908883615cb39e41e.tar.gz
abslibre-952855bbc5aae73162a6dc2908883615cb39e41e.tar.bz2
abslibre-952855bbc5aae73162a6dc2908883615cb39e41e.zip
[mkinitcpio][eudev]: move systemd hook function 'add_dev_rule'~ from 'eudev' to 'mkinitcpio'
this commit reverts the previous changes to the 'eudev' PKGBUILD 9001-udev.patch was originally made against the archlinux mkinitcpio project; so it probably should be in the mkinitcpio package # https://labs.parabola.nu/issues/3121 # https://github.com/archlinux/mkinitcpio/pull/54 # https://github.com/archlinux/mkinitcpio/commit/9ee1333a5f3302d7ddb004cf0909c94b4cff60ba.diff
-rw-r--r--nonsystemd/eudev/PKGBUILD4
-rw-r--r--nonsystemd/eudev/initcpio_install43
-rw-r--r--nonsystemd/mkinitcpio/9001-udev.patch52
3 files changed, 54 insertions, 45 deletions
diff --git a/nonsystemd/eudev/PKGBUILD b/nonsystemd/eudev/PKGBUILD
index f5724b8fb..dd8d97cea 100644
--- a/nonsystemd/eudev/PKGBUILD
+++ b/nonsystemd/eudev/PKGBUILD
@@ -10,7 +10,7 @@ _udev_ver=243
pkgbase=eudev
pkgname=('eudev' 'eudev-libudev')
pkgver=3.2.9
-pkgrel=2
+pkgrel=1
pkgdesc="The userspace dev tools (udev) forked by Gentoo"
arch=('x86_64' 'i686' 'armv7h')
url="http://www.gentoo.org/proj/en/eudev/"
@@ -27,7 +27,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/gentoo/eudev/archive/v${pkg
'udev-default-rules.patch')
sha256sums=('7d281276b480da3935d1acb239748c2c9db01a8043aad7e918ce57a223d8cd24'
'892ce43218e0a458981bbce451252c8987dc398e60b8de288e7542b8f2409c13'
- '5a3b1aa1aea4a836b0c549265bcdef73012d526d8de95a47d8ea5c5c2ca5e2e9'
+ '77dd1fd318b4456409aceb077f060b87944defb07cf39d29ad1968dc6f361875'
'2782bd3a7686596e98bd2d3fdef9d59d7d439682b87bbcc43b1fd1f5fabb3505'
'13596caef6ed85b58de674ebe7c47d9c7dd676240de5cc28ef3ccee2ce1d8a90'
'80c8f87549374d3bc7c2831b9e069b0005cc5ef90122c2d02e78e27c9bc1dbed'
diff --git a/nonsystemd/eudev/initcpio_install b/nonsystemd/eudev/initcpio_install
index f2c214b96..610b71c3d 100644
--- a/nonsystemd/eudev/initcpio_install
+++ b/nonsystemd/eudev/initcpio_install
@@ -1,48 +1,5 @@
#!/bin/bash
-# This is in 'udev' and 'systemd' hook... Let's hope we have
-# it in mkinitcpio soon.
-# https://github.com/archlinux/mkinitcpio/pull/54
-add_udev_rule() {
- # Add an udev rules file to the initcpio image. Dependencies on binaries
- # will be discovered and added.
- # $1: path to rules file (or name of rules file)
-
- local rules="$1" rule= key= value= binary=
-
- if [[ ${rules:0:1} != '/' ]]; then
- rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")
- fi
- if [[ -z $rules ]]; then
- # complain about not found rules
- return 1
- fi
-
- add_file "$rules" /usr/lib/udev/rules.d/"${rules##*/}"
-
- while IFS=, read -ra rule; do
- # skip empty lines, comments
- [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
-
- for pair in "${rule[@]}"; do
- IFS=' =' read -r key value <<< "$pair"
- case $key in
- RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
- # strip quotes
- binary=${value//[\"\']/}
- # just take the first word as the binary name
- binary=${binary%% *}
- [[ ${binary:0:1} == '$' ]] && continue
- if [[ ${binary:0:1} != '/' ]]; then
- binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")
- fi
- add_binary "$binary"
- ;;
- esac
- done
- done <"$rules"
-}
-
build() {
add_file "/etc/udev/udev.conf"
add_binary /usr/bin/udevd
diff --git a/nonsystemd/mkinitcpio/9001-udev.patch b/nonsystemd/mkinitcpio/9001-udev.patch
new file mode 100644
index 000000000..0de1067a4
--- /dev/null
+++ b/nonsystemd/mkinitcpio/9001-udev.patch
@@ -0,0 +1,52 @@
+$ curl https://github.com/archlinux/mkinitcpio/commit/9ee1333a5f3302d7ddb004cf0909c94b4cff60ba.diff
+diff --git a/functions b/functions
+index 9539a60..f95fb92 100644
+--- a/functions
++++ b/functions
+@@ -625,6 +625,46 @@ add_binary() {
+ return 0
+ }
+
++add_udev_rule() {
++ # Add an udev rules file to the initcpio image. Dependencies on binaries
++ # will be discovered and added.
++ # $1: path to rules file (or name of rules file)
++
++ local rules="$1" rule= key= value= binary=
++
++ if [[ ${rules:0:1} != '/' ]]; then
++ rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$rules")
++ fi
++ if [[ -z $rules ]]; then
++ # complain about not found rules
++ return 1
++ fi
++
++ add_file "$rules" /usr/lib/udev/rules.d/"${rules##*/}"
++
++ while IFS=, read -ra rule; do
++ # skip empty lines, comments
++ [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
++
++ for pair in "${rule[@]}"; do
++ IFS=' =' read -r key value <<< "$pair"
++ case $key in
++ RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
++ # strip quotes
++ binary=${value//[\"\']/}
++ # just take the first word as the binary name
++ binary=${binary%% *}
++ [[ ${binary:0:1} == '$' ]] && continue
++ if [[ ${binary:0:1} != '/' ]]; then
++ binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")
++ fi
++ add_binary "$binary"
++ ;;
++ esac
++ done
++ done <"$rules"
++}
++
+ parse_config() {
+ # parse key global variables set by the config file.
+