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