From 8827838e8be73691f84a7d7138925559463373eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sat, 6 Mar 2021 20:29:07 +0100 Subject: [PATCH] Distribution support status was not read when creating only BSP package (#2693) --- lib/general.sh | 6 +++--- lib/makeboarddeb.sh | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/general.sh b/lib/general.sh index 2ffff4132..e5a6a0899 100644 --- a/lib/general.sh +++ b/lib/general.sh @@ -632,15 +632,15 @@ function distros_options() { function set_distribution_status() { - local distro_support_desc_filepath="${DISTRIBUTIONS_DESC_DIR}/${RELEASE}/support" + local distro_support_desc_filepath="${SRC}/${DISTRIBUTIONS_DESC_DIR}/${RELEASE}/support" if [[ ! -f "${distro_support_desc_filepath}" ]]; then exit_with_error "Distribution ${distribution_name} does not exist" else DISTRIBUTION_STATUS="$(cat "${distro_support_desc_filepath}")" fi - + [[ "${DISTRIBUTION_STATUS}" != "supported" ]] && [[ "${EXPERT}" != "yes" ]] && exit_with_error "Armbian ${RELEASE} is unsupported and, therefore, only available to experts (EXPERT=yes)" - + } adding_packages() diff --git a/lib/makeboarddeb.sh b/lib/makeboarddeb.sh index 095ec55b8..6b8560c7d 100644 --- a/lib/makeboarddeb.sh +++ b/lib/makeboarddeb.sh @@ -266,6 +266,9 @@ fi activate update-initramfs EOF + # read distribution support status + set_distribution_status + # armhwinfo, firstrun, armbianmonitor, etc. config file cat <<-EOF > "${destination}"/etc/armbian-release # PLEASE DO NOT EDIT THIS FILE