Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Doug Klima (cardoe)" <cardoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: ChangeLog openrc-0.2-r3.ebuild openrc-0.2-r2.ebuild
Date: Mon, 31 Mar 2008 16:17:24
Message-Id: E1JgMhD-0007mP-HP@stork.gentoo.org
1 cardoe 08/03/31 16:17:19
2
3 Modified: ChangeLog
4 Added: openrc-0.2-r3.ebuild
5 Removed: openrc-0.2-r2.ebuild
6 Log:
7 fix path issue introduced by multilib patch. document SSD_NICELEVEL
8 (Portage version: 2.1.4.4)
9
10 Revision Changes Path
11 1.19 sys-apps/openrc/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.19&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.19&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.18&r2=1.19
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
20 retrieving revision 1.18
21 retrieving revision 1.19
22 diff -u -r1.18 -r1.19
23 --- ChangeLog 31 Mar 2008 16:09:00 -0000 1.18
24 +++ ChangeLog 31 Mar 2008 16:17:18 -0000 1.19
25 @@ -1,6 +1,14 @@
26 # ChangeLog for sys-apps/openrc
27 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.18 2008/03/31 16:09:00 vapier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.19 2008/03/31 16:17:18 cardoe Exp $
30 +
31 +*openrc-0.2-r3 (31 Mar 2008)
32 +
33 + 31 Mar 2008; Doug Goldstein <cardoe@g.o>
34 + +files/openrc-0.2-nicelevel-doc.patch,
35 + +files/openrc-0.2-path-fix-for-multilib-fix.patch, -openrc-0.2-r2.ebuild,
36 + +openrc-0.2-r3.ebuild:
37 + fix path issue introduced by multilib patch. document SSD_NICELEVEL
38
39 30 Mar 2008; Mike Frysinger <vapier@g.o>
40 +files/9999/0001-msg-style.patch, +files/9999/0003-KV.patch,
41
42
43
44 1.1 sys-apps/openrc/openrc-0.2-r3.ebuild
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r3.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r3.ebuild?rev=1.1&content-type=text/plain
48
49 Index: openrc-0.2-r3.ebuild
50 ===================================================================
51 # Copyright 1999-2008 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r3.ebuild,v 1.1 2008/03/31 16:17:18 cardoe Exp $
54
55 inherit eutils flag-o-matic multilib toolchain-funcs
56
57 if [[ ${PV} == "9999" ]] ; then
58 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git"
59 EGIT_BRANCH="master"
60 inherit git
61 else
62 SRC_URI="http://roy.marples.name/${PN}/${P}.tar.bz2
63 mirror://gentoo/${P}.tar.bz2
64 http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2
65 http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
66 fi
67
68 DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
69 HOMEPAGE="http://roy.marples.name/openrc"
70
71 LICENSE="BSD-2"
72 SLOT="0"
73 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc-fbsd ~x86" #"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
74 IUSE="debug ncurses pam unicode kernel_linux kernel_FreeBSD"
75
76 RDEPEND="virtual/init
77 kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 )
78 kernel_FreeBSD? ( sys-process/fuser-bsd )
79 ncurses? ( sys-libs/ncurses )
80 pam? ( virtual/pam )
81 >=sys-apps/baselayout-2.0.0
82 !<sys-fs/udev-118-r2"
83 DEPEND="${RDEPEND}
84 virtual/os-headers"
85
86 #S="${WORKDIR}/${PN}-0.2"
87
88 pkg_setup() {
89 LIBDIR="lib"
90 [ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}")
91
92 MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}"
93
94 local brand="Unknown"
95 if use kernel_linux ; then
96 MAKE_ARGS="${MAKE_ARGS} OS=Linux"
97 brand="Linux"
98 elif use kernel_FreeBSD ; then
99 MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
100 brand="FreeBSD"
101 fi
102 export BRANDING="Gentoo ${brand}"
103
104 export DEBUG=$(usev debug)
105 export MKPAM=$(usev pam)
106 export MKTERMCAP=$(usev ncurses)
107 }
108
109 src_unpack() {
110 if [[ ${PV} == "9999" ]] ; then
111 git_src_unpack
112 else
113 unpack ${A}
114 fi
115 cd "${S}"
116 epatch "${FILESDIR}"/9999/*.patch
117
118 epatch "${FILESDIR}"/${PN}-0.2-freebsd-install-rc.patch
119 epatch "${FILESDIR}"/${PN}-0.2-multiple-ntp-servers.patch
120 epatch "${FILESDIR}"/${PN}-0.2-multilib-fix.patch
121 epatch "${FILESDIR}"/${PN}-0.2-path-fix-for-multilib-fix.patch
122 epatch "${FILESDIR}"/${PN}-0.2-sysctl-vserver-fix.patch
123 epatch "${FILESDIR}"/${PN}-0.2-nicelevel-doc.patch
124 }
125
126 src_compile() {
127 # catch people running `ebuild` w/out setup
128 if [[ -z ${MAKE_ARGS} ]] ; then
129 die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?"
130 fi
131
132 if [[ ${PV} == "9999" ]] ; then
133 local ver="git-$(git --git-dir=${EGIT_STORE_DIR}/${EGIT_PROJECT} rev-parse --verify ${EGIT_BRANCH} | cut -c1-8)"
134 sed -i "/^VERSION[[:space:]]*=/s:=.*:=${ver}:" Makefile
135 fi
136
137 tc-export CC AR RANLIB
138 echo emake ${MAKE_ARGS}
139 emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed"
140 }
141
142 src_install() {
143 emake ${MAKE_ARGS} DESTDIR="${D}" install || die "make install failed"
144 gen_usr_ldscript libeinfo.so
145 gen_usr_ldscript librc.so
146
147 keepdir /"${LIBDIR}"/rc/init.d
148 keepdir /"${LIBDIR}"/rc/tmp
149
150 # Backup our default runlevels
151 dodir /usr/share/"${PN}"
152 mv "${D}/etc/runlevels" "${D}/usr/share/${PN}"
153
154 # Setup unicode defaults for silly unicode users
155 use unicode && sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf
156
157 # Cater to the norm
158 (use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps
159 }
160
161 add_boot_init() {
162 local initd=$1
163 [[ -e ${ROOT}/etc/init.d/${initd} ]] || return
164 [[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return
165 elog "Auto-adding '${initd}' service to your boot runlevel"
166 ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd}
167 }
168 add_boot_init_mit_config() {
169 local config=$1 initd=$2
170 if [[ -e ${ROOT}${config} ]] ; then
171 if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then
172 maybe_add_boot_init ${initd}
173 fi
174 fi
175 }
176
177 pkg_preinst() {
178 local f
179
180 # default net script is just comments, so no point in biting people
181 # in the ass by accident
182 [[ -e ${ROOT}/etc/conf.d/net ]] && rm -f "${D}"/etc/conf.d/net
183
184 # /etc/conf.d/clock moved to /etc/conf.d/hwclock
185 local clock
186 use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"
187 if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then
188 mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock}
189 fi
190 if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then
191 rm -f "${ROOT}"/etc/runlevels/boot/clock
192 ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock}
193 fi
194 if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then
195 rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock
196 ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock}
197 fi
198
199 # /etc/conf.d/rc is no longer used for configuration
200 if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then
201 elog "/etc/conf.d/rc is no longer used for configuration."
202 elog "Please migrate your settings and delete it."
203 fi
204
205 # upgrade timezone file
206 if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
207 (
208 source "${ROOT}"/etc/conf.d/clock
209 [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone
210 )
211 fi
212
213 # force net init.d scripts into symlinks
214 for f in "${ROOT}"/etc/init.d/net.* ; do
215 if [[ ! -L ${f} ]] ; then
216 elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."
217 elog "You should delete '${f##*/}.openrc.bak' if you don't need it."
218 mv "${f}" "${f}.openrc.bak"
219 ln -snf net.lo "${f}"
220 fi
221 done
222
223 # skip remaining migration if we already have openrc installed
224 has_version sys-apps/openrc && return 0
225
226 # baselayout boot init scripts have been split out
227 for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
228 add_boot_init ${f}
229 done
230
231 # Try to auto-add some addons when possible
232 add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt
233 add_boot_init_mit_config /etc/mdadm.conf mdraid
234 add_boot_init_mit_config /etc/dmtab device-mapper
235 [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm
236 elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
237 elog "init.d scripts. If you use such a thing, make sure you have the"
238 elog "required init.d scripts added to your boot runlevel."
239
240 # Upgrade out state for baselayout-1 users
241 if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then
242 (
243 [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc
244 svcdir=${svcdir:-/var/lib/init.d}
245 if [[ ! -d ${ROOT}${svcdir}/started ]] ; then
246 ewarn "No state found, and no state exists"
247 elog "You should reboot this host"
248 else
249 mkdir -p "${ROOT}${LIBDIR}/rc/init.d"
250 einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d"
251 mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d
252 rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \
253 "${ROOT}${LIBDIR}"/rc/init.d/console
254 umount "${ROOT}${svcdir}" 2>/dev/null
255 rm -rf "${ROOT}${svcdir}"
256 fi
257 )
258 fi
259
260 # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition
261 if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
262 elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules"
263 rm -f "${ROOT}"/etc/modules.autoload.d/.keep*
264 rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
265 if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
266 local f v
267 for f in "${ROOT}"/etc/modules.autoload.d/* ; do
268 v=${f##*/}
269 v=${v#kernel-}
270 v=${v//[^[:alnum:]]/_}
271 gawk -v v="${v}" -v f="${f##*/}" '
272 BEGIN { print "\n### START: Auto-converted from " f "\n" }
273 {
274 if ($0 ~ /^[^#]/) {
275 print "modules_" v "=\"${modules_" v "} " $1 "\""
276 gsub(/[^[:alnum:]]/, "_", $1)
277 printf "module_" $1 "_args_" v "=\""
278 for (i = 2; i <= NF; ++i) {
279 if (i > 2)
280 printf " "
281 printf $i
282 }
283 print "\"\n"
284 } else
285 print
286 }
287 END { print "\n### END: Auto-converted from " f "\n" }
288 ' "${f}" >> "${D}"/etc/conf.d/modules
289 done
290 rm -f "${f}"
291 rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
292 fi
293 fi
294 }
295
296 pkg_postinst() {
297 # Remove old baselayout links
298 rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
299
300 # Make our runlevels if they don't exist
301 if [[ ! -e ${ROOT}/etc/runlevels ]] ; then
302 einfo "Copying across default runlevels"
303 cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc
304 fi
305
306 if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
307 ewarn "/etc/modules.autoload.d is no longer used. Please convert"
308 ewarn "your files to /etc/conf.d/modules and delete the directory."
309 fi
310
311 elog "You should now update all files in /etc, using etc-update"
312 elog "or equivalent before restarting any services or this host."
313 }
314
315
316
317 --
318 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups