From: Saul Wold <sgw@linux.intel.com>
To: Ross Burton <ross.burton@intel.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH] systemd: update install-quotaon-once.patch
Date: Thu, 13 Jun 2013 09:09:06 -0700 [thread overview]
Message-ID: <51B9EEA2.1080205@linux.intel.com> (raw)
In-Reply-To: <1371029353-31833-1-git-send-email-ross.burton@intel.com>
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
>
>
next prev parent reply other threads:[~2013-06-13 16:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-12 9:29 [PATCH] systemd: update install-quotaon-once.patch Ross Burton
2013-06-13 16:09 ` Saul Wold [this message]
2013-06-14 11:30 ` Burton, Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51B9EEA2.1080205@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=ross.burton@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox