diff options
author | Andrew Savchenko <bircoph@gmail.com> | 2014-02-21 18:30:00 +0400 |
---|---|---|
committer | Andrew Savchenko <bircoph@gmail.com> | 2014-02-21 18:30:00 +0400 |
commit | e09e3d13de3cad99b1d6f65734e7a85324aedd8f (patch) | |
tree | 8128a1936f693b8ad5d34837a7cfedc05f2f75e6 /sys-apps | |
parent | latex2rtf: version bump (diff) | |
download | bircoph-e09e3d13de3cad99b1d6f65734e7a85324aedd8f.tar.gz bircoph-e09e3d13de3cad99b1d6f65734e7a85324aedd8f.tar.bz2 bircoph-e09e3d13de3cad99b1d6f65734e7a85324aedd8f.zip |
openrc: add xai's git version
Needed to test both pre- and post- loop detectors.
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/openrc/ChangeLog | 30 | ||||
-rw-r--r-- | sys-apps/openrc/Manifest | 5 | ||||
-rw-r--r-- | sys-apps/openrc/metadata.xml | 2 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-9999.ebuild | 328 |
4 files changed, 361 insertions, 4 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog index 7824a29..222d8e0 100644 --- a/sys-apps/openrc/ChangeLog +++ b/sys-apps/openrc/ChangeLog @@ -1,6 +1,32 @@ # ChangeLog for sys-apps/openrc -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.291 2013/11/29 18:02:55 johu Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.299 2014/01/27 03:19:36 williamh Exp $ + + 27 Jan 2014; William Hubbs <williamh@gentoo.org> -openrc-0.12.2.ebuild, + -openrc-0.12.3.ebuild: + remove old openrc-0.12.x versions + + 19 Jan 2014; Agostino Sarubbo <ago@gentoo.org> openrc-0.12.4.ebuild: + Stable for sparc, wrt bug #487332 + + 19 Jan 2014; Agostino Sarubbo <ago@gentoo.org> openrc-0.12.4.ebuild: + Stable for ppc64, wrt bug #487332 + + 19 Jan 2014; Agostino Sarubbo <ago@gentoo.org> openrc-0.12.4.ebuild: + Stable for ppc, wrt bug #487332 + + 18 Jan 2014; Mike Frysinger <vapier@gentoo.org> openrc-0.12.4.ebuild, + openrc-9999.ebuild: + Add arm64 love. + + 17 Jan 2014; Mike Frysinger <vapier@gentoo.org> openrc-0.12.4.ebuild: + Mark m68k/s390/sh stable. + + 14 Jan 2014; Pacho Ramos <pacho@gentoo.org> openrc-0.12.4.ebuild: + ia64 stable, bug #487332 (thanks to Emeric Maschino for testing) + + 21 Dec 2013; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild: + Fix the mknet setting. It is either yes or no, so we can use usex. 29 Nov 2013; Johannes Huber <johu@gentoo.org> openrc-0.12.4.ebuild: x86 stable wrt bug #487332 diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index 045bf25..b0d075f 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -3,5 +3,6 @@ AUX openrc.logrotate 71 SHA256 0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7 AUX start-stop-daemon.pam 63 SHA256 2681da17e4a122656b5303b7c7eca82b8fb182641290b153fdbe96b63638086d SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb WHIRLPOOL 4abc9f051155a62d3033258a06003a4ca3909d8104deca84d5c1605bc1c7e56167fd82b2b4b72fe7b707070de98a7628730de1ad3f14b924b5b1480fba5ef854 DIST openrc-0.12.4.tar.bz2 131914 SHA256 c4edda2fff4b613f50b9cc265bb457a9ab0170fbc1fe7c26eccd4a5d63b2625c SHA512 14e188e382dfe02037d3e4211fa3265152d5ec92ca491b1e86154c0615583ddfc0a2592ca849ab453068dd60000886e57e7da024036fa58d7474acdbb6b92208 WHIRLPOOL 7bdc2c310ee6e87a439574f377a3c1541a118b4122d098d727f6d4464e9f645e5a4d40bedfc82f401b53e640e78494f74fac94f9b6813eb202cc18d1c5391280 EBUILD openrc-0.12.4.ebuild 10566 SHA256 a0f7950a3bd6434f1b18233eb833f0f385beccbc2a66af1527d6cae5ae76372b SHA512 5b065d2beb6ed4d68e4382edca8375725ccbf58e354a3308e7bb384e90e9db0752e860976b174473f44db1b0e360703a702a97a05c5952bf0fcfbfca399d1db3 WHIRLPOOL aa3a29338f17a5847f99213e7897e4cec75d27346b2521539237ca6f73ac2c872a49e339b915034f7f91ee496542e8f605d64bd2019fe55b04b89fc52c2e1671 -MISC ChangeLog 48577 SHA256 11d008f49b85a3bf1abc1d4f44d5498c64c92a8c8c7c0f408a2239897b903a97 SHA512 d17207293511c4a58434989e425256b662c914e48db098edf90a1acfdb0bc930bc07b5e22c09a58d4b76745a62b6afdff73463c1d5e455ecae24625f5a0e6485 WHIRLPOOL 37877d520c7f1b924111a4414438d0b4f6130fe1f4119af79f68d7e96d1cd5a720ea4d0d7fd214544ea65f65364ad01f2316d3a3d426cae9b20897798dfa80e5 -MISC metadata.xml 373 SHA256 02f4a9ad32e00c6c046a55dd14949c4b5a3b9a8f5d4725aa07c698c107bbc1cf SHA512 80d1f2a14cddd37e7d8866ff556c753e631eca6239c0474f8a067bf387778e702a8d15152b1324744110b2f5972c2e2858eb195f8448001f322e19acc589e033 WHIRLPOOL 8a8176f52fd07682ee407923e956962ded7ce45f1b9b535e80b84195f6407954f504c44dc1b0f2cb2af8ed8a84a1e8b4cd5dc956163431c59bbc1f7785fb9151 +EBUILD openrc-9999.ebuild 10781 SHA256 394dece2a9d1e86c69bf9f8bb865db1a8f6ea2de5c822123077249863bed7bc2 SHA512 94a8c7c93a7445102102e60244d6bc95ba9f1c596e39119a58cf9cc08ac80636148e034e68345c9e3940e5a53e619a97cf322584fd446d8ac43089f0799666c6 WHIRLPOOL 9a45754f5cc9e4b82fdbe065398996d512a41e1175cc71b848500f71e34e0713890d8c829f725bc4849291c917e80334cf043b8bc2a051ab12f89f5150a2aa60 +MISC ChangeLog 49530 SHA256 2f7048ecef2fd837ceb352cdad45e014c55ff3a76f0dc025aa6c18aae52778a1 SHA512 63633596317172806c3ae080573c99d2f4ad3f5ef9d59929cf58b6188665c38bcdc49e3d7a7280d0fccabc6022c31874bffe5e65b78f68b5008408d8d763162d WHIRLPOOL 3aaea87c8e9cbd775fb3266e06da6725570024138dfac9972c19120080a771dd62773ad092707620be30891156138614c3f885a1d6af56cd0958585eb888a4a2 +MISC metadata.xml 491 SHA256 4d479c3be7310309b77b3d812f8664a9c38e0179a1f5087d271a94223e0d5a92 SHA512 18631271f8a1c714193e41a2254329629266e063d9ac329aa6c78aa12fd339652989d4fe716a9c6fabe5e0d7b9ac551b4ccf4d6114ec4855af678e6e413b96c4 WHIRLPOOL 1aaa846ec2e69a9b1ab7c210f758d6ae50743bb22c22d1b68dea4bcee5880be28eb16000aaa49cf035eb6f0087d18db174b78513b1625f9bd9d04b3960e66bcc diff --git a/sys-apps/openrc/metadata.xml b/sys-apps/openrc/metadata.xml index 0043936..7f58e81 100644 --- a/sys-apps/openrc/metadata.xml +++ b/sys-apps/openrc/metadata.xml @@ -3,6 +3,8 @@ <pkgmetadata> <herd>openrc</herd> <use> + <flag name="earlyloop">enable early loop detector</flag> + <flag name="laterloop">enable later loop detector</flag> <flag name="netifrc">enable Gentoo's network stack (net.* scripts)</flag> <flag name="newnet">enable the new network stack (experimental)</flag> <flag name="tools">build optional tools</flag> diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild new file mode 100644 index 0000000..0e770db --- /dev/null +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -0,0 +1,328 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.133 2014/01/18 09:10:41 vapier Exp $ + +EAPI=5 + +inherit eutils flag-o-matic multilib pam toolchain-funcs + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="git://github.com/xaionaro/${PN}.git" + inherit git-r3 +else + SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="debug elibc_glibc earlyloop laterloop ncurses pam newnet prefix +netifrc + selinux static-libs tools unicode kernel_linux kernel_FreeBSD" + +COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1 + kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) + elibc_glibc? ( >=sys-libs/glibc-2.5 ) + ncurses? ( sys-libs/ncurses ) + pam? ( sys-auth/pambase ) + tools? ( dev-lang/perl ) + kernel_linux? ( + sys-process/psmisc + ) + selinux? ( sec-policy/selinux-openrc ) + !<sys-fs/udev-init-scripts-17 + !<sys-fs/udev-133" +DEPEND="${COMMON_DEPEND} + virtual/os-headers + ncurses? ( virtual/pkgconfig )" +RDEPEND="${COMMON_DEPEND} + !prefix? ( + kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) + kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) + )" + +PDEPEND="netifrc? ( net-misc/netifrc )" + +# select proper git branch +if [[ ${PV} == "9999" ]]; then + EGIT_BRANCH="master" + use earlyloop && EGIT_BRANCH="earlyloopdetector" + use laterloop && EGIT_BRANCH="laterloopdetector" + use earlyloop && use laterloop && EGIT_BRANCH="mergeddetectors" +fi + +src_prepare() { + sed -i 's:0444:0644:' mk/sys.mk || die + + if [[ ${PV} == "9999" ]] ; then + local ver="git-${EGIT_VERSION:0:6}" + sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die + + + fi + + # Allow user patches to be applied without modifying the ebuild + epatch_user +} + +src_compile() { + unset LIBDIR #266688 + + MAKE_ARGS="${MAKE_ARGS} + LIBNAME=$(get_libdir) + LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc + MKNET=$(usex newnet) + MKSELINUX=$(usex selinux) + MKSTATICLIBS=$(usex static-libs) + MKTOOLS=$(usex tools)" + + local brand="Unknown" + if use kernel_linux ; then + MAKE_ARGS="${MAKE_ARGS} OS=Linux" + brand="Linux" + elif use kernel_FreeBSD ; then + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" + brand="FreeBSD" + fi + export BRANDING="Gentoo ${brand}" + use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" + export DEBUG=$(usev debug) + export MKPAM=$(usev pam) + export MKTERMCAP=$(usev ncurses) + + tc-export CC AR RANLIB + emake ${MAKE_ARGS} +} + +# set_config <file> <option name> <yes value> <no value> test +# a value of "#" will just comment out the option +set_config() { + local file="${ED}/$1" var=$2 val com + eval "${@:5}" && val=$3 || val=$4 + [[ ${val} == "#" ]] && com="#" && val='\2' + sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" +} + +set_config_yes_no() { + set_config "$1" "$2" YES NO "${@:3}" +} + +src_install() { + emake ${MAKE_ARGS} DESTDIR="${D}" install + + # move the shared libs back to /usr so ldscript can install + # more of a minimal set of files + # disabled for now due to #270646 + #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die + #gen_usr_ldscript -a einfo rc + gen_usr_ldscript libeinfo.so + gen_usr_ldscript librc.so + + if ! use kernel_linux; then + keepdir /$(get_libdir)/rc/init.d + fi + keepdir /$(get_libdir)/rc/tmp + + # Backup our default runlevels + dodir /usr/share/"${PN}" + cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die + rm -rf "${ED}"/etc/runlevels + + # Setup unicode defaults for silly unicode users + set_config_yes_no /etc/rc.conf unicode use unicode + + # Cater to the norm + set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' + + # On HPPA, do not run consolefont by default (bug #222889) + if use hppa; then + rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont + fi + + # Support for logfile rotation + insinto /etc/logrotate.d + newins "${FILESDIR}"/openrc.logrotate openrc + + # install the gentoo pam.d file + newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon + + # install documentation + dodoc README.busybox + if use newnet; then + dodoc README.newnet + fi +} + +add_boot_init() { + local initd=$1 + local runlevel=${2:-boot} + # if the initscript is not going to be installed and is not + # currently installed, return + [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \ + || return + [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return + + # if runlevels dont exist just yet, then create it but still flag + # to pkg_postinst that it needs real setup #277323 + if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then + mkdir -p "${EROOT}"etc/runlevels/${runlevel} + touch "${EROOT}"etc/runlevels/.add_boot_init.created + fi + + elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" + ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd} +} +add_boot_init_mit_config() { + local config=$1 initd=$2 + if [[ -e ${EROOT}${config} ]] ; then + if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then + add_boot_init ${initd} + fi + fi +} + +pkg_preinst() { + local f LIBDIR=$(get_libdir) + + # avoid default thrashing in conf.d files when possible #295406 + if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then + ( + unset hostname HOSTNAME + source "${EROOT}"etc/conf.d/hostname + : ${hostname:=${HOSTNAME}} + [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" + ) + fi + + # set default interactive shell to sulogin if it exists + set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin + + # termencoding was added in 0.2.1 and needed in boot + has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding + + # swapfiles was added in 0.9.9 and needed in boot (february 2012) + has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles + + if ! has_version ">=sys-apps/openrc-0.11"; then + add_boot_init sysfs sysinit + fi + + if ! has_version ">=sys-apps/openrc-0.11.3" ; then + migrate_udev_mount_script + add_boot_init tmpfiles.setup boot + fi + + # these were added in 0.12. + if ! has_version ">=sys-apps/openrc-0.12"; then + add_boot_init loopback + add_boot_init tmpfiles.dev sysinit + + # ensure existing /etc/conf.d/net is not removed + # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier + # this needs to stay in openrc ebuilds for a long time. :( + # Added in 0.12. + if [[ -f "${EROOT}"etc/conf.d/net ]]; then + einfo "Modifying conf.d/net to keep it from being removed" + cat <<-EOF >>"${EROOT}"etc/conf.d/net + +# The network scripts are now part of net-misc/netifrc +# In order to avoid sys-apps/${P} from removing this file, this comment was +# added; you can safely remove this comment. Please see +# /usr/share/doc/netifrc*/README* for more information. +EOF + fi + fi +} + +# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev. +migrate_udev_mount_script() { + if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \ + ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then + add_boot_init udev-mount sysinit + fi + return 0 +} + +pkg_postinst() { + local LIBDIR=$(get_libdir) + + # Make our runlevels if they don't exist + if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then + einfo "Copying across default runlevels" + cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc + rm -f "${EROOT}"etc/runlevels/.add_boot_init.created + else + if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then + mkdir -p "${EROOT}"etc/runlevels/sysinit + cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \ + "${EROOT}"etc/runlevels/sysinit + fi + if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then + mkdir -p "${EROOT}"etc/runlevels/shutdown + cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \ + "${EROOT}"etc/runlevels/shutdown + fi + fi + + if use hppa; then + elog "Setting the console font does not work on all HPPA consoles." + elog "You can still enable it by running:" + elog "# rc-update add consolefont boot" + fi + + # Handle the conf.d/local.{start,stop} -> local.d transition + if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then + elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}" + elog "files to ${EROOT}etc/local.d" + mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start + mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop + chmod +x "${EROOT}"etc/local.d/*{start,stop} + fi + + if use kernel_linux && [[ "${EROOT}" = "/" ]]; then + if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then + ewarn "The dependency data could not be migrated to /run/openrc." + ewarn "This means you need to reboot your system." + fi + fi + + # update the dependency tree after touching all files #224171 + [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u + + if ! use newnet && ! use netifrc; then + ewarn "You have emerged OpenRc without network support. This" + ewarn "means you need to SET UP a network manager such as" + ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd," + ewarn "net-misc/NetworkManager, or net-misc/badvpn." + ewarn "Or, you have the option of emerging openrc with the newnet" + ewarn "use flag and configuring /etc/conf.d/network and" + ewarn "/etc/conf.d/staticroute if you only use static interfaces." + fi + + if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then + ewarn "Please add the network service to your boot runlevel" + ewarn "as soon as possible. Not doing so could leave you with a system" + ewarn "without networking." + fi + + ewarn "In this version of OpenRC, the loopback interface no longer" + ewarn "satisfies the net virtual." + ewarn "If you have services now which do not start because of this," + ewarn "They can be fixed by adding rc_need=\"!net\"" + ewarn "to the ${EROOT}etc/conf.d/<servicename> file." + ewarn "You should also file a bug against the service asking that" + ewarn "need net be dropped from the dependencies." + ewarn "The bug you file should block the following tracker:" + ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092" + + ewarn "This version of OpenRC doesn't enable nfs mounts automatically any" + ewarn "longer. In order to mount nfs file systems, you must use the" + ewarn "nfsmount service from the nfs-utils package." + ewarn "See bug https://bugs.gentoo.org/show_bug.cgi?id=427996 for" + ewarn "more information on this." + + elog "You should now update all files in /etc, using etc-update" + elog "or equivalent before restarting any services or this host." +} |