From 75489fd17cdb27e4223c41f23b9e0ca7c7e6b1d3 Mon Sep 17 00:00:00 2001
From: Ian Leonard <antonlacon@gmail.com>
Date: Wed, 13 Jan 2021 00:57:46 +0000
Subject: [PATCH] checkdeps: remove option to add extra depends in project or
 distro options

Broken since November 2019 without complaint. Remove.

Revert this commit and add '. config/options ""' to scripts/checkdeps to restore
or look at having checkdeps source a function or call a script in the
distro/project/device directory to check for additional dependencies.

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 projects/Rockchip/options | 18 ----------------
 scripts/checkdeps         | 44 +++++++++++++--------------------------
 2 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/projects/Rockchip/options b/projects/Rockchip/options
index 254ff3d6f6..501034cf03 100644
--- a/projects/Rockchip/options
+++ b/projects/Rockchip/options
@@ -85,21 +85,3 @@
 
   # debug tty path
     DEBUG_TTY="/dev/ttyS2"
-
-################################################################################
-# buildsystem extras for aarch64 native builds
-################################################################################
-# rkbin supplied as an x86-64 binary only
-if [ "$(uname -m)" = "aarch64" ]; then
-  declare -A EXTRA_DEP_MAP
-    EXTRA_DEP_MAP=(
-      [qemu-x86_64]=qemu-user-binfmt
-    )
-
-  echo -e "Copy from a working x86_64 system:\n\t/lib64/libc.so.6\n\t/lib/x86_64-linux-gnu/libc.so.6\n"
-  declare -A EXTRA_FILE_MAP
-    EXTRA_FILE_MAP=(
-      [/lib64/ld-linux-x86-64.so.2]="libc6:amd64"
-      [/lib/x86_64-linux-gnu/libc.so.6]="libc6:amd64"
-    )
-fi
diff --git a/scripts/checkdeps b/scripts/checkdeps
index 13b94650e6..629ca750d9 100755
--- a/scripts/checkdeps
+++ b/scripts/checkdeps
@@ -90,6 +90,19 @@ perl_map=(
   [XML::Parser]=libxml-parser-perl
 )
 
+### PROJECT SPECIFIC REQUIREMENTS ###
+# Extend build scripts to look for distro/project/device checkdep scripts before adding further checks here
+# Native aarch64 on debian(?) host Rockchip needs to support rkbin
+if [ "$(uname -m)" = "aarch64" -a "${PROJECT}" = "Rockchip" ]; then
+  dep_map[qemu-x86_64]=qemu-user-binfmt
+  if [ ! -f /lib64/ld-linux-x86-64.so.2 -o ! -f /lib/x86_64-linux-gnu/libc.so.6 ]; then
+    echo -e "Copy from a working x86_64 system:\n\t/lib64/ld-linux-x86-64.so.2\n\t/lib/x86_64-linux-gnu/libc.so.6"
+  fi
+  file_map[/lib64/ld-linux-x86-64.so.2]="libc6:amd64"
+  file_map[/lib/x86_64-linux-gnu/libc.so.6]="libc6:amd64"
+fi
+
+# remap or add [depend]=package needs based on host distro
 case "${DISTRO}" in
     fedora|centos|rhel)
       dep_map+=(
@@ -197,36 +210,7 @@ case "${DISTRO}" in
       ;;
 esac
 
-# EXTRA_* won't work without sourcing config/options in this script
-# project specific dependencies
-if [ "${#EXTRA_DEP_MAP[@]}" -gt 0 ]; then
-  echo "${EXTRA_DEP_MAP[@]}"
-  for key in "${!EXTRA_DEP_MAP[@]}"; do
-    dep_map["${key}"]="${EXTRA_DEP_MAP[${key}]}"
-  done
-fi
-
-# project specific file needs
-if [ "${#EXTRA_FILE_MAP[@]}" -gt 0 ]; then
-  for key in "${!EXTRA_FILE_MAP[@]}"; do
-    file_map["${key}"]="${EXTRA_FILE_MAP[${key}]}"
-  done
-fi
-
-# project specific perl modules
-if [ "${#EXTRA_PERL_MAP[@]}" -gt 0 ]; then
-  for key in "${!EXTRA_PERL_MAP[@]}"; do
-    perl_map["${key}"]="${EXTRA_PERL_MAP[${key}]}"
-  done
-fi
-
-# distro specific dependencies
-if [ "${#DISTRO_DEP_MAP[@]}" -gt 0 ]; then
-  for key in "${!DISTRO_DEP_MAP[@]}"; do
-    dep_map["${key}"]="${DISTRO_DEP_MAP[${key}]}"
-  done
-fi
-
+### DEPENDENCY CHECKING AND INSTALLATION ###
 get_deps
 
 if [ "${#need_map[@]}" -gt 0 ]; then