From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7250497747957055488 X-Received: by 2002:a1c:740e:0:b0:3f7:3651:450c with SMTP id p14-20020a1c740e000000b003f73651450cmr2211320wmc.6.1688138057459; Fri, 30 Jun 2023 08:14:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c23:b0:3fb:422d:4ff8 with SMTP id j35-20020a05600c1c2300b003fb422d4ff8ls948016wms.1.-pod-prod-02-eu; Fri, 30 Jun 2023 08:14:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4zWhEPHCUYs4wVhK0tLA6IPgY2K7CQvJKY5nVgPEf/EGT6Y0iQilLpOxz/4kccDys2QnkH X-Received: by 2002:a05:600c:241:b0:3f8:fc96:6bfd with SMTP id 1-20020a05600c024100b003f8fc966bfdmr2125763wmj.17.1688138056100; Fri, 30 Jun 2023 08:14:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688138056; cv=none; d=google.com; s=arc-20160816; b=Uy8DF60hzUbBICcQlHp608FnXRK4QOldss0NAHrLUdEtdJdxWpsL2TWwHyhYI0k+FE NvgtWb/I6u5WvNcxMpZigRSiieVv4csRMIXShANjdah9VOrwH41q7mSijkYt+e0HSLmh c3gX1xOAWhqlpHMiVRQNT3zniRIayCQvPYm1rmHN5n/YjXZGJGJ9tRMJpbTRtGvEpL9+ MleHkH3wSxWJB9ogrf2YAfAcqAIqINL46z9dxF9HMNGcgkL4Yf0RgXXWvvygQ1ulthSP aa6QpwK0FTpyGwJCOZSu6YM3MGQ8ADLE6NhhNlhHJ8sNA16DBuQ3JlVRh6vsG3uksZlM 1DWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=PEh3c4NVq9jz2b73+MkthvW8HSDevZv7tobm6J87KP4=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=nCBuDd1yjFcTjodQn/cFwPT+vBpUtzRDpfPeAtUz3LAfwlCYyAVleTgynAxv4N/6Ts uCeiNNXbaEwAVriRRL0ykMRWu5h+n8oylHSdroE7W51p1ZCfoAxWhsIRr4pL1Lzp4xJR 6fpQ1zYgYM/1FOrcisDUod6ajwvS4yWJ9xoxABBxGUPlepQ4Ah8SRnzZmxEWaBuN19SU d2Xbu4aFrgPRq5SdV/u3TIvovKv85JuboOMCjir6rQtu9O3TA//BISYVzRf3CWmhZL3h 0Zf5o2U9S0v1AHCkysPUUqv1O1uK9g7D97qa+sAHuj2F+QFc4RaQCygkNB07ORBrM4JY YJQw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id g12-20020a05600c4ecc00b003f733c1f39esi969837wmq.0.2023.06.30.08.14.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jun 2023 08:14:16 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (r154-240-38-77-broadband.btv.lv [77.38.240.154] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 35UFEEx1031827 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 30 Jun 2023 17:14:14 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH] meta: Remove locale.conf hack for newer systemd Date: Fri, 30 Jun 2023 18:14:08 +0300 Message-Id: <20230630151408.174865-1-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: qBJ3L639Elbq 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 --- 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