summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-06-14 12:23:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-14 12:44:33 +0100
commit23fd4d2a0991f862eb35531d996d27fdbc45e00b (patch)
tree0968ca5342ba19523c7ed9690eb312b1dceded1e /meta/recipes-core
parent04af378874f38d1200bea2fa191beeae94232d6e (diff)
downloadpoky-23fd4d2a0991f862eb35531d996d27fdbc45e00b.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). (From OE-Core rev: cdad18589d08fdf592a50685f3b5fed32f4f4c76) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd/install-quotaon-once.patch32
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 @@
1Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=65659) 1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com> 2Signed-off-by: Ross Burton <ross.burton@intel.com>
3 3
4From 44b7c4dc877984b5ea3f2c9fa09a93ee16dbe3b2 Mon Sep 17 00:00:00 2001 4From 622004565eca385c685086cd478aa79afe73b785 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com> 5From: Ross Burton <ross.burton@intel.com>
6Date: Tue, 11 Jun 2013 17:16:37 +0100 6Date: Tue, 11 Jun 2013 17:16:37 +0100
7Subject: [PATCH] build-sys: don't install quotaon.service twice 7Subject: [PATCH] build-sys: don't install quotaon.service twice
@@ -9,24 +9,26 @@ Subject: [PATCH] build-sys: don't install quotaon.service twice
9quotaon.service is already installed through dist_systemunit_DATA, so it doesn't 9quotaon.service is already installed through dist_systemunit_DATA, so it doesn't
10need to be added to nodist_systemunit_DATA. Installing the same file twice 10need to be added to nodist_systemunit_DATA. Installing the same file twice
11results in a race condition where the install process can fail. 11results in a race condition where the install process can fail.
12
13https://bugs.freedesktop.org/show_bug.cgi?id=65659
14
15[zj: actually remove quotaon.service from the other list.]
12--- 16---
13 Makefile.am | 3 --- 17 Makefile.am | 1 -
14 1 file changed, 3 deletions(-) 18 1 file changed, 1 deletion(-)
15 19
16diff --git a/Makefile.am b/Makefile.am 20diff --git a/Makefile.am b/Makefile.am
17index 28ae7ed..197119e 100644 21index 3a196a6..d444eac 100644
18--- a/Makefile.am 22--- a/Makefile.am
19+++ b/Makefile.am 23+++ b/Makefile.am
20@@ -3229,9 +3229,6 @@ endif 24@@ -401,7 +401,6 @@ dist_systemunit_DATA = \
21 EXTRA_DIST += \ 25 units/bluetooth.target \
22 units/systemd-quotacheck.service.in 26 units/smartcard.target \
23 27 units/systemd-tmpfiles-clean.timer \
24-nodist_systemunit_DATA += \ 28- units/quotaon.service \
25- units/quotaon.service 29 units/systemd-ask-password-wall.path \
26- 30 units/systemd-ask-password-console.path \
27 # ------------------------------------------------------------------------------ 31 units/systemd-udevd-control.socket \
28 if ENABLE_RANDOMSEED
29 rootlibexec_PROGRAMS += \
30-- 32--
311.7.10.4 331.7.10.4
32 34