Patchwork systemd: update install-quotaon-once.patch

login
register
mail settings
Submitter Ross Burton
Date June 12, 2013, 9:29 a.m.
Message ID <1371029353-31833-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/51581/
State New
Headers show

Comments

Ross Burton - June 12, 2013, 9:29 a.m.
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>
---
 .../systemd/systemd/install-quotaon-once.patch     |   32 +++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)
Saul Wold - June 13, 2013, 4:09 p.m.
On 06/12/2013 02:29 AM, Ross Burton wrote:
> 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>
> ---
>   .../systemd/systemd/install-quotaon-once.patch     |   32 +++++++++++---------
>   1 file changed, 17 insertions(+), 15 deletions(-)
>
This seems to not being applied correctly

http://autobuilder.yoctoproject.org:8011/builders/nightly-qa-systemd/builds/47/steps/Building%20Images_1/logs/stdio


Sau!

> diff --git a/meta/recipes-core/systemd/systemd/install-quotaon-once.patch b/meta/recipes-core/systemd/systemd/install-quotaon-once.patch
> index 10280da..098a5f8 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 28ae7ed..3219762 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 += \
> +@@ -389,7 +389,6 @@ dist_systemunit_DATA = \
> + 	units/sound.target \
> + 	units/bluetooth.target \
> + 	units/smartcard.target \
> +-	units/quotaon.service \
> + 	units/systemd-ask-password-wall.path \
> + 	units/systemd-ask-password-console.path \
> + 	units/systemd-udevd-control.socket \
>   --
>   1.7.10.4
>
>
Ross Burton - June 14, 2013, 11:30 a.m.
On 13 June 2013 17:09, Saul Wold <sgw@linux.intel.com> wrote:
> This seems to not being applied correctly

I failed to backport to the release branch, stupid mistake.  V2 sent.

Ross

Patch

diff --git a/meta/recipes-core/systemd/systemd/install-quotaon-once.patch b/meta/recipes-core/systemd/systemd/install-quotaon-once.patch
index 10280da..098a5f8 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 28ae7ed..3219762 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 += \
+@@ -389,7 +389,6 @@ dist_systemunit_DATA = \
+ 	units/sound.target \
+ 	units/bluetooth.target \
+ 	units/smartcard.target \
+-	units/quotaon.service \
+ 	units/systemd-ask-password-wall.path \
+ 	units/systemd-ask-password-console.path \
+ 	units/systemd-udevd-control.socket \
 -- 
 1.7.10.4