From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6542807571650052096 X-Received: by 10.80.245.249 with SMTP id x54mr2198480edm.3.1523443014483; Wed, 11 Apr 2018 03:36:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.243.141 with SMTP id g13ls912379edm.8.gmail; Wed, 11 Apr 2018 03:36:54 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/mIlSSQGF3LCihg1eqSBROiDZW8sWjsqugEtwGsKTBquPYTf3up87UsL1sGMghd9sNv88J X-Received: by 10.80.190.71 with SMTP id b7mr2192179edi.7.1523443014053; Wed, 11 Apr 2018 03:36:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523443014; cv=none; d=google.com; s=arc-20160816; b=hCewIdIdJ1O8J8mDOl0A5s2ZZzrLIAdoapYTMvcp3yWBGsu87shE5mbMGusLiWVqT+ jlV06V7X2E2iWhu8mwUSGs6tfXtBy4k0T2XTlmOozhrWXGL3UGqZBq7zv3h1QIQ3OODB znWzdWQZXyxWOF7j9mhUXUAfSpHFrqqBcLXLY60k/Pgn61Fqs7QADzV6HRQ38LYFGTtW 8UzC4POfDw5hpP5xgQgTxYp3BnpQbOlspOAwW6GNb26kTbmEry0NGYeOcEV61FjM231k ULlIbUPGTUvV+Cvuu4Rzyv/RiU7bzGFvS4n2PX0N2AZYf5SWQ2JnwyojYU3SEEsBjSl0 5lBA== 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=fcWMBHZ2ErjsQaC/EoG7x01wOcDQwirKR7NCBYo5wI22LtZnGo1i5kkQBwxJQmgD+8 WI5n5/kBTYv0PHrsCaKNpxDuMfAQxBQoZK4a5n9sEpu/uUpNRAaMQ8MqVnidLjYBrwmB QrNPYuWFx1NsbtVW1RSDB9ILijZnBc9ux3OVLlAyjAVbNsH6odEiRVB/eymEC9bkgQn9 TSj7zeIHLw7E/uu6bb63kM7xlQSGhC3yA7fb0EAohjqd/DJ44+KGtotekKHegGnpTAFw Y3G80hBPB5kVRhtS5pqApDX4oC5WArHyYIT4YQcwg45K0Cd70bmWnpqrEFHbRkb6OODR hchQ== 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 r15si49035edl.3.2018.04.11.03.36.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Apr 2018 03:36:54 -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 w3BAarYh025064 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 11 Apr 2018 12:36:53 +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 w3BAaqmY025940; Wed, 11 Apr 2018 12:36:53 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v2 1/2] meta-isar/isar-image-base: remove uncesessary cmd lines from cfg scripts Date: Wed, 11 Apr 2018 12:36:47 +0200 Message-Id: <20180411103648.26826-2-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180411103648.26826-1-claudius.heine.ext@siemens.com> References: <20180411103648.26826-1-claudius.heine.ext@siemens.com> X-TUID: 7aSHdS4aCE3R 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