* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: metadata.xml ChangeLog systemd-28.ebuild
@ 2011-06-06 8:31 Michal Gorny (mgorny)
0 siblings, 0 replies; 3+ messages in thread
From: Michal Gorny (mgorny) @ 2011-06-06 8:31 UTC (permalink / raw
To: gentoo-commits
mgorny 11/06/06 08:31:26
Added: metadata.xml ChangeLog systemd-28.ebuild
Log:
Introduce sys-apps/systemd wrt bug #318365. The ebuild is currently hard-masked for testing.
(Portage version: 2.2.0_alpha37_p23/cvs/Linux x86_64)
Revision Changes Path
1.1 sys-apps/systemd/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?rev=1.1&content-type=text/plain
Index: metadata.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>no-herd</herd>
<maintainer>
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
<use>
<flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
</use>
</pkgmetadata>
1.1 sys-apps/systemd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.1&content-type=text/plain
Index: ChangeLog
===================================================================
# ChangeLog for sys-apps/systemd
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.1 2011/06/06 08:31:26 mgorny Exp $
*systemd-28 (06 Jun 2011)
06 Jun 2011; Michał Górny <mgorny@gentoo.org> +systemd-28.ebuild,
+metadata.xml:
Introduce sys-apps/systemd wrt bug #318365. The ebuild is currently
hard-masked for testing.
1.1 sys-apps/systemd/systemd-28.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-28.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-28.ebuild?rev=1.1&content-type=text/plain
Index: systemd-28.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v 1.1 2011/06/06 08:31:26 mgorny Exp $
EAPI=4
inherit autotools-utils linux-info pam
DESCRIPTION="systemd is a system and service manager for Linux"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="audit gtk pam selinux tcpd"
# XXX: libcryptsetup
COMMON_DEPEND=">=sys-apps/dbus-1.4.8-r1
>=sys-fs/udev-171
>=sys-apps/util-linux-2.19
sys-libs/libcap
audit? ( >=sys-process/audit-2 )
gtk? (
dev-libs/dbus-glib
>=dev-libs/glib-2.26
x11-libs/gtk+:2
>=x11-libs/libnotify-0.7 )
pam? ( virtual/pam )
selinux? ( sys-libs/libselinux )
tcpd? ( sys-apps/tcp-wrappers )"
# Vala-0.10 doesn't work with libnotify 0.7.1
VALASLOT="0.12"
# A little higher than upstream requires
# but I had real trouble with 2.6.37 and systemd.
MINKV="2.6.38"
# dbus, udev versions because of systemd units
# blocker on old packages to avoid collisions with above
# openrc blocker to avoid udev rules starting openrc scripts
RDEPEND="${COMMON_DEPEND}
!!sys-apps/systemd-dbus
!!sys-apps/systemd-udev
!<sys-apps/openrc-0.8.3"
DEPEND="${COMMON_DEPEND}
gtk? ( dev-lang/vala:${VALASLOT} )
>=sys-kernel/linux-headers-${MINKV}"
pkg_pretend() {
local CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
linux-info_pkg_setup
kernel_is -ge ${MINKV//./ } || die "Kernel version at least ${MINKV} required"
}
pkg_setup() {
enewgroup lock # used by var-lock.mount
enewgroup tty 5 # used by mount-setup for /dev/pts
}
src_prepare() {
# Force the rebuild of .vala sources
touch src/*.vala
autotools-utils_src_prepare
}
src_configure() {
local myeconfargs=(
--with-distro=gentoo
--with-rootdir=
--localstatedir=/var
$(use_enable audit)
$(use_enable gtk)
$(use_enable pam)
$(use_enable selinux)
$(use_enable tcpd tcpwrap)
)
if use gtk; then
export VALAC="$(type -p valac-${VALASLOT})"
fi
autotools-utils_src_configure
}
src_install() {
autotools-utils_src_install
dodoc "${D}"/usr/share/doc/systemd/*
rm -rf "${D}"/usr/share/doc/systemd
cd "${D}"/usr/share/man/man8/
for i in halt poweroff reboot runlevel shutdown telinit; do
mv ${i}.8 systemd.${i}.8 || die
done
# Drop the .pc file to avoid automagic depends.
# This a temporary workaround for gx86 packages.
rm -f "${D}"/usr/share/pkgconfig/systemd.pc
keepdir /run
}
check_mtab_is_symlink() {
if test ! -L "${ROOT}"etc/mtab; then
ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
ewarn "To correct that, execute"
ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
fi
}
systemd_machine_id_setup() {
einfo "Setting up /etc/machine-id..."
if ! "${ROOT}"bin/systemd-machine-id-setup; then
ewarn "Setting up /etc/machine-id failed, to fix it please see"
ewarn " http://lists.freedesktop.org/archives/dbus/2011-March/014187.html"
elif test ! -L "${ROOT}"var/lib/dbus/machine-id; then
# This should be fixed in the dbus ebuild, but we warn about it here.
ewarn "${ROOT}var/lib/dbus/machine-id ideally should be a symlink to"
ewarn "${ROOT}etc/machine-id to make it clear that they have the same"
ewarn "content."
fi
}
pkg_postinst() {
check_mtab_is_symlink
systemd_machine_id_setup
# Inform user about extra configuration
elog "You may need to perform some additional configuration for some"
elog "programs to work, see the systemd manpages for loading modules and"
elog "handling tmpfiles:"
elog " $ man modules-load.d"
elog " $ man tmpfiles.d"
elog
ewarn "Please note this is a work-in-progress and many packages in Gentoo"
ewarn "do not supply systemd unit files yet. You are testing it on your own"
ewarn "responsibility. Please remember than you can pass:"
ewarn " init=/sbin/init"
ewarn "to your kernel to boot using sysvinit / OpenRC."
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: metadata.xml ChangeLog systemd-28.ebuild
@ 2011-06-07 14:10 Michal Gorny (mgorny)
0 siblings, 0 replies; 3+ messages in thread
From: Michal Gorny (mgorny) @ 2011-06-07 14:10 UTC (permalink / raw
To: gentoo-commits
mgorny 11/06/07 14:10:44
Modified: metadata.xml ChangeLog systemd-28.ebuild
Log:
Support libcryptsetup, misc fixes.
(Portage version: 2.2.0_alpha37_p23/cvs/Linux x86_64)
Revision Changes Path
1.3 sys-apps/systemd/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?r1=1.2&r2=1.3
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml 6 Jun 2011 11:25:01 -0000 1.2
+++ metadata.xml 7 Jun 2011 14:10:44 -0000 1.3
@@ -11,6 +11,8 @@
<name>Robert Piasek</name>
</maintainer>
<use>
+ <!-- XXX: describe those two better -->
<flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
+ <flag name='cryptsetup'>Use libcryptsetup</flag>
</use>
</pkgmetadata>
1.3 sys-apps/systemd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.2&r2=1.3
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 6 Jun 2011 11:25:01 -0000 1.2
+++ ChangeLog 7 Jun 2011 14:10:44 -0000 1.3
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.2 2011/06/06 11:25:01 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.3 2011/06/07 14:10:44 mgorny Exp $
+
+ 07 Jun 2011; Michał Górny <mgorny@gentoo.org> systemd-28.ebuild,
+ metadata.xml:
+ Support libcryptsetup, misc fixes.
06 Jun 2011; Robert Piasek <dagger@gentoo.org> metadata.xml:
Add dagger to metadata as maintainer
1.2 sys-apps/systemd/systemd-28.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-28.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-28.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-28.ebuild?r1=1.1&r2=1.2
Index: systemd-28.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- systemd-28.ebuild 6 Jun 2011 08:31:26 -0000 1.1
+++ systemd-28.ebuild 7 Jun 2011 14:10:44 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v 1.1 2011/06/06 08:31:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v 1.2 2011/06/07 14:10:44 mgorny Exp $
EAPI=4
@@ -13,15 +13,14 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="audit gtk pam selinux tcpd"
-
-# XXX: libcryptsetup
+IUSE="audit cryptsetup gtk pam selinux tcpd"
COMMON_DEPEND=">=sys-apps/dbus-1.4.8-r1
>=sys-fs/udev-171
>=sys-apps/util-linux-2.19
sys-libs/libcap
audit? ( >=sys-process/audit-2 )
+ cryptsetup? ( sys-fs/cryptsetup )
gtk? (
dev-libs/dbus-glib
>=dev-libs/glib-2.26
@@ -61,7 +60,7 @@
src_prepare() {
# Force the rebuild of .vala sources
- touch src/*.vala
+ touch src/*.vala || die
autotools-utils_src_prepare
}
@@ -71,6 +70,7 @@
--with-rootdir=
--localstatedir=/var
$(use_enable audit)
+ $(use_enable cryptsetup libcryptsetup)
$(use_enable gtk)
$(use_enable pam)
$(use_enable selinux)
@@ -88,7 +88,7 @@
autotools-utils_src_install
dodoc "${D}"/usr/share/doc/systemd/*
- rm -rf "${D}"/usr/share/doc/systemd
+ rm -rf "${D}"/usr/share/doc/systemd || die
cd "${D}"/usr/share/man/man8/
for i in halt poweroff reboot runlevel shutdown telinit; do
@@ -97,13 +97,13 @@
# Drop the .pc file to avoid automagic depends.
# This a temporary workaround for gx86 packages.
- rm -f "${D}"/usr/share/pkgconfig/systemd.pc
+ rm -f "${D}"/usr/share/pkgconfig/systemd.pc || die
keepdir /run
}
check_mtab_is_symlink() {
- if test ! -L "${ROOT}"etc/mtab; then
+ if [[ ! -L "${ROOT}"etc/mtab ]]; then
ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
ewarn "To correct that, execute"
ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
@@ -115,7 +115,7 @@
if ! "${ROOT}"bin/systemd-machine-id-setup; then
ewarn "Setting up /etc/machine-id failed, to fix it please see"
ewarn " http://lists.freedesktop.org/archives/dbus/2011-March/014187.html"
- elif test ! -L "${ROOT}"var/lib/dbus/machine-id; then
+ elif [[ ! -L "${ROOT}"var/lib/dbus/machine-id ]]; then
# This should be fixed in the dbus ebuild, but we warn about it here.
ewarn "${ROOT}var/lib/dbus/machine-id ideally should be a symlink to"
ewarn "${ROOT}etc/machine-id to make it clear that they have the same"
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: metadata.xml ChangeLog systemd-28.ebuild
@ 2011-06-15 13:33 Michal Gorny (mgorny)
0 siblings, 0 replies; 3+ messages in thread
From: Michal Gorny (mgorny) @ 2011-06-15 13:33 UTC (permalink / raw
To: gentoo-commits
mgorny 11/06/15 13:33:05
Modified: metadata.xml ChangeLog systemd-28.ebuild
Log:
Support plymouth as requested by Christoph Brill.
(Portage version: 2.2.0_alpha40_p1/cvs/Linux x86_64)
Revision Changes Path
1.5 sys-apps/systemd/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?r1=1.4&r2=1.5
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml 10 Jun 2011 20:46:05 -0000 1.4
+++ metadata.xml 15 Jun 2011 13:33:05 -0000 1.5
@@ -10,5 +10,6 @@
<!-- XXX: describe those two better -->
<flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
<flag name='cryptsetup'>Use libcryptsetup</flag>
+ <flag name='plymouth'>Enable support for <pkg>sys-boot/plymouth</pkg></flag>
</use>
</pkgmetadata>
1.6 sys-apps/systemd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.5&r2=1.6
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog 10 Jun 2011 20:46:05 -0000 1.5
+++ ChangeLog 15 Jun 2011 13:33:05 -0000 1.6
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.5 2011/06/10 20:46:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.6 2011/06/15 13:33:05 mgorny Exp $
+
+ 15 Jun 2011; Michał Górny <mgorny@gentoo.org> systemd-28.ebuild,
+ metadata.xml:
+ Support plymouth as requested by Christoph Brill.
10 Jun 2011; Michał Górny <mgorny@gentoo.org> metadata.xml:
Switch the maintainer to systemd@g.o alias.
1.4 sys-apps/systemd/systemd-28.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-28.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-28.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-28.ebuild?r1=1.3&r2=1.4
Index: systemd-28.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- systemd-28.ebuild 8 Jun 2011 11:08:41 -0000 1.3
+++ systemd-28.ebuild 15 Jun 2011 13:33:05 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v 1.3 2011/06/08 11:08:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v 1.4 2011/06/15 13:33:05 mgorny Exp $
EAPI=4
@@ -13,7 +13,7 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="audit cryptsetup gtk pam selinux tcpd"
+IUSE="audit cryptsetup gtk pam plymouth selinux tcpd"
COMMON_DEPEND=">=sys-apps/dbus-1.4.10
>=sys-fs/udev-171
@@ -27,6 +27,7 @@
x11-libs/gtk+:2
>=x11-libs/libnotify-0.7 )
pam? ( virtual/pam )
+ plymouth? ( sys-boot/plymouth )
selinux? ( sys-libs/libselinux )
tcpd? ( sys-apps/tcp-wrappers )"
@@ -75,6 +76,10 @@
$(use_enable pam)
$(use_enable selinux)
$(use_enable tcpd tcpwrap)
+
+ # right now it is enabled on per-distro basis
+ # let's just hack into the check
+ $(use plymouth && echo have_plymouth=true)
)
if use gtk; then
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-06-15 13:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-15 13:33 [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: metadata.xml ChangeLog systemd-28.ebuild Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2011-06-07 14:10 Michal Gorny (mgorny)
2011-06-06 8:31 Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox