Gentoo Archives: gentoo-commits

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