From 8af15ed22a03c5662573f946f6e77f16f81fc406 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 17 Dec 2017 19:12:59 +0000 Subject: [PATCH] config/show_config: move to separate file --- config/functions | 170 --------------------------------------------- config/show_config | 168 ++++++++++++++++++++++++++++++++++++++++++++ scripts/image | 1 + 3 files changed, 169 insertions(+), 170 deletions(-) create mode 100644 config/show_config diff --git a/config/functions b/config/functions index df8c3d579b..6bfa4a861c 100644 --- a/config/functions +++ b/config/functions @@ -581,176 +581,6 @@ check_config() { fi } -show_config() { - # load graphic configuration - get_graphicdrivers - - dashes="===========================" - config_message="$config_message\n $dashes$dashes$dashes" - config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community"))" - config_message="$config_message\n $dashes$dashes$dashes" - - # Build options - - config_message="$config_message\n\n Buildoptions:" - config_message="$config_message\n $dashes$dashes" - - config_message="$config_message\n - CPU (ARCH):\t\t\t\t $TARGET_CPU ($TARGET_ARCH)" - config_message="$config_message\n - FLOAT:\t\t\t\t $TARGET_FLOAT" - config_message="$config_message\n - FPU:\t\t\t\t\t $TARGET_FPU" - config_message="$config_message\n - SIMD support:\t\t\t $SIMD_SUPPORT" - config_message="$config_message\n - LTO (Link Time Optimization) support: $LTO_SUPPORT" - config_message="$config_message\n - GOLD (Google Linker) Support:\t $GOLD_SUPPORT" - config_message="$config_message\n - LLVM support:\t\t\t $LLVM_SUPPORT" - - # config_message="$config_message\n - CFLAGS:\t $TARGET_CFLAGS" - # config_message="$config_message\n - LDFLAGS:\t $TARGET_LDFLAGS" - - # Graphic configuration - - config_message="$config_message\n\n Graphic configuration:" - config_message="$config_message\n $dashes$dashes" - - if [ "$DISPLAYSERVER" = "x11" ] ; then - config_message="$config_message\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS" - config_message="$config_message\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT" - config_message="$config_message\n - WindowManager:\t\t\t $WINDOWMANAGER" - fi - config_message="$config_message\n - OpenGL (GLX) support (provider):\t $OPENGL_SUPPORT ($OPENGL)" - config_message="$config_message\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)" - config_message="$config_message\n - uvesafb support:\t\t\t $UVESAFB_SUPPORT" - - # Hardware decoder support - - config_message="$config_message\n\n Hardware decoder configuration:" - config_message="$config_message\n $dashes$dashes" - - config_message="$config_message\n - Kodi Player driver:\t\t\t $KODIPLAYER_DRIVER" - config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI_SUPPORT" - config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU_SUPPORT" - - # Input device configuration - - config_message="$config_message\n\n Input device configuration:" - config_message="$config_message\n $dashes$dashes" - - config_message="$config_message\n - Remote support:\t\t\t $REMOTE_SUPPORT" - config_message="$config_message\n - ATV Remote support:\t\t\t $ATVCLIENT_SUPPORT" - config_message="$config_message\n - CEC Adapter support:\t\t\t $CEC_SUPPORT" - config_message="$config_message\n - CEC Framework support:\t\t\t $CEC_FRAMEWORK_SUPPORT" - config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT" - - # Misc. hardware configuration - - config_message="$config_message\n\n Misc. hardware configuration:" - config_message="$config_message\n $dashes$dashes" - - config_message="$config_message\n - ALSA support:\t\t\t $ALSA_SUPPORT" - config_message="$config_message\n - Pulseaudio support:\t\t\t $PULSEAUDIO_SUPPORT" - config_message="$config_message\n - Bluetooth support:\t\t\t $BLUETOOTH_SUPPORT" - - for config_driver in $ADDITIONAL_DRIVERS; do - config_message="$config_message\n - Include driver:\t\t\t $config_driver" - done - - if [ "$DRIVER_ADDONS_SUPPORT" = "yes" ]; then - for config_driver_addons in $DRIVER_ADDONS; do - config_message="$config_message\n - Include driver add-ons:\t\t $config_driver_addons" - done - fi - - for config_firmware in $FIRMWARE; do - config_message="$config_message\n - Include firmware:\t\t\t $config_firmware" - done - - for config_modules in $INITRAMFS_MODULES; do - config_message="$config_message\n - Initramfs modules:\t\t\t $config_modules" - done - - # Network service configuration - - config_message="$config_message\n\n Network service configuration:" - config_message="$config_message\n $dashes$dashes" - - config_message="$config_message\n - Avahi (Zeroconf) support:\t\t $AVAHI_DAEMON" - config_message="$config_message\n - NFS mounting support:\t\t $NFS_SUPPORT" - config_message="$config_message\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT" - config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER" - config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER" - config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT" - - # OS configuration - - config_message="$config_message\n\n OS configuration:" - config_message="$config_message\n $dashes$dashes" - - config_message="$config_message\n - OEM Support:\t\t\t\t $OEM_SUPPORT" - config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD" - config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER" - if [ "$BOOTLOADER" = "u-boot" ]; then - config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG" - config_message="$config_message\n - U-Boot config file:\t\t $UBOOT_CONFIGFILE" - fi - config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL" - config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT" - - # Misc. Filesystems - - config_message="$config_message\n\n Misc. Filesystems:" - config_message="$config_message\n $dashes$dashes" - - config_message="$config_message\n - Swap Support:\t\t\t $SWAP_SUPPORT" - if [ "$SWAP_SUPPORT" = "yes" ]; then - config_message="$config_message\n - Swapfile default size:\t\t $SWAPFILESIZE" - fi - config_message="$config_message\n - exFAT Support (via Fuse):\t\t $EXFAT" - config_message="$config_message\n - NTFS Support (via Fuse):\t\t $NTFS3G" - config_message="$config_message\n - Install HFS Tools:\t\t\t $HFSTOOLS" - - # Kodi configuration - - config_message="$config_message\n\n Kodi configuration:" - config_message="$config_message\n $dashes$dashes" - - config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER" - config_message="$config_message\n - Kodi nonfree support:\t\t $KODI_NONFREE_SUPPORT" - config_message="$config_message\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_SUPPORT" - if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then - config_message="$config_message\n - Bluray BD+ support:\t\t $BLURAY_BDPLUS_SUPPORT" - config_message="$config_message\n - Bluray AACS support:\t\t $BLURAY_AACS_SUPPORT" - fi - config_message="$config_message\n - Kodi DVDCSS support:\t\t\t $KODI_DVDCSS_SUPPORT" - config_message="$config_message\n - Kodi Airplay support:\t\t $KODI_AIRPLAY_SUPPORT" - config_message="$config_message\n - Kodi Airtunes support:\t\t $KODI_AIRTUNES_SUPPORT" - config_message="$config_message\n - Kodi NFS support:\t\t\t $KODI_NFS_SUPPORT" - config_message="$config_message\n - Kodi MySQL support:\t\t\t $KODI_MYSQL_SUPPORT" - config_message="$config_message\n - Kodi Optical Drive support:\t\t $KODI_OPTICAL_SUPPORT" - config_message="$config_message\n - Kodi SAMBA client support:\t\t $KODI_SAMBA_SUPPORT" - config_message="$config_message\n - Kodi SSH client support:\t\t $KODI_SSHLIB_SUPPORT" - config_message="$config_message\n - Kodi UPNP support:\t\t\t $KODI_UPNP_SUPPORT" - config_message="$config_message\n - Kodi Webserver support:\t\t $KODI_WEBSERVER_SUPPORT" - - - for config_skin in $SKINS; do - config_message="$config_message\n - Include Skin:\t\t\t $config_skin" - done - - config_message="$config_message\n - Default Skin:\t\t\t $SKIN_DEFAULT" - config_message="$config_message\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS" - - if [ "$(type -t show_distro_config)" = "function" ]; then - show_distro_config - fi - - config_message="$config_message\n" - config_message="$config_message\n $dashes$dashes$dashes" - config_message="$config_message\n End Configuration for $DISTRONAME" - config_message="$config_message\n $dashes$dashes$dashes" - config_message="$config_message\n\n\n" - - echo -e "$config_message" -} - # strip debug_strip() { if [ ! "$DEBUG" = yes ]; then diff --git a/config/show_config b/config/show_config new file mode 100644 index 0000000000..9c090f137f --- /dev/null +++ b/config/show_config @@ -0,0 +1,168 @@ +show_config() { + # load graphic configuration + get_graphicdrivers + + dashes="===========================" + config_message="$config_message\n $dashes$dashes$dashes" + config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community"))" + config_message="$config_message\n $dashes$dashes$dashes" + + # Build options + + config_message="$config_message\n\n Buildoptions:" + config_message="$config_message\n $dashes$dashes" + + config_message="$config_message\n - CPU (ARCH):\t\t\t\t $TARGET_CPU ($TARGET_ARCH)" + config_message="$config_message\n - FLOAT:\t\t\t\t $TARGET_FLOAT" + config_message="$config_message\n - FPU:\t\t\t\t\t $TARGET_FPU" + config_message="$config_message\n - SIMD support:\t\t\t $SIMD_SUPPORT" + config_message="$config_message\n - LTO (Link Time Optimization) support: $LTO_SUPPORT" + config_message="$config_message\n - GOLD (Google Linker) Support:\t $GOLD_SUPPORT" + config_message="$config_message\n - LLVM support:\t\t\t $LLVM_SUPPORT" + + # config_message="$config_message\n - CFLAGS:\t $TARGET_CFLAGS" + # config_message="$config_message\n - LDFLAGS:\t $TARGET_LDFLAGS" + + # Graphic configuration + + config_message="$config_message\n\n Graphic configuration:" + config_message="$config_message\n $dashes$dashes" + + if [ "$DISPLAYSERVER" = "x11" ] ; then + config_message="$config_message\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS" + config_message="$config_message\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT" + config_message="$config_message\n - WindowManager:\t\t\t $WINDOWMANAGER" + fi + config_message="$config_message\n - OpenGL (GLX) support (provider):\t $OPENGL_SUPPORT ($OPENGL)" + config_message="$config_message\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)" + config_message="$config_message\n - uvesafb support:\t\t\t $UVESAFB_SUPPORT" + + # Hardware decoder support + + config_message="$config_message\n\n Hardware decoder configuration:" + config_message="$config_message\n $dashes$dashes" + + config_message="$config_message\n - Kodi Player driver:\t\t\t $KODIPLAYER_DRIVER" + config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI_SUPPORT" + config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU_SUPPORT" + + # Input device configuration + + config_message="$config_message\n\n Input device configuration:" + config_message="$config_message\n $dashes$dashes" + + config_message="$config_message\n - Remote support:\t\t\t $REMOTE_SUPPORT" + config_message="$config_message\n - ATV Remote support:\t\t\t $ATVCLIENT_SUPPORT" + config_message="$config_message\n - CEC Adapter support:\t\t\t $CEC_SUPPORT" + config_message="$config_message\n - CEC Framework support:\t\t $CEC_FRAMEWORK_SUPPORT" + config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT" + + # Misc. hardware configuration + + config_message="$config_message\n\n Misc. hardware configuration:" + config_message="$config_message\n $dashes$dashes" + + config_message="$config_message\n - ALSA support:\t\t\t $ALSA_SUPPORT" + config_message="$config_message\n - Pulseaudio support:\t\t\t $PULSEAUDIO_SUPPORT" + config_message="$config_message\n - Bluetooth support:\t\t\t $BLUETOOTH_SUPPORT" + + for config_driver in $ADDITIONAL_DRIVERS; do + config_message="$config_message\n - Include driver:\t\t\t $config_driver" + done + + if [ "$DRIVER_ADDONS_SUPPORT" = "yes" ]; then + for config_driver_addons in $DRIVER_ADDONS; do + config_message="$config_message\n - Include driver add-ons:\t\t $config_driver_addons" + done + fi + + for config_firmware in $FIRMWARE; do + config_message="$config_message\n - Include firmware:\t\t\t $config_firmware" + done + + for config_modules in $INITRAMFS_MODULES; do + config_message="$config_message\n - Initramfs modules:\t\t\t $config_modules" + done + + # Network service configuration + + config_message="$config_message\n\n Network service configuration:" + config_message="$config_message\n $dashes$dashes" + + config_message="$config_message\n - Avahi (Zeroconf) support:\t\t $AVAHI_DAEMON" + config_message="$config_message\n - NFS mounting support:\t\t $NFS_SUPPORT" + config_message="$config_message\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT" + config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER" + config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER" + config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT" + + # OS configuration + + config_message="$config_message\n\n OS configuration:" + config_message="$config_message\n $dashes$dashes" + + config_message="$config_message\n - OEM Support:\t\t\t\t $OEM_SUPPORT" + config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD" + config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER" + if [ "$BOOTLOADER" = "u-boot" ]; then + config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG" + config_message="$config_message\n - U-Boot config file:\t\t $UBOOT_CONFIGFILE" + fi + config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL" + config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT" + + # Misc. Filesystems + + config_message="$config_message\n\n Misc. Filesystems:" + config_message="$config_message\n $dashes$dashes" + + config_message="$config_message\n - Swap Support:\t\t\t $SWAP_SUPPORT" + if [ "$SWAP_SUPPORT" = "yes" ]; then + config_message="$config_message\n - Swapfile default size:\t\t $SWAPFILESIZE" + fi + config_message="$config_message\n - exFAT Support (via Fuse):\t\t $EXFAT" + config_message="$config_message\n - NTFS Support (via Fuse):\t\t $NTFS3G" + config_message="$config_message\n - Install HFS Tools:\t\t\t $HFSTOOLS" + + # Kodi configuration + + config_message="$config_message\n\n Kodi configuration:" + config_message="$config_message\n $dashes$dashes" + + config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER" + config_message="$config_message\n - Kodi nonfree support:\t\t $KODI_NONFREE_SUPPORT" + config_message="$config_message\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_SUPPORT" + if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then + config_message="$config_message\n - Bluray BD+ support:\t\t $BLURAY_BDPLUS_SUPPORT" + config_message="$config_message\n - Bluray AACS support:\t\t $BLURAY_AACS_SUPPORT" + fi + config_message="$config_message\n - Kodi DVDCSS support:\t\t\t $KODI_DVDCSS_SUPPORT" + config_message="$config_message\n - Kodi Airplay support:\t\t $KODI_AIRPLAY_SUPPORT" + config_message="$config_message\n - Kodi Airtunes support:\t\t $KODI_AIRTUNES_SUPPORT" + config_message="$config_message\n - Kodi NFS support:\t\t\t $KODI_NFS_SUPPORT" + config_message="$config_message\n - Kodi MySQL support:\t\t\t $KODI_MYSQL_SUPPORT" + config_message="$config_message\n - Kodi Optical Drive support:\t\t $KODI_OPTICAL_SUPPORT" + config_message="$config_message\n - Kodi SAMBA client support:\t\t $KODI_SAMBA_SUPPORT" + config_message="$config_message\n - Kodi SSH client support:\t\t $KODI_SSHLIB_SUPPORT" + config_message="$config_message\n - Kodi UPNP support:\t\t\t $KODI_UPNP_SUPPORT" + config_message="$config_message\n - Kodi Webserver support:\t\t $KODI_WEBSERVER_SUPPORT" + + for config_skin in $SKINS; do + config_message="$config_message\n - Include Skin:\t\t\t $config_skin" + done + + config_message="$config_message\n - Default Skin:\t\t\t $SKIN_DEFAULT" + config_message="$config_message\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS" + + if [ "$(type -t show_distro_config)" = "function" ]; then + show_distro_config + fi + + config_message="$config_message\n" + config_message="$config_message\n $dashes$dashes$dashes" + config_message="$config_message\n End Configuration for $DISTRONAME" + config_message="$config_message\n $dashes$dashes$dashes" + config_message="$config_message\n\n\n" + + echo -e "$config_message" +} diff --git a/scripts/image b/scripts/image index 7715e8435a..10f2252d74 100755 --- a/scripts/image +++ b/scripts/image @@ -22,6 +22,7 @@ unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL . config/options $1 +. config/show_config show_config setup_toolchain target