From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6558749580291211264 X-Received: by 2002:a2e:9607:: with SMTP id v7-v6mr423422ljh.8.1527172000741; Thu, 24 May 2018 07:26:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:4d53:: with SMTP id a80-v6ls2639574lfb.2.gmail; Thu, 24 May 2018 07:26:40 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr9RApsXQD/bLR8pEnW/uOznXvP4PukhAkd+e098N98nj23puIJliaw6aXN/Qletsx60AZh X-Received: by 2002:a19:298a:: with SMTP id p132-v6mr411705lfp.44.1527172000297; Thu, 24 May 2018 07:26:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527172000; cv=none; d=google.com; s=arc-20160816; b=gNFK//jMLHxDfuj6XpTM+gIM15BJ23nzndxFT4CsQBoJ0vDNb77dd/9dw6xpL0+f8Q bkThyvDHvxqDmyexbx+z7sUWErXzKWT1TeyQsJtCBGeOiBkjeysu2tYEkjXMXrPJBp5t kEU1BvL4on9GpYrQSm6rEegOmFvt4KoISMAOW8xtifzG5VemxN7Eoc3FelvZICXQJBsn zeDZwzDt2LvjYL8rcAYC5ZRI9GKR2eNLP72L117Ag+c4XiwYL2MfAAhtaxdfVSt1JyPj n/eeIxSA2BeZtWKki9d+HO1uMg0p6KSmPLiA8jJJG72Wjs6BXaF6fOeQyMAEaYa51XzF KX4A== 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=6/tKxsHL/9kjmz6MwIVEW2WLPZPayHdLESQuNdMF2Ec=; b=r3pWg8Wtm59lot/yrZcR3kSI0OS7jroSdMVU8EUR/+uKg54pjpl4D7usVij8X2/tnl ZQGpOrQCyESM7AmgHGjGIiusg20kxisHaYOpwTX2287BKf9oXgio8R/dcuIF426PUa3I /tXl0vEwI1fLGUELB05QrbSKI5Y4yahHYuvDlBUMtKFdm32bbzCI5nCP9DTnWGzv5bpR kx8ydcR6zdlo+TU6uiDMmoBugWpx5mNqhnV13xO2Kkrj6vnkvvz1DTh0RsfYkZTn6iG7 YMNoYSQ8VYdRutLfU4KiaT5dzcZbbdhOXxWdeot/ivAGK2t8RGXNE/UGG/Muqa9y2/I5 u9QA== 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 y205-v6si679646lfa.0.2018.05.24.07.26.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 May 2018 07:26:40 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w4OEQcvm025871 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 24 May 2018 16:26:39 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.69]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id w4OEQcel007841; Thu, 24 May 2018 16:26:38 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v3 3/3] meta-isar/isar-image-base: switch use isar-cfg-localepurge Date: Thu, 24 May 2018 16:26:35 +0200 Message-Id: <20180524142635.5814-4-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180524142635.5814-1-claudius.heine.ext@siemens.com> References: <20180524142635.5814-1-claudius.heine.ext@siemens.com> X-TUID: Grei6sepP24o 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 --- .../recipes-core/images/files/debian-configscript.sh | 8 -------- .../recipes-core/images/files/raspbian-configscript.sh | 7 ------- meta-isar/recipes-core/images/isar-image-base.bb | 6 +++--- meta/recipes-core/isar-bootstrap/files/locale.nopurge | 10 ---------- meta/recipes-core/isar-bootstrap/isar-bootstrap.bb | 4 +--- 5 files changed, 4 insertions(+), 31 deletions(-) delete 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 9b3ff30..136918c 100755 --- a/meta-isar/recipes-core/images/files/debian-configscript.sh +++ b/meta-isar/recipes-core/images/files/debian-configscript.sh @@ -10,11 +10,6 @@ readonly BAUDRATE_TTY="$2" readonly ROOTFS_DEV="$3" readonly ROOTFS_TYPE="$4" -debconf-set-selections < /etc/fstab << EOF # Begin /etc/fstab /dev/$ROOTFS_DEV / $ROOTFS_TYPE defaults 1 1 @@ -37,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 448dea5..04ea571 100644 --- a/meta-isar/recipes-core/images/files/raspbian-configscript.sh +++ b/meta-isar/recipes-core/images/files/raspbian-configscript.sh @@ -10,11 +10,6 @@ readonly BAUDRATE_TTY="$2" readonly ROOTFS_DEV="$3" readonly ROOTFS_TYPE="$4" -debconf-set-selections < /etc/fstab << EOF # Begin /etc/fstab /dev/$ROOTFS_DEV / $ROOTFS_TYPE defaults 1 1 @@ -38,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 1239f72..0d46d74 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}" diff --git a/meta/recipes-core/isar-bootstrap/files/locale.nopurge b/meta/recipes-core/isar-bootstrap/files/locale.nopurge deleted file mode 100644 index 510d40c..0000000 --- a/meta/recipes-core/isar-bootstrap/files/locale.nopurge +++ /dev/null @@ -1,10 +0,0 @@ -# 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 diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb index f894821..bb3992b 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb @@ -13,8 +13,7 @@ FILESPATH_prepend := "${THISDIR}/files:" SRC_URI = " \ file://isar-apt.conf \ file://isar-apt-fallback.conf \ - file://locale \ - file://locale.nopurge" + file://locale" PV = "1.0" WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" @@ -196,7 +195,6 @@ addtask bootstrap before do_build after do_generate_keyring do_set_locale() { sudo install -v -m644 "${WORKDIR}/locale" "${ROOTFSDIR}/etc/locale" - sudo install -v -m644 "${WORKDIR}/locale.nopurge" "${ROOTFSDIR}/etc/locale.nopurge" sudo sed -i '/en_US.UTF-8 UTF-8/s/^#//g' "${ROOTFSDIR}/etc/locale.gen" sudo -E chroot "${ROOTFSDIR}" /usr/sbin/locale-gen -- 2.17.0