From 5072966b4483473f265333dee4c6909db51dcd7e Mon Sep 17 00:00:00 2001 From: Markus Hoffrogge Date: Mon, 19 Jun 2023 22:04:01 +0200 Subject: [PATCH] armbian-install: use consistent logfile name and align the according /usr/lib folder name (#5340) * armbian-install: The log file should be named identical to the originally called install script - the log file should be named as: - /var/log/armbian-install.log if script armbian-install was originally called - /var/log/nand-sata-install.log - same for directory /usr/lib/nand-sata-install: - rename this directory to /usr/lib/armbian-install - create a symbolic link nand-sata-install to this folder for backward compatibility in a subsequent commit - abort script armbian-install with an error message: - if file ${EX_LIST} does not exist - if dir ${BOOTLOADER} does not exist - remove the "beta" from the version title of armbian-install * Add symlink /usr/lib/nand-sata-install to /usr/lib/armbian-install --- .../a10/bootloader/boot.axf | Bin .../a10/bootloader/boot.ini | 20 +++++++++--------- .../a10/bootloader/linux/linux.ini | 16 +++++++------- .../a10/bootloader/u-boot.bin | Bin .../a13/bootloader/boot.axf | Bin .../a13}/bootloader/boot.ini | 10 ++++----- .../a13}/bootloader/linux/linux.ini | 16 +++++++------- .../a13/bootloader/linux/u-boot.bin | Bin .../a20/bootloader/boot.axf | Bin .../a20}/bootloader/boot.ini | 10 ++++----- .../a20}/bootloader/linux/linux.ini | 16 +++++++------- .../a20/bootloader/linux/u-boot.bin | Bin .../exclude.txt | 0 packages/bsp/common/usr/lib/nand-sata-install | 1 + packages/bsp/common/usr/sbin/armbian-install | 12 +++++++---- 15 files changed, 53 insertions(+), 48 deletions(-) rename packages/bsp/common/usr/lib/{nand-sata-install => armbian-install}/a10/bootloader/boot.axf (100%) rename packages/bsp/common/usr/lib/{nand-sata-install => armbian-install}/a10/bootloader/boot.ini (92%) rename packages/bsp/common/usr/lib/{nand-sata-install => armbian-install}/a10/bootloader/linux/linux.ini (94%) rename packages/bsp/common/usr/lib/{nand-sata-install => armbian-install}/a10/bootloader/u-boot.bin (100%) rename packages/bsp/common/usr/lib/{nand-sata-install => armbian-install}/a13/bootloader/boot.axf (100%) rename packages/bsp/common/usr/lib/{nand-sata-install/a20 => armbian-install/a13}/bootloader/boot.ini (94%) rename packages/bsp/common/usr/lib/{nand-sata-install/a20 => armbian-install/a13}/bootloader/linux/linux.ini (94%) rename packages/bsp/common/usr/lib/{nand-sata-install => armbian-install}/a13/bootloader/linux/u-boot.bin (100%) rename packages/bsp/common/usr/lib/{nand-sata-install => armbian-install}/a20/bootloader/boot.axf (100%) rename packages/bsp/common/usr/lib/{nand-sata-install/a13 => armbian-install/a20}/bootloader/boot.ini (94%) rename packages/bsp/common/usr/lib/{nand-sata-install/a13 => armbian-install/a20}/bootloader/linux/linux.ini (94%) rename packages/bsp/common/usr/lib/{nand-sata-install => armbian-install}/a20/bootloader/linux/u-boot.bin (100%) rename packages/bsp/common/usr/lib/{nand-sata-install => armbian-install}/exclude.txt (100%) create mode 120000 packages/bsp/common/usr/lib/nand-sata-install diff --git a/packages/bsp/common/usr/lib/nand-sata-install/a10/bootloader/boot.axf b/packages/bsp/common/usr/lib/armbian-install/a10/bootloader/boot.axf similarity index 100% rename from packages/bsp/common/usr/lib/nand-sata-install/a10/bootloader/boot.axf rename to packages/bsp/common/usr/lib/armbian-install/a10/bootloader/boot.axf diff --git a/packages/bsp/common/usr/lib/nand-sata-install/a10/bootloader/boot.ini b/packages/bsp/common/usr/lib/armbian-install/a10/bootloader/boot.ini similarity index 92% rename from packages/bsp/common/usr/lib/nand-sata-install/a10/bootloader/boot.ini rename to packages/bsp/common/usr/lib/armbian-install/a10/bootloader/boot.ini index e71070d557..c01cc1cd48 100644 --- a/packages/bsp/common/usr/lib/nand-sata-install/a10/bootloader/boot.ini +++ b/packages/bsp/common/usr/lib/armbian-install/a10/bootloader/boot.ini @@ -1,10 +1,10 @@ -[system] -start_os_name = linux -timeout = -1 -display_device= -1 -display_mode = 0 -erase_flash = 1 - - -[linux] - +[system] +start_os_name = linux +timeout = -1 +display_device= -1 +display_mode = 0 +erase_flash = 1 + + +[linux] + diff --git a/packages/bsp/common/usr/lib/nand-sata-install/a10/bootloader/linux/linux.ini b/packages/bsp/common/usr/lib/armbian-install/a10/bootloader/linux/linux.ini similarity index 94% rename from packages/bsp/common/usr/lib/nand-sata-install/a10/bootloader/linux/linux.ini rename to packages/bsp/common/usr/lib/armbian-install/a10/bootloader/linux/linux.ini index fc1c7d909e..c66eff6ebb 100644 --- a/packages/bsp/common/usr/lib/nand-sata-install/a10/bootloader/linux/linux.ini +++ b/packages/bsp/common/usr/lib/armbian-install/a10/bootloader/linux/linux.ini @@ -1,8 +1,8 @@ -[segment] -img_name = c:\u-boot.bin -img_size = 0x80000 -img_base = 0x4A000000 - -[script_info] -script_base = 0x43000000 -script_size = 0x10000 +[segment] +img_name = c:\u-boot.bin +img_size = 0x80000 +img_base = 0x4A000000 + +[script_info] +script_base = 0x43000000 +script_size = 0x10000 diff --git a/packages/bsp/common/usr/lib/nand-sata-install/a10/bootloader/u-boot.bin b/packages/bsp/common/usr/lib/armbian-install/a10/bootloader/u-boot.bin similarity index 100% rename from packages/bsp/common/usr/lib/nand-sata-install/a10/bootloader/u-boot.bin rename to packages/bsp/common/usr/lib/armbian-install/a10/bootloader/u-boot.bin diff --git a/packages/bsp/common/usr/lib/nand-sata-install/a13/bootloader/boot.axf b/packages/bsp/common/usr/lib/armbian-install/a13/bootloader/boot.axf similarity index 100% rename from packages/bsp/common/usr/lib/nand-sata-install/a13/bootloader/boot.axf rename to packages/bsp/common/usr/lib/armbian-install/a13/bootloader/boot.axf diff --git a/packages/bsp/common/usr/lib/nand-sata-install/a20/bootloader/boot.ini b/packages/bsp/common/usr/lib/armbian-install/a13/bootloader/boot.ini similarity index 94% rename from packages/bsp/common/usr/lib/nand-sata-install/a20/bootloader/boot.ini rename to packages/bsp/common/usr/lib/armbian-install/a13/bootloader/boot.ini index ca8afeb1c6..57ff0e0ccc 100644 --- a/packages/bsp/common/usr/lib/nand-sata-install/a20/bootloader/boot.ini +++ b/packages/bsp/common/usr/lib/armbian-install/a13/bootloader/boot.ini @@ -1,5 +1,5 @@ -[system] -start_os_name = linux -timeout = -1 -display_device= 0 -display_mode = 0 +[system] +start_os_name = linux +timeout = -1 +display_device= 0 +display_mode = 0 diff --git a/packages/bsp/common/usr/lib/nand-sata-install/a20/bootloader/linux/linux.ini b/packages/bsp/common/usr/lib/armbian-install/a13/bootloader/linux/linux.ini similarity index 94% rename from packages/bsp/common/usr/lib/nand-sata-install/a20/bootloader/linux/linux.ini rename to packages/bsp/common/usr/lib/armbian-install/a13/bootloader/linux/linux.ini index 39706b0ee9..7a1562b312 100644 --- a/packages/bsp/common/usr/lib/nand-sata-install/a20/bootloader/linux/linux.ini +++ b/packages/bsp/common/usr/lib/armbian-install/a13/bootloader/linux/linux.ini @@ -1,8 +1,8 @@ -[segment] -img_name = c:\linux\u-boot.bin -img_size = 0x80000 -img_base = 0x4A000000 - -[script_info] -script_base = 0x43000000 -script_size = 0x10000 +[segment] +img_name = c:\linux\u-boot.bin +img_size = 0x80000 +img_base = 0x4A000000 + +[script_info] +script_base = 0x43000000 +script_size = 0x10000 diff --git a/packages/bsp/common/usr/lib/nand-sata-install/a13/bootloader/linux/u-boot.bin b/packages/bsp/common/usr/lib/armbian-install/a13/bootloader/linux/u-boot.bin similarity index 100% rename from packages/bsp/common/usr/lib/nand-sata-install/a13/bootloader/linux/u-boot.bin rename to packages/bsp/common/usr/lib/armbian-install/a13/bootloader/linux/u-boot.bin diff --git a/packages/bsp/common/usr/lib/nand-sata-install/a20/bootloader/boot.axf b/packages/bsp/common/usr/lib/armbian-install/a20/bootloader/boot.axf similarity index 100% rename from packages/bsp/common/usr/lib/nand-sata-install/a20/bootloader/boot.axf rename to packages/bsp/common/usr/lib/armbian-install/a20/bootloader/boot.axf diff --git a/packages/bsp/common/usr/lib/nand-sata-install/a13/bootloader/boot.ini b/packages/bsp/common/usr/lib/armbian-install/a20/bootloader/boot.ini similarity index 94% rename from packages/bsp/common/usr/lib/nand-sata-install/a13/bootloader/boot.ini rename to packages/bsp/common/usr/lib/armbian-install/a20/bootloader/boot.ini index ca8afeb1c6..57ff0e0ccc 100644 --- a/packages/bsp/common/usr/lib/nand-sata-install/a13/bootloader/boot.ini +++ b/packages/bsp/common/usr/lib/armbian-install/a20/bootloader/boot.ini @@ -1,5 +1,5 @@ -[system] -start_os_name = linux -timeout = -1 -display_device= 0 -display_mode = 0 +[system] +start_os_name = linux +timeout = -1 +display_device= 0 +display_mode = 0 diff --git a/packages/bsp/common/usr/lib/nand-sata-install/a13/bootloader/linux/linux.ini b/packages/bsp/common/usr/lib/armbian-install/a20/bootloader/linux/linux.ini similarity index 94% rename from packages/bsp/common/usr/lib/nand-sata-install/a13/bootloader/linux/linux.ini rename to packages/bsp/common/usr/lib/armbian-install/a20/bootloader/linux/linux.ini index 39706b0ee9..7a1562b312 100644 --- a/packages/bsp/common/usr/lib/nand-sata-install/a13/bootloader/linux/linux.ini +++ b/packages/bsp/common/usr/lib/armbian-install/a20/bootloader/linux/linux.ini @@ -1,8 +1,8 @@ -[segment] -img_name = c:\linux\u-boot.bin -img_size = 0x80000 -img_base = 0x4A000000 - -[script_info] -script_base = 0x43000000 -script_size = 0x10000 +[segment] +img_name = c:\linux\u-boot.bin +img_size = 0x80000 +img_base = 0x4A000000 + +[script_info] +script_base = 0x43000000 +script_size = 0x10000 diff --git a/packages/bsp/common/usr/lib/nand-sata-install/a20/bootloader/linux/u-boot.bin b/packages/bsp/common/usr/lib/armbian-install/a20/bootloader/linux/u-boot.bin similarity index 100% rename from packages/bsp/common/usr/lib/nand-sata-install/a20/bootloader/linux/u-boot.bin rename to packages/bsp/common/usr/lib/armbian-install/a20/bootloader/linux/u-boot.bin diff --git a/packages/bsp/common/usr/lib/nand-sata-install/exclude.txt b/packages/bsp/common/usr/lib/armbian-install/exclude.txt similarity index 100% rename from packages/bsp/common/usr/lib/nand-sata-install/exclude.txt rename to packages/bsp/common/usr/lib/armbian-install/exclude.txt diff --git a/packages/bsp/common/usr/lib/nand-sata-install b/packages/bsp/common/usr/lib/nand-sata-install new file mode 120000 index 0000000000..6df62da637 --- /dev/null +++ b/packages/bsp/common/usr/lib/nand-sata-install @@ -0,0 +1 @@ +armbian-install \ No newline at end of file diff --git a/packages/bsp/common/usr/sbin/armbian-install b/packages/bsp/common/usr/sbin/armbian-install index 2fe02e04e5..9cf51a4aaa 100755 --- a/packages/bsp/common/usr/sbin/armbian-install +++ b/packages/bsp/common/usr/sbin/armbian-install @@ -22,22 +22,26 @@ [[ -f /usr/lib/u-boot/platform_install.sh ]] && source /usr/lib/u-boot/platform_install.sh -# script configuration -CWD="/usr/lib/nand-sata-install" +# ORIGINAL_SCRIPT_NAME: Must be either armbian-install or nand-sata-install +ORIGINAL_SCRIPT_NAME=$(basename $0) +# script configuration - derive from ORIGINAL_SCRIPT_NAME +CWD="/usr/lib/${ORIGINAL_SCRIPT_NAME}" EX_LIST="${CWD}/exclude.txt" +[ ! -f ${EX_LIST} ] && echo -e "### Board installation issue: File ${EX_LIST} does not exist or is not accessible!\n" && exit 1 [ -f /etc/default/openmediavault ] && echo '/srv/*' >> "${EX_LIST}" -logfile="/var/log/nand-sata-install.log" +logfile="/var/log/${ORIGINAL_SCRIPT_NAME}.log" # read in board info [[ -f /etc/armbian-release ]] && source /etc/armbian-release backtitle="Armbian for $BOARD_NAME install script, https://www.armbian.com" -title="Armbian installer beta v${VERSION}" +title="Armbian installer v${VERSION}" # exceptions if grep -q 'sun4i' /proc/cpuinfo; then DEVICE_TYPE="a10"; elif grep -q 'sun5i' /proc/cpuinfo; then DEVICE_TYPE="a13"; else DEVICE_TYPE="a20"; fi BOOTLOADER="${CWD}/${DEVICE_TYPE}/bootloader" +[ ! -d ${BOOTLOADER} ] && echo -e "### Board installation issue: Directory ${BOOTLOADER} does not exist or is not accessible!\n" && exit 1 FIRSTSECTOR=32768 #recognize_root