From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6558749580291211264 X-Received: by 2002:adf:ce8a:: with SMTP id r10-v6mr259506wrn.12.1527077886439; Wed, 23 May 2018 05:18:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:e642:: with SMTP id d63-v6ls2953499wmh.0.gmail; Wed, 23 May 2018 05:18:06 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqFd5g2Jo487TGJWDkod+dfPtbhnpDOfYeRdUCSNO2MHCSsRJUhOCdbODJKeCkKfcA5Eirl X-Received: by 2002:a1c:1785:: with SMTP id 127-v6mr539993wmx.30.1527077886020; Wed, 23 May 2018 05:18:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527077885; cv=none; d=google.com; s=arc-20160816; b=EqjIEPgbbYnPnHNKY8GVY85+/jScOlWvhHklWstOckMsju7jzr8J3HghhSE7AAGl5R zFOEvXJUKfzffSf2WgkOarpQOfSxkETiyMZvftQOK3D0EYZPzvDY7MFKyBFO29QZXdZQ 0P71gTAH67wgtmHPXJJDjlt+GTxiymPaCFu9CDj8Iuo6mmFmd9+g2ZBJGsljrwkIfqXl fy5nMFpufuPPRtumiVkuuhm5a7ACnQx2HRKqjTtr58Y7I9jy8V1+04loFQ6q4RN7uaY+ EzQ2OQF3Pkn3HSSRjdk8ryWqbiYDW+8x284CoNw9GrMFlugXFQd+9n2DqqhFyBFyLfO1 ZRBw== 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=HwObcdAJEqHQKkVu87f3mzSbzu3JtyJrKueOu43/j+Q=; b=z/CxYCNQ7Ty05dcJEGGElG+reJuPXerIYuTT6Ntg9N+iNnrLTEMmXOka9NaTi4Jeop mFqc1RdVY7L3Gf47PBomUr3hDmp2r0hARBLSW7qvx6lwnRP37mibasurxpt1ex7dEHgb 2v/sM4eGbDHxC9A1QS39l7ycdM9Sb32ReHNIMzhvr5e0kfhi4qJPOJ5QctSNaSrh7Skv vkyrS259drYRGRED2PO6b9afI89+uplH0Pj3B//q42CFY7uIT1A5M3/3xzOmqel/FwYj jdV7Ik4F5A2kMlzD0C2PfG2hg7v3djrLpORvHoKj4F7BhEFkTUB3vdgwetftGLrfm9Pp UlTg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id i10-v6si57832wrn.5.2018.05.23.05.18.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 05:18:05 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w4NCI5Ma027430 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 23 May 2018 14:18:05 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.69]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w4NCI5wo002790; Wed, 23 May 2018 14:18:05 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH 3/3] meta-isar/isar-image-base: switch use isar-cfg-localepurge Date: Wed, 23 May 2018 14:18:00 +0200 Message-Id: <20180523121800.30900-4-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523121800.30900-1-claudius.heine.ext@siemens.com> References: <20180523121800.30900-1-claudius.heine.ext@siemens.com> X-TUID: mlp5mUeg3bju From: Claudius Heine This patch removes the locale setting from the *-configscripts and instead uses the isar-cfg-localepurge configuration package. The advantange is that the package 'localepurge' is no longer installed on every image and locale settings is done in a central place. Signed-off-by: Claudius Heine --- .../images/files/debian-configscript.sh | 30 ------------------- .../images/files/raspbian-configscript.sh | 29 ------------------ .../recipes-core/images/isar-image-base.bb | 6 ++-- 3 files changed, 3 insertions(+), 62 deletions(-) diff --git a/meta-isar/recipes-core/images/files/debian-configscript.sh b/meta-isar/recipes-core/images/files/debian-configscript.sh index 0ff2f0f..136918c 100755 --- a/meta-isar/recipes-core/images/files/debian-configscript.sh +++ b/meta-isar/recipes-core/images/files/debian-configscript.sh @@ -10,33 +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/fstab << EOF # Begin /etc/fstab /dev/$ROOTFS_DEV / $ROOTFS_TYPE defaults 1 1 @@ -59,6 +32,3 @@ if [ -f /etc/inittab ]; then echo "T0:23:respawn:/sbin/getty -L $MACHINE_SERIAL $BAUDRATE_TTY vt100" \ >> /etc/inittab fi - -# Purge unused locale and installed packages' .deb files -localepurge diff --git a/meta-isar/recipes-core/images/files/raspbian-configscript.sh b/meta-isar/recipes-core/images/files/raspbian-configscript.sh index 47c9c37..04ea571 100644 --- a/meta-isar/recipes-core/images/files/raspbian-configscript.sh +++ b/meta-isar/recipes-core/images/files/raspbian-configscript.sh @@ -10,33 +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/fstab << EOF # Begin /etc/fstab /dev/$ROOTFS_DEV / $ROOTFS_TYPE defaults 1 1 @@ -60,5 +33,3 @@ KERNEL_IMAGE=`ls /boot | grep vmlinuz` cat > /boot/config.txt << EOF kernel=$KERNEL_IMAGE EOF - -localepurge diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index baac531..beb6f14 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -16,11 +16,11 @@ PV = "1.0" inherit image inherit isar-bootstrap-helper -DEPENDS += "${IMAGE_INSTALL}" +DEPENDS += "${IMAGE_INSTALL} ${IMAGE_CFG_PACKAGE}" IMAGE_PREINSTALL += "apt \ - dbus \ - localepurge" + dbus" +IMAGE_CFG_PACKAGE += "isar-cfg-localepurge" WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" -- 2.17.0