| 1 |
vapier 11/08/29 21:21:44 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: sysvinit-2.88-r3.ebuild |
| 5 |
Log: |
| 6 |
Stop installing mountpoint since newer util-linux does now. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.93 sys-apps/sysvinit/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sysvinit/ChangeLog?rev=1.93&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sysvinit/ChangeLog?rev=1.93&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sysvinit/ChangeLog?r1=1.92&r2=1.93 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v |
| 20 |
retrieving revision 1.92 |
| 21 |
retrieving revision 1.93 |
| 22 |
diff -u -r1.92 -r1.93 |
| 23 |
--- ChangeLog 31 May 2011 13:11:46 -0000 1.92 |
| 24 |
+++ ChangeLog 29 Aug 2011 21:21:44 -0000 1.93 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for sys-apps/sysvinit |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.92 2011/05/31 13:11:46 vapier Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.93 2011/08/29 21:21:44 vapier Exp $ |
| 30 |
+ |
| 31 |
+*sysvinit-2.88-r3 (29 Aug 2011) |
| 32 |
+ |
| 33 |
+ 29 Aug 2011; Mike Frysinger <vapier@g.o> +sysvinit-2.88-r3.ebuild: |
| 34 |
+ Stop installing mountpoint since newer util-linux does now. |
| 35 |
|
| 36 |
*sysvinit-2.88-r2 (31 May 2011) |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 sys-apps/sysvinit/sysvinit-2.88-r3.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sysvinit/sysvinit-2.88-r3.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sysvinit/sysvinit-2.88-r3.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: sysvinit-2.88-r3.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2011 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.88-r3.ebuild,v 1.1 2011/08/29 21:21:44 vapier Exp $ |
| 51 |
|
| 52 |
inherit eutils toolchain-funcs flag-o-matic |
| 53 |
|
| 54 |
DESCRIPTION="/sbin/init - parent of all processes" |
| 55 |
HOMEPAGE="http://savannah.nongnu.org/projects/sysvinit" |
| 56 |
SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2" |
| 57 |
|
| 58 |
LICENSE="GPL-2" |
| 59 |
SLOT="0" |
| 60 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 61 |
IUSE="selinux ibm static kernel_FreeBSD" |
| 62 |
|
| 63 |
RDEPEND="selinux? ( >=sys-libs/libselinux-1.28 ) |
| 64 |
!<sys-apps/util-linux-2.20" |
| 65 |
DEPEND="${RDEPEND} |
| 66 |
virtual/os-headers" |
| 67 |
|
| 68 |
S=${WORKDIR}/${P}dsf |
| 69 |
|
| 70 |
src_unpack() { |
| 71 |
unpack ${A} |
| 72 |
cd "${S}" |
| 73 |
epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220 |
| 74 |
epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615 |
| 75 |
epatch "${FILESDIR}"/${P}-makefile.patch #319197 |
| 76 |
epatch "${FILESDIR}"/${P}-selinux.patch #326697 |
| 77 |
sed -i '/^CPPFLAGS =$/d' src/Makefile || die |
| 78 |
|
| 79 |
# mountpoint has moved to util-linux |
| 80 |
sed -i \ |
| 81 |
-e '/^BIN/s:mountpoint::' \ |
| 82 |
-e '/^MAN1/s:mountpoint[.]1::' \ |
| 83 |
src/Makefile || die |
| 84 |
|
| 85 |
# Mung inittab for specific architectures |
| 86 |
cd "${WORKDIR}" |
| 87 |
cp "${FILESDIR}"/inittab-2.87 inittab || die "cp inittab" |
| 88 |
local insert="" |
| 89 |
use ppc && insert='#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' |
| 90 |
use arm && insert='#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' |
| 91 |
use hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' |
| 92 |
use s390 && insert='s0:12345:respawn:/sbin/agetty 38400 console' |
| 93 |
if use ibm ; then |
| 94 |
insert="${insert}#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n' |
| 95 |
insert="${insert}#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0" |
| 96 |
fi |
| 97 |
(use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab |
| 98 |
if use kernel_FreeBSD ; then |
| 99 |
sed -i \ |
| 100 |
-e 's/linux/cons25/g' \ |
| 101 |
-e 's/ttyS0/cuaa0/g' \ |
| 102 |
-e 's/ttyS1/cuaa1/g' \ |
| 103 |
inittab #121786 |
| 104 |
fi |
| 105 |
[[ -n ${insert} ]] && echo "# Architecture specific features"$'\n'"${insert}" >> inittab |
| 106 |
} |
| 107 |
|
| 108 |
src_compile() { |
| 109 |
local myconf |
| 110 |
|
| 111 |
tc-export CC |
| 112 |
append-lfs-flags |
| 113 |
use static && append-ldflags -static |
| 114 |
use selinux && myconf=WITH_SELINUX=yes |
| 115 |
emake -C src ${myconf} || die |
| 116 |
} |
| 117 |
|
| 118 |
src_install() { |
| 119 |
emake -C src install ROOT="${D}" || die |
| 120 |
dodoc README doc/* |
| 121 |
|
| 122 |
insinto /etc |
| 123 |
doins "${WORKDIR}"/inittab || die "inittab" |
| 124 |
|
| 125 |
doinitd "${FILESDIR}"/{reboot,shutdown}.sh || die |
| 126 |
} |
| 127 |
|
| 128 |
pkg_postinst() { |
| 129 |
# Reload init to fix unmounting problems of / on next reboot. |
| 130 |
# This is really needed, as without the new version of init cause init |
| 131 |
# not to quit properly on reboot, and causes a fsck of / on next reboot. |
| 132 |
if [[ ${ROOT} == / ]] ; then |
| 133 |
# Do not return an error if this fails |
| 134 |
/sbin/telinit U &>/dev/null |
| 135 |
fi |
| 136 |
} |
Archives