summaryrefslogtreecommitdiff
path: root/pcr
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2015-06-23 02:17:51 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2015-06-23 02:17:51 -0500
commitc2575baf97c888d66a7fef69a84b5718dbab28c9 (patch)
tree4ee1ca665d4959da498a9f42ca9eb5edf91372f7 /pcr
parent6e9636a0f2a0467114d0437a74dcef929d1afdbb (diff)
openrc-core-0.16.4-3: updating version
Diffstat (limited to 'pcr')
-rw-r--r--pcr/openrc-core/PKGBUILD88
-rw-r--r--pcr/openrc-core/aufs-unmount.patch38
-rw-r--r--pcr/openrc-core/openrc.install5
3 files changed, 50 insertions, 81 deletions
diff --git a/pcr/openrc-core/PKGBUILD b/pcr/openrc-core/PKGBUILD
index ed44a918e..39e021536 100644
--- a/pcr/openrc-core/PKGBUILD
+++ b/pcr/openrc-core/PKGBUILD
@@ -1,29 +1,35 @@
-# Maintainer : <freaj@riseup.net>
-# Maintainer (Manjaro): artoo <artoo@manjaro.org>
-# Contributor (Manjaro): williamh <williamh@gentoo.org>
+# Maintainer (Arch): artoo <artoo@manjaro.org>
+# Contributor (Arch): williamh <williamh@gentoo.org>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: freaj <freaj@riseup.net>
_pkgname="openrc"
_src_uri="http://dev.gentoo.org/~williamh/dist"
_net_uri="http://dev.gentoo.org/~robbat2/distfiles"
+_g_uri="https://github.com/gentoo/gentoo-functions/archive" #/0.10.tar.gz
_udev="udev-init-scripts"
-_uver=27
+_uver=30
_net="netifrc"
-_nver=0.2.4
+_nver=0.3.1
+
+_genf="gentoo-functions"
+_gver=0.10
pkgname=openrc-core
pkgdesc="Gentoo's universal init system, udev enabled."
-pkgver=0.13.11
-pkgrel=1
+pkgver=0.16.4
+pkgrel=3
pkgdesc="Gentoo's universal init system, udev enabled."
arch=('i686' 'x86_64')
url="http://www.gentoo.org/proj/en/base/openrc/"
-license=('GPL2')
+license=('BSD2' 'GPL2')
depends=('inetutils' 'psmisc' 'sysvinit' 'udev>=186')
optdepends=('dhcpcd-openrc: dhcpcd initscript')
-conflicts=('openrc' 'openrc-git' 'initscripts' 'systemd-sysvcompat' 'openrc-sysvinit')
+conflicts=('openrc' 'openrc-git' 'initscripts' 'systemd-sysvcompat' 'openrc-sysvinit'
+ 'eudev-openrc')
backup=('etc/rc.conf'
'etc/conf.d/consolefont'
'etc/conf.d/keymaps'
@@ -34,17 +40,23 @@ backup=('etc/rc.conf'
'etc/inittab')
install=${_pkgname}.install
source=("${_src_uri}/${_pkgname}-${pkgver}.tar.bz2"
- "${_src_uri}/${_udev}-${_uver}.tar.bz2"
+ "${_src_uri}/${_udev}-${_uver}.tar.gz"
"${_net_uri}/${_net}-${_nver}.tar.bz2"
+ "${_genf}-${_gver}::${_g_uri}/${_gver}.tar.gz"
"${_pkgname}.logrotate"
- 'kmod-static-nodes'
- 'aufs-unmount.patch')
-
+ 'kmod-static-nodes')
+sha256sums=('6771257e208da2e4d20b4ac2e3e7f065eb8873566644ff385e9dbd6bc5221d21'
+ '4de998d68e28f8ce4c1d4c9955aec0fa4cfe84673cbf3bfe1be71a1e9918693f'
+ 'a92a96b6f065981ee1c0232a507f3695230eeb7fb6172ec9048c2538b36cfea8'
+ '709c8b22f404001a512e47a7a4d3192070b3e150fb9d0f943de09736d665b0db'
+ '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c'
+ 'fc90e8d480de39aff90e41477f79720a98bee2a2359c53c209d0ca7bb75fb6ba')
_base_args=(SYSCONFDIR=/etc)
if [ -f /etc/os-release ]; then
. /etc/os-release
_base_args+=(BRANDING="$NAME")
+
else
_base_args+=(BRANDING='Unknown Linux')
fi
@@ -58,16 +70,17 @@ _rc_args+=(MKPAM=pam)
_rc_args+=(MKTERMCAP=ncurses)
_rc_args+=(MKNET=no)
+_f_args+=(ROOTPREFIX=/usr)
+_f_args+=(ROOTSBINDIR=/usr/bin)
+_f_args+=(ROOTLIBEXECDIR=/usr/lib/manjaro)
+
_net_args=( "${_base_args[@]}" )
_net_args+=(LIBEXECDIR=/usr/lib/${_net})
prepare(){
cd "${srcdir}/${_pkgname}-${pkgver}"
- local _bin='s|/sbin|/usr/bin|g'
- sed -e "${_bin}" -i support/sysvinit/inittab
+ sed -e "s|/sbin|/usr/bin|g" -i support/sysvinit/inittab
#sed -i 's:0444:0644:' mk/sys.mk
-
- patch -p1 -i "$srcdir/aufs-unmount.patch"
}
build(){
@@ -77,16 +90,16 @@ build(){
# make netifrc
cd "${srcdir}/${_net}-${_nver}"
make "${_net_args[@]}"
+ cd ${srcdir}/${_genf}-${_gver}
+ make "${_f_args[@]}"
}
package() {
cd "${srcdir}/${_pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" "${_rc_args[@]}" install
- # inittab
install -m644 "${srcdir}/${_pkgname}-${pkgver}/support/sysvinit/inittab" "${pkgdir}/etc/inittab"
- # logrotate
install -Dm644 "${srcdir}/${_pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${_pkgname}"
- # enable unicode & logger
+
sed -e 's/#unicode="NO"/unicode="YES"/' \
-e 's/#rc_logger="YES"/rc_logger="YES"/' \
-i "${pkgdir}/etc/rc.conf"
@@ -96,39 +109,34 @@ package() {
# udev
cd "${srcdir}/${_udev}-${_uver}"
make DESTDIR="${pkgdir}" install
- # fix shebang & path to udevd
- local _bin='s|/sbin/udevd|/usr/bin/udevd|g' \
- _shebang='s|#!/sbin/runscript|#!/usr/bin/openrc-run|'
-
- sed -e "${_shebang}" \
- -e "${_bin}" \
- -i "${pkgdir}/etc/init.d/udev"
- # create runlevel
+ sed -e "s|/sbin/udevd|/usr/bin/udevd|g" \
+ -e "s|#!/sbin/runscript|#!/usr/bin/openrc-run|" \
+ -i ${pkgdir}/etc/init.d/udev
+ for f in ${pkgdir}/etc/init.d/udev-trigger ${pkgdir}/etc/init.d/udev-settle;do
+ sed -e "s|#!/sbin/openrc-run|#!/usr/bin/openrc-run|" \
+ -e "s|/bin/udevadm|/usr/bin/udevadm|g" \
+ -i "$f"
+ done
cd "${srcdir}/${_pkgname}-${pkgver}"
ln -sf "/etc/init.d/udev" "${pkgdir}/etc/runlevels/sysinit/udev"
+ ln -sf "/etc/init.d/udev-trigger" "${pkgdir}/etc/runlevels/sysinit/udev-trigger"
# netifrc
cd "${srcdir}/${_net}-${_nver}"
make DESTDIR="${pkgdir}" "${_net_args[@]}" install
install -Dm 644 "${srcdir}/${_net}-${_nver}/doc/net.example" "${pkgdir}/etc/conf.d/net"
- _shebang='s|#!/usr/bin/runscript|#!/usr/bin/openrc-run|'
- sed -e "${_shebang}" \
+ sed -e 's|#!/usr/bin/runscript|#!/usr/bin/openrc-run|' \
-i "${pkgdir}/etc/init.d/net.lo"
-
- # create runlevel
ln -sf "/etc/init.d/net.lo" "${pkgdir}/etc/runlevels/boot/net.lo"
+ sed -e 's|/lib/gentoo/functions.sh|/usr/lib/manjaro/functions.sh|g' \
+ -i "${pkgdir}/usr/lib/netifrc/sh/functions.sh"
# kmod-static-nodes
cd "${srcdir}/${_pkgname}-${pkgver}"
install -Dm755 "${srcdir}/kmod-static-nodes" "${pkgdir}/etc/init.d/kmod-static-nodes"
-
- # create runlevel
ln -sf "/etc/init.d/kmod-static-nodes" "${pkgdir}/etc/runlevels/sysinit/kmod-static-nodes"
+
+ cd ${srcdir}/${_genf}-${_gver}
+ make DESTDIR="${pkgdir}" "${_f_args[@]}" install
}
-sha256sums=('30edffa8b39d5e68129ddd9e8cd8dfde8ca8cfafc8b470124d7323a32a4a443c'
- '1a091c361e9845861c138b505881edcb7b68fcf91708db526dff0b320243c936'
- '9b53eb3c8e6e80cd4073a34f911a28055c28b9f7a9f119a397002b0de7ac0691'
- '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c'
- 'fc90e8d480de39aff90e41477f79720a98bee2a2359c53c209d0ca7bb75fb6ba'
- '5a22d53f3bda7365d12270845a62ef651f98725c84032ae8c9bdd6512b464ec9')
diff --git a/pcr/openrc-core/aufs-unmount.patch b/pcr/openrc-core/aufs-unmount.patch
deleted file mode 100644
index 76fa5b250..000000000
--- a/pcr/openrc-core/aufs-unmount.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- ../init.d/localmount.in.orig 2015-02-18 19:56:50.000000000 +0100
-+++ ../init.d/localmount.in 2015-02-20 01:04:45.783058606 +0100
-@@ -72,19 +72,22 @@
-
- local aufs_branch aufs_mount_dir aufs_mount_point aufs_si_dir aufs_si_id
- for aufs_si_dir in /sys/fs/aufs/*; do
-- aufs_mount_dir=${aufs_si_dir#/sys/fs/aufs/}
-- aufs_si_id="$(printf "%s" $aufs_mount_dir | sed 's/_/=/g')"
-- aufs_mount_point="$(mountinfo -o ${aufs_si_id})"
-- for x in $aufs_si_dir/br[0-9][0-9][0-9]; do
-- aufs_branch=$(sed 's/=.*//g' $x)
-- eindent
-- if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
-- ewarn "Failed to remove branch $aufs_branch from aufs \
-- $aufs_mount_point"
-- fi
-- eoutdent
-- sync
-- done
-+ if [[ -d ${aufs_si_dir} ]];then
-+ aufs_mount_dir=${aufs_si_dir#/sys/fs/aufs/}
-+ aufs_si_id="$(printf "%s" $aufs_mount_dir | sed 's/_/=/g')"
-+ aufs_mount_point="$(mountinfo -o ${aufs_si_id})"
-+
-+ for x in $aufs_si_dir/br[0-9][0-9][0-9]; do
-+ aufs_branch=$(sed 's/=.*//g' $x)
-+ eindent
-+ if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
-+ ewarn "Failed to remove branch $aufs_branch from aufs \
-+ $aufs_mount_point"
-+ fi
-+ eoutdent
-+ sync
-+ done
-+ fi
- done
- fi
-
diff --git a/pcr/openrc-core/openrc.install b/pcr/openrc-core/openrc.install
index f789630f7..3e16fabfd 100644
--- a/pcr/openrc-core/openrc.install
+++ b/pcr/openrc-core/openrc.install
@@ -5,9 +5,8 @@ pre_install() {
post_install() {
echo " ==> Set up your network interface before you reboot."
- local _url="http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=4"
+ local _url="https://wiki.gentoo.org/wiki/Handbook:X86/Full/Networking"
echo " ==> Visit ${_url}"
- #rc-update -u
}
post_upgrade() {
@@ -16,4 +15,4 @@ post_upgrade() {
post_remove() {
echo " ==> Make sure you install systemd-sysvcompat before you reboot!"
-} \ No newline at end of file
+}