From 95af015d6af31fdae94fb23a5250059836494e53 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 29 Dec 2016 19:44:56 -0500 Subject: update (and tidy) pcr/openrc --- pcr/openrc/PKGBUILD | 119 ++++++++++++++++++++++------------------- pcr/openrc/openrc-install.hook | 11 ---- pcr/openrc/openrc-remove.hook | 10 ---- pcr/openrc/openrc.install | 16 ------ 4 files changed, 63 insertions(+), 93 deletions(-) delete mode 100644 pcr/openrc/openrc-install.hook delete mode 100644 pcr/openrc/openrc-remove.hook delete mode 100644 pcr/openrc/openrc.install (limited to 'pcr/openrc') diff --git a/pcr/openrc/PKGBUILD b/pcr/openrc/PKGBUILD index 86987857e..c6be8b9f9 100644 --- a/pcr/openrc/PKGBUILD +++ b/pcr/openrc/PKGBUILD @@ -1,77 +1,84 @@ +# Maintainer: Omar Vega Ramos +# Contributor: Luke Shumaker + # Maintainer (Manjaro): artoo # Contributor (Manjaro): williamh -# Maintainer: Omar Vega Ramos +# Maintainer (AUR): Andrew Gregory +# Contributor (AUR): Lone_Wolf +# Contributor (AUR): Bartłomiej Piotrowski -_url="https://github.com/OpenRC/openrc/archive" +pkgname=(openrc openrc-sysvinit) +pkgver=0.23 +pkgdesc="A dependency based init system that works with the system provided init program" +url="https://www.gentoo.org/proj/en/base/openrc/" +license=('BSD2') -pkgname=openrc -pkgver=0.22.4 -pkgrel=1.parabola1 -pkgdesc="Gentoo's universal init system" +pkgrel=1 arch=('i686' 'x86_64' 'armv7h') -url="http://www.gentoo.org/proj/en/base/openrc/" -license=('BSD2') -depends=('psmisc' 'sysvinit') -optdepends=('netifrc: Network Interface Management Scripts' - 'networkmanager-openrc: NetworkManager' - 'connman-openrc: connman') -conflicts=('systemd-sysvcompat' 'openrc-core') -replaces=('openrc-core') -install=${pkgname}.install -backup=('etc/rc.conf' - 'etc/conf.d/consolefont' - 'etc/conf.d/keymaps' - 'etc/conf.d/hostname' - 'etc/conf.d/modules' - 'etc/conf.d/hwclock' - 'etc/inittab') -#options=('emptydirs') -source=("${pkgname}-${pkgver}.tar.gz::${_url}/${pkgver}.tar.gz" - "${pkgname}.logrotate" - 'openrc-install.hook' - 'openrc-remove.hook') -sha256sums=('d428890c12936b502d79018667dc6094d0e801c558f118b49e44c5f34636073b' - '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c' - '1d4d31a7275660e7b23778e6fceb0714cab8ed2793b04aa004b01d8e7bcd43bd' - 'cbb4d00262a55a508114cb31e3903350be2cff748a4fb5e120dc745292e3987e') - -_args=(SYSCONFDIR=/etc) -_args+=(PREFIX=/usr) -_args+=(SBINDIR=/usr/bin) -_args+=(LIBEXECDIR=/usr/lib/rc) -_args+=(MKSELINUX=no) -_args+=(MKPAM=pam) -_args+=(MKTERMCAP=ncurses) -_args+=(MKNET=no) -_args+=(BRANDING='Parabola') - -prepare(){ - cd "${srcdir}/${pkgname}-${pkgver}" - sed -e "s|/sbin|/usr/bin|g" -i support/sysvinit/inittab - sed -i 's:0444:0644:' mk/sys.mk -} +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/OpenRC/openrc/archive/${pkgver}.tar.gz" + "${pkgname}.logrotate") +sha256sums=('20d0f11c66f808ee99a69b99f7f3b774f217f62d0b6d6a5acb3e039808b0f326' + '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c') +depends=( + glibc + pam # MKPAM=pam + ncurses # MKTERMCAP=ncurses +) + +_makeargs=( + MKPAM=pam # either 'pam' or '' + MKTERMCAP=ncurses # either 'ncurses' or 'termcap' + + PREFIX=/usr + SYSCONFDIR=/etc # instead of ${PREFIX}/etc + SBINDIR=/usr/bin # instead of ${PREFIX}/sbin + LIBEXECDIR=/usr/lib/rc # instead of ${PREFIX}/libexec/rc + + # these default to 0444 + INCMODE=0644 + LIBMODE=0644 + MANMODE=0644 +) build(){ cd "${srcdir}/${pkgname}-${pkgver}" - make "${_args[@]}" + make "${_makeargs[@]}" } -package() { +package_openrc() { + depends+=('openrc-init') + backup=( + etc/rc.conf + # core + etc/conf.d/{bootmisc,fsck,hostname,localmount,netmount,swap,urandom} + # MKNET=yes (yes by default) + etc/conf.d/{network,staticroute} + # Linux-specific + etc/conf.d/{consolefont,devfs,dmesg,hwclock,keymaps,killprocs,modules,mtab,net-online} + ) + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" "${_args[@]}" install - install -m644 "${srcdir}/${pkgname}-${pkgver}/support/sysvinit/inittab" "${pkgdir}/etc/inittab" + make DESTDIR="${pkgdir}" "${_makeargs[@]}" install + install -Dm644 "${srcdir}/${pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgname}" sed -e 's/#unicode="NO"/unicode="YES"/' \ -e 's/#rc_logger="YES"/rc_logger="YES"/' \ -i "${pkgdir}/etc/rc.conf" - install -d ${pkgdir}/usr/lib/rc/cache + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" +} + +package_openrc-sysvinit() { + pkgdesc="OpenRC support for using sysvinit as pid 1" + depends=(openrc sysvinit) + provides=('openrc-init') + backup=('etc/inittab') - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" + conflicts=('initscripts') - for f in openrc-{install,remove}.hook;do - install -Dm644 ${srcdir}/$f ${pkgdir}/usr/share/libalpm/hooks/$f - done + cd "${srcdir}/${pkgbase}-${pkgver}" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 support/sysvinit/inittab "${pkgdir}/etc/inittab" } diff --git a/pcr/openrc/openrc-install.hook b/pcr/openrc/openrc-install.hook deleted file mode 100644 index a85808fac..000000000 --- a/pcr/openrc/openrc-install.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = etc/init.d/* - -[Action] -Description = Displaying openrc service help ... -When = PostTransaction -Exec = /bin/bash -c 'echo " ==> Add a service to runlevel:"; echo " rc-update add "' -NeedsTargets diff --git a/pcr/openrc/openrc-remove.hook b/pcr/openrc/openrc-remove.hook deleted file mode 100644 index d9f966cc5..000000000 --- a/pcr/openrc/openrc-remove.hook +++ /dev/null @@ -1,10 +0,0 @@ -[Trigger] -Type = File -Operation = Remove -Target = etc/init.d/* - -[Action] -Description = Displaying openrc service help ... -When = PostTransaction -Exec = /bin/bash -c 'echo " ==> Remove a service from runlevel:"; echo " rc-update del "' -NeedsTargets diff --git a/pcr/openrc/openrc.install b/pcr/openrc/openrc.install deleted file mode 100644 index c45dcce43..000000000 --- a/pcr/openrc/openrc.install +++ /dev/null @@ -1,16 +0,0 @@ -pre_install() { - echo " ==> You can boot up systemd any time if systemd is used for udev." - echo " ==> Add 'init=/usr/lib/systemd/systemd' to kernel command line." -} - -post_install() { - echo " ==> Install one of the optional depends for network support!" -} - -post_upgrade() { - post_install "$1" -} - -post_remove() { - echo " ==> Make sure you install systemd-sysvcompat before you reboot!" -} -- cgit v1.2.2