summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pcr/openrc-base/PKGBUILD94
-rw-r--r--pcr/openrc-base/dbus.install21
2 files changed, 52 insertions, 63 deletions
diff --git a/pcr/openrc-base/PKGBUILD b/pcr/openrc-base/PKGBUILD
index 6bb366790..0067fd43b 100644
--- a/pcr/openrc-base/PKGBUILD
+++ b/pcr/openrc-base/PKGBUILD
@@ -1,9 +1,7 @@
# Maintainer (Manjaro): artoo <artoo@manjaro.org>
# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-_gentoo_uri="https://raw.githubusercontent.com/gentoo/gentoo/master"
-
-_uscript_ver=30
+_url="https://raw.githubusercontent.com/gentoo/gentoo/master"
pkgbase=openrc-base
pkgname=('cronie-openrc'
@@ -14,9 +12,8 @@ pkgname=('cronie-openrc'
'inetutils-openrc'
'lvm2-openrc'
'mdadm-openrc'
- 'udev-openrc')
- #'dbus-openrc')
-pkgver=20151020
+ 'dbus-openrc')
+pkgver=20160318
pkgrel=1
pkgdesc="OpenRC init scripts"
arch=('any')
@@ -24,27 +21,25 @@ url="https://github.com/manjaro/packages-openrc"
license=('GPL2')
groups=('openrc-base')
conflicts=('systemd-sysvcompat')
-source=("cronie.initd::${_gentoo_uri}/sys-process/cronie/files/cronie-1.3-initd"
- "dmcrypt.confd::${_gentoo_uri}/sys-fs/cryptsetup/files/1.6.7-dmcrypt.confd"
- "dmcrypt.initd::${_gentoo_uri}/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc"
- "nscd.initd::${_gentoo_uri}/sys-libs/glibc/files/nscd"
- "device-mapper.confd::${_gentoo_uri}/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3"
- "device-mapper.initd::${_gentoo_uri}/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2"
- "dmeventd.initd::${_gentoo_uri}/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1"
- "lvm.confd::${_gentoo_uri}/sys-fs/lvm2/files/lvm.confd-2.02.28-r2"
- "lvm.initd::${_gentoo_uri}/sys-fs/lvm2/files/lvm.rc-2.02.105-r2"
- "lvm-monitoring.initd::${_gentoo_uri}/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2"
- "lvmetad.initd::${_gentoo_uri}/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2"
- "mdadm.confd::${_gentoo_uri}/sys-fs/mdadm/files/mdadm.confd"
- "mdadm.initd::${_gentoo_uri}/sys-fs/mdadm/files/mdadm.rc"
- "mdraid.confd::${_gentoo_uri}/sys-fs/mdadm/files/mdraid.confd"
- "mdraid.initd::${_gentoo_uri}/sys-fs/mdadm/files/mdraid.rc"
- "dhcpcd.initd::${_gentoo_uri}/net-misc/dhcpcd/files/dhcpcd.initd"
+source=("cronie.initd::${_url}/sys-process/cronie/files/cronie-1.3-initd"
+ "dmcrypt.confd::${_url}/sys-fs/cryptsetup/files/1.6.7-dmcrypt.confd"
+ "dmcrypt.initd::${_url}/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc"
+ "nscd.initd::${_url}/sys-libs/glibc/files/nscd"
+ "device-mapper.confd::${_url}/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3"
+ "device-mapper.initd::${_url}/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2"
+ "dmeventd.initd::${_url}/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1"
+ "lvm.confd::${_url}/sys-fs/lvm2/files/lvm.confd-2.02.28-r2"
+ "lvm.initd::${_url}/sys-fs/lvm2/files/lvm.rc-2.02.105-r2"
+ "lvm-monitoring.initd::${_url}/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2"
+ "lvmetad.initd::${_url}/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2"
+ "mdadm.confd::${_url}/sys-fs/mdadm/files/mdadm.confd"
+ "mdadm.initd::${_url}/sys-fs/mdadm/files/mdadm.rc"
+ "mdraid.confd::${_url}/sys-fs/mdadm/files/mdraid.confd"
+ "mdraid.initd::${_url}/sys-fs/mdadm/files/mdraid.rc"
+ "dhcpcd.initd::${_url}/net-misc/dhcpcd/files/dhcpcd.initd"
'ftpd.confd'
'ftpd.initd'
- "http://dev.gentoo.org/~williamh/dist/udev-init-scripts-${_uscript_ver}.tar.gz"
- "kmod-static-nodes.initd::${_gentoo_uri}/sys-apps/kmod/files/kmod-static-nodes-r1")
- #"dbus.initd::${_gentoo_uri}/sys-apps/dbus/files/dbus.initd")
+ "dbus.initd::${_url}/sys-apps/dbus/files/dbus.initd")
sha256sums=('316753fd55bcc196aaee034f14a25f2324545749bf7bdd44fd3762d11ab18d05'
'3d933a54abe62a547294b83208dbf5d7615d9c7f380d6504c91fff3620530803'
'd0a55d31c713bbddf7d05634018623586e69d43281bc5019b5b821a745f9a57f'
@@ -63,8 +58,7 @@ sha256sums=('316753fd55bcc196aaee034f14a25f2324545749bf7bdd44fd3762d11ab18d05'
'72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492'
'59fe1aa68c43f4958afc397a0d6b35da263a20fcdb457005123a0d64cb1f7477'
'7f46e5e9ac9f204fb1564560c506a5bb4cede8823b89e3f1844e4f8be258e9ef'
- '4de998d68e28f8ce4c1d4c9955aec0fa4cfe84673cbf3bfe1be71a1e9918693f'
- 'b9452437b06aae67e19e2cade37e89398ab5a7162318e15d1ed083606b1fe7e0')
+ '31281696ad3920da14fbb03d983131361665567c2d06001dbf829dc159d48375')
pkgver() {
date +%Y%m%d
@@ -99,16 +93,16 @@ package_cronie-openrc() {
sed -e 's|/usr/sbin|/usr/bin|g' -i ${pkgdir}/etc/init.d/cronie
}
-# package_dbus-openrc() {
-# pkgdesc="OpenRC dbus init script"
-# groups=('openrc-base' 'openrc-desktop')
-# depends=('openrc' 'dbus')
-# install=dbus.install
-#
-# _inst_initd 'dbus'
-#
-# sed -e 's|dbus.pid|dbus/pid|g' -i "${pkgdir}/etc/init.d/dbus"
-# }
+package_dbus-openrc() {
+ pkgdesc="OpenRC dbus init script"
+ groups=('openrc-base' 'openrc-desktop')
+ depends=('openrc' 'dbus')
+ install=dbus.install
+
+ _inst_initd 'dbus'
+
+ sed -e 's|dbus.pid|dbus/pid|g' -i "${pkgdir}/etc/init.d/dbus"
+}
package_dhcpcd-openrc() {
pkgdesc="OpenRC dhcpcd init script"
@@ -198,29 +192,3 @@ package_mdadm-openrc() {
_inst_initd $f
done
}
-
-package_udev-openrc(){
- pkgver=${_uscript_ver}
- pkgrel=3
- pkgdesc="udev startup scripts for openrc"
- groups=('openrc-base' 'openrc-desktop')
- depends=('openrc' 'udev')
-
- cd "${srcdir}/udev-init-scripts-${_uscript_ver}"
- make DESTDIR="${pkgdir}" install
- for f in ${pkgdir}/etc/init.d/*;do
- sed -e "s|#!/sbin/openrc-run|#!/usr/bin/openrc-run|" \
- -e "s|#!/sbin/runscript|#!/usr/bin/openrc-run|" \
- -e "s|/bin/udevadm|/usr/bin/udevadm|g" \
- -e "s|/sbin/udevd|/usr/bin/udevd|g" \
- -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"
-
- # kmod-static-nodes
- _inst_initd 'kmod-static-nodes'
-
- ln -sf "/etc/init.d/kmod-static-nodes" "${pkgdir}/etc/runlevels/sysinit/kmod-static-nodes"
-}
diff --git a/pcr/openrc-base/dbus.install b/pcr/openrc-base/dbus.install
new file mode 100644
index 000000000..4b8f8e634
--- /dev/null
+++ b/pcr/openrc-base/dbus.install
@@ -0,0 +1,21 @@
+_svc="dbus"
+_rlvl="default"
+
+post_install() {
+ _cmd="rc-update add ${_svc} ${_rlvl}"
+ echo " ==> run '${_cmd}'"
+}
+
+post_upgrade() {
+ post_install "$1"
+ # Make sure new rc script can shutdown running dbus
+ if [ -f run/dbus.pid -a -d run/dbus ]; then
+ mv run/dbus.pid run/dbus/pid
+ fi
+}
+
+post_remove() {
+ _cmd="rc-update del ${_svc} ${_rlvl}"
+ echo " ==> run '${_cmd}'"
+}
+