From a51a45f18643194977b898d44ca94a88ce1105ca Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 12 Jul 2018 14:01:24 -0400 Subject: pcr/kmod-openrc: Split off from pcr/openrc-base, tidy up The rest of pcr/openrc-base could use the same treatment, but I'm only one man. However, in the mean time, stick a _commit= in pcr/openrc-base so that I can at least run `updpkgsums`, instead of trusting "master" to have not changed. --- pcr/openrc-base/PKGBUILD | 21 +++------------------ pcr/openrc-base/kmod-static-nodes.initd | 19 ------------------- 2 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 pcr/openrc-base/kmod-static-nodes.initd (limited to 'pcr/openrc-base') diff --git a/pcr/openrc-base/PKGBUILD b/pcr/openrc-base/PKGBUILD index c0cc2a781..a62f16cef 100644 --- a/pcr/openrc-base/PKGBUILD +++ b/pcr/openrc-base/PKGBUILD @@ -1,7 +1,9 @@ # Maintainer (Artix): artoo # Maintainer: Omar Vega Ramos -_url="https://raw.githubusercontent.com/gentoo/gentoo/master" +pkgver=20170927 +_commit=0783bd6eb14f40386abf1ca4c6b6ef30b68ae11b +_url="https://raw.githubusercontent.com/gentoo/gentoo/${_commit}" _sed_args=(-e 's|/var/run|/run|g') prefix=true @@ -16,14 +18,12 @@ pkgname=('cronie-openrc' 'dhcpcd-openrc' 'glibc-openrc' 'inetutils-openrc' - 'kmod-openrc' 'lvm2-openrc' 'mdadm-openrc' 'nfs-utils-openrc' 'quota-tools-openrc' 'rpcbind-openrc' 'syslog-ng-openrc') -pkgver=20170927 pkgrel=2 pkgdesc="OpenRC init scripts" arch=('any') @@ -42,7 +42,6 @@ source=("cronie.initd::${_url}/sys-process/cronie/files/cronie-1.3-initd" "nscd.initd::${_url}/sys-libs/glibc/files/nscd" 'ftpd.confd' 'ftpd.initd' - 'kmod-static-nodes.initd' "lvm.confd::${_url}/sys-fs/lvm2/files/lvm.confd-2.02.28-r2" "lvm.initd::${_url}/sys-fs/lvm2/files/lvm.rc-2.02.172" "lvm-monitoring.initd::${_url}/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2" @@ -79,7 +78,6 @@ sha256sums=('8646ff964892eeb5f6c5da444a5ef5d898fb1f3a395c5b9fc85d32d8d56fc785' '13391343bfc64379c696b4bfc1cfe8d7fbb2886f477265343fddf448d82deabf' '59fe1aa68c43f4958afc397a0d6b35da263a20fcdb457005123a0d64cb1f7477' '925c1531fd447792a4b2031473057c16bf6cf77486f11aa7f6e50d69f838e2d7' - '3ecbe7761b92a123a5a3d395ec3d9e090b0dfba7910a5987b4a2298c20a7e571' '28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844' '499fae740d7740895842e2a6db8736272ceacf2d4b6f57f00a8ff91b7993d1da' '42847d8e6dabbcf2cc19846c6ad22cbab65e9a033c4add569b152504b16ab477' @@ -104,9 +102,6 @@ sha256sums=('8646ff964892eeb5f6c5da444a5ef5d898fb1f3a395c5b9fc85d32d8d56fc785' 'b29325498ee3b1f3d63672efcd1e93f0745eecdb9f4bb05fed82a2f085399484' '5c4ad3406fc885555883de0537614034de181d783bcb1e864bff6299ac6c1356') -pkgver() { - date +%Y%m%d -} _inst_initd(){ install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 @@ -191,16 +186,6 @@ package_inetutils-openrc() { _inst_initd 'ftpd' } -package_kmod-openrc() { - pkgdesc="OpenRC nscd init script" - depends=('openrc' 'kmod') - - _inst_initd 'kmod-static-nodes' - - install -d "${pkgdir}/etc/runlevels/sysinit" - ln -sf "/etc/init.d/kmod-static-nodes" "${pkgdir}/etc/runlevels/sysinit/kmod-static-nodes" -} - package_lvm2-openrc() { pkgdesc="OpenRC lvm2 init script" depends=('device-mapper-openrc' 'lvm2') diff --git a/pcr/openrc-base/kmod-static-nodes.initd b/pcr/openrc-base/kmod-static-nodes.initd deleted file mode 100644 index 7a3f529dc..000000000 --- a/pcr/openrc-base/kmod-static-nodes.initd +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -description="Create list of required static device nodes for the current kernel" - -depend() { - after dev-mount - before tmpfiles.dev dev - keyword -lxc -systemd-nspawn -} - -start() { - ebegin "Creating list of required static device nodes for the current kernel" - checkpath -q -d /run/tmpfiles.d - kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf - eend $? -} -- cgit v1.2.2