config/show_config: reorder output

Order is roughly:

How is the buildsystem for the image set up
What hardware support is being added
What filesystems will be supported
What Network services are available
Who is providing the graphics and their setup
How does it boot / login
Distribution configuration

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
This commit is contained in:
Ian Leonard 2020-05-11 15:35:42 +00:00
parent e9862ccd6c
commit 0ea91f8079
2 changed files with 31 additions and 33 deletions

View File

@ -9,7 +9,7 @@ show_config() {
# Build options # Build options
config_message+="\n\n Buildoptions:" config_message+="\n\n Buildsystem configuration:"
config_message+="\n $dashes$dashes" config_message+="\n $dashes$dashes"
config_message+="\n - CPU (ARCH):\t\t\t\t $TARGET_CPU ($TARGET_ARCH)" config_message+="\n - CPU (ARCH):\t\t\t\t $TARGET_CPU ($TARGET_ARCH)"
@ -24,21 +24,6 @@ show_config() {
# config_message+="\n - CFLAGS:\t $TARGET_CFLAGS" # config_message+="\n - CFLAGS:\t $TARGET_CFLAGS"
# config_message+="\n - LDFLAGS:\t $TARGET_LDFLAGS" # config_message+="\n - LDFLAGS:\t $TARGET_LDFLAGS"
# Graphic configuration
config_message+="\n\n Graphic configuration:"
config_message+="\n $dashes$dashes"
if [ "$DISPLAYSERVER" = "x11" ] ; then
config_message+="\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS"
config_message+="\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT"
config_message+="\n - WindowManager:\t\t\t $WINDOWMANAGER"
fi
config_message+="\n - OpenGL (GLX) support (provider):\t $OPENGL_SUPPORT ($OPENGL)"
config_message+="\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)"
config_message+="\n - VAAPI Support:\t\t\t $VAAPI_SUPPORT"
config_message+="\n - VDPAU Support:\t\t\t $VDPAU_SUPPORT"
# Misc. hardware configuration # Misc. hardware configuration
config_message+="\n\n Misc. hardware configuration:" config_message+="\n\n Misc. hardware configuration:"
@ -62,6 +47,19 @@ show_config() {
config_message+="\n - Include firmware:\t\t\t $config_firmware" config_message+="\n - Include firmware:\t\t\t $config_firmware"
done done
# Misc. Filesystems
config_message+="\n\n Misc. Filesystems:"
config_message+="\n $dashes$dashes"
config_message+="\n - Swap Support:\t\t\t $SWAP_SUPPORT"
if [ "$SWAP_SUPPORT" = "yes" ]; then
config_message+="\n - Swapfile default size:\t\t $SWAPFILESIZE"
fi
config_message+="\n - exFAT Support (via Fuse):\t\t $EXFAT"
config_message+="\n - NTFS Support (via Fuse):\t\t $NTFS3G"
config_message+="\n - Install HFS Tools:\t\t\t $HFSTOOLS"
# Network service configuration # Network service configuration
config_message+="\n\n Network service configuration:" config_message+="\n\n Network service configuration:"
@ -75,6 +73,21 @@ show_config() {
config_message+="\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT" config_message+="\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
config_message+="\n - WireGuard support:\t\t\t $WIREGUARD_SUPPORT" config_message+="\n - WireGuard support:\t\t\t $WIREGUARD_SUPPORT"
# Graphic configuration
config_message+="\n\n Graphic configuration:"
config_message+="\n $dashes$dashes"
if [ "$DISPLAYSERVER" = "x11" ] ; then
config_message+="\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS"
config_message+="\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT"
config_message+="\n - WindowManager:\t\t\t $WINDOWMANAGER"
fi
config_message+="\n - OpenGL (GLX) support (provider):\t $OPENGL_SUPPORT ($OPENGL)"
config_message+="\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)"
config_message+="\n - VAAPI Support:\t\t\t $VAAPI_SUPPORT"
config_message+="\n - VDPAU Support:\t\t\t $VDPAU_SUPPORT"
# OS configuration # OS configuration
config_message+="\n\n OS configuration:" config_message+="\n\n OS configuration:"
@ -89,25 +102,13 @@ show_config() {
config_message+="\n - Include package:\t\t\t $config_package" config_message+="\n - Include package:\t\t\t $config_package"
done done
# Misc. Filesystems # Distribution specific configuration
config_message+="\n\n Misc. Filesystems:"
config_message+="\n $dashes$dashes"
config_message+="\n - Swap Support:\t\t\t $SWAP_SUPPORT"
if [ "$SWAP_SUPPORT" = "yes" ]; then
config_message+="\n - Swapfile default size:\t\t $SWAPFILESIZE"
fi
config_message+="\n - exFAT Support (via Fuse):\t\t $EXFAT"
config_message+="\n - NTFS Support (via Fuse):\t\t $NTFS3G"
config_message+="\n - Install HFS Tools:\t\t\t $HFSTOOLS"
if [ "$(type -t show_distro_config)" = "function" ]; then if [ "$(type -t show_distro_config)" = "function" ]; then
show_distro_config show_distro_config
fi fi
config_message+="\n" config_message+="\n\n $dashes$dashes$dashes"
config_message+="\n $dashes$dashes$dashes"
config_message+="\n End Configuration for $DISTRONAME" config_message+="\n End Configuration for $DISTRONAME"
config_message+="\n $dashes$dashes$dashes" config_message+="\n $dashes$dashes$dashes"
config_message+="\n\n\n" config_message+="\n\n\n"

View File

@ -8,9 +8,6 @@ show_distro_config() {
# Input device configuration # Input device configuration
# config_message+="\n\n Input device configuration:"
# config_message+="\n $dashes$dashes"
config_message+="\n - Remote support:\t\t\t $REMOTE_SUPPORT" config_message+="\n - Remote support:\t\t\t $REMOTE_SUPPORT"
config_message+="\n - CEC Adapter support:\t\t\t $CEC_SUPPORT" config_message+="\n - CEC Adapter support:\t\t\t $CEC_SUPPORT"
config_message+="\n - CEC Framework support:\t\t $CEC_FRAMEWORK_SUPPORT" config_message+="\n - CEC Framework support:\t\t $CEC_FRAMEWORK_SUPPORT"