From patchwork Mon Jan 19 16:14:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Mikityanskiy X-Patchwork-Id: 430584 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 68574140213 for ; Tue, 20 Jan 2015 03:14:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2E46EA18A3; Mon, 19 Jan 2015 16:14:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nbHmEBYXIq0b; Mon, 19 Jan 2015 16:14:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 90947A18FE; Mon, 19 Jan 2015 16:14:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 660C01C203A for ; Mon, 19 Jan 2015 16:14:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 619F392512 for ; Mon, 19 Jan 2015 16:14:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9wCcXSrGjOqy for ; Mon, 19 Jan 2015 16:14:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by whitealder.osuosl.org (Postfix) with ESMTPS id F22609250B for ; Mon, 19 Jan 2015 16:14:36 +0000 (UTC) Received: by mail-wi0-f182.google.com with SMTP id n3so15794039wiv.3 for ; Mon, 19 Jan 2015 08:14:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=wlaiAXXcKu4lBa7wqVdF6S1oZGsEo+VM8Cg3HDA28PA=; b=g+Wf/NTXzJgg7+Byjmc0NYqt/9w9D4wLOKLQckVBAzPxZHgNeTwCDI8lknTfFXoZHH Sp/6FyJ3hvLKH76a+oYSaO3ZpWEsmR3eQlFPOOD2sBQ+8hwDKzt7WCcwxYsrwzjLYhBq 5EqDvd9SJLnRUM6RICeIZB1zEclPhnhv5PoLKcp9P7bgh8yFJdMpinimcOczokSl0pR0 5+FqsVBnDTZI9Xe3k9gK+l7yJg71dQHelQ5pz/N+mScR44sBh/x7HvohkSivT/DJP7LA YtWtx7gQQmAUzt/sCeWrcvoAJawKa7PKedZ4IGh8BSE+wSsLcQhK/1FKpLahV9kwBxOU 9UkA== X-Received: by 10.194.93.5 with SMTP id cq5mr3588096wjb.84.1421684075697; Mon, 19 Jan 2015 08:14:35 -0800 (PST) Received: from ideapad.lan (199-13-179-94.pool.ukrtel.net. [94.179.13.199]) by mx.google.com with ESMTPSA id fc6sm14735765wib.12.2015.01.19.08.14.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Jan 2015 08:14:35 -0800 (PST) From: Maxim Mikityanskiy To: buildroot@busybox.net Date: Mon, 19 Jan 2015 18:14:05 +0200 Message-Id: <1421684056-5266-6-git-send-email-maxtram95@gmail.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1421684056-5266-1-git-send-email-maxtram95@gmail.com> References: <1421684056-5266-1-git-send-email-maxtram95@gmail.com> Subject: [Buildroot] [PATCH 05/16] package/systemd: apply locale settings in user shells X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add /etc/profile.d/locale.sh script from Arch Linux to apply systemd locale settings in user shells. Signed-off-by: Maxim Mikityanskiy --- package/systemd/locale.sh | 26 ++++++++++++++++++++++++++ package/systemd/systemd.mk | 7 +++++++ 2 files changed, 33 insertions(+) create mode 100644 package/systemd/locale.sh diff --git a/package/systemd/locale.sh b/package/systemd/locale.sh new file mode 100644 index 0000000..b665872 --- /dev/null +++ b/package/systemd/locale.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +if [ -z "$LANG" ]; then + if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then + . "$XDG_CONFIG_HOME/locale.conf" + elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then + . "$HOME/.config/locale.conf" + elif [ -r /etc/locale.conf ]; then + . /etc/locale.conf + fi +fi + +LANG=${LANG:-C} +export LANG +[ -n "$LC_CTYPE" ] && export LC_CTYPE +[ -n "$LC_NUMERIC" ] && export LC_NUMERIC +[ -n "$LC_TIME" ] && export LC_TIME +[ -n "$LC_COLLATE" ] && export LC_COLLATE +[ -n "$LC_MONETARY" ] && export LC_MONETARY +[ -n "$LC_MESSAGES" ] && export LC_MESSAGES +[ -n "$LC_PAPER" ] && export LC_PAPER +[ -n "$LC_NAME" ] && export LC_NAME +[ -n "$LC_ADDRESS" ] && export LC_ADDRESS +[ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE +[ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT +[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 92f99c2..ef14c76 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -158,6 +158,12 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK touch $(TARGET_DIR)/etc/machine-id endef +define SYSTEMD_INSTALL_LOCALE_SH_HOOK + mkdir -p $(TARGET_DIR)/etc/profile.d + $(INSTALL) -D -m 644 package/systemd/locale.sh \ + $(TARGET_DIR)/etc/profile.d/locale.sh +endef + define SYSTEMD_SANITIZE_PATH_IN_UNITS find $(TARGET_DIR)/lib/systemd/system -name '*.service' \ -exec $(SED) 's,$(HOST_DIR),,g' {} \; @@ -172,6 +178,7 @@ endef SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ SYSTEMD_INSTALL_INIT_HOOK \ SYSTEMD_INSTALL_MACHINEID_HOOK \ + SYSTEMD_INSTALL_LOCALE_SH_HOOK \ SYSTEMD_INSTALL_RESOLVCONF_HOOK \ SYSTEMD_DISABLE_LDCONFIG_SERVICE_HOOK \ SYSTEMD_SANITIZE_PATH_IN_UNITS