* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-196.ebuild ChangeLog
@ 2012-12-02 10:58 Michal Gorny (mgorny)
0 siblings, 0 replies; 2+ messages in thread
From: Michal Gorny (mgorny) @ 2012-12-02 10:58 UTC (permalink / raw
To: gentoo-commits
mgorny 12/12/02 10:58:37
Modified: ChangeLog
Added: systemd-196.ebuild
Log:
Version bump. Enable Python support. Drop old patches.
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)
Revision Changes Path
1.61 sys-apps/systemd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.60&r2=1.61
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ChangeLog 1 Dec 2012 15:26:35 -0000 1.60
+++ ChangeLog 2 Dec 2012 10:58:37 -0000 1.61
@@ -1,6 +1,21 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.60 2012/12/01 15:26:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.61 2012/12/02 10:58:37 mgorny Exp $
+
+*systemd-196 (02 Dec 2012)
+
+ 02 Dec 2012; Michał Górny <mgorny@gentoo.org>
+ +files/196-0001-Disable-udev-targets.patch, +systemd-196.ebuild,
+ -files/0001-Disable-udev-targets-for-udev-189.patch,
+ -files/0002-journald-add-missing-includes.patch,
+ -files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch,
+ -files/0004-journal-don-t-try-to-compress-without-XZ.patch,
+ -files/191-0002-journal-bring-mmap-cache-prototype-in-sync.patch,
+ -files/191-0003-log-fix-repeated-invocation-of-vsnprintf-vaprintf-in.patch,
+ -files/update-etc-systemd-symlinks.path,
+ -files/update-etc-systemd-symlinks.service,
+ -files/update-etc-systemd-symlinks.sh:
+ Version bump. Enable Python support. Drop old patches.
01 Dec 2012; Michał Górny <mgorny@gentoo.org> -systemd-189-r3.ebuild,
-systemd-191-r1.ebuild, -systemd-192.ebuild, -systemd-193.ebuild,
1.1 sys-apps/systemd/systemd-196.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-196.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-196.ebuild?rev=1.1&content-type=text/plain
Index: systemd-196.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-196.ebuild,v 1.1 2012/12/02 10:58:37 mgorny Exp $
EAPI=4
PYTHON_COMPAT=( python2_7 )
inherit autotools-utils bash-completion-r1 linux-info pam \
python-single-r1 systemd user
DESCRIPTION="System and service manager for Linux"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1 MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="acl audit cryptsetup gcrypt http lzma pam python qrcode selinux
tcpd vanilla xattr"
MINKV="2.6.39"
COMMON_DEPEND=">=sys-apps/dbus-1.4.10
>=sys-apps/kmod-5
>=sys-apps/util-linux-2.20
~sys-fs/udev-${PV}
sys-libs/libcap
acl? ( sys-apps/acl )
audit? ( >=sys-process/audit-2 )
cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 )
gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
http? ( net-libs/libmicrohttpd )
lzma? ( app-arch/xz-utils )
pam? ( virtual/pam )
python? ( ${PYTHON_DEPS} )
qrcode? ( media-gfx/qrencode )
selinux? ( sys-libs/libselinux )
tcpd? ( sys-apps/tcp-wrappers )
xattr? ( sys-apps/attr )"
RDEPEND="${COMMON_DEPEND}
sys-apps/hwids
|| (
>=sys-apps/util-linux-2.22
<sys-apps/sysvinit-2.88-r4
)
!<sys-libs/glibc-2.10
!~sys-fs/udev-187"
# sys-fs/quota is necessary to store correct paths in unit files
DEPEND="${COMMON_DEPEND}
app-arch/xz-utils
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
dev-util/gperf
dev-util/intltool
sys-fs/quota
>=sys-kernel/linux-headers-${MINKV}"
AUTOTOOLS_IN_SOURCE_BUILD=1
pkg_setup() {
enewgroup lock # used by var-lock.mount
enewgroup tty 5 # used by mount-setup for /dev/pts
use python && python-single-r1_pkg_setup
}
src_prepare() {
# systemd-analyze is for python2.7 only nowadays.
sed -i -e '1s/python/&2.7/' src/analyze/systemd-analyze
# link against external udev.
sed -i -e 's:libudev\.la:-ludev:' Makefile.am
local PATCHES=(
"${FILESDIR}"/196-0001-Disable-udev-targets.patch
)
autotools-utils_src_prepare
# XXX: support it within eclass
eautomake
}
src_configure() {
local myeconfargs=(
--localstatedir=/var
--with-distro=$(use vanilla && echo other || echo gentoo)
# install everything to /usr
--with-rootprefix=/usr
--with-rootlibdir=/usr/$(get_libdir)
# but pam modules have to lie in /lib*
--with-pamlibdir=/$(get_libdir)/security
# make sure we get /bin:/sbin in $PATH
--enable-split-usr
# udev parts
--disable-introspection
--disable-gtk-doc
--disable-gudev
$(use_enable acl)
$(use_enable audit)
$(use_enable cryptsetup libcryptsetup)
$(use_enable gcrypt)
$(use_enable http microhttpd)
$(use_enable lzma xz)
$(use_enable pam)
$(use_with python)
$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
$(use_enable qrcode qrencode)
$(use_enable selinux)
$(use_enable tcpd tcpwrap)
$(use_enable xattr)
)
autotools-utils_src_configure
}
src_install() {
autotools-utils_src_install \
bashcompletiondir=/tmp
# remove pam.d plugin .la-file
prune_libtool_files --modules
# compat for init= use
dosym ../usr/lib/systemd/systemd /bin/systemd
dosym ../lib/systemd/systemd /usr/bin/systemd
# rsyslog.service depends on it...
dosym ../usr/bin/systemctl /bin/systemctl
# move files as necessary
newbashcomp "${D}"/tmp/systemd-bash-completion.sh ${PN}
rm -r "${D}"/tmp || die
# we just keep sysvinit tools, so no need for the mans
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
|| die
rm "${D}"/usr/share/man/man1/init.1 || die
if ! use vanilla; then
# Create /run/lock as required by new baselay/OpenRC compat.
systemd_dotmpfilesd "${FILESDIR}"/gentoo-run.conf
# Add mount-rules for /var/lock and /var/run, bug #433607
systemd_dounit "${FILESDIR}"/var-{lock,run}.mount
systemd_enable_service sysinit.target var-lock.mount
systemd_enable_service sysinit.target var-run.mount
fi
# Disable storing coredumps in journald, bug #433457
mv "${D}"/usr/lib/sysctl.d/coredump.conf \
"${D}"/etc/sysctl.d/coredump.conf.disabled || die
# Preserve empty dirs in /etc & /var, bug #437008
keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
# Check whether we won't break user's system.
[[ -x "${D}"/bin/systemd ]] || die '/bin/systemd symlink broken, aborting.'
[[ -x "${D}"/usr/bin/systemd ]] || die '/usr/bin/systemd symlink broken, aborting.'
}
pkg_preinst() {
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS
~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD
~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required"
check_extra_config
}
optfeature() {
local i desc=${1} text
shift
text=" [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
shift
for i; do
elog "${text}"
text="& [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
done
elog "${text} (${desc})"
}
pkg_postinst() {
mkdir -p "${ROOT}"/run || ewarn "Unable to mkdir /run, this could mean trouble."
if [[ ! -L "${ROOT}"/etc/mtab ]]; then
ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts."
ewarn "It is known to cause users being unable to unmount user mounts. If you don't"
ewarn "require that specific feature, please call:"
ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
ewarn
fi
elog "To get additional features, a number of optional runtime dependencies may"
elog "be installed:"
optfeature 'for systemd-analyze' \
'dev-lang/python:2.7' 'dev-python/dbus-python'
optfeature 'for systemd-analyze plotting ability' \
'dev-python/pycairo[svg]'
optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \
'sys-apps/systemd-ui'
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] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-196.ebuild ChangeLog
@ 2012-12-04 16:55 Michal Gorny (mgorny)
0 siblings, 0 replies; 2+ messages in thread
From: Michal Gorny (mgorny) @ 2012-12-04 16:55 UTC (permalink / raw
To: gentoo-commits
mgorny 12/12/04 16:55:11
Modified: systemd-196.ebuild ChangeLog
Log:
Do not require libgcrypt macros when gcrypt is disabled, bug #445920.
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)
Revision Changes Path
1.2 sys-apps/systemd/systemd-196.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-196.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-196.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-196.ebuild?r1=1.1&r2=1.2
Index: systemd-196.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-196.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- systemd-196.ebuild 2 Dec 2012 10:58:37 -0000 1.1
+++ systemd-196.ebuild 4 Dec 2012 16:55:11 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-196.ebuild,v 1.1 2012/12/02 10:58:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-196.ebuild,v 1.2 2012/12/04 16:55:11 mgorny Exp $
EAPI=4
@@ -75,6 +75,7 @@
local PATCHES=(
"${FILESDIR}"/196-0001-Disable-udev-targets.patch
+ "${FILESDIR}"/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch
)
autotools-utils_src_prepare
1.62 sys-apps/systemd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.61&r2=1.62
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ChangeLog 2 Dec 2012 10:58:37 -0000 1.61
+++ ChangeLog 4 Dec 2012 16:55:11 -0000 1.62
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.61 2012/12/02 10:58:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.62 2012/12/04 16:55:11 mgorny Exp $
+
+ 04 Dec 2012; Michał Górny <mgorny@gentoo.org>
+ +files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch,
+ systemd-196.ebuild:
+ Do not require libgcrypt macros when gcrypt is disabled, bug #445920.
*systemd-196 (02 Dec 2012)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-04 16:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-02 10:58 [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-196.ebuild ChangeLog Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2012-12-04 16:55 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