From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6542807571650052096 X-Received: by 10.28.134.85 with SMTP id i82mr27686wmd.32.1523953639210; Tue, 17 Apr 2018 01:27:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.116.3 with SMTP id p3ls190267wmc.4.canary-gmail; Tue, 17 Apr 2018 01:27:18 -0700 (PDT) X-Google-Smtp-Source: AIpwx48dSOQ3xefQzf67Kf0GuywDdL6egTzeaYKZQciwTqDGN+NEDAQZYP7HQBeEjNIzNpYTUOuR X-Received: by 10.28.144.147 with SMTP id s141mr26862wmd.16.1523953638277; Tue, 17 Apr 2018 01:27:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523953638; cv=none; d=google.com; s=arc-20160816; b=eLWAqK2Vqf8FkRxYvPRSQEZPvIu5q9HqlRfd7X71/BZz82v8psisUm3b7wkOIhPyqU LEqfGoX/8FcqTuFVp9Hxp1C7deDpZjxFLQjj6a1OA6P4/JYV/MNxmkYARluS9kcswvgn L/0iTrl2SGd9FEsCjbpGtqP/EjxrxbQN01DUO4Cek3uKuQmrK+Itmdof25Zg6tofIYOW BJzipWZbbzfnX1D/cUQLjMh2cjZnhw0yST5kluOhrmY9fDcbyGRDIpVCd5HXY/y0cz3z esirBBuz2dCWrQuazBD3U1RdkR/6pmQlRwgTSScpduTVsA6YWGtY1+Wf6Q1kSngXDGMN I0wA== 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=SAv0ydopuW2JhNjGuS8sw4AWCgqRricCUvTfasFpuHQ=; b=TR6JFDa5mXWZC5wbwuMiKAnv6rzg6Ell3W1gyWwt1Tlf69rTezrTWr+bD8yAMiMypj Nkc+segnm7nnxieOdybMbUkuGDm0WDOy7jvOOJq7STBKcxNcON/SYT/HpBbaJk3yh1Rc um8CMzzcQfmbsgLnoJ5w1GHjmJFN89CHfGbW3kuzJU8JjLi4D5HXRk578Dq0KmWIQdI+ 5uhKf1ZVDvVvGYA0h/iATL4hzubAwch/HQSW9eUr0cl+8WpECIsU1EmtuXCoerWRJaRE 2UGsggix7dDepCA4lq5tPFYS5qoN0d6wHVgPvE308Yn86Zw4G+1qkPwZei/s8ZDvgFqH 0qjQ== 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 t10si414197wmh.0.2018.04.17.01.27.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 01:27:18 -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 w3H8RHSC029777 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 17 Apr 2018 10:27:17 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.226]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id w3H8RGk6025108; Tue, 17 Apr 2018 10:27:17 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v4 1/2] meta-isar/isar-image-base: remove uncesessary cmd lines from cfg scripts Date: Tue, 17 Apr 2018 10:27:09 +0200 Message-Id: <20180417082710.665-2-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180417082710.665-1-claudius.heine.ext@siemens.com> References: <20180417082710.665-1-claudius.heine.ext@siemens.com> X-TUID: HrdkPM0qQLaz 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.17.0