diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-07-29 22:11:19 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-07-29 22:11:19 +0000 |
| commit | 4682b22ea313843e8d8001a5b89f2eb5580c40e6 (patch) | |
| tree | 772a56c1b84748ec005bfe1ddcfdc70201cb8d12 /sys-apps | |
| parent | Block the current revision of live ebuild as well, to ensure a smooth move of... (diff) | |
| download | gentoo-2-4682b22ea313843e8d8001a5b89f2eb5580c40e6.tar.gz gentoo-2-4682b22ea313843e8d8001a5b89f2eb5580c40e6.tar.bz2 gentoo-2-4682b22ea313843e8d8001a5b89f2eb5580c40e6.zip | |
Move the Gentoo-specific files from the live ebuild to gentoo-systemd-integration. Revbump to ensure smooth migration.
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/systemd/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999-r1.ebuild (renamed from sys-apps/systemd/systemd-9999.ebuild) | 13 |
2 files changed, 10 insertions, 12 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index c0625f61881f..9436a8fc84ea 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.150 2013/07/28 19:46:11 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.151 2013/07/29 22:11:19 mgorny Exp $ + +*systemd-9999-r1 (29 Jul 2013) + + 29 Jul 2013; Michał Górny <mgorny@gentoo.org> +systemd-9999-r1.ebuild, + -systemd-9999.ebuild: + Move the Gentoo-specific files from the live ebuild to gentoo-systemd- + integration. Revbump to ensure smooth migration. 28 Jul 2013; Agostino Sarubbo <ago@gentoo.org> systemd-204.ebuild: Stable for arm, wrt bug #477910 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999-r1.ebuild index 4f6367cbdfdb..4c9622bd4876 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.65 2013/07/23 08:25:11 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.1 2013/07/29 22:11:19 mgorny Exp $ EAPI=5 @@ -58,6 +58,7 @@ RDEPEND="${COMMON_DEPEND} >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) + !vanilla? ( sys-apps/gentoo-systemd-integration ) !sys-auth/nss-myhostname !<sys-libs/glibc-2.10 !sys-fs/udev" @@ -233,16 +234,6 @@ src_install() { || 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/50-coredump.conf{,.disabled} || die |