From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6558749580291211264 X-Received: by 2002:adf:9cd1:: with SMTP id h17-v6mr1323001wre.1.1527596070990; Tue, 29 May 2018 05:14:30 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:f512:: with SMTP id t18-v6ls5945894wmh.10.gmail; Tue, 29 May 2018 05:14:30 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLPWon2nWTNnhnNcb15vJ8/jHqRG2pUkwYOwoFWFlQCCuj4PUrbzApBHtja2Cxnv50Vu6is X-Received: by 2002:a1c:b205:: with SMTP id b5-v6mr1549916wmf.0.1527596070563; Tue, 29 May 2018 05:14:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527596070; cv=none; d=google.com; s=arc-20160816; b=ZzrJ9sG0jqcCHhTzRxjxmQjacqUQYVU/Iii1ab5qjTQ6EoSTubrylXbrFpZHSL2BK2 SoeEpqTQH//6+Uu5RG6cO4w3ZZXayPociu1NhlGE1a6hJ/LumilCxthjJHWFgy/w+IVY Jmuy+oOraehdcwfnRbV0CO+H9A1iZWyT9U/FRGk4O2PrFu5w6bj2R66gHyLzbL74D7ve Nw44ipp83ZoacxojiaLGo3BsDVAHbJDiCaHyj6YAgHN3PBy9VAveSAUJg40RAE5/tz+n l3Ny3r1h29zFwrcBvnI+Q+oM9+knRwPX362XnzWeGQI/iXWjFuVk2T0js5ASmQQGgmBW /qOw== 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=ZBksadkjMn8wbQNfoJBN1V+AUpxEhBnJRFkjYyTMYymV1tb+KLkaAxCOBKR2isr/2W 0poMGDvV9XBcajX0nAuKX/UDEs6JnN2/rB+/6RbyOu2XwWdAWChNmYeqrpdLhrEE69BR igmwjAQCSRIyb51Saxjh8LTBKLfQF1LB7AP3U/gQRwtNsi8kmQvXJEsF8dglyRpujACQ j2ZRhVdNqvFaugQnb6q4OxpFuqksx5+1do1T9igxdNEBau4njBGS6HYwO93Gp+AeazEU DE7wlAFbZP4ay088KdpcMDjuuF38tngC45EHLCKxW4rzGto3NZWchibL8mD0KRkmuVll Ew1w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id x3-v6si124326wrn.0.2018.05.29.05.14.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 May 2018 05:14:30 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w4TCETG9018191 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 May 2018 14:14:29 +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 w4TCET93025126; Tue, 29 May 2018 14:14:29 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v5 3/4] meta-isar/isar-image-base: switch use isar-cfg-localepurge Date: Tue, 29 May 2018 14:14:24 +0200 Message-Id: <20180529121425.8783-4-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180529121425.8783-1-claudius.heine.ext@siemens.com> References: <20180529121425.8783-1-claudius.heine.ext@siemens.com> X-TUID: xXHi82xImR5m 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