JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

armbian-next: [focal-host] try to support focal-like host OS's again, via python3.9 (and drop buster completely)

Browse Source 
- completely remove support for building under `buster` -- that's way too old, sorry.
- de-hardcode `python3` invocations, instead use `python3_binary_path` set by `prepare_python3_binary_for_python_tools()`
- juggle `$HOSTRELEASE`: read from actual host, or determined from Docker image name (during Dockerfile build)
- TL;DR: include and use `python3.9` for focal-like host OS's
This commit is contained in:
Ricardo Pardini
2023-01-05 14:01:40 +01:00
parent f167864f2c
commit 6cb12a3397
11 changed files with 108 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/functions/cli/cli-jsoninfo.sh
View File

@@ -11,9 +11,12 @@ function cli_json_info_run() {
# - python debian packages hostdeps? (-dev, -pip, virtualenv, etc)
# - run the virtualenv (messy?)
declare python3_binary_path
prepare_python3_binary_for_python_tools
# The info extractor itself...
run_host_command_logged python3 "${SRC}"/lib/tools/info.py ">" "${SRC}/output/info.json"
run_host_command_logged "${python3_binary_path}" "${SRC}"/lib/tools/info.py ">" "${SRC}/output/info.json"
# Also convert output to CSV for easy import into Google Sheets etc
run_host_command_logged python3 "${SRC}"/lib/tools/json2csv.py "<" "${SRC}/output/info.json" ">" "${SRC}/output/info.csv"
run_host_command_logged "${python3_binary_path}" "${SRC}"/lib/tools/json2csv.py "<" "${SRC}/output/info.json" ">" "${SRC}/output/info.csv"
}