Re: [Buildroot] [PATCH v4 3/3] board/canaan/k210-soc: use tinyinit as Linux init process

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Dario, All,

On 2024-08-31 14:08 +0200, Dario Binacchi spake thusly:
> The initialization script provided by the tinyinit package is the same
> as the one contained in board/canaan/k210-soc/rootfs_overlay/sbin/init
> except for the Linux logo, which has been removed. The patch reworks
> the configurations that use this overlay directory by replacing the
> initialization process contained within it with the one provided by
> the tinyinit package.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> Changes v3 -> v4:
>  - Replace BR2_INIT_NONE=y and BR2_PACKAGE_TINYINIT=y with
>    BR2_INIT_TINYINIT=y in stm32f746_disco_sd_defconfig
> 
> Changes v2 -> v3:
>  - Replace BR2_INIT_TINYINIT=y with BR2_INIT_NONE=y and
>    BR2_PACKAGE_TINYINIT=y in stm32f746_disco_sd_defconfig.
> 
> Changes v1 -> v2:
>  - Remove the logo management.
>  - Update the commit message.
> 
>  .checkpackageignore                           |  1 -
>  board/canaan/k210-soc/rootfs_overlay/init     |  1 -
>  .../canaan/k210-soc/rootfs_overlay/sbin/init  | 41 -------------------
>  configs/canaan_kd233_defconfig                |  3 +-
>  configs/sipeed_maix_bit_defconfig             |  3 +-
>  configs/sipeed_maix_bit_sdcard_defconfig      |  3 +-
>  configs/sipeed_maix_dock_defconfig            |  3 +-
>  configs/sipeed_maix_dock_sdcard_defconfig     |  3 +-
>  configs/sipeed_maix_go_defconfig              |  3 +-
>  configs/sipeed_maix_go_sdcard_defconfig       |  3 +-
>  configs/sipeed_maixduino_defconfig            |  3 +-
>  configs/sipeed_maixduino_sdcard_defconfig     |  3 +-
>  12 files changed, 9 insertions(+), 61 deletions(-)
>  delete mode 120000 board/canaan/k210-soc/rootfs_overlay/init
>  delete mode 100755 board/canaan/k210-soc/rootfs_overlay/sbin/init
> 
> diff --git a/.checkpackageignore b/.checkpackageignore
> index 4cfc202153c7..849bb2a55e47 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -22,7 +22,6 @@ board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh Shellcheck
>  board/bsh/imx8mn-bsh-smm-s2/flash.sh Shellcheck lib_shellscript.EmptyLastLine
>  board/bsh/imx8mn-bsh-smm-s2/post-build.sh Shellcheck
>  board/canaan/k210-soc/post-build.sh Shellcheck
> -board/canaan/k210-soc/rootfs_overlay/sbin/init Shellcheck
>  board/chromebook/elm/sign.sh Shellcheck
>  board/chromebook/mksd.sh Shellcheck
>  board/chromebook/snow/sign.sh Shellcheck
> diff --git a/board/canaan/k210-soc/rootfs_overlay/init b/board/canaan/k210-soc/rootfs_overlay/init
> deleted file mode 120000
> index a0b71977c06f..000000000000
> --- a/board/canaan/k210-soc/rootfs_overlay/init
> +++ /dev/null
> @@ -1 +0,0 @@
> -/sbin/init
> \ No newline at end of file
> diff --git a/board/canaan/k210-soc/rootfs_overlay/sbin/init b/board/canaan/k210-soc/rootfs_overlay/sbin/init
> deleted file mode 100755
> index d4bf53d45231..000000000000
> --- a/board/canaan/k210-soc/rootfs_overlay/sbin/init
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -#!/bin/sh
> -
> -# This script replaces the default busybox init process to avoid having that
> -# process staying alive and sleeping in the background, (uselessly) consuming
> -# precious memory.
> -
> -# Mount procfs and sysfs
> -/bin/mount -t proc proc /proc
> -/bin/mount -t sysfs sysfs /sys
> -
> -# When the kernel is directly booted, devtmpfs is not automatically mounted.
> -# Manually mount it if needed.
> -devmnt=$(mount | grep -c devtmpfs)
> -if [ ${devmnt} -eq 0 ]; then
> -    /bin/mount -t devtmpfs devtmpfs /dev
> -fi
> -
> -# Use the /dev/console device node from devtmpfs if possible to not
> -# confuse glibc's ttyname_r().
> -# This may fail (E.G. booted with console=), and errors from exec will
> -# terminate the shell, so use a subshell for the test
> -if (exec 0</dev/console) 2>/dev/null; then
> -    exec 0</dev/console
> -    exec 1>/dev/console
> -    exec 2>/dev/console
> -fi
> -
> -# Clear memory to reduce page fragmentation
> -echo 3 > /proc/sys/vm/drop_caches
> -
> -# Print a fun logo :)
> -echo "          __  _"
> -echo "         / / (_) ____   _   _ __  __"
> -echo "        / /  | ||  _ \\ | | | |\\ \\/ /"
> -echo "       / /___| || | | || |_| | >  < "
> -echo "      /_____/|_||_| |_| \\____|/_/\\_\\"
> -echo "    64-bits RISC-V Kendryte K210 NOMMU"
> -echo ""
> -
> -# Finally, let's start an interactive shell
> -exec /bin/sh
> diff --git a/configs/canaan_kd233_defconfig b/configs/canaan_kd233_defconfig
> index 832f8363a75c..27624aff4a9a 100644
> --- a/configs/canaan_kd233_defconfig
> +++ b/configs/canaan_kd233_defconfig
> @@ -32,6 +32,5 @@ BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.co
>  # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
>  
>  # Filesystem
> -BR2_INIT_NONE=y
> +BR2_INIT_TINYINIT=y
>  BR2_TARGET_ROOTFS_INITRAMFS=y
> -BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
> diff --git a/configs/sipeed_maix_bit_defconfig b/configs/sipeed_maix_bit_defconfig
> index 238e082a3d40..5119307330de 100644
> --- a/configs/sipeed_maix_bit_defconfig
> +++ b/configs/sipeed_maix_bit_defconfig
> @@ -32,6 +32,5 @@ BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.co
>  # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
>  
>  # Filesystem
> -BR2_INIT_NONE=y
> +BR2_INIT_TINYINIT=y
>  BR2_TARGET_ROOTFS_INITRAMFS=y
> -BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
> diff --git a/configs/sipeed_maix_bit_sdcard_defconfig b/configs/sipeed_maix_bit_sdcard_defconfig
> index 28aa143583bd..4047da159221 100644
> --- a/configs/sipeed_maix_bit_sdcard_defconfig
> +++ b/configs/sipeed_maix_bit_sdcard_defconfig
> @@ -33,10 +33,9 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_bit"
>  # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
>  
>  # Filesystem
> -BR2_INIT_NONE=y
> +BR2_INIT_TINYINIT=y
>  BR2_TARGET_ROOTFS_EXT2=y
>  BR2_TARGET_ROOTFS_EXT2_SIZE="64M"
> -BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
>  BR2_ROOTFS_POST_BUILD_SCRIPT="board/canaan/k210-soc/post-build.sh"
>  BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
>  BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/canaan/k210-soc/genimage.cfg"
> diff --git a/configs/sipeed_maix_dock_defconfig b/configs/sipeed_maix_dock_defconfig
> index ee1b0d837284..0caa4d4e3ae3 100644
> --- a/configs/sipeed_maix_dock_defconfig
> +++ b/configs/sipeed_maix_dock_defconfig
> @@ -32,6 +32,5 @@ BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.co
>  # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
>  
>  # Filesystem
> -BR2_INIT_NONE=y
> +BR2_INIT_TINYINIT=y
>  BR2_TARGET_ROOTFS_INITRAMFS=y
> -BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
> diff --git a/configs/sipeed_maix_dock_sdcard_defconfig b/configs/sipeed_maix_dock_sdcard_defconfig
> index 41a062c7a179..ecb640a47bb2 100644
> --- a/configs/sipeed_maix_dock_sdcard_defconfig
> +++ b/configs/sipeed_maix_dock_sdcard_defconfig
> @@ -33,10 +33,9 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_dock"
>  # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
>  
>  # Filesystem
> -BR2_INIT_NONE=y
> +BR2_INIT_TINYINIT=y
>  BR2_TARGET_ROOTFS_EXT2=y
>  BR2_TARGET_ROOTFS_EXT2_SIZE="64M"
> -BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
>  BR2_ROOTFS_POST_BUILD_SCRIPT="board/canaan/k210-soc/post-build.sh"
>  BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
>  BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/canaan/k210-soc/genimage.cfg"
> diff --git a/configs/sipeed_maix_go_defconfig b/configs/sipeed_maix_go_defconfig
> index a5b09e17ac1c..21075a9ed004 100644
> --- a/configs/sipeed_maix_go_defconfig
> +++ b/configs/sipeed_maix_go_defconfig
> @@ -32,6 +32,5 @@ BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.co
>  # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
>  
>  # Filesystem
> -BR2_INIT_NONE=y
> +BR2_INIT_TINYINIT=y
>  BR2_TARGET_ROOTFS_INITRAMFS=y
> -BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
> diff --git a/configs/sipeed_maix_go_sdcard_defconfig b/configs/sipeed_maix_go_sdcard_defconfig
> index 0e80d9c83ad8..5448bd0ce351 100644
> --- a/configs/sipeed_maix_go_sdcard_defconfig
> +++ b/configs/sipeed_maix_go_sdcard_defconfig
> @@ -33,10 +33,9 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_go"
>  # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
>  
>  # Filesystem
> -BR2_INIT_NONE=y
> +BR2_INIT_TINYINIT=y
>  BR2_TARGET_ROOTFS_EXT2=y
>  BR2_TARGET_ROOTFS_EXT2_SIZE="64M"
> -BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
>  BR2_ROOTFS_POST_BUILD_SCRIPT="board/canaan/k210-soc/post-build.sh"
>  BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
>  BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/canaan/k210-soc/genimage.cfg"
> diff --git a/configs/sipeed_maixduino_defconfig b/configs/sipeed_maixduino_defconfig
> index 7ba7653e8d5f..6c93b29b4343 100644
> --- a/configs/sipeed_maixduino_defconfig
> +++ b/configs/sipeed_maixduino_defconfig
> @@ -32,6 +32,5 @@ BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.co
>  # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
>  
>  # Filesystem
> -BR2_INIT_NONE=y
> +BR2_INIT_TINYINIT=y
>  BR2_TARGET_ROOTFS_INITRAMFS=y
> -BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
> diff --git a/configs/sipeed_maixduino_sdcard_defconfig b/configs/sipeed_maixduino_sdcard_defconfig
> index 7bdd36e1d09f..0b42cae45df7 100644
> --- a/configs/sipeed_maixduino_sdcard_defconfig
> +++ b/configs/sipeed_maixduino_sdcard_defconfig
> @@ -33,10 +33,9 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maixduino"
>  # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
>  
>  # Filesystem
> -BR2_INIT_NONE=y
> +BR2_INIT_TINYINIT=y
>  BR2_TARGET_ROOTFS_EXT2=y
>  BR2_TARGET_ROOTFS_EXT2_SIZE="64M"
> -BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
>  BR2_ROOTFS_POST_BUILD_SCRIPT="board/canaan/k210-soc/post-build.sh"
>  BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
>  BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/canaan/k210-soc/genimage.cfg"
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot