jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

checkdeps: remove option to add extra depends in project or distro options

Browse Source 
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>
This commit is contained in:
Ian Leonard 2021-01-13 00:57:46 +00:00
parent d655a20025
commit 75489fd17c
2 changed files with 14 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
projects/Rockchip/options
View File

@ -85,21 +85,3 @@
# debug tty path # debug tty path
DEBUG_TTY="/dev/ttyS2" 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

44
scripts/checkdeps
View File

@ -90,6 +90,19 @@ perl_map=(
[XML::Parser]=libxml-parser-perl [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 case "${DISTRO}" in
fedora|centos|rhel) fedora|centos|rhel)
dep_map+=( dep_map+=(
@ -197,36 +210,7 @@ case "${DISTRO}" in
;; ;;
esac esac
# EXTRA_* won't work without sourcing config/options in this script ### DEPENDENCY CHECKING AND INSTALLATION ###
# 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
get_deps get_deps
if [ "${#need_map[@]}" -gt 0 ]; then if [ "${#need_map[@]}" -gt 0 ]; then