From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6555830666749018112 X-Received: by 2002:adf:ea87:: with SMTP id s7-v6mr1225009wrm.5.1526398274245; Tue, 15 May 2018 08:31:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:80ca:: with SMTP id b193-v6ls178369wmd.9.gmail; Tue, 15 May 2018 08:31:13 -0700 (PDT) X-Google-Smtp-Source: AB8JxZru82wwXu3EvU/CrZAuTi9BZUCy+l/P18eGXxj5f8hhYZYsJNVYDRJFmt26XqrZaWPxxkZj X-Received: by 2002:a1c:d7c1:: with SMTP id o184-v6mr1594559wmg.22.1526398273692; Tue, 15 May 2018 08:31:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526398273; cv=none; d=google.com; s=arc-20160816; b=dSfH1n9II9eZq+8aHVobkUwBUY7DtBrx4ry9BatE+b2rbK1rxT+mruA/zFuQG+4Mr7 XmRJbSxaDhFxPZnaTOH4m5BFthg/FBdtOJmq0xupqMZesQ+QM0+H7wzy7mHfdNjeEgXR rgOGo7EQRLDw3OTJyPGHRf7+dhnQ3Ssbhl4YvUBXG5dOY31RjqF5T6WTvGdyH3/zakGn ZnB401SrWa5ryFYOvDdFa8/wkwjxO70GX0XniaEaOwVE42WX2ghlWhQ4QkbbZIXfGYUD qdptLHAq2SzNe1ABxQJqjy3EIHrYV1dhK4UHe+H9NddggiogivkfD57KIpRGWvXtDARV NS8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=bGyejsrfFi29SPDjns65dwaS7A7Fcj20a/VyCPYuZEA=; b=DkEj4fr/n3bRAQT24KotH9bgzlIankDNzQmwtmV5wtQo8OVQAh+UBFk1VY4WoMJzOS zfEz9Tyory9dRN/tn8usE9ZI4pIqV+1q/vTZYctKKgXFbTxtUPnQtl8zv7WjTgxWQjI3 wOCxTi8zXPXM0X0XfoU/AKwXc8Qf74V/2WLcoWiC/FwcuIwkxKz8tt0+N576Ki6qsKAN w243UMXFEALQUjOVW99SLry8RRlQY6kIAwvyMZGJ2D/aNzsfTO2W1afBQ6YcjFoIwrk1 1KyNkxdFdmBGd+JY0NvM30Ukxu8YidSoRza1CZPjqdCN5AJChcq3Xav5xf/ENbVD2L+W V2kA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id g18-v6si567623wmc.4.2018.05.15.08.31.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 May 2018 08:31:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from localhost.localdomain ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w4FFUxU5014991 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 May 2018 17:31:05 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH 1/2] isar-bootsrtap: Setup locale Date: Tue, 15 May 2018 18:30:51 +0300 Message-Id: <20180515153052.4946-2-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180515153052.4946-1-asmirnov@ilbers.de> References: <20180515153052.4946-1-asmirnov@ilbers.de> X-TUID: cLupqyuh4E2C Currently locale is set in config scripts for buildchroot and images. This is absolutely the same routine which is duplicated in all these scripts. This patch moves locale initialization to isar-bootstrap, so now locale is set once and works for all the futher root filesystems. The task do_set_locale is added right after do_bootstrap to avoid warning messages in isar-bootstrap logs after 'apt-get' calls. Signed-off-by: Alexander Smirnov --- .../images/files/debian-configscript.sh | 22 -------------------- .../images/files/raspbian-configscript.sh | 22 -------------------- meta/recipes-core/isar-bootstrap/files/locale | 4 ++++ .../isar-bootstrap/files/locale.nopurge | 10 +++++++++ meta/recipes-core/isar-bootstrap/isar-bootstrap.bb | 13 ++++++++++-- .../buildchroot/files/configscript.sh | 24 +--------------------- 6 files changed, 26 insertions(+), 69 deletions(-) create mode 100644 meta/recipes-core/isar-bootstrap/files/locale create mode 100644 meta/recipes-core/isar-bootstrap/files/locale.nopurge diff --git a/meta-isar/recipes-core/images/files/debian-configscript.sh b/meta-isar/recipes-core/images/files/debian-configscript.sh index 042b530..7ca0562 100755 --- a/meta-isar/recipes-core/images/files/debian-configscript.sh +++ b/meta-isar/recipes-core/images/files/debian-configscript.sh @@ -10,28 +10,6 @@ readonly BAUDRATE_TTY="$2" readonly ROOTFS_DEV="$3" readonly ROOTFS_TYPE="$4" -cat >> /etc/default/locale << EOF -LANG=en_US.UTF-8 -LANGUAGE=en_US.UTF-8 -LC_ALL=C -LC_CTYPE=C -EOF - -## Configuration file for localepurge(8) -cat > /etc/locale.nopurge << EOF - -# Remove localized man pages -MANDELETE - -# Delete new locales which appear on the system without bothering you -DONTBOTHERNEWLOCALE - -# Keep these locales after package installations via apt-get(8) -en -en_US -en_US.UTF-8 -EOF - debconf-set-selections <> /etc/default/locale << EOF -LANG=en_US.UTF-8 -LANGUAGE=en_US.UTF-8 -LC_ALL=C -LC_CTYPE=C -EOF - -## Configuration file for localepurge(8) -cat > /etc/locale.nopurge << EOF - -# Remove localized man pages -MANDELETE - -# Delete new locales which appear on the system without bothering you -DONTBOTHERNEWLOCALE - -# Keep these locales after package installations via apt-get(8) -en -en_US -en_US.UTF-8 -EOF - debconf-set-selections <> /etc/default/locale << EOF -LANG=en_US.UTF-8 -LANGUAGE=en_US.UTF-8 -LC_ALL=C -LC_CTYPE=C -EOF - -## Configuration file for localepurge(8) -cat > /etc/locale.nopurge << EOF - -# Remove localized man pages -MANDELETE - -# Delete new locales which appear on the system without bothering you -DONTBOTHERNEWLOCALE - -# Keep these locales after package installations via apt-get(8) -en -en_US -en_US.UTF-8 -EOF - debconf-set-selections <