summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-07-12 05:16:23 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-07-12 16:40:15 -0400
commit71fcf0b4b490e8d497f146eddfc0e9f3ed4b1592 (patch)
treee0fe7441a99bb7b827cd8e093678bb0e3daeb72b
parentf3335bb581f4bd131cf3d46b9abd893b17fbf27d (diff)
pcr/{eudev-openrc,udev-init-scripts}: Clean up
- Update all URLs to point to Gentoo, because that's where we're getting it from, not Artix. - Rename eudev-openrc to udev-init-scripts, because that's what Gentoo upstream calls it, and we follow upstream as much as possible. - groups=(base-openrc), not groups=(openrc-base) - depend on 'udev>=217', which is provided by both eudev and systemd-udev - Don't bother fixing /sbin/ paths in the init scripts; it's a symlink and it will work. - Don't conflict with systemd-sysvcompat... that's SOOOOO not our job - Bump pkgrel 4.3->5 -
-rw-r--r--pcr/eudev-openrc/PKGBUILD36
-rw-r--r--pcr/udev-init-scripts/PKGBUILD35
2 files changed, 35 insertions, 36 deletions
diff --git a/pcr/eudev-openrc/PKGBUILD b/pcr/eudev-openrc/PKGBUILD
deleted file mode 100644
index 6c56bf55a..000000000
--- a/pcr/eudev-openrc/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer (Artix): artoo <artoo@cromnix.org>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-_url="http://dev.gentoo.org/~williamh/dist"
-_pkgname=udev-init-scripts
-
-_sed_args=(-e "s|/bin/udevadm|/usr/bin/udevadm|g" -e "s|/sbin/udevd|/usr/bin/udevd|g")
-_sed_args+=(-e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g')
-
-pkgname=eudev-openrc
-pkgver=32
-pkgrel=4.3
-pkgdesc="OpenRC eudev startup scripts"
-arch=('any')
-url="https://github.com/cromnix/artix"
-license=('GPL2')
-groups=('openrc-base')
-provides=('udev-openrc')
-depends=('kmod-openrc' 'eudev')
-conflicts=('systemd-sysvcompat' 'udev-openrc')
-replaces=('udev-openrc')
-source=("${_url}/${_pkgname}-${pkgver}.tar.gz")
-sha256sums=('d5ae437291ae140194f67fec2c9a6ceeda39708433840e7b4b0361cc5ae53eaa')
-
-package(){
- cd "${srcdir}/${_pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- for f in ${pkgdir}/etc/init.d/*;do
- sed ${_sed_args[@]} -i "$f"
- done
-
- install -d "${pkgdir}/etc/runlevels/sysinit"
- ln -sf "/etc/init.d/udev" "${pkgdir}/etc/runlevels/sysinit/udev"
- ln -sf "/etc/init.d/udev-trigger" "${pkgdir}/etc/runlevels/sysinit/udev-trigger"
-}
diff --git a/pcr/udev-init-scripts/PKGBUILD b/pcr/udev-init-scripts/PKGBUILD
new file mode 100644
index 000000000..7840d12da
--- /dev/null
+++ b/pcr/udev-init-scripts/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: Luke Shumaker <lukeshu@parabola.nu>
+
+# Upstream information
+pkgname=udev-init-scripts
+pkgver=32
+pkgdesc="udev startup scripts for OpenRC"
+url="https://gitweb.gentoo.org/proj/${pkgname}.git"
+# Gentoo's package script: https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-fs/udev-init-scripts
+source=("http://dev.gentoo.org/~williamh/dist/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('d5ae437291ae140194f67fec2c9a6ceeda39708433840e7b4b0361cc5ae53eaa')
+depends=('openrc' 'udev>=217')
+license=('GPL2')
+
+# Package information
+pkgrel=5
+arch=('any')
+groups=('base-openrc')
+# Depend on any $X-openrc packages that exist for the dependencies of
+# eudev and systemd-udev
+depends+=('kmod-openrc')
+
+# Historical compatibility
+provides+=('udev-openrc' 'eudev-openrc')
+conflicts+=('udev-openrc' 'eudev-openrc')
+replaces+=('udev-openrc' 'eudev-openrc')
+
+package(){
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -d "${pkgdir}/etc/runlevels/sysinit"
+ ln -sf "/etc/init.d/udev" "${pkgdir}/etc/runlevels/sysinit/udev"
+ ln -sf "/etc/init.d/udev-trigger" "${pkgdir}/etc/runlevels/sysinit/udev-trigger"
+}