All of lore.kernel.org
 help / color / mirror / Atom feed
* Re: [meta-virtualization] [PATCH v2] lxc: remove deprecated options in lxc*.service
@ 2020-09-28 12:44 Bruce Ashfield
  2020-09-29  2:26 ` [PATCH v3] " Yu, Mingli
  0 siblings, 1 reply; 3+ messages in thread
From: Bruce Ashfield @ 2020-09-28 12:44 UTC (permalink / raw)
  To: Yu, Mingli; +Cc: meta-virtualization

On Mon, Sep 28, 2020 at 1:52 AM Yu, Mingli <mingli.yu@windriver.com> wrote:
>
> Hi Bruce,
>
> On 9/28/20 10:42 AM, Bruce Ashfield wrote:
> > On Wed, Sep 23, 2020 at 9:40 PM Yu, Mingli <mingli.yu@windriver.com> wrote:
> >>
> >> Hi Bruce,
> >>
> >> On 9/23/20 8:40 PM, Bruce Ashfield wrote:
> >>> On Wed, Sep 23, 2020 at 3:54 AM Yu, Mingli <mingli.yu@windriver.com> wrote:
> >>>>
> >>>> From: Mingli Yu <mingli.yu@windriver.com>
> >>>>
> >>>> Remove deprecated options in lxc*.service to silence below warning:
> >>>>    # systemctl status lxc
> >>>>    [snip]
> >>>>    /usr/lib/systemd/system/lxc.service:17: Standard output type syslog is obsolete, automatically updating to journal. Please update your unit file, and consider removing the setting altogether.
> >>>>    /usr/lib/systemd/system/lxc.service:18: Standard output type syslog is obsolete, automatically updating to journal. Please update your unit file, and consider removing the setting altogether.
> >>>
> >>> What's the delta to v1 ?
> >>
> >
> > This should be logged in the temporary section of the patch, that way
> > I can track what is changing through a series.
> >
> > That being said, I went to apply this patch, and it isn't against the
> > lxc version that we have in master.
> >
> > Can you update and resubmit ?
>
> No problem, I can update the patch if need.
>
> But the patch is created against the latest code on master for lxc after
> I checked. I don't quite understand what problem you encounter when
> merge this patch.

In v2, I see:

diff --git a/recipes-containers/lxc/lxc_4.0.2.bb
b/recipes-containers/lxc/lxc_4.0.2.bb
index d0ead81..ead6bb2 100644
--- a/recipes-containers/lxc/lxc_4.0.2.bb
+++ b/recipes-containers/lxc/lxc_4.0.2.bb

Are you not seeing lxc_4.0.4.bb in your master checkout ?

https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/tree/recipes-containers/lxc/lxc_4.0.4.bb

Bruce

>
> Thanks,
>
> >
> > Bruce
> >
> >> The v1 only have one patch
> >>     file://0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch
> >>
> >>
> >> And the v2 have the below two patch files.
> >>    file://0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch
> >>    file://0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch
> >>
> >> Thanks,
> >>
> >>>
> >>> Bruce
> >>>
> >>>>
> >>>> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> >>>> ---
> >>>>    ...setting-regarding-the-Standard-Outpu.patch | 35 +++++++++++++++++++
> >>>>    ...ed-options-in-lxc.service-fixes-3527.patch | 31 ++++++++++++++++
> >>>>    recipes-containers/lxc/lxc_4.0.2.bb           |  2 ++
> >>>>    3 files changed, 68 insertions(+)
> >>>>    create mode 100644 recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch
> >>>>    create mode 100644 recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch
> >>>>
> >>>> diff --git a/recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch b/recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch
> >>>> new file mode 100644
> >>>> index 0000000..ab97422
> >>>> --- /dev/null
> >>>> +++ b/recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch
> >>>> @@ -0,0 +1,35 @@
> >>>> +From a7a92a06a47322dee45664db5c7bfa68b2b95edb Mon Sep 17 00:00:00 2001
> >>>> +From: Mingli Yu <mingli.yu@windriver.com>
> >>>> +Date: Wed, 23 Sep 2020 07:03:02 +0000
> >>>> +Subject: [PATCH] Remove obsolete setting regarding the Standard Output
> >>>> +
> >>>> +The Standard output type "syslog" is obsolete, causing a warning since systemd
> >>>> +version 246 [1].
> >>>> +
> >>>> +Please consider using "journal" or "journal+console"
> >>>> +
> >>>> +[1] https://github.com/systemd/systemd/blob/master/NEWS#L202
> >>>> +
> >>>> +Upstream-Status: Submitted [https://github.com/lxc/lxc/pull/3541]
> >>>> +
> >>>> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> >>>> +---
> >>>> + config/init/systemd/lxc@.service.in         | 2 --
> >>>> + 1 files changed, 2 deletions(-)
> >>>> +
> >>>> +diff --git a/config/init/systemd/lxc@.service.in b/config/init/systemd/lxc@.service.in
> >>>> +index a2aa2211f..21ce64aef 100644
> >>>> +--- a/config/init/systemd/lxc@.service.in
> >>>> ++++ b/config/init/systemd/lxc@.service.in
> >>>> +@@ -14,8 +14,6 @@ ExecStop=@BINDIR@/lxc-stop -n %i
> >>>> + # Environment=BOOTUP=serial
> >>>> + # Environment=CONSOLETYPE=serial
> >>>> + Delegate=yes
> >>>> +-StandardOutput=syslog
> >>>> +-StandardError=syslog
> >>>> +
> >>>> + [Install]
> >>>> + WantedBy=multi-user.target
> >>>> +--
> >>>> +2.26.2
> >>>> +
> >>>> diff --git a/recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch b/recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch
> >>>> new file mode 100644
> >>>> index 0000000..2957680
> >>>> --- /dev/null
> >>>> +++ b/recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch
> >>>> @@ -0,0 +1,31 @@
> >>>> +From 0c4cd88d4a19d27ba9b5d2c8fa4d482d78211c35 Mon Sep 17 00:00:00 2001
> >>>> +From: graysky <graysky@archlinux.us>
> >>>> +Date: Fri, 21 Aug 2020 06:33:49 -0400
> >>>> +Subject: [PATCH] remove deprecated options in lxc.service fixes #3527
> >>>> +
> >>>> +Remove deprecated options in lxc.service fixes #3527
> >>>> +
> >>>> +Upstream-Status: Backport
> >>>> +
> >>>> +Signed-off-by: graysky <graysky@archlinux.us>
> >>>> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> >>>> +---
> >>>> + config/init/systemd/lxc.service.in | 2 --
> >>>> + 1 file changed, 2 deletions(-)
> >>>> +
> >>>> +diff --git a/config/init/systemd/lxc.service.in b/config/init/systemd/lxc.service.in
> >>>> +index e3745dc2d..397a6c4d0 100644
> >>>> +--- a/config/init/systemd/lxc.service.in
> >>>> ++++ b/config/init/systemd/lxc.service.in
> >>>> +@@ -14,8 +14,6 @@ ExecReload=@LIBEXECDIR@/lxc/lxc-apparmor-load
> >>>> + # Environment=BOOTUP=serial
> >>>> + # Environment=CONSOLETYPE=serial
> >>>> + Delegate=yes
> >>>> +-StandardOutput=syslog
> >>>> +-StandardError=syslog
> >>>> +
> >>>> + [Install]
> >>>> + WantedBy=multi-user.target
> >>>> +--
> >>>> +2.26.2
> >>>> +
> >>>> diff --git a/recipes-containers/lxc/lxc_4.0.2.bb b/recipes-containers/lxc/lxc_4.0.2.bb
> >>>> index d0ead81..ead6bb2 100644
> >>>> --- a/recipes-containers/lxc/lxc_4.0.2.bb
> >>>> +++ b/recipes-containers/lxc/lxc_4.0.2.bb
> >>>> @@ -47,6 +47,8 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \
> >>>>           file://templates-use-curl-instead-of-wget.patch \
> >>>>           file://tests-our-init-is-not-busybox.patch \
> >>>>           file://tests-add-no-validate-when-using-download-template.patch \
> >>>> +       file://0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch \
> >>>> +       file://0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch \
> >>>>           file://dnsmasq.conf \
> >>>>           file://lxc-net \
> >>>>           "
> >>>> --
> >>>> 2.26.2
> >>>>
> >>>>
> >>>> 
> >>>>
> >>>
> >>>
> >
> >
> >



-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-02  3:08 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1638DCB9C95B4ECB.17423@lists.yoctoproject.org>
2020-09-29  2:06 ` [PATCH v3] lxc: remove deprecated options in lxc*.service Yu, Mingli
2020-10-02  3:08   ` Bruce Ashfield
2020-09-28 12:44 [meta-virtualization] [PATCH v2] " Bruce Ashfield
2020-09-29  2:26 ` [PATCH v3] " Yu, Mingli

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.