summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-06-11 17:00:03 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-11 17:07:17 (GMT)
commit73f103bf9b2cdf985464dc53bf4f1cfd71d4531f (patch)
tree577e66f2a5edfaba8c46efcfd2dd3fec1b92a887
parent0a697caca4fa8f7cc932a8d715ea3210ef6b23f5 (diff)
downloadpoky-yocto-1.4.1.tar.gz
systemd: don't install quotaon.service twiceyocto-1.4.1dylan-9.0.1.rc1dylan-9.0.11.4.1.rc1
If the same file is installed twice there's a race which can lead to "make install" failing. Remove the redundant installation of quotaon.service to eliminate the race. (From OE-Core master rev: c6c5c2285e1b6cb3598ccba08aee3dfd090e7129) (From OE-Core rev: 7b8dd3b5547b501e94a6887d3be5c2bbb8845ec8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd/install-quotaon-once.patch32
-rw-r--r--meta/recipes-core/systemd/systemd_199.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/install-quotaon-once.patch b/meta/recipes-core/systemd/systemd/install-quotaon-once.patch
new file mode 100644
index 0000000..10280da
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/install-quotaon-once.patch
@@ -0,0 +1,32 @@
1Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=65659)
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 44b7c4dc877984b5ea3f2c9fa09a93ee16dbe3b2 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Tue, 11 Jun 2013 17:16:37 +0100
7Subject: [PATCH] build-sys: don't install quotaon.service twice
8
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
11results in a race condition where the install process can fail.
12---
13 Makefile.am | 3 ---
14 1 file changed, 3 deletions(-)
15
16diff --git a/Makefile.am b/Makefile.am
17index 28ae7ed..197119e 100644
18--- a/Makefile.am
19+++ b/Makefile.am
20@@ -3229,9 +3229,6 @@ endif
21 EXTRA_DIST += \
22 units/systemd-quotacheck.service.in
23
24-nodist_systemunit_DATA += \
25- units/quotaon.service
26-
27 # ------------------------------------------------------------------------------
28 if ENABLE_RANDOMSEED
29 rootlibexec_PROGRAMS += \
30--
311.7.10.4
32
diff --git a/meta/recipes-core/systemd/systemd_199.bb b/meta/recipes-core/systemd/systemd_199.bb
index 43463c5..1c5e386 100644
--- a/meta/recipes-core/systemd/systemd_199.bb
+++ b/meta/recipes-core/systemd/systemd_199.bb
@@ -23,6 +23,7 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
23 file://modprobe.rules \ 23 file://modprobe.rules \
24 file://var-run.conf \ 24 file://var-run.conf \
25 ${UCLIBCPATCHES} \ 25 ${UCLIBCPATCHES} \
26 file://install-quotaon-once.patch \
26 file://00-create-volatile.conf \ 27 file://00-create-volatile.conf \
27 file://0002-readahead-chunk-on-spinning-media.patch \ 28 file://0002-readahead-chunk-on-spinning-media.patch \
28 file://0003-readahead-cleanups.patch \ 29 file://0003-readahead-cleanups.patch \