diff options
| -rw-r--r-- | pcr/openrc-desktop/PKGBUILD | 126 | ||||
| -rw-r--r-- | pcr/openrc-desktop/avahi-daemon.initd | 2 | ||||
| -rw-r--r-- | pcr/openrc-desktop/avahi-dnsconfd.initd | 2 |
3 files changed, 60 insertions, 70 deletions
diff --git a/pcr/openrc-desktop/PKGBUILD b/pcr/openrc-desktop/PKGBUILD index b0cb76602..ef70b4cea 100644 --- a/pcr/openrc-desktop/PKGBUILD +++ b/pcr/openrc-desktop/PKGBUILD @@ -1,84 +1,87 @@ -# Maintainer (Manajaro): artoo <artoo@manjaro.org> +# Maintainer (Artix): artoo <artoo@cromnix.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _url="https://raw.githubusercontent.com/gentoo/gentoo/master" +_sed_args=(-e 's|/var/run|/run|g' -e 's|/usr/sbin|/usr/bin|g') +prefix=true + +$_prefix && _sed_args+=(-e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g') + pkgbase=openrc-desktop pkgname=('acpid-openrc' - 'alsa-utils-openrc' - 'avahi-openrc' - 'displaymanager-openrc' - 'gpm-openrc' - 'bluez-openrc' - 'networkmanager-openrc' - 'wpa_supplicant-openrc' - 'elogind-openrc') - -pkgver=20170312 -pkgrel=1.1 + 'alsa-utils-openrc' + 'avahi-openrc' + 'bluez-openrc' + 'displaymanager-openrc' + 'elogind-openrc' + 'gpm-openrc' + 'networkmanager-openrc' + 'wpa_supplicant-openrc') + +pkgver=20170926 +pkgrel=1 pkgdesc="OpenRC init scripts" arch=('any') url="https://github.com/manjaro/packages-openrc" license=('GPL2') -# groups=('openrc-desktop') +groups=('openrc-desktop') conflicts=('systemd-sysvcompat') source=("acpid.confd::${_url}/sys-power/acpid/files/acpid-2.0.16-conf.d" "acpid.initd::${_url}/sys-power/acpid/files/acpid-2.0.26-init.d" "alsasound.confd::${_url}/media-sound/alsa-utils/files/alsasound.confd-r4" "alsasound.initd::${_url}/media-sound/alsa-utils/files/alsasound.initd-r6" + 'avahi-daemon.initd' + 'avahi-dnsconfd.initd' + "rfcomm.initd::${_url}/net-wireless/bluez/files/rfcomm-init.d-r2" + "bluetooth.initd::${_url}/net-wireless/bluez/files/bluetooth-init.d-r4" "xdm.confd::${_url}/x11-base/xorg-server/files/xdm.confd-4" "xdm.initd::${_url}/x11-base/xorg-server/files/xdm.initd-11" "xdm-setup.initd::${_url}/x11-base/xorg-server/files/xdm-setup.initd-1" "${_url}/x11-apps/xinit/files/startDM.sh" + 'xdg-user-dirs' + "elogind.confd::${_url}/sys-auth/elogind/files/elogind.conf" + "elogind.initd::${_url}/sys-auth/elogind/files/elogind.init" "gpm.confd::${_url}/sys-libs/gpm/files/gpm.conf.d" "gpm.initd::${_url}/sys-libs/gpm/files/gpm.rc6-2" - "rfcomm.initd::${_url}/net-wireless/bluez/files/rfcomm-init.d-r2" - "bluetooth.initd::${_url}/net-wireless/bluez/files/bluetooth-init.d-r3" - "wpa_supplicant.confd::${_url}/net-wireless/wpa_supplicant/files/wpa_supplicant-conf.d" - "wpa_supplicant.initd::${_url}/net-wireless/wpa_supplicant/files/wpa_supplicant-init.d" - "${_url}/net-wireless/wpa_supplicant/files/wpa_cli.sh" "NetworkManager.confd::${_url}/net-misc/networkmanager/files/conf.d.NetworkManager" "NetworkManager.initd::${_url}/net-misc/networkmanager/files/init.d.NetworkManager-r1" - "elogind.confd::${_url}/sys-auth/elogind/files/elogind.conf" - "elogind.initd::${_url}/sys-auth/elogind/files/elogind.init" '10-openrc-status' - 'avahi-daemon.initd' - 'avahi-dnsconfd.initd' - 'xdg-user-dirs') + "wpa_supplicant.confd::${_url}/net-wireless/wpa_supplicant/files/wpa_supplicant-conf.d" + "wpa_supplicant.initd::${_url}/net-wireless/wpa_supplicant/files/wpa_supplicant-init.d" + "${_url}/net-wireless/wpa_supplicant/files/wpa_cli.sh") sha256sums=('3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba' '5dcf5721a129b3782c13fc453853c390c34e2ad4ee00706388ce014454b063ee' 'd1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43' 'cf67ba1c4bd13cc6fafdebab40b3e84d09f5b6ec768ed2dcf0ec53d9be296ba4' + '876788303553fe773e64917f76f0208f5e8adf7b91d4af24aa9d6a68a147d646' + 'e128576d72981e402ff106bb481108ab6d5ba941ab1b0f5f53e96a7831fc1d15' + '0bd7f4a3e05c781f4cd24ef7d6702fbd7e621100bcd1e281f0ee15bb134f96b5' + '7fef67f1f0965aa08fd65408d2cd8c3fcefaec0ef627a2a0e1f1372c15e011b2' '9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8' '2ae57ee506eeb15eaa8f06b6a8f1d29fd007e33558c506bbf7640d16c4a67d50' 'e37a9353ed848f35ac7b07d1398466a18741fd1de075a6cb971e1c28088d791d' 'f343f87c5c89aa1b7112ec946c4df06b25e541d488405f4d98bedbeddd30bd32' + 'f0f27de23d849b2fa4ebf59e448b5a843b577d14dc2c1070e228999091fa7f5e' + 'ad651e0c6cd456cc0209802ac878a7c08e69435f0428ded4ad116d11f728b2dd' + '982423a88eea889c194123ecffbdea03d8f94ca497b7b32bd86fdf20a81680c7' '73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8' 'b48fd8ef0c4e64ca3f3ada72e8e2148a276f86bf3cbb1a165504058bd15385c1' - '0bd7f4a3e05c781f4cd24ef7d6702fbd7e621100bcd1e281f0ee15bb134f96b5' - 'e42a9bef5fb34bfcbab223189a416e7be220009aaef36d26b39c664655b2971c' - '61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90' - '98985142371d39ea6294d757e85a3d3fc9fc21718063afbf81869e1d2ca648a7' - 'f3aa34b99a90213c53496f8ea014c487266338791f3526043a7fd97adc651fc6' '4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd' - '99bd8af8573b8b4ca64e818ef312ce6094f05ed5829712203fd4a12b98f39650' - 'ad651e0c6cd456cc0209802ac878a7c08e69435f0428ded4ad116d11f728b2dd' - '0113e93f3dd2c7e2ee581a39e7625d49d8e64c6089d432721a6be9df85e36531' + '861445d46e8863dca26a91018da3dd9fee6a64467a93e7512774dfd88914539d' '1535237db113a76261d6f1ce0b24a55e956934b0c1c59e9fd624f621961327b6' - 'aaa2c46e9d0b5c9a61b1169f7dc50c9c1df09d15ca15f60fc9ac6d90065a0bc9' - '95a354016e3335a8b82b61aa00d15eb273a384fe725082ce3fbcdff311767c6d' - 'f0f27de23d849b2fa4ebf59e448b5a843b577d14dc2c1070e228999091fa7f5e') + '61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90' + '98985142371d39ea6294d757e85a3d3fc9fc21718063afbf81869e1d2ca648a7' + 'f3aa34b99a90213c53496f8ea014c487266338791f3526043a7fd97adc651fc6') pkgver() { - date +%Y%m%d + date +%Y%m%d } _inst_initd(){ install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 - sed -e 's|/var/run|/run|g' \ - -e 's|/usr/sbin|/usr/bin|g' \ - -i ${pkgdir}/etc/init.d/$1 + sed ${_sed_args[@]} -i ${pkgdir}/etc/init.d/$1 } _inst_confd(){ @@ -87,7 +90,6 @@ _inst_confd(){ package_acpid-openrc() { pkgdesc="OpenRC acpid init script" - groups=('openrc-desktop') depends=('openrc' 'acpid') backup=('etc/conf.d/acpid') @@ -97,7 +99,6 @@ package_acpid-openrc() { package_alsa-utils-openrc() { pkgdesc="OpenRC alsa-utils init script" - groups=('openrc-desktop') depends=('openrc' 'alsa-utils') backup=('etc/conf.d/alsasound') @@ -107,17 +108,26 @@ package_alsa-utils-openrc() { package_avahi-openrc() { pkgdesc="OpenRC avahi init script" - groups=('openrc-desktop') depends=('avahi' 'dbus-openrc') _inst_initd 'avahi-daemon' _inst_initd 'avahi-dnsconfd' } +package_bluez-openrc() { + pkgdesc="OpenRC bluez init script" + depends=('bluez' 'dbus-openrc') + + _inst_initd 'rfcomm' + _inst_initd 'bluetooth' + + sed -e 's|/usr/libexec|/usr/lib|g' \ + -i "${pkgdir}/etc/init.d/bluetooth" +} + package_displaymanager-openrc() { pkgdesc="OpenRC dm init script" - groups=('openrc-desktop') - depends=('xorg-server' 'xorg-xinit' 'udev-openrc') + depends=('xorg-server' 'xorg-xinit' 'eudev-openrc') optdepends=('elogind-openrc: elogind initscript' 'dbus-openrc: dbus initscript') @@ -140,10 +150,9 @@ package_displaymanager-openrc() { package_elogind-openrc() { pkgdesc="OpenRC elogind init script" - groups=('openrc-desktop') - depends=('elogind' 'dbus-openrc' 'udev-openrc') + depends=('elogind' 'dbus-openrc' 'eudev-openrc') conflicts=('consolekit-openrc') -# replaces=('consolekit-openrc') +# replaces=('consolekit-openrc') _inst_confd 'elogind' _inst_initd 'elogind' @@ -156,7 +165,6 @@ package_elogind-openrc() { package_gpm-openrc() { pkgdesc="OpenRC gpm init script" depends=('openrc' 'gpm') - groups=('openrc-desktop') backup=('etc/conf.d/gpm') _inst_confd 'gpm' @@ -166,8 +174,8 @@ package_gpm-openrc() { package_networkmanager-openrc() { pkgdesc="OpenRC networkmanager init script" depends=('dbus-openrc' 'networkmanager') - groups=('openrc-desktop' 'openrc-mobile') - optdepends=('elogind-openrc: elogind initscript') + conflicts=('networkmanager-consolekit') +# optdepends=('elogind-openrc: elogind initscript') backup=('etc/conf.d/NetworkManager') _inst_confd 'NetworkManager' @@ -179,21 +187,8 @@ package_networkmanager-openrc() { -i "${pkgdir}/etc/init.d/NetworkManager" } -package_bluez-openrc() { - pkgdesc="OpenRC bluez init script" - groups=('openrc-mobile') - depends=('bluez' 'dbus-openrc') - - _inst_initd 'rfcomm' - _inst_initd 'bluetooth' - - sed -e 's|/usr/libexec|/usr/lib|g' \ - -i "${pkgdir}/etc/init.d/bluetooth" -} - package_wpa_supplicant-openrc() { pkgdesc="OpenRC wpa_supplicant init script" - groups=('openrc-mobile') depends=('openrc' 'wpa_supplicant') backup=('etc/conf.d/wpa_supplicant') @@ -202,10 +197,5 @@ package_wpa_supplicant-openrc() { install -Dm755 "${srcdir}/wpa_cli.sh" "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" - if [[ -f /etc/os-release ]];then - . /etc/os-release - sed -e "s|gentoo-release|${ID}-release|" -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" - else - sed -e 's|gentoo-release|arch-release|' -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" - fi + sed -e "s|gentoo-release|parabola-release|" -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" } diff --git a/pcr/openrc-desktop/avahi-daemon.initd b/pcr/openrc-desktop/avahi-daemon.initd index c59d230cc..3db552903 100644 --- a/pcr/openrc-desktop/avahi-daemon.initd +++ b/pcr/openrc-desktop/avahi-daemon.initd @@ -1,4 +1,4 @@ -#!/sbin/openrc-run +#!/usr/bin/openrc-run # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/pcr/openrc-desktop/avahi-dnsconfd.initd b/pcr/openrc-desktop/avahi-dnsconfd.initd index e17e08546..1389a2889 100644 --- a/pcr/openrc-desktop/avahi-dnsconfd.initd +++ b/pcr/openrc-desktop/avahi-dnsconfd.initd @@ -1,4 +1,4 @@ -#!/sbin/openrc-run +#!/usr/bin/openrc-run # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 |