1 |
mgorny 12/09/30 22:20:03 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: systemd-193.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
|
8 |
(Portage version: 2.2.0_alpha131_p3/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.12 sys-apps/systemd/metadata.xml |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?rev=1.12&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?rev=1.12&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?r1=1.11&r2=1.12 |
16 |
|
17 |
Index: metadata.xml |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/metadata.xml,v |
20 |
retrieving revision 1.11 |
21 |
retrieving revision 1.12 |
22 |
diff -u -r1.11 -r1.12 |
23 |
--- metadata.xml 24 Aug 2012 17:21:06 -0000 1.11 |
24 |
+++ metadata.xml 30 Sep 2012 22:20:03 -0000 1.12 |
25 |
@@ -10,6 +10,7 @@ |
26 |
<flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag> |
27 |
<flag name='cryptsetup'>Use libcryptsetup</flag> |
28 |
<flag name='gcrypt'>Enable sealing of journal files using gcrypt</flag> |
29 |
+ <flag name='http'>Enable embedded HTTP server in journald</flag> |
30 |
<flag name='qrcode'>Enable qrcode output support in journal</flag> |
31 |
</use> |
32 |
</pkgmetadata> |
33 |
|
34 |
|
35 |
|
36 |
1.54 sys-apps/systemd/ChangeLog |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.54&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.54&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.53&r2=1.54 |
41 |
|
42 |
Index: ChangeLog |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v |
45 |
retrieving revision 1.53 |
46 |
retrieving revision 1.54 |
47 |
diff -u -r1.53 -r1.54 |
48 |
--- ChangeLog 26 Sep 2012 06:07:06 -0000 1.53 |
49 |
+++ ChangeLog 30 Sep 2012 22:20:03 -0000 1.54 |
50 |
@@ -1,6 +1,12 @@ |
51 |
# ChangeLog for sys-apps/systemd |
52 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.53 2012/09/26 06:07:06 mgorny Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.54 2012/09/30 22:20:03 mgorny Exp $ |
55 |
+ |
56 |
+*systemd-193 (30 Sep 2012) |
57 |
+ |
58 |
+ 30 Sep 2012; Michał Górny <mgorny@g.o> +systemd-193.ebuild, |
59 |
+ metadata.xml: |
60 |
+ Version bump. |
61 |
|
62 |
*systemd-192 (26 Sep 2012) |
63 |
|
64 |
|
65 |
|
66 |
|
67 |
1.1 sys-apps/systemd/systemd-193.ebuild |
68 |
|
69 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-193.ebuild?rev=1.1&view=markup |
70 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-193.ebuild?rev=1.1&content-type=text/plain |
71 |
|
72 |
Index: systemd-193.ebuild |
73 |
=================================================================== |
74 |
# Copyright 1999-2012 Gentoo Foundation |
75 |
# Distributed under the terms of the GNU General Public License v2 |
76 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-193.ebuild,v 1.1 2012/09/30 22:20:03 mgorny Exp $ |
77 |
|
78 |
EAPI=4 |
79 |
|
80 |
inherit autotools-utils bash-completion-r1 linux-info pam systemd user |
81 |
|
82 |
DESCRIPTION="System and service manager for Linux" |
83 |
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" |
84 |
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" |
85 |
|
86 |
LICENSE="GPL-2 LGPL-2.1 MIT" |
87 |
SLOT="0" |
88 |
KEYWORDS="~amd64 ~arm ~x86" |
89 |
IUSE="acl audit cryptsetup gcrypt http lzma pam qrcode selinux tcpd" |
90 |
|
91 |
MINKV="2.6.39" |
92 |
|
93 |
COMMON_DEPEND=">=sys-apps/dbus-1.4.10 |
94 |
>=sys-apps/kmod-5 |
95 |
>=sys-apps/util-linux-2.20 |
96 |
~sys-fs/udev-193 |
97 |
sys-libs/libcap |
98 |
acl? ( sys-apps/acl ) |
99 |
audit? ( >=sys-process/audit-2 ) |
100 |
cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 ) |
101 |
gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) |
102 |
http? ( net-libs/libmicrohttpd ) |
103 |
lzma? ( app-arch/xz-utils ) |
104 |
pam? ( virtual/pam ) |
105 |
qrcode? ( media-gfx/qrencode ) |
106 |
selinux? ( sys-libs/libselinux ) |
107 |
tcpd? ( sys-apps/tcp-wrappers )" |
108 |
|
109 |
RDEPEND="${COMMON_DEPEND} |
110 |
sys-apps/hwids |
111 |
|| ( |
112 |
>=sys-apps/util-linux-2.22 |
113 |
<sys-apps/sysvinit-2.88-r4 |
114 |
) |
115 |
!<sys-libs/glibc-2.10 |
116 |
!~sys-fs/udev-187" |
117 |
|
118 |
# sys-fs/quota is necessary to store correct paths in unit files |
119 |
DEPEND="${COMMON_DEPEND} |
120 |
app-arch/xz-utils |
121 |
app-text/docbook-xsl-stylesheets |
122 |
dev-libs/libxslt |
123 |
dev-util/gperf |
124 |
dev-util/intltool |
125 |
sys-fs/quota |
126 |
>=sys-kernel/linux-headers-${MINKV}" |
127 |
|
128 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
129 |
|
130 |
pkg_setup() { |
131 |
enewgroup lock # used by var-lock.mount |
132 |
enewgroup tty 5 # used by mount-setup for /dev/pts |
133 |
} |
134 |
|
135 |
src_prepare() { |
136 |
# systemd-analyze is for python2.7 only nowadays. |
137 |
sed -i -e '1s/python/&2.7/' src/analyze/systemd-analyze |
138 |
|
139 |
# link against external udev. |
140 |
sed -i -e 's:libudev\.la:-ludev:' Makefile.am |
141 |
|
142 |
local PATCHES=( |
143 |
"${FILESDIR}"/191-0001-Disable-udev-targets-for-udev-190.patch |
144 |
) |
145 |
|
146 |
autotools-utils_src_prepare |
147 |
|
148 |
# XXX: support it within eclass |
149 |
eautomake |
150 |
} |
151 |
|
152 |
src_configure() { |
153 |
local myeconfargs=( |
154 |
--localstatedir=/var |
155 |
--with-distro=gentoo |
156 |
# install everything to /usr |
157 |
--with-rootprefix=/usr |
158 |
--with-rootlibdir=/usr/$(get_libdir) |
159 |
# but pam modules have to lie in /lib* |
160 |
--with-pamlibdir=/$(get_libdir)/security |
161 |
# this avoids dep on pciutils & usbutils |
162 |
--with-pci-ids-path=/usr/share/misc/pci.ids |
163 |
--with-usb-ids-path=/usr/share/misc/usb.ids |
164 |
# make sure we get /bin:/sbin in $PATH |
165 |
--enable-split-usr |
166 |
# udev parts |
167 |
--disable-introspection |
168 |
--disable-gtk-doc |
169 |
--disable-gudev |
170 |
$(use_enable acl) |
171 |
$(use_enable audit) |
172 |
$(use_enable cryptsetup libcryptsetup) |
173 |
$(use_enable gcrypt) |
174 |
$(use_enable http microhttpd) |
175 |
$(use_enable lzma xz) |
176 |
$(use_enable pam) |
177 |
$(use_enable qrcode qrencode) |
178 |
$(use_enable selinux) |
179 |
$(use_enable tcpd tcpwrap) |
180 |
|
181 |
# Disable Python for now. |
182 |
PYTHON=: |
183 |
) |
184 |
|
185 |
autotools-utils_src_configure |
186 |
} |
187 |
|
188 |
src_install() { |
189 |
autotools-utils_src_install \ |
190 |
bashcompletiondir=/tmp |
191 |
|
192 |
# compat for init= use |
193 |
dosym ../usr/lib/systemd/systemd /bin/systemd |
194 |
dosym ../lib/systemd/systemd /usr/bin/systemd |
195 |
# rsyslog.service depends on it... |
196 |
dosym ../usr/bin/systemctl /bin/systemctl |
197 |
|
198 |
# move files as necessary |
199 |
newbashcomp "${D}"/tmp/systemd-bash-completion.sh ${PN} |
200 |
rm -r "${D}"/tmp || die |
201 |
|
202 |
# we just keep sysvinit tools, so no need for the mans |
203 |
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ |
204 |
|| die |
205 |
rm "${D}"/usr/share/man/man1/init.1 || die |
206 |
|
207 |
# Create /run/lock as required by new baselay/OpenRC compat. |
208 |
systemd_dotmpfilesd "${FILESDIR}"/gentoo-run.conf |
209 |
|
210 |
# Add mount-rules for /var/lock and /var/run, bug #433607 |
211 |
systemd_dounit "${FILESDIR}"/var-{lock,run}.mount |
212 |
systemd_enable_service sysinit.target var-lock.mount |
213 |
systemd_enable_service sysinit.target var-run.mount |
214 |
|
215 |
# Check whether we won't break user's system. |
216 |
[[ -x "${D}"/bin/systemd ]] || die '/bin/systemd symlink broken, aborting.' |
217 |
[[ -x "${D}"/usr/bin/systemd ]] || die '/usr/bin/systemd symlink broken, aborting.' |
218 |
} |
219 |
|
220 |
pkg_preinst() { |
221 |
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS |
222 |
~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD |
223 |
~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" |
224 |
kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required" |
225 |
check_extra_config |
226 |
} |
227 |
|
228 |
optfeature() { |
229 |
local i desc=${1} text |
230 |
shift |
231 |
|
232 |
text=" [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}" |
233 |
shift |
234 |
|
235 |
for i; do |
236 |
elog "${text}" |
237 |
text="& [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}" |
238 |
done |
239 |
elog "${text} (${desc})" |
240 |
} |
241 |
|
242 |
pkg_postinst() { |
243 |
mkdir -p "${ROOT}"/run || ewarn "Unable to mkdir /run, this could mean trouble." |
244 |
if [[ ! -L "${ROOT}"/etc/mtab ]]; then |
245 |
ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts." |
246 |
ewarn "It is known to cause users being unable to unmount user mounts. If you don't" |
247 |
ewarn "require that specific feature, please call:" |
248 |
ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" |
249 |
ewarn |
250 |
fi |
251 |
|
252 |
elog "To get additional features, a number of optional runtime dependencies may" |
253 |
elog "be installed:" |
254 |
optfeature 'for systemd-analyze' \ |
255 |
'dev-lang/python:2.7' 'dev-python/dbus-python' |
256 |
optfeature 'for systemd-analyze plotting ability' \ |
257 |
'dev-python/pycairo[svg]' |
258 |
optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \ |
259 |
'sys-apps/systemd-ui' |
260 |
elog |
261 |
|
262 |
ewarn "Please note this is a work-in-progress and many packages in Gentoo" |
263 |
ewarn "do not supply systemd unit files yet. You are testing it on your own" |
264 |
ewarn "responsibility. Please remember than you can pass:" |
265 |
ewarn " init=/sbin/init" |
266 |
ewarn "to your kernel to boot using sysvinit / OpenRC." |
267 |
} |