From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6558749580291211264 X-Received: by 2002:adf:e544:: with SMTP id z4-v6mr204255wrm.6.1527681010207; Wed, 30 May 2018 04:50:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4085:: with SMTP id o5-v6ls1999814wrp.6.gmail; Wed, 30 May 2018 04:50:09 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJLH/SfOlrhozXKbKOqgbj4csZ9Mk1NZHOuZvBKQEI0XiFOfPgh1NcsktAgMs6DykW1TwVt X-Received: by 2002:adf:ab57:: with SMTP id r23-v6mr205341wrc.13.1527681009804; Wed, 30 May 2018 04:50:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527681009; cv=none; d=google.com; s=arc-20160816; b=rpbQXsDraLhe1CTu+2zxGUAq61+sMZbyVZOkki+9VrjwH/fH9+tBJr+1pCaXpidiTM rNxRLdOw1W7JUmRexb9sUZREGBqBp5KnopuB9LOsWjyLtd6geUzMge3JeLoCrLCrQqF6 Uvb2iOwBk3XnqeCUNaS8heFcuoq+Iph6xxzQ9gqhhs8vVuo2iWXrMFaclFkAWKnnZ1Ww 5GR9h85AqlxAb8uWR5vqrLuLXUuvZ25M1r9/lJNOCxg97kFuhw0y4HPE/fHvT3u7Z5b8 vmGSlveFS0P3nRSB6QCTknGqGBrQaulH3IzETRLJPt8O2SyfiuREoWwWHaHX3h2S37mL erIA== 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=kKB+NumkPReB++ilkdubweMqAcO7MEF56iO/ZLTvSRA=; b=0PUXCTtby5Q4NKVLG2TtmCD9Y5QXqsWNo9b+BXmznQQuXITwQ1p/radmZEO3L5R3u3 IcTHwuzywxeGCvyxMNooarULbgVagVCs/ynr+hDITnInaZafwvfwhRbBYz5SqF1mcI7B tNxUzWv9L5ydlvZH+CfrmvF6Mt4EYTryGKDywm4yy+7qlCcVKmWerudL5h7OTJ93Cxzu zxMMT0hV1HL2s8Dh4Wc/eLUexN5eI1VBM/vWqoPWB7dp0r36ue8N8/WFbsRhIy7/ULJp vVohesxBIXFF1i/izCiW26nQDs9PAzByFX0rDNetAa390L0L5TJwuk7OcnvQvNV7hkr4 fqeQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id z83-v6si557732wmc.0.2018.05.30.04.50.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 May 2018 04:50:09 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id w4UBo8ho019976 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 May 2018 13:50:08 +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 w4UBo7F4014220; Wed, 30 May 2018 13:50:08 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v6 3/4] meta-isar/isar-image-base: switch use isar-cfg-localepurge Date: Wed, 30 May 2018 13:49:59 +0200 Message-Id: <20180530115000.14424-4-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180530115000.14424-1-claudius.heine.ext@siemens.com> References: <20180530115000.14424-1-claudius.heine.ext@siemens.com> X-TUID: rdGQ/MGN/krb From: Claudius Heine This patch removes the locale setting from the *-configscripts and instead uses the isar-cfg-localepurge configuration package as a transient 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..f91dfb0 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_TRANSIENT_PACKAGES}" IMAGE_PREINSTALL += "apt \ - dbus \ - localepurge" + dbus" +IMAGE_TRANSIENT_PACKAGES += "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