From da0dab45568a27c95de6ffbab6f6f1fb8af235ba Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Fri, 5 Dec 2008 23:51:13 +0000 Subject: Bug #246502, adding l0s and l6r ready for openrc-0.4.0. (Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64) --- sys-apps/sysvinit/ChangeLog | 10 +++- sys-apps/sysvinit/files/inittab-2.86-r11 | 59 ++++++++++++++++++ sys-apps/sysvinit/sysvinit-2.86-r11.ebuild | 96 ++++++++++++++++++++++++++++++ 3 files changed, 163 insertions(+), 2 deletions(-) create mode 100644 sys-apps/sysvinit/files/inittab-2.86-r11 create mode 100644 sys-apps/sysvinit/sysvinit-2.86-r11.ebuild (limited to 'sys-apps/sysvinit') diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog index 873c10b1ae77..0387bc84a545 100644 --- a/sys-apps/sysvinit/ChangeLog +++ b/sys-apps/sysvinit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/sysvinit -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.60 2007/12/24 16:39:33 ranger Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.61 2008/12/05 23:51:11 robbat2 Exp $ + +*sysvinit-2.86-r11 (05 Dec 2008) + + 05 Dec 2008; Robin H. Johnson + +files/inittab-2.86-r11, +sysvinit-2.86-r11.ebuild: + Bug #246502, adding l0s and l6r ready for openrc-0.4.0. 24 Dec 2007; Brent Baude sysvinit-2.86-r10.ebuild: Marking sysvinit-2.86-r10 ppc64 for bug 202790 diff --git a/sys-apps/sysvinit/files/inittab-2.86-r11 b/sys-apps/sysvinit/files/inittab-2.86-r11 new file mode 100644 index 000000000000..1be1624fdc10 --- /dev/null +++ b/sys-apps/sysvinit/files/inittab-2.86-r11 @@ -0,0 +1,59 @@ +# +# /etc/inittab: This file describes how the INIT process should set up +# the system in a certain run-level. +# +# Author: Miquel van Smoorenburg, +# Modified by: Patrick J. Volkerding, +# Modified by: Daniel Robbins, +# Modified by: Martin Schlemmer, +# Modified by: Mike Frysinger, +# Modified by: Robin H. Johnson, +# +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.86-r11,v 1.1 2008/12/05 23:51:13 robbat2 Exp $ + +# Default runlevel. +id:3:initdefault: + +# System initialization, mount local filesystems, etc. +si::sysinit:/sbin/rc sysinit + +# Further system initialization, brings up the boot runlevel. +rc::bootwait:/sbin/rc boot + +l0:0:wait:/sbin/rc shutdown +l0s:0:wait:/sbin/halt -dhip +l1:S1:wait:/sbin/rc single +l2:2:wait:/sbin/rc nonetwork +l3:3:wait:/sbin/rc default +l4:4:wait:/sbin/rc default +l5:5:wait:/sbin/rc default +l6:6:wait:/sbin/rc reboot +l6r:6:wait:/sbin/reboot -dk +#z6:6:respawn:/sbin/sulogin + +# Do not uncomment yet. Pending bug 246502 +#BL2#s0:S:wait:/sbin/rc single +#BL2#s1:S:wait:/sbin/sulogin + +# TERMINALS +c1:12345:respawn:/sbin/agetty 38400 tty1 linux +c2:2345:respawn:/sbin/agetty 38400 tty2 linux +c3:2345:respawn:/sbin/agetty 38400 tty3 linux +c4:2345:respawn:/sbin/agetty 38400 tty4 linux +c5:2345:respawn:/sbin/agetty 38400 tty5 linux +c6:2345:respawn:/sbin/agetty 38400 tty6 linux + +# SERIAL CONSOLES +#s0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100 +#s1:12345:respawn:/sbin/agetty 9600 ttyS1 vt100 + +# What to do at the "Three Finger Salute". +ca:12345:ctrlaltdel:/sbin/shutdown -r now + +# Used by /etc/init.d/xdm to control DM startup. +# Read the comments in /etc/init.d/xdm for more +# info. Do NOT remove, as this will start nothing +# extra at boot if /etc/init.d/xdm is not added +# to the "default" runlevel. +x:a:once:/etc/X11/startDM.sh + diff --git a/sys-apps/sysvinit/sysvinit-2.86-r11.ebuild b/sys-apps/sysvinit/sysvinit-2.86-r11.ebuild new file mode 100644 index 000000000000..e41ce18b6adf --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-2.86-r11.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.86-r11.ebuild,v 1.1 2008/12/05 23:51:11 robbat2 Exp $ + +inherit eutils toolchain-funcs flag-o-matic + +DESCRIPTION="/sbin/init - parent of all processes" +HOMEPAGE="http://freshmeat.net/projects/sysvinit/" +SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/${P}.tar.gz + ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/${P}.tar.gz + http://www.gc-linux.org/down/isobel/kexec/sysvinit/sysvinit-2.86-kexec.patch" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="selinux ibm static kernel_FreeBSD" + +RDEPEND="selinux? ( >=sys-libs/libselinux-1.28 )" +DEPEND="${RDEPEND} + virtual/os-headers" + +src_unpack() { + unpack ${P}.tar.gz + cd "${S}" + cp "${FILESDIR}"/change_console.{c,8} src/ || die + epatch "${FILESDIR}"/${P}-docs.patch + epatch "${FILESDIR}"/${P}-shutdown-usage.patch + epatch "${FILESDIR}"/${P}-off-by-one.patch + epatch "${DISTDIR}"/${P}-kexec.patch + epatch "${FILESDIR}"/${P}-execl.patch + epatch "${FILESDIR}"/${P}-utmp-64bit.patch + epatch "${FILESDIR}"/${P}-shutdown-single.patch + epatch "${FILESDIR}"/${P}-utmp-smp.patch + epatch "${FILESDIR}"/${P}-build.patch + use selinux && epatch "${FILESDIR}"/${PV}-selinux-1.patch + + # Mung inittab for specific architectures + cd "${WORKDIR}" + cp "${FILESDIR}"/inittab-2.86-r11 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 hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' + use s390 && insert='s0:12345:respawn:/sbin/agetty 38400 console' + if use ibm ; then + insert="${insert}#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n' + insert="${insert}#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 + [[ -n ${insert} ]] && echo "# Architecture specific features"$'\n'"${insert}" >> inittab + + # Ready for baselayout2/openrc-0.4.0, commented pending bug 246502 + #has_version =sys-apps/baselayout-2* && sed -i -e '/^#BL2#/s,^#BL2#,,g' inittab +} + +src_compile() { + use static && append-ldflags -static + emake -C src \ + CC="$(tc-getCC)" \ + all change_console \ + || die +} + +src_install() { + emake -C src \ + install \ + ROOT="${D}" \ + || die "make install" + dodoc README doc/* + + into / + dosbin src/change_console || die + doman src/change_console.8 + + insinto /etc + doins "${WORKDIR}"/inittab || die "inittab" + + doinitd "${FILESDIR}"/{reboot,shutdown}.sh || die +} + +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 +} -- cgit v1.2.3-65-gdbad