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

Merge pull request #2894 from MilhouseVH/le90_distrotool-and-pkg-fixups

Browse Source 
distro-tool and package fixups
This commit is contained in:
Christian Hewitt 2018-08-18 11:47:15 +04:00 committed by GitHub
commit 1e1dd3cdfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 91 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/compress/bzip2/package.mk
View File

@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="bzip2"
PKG_VERSION="1.0.6"
@ -7,7 +8,7 @@ PKG_SHA256="a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.bzip.org"
PKG_URL="http://www.bzip.org/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_HOST=""
PKG_DEPENDS_TARGET="toolchain"
PKG_SECTION="compress"

5
packages/graphics/libepoxy/package.mk
View File

@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
# libepoxy (actually) needs to be built shared, to avoid
# (EE) Failed to load /usr/lib/xorg/modules/libglamoregl.so:
@ -7,8 +8,8 @@
# in Xorg.log
PKG_NAME="libepoxy"
PKG_VERSION="1.4.3"
PHG_SHA256="0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6"
PKG_VERSION="1.5.2"
PKG_SHA256="a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/anholt/libepoxy"

80
tools/distro-tool
View File

@ -21,7 +21,9 @@ CHECK_FILTER_CLASS=All
PROGRESS=yes
IS_MIRROR=yes
VERBOSE=0
WORKER_THREADS=32
PATH_FILTER=
VERIFY_CHECKSUM=no
WORKER_THREADS=16
LOCKFILE=/tmp/distro_tool.lock
WORKFILES_I=/tmp/distro_tool.in
@ -244,11 +246,14 @@ class MyUtility(object):
# 35/56 as retries, could have several of these before a successful
# request - limit total number of retries as ${retry} * 3.
while retry > 0 and maxattempts > 0:
maxattempts -= 1
if stopped.is_set(): break
ts_cmd = datetime.datetime.now()
if HEAD_supported:
MyUtility.logmsg(msgs, 3, "%s --head --output - --url %s" % (curl_args, url))
(result, headers) = MyUtility.runcommand(msgs, "%s --head --output - --url %s" % (curl_args, url))
else:
MyUtility.logmsg(msgs, 3, "%s --range 0-1024 --output /dev/null --url %s" % (curl_args, url))
(result, headers) = MyUtility.runcommand(msgs, "%s --range 0-1024 --output /dev/null --url %s" % (curl_args, url))
search_obj = MyUtility.search_HTTP_CODE.search(headers)
@ -352,11 +357,8 @@ class MyUtility(object):
@staticmethod
def get_package(msgs, package_name, package_source, package_url, package_sha):
onsource = False
onmirror = False
onsource = MyUtility.remote_file_exists(msgs, package_url)
if not onsource:
onmirror = MyUtility.remote_file_exists(msgs, "%s/%s/%s" % (DISTRO_MIRROR, package_name, package_source))
# If the only PKG_URL source is the DISTRO_SRC server...
@ -386,12 +388,29 @@ class MyUtility(object):
if os.path.exists(tmpfile_log):
os.remove(tmpfile_log)
if VERIFY_CHECKSUM == True and package_sha and onmirror:
result = MyUtility.download_file(msgs, tmpfile_data, tmpfile_log, "%s/%s/%s" % (DISTRO_MIRROR, package_name, package_source))
calc_sha = MyUtility.calculate_sha256(tmpfile_data)
if os.path.exists(tmpfile_data):
os.remove(tmpfile_data)
if os.path.exists(tmpfile_log):
os.remove(tmpfile_log)
if calc_sha != package_sha:
MyUtility.show(msgs, 0, "yellow", "CHECKSUM MISMATCH FROM MIRROR - REFRESHING FROM SOURCE", "%s (%s)" % (package_name, package_url))
MyUtility.logmsg(msgs, 0, "Checksum mismatch - got [%s], expected [%s]" % (calc_sha, package_sha))
onmirror = False
else:
MyUtility.show(msgs, 1, "green", "Mirror checksum valid", "%s (%s)" % (package_name, package_source))
return True
if onsource:
result = MyUtility.download_file(msgs, tmpfile_data, tmpfile_log, package_url)
elif onmirror:
result = MyUtility.download_file(msgs, tmpfile_data, tmpfile_log, "%s/%s/%s" % (DISTRO_MIRROR, package_name, package_source))
else:
result=False
result = False
if result == False or not os.path.exists(tmpfile_data):
result = False
@ -525,15 +544,15 @@ class MyThread(threading.Thread):
MyUtility.logmsg(msgs, 3, ">>>>>>>>>>>>>>>>> %s, %s, %s, wanted sha256 %s" % (pkg_name, pkg_version, pkg_url, pkg_sha))
if MyUtility.have_package(pkg_name, pkg_source_name):
MyUtility.show(msgs, 1, "green", "Already downloaded", "%s (%s)" % (pkg_name, pkg_source_name))
else:
if not MyUtility.have_package(pkg_name, pkg_source_name) or (VERIFY_CHECKSUM and pkg_sha):
tStart = datetime.datetime.now()
if not stopped.is_set() and \
not MyUtility.get_package(msgs, pkg_name, pkg_source_name, pkg_url, pkg_sha):
if not IGNORE_ERRORS:
stopped.set()
tDelta_get_package = datetime.datetime.now() - tStart
else:
MyUtility.show(msgs, 1, "green", "Already downloaded", "%s (%s)" % (pkg_name, pkg_source_name))
if CHECK_NEWER and not stopped.is_set():
if (CHECK_FILTER_CLASS == "All") or \
@ -655,7 +674,8 @@ if __name__ == "__main__":
GIT_PASSWORD = args[11]
CHECK_FILTER_CLASS = args[12]
CHECK_FILTER_TYPE = args[13]
VERBOSE = int(args[14])
VERIFY_CHECKSUM = True if args[14] == "yes" else False
VERBOSE = int(args[15])
SCRATCH_DIR="%s/.tmp" % DOWNLOAD_DIR
stopped = threading.Event()
@ -677,7 +697,7 @@ Usage: $(basename $0) -d|--download <path> [-t|--target <path>] [-l|--libreelec
[-m|--mirror] [-s|--source] [-a|-all] [-p|--package <package_name> [-r|--revision <revision>]]
[--git] [-n|--notnewer] [--check-main | --check-addons] [--check-ver | --check-rev]
[--noprogress] [-T #|--threads #] [-U|--gituser] [-P|--gitpass] [--dry-run]
[-v|--verbose] [-h|--help]
[--path-filter path] [--verify-checksum] [-v|--verbose] [-h|--help]
Options:
-d, --download: Directory path into which new package files will be downloaded - default is $HOME/download[1]
@ -699,6 +719,8 @@ Options:
-U, --gituser: Git username (or source from ~/.git.conf) - avoids API limits
-P, --gitpass: Git password (or source from ~/.git.conf) - avoids API limits
--dry-run: Don't actually download anything (will still git clone/pull if configured)
--path-filter Restrict workload to specified path, eg. packages/x11 (recursive)
--verify-checksum: If checksum on mirror is no longer valid, attempt re-download of package from source
-v, --verbose: Output more verbose sync information. Repeat for more detail
-h, --help: This message
@ -721,18 +743,22 @@ get_libreelec_option() {
}
generate_work() {
local package_name="$1" revision="$2"
local package_name="$1" revision="$2" path_filter="$3"
local packages pcount
local workfile_o
local tcount=0
[ ${PROGRESS} == yes ] && echo -en "Acquiring packages...\r" >&2
packages="$(get_packages ${package_name})"
packages="$(get_packages "${package_name}" "${path_filter}")"
pcount="$(echo "${packages}" | wc -l)"
if [ -n "${package_name}" -a -z "${packages}" ]; then
if [ -n "${path_filter}" ]; then
echo "ERROR: ${package_name} is not a valid package when using filter ${path_filter} - package.mk does not exist" >&2
else
echo "ERROR: ${package_name} is not a valid package - package.mk does not exist" >&2
fi
exit 1
fi
@ -848,16 +874,24 @@ get_package_path() {
}
get_packages() {
local package_name="$1"
local package_name="$1" path_filter="$2"
export -f get_package_path
cd $LIBREELEC_DIR
if [ -n "${path_filter}" ]; then
if [ -n "${package_name}" ]; then
basename $(dirname $(find packages projects/${PROJECT} -path "*/${package_name}/*" -name package.mk) 2>/dev/null | head -1) 2>/dev/null
basename $(dirname $(find ${path_filter} -path "*/${package_name}/*" -name package.mk 2>/dev/null) 2>/dev/null | head -1) 2>/dev/null
else
find packages projects/${PROJECT} -name package.mk -exec bash -c get_package_path "{}" \; | cut -d' ' -f1 | sort -u
find ${path_filter} -name package.mk -exec bash -c get_package_path "{}" \; 2>/dev/null | cut -d' ' -f1 | sort -u
fi
else
if [ -n "${package_name}" ]; then
basename $(dirname $(find packages projects/${PROJECT} -path "*/${package_name}/*" -name package.mk 2>/dev/null) 2>/dev/null | head -1) 2>/dev/null
else
find packages projects/${PROJECT} -name package.mk -exec bash -c get_package_path "{}" \; 2>/dev/null | cut -d' ' -f1 | sort -u
fi
fi
return 0
}
@ -886,7 +920,7 @@ exec_worker_prog() {
python3 /tmp/distro-tool.py "${DOWNLOAD_DIR}" "${TARGET_DIR}" "${DISTRO_SOURCE}" "${DISTRO_MIRROR}" \
"${IS_MIRROR}" "${IGNORE_ERRORS}" "${DRY_RUN}" "${CHECK_NEWER}" \
"${PROGRESS}" "${WORKER_THREADS}" "${GIT_USERNAME}" "${GIT_PASSWORD}" \
"${CHECK_FILTER_CLASS}" "${CHECK_FILTER_TYPE}" "${VERBOSE}"
"${CHECK_FILTER_CLASS}" "${CHECK_FILTER_TYPE}" ${VERIFY_CHECKSUM} "${VERBOSE}"
rm -f /tmp/distro-tool.py
}
@ -962,6 +996,13 @@ while [ : ]; do
--noprogress)
PROGRESS=no
;;
--path-filter)
shift
PATH_FILTER=$1
;;
--verify-checksum)
VERIFY_CHECKSUM=yes
;;
-h|--help)
help
exit 0
@ -1026,6 +1067,9 @@ echo "Distro Source is: ${DISTRO_SOURCE}"
echo "Distro Mirror is: ${DISTRO_MIRROR}"
echo " Syncing against: ${TARGET_DIR}"
echo " Downloading to: ${DOWNLOAD_DIR}"
if [ -n "${PATH_FILTER}" ]; then
echo " Path filter: ${PATH_FILTER}"
fi
echo " Check Newer: ${CHECK_NEWER^} Class/Type: ${CHECK_FILTER_CLASS} / ${CHECK_FILTER_TYPE}"
echo " Dry run: ${DRY_RUN^}"
if [ ${VERBOSE} -gt 2 ]; then
@ -1035,7 +1079,7 @@ fi
echo
if [ ${VERBOSE} -gt 2 -a -n "${DEBUG_LOG}" ]; then
generate_work "${PACKAGE}" "${REVISION}" | exec_worker_prog 2>${DEBUG_LOG}
generate_work "${PACKAGE}" "${REVISION}" "${PATH_FILTER}" | exec_worker_prog 2>${DEBUG_LOG}
else
generate_work "${PACKAGE}" "${REVISION}" | exec_worker_prog
generate_work "${PACKAGE}" "${REVISION}" "${PATH_FILTER}" | exec_worker_prog
fi