[PATCH v3 0/2] Cleanup of the configscripts

[PATCH v3 0/2] Cleanup of the configscripts

[claudius.heine.ext]

From: Claudius Heine <ch@denx.de>

Hi,

Since Jan reminded me that qemu-*-static binaries are also deployed when
building with debian, for instance in case of qemuarm, I added the
removal to the debian-configscript as well.

Claudius

Changes on v2:
  - Added removal of qemu-*-static command to debian-configscript.sh

Changes on v1:
  - Added removal of qemu-arm-static command to raspbian-configscript.sh

Claudius Heine (2):
  meta-isar/isar-image-base: remove uncesessary cmd lines from cfg
    scripts
  meta-isar/*-configscript: added removal of qemu-*-static binaries

 .../images/files/debian-configscript.sh            | 27 ++--------------
 .../images/files/raspbian-configscript.sh          | 36 ++++------------------
 2 files changed, 8 insertions(+), 55 deletions(-)

-- 
2.16.3

[PATCH v3 1/2] meta-isar/isar-image-base: remove uncesessary cmd lines from cfg scripts

[claudius.heine.ext]

From: Claudius Heine <ch@denx.de>

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 <ch@denx.de>
---
 .../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

[PATCH v3 2/2] meta-isar/*-configscript: added removal of qemu-*-static binaries

[claudius.heine.ext]

From: Claudius Heine <ch@denx.de>

After the image has finished building, the qemu-*-static binaries that
are installed by quemu-debootstrap can be removed because they are no
longer needed.

Reported-by: Henning Schild <henning.schild@siemens.com>
Signed-off-by: Claudius Heine <ch@denx.de>
---
 meta-isar/recipes-core/images/files/debian-configscript.sh   | 3 +++
 meta-isar/recipes-core/images/files/raspbian-configscript.sh | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/meta-isar/recipes-core/images/files/debian-configscript.sh b/meta-isar/recipes-core/images/files/debian-configscript.sh
index 042b530..e6d5335 100755
--- a/meta-isar/recipes-core/images/files/debian-configscript.sh
+++ b/meta-isar/recipes-core/images/files/debian-configscript.sh
@@ -63,3 +63,6 @@ fi
 # Purge unused locale and installed packages' .deb files
 localepurge
 apt-get clean
+
+# Remove qemu-*-static:
+find /usr/bin -maxdepth 1 -name 'qemu-*-static' -delete
diff --git a/meta-isar/recipes-core/images/files/raspbian-configscript.sh b/meta-isar/recipes-core/images/files/raspbian-configscript.sh
index ec05a6b..d7bdc07 100644
--- a/meta-isar/recipes-core/images/files/raspbian-configscript.sh
+++ b/meta-isar/recipes-core/images/files/raspbian-configscript.sh
@@ -63,3 +63,6 @@ EOF
 
 localepurge
 apt-get clean
+
+# Remove qemu-*-static:
+find /usr/bin -maxdepth 1 -name 'qemu-*-static' -delete
-- 
2.16.3

Re: [PATCH v3 2/2] meta-isar/*-configscript: added removal of qemu-*-static binaries

[Alexander Smirnov]

Hi,

On 04/12/2018 10:01 AM, claudius.heine.ext@siemens.com wrote:
> From: Claudius Heine <ch@denx.de>
> 
> After the image has finished building, the qemu-*-static binaries that
> are installed by quemu-debootstrap can be removed because they are no
> longer needed.
> 
> Reported-by: Henning Schild <henning.schild@siemens.com>
> Signed-off-by: Claudius Heine <ch@denx.de>
> ---
>   meta-isar/recipes-core/images/files/debian-configscript.sh   | 3 +++
>   meta-isar/recipes-core/images/files/raspbian-configscript.sh | 3 +++
>   2 files changed, 6 insertions(+)
> 
> diff --git a/meta-isar/recipes-core/images/files/debian-configscript.sh b/meta-isar/recipes-core/images/files/debian-configscript.sh
> index 042b530..e6d5335 100755
> --- a/meta-isar/recipes-core/images/files/debian-configscript.sh
> +++ b/meta-isar/recipes-core/images/files/debian-configscript.sh
> @@ -63,3 +63,6 @@ fi
>   # Purge unused locale and installed packages' .deb files
>   localepurge
>   apt-get clean
> +
> +# Remove qemu-*-static:
> +find /usr/bin -maxdepth 1 -name 'qemu-*-static' -delete

If user requested to install 'qemu-user-static' package via 
IMAGE_INSTALL, this line will totally corrupt it. I think that the 
additional check like `dpkg -S xxx` before removing could help to avoid 
this.

Alex

> diff --git a/meta-isar/recipes-core/images/files/raspbian-configscript.sh b/meta-isar/recipes-core/images/files/raspbian-configscript.sh
> index ec05a6b..d7bdc07 100644
> --- a/meta-isar/recipes-core/images/files/raspbian-configscript.sh
> +++ b/meta-isar/recipes-core/images/files/raspbian-configscript.sh
> @@ -63,3 +63,6 @@ EOF
>   
>   localepurge
>   apt-get clean
> +
> +# Remove qemu-*-static:
> +find /usr/bin -maxdepth 1 -name 'qemu-*-static' -delete