diff options
Diffstat (limited to 'pcr/openrc')
| -rw-r--r-- | pcr/openrc/PKGBUILD | 7 | ||||
| -rw-r--r-- | pcr/openrc/use-optional-modules-load-d.patch | 80 |
2 files changed, 2 insertions, 85 deletions
diff --git a/pcr/openrc/PKGBUILD b/pcr/openrc/PKGBUILD index 3c7eadf0d..43d538c62 100644 --- a/pcr/openrc/PKGBUILD +++ b/pcr/openrc/PKGBUILD @@ -5,7 +5,7 @@ _url="https://github.com/OpenRC/openrc/archive" pkgname=openrc -pkgver=0.21.4 +pkgver=0.21.7 pkgrel=1.parabola1 pkgdesc="Gentoo's universal init system" arch=('i686' 'x86_64' 'armv7h') @@ -28,12 +28,10 @@ backup=('etc/rc.conf' #options=('emptydirs') source=("${pkgname}-${pkgver}.tar.gz::${_url}/${pkgver}.tar.gz" "${pkgname}.logrotate" - 'use-optional-modules-load-d.patch' 'openrc-install.hook' 'openrc-remove.hook') -sha256sums=('a9d68762d996caefb64995e6679d58e3df6421d297117a5ae0cd5267df727f29' +sha256sums=('522409fb65f4c751e7d01faec54a9446501837abc9e6ee1bea868cb88e4bd603' '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c' - 'b8b750c863199e9c039e874c3c79c72d468f35442750156dfbdf503a27977cf3' '1d4d31a7275660e7b23778e6fceb0714cab8ed2793b04aa004b01d8e7bcd43bd' 'cbb4d00262a55a508114cb31e3903350be2cff748a4fb5e120dc745292e3987e') @@ -51,7 +49,6 @@ prepare(){ cd "${srcdir}/${pkgname}-${pkgver}" sed -e "s|/sbin|/usr/bin|g" -i support/sysvinit/inittab sed -i 's:0444:0644:' mk/sys.mk - patch -Np1 -i ${srcdir}/use-optional-modules-load-d.patch } build(){ diff --git a/pcr/openrc/use-optional-modules-load-d.patch b/pcr/openrc/use-optional-modules-load-d.patch deleted file mode 100644 index 81ef5be3b..000000000 --- a/pcr/openrc/use-optional-modules-load-d.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -aur openrc-0.20.5.orig/conf.d/modules openrc-0.20.5/conf.d/modules ---- openrc-0.20.5.orig/conf.d/modules 2016-04-20 10:54:37.686042847 -0700 -+++ openrc-0.20.5/conf.d/modules 2016-04-20 10:56:27.900232387 -0700 -@@ -1,6 +1,11 @@ - # You can define a list modules for a specific kernel version, - # a released kernel version, a main kernel version or just a list. - # The most specific versioned variable will take precedence. -+ -+# if openrc should make use of /etc/modules-load.d -+# systemd places stuff there -+use_modules_load_d=false -+ - #modules_2_6_23_gentoo_r5="ieee1394 ohci1394" - #modules_2_6_23="tun ieee1394" - #modules_2_6="tun" -diff -aur openrc-0.20.5.orig/init.d/modules.in openrc-0.20.5/init.d/modules.in ---- openrc-0.20.5.orig/init.d/modules.in 2016-04-20 10:54:37.689376105 -0700 -+++ openrc-0.20.5/init.d/modules.in 2016-04-20 10:55:41.671271452 -0700 -@@ -23,6 +23,61 @@ - # support compiled in ... - [ ! -f /proc/modules ] && return 0 - -+ if yesno "${use_modules_load_d:-false}";then -+ local conf_s=/etc/modules-load.d -+ einfo "using ${conf_s}" -+ -+ local mhwd= -+ if [ -f "${conf_s}/mwhd-gpu.conf" ];then -+ for m in $(cat ${conf_s}/mhwd-gpu.conf | sed '/^.*#/d'); do -+ mhwd="$mhwd $m" -+ done -+ fi -+ -+ if [ -d "${conf_s}" ]; then -+ local mods= fn= kv= gmods= kv_cache= -+ -+ for f in $(ls ${conf_s}/*.conf); do -+ fn="$( expr "$(basename "$f")" : '\(.*\).conf' )" -+ -+ if [ "$fn" != mhwd-gpu ];then -+ kv="$(expr "$fn" : 'linux\([0-9]\+\)-')" -+ echo "$fn || $kv" -+ -+ if expr "$fn" : "linux${kv}-.*" > /dev/null; then -+ for m in $(cat $f | sed '/^.*#/d'); do -+ mods="$mods $m" -+ done -+ -+ local kv_major="$(expr "$kv" : "\([0-9]\)" )" -+ local kv_minor="$(expr "$kv" : "[0-9]\([0-9]\)" )" -+ -+ local kvr_k="${kv_major}_${kv_minor}" -+ -+ if expr \( "${kv_cache}" : "${kvr_k}" \) = 0; then -+ kv_cache="${kv_cache} ${kvr_k}" -+ fi -+ -+ eval local "_cache_${kvr_k}=\"\${_cache_${kvr_k}} ${mods}\"" -+ mods= -+ else -+ for m in $(cat $f | sed '/^.*#/d'); do -+ gmods="$gmods $m" -+ done -+ fi -+ fi -+ done -+ -+ for kv_key in $(echo "${kv_cache}"|tr ' ' '\n'); do -+ kv_val="$(eval "echo \"\${_cache_${kv_key}}"\")" -+ eval "modules_${kv_key}=\"${kv_val} ${mhwd} ${gmods}\"" -+ unset "_cache_${kv_key}" -+ done -+ -+ eval "modules=\"${mhwd} ${gmods}\"" -+ fi -+ fi -+ - local KV x y kv_variant_list - KV=$(uname -r) - # full $KV |