summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2011-12-12 08:17:37 +0000
committerMichał Górny <mgorny@gentoo.org>2011-12-12 08:17:37 +0000
commitbd1c05b617938a8e2a04d7e8f7185c836a8b4484 (patch)
treecc7f6775ab8efa5d8b4b1cc446bd3e0cb80c1e05 /sys-apps
parentFix manifest bug #394391 (diff)
downloadgentoo-2-bd1c05b617938a8e2a04d7e8f7185c836a8b4484.tar.gz
gentoo-2-bd1c05b617938a8e2a04d7e8f7185c836a8b4484.tar.bz2
gentoo-2-bd1c05b617938a8e2a04d7e8f7185c836a8b4484.zip
Create /run/lock as enforced by new OpenRC.
(Portage version: 2.2.0_alpha79_p31/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd/ChangeLog10
-rw-r--r--sys-apps/systemd/files/gentoo-run.conf5
-rw-r--r--sys-apps/systemd/systemd-29-r3.ebuild (renamed from sys-apps/systemd/systemd-29-r2.ebuild)6
-rw-r--r--sys-apps/systemd/systemd-37-r1.ebuild (renamed from sys-apps/systemd/systemd-37.ebuild)6
4 files changed, 24 insertions, 3 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 49b72f6b41fe..859dc2aafe79 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,14 @@
# 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.15 2011/11/06 15:19:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.16 2011/12/12 08:17:37 mgorny Exp $
+
+*systemd-37-r1 (12 Dec 2011)
+*systemd-29-r3 (12 Dec 2011)
+
+ 12 Dec 2011; Michał Górny <mgorny@gentoo.org> -systemd-29-r2.ebuild,
+ +systemd-29-r3.ebuild, -systemd-37.ebuild, +systemd-37-r1.ebuild,
+ +files/gentoo-run.conf:
+ Create /run/lock as enforced by new OpenRC.
06 Nov 2011; Michał Górny <mgorny@gentoo.org> systemd-37.ebuild:
Re-introduce keywords to the systemd ebuild as package.mask entry was
diff --git a/sys-apps/systemd/files/gentoo-run.conf b/sys-apps/systemd/files/gentoo-run.conf
new file mode 100644
index 000000000000..5b3bcab8f338
--- /dev/null
+++ b/sys-apps/systemd/files/gentoo-run.conf
@@ -0,0 +1,5 @@
+# New OpenRC versions replace /var/lock with a symlink to /run/lock.
+# We just create that directory for now, just in case.
+# Of course, it's not guaranteed that'll satisfy all relevant packages.
+
+d /run/lock 0755 root root -
diff --git a/sys-apps/systemd/systemd-29-r2.ebuild b/sys-apps/systemd/systemd-29-r3.ebuild
index c797c3cac5db..3cb1a89cb052 100644
--- a/sys-apps/systemd/systemd-29-r2.ebuild
+++ b/sys-apps/systemd/systemd-29-r3.ebuild
@@ -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-29-r2.ebuild,v 1.1 2011/08/15 07:48:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-29-r3.ebuild,v 1.1 2011/12/12 08:17:37 mgorny Exp $
EAPI=4
@@ -97,6 +97,10 @@ src_install() {
done
keepdir /run
+
+ # Create /run/lock as required by new baselay/OpenRC compat.
+ insinto /usr/lib/tmpfiles.d
+ doins "${FILESDIR}"/gentoo-run.conf
}
pkg_preinst() {
diff --git a/sys-apps/systemd/systemd-37.ebuild b/sys-apps/systemd/systemd-37-r1.ebuild
index c12f5c62627f..c1df28dc5cab 100644
--- a/sys-apps/systemd/systemd-37.ebuild
+++ b/sys-apps/systemd/systemd-37-r1.ebuild
@@ -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-37.ebuild,v 1.2 2011/11/06 15:19:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-37-r1.ebuild,v 1.1 2011/12/12 08:17:37 mgorny Exp $
EAPI=4
@@ -99,6 +99,10 @@ src_install() {
done
keepdir /run
+
+ # Create /run/lock as required by new baselay/OpenRC compat.
+ insinto /usr/lib/tmpfiles.d
+ doins "${FILESDIR}"/gentoo-run.conf
}
pkg_preinst() {