From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6542807571650052096 X-Received: by 10.28.125.19 with SMTP id y19mr624921wmc.21.1523516494683; Thu, 12 Apr 2018 00:01:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.63.74 with SMTP id m71ls727232wma.5.canary-gmail; Thu, 12 Apr 2018 00:01:34 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+6gzLazcumm3o2WN8EhZgGCtMPpg7upy4a2YgLlZmAH0lZxPIodueoAJBJ1xFtamUqWi6Y X-Received: by 10.28.225.68 with SMTP id y65mr629131wmg.30.1523516494097; Thu, 12 Apr 2018 00:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523516494; cv=none; d=google.com; s=arc-20160816; b=Rh+naCZktfv7da0BSmY79HMmuz4oLtum9njD2F4jF4clrYU80fHWTnrbiWOJhivULs Pduz7ns+vTbzl7qIxAUCcUUywurW1R+b+vmI+piMqWc5crGVqJT9sHCAQPKdBVZX9xno ZyQBh1fd/UWLacJzXpm7XbxVl1KKZKq6ZS2p7qoPFXpcWwvdaR+ecM5FixlwuwuyR9tl EDY6abCyClc7B5t1sojYQy2gblTnsiNaBdZy+GbzRDH/2YazWmQWCtAaMZPJWNt/yzVs watXXyTOox1Q1vVcQfg2EIg0OB2pdM0eKG2pGfV0SEGX79BpDd0npgz/Px2P5Wr17hfx 8TRw== 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=RyuYkqmpQs9Mwy2u6hUoqmYeBZXLRWepnxZyanWjg7VYijZwx055bEkgREj+sRIAZ7 eTQFuZjDYeKnEXesJMl49dl7Z3eErDnsqZmm05QdR3Czq4eMYJouoYyHxkH+6DBuCzOp 9eg0QuouM0xAyKHBxFDFUSTOdJQPfHQlR1xLr9s5BSgtXuACXRDMEDoAit+3TiANu9/L onEQDxOuCwJ2F3VaGAUFA9RNYW2vsZahJCVpKWlTMt0eX9cFnnPJMEJEhc34OuY13b2g A86Gds+YybcoSngKfh2JBVIwRPi4xRmgK8FnamnlUUZZubEAA3POCSROgv2+5RU+miwA UYzg== 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 b202si72609wmb.2.2018.04.12.00.01.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Apr 2018 00:01:34 -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 w3C71WIT026051 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 12 Apr 2018 09:01:33 +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 w3C71WQH026686; Thu, 12 Apr 2018 09:01:32 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v3 1/2] meta-isar/isar-image-base: remove uncesessary cmd lines from cfg scripts Date: Thu, 12 Apr 2018 09:01:20 +0200 Message-Id: <20180412070121.31332-2-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180412070121.31332-1-claudius.heine.ext@siemens.com> References: <20180412070121.31332-1-claudius.heine.ext@siemens.com> X-TUID: vmpLGigg5I6P 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