public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
* [PATCH] meta: Remove locale.conf hack for newer systemd
@ 2023-06-30 15:14 Anton Mikanovich
  2023-07-06  4:43 ` Uladzimir Bely
  0 siblings, 1 reply; 2+ messages in thread
From: Anton Mikanovich @ 2023-06-30 15:14 UTC (permalink / raw)
  To: isar-users; +Cc: Anton Mikanovich

Starting from systemd 253 /etc/locale.conf creation is already handled
by systemd package itself. So do not create symlink manually.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta/classes/image-locales-extension.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/image-locales-extension.bbclass b/meta/classes/image-locales-extension.bbclass
index b48bcec8..9149d643 100644
--- a/meta/classes/image-locales-extension.bbclass
+++ b/meta/classes/image-locales-extension.bbclass
@@ -90,7 +90,9 @@ __EOF__
                 --show systemd || echo "0" )
 
             if dpkg --compare-versions "$SYSTEMD_VERSION" "ge" "251"; then
-                ln -s /etc/default/locale /etc/locale.conf
+                if dpkg --compare-versions "$SYSTEMD_VERSION" "lt" "253"; then
+                    ln -s /etc/default/locale /etc/locale.conf
+                fi
             fi
 
             echo 'reconfigure locales'
-- 
2.34.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] meta: Remove locale.conf hack for newer systemd
  2023-06-30 15:14 [PATCH] meta: Remove locale.conf hack for newer systemd Anton Mikanovich
@ 2023-07-06  4:43 ` Uladzimir Bely
  0 siblings, 0 replies; 2+ messages in thread
From: Uladzimir Bely @ 2023-07-06  4:43 UTC (permalink / raw)
  To: Anton Mikanovich, isar-users

On Fri, 2023-06-30 at 18:14 +0300, Anton Mikanovich wrote:
> Starting from systemd 253 /etc/locale.conf creation is already
> handled
> by systemd package itself. So do not create symlink manually.
> 
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  meta/classes/image-locales-extension.bbclass | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> 

Applied to next.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-07-06  4:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-30 15:14 [PATCH] meta: Remove locale.conf hack for newer systemd Anton Mikanovich
2023-07-06  4:43 ` Uladzimir Bely

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox