diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-06-14 12:23:46 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-14 12:38:54 +0100 |
| commit | cdad18589d08fdf592a50685f3b5fed32f4f4c76 (patch) | |
| tree | d095f169e7f1cdce06ce6e70b978acbdbc6b3ad9 /meta/recipes-core/systemd | |
| parent | 1aeecaeee9bb1eee779973fce7f15cc7fad269a0 (diff) | |
| download | openembedded-core-contrib-cdad18589d08fdf592a50685f3b5fed32f4f4c76.tar.gz | |
systemd: update install-quotaon-once.patch
This patch has been merged upstream now, so refresh the patch with a backport
(the patch was changed before being merged).
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
| -rw-r--r-- | meta/recipes-core/systemd/systemd/install-quotaon-once.patch | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/meta/recipes-core/systemd/systemd/install-quotaon-once.patch b/meta/recipes-core/systemd/systemd/install-quotaon-once.patch index 10280dae43..6b7cf2f9b5 100644 --- a/meta/recipes-core/systemd/systemd/install-quotaon-once.patch +++ b/meta/recipes-core/systemd/systemd/install-quotaon-once.patch @@ -1,7 +1,7 @@ -Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=65659) +Upstream-Status: Backport Signed-off-by: Ross Burton <ross.burton@intel.com> -From 44b7c4dc877984b5ea3f2c9fa09a93ee16dbe3b2 Mon Sep 17 00:00:00 2001 +From 622004565eca385c685086cd478aa79afe73b785 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Tue, 11 Jun 2013 17:16:37 +0100 Subject: [PATCH] build-sys: don't install quotaon.service twice @@ -9,24 +9,26 @@ Subject: [PATCH] build-sys: don't install quotaon.service twice quotaon.service is already installed through dist_systemunit_DATA, so it doesn't need to be added to nodist_systemunit_DATA. Installing the same file twice results in a race condition where the install process can fail. + +https://bugs.freedesktop.org/show_bug.cgi?id=65659 + +[zj: actually remove quotaon.service from the other list.] --- - Makefile.am | 3 --- - 1 file changed, 3 deletions(-) + Makefile.am | 1 - + 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 28ae7ed..197119e 100644 +index 3a196a6..d444eac 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -3229,9 +3229,6 @@ endif - EXTRA_DIST += \ - units/systemd-quotacheck.service.in - --nodist_systemunit_DATA += \ -- units/quotaon.service -- - # ------------------------------------------------------------------------------ - if ENABLE_RANDOMSEED - rootlibexec_PROGRAMS += \ +@@ -401,7 +401,6 @@ dist_systemunit_DATA = \ + units/bluetooth.target \ + units/smartcard.target \ + units/systemd-tmpfiles-clean.timer \ +- units/quotaon.service \ + units/systemd-ask-password-wall.path \ + units/systemd-ask-password-console.path \ + units/systemd-udevd-control.socket \ -- 1.7.10.4 |