From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 82811138330 for ; Thu, 15 Sep 2016 17:16:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2E66E0962; Thu, 15 Sep 2016 17:16:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B367FE0962 for ; Thu, 15 Sep 2016 17:16:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18C6C340AE2 for ; Thu, 15 Sep 2016 17:16:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3CCEC2481 for ; Thu, 15 Sep 2016 17:16:20 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1473959705.871c2b0416906b5dffe731425e0420b0219562d8.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/, sys-apps/sysvinit/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/sysvinit/files/inittab-2.87 sys-apps/sysvinit/files/reboot.sh sys-apps/sysvinit/files/shutdown.sh sys-apps/sysvinit/sysvinit-2.88-r7.ebuild X-VCS-Directories: sys-apps/sysvinit/files/ sys-apps/sysvinit/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 871c2b0416906b5dffe731425e0420b0219562d8 X-VCS-Branch: master Date: Thu, 15 Sep 2016 17:16:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d0b13b03-0c0a-45a9-a300-0d2ea337e452 X-Archives-Hash: 83d0f5ca5d072cc55d05a98ea9faf613 commit: 871c2b0416906b5dffe731425e0420b0219562d8 Author: William Hubbs gentoo org> AuthorDate: Thu Sep 15 17:15:05 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Sep 15 17:15:05 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871c2b04 sys-apps/sysvinit: remove old version Package-Manager: portage-2.2.28 sys-apps/sysvinit/files/inittab-2.87 | 58 --------------- sys-apps/sysvinit/files/reboot.sh | 11 --- sys-apps/sysvinit/files/shutdown.sh | 13 ---- sys-apps/sysvinit/sysvinit-2.88-r7.ebuild | 118 ------------------------------ 4 files changed, 200 deletions(-) diff --git a/sys-apps/sysvinit/files/inittab-2.87 b/sys-apps/sysvinit/files/inittab-2.87 deleted file mode 100644 index 1fcb8bb..00000000 --- a/sys-apps/sysvinit/files/inittab-2.87 +++ /dev/null @@ -1,58 +0,0 @@ -# -# /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, -# -# $Id$ - -# 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 -dhp -l1:1: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 - -# new-style single-user -su0:S:wait:/sbin/rc single -su1: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 -L 9600 ttyS0 vt100 -#s1:12345:respawn:/sbin/agetty -L 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/files/reboot.sh b/sys-apps/sysvinit/files/reboot.sh deleted file mode 100644 index 3e50f71..00000000 --- a/sys-apps/sysvinit/files/reboot.sh +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -opts="-dpk" -[ "${RC_DOWN_INTERFACE}" = "yes" ] && opts="${opts}i" - -/sbin/reboot "${opts}" 2>/dev/null - -# hmm, if the above failed, that's kind of odd ... -# so let's force a reboot -/sbin/reboot -f diff --git a/sys-apps/sysvinit/files/shutdown.sh b/sys-apps/sysvinit/files/shutdown.sh deleted file mode 100644 index 502ef52..00000000 --- a/sys-apps/sysvinit/files/shutdown.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -opts="-d" -[ "${INIT_HALT}" != "HALT" ] && opts="${opts}p" -[ "${RC_DOWN_INTERFACE}" = "yes" ] && opts="${opts}i" -[ "${RC_DOWN_HARDDISK}" = "yes" ] && opts="${opts}h" - -/sbin/halt "${opts}" - -# hmm, if the above failed, that's kind of odd ... -# so let's force a halt -/sbin/halt -f diff --git a/sys-apps/sysvinit/sysvinit-2.88-r7.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r7.ebuild deleted file mode 100644 index 1ccda21..00000000 --- a/sys-apps/sysvinit/sysvinit-2.88-r7.ebuild +++ /dev/null @@ -1,118 +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="https://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" - -CDEPEND=" - selinux? ( - >=sys-libs/libselinux-1.28 - )" -DEPEND="${CDEPEND} - virtual/os-headers" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-shutdown ) -" - -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 - - # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux - sed -i -r \ - -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ - -e '/^MAN[18]/s:\<(last|lastb|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:\::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 - - # dead symlink - rm -f "${D}"/usr/bin/lastb - - 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 last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to" - elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps." -}