diff mbox series

shadow-native: Change upstream status of disable_syslog.patch

Message ID 20260507102353.43585-1-frezidok1@gmail.com
State Changes Requested
Headers show
Series shadow-native: Change upstream status of disable_syslog.patch | expand

Commit Message

Dmitry Sakhonchik May 7, 2026, 10:23 a.m. UTC
From: Dmitry Sakhonchik <frezidok1@gmail.com>

Upstream has accepted configure option and merged it into their master branch.

https://github.com/shadow-maint/shadow/pull/1618

After they release v4.20 we can remove the patch and rewrite recipe with the configure option.

Fixes [YOCTO #15785]

Signed-off-by: Dmitry Sakhonchik <frezidok1@gmail.com>
---
 meta/recipes-extended/shadow/files/disable_syslog.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Alexander Kanavin May 7, 2026, 11:18 a.m. UTC | #1
On Thu, 7 May 2026 at 12:24, frezidok1 via lists.openembedded.org
<frezidok1=gmail.com@lists.openembedded.org> wrote:
> After they release v4.20 we can remove the patch and rewrite recipe with the configure option.

We don't need to wait for 4.20 to do that. You can replace the patch
below with a backport of what was accepted, and then tweak the recipe
to use the newly added option.

> -Upstream-Status: Inappropriate [Would upstream accept a configure option?]
> +Upstream-Status: Submitted [Merged to upstream's master, waiting for release]

Also this change isn't accurate: the patch that was submitted and
merged is not the same as this one. If this patch is kept, then the
accurate status would be:

Inappropriate [upstream has accepted a better patch at $link]

Alex
Dmitry Sakhonchik May 7, 2026, 11:47 a.m. UTC | #2
> You can replace the patch below with a backport of what was accepted

No, I can't do that because the current shadow's master and v4.19.4 (last
release) are quite different. I cannot simply cherry-pick my commit and
apply it as a patch, the only way to backport is to manually completely
recreate these changes for v4.19.4. I have already discussed this topic
with Randy (randy.macleod@windriver.com), and he advised me that waiting
for a stable release (they are promising late June 2026) is better than
doing this complex backport.

Though, if required, I don't mind creating a different patch special for
v4.19.4 so we can use the new configure option ASAP. But since the shadow
recipe will have to be rewritten anyway after v4.20 release, should I? I
don't really know what would be better, so I appreciate any opinion.

чт, 7 мая 2026 г. в 14:18, Alexander Kanavin <alex.kanavin@gmail.com>:

> On Thu, 7 May 2026 at 12:24, frezidok1 via lists.openembedded.org
> <frezidok1=gmail.com@lists.openembedded.org> wrote:
> > After they release v4.20 we can remove the patch and rewrite recipe with
> the configure option.
>
> We don't need to wait for 4.20 to do that. You can replace the patch
> below with a backport of what was accepted, and then tweak the recipe
> to use the newly added option.
>
> > -Upstream-Status: Inappropriate [Would upstream accept a configure
> option?]
> > +Upstream-Status: Submitted [Merged to upstream's master, waiting for
> release]
>
> Also this change isn't accurate: the patch that was submitted and
> merged is not the same as this one. If this patch is kept, then the
> accurate status would be:
>
> Inappropriate [upstream has accepted a better patch at $link]
>
> Alex
>
Alexander Kanavin May 7, 2026, 12:02 p.m. UTC | #3
On Thu, 7 May 2026 at 13:47, Dmitry Sakhonchik <frezidok1@gmail.com> wrote:
> No, I can't do that because the current shadow's master and v4.19.4 (last release) are quite different. I cannot simply cherry-pick my commit and apply it as a patch, the only way to backport is to manually completely recreate these changes for v4.19.4. I have already discussed this topic with Randy (randy.macleod@windriver.com), and he advised me that waiting for a stable release (they are promising late June 2026) is better than doing this complex backport.

This is fine too. Then you just need to update the upstream status of
the existing patch as suggested.

Alex
diff mbox series

Patch

diff --git a/meta/recipes-extended/shadow/files/disable_syslog.patch b/meta/recipes-extended/shadow/files/disable_syslog.patch
index 7299a8e61c..7afe0654ae 100644
--- a/meta/recipes-extended/shadow/files/disable_syslog.patch
+++ b/meta/recipes-extended/shadow/files/disable_syslog.patch
@@ -2,8 +2,9 @@  When building images using shadow-native, we shouldn't be spamming the host's
 log with lots of syslog messages which aren't relavent. Disable syslog use
 in the native case.
 
-Upstream-Status: Inappropriate [Would upstream accept a configure option?]
+Upstream-Status: Submitted [Merged to upstream's master, waiting for release]
 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+Signed-off-by: Dmitry Sakhonchik <frezidok1@gmail.com>
 
 Index: shadow-4.17.2/lib/defines.h
 ===================================================================