diff options
Diffstat (limited to 'sys-apps/sysvinit')
-rw-r--r-- | sys-apps/sysvinit/files/inittab-2.88 | 3 | ||||
-rw-r--r-- | sys-apps/sysvinit/sysvinit-2.88-r4.ebuild | 104 | ||||
-rw-r--r-- | sys-apps/sysvinit/sysvinit-2.88-r5.ebuild | 106 | ||||
-rw-r--r-- | sys-apps/sysvinit/sysvinit-2.88-r6.ebuild | 113 | ||||
-rw-r--r-- | sys-apps/sysvinit/sysvinit-2.88-r9.ebuild (renamed from sys-apps/sysvinit/sysvinit-2.88-r8.ebuild) | 20 |
5 files changed, 14 insertions, 332 deletions
diff --git a/sys-apps/sysvinit/files/inittab-2.88 b/sys-apps/sysvinit/files/inittab-2.88 index 5328d3054c..ffb1ce3fec 100644 --- a/sys-apps/sysvinit/files/inittab-2.88 +++ b/sys-apps/sysvinit/files/inittab-2.88 @@ -8,6 +8,7 @@ # Modified by: Martin Schlemmer, <azarah@gentoo.org> # Modified by: Mike Frysinger, <vapier@gentoo.org> # Modified by: Robin H. Johnson, <robbat2@gentoo.org> +# Modified by: William Hubbs, <williamh@gentoo.org> # # $Id$ @@ -36,7 +37,7 @@ su0:S:wait:/sbin/openrc single su1:S:wait:/sbin/sulogin # TERMINALS -x1:12345:respawn:/sbin/agetty 38400 console linux +#x1:12345:respawn:/sbin/agetty 38400 console linux c1:12345:respawn:/sbin/agetty 38400 tty1 linux c2:2345:respawn:/sbin/agetty 38400 tty2 linux c3:2345:respawn:/sbin/agetty 38400 tty3 linux diff --git a/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild deleted file mode 100644 index 011e317834..0000000000 --- a/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils toolchain-funcs flag-o-matic - -DESCRIPTION="/sbin/init - parent of all processes" -HOMEPAGE="http://savannah.nongnu.org/projects/sysvinit" -SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="selinux ibm static kernel_FreeBSD" - -RDEPEND=" - selinux? ( - >=sys-libs/libselinux-1.28 - sec-policy/selinux-shutdown - ) - !>=sys-apps/util-linux-2.23" -DEPEND="${RDEPEND} - virtual/os-headers" - -S=${WORKDIR}/${P}dsf - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220 - epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615 - epatch "${FILESDIR}"/${P}-makefile.patch #319197 - epatch "${FILESDIR}"/${P}-selinux.patch #326697 - sed -i '/^CPPFLAGS =$/d' src/Makefile || die - - # mountpoint/sulogin/utmpdump have moved to util-linux - sed -i -r \ - -e '/^(USR)?S?BIN/s:\<(mountpoint|sulogin|utmpdump)\>::g' \ - -e '/^MAN[18]/s:\<(mountpoint|sulogin|utmpdump)[.][18]\>::g' \ - src/Makefile || die - - # Mung inittab for specific architectures - cd "${WORKDIR}" - cp "${FILESDIR}"/inittab-2.87 inittab || die "cp inittab" - local insert=() - use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) - use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) - use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' ) - use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) - use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) - if use ibm ; then - insert+=( - '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' - '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' - ) - fi - (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab - if use kernel_FreeBSD ; then - sed -i \ - -e 's/linux/cons25/g' \ - -e 's/ttyS0/cuaa0/g' \ - -e 's/ttyS1/cuaa1/g' \ - inittab #121786 - fi - if use x86 || use amd64 ; then - sed -i \ - -e '/ttyS[01]/s:9600:115200:' \ - inittab - fi - if [[ ${#insert[@]} -gt 0 ]] ; then - printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab - fi -} - -src_compile() { - local myconf - - tc-export CC - append-lfs-flags - export DISTRO= #381311 - use static && append-ldflags -static - use selinux && myconf=WITH_SELINUX=yes - emake -C src ${myconf} || die -} - -src_install() { - emake -C src install ROOT="${D}" - dodoc README doc/* - - insinto /etc - doins "${WORKDIR}"/inittab - - doinitd "${FILESDIR}"/{reboot,shutdown}.sh -} - -pkg_postinst() { - # Reload init to fix unmounting problems of / on next reboot. - # This is really needed, as without the new version of init cause init - # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] ; then - # Do not return an error if this fails - /sbin/telinit U &>/dev/null - fi -} diff --git a/sys-apps/sysvinit/sysvinit-2.88-r5.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r5.ebuild deleted file mode 100644 index a885d32417..0000000000 --- a/sys-apps/sysvinit/sysvinit-2.88-r5.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils toolchain-funcs flag-o-matic - -DESCRIPTION="/sbin/init - parent of all processes" -HOMEPAGE="http://savannah.nongnu.org/projects/sysvinit" -SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="selinux ibm static kernel_FreeBSD" - -RDEPEND=" - selinux? ( - >=sys-libs/libselinux-1.28 - sec-policy/selinux-shutdown - )" -DEPEND="${RDEPEND} - virtual/os-headers" - -S=${WORKDIR}/${P}dsf - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220 - epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615 - epatch "${FILESDIR}"/${P}-makefile.patch #319197 - epatch "${FILESDIR}"/${P}-selinux.patch #326697 - epatch "${FILESDIR}"/${P}-shutdown-h.patch #449354 - sed -i '/^CPPFLAGS =$/d' src/Makefile || die - - # mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux - sed -i -r \ - -e '/^(USR)?S?BIN/s:\<(mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ - -e '/^MAN[18]/s:\<(mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ - src/Makefile || die - - # Mung inittab for specific architectures - cd "${WORKDIR}" - cp "${FILESDIR}"/inittab-2.87 inittab || die "cp inittab" - local insert=() - use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) - use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) - use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' ) - use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) - use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) - if use ibm ; then - insert+=( - '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' - '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' - ) - fi - (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab - if use kernel_FreeBSD ; then - sed -i \ - -e 's/linux/cons25/g' \ - -e 's/ttyS0/cuaa0/g' \ - -e 's/ttyS1/cuaa1/g' \ - inittab #121786 - fi - if use x86 || use amd64 ; then - sed -i \ - -e '/ttyS[01]/s:9600:115200:' \ - inittab - fi - if [[ ${#insert[@]} -gt 0 ]] ; then - printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab - fi -} - -src_compile() { - local myconf - - tc-export CC - append-lfs-flags - export DISTRO= #381311 - use static && append-ldflags -static - use selinux && myconf=WITH_SELINUX=yes - emake -C src ${myconf} || die -} - -src_install() { - emake -C src install ROOT="${D}" - dodoc README doc/* - - insinto /etc - doins "${WORKDIR}"/inittab - - doinitd "${FILESDIR}"/{reboot,shutdown}.sh -} - -pkg_postinst() { - # Reload init to fix unmounting problems of / on next reboot. - # This is really needed, as without the new version of init cause init - # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] ; then - # Do not return an error if this fails - /sbin/telinit U &>/dev/null - fi - - elog "The mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to sys-apps/util-linux." -} diff --git a/sys-apps/sysvinit/sysvinit-2.88-r6.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r6.ebuild deleted file mode 100644 index 8f02b5554f..0000000000 --- a/sys-apps/sysvinit/sysvinit-2.88-r6.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils toolchain-funcs flag-o-matic - -DESCRIPTION="/sbin/init - parent of all processes" -HOMEPAGE="http://savannah.nongnu.org/projects/sysvinit" -SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="selinux ibm static kernel_FreeBSD" - -RDEPEND=" - selinux? ( - >=sys-libs/libselinux-1.28 - sec-policy/selinux-shutdown - )" -DEPEND="${RDEPEND} - virtual/os-headers" - -S=${WORKDIR}/${P}dsf - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220 - epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615 - epatch "${FILESDIR}"/${P}-makefile.patch #319197 - epatch "${FILESDIR}"/${P}-selinux.patch #326697 - epatch "${FILESDIR}"/${P}-shutdown-h.patch #449354 - sed -i '/^CPPFLAGS =$/d' src/Makefile || die - - # mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux - sed -i -r \ - -e '/^(USR)?S?BIN/s:\<(mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ - -e '/^MAN[18]/s:\<(mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ - src/Makefile || die - - # pidof has moved to >=procps-3.3.9 - sed -i -r \ - -e '/\/bin\/pidof/d' \ - -e '/^MAN8/s:\<pidof.8\>::g' \ - src/Makefile || die - - # Mung inittab for specific architectures - cd "${WORKDIR}" - cp "${FILESDIR}"/inittab-2.87 inittab || die "cp inittab" - local insert=() - use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) - use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) - use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' ) - use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) - use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) - if use ibm ; then - insert+=( - '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' - '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' - ) - fi - (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab - if use kernel_FreeBSD ; then - sed -i \ - -e 's/linux/cons25/g' \ - -e 's/ttyS0/cuaa0/g' \ - -e 's/ttyS1/cuaa1/g' \ - inittab #121786 - fi - if use x86 || use amd64 ; then - sed -i \ - -e '/ttyS[01]/s:9600:115200:' \ - inittab - fi - if [[ ${#insert[@]} -gt 0 ]] ; then - printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab - fi -} - -src_compile() { - local myconf - - tc-export CC - append-lfs-flags - export DISTRO= #381311 - use static && append-ldflags -static - use selinux && myconf=WITH_SELINUX=yes - emake -C src ${myconf} || die -} - -src_install() { - emake -C src install ROOT="${D}" - dodoc README doc/* - - insinto /etc - doins "${WORKDIR}"/inittab - - doinitd "${FILESDIR}"/{reboot,shutdown}.sh -} - -pkg_postinst() { - # Reload init to fix unmounting problems of / on next reboot. - # This is really needed, as without the new version of init cause init - # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] ; then - # Do not return an error if this fails - /sbin/telinit U &>/dev/null - fi - - elog "The mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to sys-apps/util-linux." - elog "The pidof tool has been moved to sys-process/procps." -} diff --git a/sys-apps/sysvinit/sysvinit-2.88-r8.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild index acc8a8dc74..a6b30a3ee3 100644 --- a/sys-apps/sysvinit/sysvinit-2.88-r8.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI=5 inherit eutils toolchain-funcs flag-o-matic @@ -27,12 +27,16 @@ RDEPEND="${CDEPEND} S=${WORKDIR}/${P}dsf +PATCHES=( + "${FILESDIR}/${PN}-2.86-kexec.patch" #80220 + "${FILESDIR}/${PN}-2.86-shutdown-single.patch" #158615 + "${FILESDIR}/${P}-makefile.patch" #319197 + "${FILESDIR}/${P}-selinux.patch" #326697 + "${FILESDIR}/${P}-shutdown-h.patch" #449354 +) + src_prepare() { - epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220 - epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615 - epatch "${FILESDIR}"/${P}-makefile.patch #319197 - epatch "${FILESDIR}"/${P}-selinux.patch #326697 - epatch "${FILESDIR}"/${P}-shutdown-h.patch #449354 + epatch "${PATCHES[@]}" sed -i '/^CPPFLAGS =$/d' src/Makefile || die # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux @@ -99,7 +103,7 @@ src_install() { doins "${WORKDIR}"/inittab # dead symlink - rm -f "${D}"/usr/bin/lastb + rm "${D}"/usr/bin/lastb || die } pkg_postinst() { |