From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6542807571650052096 X-Received: by 10.80.242.133 with SMTP id f5mr904542edm.9.1523366099229; Tue, 10 Apr 2018 06:14:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.214.21 with SMTP id x21ls6794875edi.7.gmail; Tue, 10 Apr 2018 06:14:58 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+heMBqJfW4sCDiiqb/JeNJZV157IHfGeHJ6eX35kIg/UtHleDMRFf5c7VNMOEJCDM4ThAq X-Received: by 10.80.245.132 with SMTP id u4mr914172edm.2.1523366098742; Tue, 10 Apr 2018 06:14:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523366098; cv=none; d=google.com; s=arc-20160816; b=KoIs/SVbfe5pdK8Pf1XrhoSMn/iF/V2b1DmxUeKuSKOlBn8nrGU0x3sAxHminfeJIf EM+l7cC0ucwuGfHWoBt/DP/LlfvuPnyMFQKBQ1VmWqDCQFwXbe9ilxdGIsdsQK0k78zZ HKAk3UrspSW0kdniLpxglsOE6N7qTVkX09pjfErlWsLLiqljiwJtjS7WxPmVjSZr8ARv eZjikuIf66jfK5E+Nf0hiSinZW9JjaUcglUKnq79gEclvoXzUjrqnESxhSm17cwdiv6A sGKLiKTKWoecZNTFxJhVLkEB49lTTOiYJGYrvtFjNmiqPRK8xWqoUk7VrLiYQG75Zap1 t7hA== 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=HtOze9xQQlBCaihL+kC5mb7DKqyqaf3fooo9j89RWDc=; b=nMU8Axi47QrHjXBDHD9wR1axRBonrwFfc18PYwD/PWXz3Cptg5WksKjK+Z/GP5FFfk eirtKzmLBRRfJCYksJfIZH7tu1v0ktL7h9ZfY4QGkPzr/HHnk6GvTD0BjrQ65KT+9Ybo 95KHhaftSjqOzKtPQEksoXqcA0SWdFVFHJf1WuTf2h59X88tQoQyxCpYdk4+laKYlECb 2RjzrYELibQZ1Mw8ZlpdgTXxTclcCFIkQk8S+8vx+v6RyTVjosINjehg7pMMXmZHa8/p z3r07KDbCClkcsyHkDEWIgvl6xRFITAqDEOlmLizVUFv1abIOJipDaLXEPdcloG/Ncn0 jqdg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id y22si26469edm.0.2018.04.10.06.14.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Apr 2018 06:14:58 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id w3ADEvAL027345 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Apr 2018 15:14:58 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.226]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w3ADEvf1028246; Tue, 10 Apr 2018 15:14:57 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH 1/1] meta-isar/isar-image-base: remove uncesessary cmd lines from cfg scripts Date: Tue, 10 Apr 2018 15:14:54 +0200 Message-Id: <20180410131454.1955-2-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180410131454.1955-1-claudius.heine.ext@siemens.com> References: <20180410131454.1955-1-claudius.heine.ext@siemens.com> X-TUID: fyu7vMnarHA/ From: Claudius Heine Since we changed to use debootstrap and apt for the installation of every package, additional runs of 'dpkg configure' and postinst scripts are no longer necessary. This removes also the defunct revert of the 'deamon disable steps' used with the multistrap version of isar and the setting of the root password, since that should be done in a postinst step of a package instead. Signed-off-by: Claudius Heine --- .../images/files/debian-configscript.sh | 26 ----------------- .../images/files/raspbian-configscript.sh | 33 ++-------------------- 2 files changed, 3 insertions(+), 56 deletions(-) diff --git a/meta-isar/recipes-core/images/files/debian-configscript.sh b/meta-isar/recipes-core/images/files/debian-configscript.sh index f2fa2d9..042b530 100755 --- a/meta-isar/recipes-core/images/files/debian-configscript.sh +++ b/meta-isar/recipes-core/images/files/debian-configscript.sh @@ -37,19 +37,6 @@ locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8 locales locales/default_environment_locale select en_US.UTF-8 END -# Set up non-interactive configuration -export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true -export LC_ALL=C LANGUAGE=C LANG=C - -# Run pre installation script -/var/lib/dpkg/info/dash.preinst install - -# Configuring packages -dpkg --configure -a - -# set the root password if that has not been done before -grep "root:\*:" /etc/shadow && echo "root:root" | chpasswd - cat > /etc/fstab << EOF # Begin /etc/fstab /dev/$ROOTFS_DEV / $ROOTFS_TYPE defaults 1 1 @@ -76,16 +63,3 @@ fi # Purge unused locale and installed packages' .deb files localepurge apt-get clean - -# Undo setup script changes -if [ -x "$TARGET/sbin/start-stop-daemon.REAL" ]; then - mv -f $TARGET/sbin/start-stop-daemon.REAL $TARGET/sbin/start-stop-daemon -fi - -if [ -x "$TARGET/sbin/initctl.REAL" ]; then - mv $TARGET/sbin/initctl.REAL $TARGET/sbin/initctl -fi - -if [ -x "$TARGET/sbin/init" -a -x "$TARGET/usr/sbin/policy-rc.d" ]; then - rm -f $TARGET/usr/sbin/policy-rc.d -fi diff --git a/meta-isar/recipes-core/images/files/raspbian-configscript.sh b/meta-isar/recipes-core/images/files/raspbian-configscript.sh index 1a85c40..ec05a6b 100644 --- a/meta-isar/recipes-core/images/files/raspbian-configscript.sh +++ b/meta-isar/recipes-core/images/files/raspbian-configscript.sh @@ -37,23 +37,6 @@ locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8 locales locales/default_environment_locale select en_US.UTF-8 END -# Set up non-interactive configuration -export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true -export LC_ALL=C LANGUAGE=C LANG=C - -# Run pre installation scripts -/var/lib/dpkg/info/dash.preinst install - -# Prevent removing of boot firmware -/var/lib/dpkg/info/raspberrypi-bootloader-nokernel.preinst install -rm /var/lib/dpkg/info/raspberrypi-bootloader-nokernel.postinst - -# Configuring packages -dpkg --configure -a - -# set the root password if that has not been done before -grep "root:\*:" /etc/shadow && echo "root:root" | chpasswd - cat > /etc/fstab << EOF # Begin /etc/fstab /dev/$ROOTFS_DEV / $ROOTFS_TYPE defaults 1 1 @@ -72,21 +55,11 @@ if [ -f /etc/inittab ]; then >> /etc/inittab fi -# Undo setup script changes -if [ -x "$TARGET/sbin/start-stop-daemon.REAL" ]; then - mv -f $TARGET/sbin/start-stop-daemon.REAL $TARGET/sbin/start-stop-daemon -fi - -if [ -x "$TARGET/sbin/initctl.REAL" ]; then - mv $TARGET/sbin/initctl.REAL $TARGET/sbin/initctl -fi - -if [ -x "$TARGET/sbin/init" -a -x "$TARGET/usr/sbin/policy-rc.d" ]; then - rm -f $TARGET/usr/sbin/policy-rc.d -fi - KERNEL_IMAGE=`ls /boot | grep vmlinuz` cat > /boot/config.txt << EOF kernel=$KERNEL_IMAGE EOF + +localepurge +apt-get clean -- 2.16.3