API tools faq
paste
Guest User

Untitled

a guest
Jan 28th, 2019
181
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 128.61 KB | None | 0 0
raw download clone embed print report
  1. From 894dbe7a2a1ddc89264e616e8e83f47b9d79c7d5 Mon Sep 17 00:00:00 2001
  2. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  3. Date: Sat, 5 Jan 2019 02:35:53 +0000
  4. Subject: [PATCH 01/26] config/path: add THREAD_CONTROL directory
  5.  
  6. ---
  7. config/path | 2 ++
  8. 1 file changed, 2 insertions(+)
  9.  
  10. diff --git a/config/path b/config/path
  11. index 1f1080b..c5c116f 100644
  12. --- a/config/path
  13. +++ b/config/path
  14. @@ -29,6 +29,8 @@ if [ -n "$BUILD_SUFFIX" ]; then
  15. BUILD=$BUILD-$BUILD_SUFFIX
  16. fi
  17.  
  18. +THREAD_CONTROL=${BUILD}/.threads
  19. +
  20. TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH"
  21. ADDON_BUILD="$BUILD/$ADDONS/$1"
  22. STAMPS_NOARCH=.stamps
  23. --
  24. 2.14.1
  25.  
  26.  
  27. From 94aa94fa0b1f1bbac5d41954683d5be4cb7fcc26 Mon Sep 17 00:00:00 2001
  28. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  29. Date: Sun, 6 Jan 2019 04:55:48 +0000
  30. Subject: [PATCH 02/26] config/path: stop logging patch progress to stderr when
  31. stdout is fine
  32.  
  33. ---
  34. config/path | 2 +-
  35. 1 file changed, 1 insertion(+), 1 deletion(-)
  36.  
  37. diff --git a/config/path b/config/path
  38. index c5c116f..98b8e91 100644
  39. --- a/config/path
  40. +++ b/config/path
  41. @@ -91,7 +91,7 @@ if [ -z "${SILENT_OUT}" -a -z "${VERBOSE_OUT}" ]; then
  42.  
  43. if [ "$VERBOSE" = yes ]; then
  44. exec 3>&1
  45. - exec 4>&2
  46. + exec 4>&1
  47. else
  48. exec 3>&2
  49. exec 4>/dev/null
  50. --
  51. 2.14.1
  52.  
  53.  
  54. From dd4dfc3a7cd7a10f49131fee3ce75967a5fabd63 Mon Sep 17 00:00:00 2001
  55. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  56. Date: Sun, 6 Jan 2019 05:43:26 +0000
  57. Subject: [PATCH 03/26] config/path: VERBOSE_OUT/SILENT_OUT - drop export, need
  58. to exec for every parallel process
  59.  
  60. ---
  61. config/path | 22 ++++++++++------------
  62. 1 file changed, 10 insertions(+), 12 deletions(-)
  63.  
  64. diff --git a/config/path b/config/path
  65. index 98b8e91..134f7ca 100644
  66. --- a/config/path
  67. +++ b/config/path
  68. @@ -84,18 +84,16 @@ fi
  69. VERSION_SUFFIX=$TARGET_ARCH
  70.  
  71. # redirect formatted output
  72. -if [ -z "${SILENT_OUT}" -a -z "${VERBOSE_OUT}" ]; then
  73. - export BUILD_INDENT_SIZE=4
  74. - export SILENT_OUT=3
  75. - export VERBOSE_OUT=4
  76. -
  77. - if [ "$VERBOSE" = yes ]; then
  78. - exec 3>&1
  79. - exec 4>&1
  80. - else
  81. - exec 3>&2
  82. - exec 4>/dev/null
  83. - fi
  84. +export BUILD_INDENT_SIZE=4
  85. +SILENT_OUT=3
  86. +VERBOSE_OUT=4
  87. +
  88. +if [ "$VERBOSE" = yes ]; then
  89. + exec 3>&1
  90. + exec 4>&1
  91. +else
  92. + exec 3>&2
  93. + exec 4>/dev/null
  94. fi
  95.  
  96. unset LD_LIBRARY_PATH
  97. --
  98. 2.14.1
  99.  
  100.  
  101. From 4aaeceecdb2bd625fc18bee3c491f5906b6b7a5c Mon Sep 17 00:00:00 2001
  102. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  103. Date: Sat, 19 Jan 2019 03:20:27 +0000
  104. Subject: [PATCH 04/26] config/path: get rid of MAKEINSTALL
  105.  
  106. ---
  107. config/path | 1 -
  108. scripts/build | 2 +-
  109. 2 files changed, 1 insertion(+), 2 deletions(-)
  110.  
  111. diff --git a/config/path b/config/path
  112. index 134f7ca..fd0dddc 100644
  113. --- a/config/path
  114. +++ b/config/path
  115. @@ -62,7 +62,6 @@ INSTALL_INIT=$BUILD/image/initramfs/root-image
  116. . config/sources
  117.  
  118. MAKE="$TOOLCHAIN/bin/make"
  119. -MAKEINSTALL="$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install"
  120.  
  121. XORG_PATH_DRI=/usr/lib/dri
  122. XORG_PATH_XKB=/usr/share/X11/xkb
  123. diff --git a/scripts/build b/scripts/build
  124. index 1d240b2..1746d87 100755
  125. --- a/scripts/build
  126. +++ b/scripts/build
  127. @@ -385,7 +385,7 @@ else
  128.  
  129. # make based builds
  130. "configure:target"|"cmake-make:target"|"autotools:target"|"make:target")
  131. - $MAKEINSTALL $PKG_MAKEINSTALL_OPTS_TARGET
  132. + make install DESTDIR=$SYSROOT_PREFIX -j1 $PKG_MAKEINSTALL_OPTS_TARGET
  133. make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET
  134. ;;
  135. "configure:host"|"cmake-make:host"|"autotools:host"|"make:host")
  136. --
  137. 2.14.1
  138.  
  139.  
  140. From cc890119d90aaf0d5580a1b469c17829a08e9daf Mon Sep 17 00:00:00 2001
  141. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  142. Date: Sat, 5 Jan 2019 02:31:32 +0000
  143. Subject: [PATCH 05/26] config/functions: allow package to be sourced using
  144. path
  145.  
  146. ---
  147. config/functions | 2 +-
  148. 1 file changed, 1 insertion(+), 1 deletion(-)
  149.  
  150. diff --git a/config/functions b/config/functions
  151. index 0d8d532..321c000 100644
  152. --- a/config/functions
  153. +++ b/config/functions
  154. @@ -854,7 +854,7 @@ source_package() {
  155. unset_functions
  156.  
  157. if [ -n "${1}" ]; then
  158. - PKG_DIR="$(get_pkg_directory ${1})"
  159. + [ -f "${1}" ] && PKG_DIR="$(dirname "${1}")" || PKG_DIR="$(get_pkg_directory "${1}")"
  160.  
  161. [ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ] || die "FAILURE: unable to source package - ${1}/package.mk does not exist"
  162.  
  163. --
  164. 2.14.1
  165.  
  166.  
  167. From 2628b642961d6a265bc6c07918d6747f0893b246 Mon Sep 17 00:00:00 2001
  168. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  169. Date: Sat, 5 Jan 2019 02:34:45 +0000
  170. Subject: [PATCH 06/26] config/functions: add multi-threaded helpers
  171.  
  172. ---
  173. config/functions | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
  174. 1 file changed, 143 insertions(+), 1 deletion(-)
  175.  
  176. diff --git a/config/functions b/config/functions
  177. index 321c000..253df95 100644
  178. --- a/config/functions
  179. +++ b/config/functions
  180. @@ -1172,7 +1172,7 @@ add_group() {
  181. }
  182.  
  183. # Usage: enable_service <unit> [target]
  184. -enable_service () {
  185. +enable_service() {
  186. local unit="$1"
  187. local unit_dir="/usr/lib/systemd/system"
  188. local target="$2"
  189. @@ -1194,6 +1194,148 @@ enable_service () {
  190. done
  191. }
  192.  
  193. +
  194. +### MULTI-THREADED FUNCTION HELPERS ###
  195. +# Prevent concurrent modifications to a package (unpack) or
  196. +# package:target (install/build).
  197. +#
  198. +# If a package is already locked and the owner is ourselves
  199. +# then assume we already have the required lock.
  200. +pkg_lock() {
  201. + [ "${MTWITHLOCKS}" != "yes" ] && return 0
  202. +
  203. + local pkg="$1" task="$2" parent_pkg="$3"
  204. + local this_job="${MTJOBID}"
  205. + local lock_job lock_task lock_pkg
  206. +
  207. + exec 98>"${THREAD_CONTROL}/locks/${pkg}.${task}"
  208. + if ! flock --nonblock --exclusive 98; then
  209. + while [ : ]; do
  210. + read -r lock_job lock_task lock_pkg <<<$(cat "${THREAD_CONTROL}/locks/${pkg}.${task}.owner" 2>/dev/null)
  211. + [ -n "${lock_job}" ] && break || sleep 1
  212. + done
  213. +
  214. + if [ ${lock_job} != ${this_job} ]; then
  215. + pkg_lock_status "STALLED" "${parent_pkg}" "${task}" "$(printf "waiting on [%02d] %s %s" ${lock_job} "${lock_task}" "${lock_pkg}")"
  216. + flock --exclusive 98
  217. + fi
  218. + fi
  219. + echo "${this_job} ${task} ${pkg}" >"${THREAD_CONTROL}/locks/${pkg}.${task}.owner"
  220. +
  221. + pkg_lock_status "LOCKED" "${pkg}" "${task}"
  222. +}
  223. +
  224. +# Log additional information for a locked package.
  225. +pkg_lock_status() {
  226. + [ "${MTWITHLOCKS}" != "yes" ] && return 0
  227. +
  228. + local status="$1" pkg="$2" task="$3" msg="$4"
  229. + local this_job="${MTJOBID}" line
  230. +
  231. + printf -v line "%s: <%05d> [%02d/%0*d] %-7s %-7s %-35s" \
  232. + "$(date +%Y-%m-%d\ %H:%M:%S.%N)" $$ ${this_job} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${status}" "${task}" "${pkg}"
  233. + [ -n "${msg}" ] && line+=" (${msg})"
  234. +
  235. + echo "${line}" >>"${THREAD_CONTROL}/history"
  236. +
  237. + [ "${DASHBOARD}" != "no" ] && update_dashboard "${status}" "${pkg}" "${task}" "${msg}"
  238. +}
  239. +
  240. +update_dashboard() {
  241. + local status="$1" pkg="$2" task="$3" msg="$4"
  242. + local line sedline preamble num elapsed projdevarch
  243. + local boldred boldgreen boldyellow endcolor
  244. +
  245. + (
  246. + flock --exclusive 97
  247. +
  248. + [ -n "${MTJOBID}" ] && sedline=$((MTJOBID + 2)) || sedline=1
  249. +
  250. + num=$(cat "${THREAD_CONTROL}/status" | wc -l)
  251. + while [ ${num} -lt ${sedline} ]; do echo "" >>"${THREAD_CONTROL}/status"; num=$((num + 1)); done
  252. +
  253. + num=$(($(cat "${THREAD_CONTROL}/progress.prev") + 1))
  254. + projdevarch="${PROJECT}/"
  255. + [ -n "${DEVICE}" ] && projdevarch+="${DEVICE}/"
  256. + projdevarch+="${TARGET_ARCH}"
  257. + TZ=UTC0 printf -v elapsed "%(%H:%M:%S)T" $(($(date +%s) - MTBUILDSTART))
  258. + printf -v preamble "%s Dashboard (%s) - %d of %d jobs completed, %s elapsed" "${DISTRONAME}" "${projdevarch}" ${num} ${MTMAXJOBS} "${elapsed}"
  259. + printf -v preamble "%b%-105s %s" "\e[2J\e[0;0H" "${preamble//\//\\/}" "$(date "+%Y-%m-%d %H:%M:%S")"
  260. +
  261. + # Only update the header when caller is not a worker thread
  262. + if [ -z "${MTJOBID}" ]; then
  263. + sed -e "1s/.*/${preamble}/" -i "${THREAD_CONTROL}/status"
  264. + else
  265. + if [ "${DISABLE_COLORS}" != "yes" ]; then
  266. + boldred="\e[1;31m"
  267. + boldgreen="\e[1;32m"
  268. + boldyellow="\e[1;33m"
  269. + white="\e[0;37m"
  270. + endcolor="\e[0m"
  271. +
  272. + case "${status}" in
  273. + IDLE) color="${white}";;
  274. + STALLED) color="${boldyellow}";;
  275. + MUTEX/W) color="${boldyellow}";;
  276. + FAILED ) color="${boldred}";;
  277. + *) color="${boldgreen}";;
  278. + esac
  279. + fi
  280. +
  281. + printf -v line "[%02d\/%0*d]: %b%-7s%b %-7s %-35s" ${MTJOBID} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${color}" "${status//\//\\/}" "${endcolor}" "${task}" "${pkg}"
  282. + [ -n "${msg}" ] && line+=" ${msg//\//\\/}"
  283. + sed -e "1s/.*/${preamble}/;${sedline}s/.*/${line}/" -i "${THREAD_CONTROL}/status"
  284. + fi
  285. + ) 97>"${THREAD_CONTROL}/locks/.status"
  286. +}
  287. +
  288. +# Thread concurrency helpers to avoid concurrency issues with some code,
  289. +# eg. when Python installs directly into $TOOLCHAIN.
  290. +# Test MTJOBID so that these functions are a no-op during non-multithreaded builds.
  291. +acquire_exclusive_lock() {
  292. + [ "${MTWITHLOCKS}" != "yes" ] && return 0
  293. +
  294. + local pkg="$1" task="$2" lockfile="${3:-.global}"
  295. + local this_job="${MTJOBID}"
  296. + local lock_job lock_task lock_pkg
  297. +
  298. + exec 96>"${THREAD_CONTROL}/locks/${lockfile}"
  299. + if ! flock --nonblock --exclusive 96; then
  300. + while [ : ]; do
  301. + read -r lock_job lock_task lock_pkg <<<$(cat "${THREAD_CONTROL}/locks/${lockfile}.owner" 2>/dev/null)
  302. + [ -n "${lock_job}" ] && break || sleep 1
  303. + done
  304. +
  305. + if [ ${lock_job} != ${this_job} ]; then
  306. + pkg_lock_status "MUTEX/W" "${pkg}" "${task}" "$(printf "mutex: %s; waiting on [%02d] %s %s" "${lockfile}" ${lock_job} "${lock_task}" "${lock_pkg}")"
  307. + flock --exclusive 96
  308. + fi
  309. + fi
  310. + echo "${this_job} ${task} ${pkg}" >"${THREAD_CONTROL}/locks/${lockfile}.owner"
  311. +
  312. + pkg_lock_status "MUTEX" "${pkg}" "${task}" "mutex: ${lockfile}"
  313. +}
  314. +
  315. +release_exclusive_lock() {
  316. + [ "${MTWITHLOCKS}" != "yes" ] && return 0
  317. +
  318. + local pkg="$1" task="$2"
  319. +
  320. + flock --unlock 96 2>/dev/null
  321. +
  322. + pkg_lock_status "ACTIVE" "${pkg}" "${task}"
  323. +}
  324. +
  325. +# Execute single command using mutex
  326. +exec_thread_safe() {
  327. + local result
  328. + acquire_exclusive_lock "${PKG_NAME:exec}" "execcmd"
  329. + $@
  330. + result=$?
  331. + release_exclusive_lock "${PKG_NAME:exec}" "execcmd"
  332. + return ${result}
  333. +}
  334. +
  335. # Use distribution functions if any
  336. if [ -f "distributions/$DISTRO/config/functions" ]; then
  337. . distributions/$DISTRO/config/functions
  338. --
  339. 2.14.1
  340.  
  341.  
  342. From 45b0ee7a7339ecc09ac49457e3a7cca84f3fefa7 Mon Sep 17 00:00:00 2001
  343. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  344. Date: Sat, 5 Jan 2019 02:37:33 +0000
  345. Subject: [PATCH 07/26] build system: add parallel build support; use new
  346. "image" package
  347.  
  348. ---
  349. config/multithread | 138 ++++++++++
  350. packages/devel/parallel/package.mk | 11 +
  351. packages/virtual/image/package.mk | 44 ++++
  352. scripts/build | 35 ++-
  353. scripts/genbuildplan.py | 380 ++++++++++++++++++++++++++++
  354. scripts/image | 12 +-
  355. scripts/image_mt | 499 +++++++++++++++++++++++++++++++++++++
  356. scripts/install | 18 +-
  357. scripts/unpack | 28 ++-
  358. tools/dashboard | 20 ++
  359. tools/viewplan | 29 +++
  360. 11 files changed, 1180 insertions(+), 34 deletions(-)
  361. create mode 100644 config/multithread
  362. create mode 100644 packages/devel/parallel/package.mk
  363. create mode 100644 packages/virtual/image/package.mk
  364. create mode 100755 scripts/genbuildplan.py
  365. create mode 100755 scripts/image_mt
  366. create mode 100755 tools/dashboard
  367. create mode 100755 tools/viewplan
  368.  
  369. diff --git a/config/multithread b/config/multithread
  370. new file mode 100644
  371. index 0000000..1193bd8
  372. --- /dev/null
  373. +++ b/config/multithread
  374. @@ -0,0 +1,138 @@
  375. +# SPDX-License-Identifier: GPL-2.0
  376. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  377. +
  378. +THREADCOUNT=${THREADCOUNT:-100%}
  379. +
  380. +# This function is passed a list of package.mk paths to be processed.
  381. +# Each package.mk is sourced with relevant variables output in JSON format.
  382. +json_worker() {
  383. + local packages="$@"
  384. + local pkgpath hierarchy exited
  385. +
  386. + exit() { exited=1; }
  387. +
  388. + . config/options ""
  389. +
  390. + for pkgpath in ${packages}; do
  391. + pkgpath="${pkgpath%%@*}"
  392. +
  393. + exited=0
  394. + if ! source_package "${pkgpath}/package.mk" &>/dev/null; then
  395. + unset -f exit
  396. + die "$(print_color CLR_ERROR "FAILURE: sourcing package ${pkgpath}/package.mk")"
  397. + fi
  398. +
  399. + [ ${exited} -eq 1 ] && continue
  400. +
  401. + [[ ${pkgpath} =~ ^${ROOT}/${PACKAGES}/ ]] && hierarchy="global" || hierarchy="local"
  402. +
  403. + if [ -n "$PKG_ARCH" ]; then
  404. + listcontains "$PKG_ARCH" "!$TARGET_ARCH" && continue
  405. + listcontains "$PKG_ARCH" "$TARGET_ARCH" || listcontains "$PKG_ARCH" "any" || continue
  406. + fi
  407. +
  408. + cat <<EOF
  409. + {
  410. + "name": "${PKG_NAME}",
  411. + "hierarchy": "${hierarchy}",
  412. + "section": "${PKG_SECTION}",
  413. + "bootstrap": "${PKG_DEPENDS_BOOTSTRAP}",
  414. + "init": "${PKG_DEPENDS_INIT}",
  415. + "host": "${PKG_DEPENDS_HOST}",
  416. + "target": "${PKG_DEPENDS_TARGET}"
  417. + },
  418. +EOF
  419. + done
  420. +}
  421. +export -f json_worker
  422. +
  423. +# This function is passed the build instruction for a single job.
  424. +# The function will run either "build <package>" or "install <package>".
  425. +# ${slot} is the job slot number, ie. 1-8 when THREADCOUNT=8.
  426. +# ${job} is the sequence within the total number of ${jobs}.
  427. +package_worker() {
  428. + local slot=$1 job=$2 jobs=$3 args="$4"
  429. + local task pkgname result status
  430. +
  431. + . config/options ""
  432. +
  433. + export MTJOBID=${slot} MTMAXJOBS=${jobs}
  434. +
  435. + read -r task pkgname <<<$(echo "${args}")
  436. +
  437. + ${SCRIPTS}/${task} ${pkgname} 2>&1 && result=0 || result=1
  438. +
  439. + [ ${result} -eq 0 ] && status="DONE" || status="FAIL"
  440. +
  441. + (
  442. + flock --exclusive 95
  443. + num=$(($(cat "${THREAD_CONTROL}/progress") + 1))
  444. + cp "${THREAD_CONTROL}/progress" "${THREAD_CONTROL}/progress.prev"
  445. + echo "${num}" >"${THREAD_CONTROL}/progress"
  446. + printf "[%0*d/%0*d] [%-4s] %-7s %s\n" ${#jobs} ${num} ${#jobs} ${jobs} "${status}" "${task}" "${pkgname}" >&2
  447. + ) 95<"${THREAD_CONTROL}/progress"
  448. +
  449. + if [ ${result} -eq 0 ]; then
  450. + pkg_lock_status "IDLE"
  451. + else
  452. + pkg_lock_status "FAILED" "${pkgname}" "${task}"
  453. +
  454. + print_color CLR_ERROR "FAILURE: $SCRIPTS/${task} ${pkgname} has failed!\n"
  455. +
  456. + if [ -d "${THREAD_CONTROL}/logs" ]; then
  457. + cat >&2 <<EOF
  458. +
  459. +The following logs for this failure are available:
  460. + stdout: ${THREAD_CONTROL}/logs/${job}/stdout
  461. + stderr: ${THREAD_CONTROL}/logs/${job}/stderr
  462. +
  463. +EOF
  464. + fi
  465. + fi
  466. +
  467. + return ${result}
  468. +}
  469. +export -f package_worker
  470. +
  471. +start_multithread_build() {
  472. + local logbuffer withlocks now
  473. +
  474. + now=$(date +%s)
  475. +
  476. + # init thread control folder
  477. + rm -fr "${THREAD_CONTROL}"
  478. + mkdir -p "${THREAD_CONTROL}/locks"
  479. + echo -1 >"${THREAD_CONTROL}/progress.prev"
  480. + echo 0 >"${THREAD_CONTROL}/progress"
  481. + touch "${THREAD_CONTROL}/status"
  482. +
  483. + [ "${THREADCOUNT}" = "0" ] && THREADCOUNT=1
  484. +
  485. + # Bootstrap GNU parallel
  486. + $SCRIPTS/build parallel:host 2>&1 || die "Unable to bootstrap parallel package"
  487. +
  488. + # if number of detected slots is 1 then don't bother using inter-process locks as this is a sequential build
  489. + [ $(seq 1 32 | ${TOOLCHAIN}/bin/parallel --plain --no-notice --max-procs ${THREADCOUNT} echo {%} | sort -n | tail -1) -eq 1 ] && withlocks=no || withlocks=yes
  490. +
  491. + # create a single log file by default if not using locks (single build process), or the builder is a masochist
  492. + if [ "${withlocks}" = "no" -a "${ONELOG,,}" != "no" ] || [ "${ONELOG,,}" = "yes" ]; then
  493. + logbuffer="--ungroup"
  494. + else
  495. + mkdir -p "${THREAD_CONTROL}/logs"
  496. + logbuffer="--group --results ${THREAD_CONTROL}/logs/{#}/"
  497. + fi
  498. +
  499. + # pipefail: return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
  500. + set -o pipefail
  501. +
  502. + cat ${_CACHE_PACKAGE_GLOBAL} ${_CACHE_PACKAGE_LOCAL} | \
  503. + ${TOOLCHAIN}/bin/parallel --plain --no-notice --max-args 30 --halt now,fail=1 json_worker | \
  504. + ${SCRIPTS}/genbuildplan.py --no-reorder --show-wants --build ${@} > "${THREAD_CONTROL}"/plan || return
  505. +
  506. + cat "${THREAD_CONTROL}"/plan | awk '{print $1 " " $2}' | \
  507. + MTBUILDSTART=${now} MTWITHLOCKS=${withlocks} ${TOOLCHAIN}/bin/parallel \
  508. + --plain --no-notice --max-procs ${THREADCOUNT} --joblog="${THREAD_CONTROL}/joblog" ${logbuffer} --halt now,fail=1 --plus \
  509. + package_worker {%} {#} {##} {} || return
  510. +
  511. + set +o pipefail
  512. +}
  513. diff --git a/packages/devel/parallel/package.mk b/packages/devel/parallel/package.mk
  514. new file mode 100644
  515. index 0000000..9b62df3
  516. --- /dev/null
  517. +++ b/packages/devel/parallel/package.mk
  518. @@ -0,0 +1,11 @@
  519. +# SPDX-License-Identifier: GPL-2.0
  520. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  521. +
  522. +PKG_NAME="parallel"
  523. +PKG_VERSION="20190122"
  524. +PKG_SHA256="ae735f201a8ceeff2ace48ff779bda9d19846e629bcc02ea7c8768a42394190c"
  525. +PKG_LICENSE="GPLv3"
  526. +PKG_SITE="https://www.gnu.org/software/parallel/"
  527. +PKG_URL="http://ftpmirror.gnu.org/parallel/$PKG_NAME-$PKG_VERSION.tar.bz2"
  528. +PKG_DEPENDS_HOST=""
  529. +PKG_LONGDESC="GNU parallel is a shell tool for executing jobs in parallel using one or more computers."
  530. diff --git a/packages/virtual/image/package.mk b/packages/virtual/image/package.mk
  531. new file mode 100644
  532. index 0000000..f060a62
  533. --- /dev/null
  534. +++ b/packages/virtual/image/package.mk
  535. @@ -0,0 +1,44 @@
  536. +# SPDX-License-Identifier: GPL-2.0
  537. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  538. +
  539. +PKG_NAME="image"
  540. +PKG_LICENSE="GPL"
  541. +PKG_SITE="https://libreelec.tv"
  542. +PKG_DEPENDS_TARGET="toolchain squashfs:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware ${BOOTLOADER} busybox util-linux corefonts network misc-packages debug"
  543. +PKG_SECTION="virtual"
  544. +PKG_LONGDESC="Root package used to build cnd create complete image"
  545. +
  546. +# Graphic support
  547. +[ ! "$DISPLAYSERVER" = "no" ] && PKG_DEPENDS_TARGET+=" $DISPLAYSERVER"
  548. +
  549. +# Multimedia support
  550. +[ ! "$MEDIACENTER" = "no" ] && PKG_DEPENDS_TARGET+=" mediacenter"
  551. +
  552. +# Sound support
  553. +[ "$ALSA_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" alsa"
  554. +
  555. +# Automounter support
  556. +[ "$UDEVIL" = "yes" ] && PKG_DEPENDS_TARGET+=" udevil"
  557. +
  558. +# EXFAT support
  559. +[ "$EXFAT" = "yes" ] && PKG_DEPENDS_TARGET+=" fuse-exfat"
  560. +
  561. +# NTFS 3G support
  562. +[ "$NTFS3G" = "yes" ] && PKG_DEPENDS_TARGET+=" ntfs-3g_ntfsprogs"
  563. +
  564. +# Remote support
  565. +[ "$REMOTE_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" remote"
  566. +
  567. +# Virtual image creation support
  568. +[ "$PROJECT" = "Generic" ] && PKG_DEPENDS_TARGET+=" virtual"
  569. +
  570. +# Installer support
  571. +[ "$INSTALLER_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" installer"
  572. +
  573. +# Devtools... (not for Release)
  574. +[ "$TESTING" = "yes" ] && PKG_DEPENDS_TARGET+=" testing"
  575. +
  576. +# OEM packages
  577. +[ "$OEM_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" oem"
  578. +
  579. +true
  580. diff --git a/scripts/build b/scripts/build
  581. index 1746d87..c20a934 100755
  582. --- a/scripts/build
  583. +++ b/scripts/build
  584. @@ -7,7 +7,7 @@
  585. . config/options "$1"
  586.  
  587. if [ -z "$1" ]; then
  588. - die "usage: $0 package_name[:<host|target|init|bootstrap>]"
  589. + die "usage: $0 package_name[:<host|target|init|bootstrap>] [parent_pkg]"
  590. fi
  591.  
  592. if [ "$1" = "--all" ]; then
  593. @@ -32,10 +32,14 @@ if [ "${1//:/}" != "${1}" ]; then
  594. PACKAGE_NAME="${1%:*}"
  595. TARGET="${1#*:}"
  596. else
  597. - PACKAGE_NAME=$1
  598. + PACKAGE_NAME="${1}"
  599. TARGET=
  600. fi
  601. TARGET="${TARGET:-target}"
  602. +PARENT_PKG="${2:-${PKG_NAME}:${TARGET}}"
  603. +
  604. +# virtual packages are not built, so no need to lock
  605. +[ "$PKG_SECTION" != "virtual" ] && pkg_lock "${PACKAGE_NAME}:${TARGET}" "build" "${PARENT_PKG}"
  606.  
  607. mkdir -p $STAMPS/$PACKAGE_NAME
  608. STAMP=$STAMPS/$PACKAGE_NAME/build_$TARGET
  609. @@ -46,10 +50,11 @@ if [ -f $STAMP ]; then
  610. rm -f $STAMP
  611. elif [ ! "$BUILD_WITH_DEBUG" = "$STAMP_BUILD_WITH_DEBUG" ]; then
  612. rm -f $STAMP
  613. - elif [ "$1" = "u-boot" -a ! "$UBOOT_SYSTEM" = "$STAMP_UBOOT_SYSTEM" ]; then
  614. + elif [ "${PKG_NAME}" = "u-boot" -a ! "$UBOOT_SYSTEM" = "$STAMP_UBOOT_SYSTEM" ]; then
  615. rm -f $STAMP
  616. else
  617. # stamp matched: already built, do nothing
  618. + [ "$PKG_SECTION" != "virtual" ] && pkg_lock_status "UNLOCK" "${PKG_NAME}:${TARGET}" "build" "already built"
  619. exit 0
  620. fi
  621. fi
  622. @@ -65,16 +70,9 @@ case "$TARGET" in
  623. "bootstrap") _pkg_depends="$PKG_DEPENDS_BOOTSTRAP";;
  624. esac
  625. for p in $_pkg_depends; do
  626. - $SCRIPTS/build $p
  627. + $SCRIPTS/build "${p}" "${PARENT_PKG}"
  628. done
  629.  
  630. -# build this package
  631. -if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then
  632. - build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})") [DEBUG]" "indent"
  633. -else
  634. - build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})")" "indent"
  635. -fi
  636. -
  637. # virtual packages are not built as they only contain dependencies, so dont go further here
  638. if [ "$PKG_SECTION" = "virtual" ]; then
  639. PKG_DEEPHASH=$(calculate_stamp)
  640. @@ -85,6 +83,15 @@ if [ "$PKG_SECTION" = "virtual" ]; then
  641. exit 0
  642. fi
  643.  
  644. +# build this package
  645. +if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then
  646. + build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})") [DEBUG]" "indent"
  647. +else
  648. + build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})")" "indent"
  649. +fi
  650. +
  651. +pkg_lock_status "ACTIVE" "${PKG_NAME}:${TARGET}" "build"
  652. +
  653. setup_toolchain $TARGET
  654.  
  655. # configure install directory
  656. @@ -224,7 +231,7 @@ if [ -f "$PKG_CONFIGURE_SCRIPT" -o -f "$PKG_CMAKE_SCRIPT" -o -f "$PKG_MESON_SCRI
  657. mkdir -p "$PKG_REAL_BUILD"
  658. cd "$PKG_REAL_BUILD"
  659.  
  660. - MESON_CONF="$PKG_REAL_BUILD/meson.conf"
  661. + MESON_CONF="$PKG_REAL_BUILD/${TARGET}.meson.conf"
  662. fi
  663.  
  664. # configure
  665. @@ -455,6 +462,8 @@ PKG_DEEPHASH=$(calculate_stamp)
  666. for i in PKG_NAME PKG_DEEPHASH BUILD_WITH_DEBUG; do
  667. echo "STAMP_$i=\"${!i}\"" >> $STAMP
  668. done
  669. -if [ "$1" = "u-boot" ]; then
  670. +if [ "${PKG_NAME}" = "u-boot" ]; then
  671. echo "STAMP_UBOOT_SYSTEM=\"${UBOOT_SYSTEM}\"" >> $STAMP
  672. fi
  673. +
  674. +pkg_lock_status "UNLOCK" "${PKG_NAME}:${TARGET}" "build" "built"
  675. diff --git a/scripts/genbuildplan.py b/scripts/genbuildplan.py
  676. new file mode 100755
  677. index 0000000..0a3a078
  678. --- /dev/null
  679. +++ b/scripts/genbuildplan.py
  680. @@ -0,0 +1,380 @@
  681. +#!/usr/bin/env python
  682. +# -*- coding: utf-8 -*-
  683. +
  684. +# SPDX-License-Identifier: GPL-2.0
  685. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  686. +
  687. +from __future__ import print_function
  688. +import sys, os, codecs, json, argparse, re
  689. +
  690. +ROOT_PKG = "__root__"
  691. +
  692. +class LibreELEC_Package:
  693. + def __init__(self, name, section):
  694. + self.name = name
  695. + self.section = section
  696. + self.deps = {"bootstrap": [],
  697. + "init": [],
  698. + "host": [],
  699. + "target": []}
  700. + self.wants = []
  701. + self.wantedby = []
  702. +
  703. + def __repr__(self):
  704. + s = "%-9s: %s" % ("name", self.name)
  705. + s = "%s\n%-9s: %s" % (s, "section", self.section)
  706. +
  707. + for t in self.deps:
  708. + s = "%s\n%-9s: %s" % (s, t, self.deps[t])
  709. +
  710. + s = "%s\n%-9s: %s" % (s, "NEEDS", self.wants)
  711. + s = "%s\n%-9s: %s" % (s, "WANTED BY", self.wantedby)
  712. +
  713. + return s
  714. +
  715. + def addDependencies(self, target, packages):
  716. + for d in " ".join(packages.split()).split():
  717. + self.deps[target].append(d)
  718. + name = d.split(":")[0]
  719. + if name not in self.wants and name != self.name:
  720. + self.wants.append(name)
  721. +
  722. + def delDependency(self, target, package):
  723. + if package in self.deps[target]:
  724. + self.deps[target].remove(package)
  725. + name = package.split(":")[0]
  726. + if name in self.wants:
  727. + self.wants.remove(name)
  728. +
  729. + def addReference(self, package):
  730. + name = package.split(":")[0]
  731. + if name not in self.wantedby:
  732. + self.wantedby.append(name)
  733. +
  734. + def delReference(self, package):
  735. + name = package.split(":")[0]
  736. + if name in self.wantedby:
  737. + self.wantedby.remove(name)
  738. +
  739. + def isReferenced(self):
  740. + return False if self.wants == [] else True
  741. +
  742. + def isWanted(self):
  743. + return False if self.wantedby == [] else True
  744. +
  745. + def references(self, package):
  746. + return package in self.wants
  747. +
  748. +# Reference material:
  749. +# https://www.electricmonk.nl/docs/dependency_resolving_algorithm/dependency_resolving_algorithm.html
  750. +class Node:
  751. + def __init__(self, name, target, section):
  752. + self.name = name
  753. + self.target = target
  754. + self.section = section
  755. + self.fqname = "%s:%s" % (name, target)
  756. + self.edges = []
  757. +
  758. + def appendEdges(self, node):
  759. + # Add the node itself...
  760. + if node not in self.edges:
  761. + self.edges.append(node)
  762. + # as well as its edges
  763. + for e in node.edges:
  764. + if e not in self.edges:
  765. + self.edges.append(e)
  766. +
  767. + # Return True if the dependencies of the specified node are met by this node
  768. + def satisfies(self, node):
  769. + for e in node.edges:
  770. + if e not in self.edges:
  771. + return False
  772. + return True
  773. +
  774. + def __repr__(self):
  775. + s = "%-9s: %s" % ("name", self.name)
  776. + s = "%s\n%-9s: %s" % (s, "target", self.target)
  777. + s = "%s\n%-9s: %s" % (s, "fqname", self.fqname)
  778. + s = "%s\n%-9s: %s" % (s, "common", self.commonName())
  779. + s = "%s\n%-9s: %s" % (s, "section", self.section)
  780. +
  781. + for e in self.edges:
  782. + s = "%s\nEDGE: %s" % (s, e.fqname)
  783. +
  784. + return s
  785. +
  786. + def commonName(self):
  787. + return self.name if self.target == "target" else "%s:%s" % (self.name, self.target)
  788. +
  789. + def addEdge(self, node):
  790. + self.edges.append(node)
  791. +
  792. +def eprint(*args, **kwargs):
  793. + print(*args, file=sys.stderr, **kwargs)
  794. +
  795. +# Read a JSON list of all possible packages from stdin
  796. +def loadPackages():
  797. + jdata = json.loads("[%s]" % sys.stdin.read().replace('\n','')[:-1])
  798. +
  799. + map = {}
  800. +
  801. + # Load "global" packages first
  802. + for pkg in jdata:
  803. + if pkg["hierarchy"] == "global":
  804. + map[pkg["name"]] = initPackage(pkg)
  805. +
  806. + # Then the "local" packages, as these will replace any matching "global" packages
  807. + for pkg in jdata:
  808. + if pkg["hierarchy"] == "local":
  809. + map[pkg["name"]] = initPackage(pkg)
  810. +
  811. + return map
  812. +
  813. +# Create a fully formed LibreELEC_Package object
  814. +def initPackage(package):
  815. + pkg = LibreELEC_Package(package["name"], package["section"])
  816. +
  817. + for target in ["bootstrap", "init", "host", "target"]:
  818. + pkg.addDependencies(target, package[target])
  819. +
  820. + return pkg
  821. +
  822. +# Split name:target into components
  823. +def split_package(name):
  824. + parts = name.split(":")
  825. + pn = parts[0]
  826. + pt = parts[1] if len(parts) != 1 else "target"
  827. + return (pn, pt)
  828. +
  829. +# Return a list of packages of the specified type
  830. +def get_packages_by_target(target, list):
  831. + newlist = []
  832. +
  833. + for p in list:
  834. + (pn, pt) = split_package(p)
  835. + if target in ["target", "init"] and pt in ["target", "init"]:
  836. + newlist.append(p)
  837. + elif target in ["bootstrap", "host"] and pt in ["bootstrap", "host"]:
  838. + newlist.append(p)
  839. +
  840. + return newlist
  841. +
  842. +# For the specified node iterate over the list of scheduled nodes and return the first
  843. +# position where we could possibly build this node (ie. all dependencies satisfied).
  844. +def findbuildpos(node, list):
  845. +
  846. + # Keep a running total of all dependencies as we progress through the list
  847. + alldeps = Node("", "", "")
  848. +
  849. + candidate = None
  850. + for n in list:
  851. + alldeps.appendEdges(n)
  852. + if alldeps.satisfies(node):
  853. + if len(n.edges) > len(node.edges):
  854. + if candidate == None:
  855. + candidate = n
  856. + break
  857. + candidate = n
  858. +
  859. + return list.index(candidate) + 1 if candidate else -1
  860. +
  861. +# Resolve dependencies for a node
  862. +def dep_resolve(node, resolved, unresolved, noreorder):
  863. + unresolved.append(node)
  864. +
  865. + for edge in node.edges:
  866. + if edge not in resolved:
  867. + if edge in unresolved:
  868. + raise Exception('Circular reference detected: %s -> %s\nRemove %s from %s package.mk::PKG_DEPENDS_%s' % \
  869. + (node.fqname, edge.commonName(), edge.commonName(), node.name, node.target.upper()))
  870. + dep_resolve(edge, resolved, unresolved, noreorder)
  871. +
  872. + if node not in resolved:
  873. + pos = -1 if noreorder else findbuildpos(node, resolved)
  874. + if pos != -1:
  875. + resolved.insert(pos, node)
  876. + else:
  877. + resolved.append(node)
  878. +
  879. + unresolved.remove(node)
  880. +
  881. +# Return a list of build steps for the trigger packages
  882. +def get_build_steps(args, nodes, trigger_pkgs, built_pkgs):
  883. + resolved = []
  884. + unresolved = []
  885. +
  886. + for pkgname in [x for x in trigger_pkgs if x]:
  887. + if pkgname.find(":") == -1:
  888. + pkgname = "%s:target" % pkgname
  889. +
  890. + if pkgname in nodes:
  891. + dep_resolve(nodes[pkgname], resolved, unresolved, args.no_reorder)
  892. +
  893. + # Abort if any references remain unresolved
  894. + if unresolved != []:
  895. + eprint("The following dependencies have not been resolved:")
  896. + for dep in unresolved:
  897. + eprint(" %s" % dep)
  898. + raise("Unresolved references")
  899. +
  900. + # Output list of resolved dependencies
  901. + for pkg in resolved:
  902. + if pkg.fqname not in built_pkgs:
  903. + built_pkgs.append(pkg.fqname)
  904. + task = "build" if pkg.fqname.endswith(":host") else "install"
  905. + yield(task, pkg.fqname)
  906. +
  907. +# Reduce the complete list of packages to a map of those packages that will
  908. +# be needed for the build.
  909. +def processPackages(args, packages, build):
  910. + # Add dummy package to ensure build/install dependencies are not culled
  911. + pkg = {
  912. + "name": ROOT_PKG,
  913. + "section": "virtual",
  914. + "hierarchy": "global",
  915. + "bootstrap": "",
  916. + "init": "",
  917. + "host": " ".join(get_packages_by_target("host", build)),
  918. + "target": " ".join(get_packages_by_target("target", build))
  919. + }
  920. +
  921. + packages[pkg["name"]] = initPackage(pkg)
  922. +
  923. + # Resolve reverse references that we can use to ignore unreferenced packages
  924. + for pkgname in packages:
  925. + for opkgname in packages:
  926. + opkg = packages[opkgname]
  927. + if opkg.references(pkgname):
  928. + if pkgname in packages:
  929. + packages[pkgname].addReference(opkgname)
  930. +
  931. + # Identify unused packages
  932. + while True:
  933. + changed = False
  934. + for pkgname in packages:
  935. + pkg = packages[pkgname]
  936. + if pkg.isWanted():
  937. + for opkgname in pkg.wantedby:
  938. + if opkgname != ROOT_PKG:
  939. + if not packages[opkgname].isWanted():
  940. + pkg.delReference(opkgname)
  941. + changed = True
  942. + if not changed:
  943. + break
  944. +
  945. + # Create a new map of "needed" packages
  946. + needed_map = {}
  947. + for pkgname in packages:
  948. + pkg = packages[pkgname]
  949. + if pkg.isWanted() or pkgname == ROOT_PKG:
  950. + needed_map[pkgname] = pkg
  951. +
  952. + # Validate package dependency references
  953. + for pkgname in needed_map:
  954. + pkg = needed_map[pkgname]
  955. + for t in pkg.deps:
  956. + for d in pkg.deps[t]:
  957. + if split_package(d)[0] not in needed_map and not args.ignore_invalid:
  958. + msg = 'Invalid package reference: dependency %s in package %s::PKG_DEPENDS_%s is not valid' % (d, pkgname, t.upper())
  959. + if args.warn_invalid:
  960. + eprint("WARNING: %s" % msg)
  961. + else:
  962. + raise Exception(msg)
  963. +
  964. + node_map = {}
  965. +
  966. + # Convert all packages to target-specific nodes
  967. + for pkgname in needed_map:
  968. + pkg = needed_map[pkgname]
  969. + for target in pkg.deps:
  970. + if pkg.deps[target]:
  971. + node = Node(pkgname, target, pkg.section)
  972. + node_map[node.fqname] = node
  973. +
  974. + # Ensure all referenced dependencies exist as a basic node
  975. + for pkgname in needed_map:
  976. + pkg = needed_map[pkgname]
  977. + for target in pkg.deps:
  978. + for dep in pkg.deps[target]:
  979. + dfq = dep if dep.find(":") != -1 else "%s:target" % dep
  980. + if dfq not in node_map:
  981. + (dfq_p, dfq_t) = split_package(dfq)
  982. + if dfq_p in packages:
  983. + dpkg = packages[dfq_p]
  984. + node_map[dfq] = Node(dfq_p, dfq_t, dpkg.section)
  985. + elif not args.ignore_invalid:
  986. + raise Exception("Invalid package! Package %s cannot be found for this PROJECT/DEVICE/ARCH" % dfq_p)
  987. +
  988. + # To each target-specific node, add the correspnding
  989. + # target-specific dependency nodes ("edges")
  990. + for name in node_map:
  991. + node = node_map[name]
  992. + if node.name not in needed_map:
  993. + if args.warn_invalid:
  994. + continue
  995. + else:
  996. + raise Exception("Invalid package! Package %s cannot be found for this PROJECT/DEVICE/ARCH" % node.name)
  997. + for dep in needed_map[node.name].deps[node.target]:
  998. + dfq = dep if dep.find(":") != -1 else "%s:target" % dep
  999. + if dfq in node_map:
  1000. + node.addEdge(node_map[dfq])
  1001. +
  1002. + return node_map
  1003. +
  1004. +#---------------------------------------------
  1005. +parser = argparse.ArgumentParser(description="Generate package dependency list for the requested build/install packages. \
  1006. + Package data will be read from stdin in JSON format.", \
  1007. + formatter_class=lambda prog: argparse.HelpFormatter(prog,max_help_position=25,width=90))
  1008. +
  1009. +parser.add_argument("-b", "--build", nargs="+", metavar="PACKAGE", required=True, \
  1010. + help="Space-separated list of build trigger packages, either for host or target. Required property - specify at least one package.")
  1011. +
  1012. +parser.add_argument("--warn-invalid", action="store_true", \
  1013. + help="Warn about invalid/missing dependency packages, perhaps excluded by a PKG_ARCH incompatability. Default is to abort.")
  1014. +
  1015. +parser.add_argument("--no-reorder", action="store_true", default="True", \
  1016. + help="Do not resequence steps based on dependencies. This is the default.")
  1017. +
  1018. +parser.add_argument("--reorder", action="store_false", dest="no_reorder", \
  1019. + help="Disable --no-reorder and resequence packages to try and reduce stalls etc.")
  1020. +
  1021. +parser.add_argument("--show-wants", action="store_true", \
  1022. + help="Output \"wants\" dependencies for each step.")
  1023. +
  1024. +parser.add_argument("--hide-wants", action="store_false", dest="show_wants", default="True", \
  1025. + help="Disable --show-wants.")
  1026. +
  1027. +parser.add_argument("--ignore-invalid", action="store_true", \
  1028. + help="Ignore invalid packages.")
  1029. +
  1030. +args = parser.parse_args()
  1031. +
  1032. +ALL_PACKAGES = loadPackages()
  1033. +
  1034. +loaded = len(ALL_PACKAGES)
  1035. +
  1036. +REQUIRED_PKGS = processPackages(args, ALL_PACKAGES, args.build)
  1037. +
  1038. +# Output list of packages to build/install
  1039. +built_pkgs = []
  1040. +steps = []
  1041. +
  1042. +for step in get_build_steps(args, REQUIRED_PKGS, args.build, built_pkgs):
  1043. + steps.append(step)
  1044. +
  1045. +eprint("Packages loaded : %d" % loaded)
  1046. +eprint("Build trigger(s): %d [%s]" % (len(args.build), " ".join(args.build)))
  1047. +eprint("Package steps : %d" % len(steps))
  1048. +eprint("")
  1049. +
  1050. +# Output build/install steps
  1051. +if args.show_wants:
  1052. + for step in steps:
  1053. + wants = []
  1054. + node = (REQUIRED_PKGS[step[1]])
  1055. + for e in node.edges:
  1056. + wants.append(e.fqname)
  1057. + print("%-7s %-25s (wants: %s)" % (step[0], step[1].replace(":target",""), ", ".join(wants).replace(":target","")))
  1058. +else:
  1059. + for step in steps:
  1060. + print("%-7s %s" % (step[0], step[1].replace(":target","")))
  1061. diff --git a/scripts/image b/scripts/image
  1062. index c164aa0..ea126e8 100755
  1063. --- a/scripts/image
  1064. +++ b/scripts/image
  1065. @@ -97,14 +97,14 @@ mkdir -p $INSTALL
  1066. for directory in etc dev proc run sys tmp usr var flash storage; do
  1067. mkdir -p $INSTALL/$directory
  1068. done
  1069. -ln -sf /var/media $INSTALL/media
  1070. -ln -sf /usr/lib $INSTALL/lib
  1071. -ln -sf /usr/bin $INSTALL/bin
  1072. -ln -sf /usr/sbin $INSTALL/sbin
  1073. +ln -sfn /var/media $INSTALL/media
  1074. +ln -sfn /usr/lib $INSTALL/lib
  1075. +ln -sfn /usr/bin $INSTALL/bin
  1076. +ln -sfn /usr/sbin $INSTALL/sbin
  1077.  
  1078. if [ "$TARGET_ARCH" = "x86_64" ]; then
  1079. - ln -s /usr/lib $INSTALL/lib64
  1080. - ln -s /usr/lib $INSTALL/usr/lib64
  1081. + ln -sfn /usr/lib $INSTALL/lib64
  1082. + ln -sfn /usr/lib $INSTALL/usr/lib64
  1083. fi
  1084.  
  1085. echo "$TARGET_VERSION" > $INSTALL/etc/release
  1086. diff --git a/scripts/image_mt b/scripts/image_mt
  1087. new file mode 100755
  1088. index 0000000..88d3819
  1089. --- /dev/null
  1090. +++ b/scripts/image_mt
  1091. @@ -0,0 +1,499 @@
  1092. +#!/bin/bash
  1093. +
  1094. +# SPDX-License-Identifier: GPL-2.0
  1095. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1096. +
  1097. +unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACKAGE_LIST
  1098. +
  1099. +. config/options ""
  1100. +. config/multithread
  1101. +. config/show_config
  1102. +
  1103. +show_config
  1104. +save_build_config
  1105. +
  1106. +# Setup both toolchain cmake configs to avoid potentially racy behaviour later,
  1107. +# using a fork as we don't want the exports at this stage.
  1108. +for t in host target; do
  1109. + ( setup_toolchain ${t} )
  1110. +done
  1111. +
  1112. +if [ -n "$CUSTOM_GIT_HASH" ]; then
  1113. + GIT_HASH="$CUSTOM_GIT_HASH"
  1114. +else
  1115. + GIT_HASH=$(git rev-parse HEAD)
  1116. +fi
  1117. +
  1118. +if [ "$LIBREELEC_VERSION" = "devel" ]; then
  1119. + GIT_ABBREV=${GIT_HASH:0:7}
  1120. + DEVEL_VERSION=$LIBREELEC_VERSION
  1121. + case "$BUILD_PERIODIC" in
  1122. + nightly) LIBREELEC_VERSION=nightly-$(date +%Y%m%d)-$GIT_ABBREV;;
  1123. + daily) LIBREELEC_VERSION=daily-$(date +%Y%j)-$GIT_ABBREV;;
  1124. + weekly) LIBREELEC_VERSION=weekly-$(date +%G%V)-$GIT_ABBREV;;
  1125. + monthly) LIBREELEC_VERSION=monthly-$(date +%Y%m)-$GIT_ABBREV;;
  1126. + *) LIBREELEC_VERSION=devel-$(date +%Y%m%d%H%M%S)-$GIT_ABBREV;;
  1127. + esac
  1128. +fi
  1129. +
  1130. +# Get origin url, fix git:// and git@github.com: urls if necessary
  1131. +ORIGIN_URL="$(git remote -v | awk '$1 == "origin" { print $2 }' | head -1 | sed 's#\.git$##;s#^git:#https:#;s#^git@github\.com:#https://github.com/#')"
  1132. +
  1133. +[ "${BUILDER_NAME,,}" = "official" ] && BUILDER_NAME=
  1134. +if [ "$OFFICIAL" = "yes" ]; then
  1135. + LIBREELEC_BUILD="official"
  1136. +else
  1137. + if [ -n "$BUILDER_NAME" ]; then
  1138. + LIBREELEC_BUILD="$BUILDER_NAME"
  1139. + else
  1140. + LIBREELEC_BUILD="community"
  1141. + fi
  1142. +fi
  1143. +
  1144. +if [ -n "$CUSTOM_VERSION" ]; then
  1145. + LIBREELEC_VERSION="$CUSTOM_VERSION"
  1146. +fi
  1147. +
  1148. +LIBREELEC_ARCH="${DEVICE:-$PROJECT}.$TARGET_ARCH"
  1149. +TARGET_VERSION="$LIBREELEC_ARCH-$LIBREELEC_VERSION"
  1150. +
  1151. +if [ -n "$CUSTOM_IMAGE_NAME" ]; then
  1152. + IMAGE_NAME="$CUSTOM_IMAGE_NAME"
  1153. +else
  1154. + if [ "$DEVEL_VERSION" = "devel" ]; then
  1155. + IMAGE_NAME="$DISTRONAME-$LIBREELEC_ARCH-$OS_VERSION-$LIBREELEC_VERSION"
  1156. + else
  1157. + IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
  1158. + fi
  1159. +
  1160. + if [ -n "$UBOOT_SYSTEM" ] && [ "$UBOOT_SYSTEM" != "${DEVICE:-$PROJECT}" ]; then
  1161. + IMAGE_NAME="$IMAGE_NAME-$UBOOT_SYSTEM"
  1162. + fi
  1163. +fi
  1164. +
  1165. +if [ -n "$IMAGE_SUFFIX" ]; then
  1166. + IMAGE_NAME="$IMAGE_NAME-$IMAGE_SUFFIX"
  1167. +fi
  1168. +
  1169. +echo "$IMAGE_NAME" > $BUILD/BUILD_FILENAME
  1170. +
  1171. +# Setup fakeroot
  1172. +rm -rf $FAKEROOT_SCRIPT # remove $FAKEROOT_SCRIPT if it exist
  1173. +touch $FAKEROOT_SCRIPT # create an empty $FAKEROOT_SCRIPT
  1174. +chmod +x $FAKEROOT_SCRIPT # make $FAKEROOT_SCRIPT executable
  1175. +echo "chown -R 0:0 $INSTALL" >> $FAKEROOT_SCRIPT
  1176. +
  1177. +# Clean old install dirs
  1178. +rm -rf $INSTALL
  1179. +rm -rf $STAMPS_INSTALL
  1180. +mkdir -p $INSTALL
  1181. +
  1182. +# Create base layout of LibreELEC read-only file system
  1183. +for directory in etc dev proc run sys tmp usr var flash storage; do
  1184. + mkdir -p $INSTALL/$directory
  1185. +done
  1186. +
  1187. +# Build image contents
  1188. +start_multithread_build image || die "Parallel build failure - see log for details. Time of failure: $(date)"
  1189. +
  1190. +echo "Successful build, creating image..." >&2
  1191. +
  1192. +# Create legacy sym links
  1193. +ln -sfn /var/media $INSTALL/media
  1194. +ln -sfn /usr/lib $INSTALL/lib
  1195. +ln -sfn /usr/bin $INSTALL/bin
  1196. +ln -sfn /usr/sbin $INSTALL/sbin
  1197. +
  1198. +if [ "$TARGET_ARCH" = "x86_64" ]; then
  1199. + ln -sfn /usr/lib $INSTALL/lib64
  1200. + ln -sfn /usr/lib $INSTALL/usr/lib64
  1201. +fi
  1202. +
  1203. +echo "$TARGET_VERSION" > $INSTALL/etc/release
  1204. +
  1205. +# Create /etc/os-release
  1206. +echo -e "NAME=\"$DISTRONAME\"" > $INSTALL/etc/os-release
  1207. +echo -e "VERSION=\"$LIBREELEC_VERSION\"" >> $INSTALL/etc/os-release
  1208. +echo -e "ID=\"libreelec\"" >> $INSTALL/etc/os-release
  1209. +echo -e "VERSION_ID=\"$OS_VERSION\"" >> $INSTALL/etc/os-release
  1210. +echo -e "PRETTY_NAME=\"$DISTRONAME ($LIBREELEC_BUILD): $LIBREELEC_VERSION\"" >> $INSTALL/etc/os-release
  1211. +echo -e "HOME_URL=\"https://libreelec.tv\"" >> $INSTALL/etc/os-release
  1212. +echo -e "BUG_REPORT_URL=\"$ORIGIN_URL\"" >> $INSTALL/etc/os-release
  1213. +echo -e "BUILD_ID=\"$GIT_HASH\"" >> $INSTALL/etc/os-release
  1214. +echo -e "OPENELEC_ARCH=\"$LIBREELEC_ARCH\"" >> $INSTALL/etc/os-release
  1215. +echo -e "LIBREELEC_ARCH=\"$LIBREELEC_ARCH\"" >> $INSTALL/etc/os-release
  1216. +echo -e "LIBREELEC_BUILD=\"$LIBREELEC_BUILD\"" >> $INSTALL/etc/os-release
  1217. +echo -e "LIBREELEC_PROJECT=\"$PROJECT\"" >> $INSTALL/etc/os-release
  1218. +[ -n "$DEVICE" ] && echo -e "LIBREELEC_DEVICE=\"$DEVICE\"" >> $INSTALL/etc/os-release
  1219. +[ -n "$BUILDER_NAME" ] && echo -e "BUILDER_NAME=\"$BUILDER_NAME\"" >> $INSTALL/etc/os-release
  1220. +[ -n "$BUILDER_VERSION" ] && echo -e "BUILDER_VERSION=\"$BUILDER_VERSION\"" >> $INSTALL/etc/os-release
  1221. +
  1222. +# Create /etc/issue
  1223. +echo "$GREETING0" > $INSTALL/etc/issue
  1224. +echo "$GREETING1" >> $INSTALL/etc/issue
  1225. +echo "$GREETING2" >> $INSTALL/etc/issue
  1226. +echo "$GREETING3" >> $INSTALL/etc/issue
  1227. +echo "$GREETING4" >> $INSTALL/etc/issue
  1228. +echo "$DISTRONAME ($LIBREELEC_BUILD): $LIBREELEC_VERSION ($LIBREELEC_ARCH)" >> $INSTALL/etc/issue
  1229. +
  1230. +ln -sf /etc/issue $INSTALL/etc/motd
  1231. +
  1232. +# Copy PROJECT related files to filesystem
  1233. +if [ -d "$PROJECT_DIR/$PROJECT/filesystem" ]; then
  1234. + cp -PR $PROJECT_DIR/$PROJECT/filesystem/* $INSTALL
  1235. + # Install project specific systemd services
  1236. + for service in $PROJECT_DIR/$PROJECT/filesystem/usr/lib/systemd/system/*.service; do
  1237. + if [ -f "$service" ]; then
  1238. + enable_service $(basename $service)
  1239. + fi
  1240. + done
  1241. +fi
  1242. +
  1243. +# Copy DEVICE related files to filesystem
  1244. +if [ -n "$DEVICE" -a -d "$PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem" ]; then
  1245. + cp -PR $PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem/* $INSTALL
  1246. + # Install device specific systemd services
  1247. + for service in $PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem/usr/lib/systemd/system/*.service; do
  1248. + if [ -f "$service" ]; then
  1249. + enable_service $(basename $service)
  1250. + fi
  1251. + done
  1252. +fi
  1253. +
  1254. +# Run depmod for base overlay modules
  1255. +MODVER=$(basename $(ls -d $INSTALL/usr/lib/kernel-overlays/base/lib/modules/*))
  1256. +find $INSTALL/usr/lib/kernel-overlays/base/lib/modules/$MODVER/ -name *.ko | \
  1257. + sed -e "s,$INSTALL/usr/lib/kernel-overlays/base/lib/modules/$MODVER/,," \
  1258. + > $INSTALL/usr/lib/kernel-overlays/base/lib/modules/$MODVER/modules.order
  1259. +$TOOLCHAIN/bin/depmod -b $INSTALL/usr/lib/kernel-overlays/base -a -e -F "$BUILD/linux-$(kernel_version)/System.map" $MODVER 2>&1
  1260. +
  1261. +# Strip kernel modules
  1262. +for MOD in $(find $INSTALL/usr/lib/kernel-overlays/ -type f -name *.ko); do
  1263. + ${TARGET_KERNEL_PREFIX}strip --strip-debug $MOD
  1264. +done
  1265. +
  1266. +# Symlink overlayed modules to /usr/lib/modules
  1267. +ln -sT /var/lib/modules $INSTALL/usr/lib/modules
  1268. +
  1269. +# Symlink overlayed firmware to /usr/lib/firmware
  1270. +ln -sT /var/lib/firmware $INSTALL/usr/lib/firmware
  1271. +
  1272. +# Make target dir
  1273. +mkdir -p $TARGET_IMG
  1274. +rm -rf $TARGET_IMG/$IMAGE_NAME.kernel
  1275. +
  1276. +# Copy kernel to target dir
  1277. +cp -PR $BUILD/linux-$(kernel_version)/arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET $TARGET_IMG/$IMAGE_NAME.kernel
  1278. +chmod 0644 $TARGET_IMG/$IMAGE_NAME.kernel
  1279. +
  1280. +# Set mksquashfs options for each compression method
  1281. +if [ -z "$SQUASHFS_COMPRESSION_OPTION" ]; then
  1282. + if [ "${SQUASHFS_COMPRESSION:-gzip}" = "gzip" ]; then
  1283. + SQUASHFS_COMPRESSION_OPTION="-Xcompression-level 9 -b 262144"
  1284. + elif [ "$SQUASHFS_COMPRESSION" = "lzo" ]; then
  1285. + SQUASHFS_COMPRESSION_OPTION="-Xcompression-level 9 -b 524288"
  1286. + elif [ "$SQUASHFS_COMPRESSION" = "zstd" ]; then
  1287. + SQUASHFS_COMPRESSION_OPTION="-Xcompression-level 22 -b 262144"
  1288. + fi
  1289. +fi
  1290. +
  1291. +# Create squashfs file, default to gzip if no compression configured
  1292. +echo "rm -rf \"$TARGET_IMG/$IMAGE_NAME.system\"" >> $FAKEROOT_SCRIPT
  1293. +echo "$TOOLCHAIN/bin/mksquashfs \"$BUILD/image/system\" \"$TARGET_IMG/$IMAGE_NAME.system\" -noappend -comp ${SQUASHFS_COMPRESSION:-gzip} ${SQUASHFS_COMPRESSION_OPTION}" >> $FAKEROOT_SCRIPT
  1294. +
  1295. +# Run fakeroot
  1296. +$TOOLCHAIN/bin/fakeroot -- $FAKEROOT_SCRIPT
  1297. +rm -rf $FAKEROOT_SCRIPT
  1298. +
  1299. +# Set permissions
  1300. +chmod 0644 $TARGET_IMG/$IMAGE_NAME.system
  1301. +
  1302. +if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]; then
  1303. +
  1304. + RELEASE_DIR="target/$IMAGE_NAME"
  1305. +
  1306. + # Cleanup
  1307. + rm -rf $RELEASE_DIR
  1308. +
  1309. + # Create release dir
  1310. + mkdir -p $RELEASE_DIR
  1311. +
  1312. + # Remove any previously created release images
  1313. + rm -rf $TARGET_IMG/$IMAGE_NAME.img.gz
  1314. +
  1315. + if [ -n "$BOOTLOADER" ]; then
  1316. +
  1317. + BOOTLOADER_DIR="$(get_pkg_directory "$BOOTLOADER")"
  1318. +
  1319. + if [ -d $BOOTLOADER_DIR/files ]; then
  1320. + cp -R $BOOTLOADER_DIR/files/* $RELEASE_DIR
  1321. + fi
  1322. +
  1323. + if find_file_path bootloader/release $BOOTLOADER_DIR/release; then
  1324. + echo "Running $FOUND_PATH"
  1325. + . $FOUND_PATH
  1326. + fi
  1327. + fi
  1328. +
  1329. + cp $ROOT/README* $RELEASE_DIR
  1330. + cp $ROOT/CHANGELOG* $RELEASE_DIR
  1331. + echo "$TARGET_VERSION" > $RELEASE_DIR/RELEASE
  1332. +
  1333. + if [ ! "$MEDIACENTER" = "no" ]; then
  1334. + echo "Kodi commit: $(get_pkg_version $MEDIACENTER)" >> $RELEASE_DIR/RELEASE
  1335. + fi
  1336. +
  1337. + mkdir -p $RELEASE_DIR/licenses
  1338. + cp $ROOT/licenses/* $RELEASE_DIR/licenses
  1339. +
  1340. + mkdir -p $RELEASE_DIR/target
  1341. + cp $TARGET_IMG/$IMAGE_NAME.system $RELEASE_DIR/target/SYSTEM
  1342. + cp $TARGET_IMG/$IMAGE_NAME.kernel $RELEASE_DIR/target/KERNEL
  1343. +
  1344. + # Create md5sum's
  1345. + ( cd $RELEASE_DIR;
  1346. + md5sum -t target/SYSTEM > target/SYSTEM.md5;
  1347. + md5sum -t target/KERNEL > target/KERNEL.md5;
  1348. + )
  1349. +
  1350. + # Create target directory
  1351. + mkdir -p $TARGET_IMG
  1352. +
  1353. + # Remove any previously created release tarballs
  1354. + rm -rf $TARGET_IMG/$IMAGE_NAME.tar
  1355. +
  1356. + # Create release tarball
  1357. + tar cf $TARGET_IMG/$IMAGE_NAME.tar -C target $IMAGE_NAME
  1358. +
  1359. + # Create sha256 checksum of tarball
  1360. + ( cd $TARGET_IMG
  1361. + sha256sum ${IMAGE_NAME}.tar > ${IMAGE_NAME}.tar.sha256
  1362. + )
  1363. +
  1364. + # Create image files if requested
  1365. + if [[ ( "$1" = "amlpkg" || "$1" = "noobs" || "$1" = "mkimage" ) && -n "$BOOTLOADER" ]]; then
  1366. + # INSTALL_SRC_DIR can be board specific
  1367. + if [ -n "$DEVICE" -a -d "$PROJECT_DIR/$PROJECT/devices/$DEVICE/install" ]; then
  1368. + INSTALL_SRC_DIR="$PROJECT_DIR/$PROJECT/devices/$DEVICE/install"
  1369. + else
  1370. + INSTALL_SRC_DIR="$PROJECT_DIR/$PROJECT/install"
  1371. + fi
  1372. +
  1373. + # Variables used in image script must be passed
  1374. + env \
  1375. + PATH="$PATH:/sbin" \
  1376. + ROOT="$ROOT" \
  1377. + SCRIPTS="$SCRIPTS" \
  1378. + TOOLCHAIN="$TOOLCHAIN" \
  1379. + PROJECT_DIR="$PROJECT_DIR" \
  1380. + PROJECT="$PROJECT" \
  1381. + DEVICE="$DEVICE" \
  1382. + DISTRO="$DISTRO" \
  1383. + TARGET_IMG="$TARGET_IMG" \
  1384. + IMAGE_NAME="$IMAGE_NAME" \
  1385. + INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
  1386. + BOOTLOADER="$BOOTLOADER" \
  1387. + KERNEL_NAME="$KERNEL_NAME" \
  1388. + TARGET_KERNEL_ARCH="$TARGET_KERNEL_ARCH" \
  1389. + RELEASE_DIR=$RELEASE_DIR \
  1390. + UUID_STORAGE="$(uuidgen)" \
  1391. + DISTRO_BOOTLABEL="$DISTRO_BOOTLABEL" \
  1392. + DISTRO_DISKLABEL="$DISTRO_DISKLABEL" \
  1393. + UBOOT_SYSTEM="$UBOOT_SYSTEM" \
  1394. + UBOOT_VERSION="$UBOOT_VERSION" \
  1395. + EXTRA_CMDLINE="$EXTRA_CMDLINE" \
  1396. + SYSTEM_SIZE="$SYSTEM_SIZE" \
  1397. + SYSTEM_PART_START="$SYSTEM_PART_START" \
  1398. + OVA_SIZE="$OVA_SIZE" \
  1399. + $SCRIPTS/mkimage
  1400. + fi
  1401. +
  1402. + # Cleanup release dir
  1403. + rm -rf $RELEASE_DIR
  1404. +
  1405. + # Create WeTek Play (Amlogic) ZIP update and auto-install packages if requested
  1406. + if [ "$1" = "amlpkg" ]; then
  1407. + echo "Creating Amlogic ZIP update package"
  1408. +
  1409. + AML_PKG_DIR="$RELEASE_DIR/ampl-pkg"
  1410. +
  1411. + # Create package directory
  1412. + mkdir -p "$AML_PKG_DIR"
  1413. +
  1414. + # Copy system and kernel images
  1415. + mkdir -p "$AML_PKG_DIR/system"
  1416. + cp $TARGET_IMG/$IMAGE_NAME.system $AML_PKG_DIR/system/SYSTEM
  1417. + cp $TARGET_IMG/$IMAGE_NAME.kernel $AML_PKG_DIR/KERNEL
  1418. +
  1419. + # Copy update-binary and updater-script
  1420. + META_INF_DIR="$AML_PKG_DIR/META-INF/com/google/android"
  1421. + mkdir -p "$META_INF_DIR"
  1422. + cp $INSTALL_SRC_DIR/update-binary $META_INF_DIR
  1423. + cp $INSTALL_SRC_DIR/updater-script $META_INF_DIR
  1424. +
  1425. + # Copy other files if any
  1426. + if [ -d "$INSTALL_SRC_DIR/files" ]; then
  1427. + cp -PR $INSTALL_SRC_DIR/files/* $AML_PKG_DIR
  1428. + fi
  1429. +
  1430. + # Copy device tree image if any
  1431. + if [ -f "$INSTALL/usr/share/bootloader/dtb.img" ]; then
  1432. + cp "$INSTALL/usr/share/bootloader/dtb.img" $AML_PKG_DIR/dtb.img
  1433. + fi
  1434. +
  1435. + # Create the update package
  1436. + pushd "$AML_PKG_DIR" > /dev/null
  1437. + zip -rq update.zip *
  1438. +
  1439. + # Sign the update package
  1440. + echo "Signing the update package"
  1441. + mkdir -p sign
  1442. + SIGNAPK_DIR="$ROOT/tools/signapk"
  1443. + java -Xmx1024m -jar $SIGNAPK_DIR/signapk.jar -w $SIGNAPK_DIR/testkey.x509.pem $SIGNAPK_DIR/testkey.pk8 update.zip sign/$IMAGE_NAME-update.zip
  1444. +
  1445. + # Create the auto-install package
  1446. + echo "Creating Amlogic ZIP auto-install package"
  1447. + pushd sign > /dev/null
  1448. + echo --update_package=/sdcard/$IMAGE_NAME-update.zip > factory_update_param.aml
  1449. + echo --wipe_data >> factory_update_param.aml
  1450. + echo --wipe_cache >> factory_update_param.aml
  1451. + if [ -f "$INSTALL_SRC_DIR/files/recovery.img" ]; then
  1452. + cp $INSTALL_SRC_DIR/files/recovery.img .
  1453. + fi
  1454. +
  1455. + if [ -f $INSTALL_SRC_DIR/files/aml_autoscript ]; then
  1456. + cp $INSTALL_SRC_DIR/files/aml_autoscript .
  1457. + fi
  1458. +
  1459. + # Copy device tree image if any
  1460. + if [ -f "$INSTALL/usr/share/bootloader/dtb.img" ]; then
  1461. + cp "$INSTALL/usr/share/bootloader/dtb.img" .
  1462. + fi
  1463. +
  1464. + zip -q $TARGET_IMG/$IMAGE_NAME.zip *
  1465. +
  1466. + # Create sha256 checksum of zip
  1467. + ( cd $TARGET_IMG
  1468. + sha256sum ${IMAGE_NAME}.zip > ${IMAGE_NAME}.zip.sha256
  1469. + )
  1470. +
  1471. + popd > /dev/null
  1472. + popd > /dev/null
  1473. +
  1474. + elif [ "$1" = "noobs" ]; then
  1475. + echo "Creating \"$1\" release tarball..."
  1476. +
  1477. + RELEASE_DIR="$TARGET_IMG/${IMAGE_NAME}-$1"
  1478. +
  1479. + # eg. LibreELEC_RPi, LibreELEC_RPi2 etc.
  1480. + NOOBS_DISTRO="${DISTRONAME}_${DEVICE:-$PROJECT}"
  1481. +
  1482. + # Create release dir
  1483. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}
  1484. +
  1485. + if [ -f $DISTRO_DIR/$DISTRO/${DISTRONAME}_40x40.png ]; then
  1486. + cp -PR $DISTRO_DIR/$DISTRO/${DISTRONAME}_40x40.png $RELEASE_DIR/${NOOBS_DISTRO}/${NOOBS_DISTRO}.png
  1487. + else
  1488. + cp -PR $DISTRO_DIR/$DISTRO/${DISTRONAME}.png $RELEASE_DIR/${NOOBS_DISTRO}/${NOOBS_DISTRO}.png
  1489. + fi
  1490. + cp -PR $ROOT/config/noobs/os.json $RELEASE_DIR/${NOOBS_DISTRO}
  1491. + cp -PR $ROOT/config/noobs/partition_setup.sh $RELEASE_DIR/${NOOBS_DISTRO}
  1492. + cp -PR $ROOT/config/noobs/partitions.json $RELEASE_DIR/${NOOBS_DISTRO}
  1493. + if [ -d $DISTRO_DIR/$DISTRO/noobs/marketing ]; then
  1494. + tar cf $RELEASE_DIR/${NOOBS_DISTRO}/marketing.tar -C $DISTRO_DIR/$DISTRO/noobs/marketing .
  1495. + else
  1496. + tar cf $RELEASE_DIR/${NOOBS_DISTRO}/marketing.tar -C $ROOT/config/noobs/marketing .
  1497. + fi
  1498. + cp $ROOT/README* $RELEASE_DIR/${NOOBS_DISTRO}
  1499. + cp $ROOT/CHANGELOG $RELEASE_DIR/${NOOBS_DISTRO}/release_notes.txt
  1500. +
  1501. + sed -e "s%@DISTRONAME@%$DISTRONAME%g" \
  1502. + -e "s%@PROJECT@%${DEVICE:-$PROJECT}%g" \
  1503. + -e "s%@LIBREELEC_VERSION@%$LIBREELEC_VERSION%g" \
  1504. + -e "s%@RELEASE_DATE@%$(date +%F)%g" \
  1505. + -e "s%@KERNEL_VERSION@%$(kernel_version)%g" \
  1506. + -e "s%@DESCRIPTION@%$DESCRIPTION%g" \
  1507. + -e "s%@ROOT_PASSWORD@%$ROOT_PASSWORD%g" \
  1508. + -e "s%@NOOBS_SUPPORTED_MODELS@%$NOOBS_SUPPORTED_MODELS%g" \
  1509. + -e "s%@NOOBS_HEX@%$NOOBS_HEX%g" \
  1510. + -i $RELEASE_DIR/${NOOBS_DISTRO}/os.json
  1511. +
  1512. + sed -e "s%@DISTRONAME@%$DISTRONAME%g" \
  1513. + -e "s%@PROJECT@%${DEVICE:-$PROJECT}%g" \
  1514. + -e "s%@SYSTEM_SIZE@%$SYSTEM_SIZE%g" \
  1515. + -i $RELEASE_DIR/${NOOBS_DISTRO}/partitions.json
  1516. +
  1517. + # Create System dir
  1518. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}/System
  1519. +
  1520. + BOOTLOADER_DIR="$(get_pkg_directory "$BOOTLOADER")"
  1521. + if [ -d $BOOTLOADER_DIR/files/3rdparty/bootloader/ ]; then
  1522. + cp -PR $BOOTLOADER_DIR/files/3rdparty/bootloader/* $RELEASE_DIR/${NOOBS_DISTRO}/System
  1523. + fi
  1524. +
  1525. + # Copy Bootloader
  1526. + cp -PR $BUILD/bcm2835-bootloader-*/LICENCE* $RELEASE_DIR/${NOOBS_DISTRO}/System/
  1527. + cp -PR $BUILD/bcm2835-bootloader-*/bootcode.bin $RELEASE_DIR/${NOOBS_DISTRO}/System/
  1528. + cp -PR $BUILD/bcm2835-bootloader-*/fixup_x.dat $RELEASE_DIR/${NOOBS_DISTRO}/System/fixup.dat
  1529. + cp -PR $BUILD/bcm2835-bootloader-*/start_x.elf $RELEASE_DIR/${NOOBS_DISTRO}/System/start.elf
  1530. + [ -f $BUILD/bcm2835-bootloader-*/dt-blob.bin ] && cp -PR $BUILD/bcm2835-bootloader-*/dt-blob.bin $RELEASE_DIR/${NOOBS_DISTRO}/System/dt-blob.bin
  1531. +
  1532. + # Copy system files
  1533. + cp $TARGET_IMG/$IMAGE_NAME.system $RELEASE_DIR/${NOOBS_DISTRO}/System/SYSTEM
  1534. + cp $TARGET_IMG/$IMAGE_NAME.kernel $RELEASE_DIR/${NOOBS_DISTRO}/System/kernel.img
  1535. +
  1536. + for dtb in $INSTALL/usr/share/bootloader/*.dtb; do
  1537. + if [ -f $dtb ]; then
  1538. + cp -PR $dtb $RELEASE_DIR/${NOOBS_DISTRO}/System
  1539. + fi
  1540. + done
  1541. +
  1542. + for overlay in $INSTALL/usr/share/bootloader/overlays/*; do
  1543. + if [ -f $overlay ]; then
  1544. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}/System/overlays
  1545. + cp -PR $overlay $RELEASE_DIR/${NOOBS_DISTRO}/System/overlays
  1546. + fi
  1547. + done
  1548. +
  1549. + # Create md5sum's
  1550. + ( cd $RELEASE_DIR/${NOOBS_DISTRO}/System;
  1551. + md5sum -t SYSTEM > SYSTEM.md5;
  1552. + md5sum -t kernel.img > kernel.img.md5;
  1553. + )
  1554. +
  1555. + # Copy additional files
  1556. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}/System/licenses
  1557. + cp $ROOT/licenses/* $RELEASE_DIR/${NOOBS_DISTRO}/System/licenses
  1558. +
  1559. + # Create Storage dir
  1560. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}/Storage
  1561. +
  1562. + # Remove any previously created release tarball
  1563. + rm -rf $RELEASE_DIR/${NOOBS_DISTRO}/System.tar.xz
  1564. + rm -rf $RELEASE_DIR/${NOOBS_DISTRO}/Storage.tar.xz
  1565. +
  1566. + # Create filesystem tarballs
  1567. + tar cJf $RELEASE_DIR/${NOOBS_DISTRO}/System.tar.xz -C $RELEASE_DIR/${NOOBS_DISTRO}/System/ .
  1568. + tar cJf $RELEASE_DIR/${NOOBS_DISTRO}/Storage.tar.xz -C $RELEASE_DIR/${NOOBS_DISTRO}/Storage/ .
  1569. +
  1570. + # Remove filesystem dirs
  1571. + rm -rf $RELEASE_DIR/${NOOBS_DISTRO}/System
  1572. + rm -rf $RELEASE_DIR/${NOOBS_DISTRO}/Storage
  1573. +
  1574. + # Remove any previously created release tarball
  1575. + rm -rf $TARGET_IMG/${IMAGE_NAME}-$1.tar
  1576. +
  1577. + # Create release tarball
  1578. + tar cf $TARGET_IMG/${IMAGE_NAME}-$1.tar -C $TARGET_IMG ${IMAGE_NAME}-$1
  1579. +
  1580. + # Create sha256 checksum of tarball
  1581. + ( cd $TARGET_IMG
  1582. + sha256sum ${IMAGE_NAME}-$1.tar > ${IMAGE_NAME}-$1.tar.sha256
  1583. + )
  1584. + fi
  1585. +
  1586. + if [ -d $RELEASE_DIR ]; then
  1587. + # Cleanup release dir
  1588. + rm -rf $RELEASE_DIR
  1589. + fi
  1590. +fi
  1591. diff --git a/scripts/install b/scripts/install
  1592. index cb8521c..4d7e85c 100755
  1593. --- a/scripts/install
  1594. +++ b/scripts/install
  1595. @@ -8,7 +8,7 @@
  1596. . config/options "$1"
  1597.  
  1598. if [ -z "$1" ]; then
  1599. - die "usage: $0 package_name"
  1600. + die "usage: $0 package_name [parent_pkg]"
  1601. fi
  1602.  
  1603. if [ -z "${PKG_NAME}" ]; then
  1604. @@ -29,29 +29,35 @@ if [ "${1//:/}" != "${1}" ]; then
  1605. PACKAGE_NAME="${1%:*}"
  1606. TARGET="${1#*:}"
  1607. else
  1608. - PACKAGE_NAME=$1
  1609. + PACKAGE_NAME="${1}"
  1610. TARGET=
  1611. fi
  1612. [ -z "$TARGET" ] && TARGET="target"
  1613. +PARENT_PKG="${2:-${PKG_NAME}:${TARGET}}"
  1614. +
  1615. +[ "$PKG_SECTION" != "virtual" ] && pkg_lock "${PACKAGE_NAME}:${TARGET}" "install" "${PARENT_PKG}"
  1616.  
  1617. STAMP=$STAMPS_INSTALL/$PACKAGE_NAME/install_$TARGET
  1618. +[ -f $STAMP ] && pkg_lock_status "UNLOCK" "${PACKAGE_NAME}:${TARGET}" "install" "already installed"
  1619. [ -f $STAMP ] && exit 0
  1620.  
  1621. mkdir -p $STAMPS_INSTALL/$PACKAGE_NAME
  1622.  
  1623. -$SCRIPTS/build $@
  1624. +$SCRIPTS/build "${1}" "${PARENT_PKG}"
  1625.  
  1626. if [ "$TARGET" = target ] ; then
  1627. for p in $PKG_DEPENDS_TARGET; do
  1628. - $SCRIPTS/install $p
  1629. + $SCRIPTS/install "${p}" "${PARENT_PKG}"
  1630. done
  1631. elif [ "$TARGET" = init ] ; then
  1632. for p in $PKG_DEPENDS_INIT; do
  1633. - $SCRIPTS/install $p
  1634. + $SCRIPTS/install "${p}" "${PARENT_PKG}"
  1635. done
  1636. INSTALL=$BUILD/initramfs
  1637. fi
  1638.  
  1639. +pkg_lock_status "ACTIVE" "${PACKAGE_NAME}:${TARGET}" "install"
  1640. +
  1641. build_msg "CLR_INSTALL" "INSTALL" "${PACKAGE_NAME} $(print_color CLR_TARGET "(${TARGET})")" "indent"
  1642.  
  1643. mkdir -p $INSTALL
  1644. @@ -137,3 +143,5 @@ if [ "$TARGET" = target ] ; then
  1645. fi
  1646.  
  1647. touch $STAMP
  1648. +
  1649. +pkg_lock_status "UNLOCK" "${PACKAGE_NAME}:${TARGET}" "install" "installed"
  1650. diff --git a/scripts/unpack b/scripts/unpack
  1651. index 5da8a4f..c19ffef 100755
  1652. --- a/scripts/unpack
  1653. +++ b/scripts/unpack
  1654. @@ -7,14 +7,19 @@
  1655. . config/options "$1"
  1656.  
  1657. if [ -z "$1" ]; then
  1658. - die "usage: $0 package_name"
  1659. + die "usage: $0 package_name [parent_pkg]"
  1660. fi
  1661.  
  1662. if [ -z "${PKG_NAME}" ]; then
  1663. die "$(print_color CLR_ERROR "${1}: no package.mk file found")"
  1664. fi
  1665. +PARENT_PKG="${2:-${PKG_NAME}}"
  1666.  
  1667. -$SCRIPTS/get $1
  1668. +pkg_lock "${PKG_NAME}" "unpack" "${PARENT_PKG}"
  1669. +
  1670. +pkg_lock_status "ACTIVE" "${PKG_NAME}" "unpack"
  1671. +
  1672. +$SCRIPTS/get "${PKG_NAME}"
  1673.  
  1674. STAMP="$PKG_BUILD/.libreelec-unpack"
  1675.  
  1676. @@ -22,13 +27,13 @@ mkdir -p $BUILD
  1677.  
  1678. # Perform a wildcard match on the package to ensure old versions are cleaned too
  1679. PKG_DEEPHASH=
  1680. -for i in $BUILD/$1-*; do
  1681. +for i in $BUILD/${PKG_NAME}-*; do
  1682. if [ -d $i -a -f "$i/.libreelec-unpack" ] ; then
  1683. . "$i/.libreelec-unpack"
  1684. - if [ "$STAMP_PKG_NAME" = "$1" ]; then
  1685. + if [ "$STAMP_PKG_NAME" = "${PKG_NAME}" ]; then
  1686. [ -z "${PKG_DEEPHASH}" ] && PKG_DEEPHASH=$(calculate_stamp)
  1687. if [ ! "$PKG_DEEPHASH" = "$STAMP_PKG_DEEPHASH" ] ; then
  1688. - $SCRIPTS/clean $1
  1689. + $SCRIPTS/clean "${PKG_NAME}"
  1690. fi
  1691. fi
  1692. fi
  1693. @@ -36,13 +41,14 @@ done
  1694.  
  1695. if [ -d "$PKG_BUILD" -a ! -f "$STAMP" ]; then
  1696. # stale pkg build dir
  1697. - $SCRIPTS/clean $1
  1698. + $SCRIPTS/clean "${PKG_NAME}"
  1699. fi
  1700.  
  1701. +[ -f "$STAMP" ] && pkg_lock_status "UNLOCK" "${PKG_NAME}" "unpack" "already unpacked"
  1702. [ -f "$STAMP" ] && exit 0
  1703.  
  1704. -if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
  1705. - build_msg "CLR_UNPACK" "UNPACK" "${1}" "indent"
  1706. +if [ -d "$SOURCES/${PKG_NAME}" -o -d "$PKG_DIR/sources" ]; then
  1707. + build_msg "CLR_UNPACK" "UNPACK" "${PKG_NAME}" "indent"
  1708.  
  1709. pkg_call_exists pre_unpack && pkg_call pre_unpack
  1710.  
  1711. @@ -50,7 +56,7 @@ if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
  1712. pkg_call unpack
  1713. else
  1714. if [ -n "$PKG_URL" ]; then
  1715. - $SCRIPTS/extract $1 $BUILD
  1716. + $SCRIPTS/extract "${PKG_NAME}" $BUILD
  1717. fi
  1718. fi
  1719.  
  1720. @@ -161,10 +167,12 @@ fi
  1721. if [ "$PKG_SECTION" != "virtual" ]; then
  1722. mkdir -p "$PKG_BUILD"
  1723.  
  1724. - rm -f $STAMPS/$1/build_*
  1725. + rm -f $STAMPS/${PKG_NAME}/build_*
  1726.  
  1727. PKG_DEEPHASH=$(calculate_stamp)
  1728. for i in PKG_NAME PKG_DEEPHASH; do
  1729. echo "STAMP_$i=\"${!i}\"" >> $STAMP
  1730. done
  1731. fi
  1732. +
  1733. +pkg_lock_status "UNLOCK" "${PKG_NAME}" "unpack" "unpacked"
  1734. diff --git a/tools/dashboard b/tools/dashboard
  1735. new file mode 100755
  1736. index 0000000..369b3ba
  1737. --- /dev/null
  1738. +++ b/tools/dashboard
  1739. @@ -0,0 +1,20 @@
  1740. +#!/bin/bash
  1741. +
  1742. +# SPDX-License-Identifier: GPL-2.0
  1743. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1744. +
  1745. +. config/options ""
  1746. +
  1747. +if command -v inotifywait >/dev/null; then
  1748. + while [ : ]; do
  1749. + echo "Waiting for build to start..."
  1750. + while [ ! -d "${THREAD_CONTROL}" ]; do sleep 1.0; done
  1751. +
  1752. + inotifywait --quiet --quiet -e DELETE_SELF "${THREAD_CONTROL}" &
  1753. + tail -Fn+0 --pid=$! ${THREAD_CONTROL}/status 2>/dev/null
  1754. +
  1755. + echo
  1756. + done
  1757. +else
  1758. + tail -Fn+0 ${delay} ${THREAD_CONTROL}/status 2>/dev/null
  1759. +fi
  1760. diff --git a/tools/viewplan b/tools/viewplan
  1761. new file mode 100755
  1762. index 0000000..3b58af2
  1763. --- /dev/null
  1764. +++ b/tools/viewplan
  1765. @@ -0,0 +1,29 @@
  1766. +#!/bin/bash
  1767. +
  1768. +# SPDX-License-Identifier: GPL-2.0
  1769. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1770. +
  1771. +unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACKAGE_LIST
  1772. +
  1773. +. config/options ""
  1774. +. config/multithread
  1775. +
  1776. +# Fake the parallel command if GNU parallel is not available - slow, but works.
  1777. +fake_parallel() {
  1778. + while read -r line; do
  1779. + json_worker "${line}"
  1780. + done
  1781. +}
  1782. +
  1783. +PARALLEL_BIN=${TOOLCHAIN}/bin/parallel
  1784. +
  1785. +[ -x ${PARALLEL_BIN} ] || PARALLEL_BIN=parallel
  1786. +command -v ${PARALLEL_BIN} >/dev/null || PARALLEL_BIN=fake_parallel
  1787. +
  1788. +# pipefail: return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
  1789. +set -o pipefail
  1790. +
  1791. +cat ${_CACHE_PACKAGE_GLOBAL} ${_CACHE_PACKAGE_LOCAL} | \
  1792. + ${PARALLEL_BIN} --plain --no-notice --max-args 30 json_worker --halt now,fail=1 | \
  1793. + ${SCRIPTS}/genbuildplan.py --no-reorder --show-wants --build ${@:-image} --warn-invalid ${GENFLAGS} || \
  1794. + die "FAILURE: Unable to generate plan"
  1795. --
  1796. 2.14.1
  1797.  
  1798.  
  1799. From 84ce3a03e4cbe8fc5f42cd6b4fd3bae451694dba Mon Sep 17 00:00:00 2001
  1800. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1801. Date: Fri, 18 Jan 2019 00:41:41 +0000
  1802. Subject: [PATCH 08/26] scripts/build: use global lock as sed -i
  1803. $SYSROOT_PREFIX/usr/lib/*.la is racy
  1804.  
  1805. ---
  1806. scripts/build | 21 +++++++++++++++++----
  1807. 1 file changed, 17 insertions(+), 4 deletions(-)
  1808.  
  1809. diff --git a/scripts/build b/scripts/build
  1810. index c20a934..f25813e 100755
  1811. --- a/scripts/build
  1812. +++ b/scripts/build
  1813. @@ -368,6 +368,14 @@ fi
  1814.  
  1815. pkg_call_exists post_make_$TARGET && pkg_call post_make_$TARGET
  1816.  
  1817. +# make install writes directly to sysroot which then needs fixing up - this is racy
  1818. +if listcontains "configure:target cmake-make:target autotools:target make:target" "${PKG_TOOLCHAIN}:${TARGET}"; then
  1819. + acquire_exclusive_lock "${PKG_NAME}:${TARGET}" "build"
  1820. + PKG_NEED_UNLOCK=yes
  1821. +else
  1822. + PKG_NEED_UNLOCK=no
  1823. +fi
  1824. +
  1825. # make install
  1826. pkg_call_exists pre_makeinstall_$TARGET && pkg_call pre_makeinstall_$TARGET
  1827.  
  1828. @@ -409,6 +417,15 @@ fi
  1829.  
  1830. pkg_call_exists post_makeinstall_$TARGET && pkg_call post_makeinstall_$TARGET
  1831.  
  1832. +# This is the racy part - one or more processes may be creating, modifying or deleting
  1833. +# $SYSROOT_PREFIX/usr/lib/*.la files while another (eg. this) process is rewriting the same
  1834. +# files as it fixes up the libdir prefix. Eugh.
  1835. +for i in $(find $SYSROOT_PREFIX/usr/lib/ -name "*.la" 2>/dev/null); do
  1836. + sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $i
  1837. +done
  1838. +
  1839. +[ "${PKG_NEED_UNLOCK}" = "yes" ] && release_exclusive_lock "${PKG_NAME}:${TARGET}" "build" || true
  1840. +
  1841. if [ "$TARGET" = "target" -o "$TARGET" = "init" ]; then
  1842. if [ -d $INSTALL ]; then
  1843. rm -rf $INSTALL/{usr/,}include
  1844. @@ -454,10 +471,6 @@ fi
  1845.  
  1846. cd $ROOT
  1847.  
  1848. -for i in $(find $SYSROOT_PREFIX/usr/lib/ -name "*.la" 2>/dev/null); do
  1849. - sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $i
  1850. -done
  1851. -
  1852. PKG_DEEPHASH=$(calculate_stamp)
  1853. for i in PKG_NAME PKG_DEEPHASH BUILD_WITH_DEBUG; do
  1854. echo "STAMP_$i=\"${!i}\"" >> $STAMP
  1855. --
  1856. 2.14.1
  1857.  
  1858.  
  1859. From 0607e8092901285f8d4260fff4eb28577c6728a7 Mon Sep 17 00:00:00 2001
  1860. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1861. Date: Sat, 5 Jan 2019 02:48:53 +0000
  1862. Subject: [PATCH 09/26] PKG_DEPENDS_UNPACK: solution for packages using source
  1863. code of another
  1864.  
  1865. ---
  1866. packages/mediacenter/JsonSchemaBuilder/package.mk | 3 ++-
  1867. packages/mediacenter/TexturePacker/package.mk | 3 ++-
  1868. packages/security/nspr/package.mk | 2 ++
  1869. scripts/build | 8 +++++++-
  1870. 4 files changed, 13 insertions(+), 3 deletions(-)
  1871.  
  1872. diff --git a/packages/mediacenter/JsonSchemaBuilder/package.mk b/packages/mediacenter/JsonSchemaBuilder/package.mk
  1873. index b61af9f..b62b79a 100644
  1874. --- a/packages/mediacenter/JsonSchemaBuilder/package.mk
  1875. +++ b/packages/mediacenter/JsonSchemaBuilder/package.mk
  1876. @@ -1,11 +1,12 @@
  1877. # SPDX-License-Identifier: GPL-2.0-or-later
  1878. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  1879. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1880.  
  1881. PKG_NAME="JsonSchemaBuilder"
  1882. PKG_VERSION="0"
  1883. PKG_LICENSE="GPL"
  1884. PKG_SITE="http://www.kodi.tv"
  1885. -PKG_URL=""
  1886. +PKG_DEPENDS_UNPACK="kodi"
  1887. PKG_NEED_UNPACK="$(get_pkg_directory $MEDIACENTER)"
  1888. PKG_LONGDESC="kodi-platform:"
  1889.  
  1890. diff --git a/packages/mediacenter/TexturePacker/package.mk b/packages/mediacenter/TexturePacker/package.mk
  1891. index 8faa689..ed8ee07 100644
  1892. --- a/packages/mediacenter/TexturePacker/package.mk
  1893. +++ b/packages/mediacenter/TexturePacker/package.mk
  1894. @@ -1,12 +1,13 @@
  1895. # SPDX-License-Identifier: GPL-2.0-or-later
  1896. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  1897. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1898.  
  1899. PKG_NAME="TexturePacker"
  1900. PKG_VERSION="0"
  1901. PKG_LICENSE="GPL"
  1902. PKG_SITE="http://www.kodi.tv"
  1903. -PKG_URL=""
  1904. PKG_DEPENDS_HOST="lzo:host libpng:host libjpeg-turbo:host giflib:host"
  1905. +PKG_DEPENDS_UNPACK="kodi"
  1906. PKG_NEED_UNPACK="$(get_pkg_directory $MEDIACENTER)"
  1907. PKG_LONGDESC="kodi-platform:"
  1908.  
  1909. diff --git a/packages/security/nspr/package.mk b/packages/security/nspr/package.mk
  1910. index 7d16ac8..fd63908 100644
  1911. --- a/packages/security/nspr/package.mk
  1912. +++ b/packages/security/nspr/package.mk
  1913. @@ -1,5 +1,6 @@
  1914. # SPDX-License-Identifier: GPL-2.0-or-later
  1915. # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
  1916. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1917.  
  1918. PKG_NAME="nspr"
  1919. PKG_VERSION="4.19"
  1920. @@ -7,6 +8,7 @@ PKG_LICENSE="Mozilla Public License"
  1921. PKG_SITE="http://www.linuxfromscratch.org/blfs/view/svn/general/nspr.html"
  1922. PKG_DEPENDS_HOST="ccache:host"
  1923. PKG_DEPENDS_TARGET="toolchain nss:host"
  1924. +PKG_DEPENDS_UNPACK="nss"
  1925. PKG_LONGDESC="Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions"
  1926. PKG_TOOLCHAIN="configure"
  1927. PKG_BUILD_FLAGS="-parallel"
  1928. diff --git a/scripts/build b/scripts/build
  1929. index f25813e..d8930cf 100755
  1930. --- a/scripts/build
  1931. +++ b/scripts/build
  1932. @@ -59,7 +59,13 @@ if [ -f $STAMP ]; then
  1933. fi
  1934. fi
  1935.  
  1936. -$SCRIPTS/unpack $PACKAGE_NAME
  1937. +if [ -n "${PKG_DEPENDS_UNPACK}" ]; then
  1938. + for p in ${PKG_DEPENDS_UNPACK}; do
  1939. + $SCRIPTS/unpack "${p}" "${PARENT_PKG}"
  1940. + done
  1941. +else
  1942. + $SCRIPTS/unpack "${PACKAGE_NAME}" "${PARENT_PKG}"
  1943. +fi
  1944.  
  1945. # build dependencies, only when PKG_DEPENDS_? is filled
  1946. unset _pkg_depends
  1947. --
  1948. 2.14.1
  1949.  
  1950.  
  1951. From 6a80705d9835fa07d2612d90437ad870c8e064a1 Mon Sep 17 00:00:00 2001
  1952. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1953. Date: Wed, 9 Jan 2019 03:27:04 +0000
  1954. Subject: [PATCH 10/26] PKG_DEPENDS_UNPACK: add source package to
  1955. PKG_NEED_UNPACK
  1956.  
  1957. If the source package changes then we need to rebuild too.
  1958. ---
  1959. config/functions | 6 ++++++
  1960. 1 file changed, 6 insertions(+)
  1961.  
  1962. diff --git a/config/functions b/config/functions
  1963. index 253df95..cd930b1 100644
  1964. --- a/config/functions
  1965. +++ b/config/functions
  1966. @@ -870,6 +870,12 @@ source_package() {
  1967. [ "$PKG_ADDON_IS_STANDALONE" != "yes" ] && PKG_NEED_UNPACK="${PKG_NEED_UNPACK} $(get_pkg_directory $MEDIACENTER)"
  1968. fi
  1969.  
  1970. + if [ -n "${PKG_DEPENDS_UNPACK}" ]; then
  1971. + for _p in ${PKG_DEPENDS_UNPACK}; do
  1972. + PKG_NNED_UNPACK+=" $(get_pkg_directory ${_p})"
  1973. + done
  1974. + fi
  1975. +
  1976. # Automatically set PKG_SOURCE_NAME unless it is already defined.
  1977. # PKG_SOURCE_NAME will be automatically set to a name based on
  1978. # the $PKG_NAME-$PKG_VERSION convention.
  1979. --
  1980. 2.14.1
  1981.  
  1982.  
  1983. From c986513ca9041f9c3e1d9a21cae71857c9133902 Mon Sep 17 00:00:00 2001
  1984. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1985. Date: Sat, 5 Jan 2019 02:44:12 +0000
  1986. Subject: [PATCH 11/26] packages: pciutils, nasm, etc.: build only for x86_64
  1987.  
  1988. ---
  1989. packages/addons/tools/multimedia-tools/package.mk | 5 ++++-
  1990. packages/addons/tools/system-tools/package.mk | 6 ++++--
  1991. packages/linux/package.mk | 4 ++--
  1992. packages/mediacenter/kodi/package.mk | 6 +++++-
  1993. packages/multimedia/dav1d/package.mk | 6 +++++-
  1994. packages/sysutils/busybox/package.mk | 6 +++++-
  1995. 6 files changed, 25 insertions(+), 8 deletions(-)
  1996.  
  1997. diff --git a/packages/addons/tools/multimedia-tools/package.mk b/packages/addons/tools/multimedia-tools/package.mk
  1998. index f4d4190..5fd256f 100644
  1999. --- a/packages/addons/tools/multimedia-tools/package.mk
  2000. +++ b/packages/addons/tools/multimedia-tools/package.mk
  2001. @@ -21,13 +21,16 @@ PKG_ADDON_TYPE="xbmc.python.script"
  2002. PKG_DEPENDS_TARGET="toolchain \
  2003. alsa-utils \
  2004. mediainfo \
  2005. - mesa-demos \
  2006. mpg123 \
  2007. opencaster \
  2008. squeezelite \
  2009. tsdecrypt \
  2010. tstools"
  2011.  
  2012. +if [ "$TARGET_ARCH" = "x86_64" ]; then
  2013. + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mesa-demos"
  2014. +fi
  2015. +
  2016. addon() {
  2017. mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
  2018. # alsamixer
  2019. diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk
  2020. index 84d1441..b71cf8b 100644
  2021. --- a/packages/addons/tools/system-tools/package.mk
  2022. +++ b/packages/addons/tools/system-tools/package.mk
  2023. @@ -22,7 +22,6 @@ PKG_DEPENDS_TARGET="toolchain \
  2024. diffutils \
  2025. dstat \
  2026. dtach \
  2027. - efibootmgr \
  2028. encfs \
  2029. evtest \
  2030. fdupes \
  2031. @@ -38,7 +37,6 @@ PKG_DEPENDS_TARGET="toolchain \
  2032. lm_sensors \
  2033. lshw \
  2034. mc \
  2035. - mrxvt \
  2036. mtpfs \
  2037. nmon \
  2038. p7zip \
  2039. @@ -52,6 +50,10 @@ PKG_DEPENDS_TARGET="toolchain \
  2040. usb-modeswitch \
  2041. vim"
  2042.  
  2043. +if [ "$TARGET_ARCH" = "x86_64" ]; then
  2044. + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET efibootmgr mrxvt"
  2045. +fi
  2046. +
  2047. addon() {
  2048. mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/
  2049. mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/data/
  2050. diff --git a/packages/linux/package.mk b/packages/linux/package.mk
  2051. index 93c4407..6daa186 100644
  2052. --- a/packages/linux/package.mk
  2053. +++ b/packages/linux/package.mk
  2054. @@ -6,7 +6,7 @@ PKG_NAME="linux"
  2055. PKG_LICENSE="GPL"
  2056. PKG_SITE="http://www.kernel.org"
  2057. PKG_DEPENDS_HOST="ccache:host"
  2058. -PKG_DEPENDS_TARGET="toolchain cpio:host kmod:host pciutils xz:host wireless-regdb keyutils $KERNEL_EXTRA_DEPENDS_TARGET"
  2059. +PKG_DEPENDS_TARGET="toolchain cpio:host kmod:host xz:host wireless-regdb keyutils $KERNEL_EXTRA_DEPENDS_TARGET"
  2060. PKG_DEPENDS_INIT="toolchain"
  2061. PKG_NEED_UNPACK="$LINUX_DEPENDS"
  2062. PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
  2063. @@ -65,7 +65,7 @@ if [ "$PKG_BUILD_PERF" != "no" ] && grep -q ^CONFIG_PERF_EVENTS= $PKG_KERNEL_CFG
  2064. fi
  2065.  
  2066. if [ "$TARGET_ARCH" = "x86_64" ]; then
  2067. - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-ucode:host kernel-firmware elfutils:host"
  2068. + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-ucode:host kernel-firmware elfutils:host pciutils"
  2069. fi
  2070.  
  2071. if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
  2072. diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
  2073. index ddcc9e1..c85ac38 100644
  2074. --- a/packages/mediacenter/kodi/package.mk
  2075. +++ b/packages/mediacenter/kodi/package.mk
  2076. @@ -5,7 +5,7 @@
  2077. PKG_NAME="kodi"
  2078. PKG_LICENSE="GPL"
  2079. PKG_SITE="http://www.kodi.tv"
  2080. -PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python2 zlib systemd pciutils lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid giflib libdvdnav libhdhomerun libfmt lirc libfstrcmp flatbuffers:host flatbuffers"
  2081. +PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python2 zlib systemd lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid giflib libdvdnav libhdhomerun libfmt lirc libfstrcmp flatbuffers:host flatbuffers"
  2082. PKG_LONGDESC="A free and open source cross-platform media player."
  2083.  
  2084. PKG_PATCH_DIRS="$KODI_VENDOR"
  2085. @@ -39,6 +39,10 @@ configure_package() {
  2086.  
  2087. get_graphicdrivers
  2088.  
  2089. + if [ "$TARGET_ARCH" = "x86_64" ]; then
  2090. + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pciutils"
  2091. + fi
  2092. +
  2093. PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET dbus"
  2094.  
  2095. if [ "$DISPLAYSERVER" = "x11" ]; then
  2096. diff --git a/packages/multimedia/dav1d/package.mk b/packages/multimedia/dav1d/package.mk
  2097. index 275aca4..ab20356 100644
  2098. --- a/packages/multimedia/dav1d/package.mk
  2099. +++ b/packages/multimedia/dav1d/package.mk
  2100. @@ -7,5 +7,9 @@ PKG_SHA256="3662184809fa29af39c920877cedec3724dc5c3cf71d94bec424f2a7ee4825cf"
  2101. PKG_LICENSE="BSD"
  2102. PKG_SITE="http://www.jbkempf.com/blog/post/2018/Introducing-dav1d"
  2103. PKG_URL="https://code.videolan.org/videolan/dav1d/-/archive/${PKG_VERSION}/dav1d-${PKG_VERSION}.tar.bz2"
  2104. -PKG_DEPENDS_TARGET="toolchain nasm:host"
  2105. +PKG_DEPENDS_TARGET="toolchain"
  2106. PKG_LONGDESC="dav1d is an AV1 decoder :)"
  2107. +
  2108. +if [ "$TARGET_ARCH" = "x86_64" ]; then
  2109. + PKG_DEPENDS_TARGET+=" nasm:host"
  2110. +fi
  2111. diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk
  2112. index 4d8b2fb..4aa977c 100644
  2113. --- a/packages/sysutils/busybox/package.mk
  2114. +++ b/packages/sysutils/busybox/package.mk
  2115. @@ -9,7 +9,7 @@ PKG_LICENSE="GPL"
  2116. PKG_SITE="http://www.busybox.net"
  2117. PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2118. PKG_DEPENDS_HOST=""
  2119. -PKG_DEPENDS_TARGET="toolchain busybox:host hdparm dosfstools e2fsprogs zip unzip pciutils usbutils parted procps-ng gptfdisk libtirpc"
  2120. +PKG_DEPENDS_TARGET="toolchain busybox:host hdparm dosfstools e2fsprogs zip unzip usbutils parted procps-ng gptfdisk libtirpc"
  2121. PKG_DEPENDS_INIT="toolchain libtirpc"
  2122. PKG_LONGDESC="BusyBox combines tiny versions of many common UNIX utilities into a single small executable."
  2123. # busybox fails to build with GOLD support enabled with binutils-2.25
  2124. @@ -25,6 +25,10 @@ if [ "$NFS_SUPPORT" = yes ]; then
  2125. PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET rpcbind"
  2126. fi
  2127.  
  2128. +if [ "$TARGET_ARCH" = "x86_64" ]; then
  2129. + PKG_DEPENDS_TARGET+=" pciutils"
  2130. +fi
  2131. +
  2132. pre_build_target() {
  2133. PKG_MAKE_OPTS_TARGET="ARCH=$TARGET_ARCH \
  2134. HOSTCC=$HOST_CC \
  2135. --
  2136. 2.14.1
  2137.  
  2138.  
  2139. From 2114c06801b5b326d164018e687c6104c7a7c6b3 Mon Sep 17 00:00:00 2001
  2140. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  2141. Date: Sat, 5 Jan 2019 02:50:57 +0000
  2142. Subject: [PATCH 12/26] packages: add missing dependencies
  2143.  
  2144. ---
  2145. packages/addons/addon-depends/cxxtools/package.mk | 5 +++--
  2146. packages/addons/addon-depends/mpd-mpc/package.mk | 2 +-
  2147. packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk | 2 +-
  2148. packages/addons/addon-depends/system-tools-depends/p7zip/package.mk | 1 +
  2149. packages/addons/tools/mono/package.mk | 1 +
  2150. packages/compress/bzip2/package.mk | 2 +-
  2151. packages/compress/xz/package.mk | 1 +
  2152. packages/compress/zstd/package.mk | 1 +
  2153. packages/databases/sqlite/package.mk | 1 +
  2154. packages/debug/libunwind/package.mk | 1 +
  2155. packages/devel/elfutils/package.mk | 2 +-
  2156. packages/devel/flex/package.mk | 1 +
  2157. packages/devel/glib/package.mk | 2 +-
  2158. packages/devel/glibc/package.mk | 2 +-
  2159. packages/devel/libffi/package.mk | 2 ++
  2160. packages/devel/ncurses/package.mk | 1 +
  2161. packages/devel/pcre/package.mk | 2 +-
  2162. packages/lang/gcc/package.mk | 1 +
  2163. packages/linux/package.mk | 2 +-
  2164. packages/mediacenter/JsonSchemaBuilder/package.mk | 1 +
  2165. packages/print/freetype/package.mk | 1 +
  2166. packages/security/nspr/package.mk | 2 +-
  2167. packages/sysutils/busybox/package.mk | 2 +-
  2168. packages/sysutils/dosfstools/package.mk | 2 ++
  2169. packages/sysutils/e2fsprogs/package.mk | 1 +
  2170. packages/sysutils/gptfdisk/package.mk | 2 +-
  2171. packages/sysutils/util-linux/package.mk | 2 +-
  2172. packages/sysutils/v4l-utils/package.mk | 2 +-
  2173. packages/tools/aml-dtbtools/package.mk | 1 +
  2174. packages/tools/dtc/package.mk | 2 +-
  2175. packages/tools/mkbootimg/package.mk | 3 ++-
  2176. packages/tools/mtools/package.mk | 3 ++-
  2177. packages/x11/lib/pixman/package.mk | 2 ++
  2178. projects/Amlogic/packages/autoscript-amlogic/package.mk | 2 +-
  2179. 34 files changed, 41 insertions(+), 19 deletions(-)
  2180.  
  2181. diff --git a/packages/addons/addon-depends/cxxtools/package.mk b/packages/addons/addon-depends/cxxtools/package.mk
  2182. index f7f31e8..2af05c5 100644
  2183. --- a/packages/addons/addon-depends/cxxtools/package.mk
  2184. +++ b/packages/addons/addon-depends/cxxtools/package.mk
  2185. @@ -1,5 +1,6 @@
  2186. # SPDX-License-Identifier: GPL-2.0-or-later
  2187. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2188. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2189.  
  2190. PKG_NAME="cxxtools"
  2191. PKG_VERSION="2.2.1"
  2192. @@ -7,8 +8,8 @@ PKG_SHA256="8cebb6d6cda7c93cc4f7c0d552a68d50dd5530b699cf87916bb3b708fdc4e342"
  2193. PKG_LICENSE="GPL-2"
  2194. PKG_SITE="http://www.tntnet.org/cxxtools.html"
  2195. PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
  2196. -PKG_DEPENDS_HOST=""
  2197. -PKG_DEPENDS_TARGET="toolchain"
  2198. +PKG_DEPENDS_HOST="gcc:host"
  2199. +PKG_DEPENDS_TARGET="toolchain cxxtools:host"
  2200. PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes."
  2201. PKG_BUILD_FLAGS="+pic"
  2202.  
  2203. diff --git a/packages/addons/addon-depends/mpd-mpc/package.mk b/packages/addons/addon-depends/mpd-mpc/package.mk
  2204. index c999e09..bb49bf0 100644
  2205. --- a/packages/addons/addon-depends/mpd-mpc/package.mk
  2206. +++ b/packages/addons/addon-depends/mpd-mpc/package.mk
  2207. @@ -7,7 +7,7 @@ PKG_SHA256="65fc5b0a8430efe9acbe6e261127960682764b20ab994676371bdc797d867fce"
  2208. PKG_LICENSE="GPL"
  2209. PKG_SITE="https://www.musicpd.org"
  2210. PKG_URL="https://www.musicpd.org/download/mpc/0/mpc-${PKG_VERSION}.tar.xz"
  2211. -PKG_DEPENDS_TARGET="toolchain libiconv"
  2212. +PKG_DEPENDS_TARGET="toolchain libiconv libmpdclient"
  2213. PKG_LONGDESC="Command-line client for MPD."
  2214. PKG_TOOLCHAIN="meson"
  2215.  
  2216. diff --git a/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk b/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk
  2217. index 737648d..e9f1989 100644
  2218. --- a/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk
  2219. +++ b/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk
  2220. @@ -7,7 +7,7 @@ PKG_SHA256="dd779b6992de37995555e1d54caf0716a694765efc65480eed2c713105ab46fe"
  2221. PKG_LICENSE="GPL"
  2222. PKG_SITE="http://www.liblognorm.com"
  2223. PKG_URL="https://github.com/rsyslog/liblognorm/archive/v$PKG_VERSION.tar.gz"
  2224. -PKG_DEPENDS_TARGET="toolchain"
  2225. +PKG_DEPENDS_TARGET="toolchain libestr"
  2226. PKG_TOOLCHAIN="autotools"
  2227. PKG_LONGDESC="A fast samples-based log normalization library."
  2228.  
  2229. diff --git a/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk b/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
  2230. index 4db0399..53ef8ff 100644
  2231. --- a/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
  2232. +++ b/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
  2233. @@ -7,6 +7,7 @@ PKG_SHA256="5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f"
  2234. PKG_LICENSE="GPL"
  2235. PKG_SITE="http://p7zip.sourceforge.net/"
  2236. PKG_URL="http://downloads.sourceforge.net/project/p7zip/p7zip/${PKG_VERSION}/p7zip_${PKG_VERSION}_src_all.tar.bz2"
  2237. +PKG_DEPENDS_HOST="gcc:host"
  2238. PKG_DEPENDS_TARGET="toolchain"
  2239. PKG_LONGDESC="p7zip is a port of 7za.exe for POSIX systems like Unix."
  2240. PKG_TOOLCHAIN="manual"
  2241. diff --git a/packages/addons/tools/mono/package.mk b/packages/addons/tools/mono/package.mk
  2242. index 50c3d5c..1d0b725 100644
  2243. --- a/packages/addons/tools/mono/package.mk
  2244. +++ b/packages/addons/tools/mono/package.mk
  2245. @@ -9,6 +9,7 @@ PKG_ARCH="any"
  2246. PKG_LICENSE="MIT"
  2247. PKG_SITE="http://www.mono-project.com"
  2248. PKG_URL="http://download.mono-project.com/sources/mono/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2249. +PKG_DEPENDS_HOST="toolchain"
  2250. PKG_DEPENDS_TARGET="toolchain mono:host libgdiplus sqlite zlib"
  2251. PKG_SECTION="tools"
  2252. PKG_SHORTDESC="Mono: a cross platform, open source .NET framework"
  2253. diff --git a/packages/compress/bzip2/package.mk b/packages/compress/bzip2/package.mk
  2254. index 610406b..9a12838 100644
  2255. --- a/packages/compress/bzip2/package.mk
  2256. +++ b/packages/compress/bzip2/package.mk
  2257. @@ -8,7 +8,7 @@ PKG_SHA256="a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
  2258. PKG_LICENSE="GPL"
  2259. PKG_SITE="http://www.bzip.org"
  2260. PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
  2261. -PKG_DEPENDS_HOST=""
  2262. +PKG_DEPENDS_HOST="gcc:host"
  2263. PKG_DEPENDS_TARGET="toolchain"
  2264. PKG_LONGDESC="A high-quality bzip2 data compressor."
  2265. PKG_BUILD_FLAGS="+pic +pic:host"
  2266. diff --git a/packages/compress/xz/package.mk b/packages/compress/xz/package.mk
  2267. index 0974846..ab7d013 100644
  2268. --- a/packages/compress/xz/package.mk
  2269. +++ b/packages/compress/xz/package.mk
  2270. @@ -9,6 +9,7 @@ PKG_LICENSE="GPL"
  2271. PKG_SITE="http://tukaani.org/xz/"
  2272. PKG_URL="http://tukaani.org/xz/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2273. PKG_DEPENDS_HOST="ccache:host"
  2274. +PKG_DEPENDS_TARGET="gcc:host"
  2275. PKG_LONGDESC="A free general-purpose data compression software with high compression ratio."
  2276. PKG_BUILD_FLAGS="+pic"
  2277.  
  2278. diff --git a/packages/compress/zstd/package.mk b/packages/compress/zstd/package.mk
  2279. index 3ec5713..2aee9d6 100644
  2280. --- a/packages/compress/zstd/package.mk
  2281. +++ b/packages/compress/zstd/package.mk
  2282. @@ -8,6 +8,7 @@ PKG_LICENSE="BSD/GPLv2"
  2283. PKG_SITE="http://www.zstd.net"
  2284. PKG_URL="https://github.com/facebook/zstd/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
  2285. PKG_SOURCE_DIR=$PKG_NAME-$PKG_VERSION
  2286. +PKG_DEPENDS_HOST="gcc:host ninja:host"
  2287. PKG_DEPENDS_TARGET="toolchain"
  2288. PKG_LONGDESC="A fast real-time compression algorithm."
  2289.  
  2290. diff --git a/packages/databases/sqlite/package.mk b/packages/databases/sqlite/package.mk
  2291. index 66af712..8a793e8 100644
  2292. --- a/packages/databases/sqlite/package.mk
  2293. +++ b/packages/databases/sqlite/package.mk
  2294. @@ -8,6 +8,7 @@ PKG_SHA256="5daa6a3fb7d1e8c767cd59c4ded8da6e4b00c61d3b466d0685e35c4dd6d7bf5d"
  2295. PKG_LICENSE="PublicDomain"
  2296. PKG_SITE="https://www.sqlite.org/"
  2297. PKG_URL="https://www.sqlite.org/2018/$PKG_NAME-$PKG_VERSION.tar.gz"
  2298. +PKG_DEPENDS_HOST="gcc:host"
  2299. PKG_DEPENDS_TARGET="toolchain"
  2300. PKG_LONGDESC="An Embeddable SQL Database Engine."
  2301. # libsqlite3.a(sqlite3.o): requires dynamic R_X86_64_PC32 reloc against 'sqlite3_stricmp' which may overflow at runtime
  2302. diff --git a/packages/debug/libunwind/package.mk b/packages/debug/libunwind/package.mk
  2303. index 47698d3..44b91b6 100644
  2304. --- a/packages/debug/libunwind/package.mk
  2305. +++ b/packages/debug/libunwind/package.mk
  2306. @@ -7,6 +7,7 @@ PKG_SHA256="3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb"
  2307. PKG_LICENSE="GPL"
  2308. PKG_SITE="http://www.nongnu.org/libunwind/"
  2309. PKG_URL="http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PKG_VERSION}.tar.gz"
  2310. +PKG_DEPENDS_TARGET="gcc:host"
  2311. PKG_LONGDESC="library to determine the call-chain of a program"
  2312.  
  2313. PKG_CONFIGURE_OPTS_TARGET="--enable-static \
  2314. diff --git a/packages/devel/elfutils/package.mk b/packages/devel/elfutils/package.mk
  2315. index 6a2cedb..3534b60 100644
  2316. --- a/packages/devel/elfutils/package.mk
  2317. +++ b/packages/devel/elfutils/package.mk
  2318. @@ -9,7 +9,7 @@ PKG_LICENSE="GPL"
  2319. PKG_SITE="https://sourceware.org/elfutils/"
  2320. PKG_URL="https://sourceware.org/elfutils/ftp/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2321. PKG_DEPENDS_HOST="make:host zlib:host"
  2322. -PKG_DEPENDS_TARGET="toolchain zlib"
  2323. +PKG_DEPENDS_TARGET="toolchain zlib elfutils:host"
  2324. PKG_LONGDESC="A collection of utilities to handle ELF objects."
  2325. PKG_TOOLCHAIN="autotools"
  2326. PKG_BUILD_FLAGS="+pic"
  2327. diff --git a/packages/devel/flex/package.mk b/packages/devel/flex/package.mk
  2328. index 091e4c2..37e2324 100644
  2329. --- a/packages/devel/flex/package.mk
  2330. +++ b/packages/devel/flex/package.mk
  2331. @@ -8,6 +8,7 @@ PKG_LICENSE="GPL"
  2332. PKG_SITE="http://flex.sourceforge.net/"
  2333. PKG_URL="$SOURCEFORGE_SRC/flex/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2334. PKG_DEPENDS_HOST="ccache:host"
  2335. +PKG_DEPENDS_TARGET="toolchain"
  2336. PKG_LONGDESC="A tool for generating programs that perform pattern-matching on text."
  2337. PKG_TOOLCHAIN="autotools"
  2338.  
  2339. diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk
  2340. index a6ee221..d490da4 100644
  2341. --- a/packages/devel/glib/package.mk
  2342. +++ b/packages/devel/glib/package.mk
  2343. @@ -8,8 +8,8 @@ PKG_SHA256="991421f41a4ed4cc1637e5f9db0d03fd236d2cbd19f3c5b097a343bec5126602"
  2344. PKG_LICENSE="LGPL"
  2345. PKG_SITE="http://www.gtk.org/"
  2346. PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz"
  2347. +PKG_DEPENDS_HOST="libffi:host pcre:host pkg-config:host"
  2348. PKG_DEPENDS_TARGET="toolchain zlib libffi Python2:host util-linux"
  2349. -PKG_DEPENDS_HOST="libffi:host pcre:host"
  2350. PKG_LONGDESC="A library which includes support routines for C such as lists, trees, hashes, memory allocation."
  2351. PKG_TOOLCHAIN="autotools"
  2352.  
  2353. diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk
  2354. index a487ed0..545a6c0 100644
  2355. --- a/packages/devel/glibc/package.mk
  2356. +++ b/packages/devel/glibc/package.mk
  2357. @@ -8,7 +8,7 @@ PKG_SHA256="b1900051afad76f7a4f73e71413df4826dce085ef8ddb785a945b66d7d513082"
  2358. PKG_LICENSE="GPL"
  2359. PKG_SITE="http://www.gnu.org/software/libc/"
  2360. PKG_URL="http://ftp.gnu.org/pub/gnu/glibc/$PKG_NAME-$PKG_VERSION.tar.xz"
  2361. -PKG_DEPENDS_TARGET="ccache:host autotools:host autoconf:host linux:host gcc:bootstrap"
  2362. +PKG_DEPENDS_TARGET="ccache:host autotools:host linux:host gcc:bootstrap"
  2363. PKG_DEPENDS_INIT="glibc"
  2364. PKG_LONGDESC="The Glibc package contains the main C library."
  2365. PKG_BUILD_FLAGS="-gold"
  2366. diff --git a/packages/devel/libffi/package.mk b/packages/devel/libffi/package.mk
  2367. index b4e83eb..0cb80e0 100644
  2368. --- a/packages/devel/libffi/package.mk
  2369. +++ b/packages/devel/libffi/package.mk
  2370. @@ -1,5 +1,6 @@
  2371. # SPDX-License-Identifier: GPL-2.0-or-later
  2372. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2373. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2374.  
  2375. PKG_NAME="libffi"
  2376. PKG_VERSION="3.2.1"
  2377. @@ -7,6 +8,7 @@ PKG_SHA256="d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37"
  2378. PKG_LICENSE="GPL"
  2379. PKG_SITE="http://sourceware.org/$PKG_NAME/"
  2380. PKG_URL="ftp://sourceware.org/pub/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
  2381. +PKG_DEPENDS_HOST="gcc:host"
  2382. PKG_DEPENDS_TARGET="toolchain"
  2383. PKG_LONGDESC="Foreign Function Interface Library."
  2384. PKG_TOOLCHAIN="autotools"
  2385. diff --git a/packages/devel/ncurses/package.mk b/packages/devel/ncurses/package.mk
  2386. index c04d685..e579734 100644
  2387. --- a/packages/devel/ncurses/package.mk
  2388. +++ b/packages/devel/ncurses/package.mk
  2389. @@ -7,6 +7,7 @@ PKG_SHA256="08b07c3e792961f300829512c283d5fefc0b1c421a57b76922c3d13303ed677d"
  2390. PKG_LICENSE="MIT"
  2391. PKG_SITE="http://www.gnu.org/software/ncurses/"
  2392. PKG_URL="http://invisible-mirror.net/archives/ncurses/current/ncurses-$PKG_VERSION.tgz"
  2393. +PKG_DEPENDS_HOST="gcc:host"
  2394. PKG_DEPENDS_TARGET="toolchain zlib ncurses:host"
  2395. PKG_LONGDESC="A library is a free software emulation of curses in System V Release 4.0, and more."
  2396. # causes some segmentation fault's (dialog) when compiled with gcc's link time optimization.
  2397. diff --git a/packages/devel/pcre/package.mk b/packages/devel/pcre/package.mk
  2398. index 0518214..3148324 100644
  2399. --- a/packages/devel/pcre/package.mk
  2400. +++ b/packages/devel/pcre/package.mk
  2401. @@ -8,7 +8,7 @@ PKG_SHA256="2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301"
  2402. PKG_LICENSE="OSS"
  2403. PKG_SITE="http://www.pcre.org/"
  2404. PKG_URL="https://ftp.pcre.org/pub/pcre/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2405. -PKG_DEPENDS_HOST=""
  2406. +PKG_DEPENDS_HOST="gcc:host"
  2407. PKG_DEPENDS_TARGET="toolchain"
  2408. PKG_LONGDESC="A set of functions that implement regular expression pattern matching."
  2409. PKG_TOOLCHAIN="configure"
  2410. diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
  2411. index f899aeb..a7d1d87 100644
  2412. --- a/packages/lang/gcc/package.mk
  2413. +++ b/packages/lang/gcc/package.mk
  2414. @@ -11,6 +11,7 @@ PKG_URL="http://ftpmirror.gnu.org/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERS
  2415. PKG_DEPENDS_BOOTSTRAP="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host"
  2416. PKG_DEPENDS_TARGET="gcc:host"
  2417. PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host glibc"
  2418. +PKG_DEPENDS_INIT="toolchain"
  2419. PKG_LONGDESC="This package contains the GNU Compiler Collection."
  2420.  
  2421. GCC_COMMON_CONFIGURE_OPTS="--target=$TARGET_NAME \
  2422. diff --git a/packages/linux/package.mk b/packages/linux/package.mk
  2423. index 6daa186..45e82d2 100644
  2424. --- a/packages/linux/package.mk
  2425. +++ b/packages/linux/package.mk
  2426. @@ -5,7 +5,7 @@
  2427. PKG_NAME="linux"
  2428. PKG_LICENSE="GPL"
  2429. PKG_SITE="http://www.kernel.org"
  2430. -PKG_DEPENDS_HOST="ccache:host"
  2431. +PKG_DEPENDS_HOST="ccache:host openssl:host"
  2432. PKG_DEPENDS_TARGET="toolchain cpio:host kmod:host xz:host wireless-regdb keyutils $KERNEL_EXTRA_DEPENDS_TARGET"
  2433. PKG_DEPENDS_INIT="toolchain"
  2434. PKG_NEED_UNPACK="$LINUX_DEPENDS"
  2435. diff --git a/packages/mediacenter/JsonSchemaBuilder/package.mk b/packages/mediacenter/JsonSchemaBuilder/package.mk
  2436. index b62b79a..91fefc9 100644
  2437. --- a/packages/mediacenter/JsonSchemaBuilder/package.mk
  2438. +++ b/packages/mediacenter/JsonSchemaBuilder/package.mk
  2439. @@ -6,6 +6,7 @@ PKG_NAME="JsonSchemaBuilder"
  2440. PKG_VERSION="0"
  2441. PKG_LICENSE="GPL"
  2442. PKG_SITE="http://www.kodi.tv"
  2443. +PKG_DEPENDS_HOST="toolchain"
  2444. PKG_DEPENDS_UNPACK="kodi"
  2445. PKG_NEED_UNPACK="$(get_pkg_directory $MEDIACENTER)"
  2446. PKG_LONGDESC="kodi-platform:"
  2447. diff --git a/packages/print/freetype/package.mk b/packages/print/freetype/package.mk
  2448. index 4188f2c..23759c3 100644
  2449. --- a/packages/print/freetype/package.mk
  2450. +++ b/packages/print/freetype/package.mk
  2451. @@ -8,6 +8,7 @@ PKG_SHA256="e20a6e1400798fd5e3d831dd821b61c35b1f9a6465d6b18a53a9df4cf441acf0"
  2452. PKG_LICENSE="GPL"
  2453. PKG_SITE="http://www.freetype.org"
  2454. PKG_URL="http://download.savannah.gnu.org/releases/freetype/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2455. +PKG_DEPENDS_HOST="gcc:host"
  2456. PKG_DEPENDS_TARGET="toolchain zlib libpng"
  2457. PKG_LONGDESC="The FreeType engine is a free and portable TrueType font rendering engine."
  2458. PKG_TOOLCHAIN="configure"
  2459. diff --git a/packages/security/nspr/package.mk b/packages/security/nspr/package.mk
  2460. index fd63908..58f4f22 100644
  2461. --- a/packages/security/nspr/package.mk
  2462. +++ b/packages/security/nspr/package.mk
  2463. @@ -7,7 +7,7 @@ PKG_VERSION="4.19"
  2464. PKG_LICENSE="Mozilla Public License"
  2465. PKG_SITE="http://www.linuxfromscratch.org/blfs/view/svn/general/nspr.html"
  2466. PKG_DEPENDS_HOST="ccache:host"
  2467. -PKG_DEPENDS_TARGET="toolchain nss:host"
  2468. +PKG_DEPENDS_TARGET="toolchain nss:host nspr:host"
  2469. PKG_DEPENDS_UNPACK="nss"
  2470. PKG_LONGDESC="Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions"
  2471. PKG_TOOLCHAIN="configure"
  2472. diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk
  2473. index 4aa977c..dd1fba0 100644
  2474. --- a/packages/sysutils/busybox/package.mk
  2475. +++ b/packages/sysutils/busybox/package.mk
  2476. @@ -8,7 +8,7 @@ PKG_SHA256="97648636e579462296478e0218e65e4bc1e9cd69089a3b1aeb810bff7621efb7"
  2477. PKG_LICENSE="GPL"
  2478. PKG_SITE="http://www.busybox.net"
  2479. PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2480. -PKG_DEPENDS_HOST=""
  2481. +PKG_DEPENDS_HOST="gcc:host"
  2482. PKG_DEPENDS_TARGET="toolchain busybox:host hdparm dosfstools e2fsprogs zip unzip usbutils parted procps-ng gptfdisk libtirpc"
  2483. PKG_DEPENDS_INIT="toolchain libtirpc"
  2484. PKG_LONGDESC="BusyBox combines tiny versions of many common UNIX utilities into a single small executable."
  2485. diff --git a/packages/sysutils/dosfstools/package.mk b/packages/sysutils/dosfstools/package.mk
  2486. index 6f8c72b..65bc096 100644
  2487. --- a/packages/sysutils/dosfstools/package.mk
  2488. +++ b/packages/sysutils/dosfstools/package.mk
  2489. @@ -1,5 +1,6 @@
  2490. # SPDX-License-Identifier: GPL-2.0-or-later
  2491. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2492. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2493.  
  2494. PKG_NAME="dosfstools"
  2495. PKG_VERSION="3.0.28"
  2496. @@ -7,6 +8,7 @@ PKG_SHA256="ee95913044ecf2719b63ea11212917649709a6e53209a72d622135aaa8517ee2"
  2497. PKG_LICENSE="GPLv3"
  2498. PKG_SITE="https://github.com/dosfstools/dosfstools"
  2499. PKG_URL="https://github.com/dosfstools/dosfstools/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
  2500. +PKG_DEPENDS_HOST="gcc:host"
  2501. PKG_DEPENDS_TARGET="toolchain"
  2502. PKG_DEPENDS_INIT="toolchain dosfstools"
  2503. PKG_LONGDESC="dosfstools contains utilities for making and checking MS-DOS FAT filesystems."
  2504. diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk
  2505. index 65ba2b8..410ada8 100644
  2506. --- a/packages/sysutils/e2fsprogs/package.mk
  2507. +++ b/packages/sysutils/e2fsprogs/package.mk
  2508. @@ -8,6 +8,7 @@ PKG_SHA256="926f8e8de1ffba55d791f21b71334e8a32b5227257ad370f2bf7e4396629e97f"
  2509. PKG_LICENSE="GPL"
  2510. PKG_SITE="http://e2fsprogs.sourceforge.net/"
  2511. PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/$PKG_NAME/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
  2512. +PKG_DEPENDS_HOST="gcc:host"
  2513. PKG_DEPENDS_TARGET="toolchain"
  2514. PKG_DEPENDS_INIT="toolchain"
  2515. PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs, dumpe2fs, fsck, and others."
  2516. diff --git a/packages/sysutils/gptfdisk/package.mk b/packages/sysutils/gptfdisk/package.mk
  2517. index 2668ea6..5e59cb0 100644
  2518. --- a/packages/sysutils/gptfdisk/package.mk
  2519. +++ b/packages/sysutils/gptfdisk/package.mk
  2520. @@ -7,7 +7,7 @@ PKG_SHA256="b663391a6876f19a3cd901d862423a16e2b5ceaa2f4a3b9bb681e64b9c7ba78d"
  2521. PKG_LICENSE="GPL"
  2522. PKG_SITE="http://www.rodsbooks.com/gdisk/"
  2523. PKG_URL="https://downloads.sourceforge.net/project/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
  2524. -PKG_DEPENDS_TARGET="toolchain popt"
  2525. +PKG_DEPENDS_TARGET="toolchain popt crossguid"
  2526. PKG_LONGDESC="GPT text-mode partitioning tools"
  2527.  
  2528. make_target() {
  2529. diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk
  2530. index 07e07e8..27a18b8 100644
  2531. --- a/packages/sysutils/util-linux/package.mk
  2532. +++ b/packages/sysutils/util-linux/package.mk
  2533. @@ -7,7 +7,7 @@ PKG_VERSION="2.32.1"
  2534. PKG_SHA256="86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2"
  2535. PKG_LICENSE="GPL"
  2536. PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz"
  2537. -PKG_DEPENDS_HOST=""
  2538. +PKG_DEPENDS_HOST="gcc:host pkg-config:host"
  2539. PKG_DEPENDS_TARGET="toolchain"
  2540. PKG_DEPENDS_INIT="toolchain"
  2541. PKG_LONGDESC="A large variety of low-level system utilities that are necessary for a Linux system to function."
  2542. diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk
  2543. index 6e37014..84495df 100644
  2544. --- a/packages/sysutils/v4l-utils/package.mk
  2545. +++ b/packages/sysutils/v4l-utils/package.mk
  2546. @@ -10,7 +10,7 @@ PKG_SHA256="e6b962c4b1253cf852c31da13fd6b5bb7cbe5aa9e182881aec55123bae680692"
  2547. PKG_LICENSE="GPL"
  2548. PKG_SITE="http://linuxtv.org/"
  2549. PKG_URL="http://linuxtv.org/downloads/v4l-utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2550. -PKG_DEPENDS_TARGET="toolchain"
  2551. +PKG_DEPENDS_TARGET="toolchain alsa-lib systemd"
  2552. PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
  2553.  
  2554. PKG_CONFIGURE_OPTS_TARGET="--without-jpeg \
  2555. diff --git a/packages/tools/aml-dtbtools/package.mk b/packages/tools/aml-dtbtools/package.mk
  2556. index 8e21b9b..93a0d28 100644
  2557. --- a/packages/tools/aml-dtbtools/package.mk
  2558. +++ b/packages/tools/aml-dtbtools/package.mk
  2559. @@ -7,6 +7,7 @@ PKG_SHA256="8bcaa83fcc9e85c9c04930e7411447d96a97da0809c5ecd9af91c8b554133c41"
  2560. PKG_LICENSE="free"
  2561. PKG_SITE="https://github.com/Wilhansen/aml-dtbtools"
  2562. PKG_URL="https://github.com/Wilhansen/aml-dtbtools/archive/${PKG_VERSION}.tar.gz"
  2563. +PKG_DEPENDS_HOST="gcc:host"
  2564. PKG_LONGDESC="AML DTB Tools"
  2565.  
  2566. PKG_MAKE_OPTS_HOST="dtbTool"
  2567. diff --git a/packages/tools/dtc/package.mk b/packages/tools/dtc/package.mk
  2568. index e943d3e..4fe132c 100644
  2569. --- a/packages/tools/dtc/package.mk
  2570. +++ b/packages/tools/dtc/package.mk
  2571. @@ -8,7 +8,7 @@ PKG_LICENSE="GPL"
  2572. PKG_SITE="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/"
  2573. PKG_URL="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$PKG_VERSION.tar.gz"
  2574. PKG_DEPENDS_HOST="Python2:host swig:host"
  2575. -PKG_DEPENDS_TARGET="toolchain"
  2576. +PKG_DEPENDS_TARGET="toolchain dtc:host"
  2577. PKG_LONGDESC="The Device Tree Compiler"
  2578.  
  2579. PKG_MAKE_OPTS_HOST="dtc libfdt"
  2580. diff --git a/packages/tools/mkbootimg/package.mk b/packages/tools/mkbootimg/package.mk
  2581. index 0b9d83a..adc1d3a 100644
  2582. --- a/packages/tools/mkbootimg/package.mk
  2583. +++ b/packages/tools/mkbootimg/package.mk
  2584. @@ -1,5 +1,6 @@
  2585. # SPDX-License-Identifier: GPL-2.0-or-later
  2586. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2587. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2588.  
  2589. PKG_NAME="mkbootimg"
  2590. PKG_VERSION="6668fc2"
  2591. @@ -7,7 +8,7 @@ PKG_SHA256="d84870e055414d638a3e7eb4b7a3ebf415899841218f24cb3647d06ecf6ddb17"
  2592. PKG_LICENSE="GPL"
  2593. PKG_SITE="https://android.googlesource.com/platform/system/core/+/master/mkbootimg/"
  2594. PKG_URL="https://github.com/codesnake/mkbootimg/archive/$PKG_VERSION.tar.gz"
  2595. -PKG_DEPENDS_HOST=""
  2596. +PKG_DEPENDS_HOST="gcc:host"
  2597. PKG_LONGDESC="mkbootimg: Creates kernel boot images for Android"
  2598.  
  2599. makeinstall_host() {
  2600. diff --git a/packages/tools/mtools/package.mk b/packages/tools/mtools/package.mk
  2601. index 099488f..e0dd42e 100644
  2602. --- a/packages/tools/mtools/package.mk
  2603. +++ b/packages/tools/mtools/package.mk
  2604. @@ -1,5 +1,6 @@
  2605. # SPDX-License-Identifier: GPL-2.0-or-later
  2606. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2607. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2608.  
  2609. PKG_NAME="mtools"
  2610. PKG_VERSION="4.0.18"
  2611. @@ -7,6 +8,6 @@ PKG_SHA256="59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85"
  2612. PKG_LICENSE="GPL"
  2613. PKG_SITE="http://www.gnu.org/software/mtools/"
  2614. PKG_URL="http://ftpmirror.gnu.org/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2615. -PKG_DEPENDS_HOST=""
  2616. +PKG_DEPENDS_HOST="gcc:host"
  2617. PKG_LONGDESC="mtools: A collection of utilities to access MS-DOS disks"
  2618. PKG_TOOLCHAIN="autotools"
  2619. diff --git a/packages/x11/lib/pixman/package.mk b/packages/x11/lib/pixman/package.mk
  2620. index 65868f2..631a570 100644
  2621. --- a/packages/x11/lib/pixman/package.mk
  2622. +++ b/packages/x11/lib/pixman/package.mk
  2623. @@ -1,5 +1,6 @@
  2624. # SPDX-License-Identifier: GPL-2.0-or-later
  2625. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2626. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2627.  
  2628. PKG_NAME="pixman"
  2629. PKG_VERSION="0.34.0"
  2630. @@ -7,6 +8,7 @@ PKG_SHA256="39ba3438f3d17c464b0cb8be006dacbca0ab5aee97ebde69fec7ecdbf85794a0"
  2631. PKG_LICENSE="OSS"
  2632. PKG_SITE="http://www.x.org/"
  2633. PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2634. +PKG_DEPENDS_HOST="gcc:host"
  2635. PKG_DEPENDS_TARGET="toolchain util-macros"
  2636. PKG_LONGDESC="Pixman is a generic library for manipulating pixel regions, contains low-level pixel manipulation routines."
  2637.  
  2638. diff --git a/projects/Amlogic/packages/autoscript-amlogic/package.mk b/projects/Amlogic/packages/autoscript-amlogic/package.mk
  2639. index b35cfac..ce08e3f 100644
  2640. --- a/projects/Amlogic/packages/autoscript-amlogic/package.mk
  2641. +++ b/projects/Amlogic/packages/autoscript-amlogic/package.mk
  2642. @@ -4,7 +4,7 @@
  2643. PKG_NAME="autoscript-amlogic"
  2644. PKG_VERSION=""
  2645. PKG_LICENSE="GPL"
  2646. -PKG_DEPENDS_TARGET="toolchain"
  2647. +PKG_DEPENDS_TARGET="toolchain u-boot-tools-aml:host"
  2648. PKG_LONGDESC="Autoscript package for Amlogic devices"
  2649. PKG_TOOLCHAIN="manual"
  2650.  
  2651. --
  2652. 2.14.1
  2653.  
  2654.  
  2655. From 3e5ee9b219e0d4c7117b2b3e50d355528ea0505d Mon Sep 17 00:00:00 2001
  2656. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  2657. Date: Sun, 6 Jan 2019 10:22:10 +0000
  2658. Subject: [PATCH 13/26] packages: add missing xorg dependencies
  2659.  
  2660. ---
  2661. packages/x11/app/xkbcomp/package.mk | 3 ++-
  2662. packages/x11/driver/xf86-input-evdev/package.mk | 2 +-
  2663. packages/x11/driver/xf86-input-synaptics/package.mk | 2 +-
  2664. packages/x11/lib/libXi/package.mk | 2 +-
  2665. packages/x11/lib/libxshmfence/package.mk | 2 +-
  2666. 5 files changed, 6 insertions(+), 5 deletions(-)
  2667.  
  2668. diff --git a/packages/x11/app/xkbcomp/package.mk b/packages/x11/app/xkbcomp/package.mk
  2669. index fdee2ed..cefb1e3 100644
  2670. --- a/packages/x11/app/xkbcomp/package.mk
  2671. +++ b/packages/x11/app/xkbcomp/package.mk
  2672. @@ -1,5 +1,6 @@
  2673. # SPDX-License-Identifier: GPL-2.0-or-later
  2674. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2675. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2676.  
  2677. PKG_NAME="xkbcomp"
  2678. PKG_VERSION="1.4.1"
  2679. @@ -7,7 +8,7 @@ PKG_SHA256="748dc4cf58ac95684106bd9cf163ac6ab7de9a236faec02a6f4d4006d63a5736"
  2680. PKG_LICENSE="OSS"
  2681. PKG_SITE="http://www.X.org"
  2682. PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2683. -PKG_DEPENDS_TARGET="toolchain util-macros libX11"
  2684. +PKG_DEPENDS_TARGET="toolchain util-macros libX11 libxkbfile"
  2685. PKG_LONGDESC="The xkbcomp keymap compiler converts a description of an XKB keymap into one of several output formats."
  2686.  
  2687. PKG_CONFIGURE_OPTS_TARGET="--with-xkb-config-root=$XORG_PATH_XKB"
  2688. diff --git a/packages/x11/driver/xf86-input-evdev/package.mk b/packages/x11/driver/xf86-input-evdev/package.mk
  2689. index e83dd81..c015cfc 100644
  2690. --- a/packages/x11/driver/xf86-input-evdev/package.mk
  2691. +++ b/packages/x11/driver/xf86-input-evdev/package.mk
  2692. @@ -8,7 +8,7 @@ PKG_SHA256="9edaa6205baf6d2922cc4db3d8e54a7e7773b5f733b0ae90f6be7725f983b70d"
  2693. PKG_LICENSE="OSS"
  2694. PKG_SITE="http://www.X.org"
  2695. PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2696. -PKG_DEPENDS_TARGET="toolchain util-macros libevdev mtdev systemd"
  2697. +PKG_DEPENDS_TARGET="toolchain xorg-server util-macros libevdev mtdev systemd"
  2698. PKG_LONGDESC="Evdev is an Xorg input driver for Linux's generic event devices."
  2699. PKG_TOOLCHAIN="autotools"
  2700.  
  2701. diff --git a/packages/x11/driver/xf86-input-synaptics/package.mk b/packages/x11/driver/xf86-input-synaptics/package.mk
  2702. index abbdf17..450fbf7 100644
  2703. --- a/packages/x11/driver/xf86-input-synaptics/package.mk
  2704. +++ b/packages/x11/driver/xf86-input-synaptics/package.mk
  2705. @@ -7,7 +7,7 @@ PKG_SHA256="afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a"
  2706. PKG_LICENSE="GPL"
  2707. PKG_SITE="http://lists.freedesktop.org/mailman/listinfo/xorg"
  2708. PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2709. -PKG_DEPENDS_TARGET="toolchain libXi"
  2710. +PKG_DEPENDS_TARGET="toolchain xorg-server libXi libXext"
  2711. PKG_LONGDESC="Synaptics touchpad driver for X.Org."
  2712. PKG_TOOLCHAIN="autotools"
  2713.  
  2714. diff --git a/packages/x11/lib/libXi/package.mk b/packages/x11/lib/libXi/package.mk
  2715. index 8f50cc5..ac1707c 100644
  2716. --- a/packages/x11/lib/libXi/package.mk
  2717. +++ b/packages/x11/lib/libXi/package.mk
  2718. @@ -8,7 +8,7 @@ PKG_SHA256="c2e6b8ff84f9448386c1b5510a5cf5a16d788f76db018194dacdc200180faf45"
  2719. PKG_LICENSE="OSS"
  2720. PKG_SITE="http://www.x.org/"
  2721. PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2722. -PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXfixes"
  2723. +PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXfixes libXext"
  2724. PKG_LONGDESC="LibXi provides an X Window System client interface to the XINPUT extension to the X protocol."
  2725. PKG_BUILD_FLAGS="+pic"
  2726.  
  2727. diff --git a/packages/x11/lib/libxshmfence/package.mk b/packages/x11/lib/libxshmfence/package.mk
  2728. index daa5868..63d48f6 100644
  2729. --- a/packages/x11/lib/libxshmfence/package.mk
  2730. +++ b/packages/x11/lib/libxshmfence/package.mk
  2731. @@ -8,7 +8,7 @@ PKG_SHA256="b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7"
  2732. PKG_LICENSE="OSS"
  2733. PKG_SITE="http://www.X.org"
  2734. PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2735. -PKG_DEPENDS_TARGET="toolchain util-macros"
  2736. +PKG_DEPENDS_TARGET="toolchain util-macros xorgproto"
  2737. PKG_LONGDESC="libxshmfence is the Shared memory 'SyncFence' synchronization primitive."
  2738. PKG_TOOLCHAIN="autotools"
  2739. PKG_BUILD_FLAGS="+pic"
  2740. --
  2741. 2.14.1
  2742.  
  2743.  
  2744. From dd100fe3de96393c16743bf377e14aa795b19305 Mon Sep 17 00:00:00 2001
  2745. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  2746. Date: Sat, 12 Jan 2019 14:12:26 +0000
  2747. Subject: [PATCH 14/26] packages: more missing dependencies
  2748.  
  2749. ---
  2750. packages/databases/sqlite/package.mk | 2 +-
  2751. packages/devel/bison/package.mk | 3 ++-
  2752. packages/devel/flex/package.mk | 2 +-
  2753. packages/devel/gmp/package.mk | 4 +++-
  2754. packages/lang/Python2/package.mk | 2 +-
  2755. 5 files changed, 8 insertions(+), 5 deletions(-)
  2756.  
  2757. diff --git a/packages/databases/sqlite/package.mk b/packages/databases/sqlite/package.mk
  2758. index 8a793e8..9bda7be 100644
  2759. --- a/packages/databases/sqlite/package.mk
  2760. +++ b/packages/databases/sqlite/package.mk
  2761. @@ -9,7 +9,7 @@ PKG_LICENSE="PublicDomain"
  2762. PKG_SITE="https://www.sqlite.org/"
  2763. PKG_URL="https://www.sqlite.org/2018/$PKG_NAME-$PKG_VERSION.tar.gz"
  2764. PKG_DEPENDS_HOST="gcc:host"
  2765. -PKG_DEPENDS_TARGET="toolchain"
  2766. +PKG_DEPENDS_TARGET="toolchain ncurses"
  2767. PKG_LONGDESC="An Embeddable SQL Database Engine."
  2768. # libsqlite3.a(sqlite3.o): requires dynamic R_X86_64_PC32 reloc against 'sqlite3_stricmp' which may overflow at runtime
  2769. PKG_BUILD_FLAGS="+pic +pic:host -parallel"
  2770. diff --git a/packages/devel/bison/package.mk b/packages/devel/bison/package.mk
  2771. index 5c15fbc..886e922 100644
  2772. --- a/packages/devel/bison/package.mk
  2773. +++ b/packages/devel/bison/package.mk
  2774. @@ -1,5 +1,6 @@
  2775. # SPDX-License-Identifier: GPL-2.0-or-later
  2776. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2777. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2778.  
  2779. PKG_NAME="bison"
  2780. PKG_VERSION="3.0.5"
  2781. @@ -7,7 +8,7 @@ PKG_SHA256="075cef2e814642e30e10e8155e93022e4a91ca38a65aa1d5467d4e969f97f338"
  2782. PKG_LICENSE="GPL"
  2783. PKG_SITE="http://www.gnu.org/software/bison/"
  2784. PKG_URL="http://ftpmirror.gnu.org/bison/$PKG_NAME-$PKG_VERSION.tar.xz"
  2785. -PKG_DEPENDS_HOST="ccache:host"
  2786. +PKG_DEPENDS_HOST="ccache:host m4:host"
  2787. PKG_LONGDESC="A general-purpose parser generator."
  2788.  
  2789. PKG_CONFIGURE_OPTS_HOST="--disable-rpath --with-gnu-ld"
  2790. diff --git a/packages/devel/flex/package.mk b/packages/devel/flex/package.mk
  2791. index 37e2324..dc68458 100644
  2792. --- a/packages/devel/flex/package.mk
  2793. +++ b/packages/devel/flex/package.mk
  2794. @@ -7,7 +7,7 @@ PKG_SHA256="add2b55f3bc38cb512b48fad7d72f43b11ef244487ff25fc00aabec1e32b617f"
  2795. PKG_LICENSE="GPL"
  2796. PKG_SITE="http://flex.sourceforge.net/"
  2797. PKG_URL="$SOURCEFORGE_SRC/flex/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2798. -PKG_DEPENDS_HOST="ccache:host"
  2799. +PKG_DEPENDS_HOST="ccache:host m4:host"
  2800. PKG_DEPENDS_TARGET="toolchain"
  2801. PKG_LONGDESC="A tool for generating programs that perform pattern-matching on text."
  2802. PKG_TOOLCHAIN="autotools"
  2803. diff --git a/packages/devel/gmp/package.mk b/packages/devel/gmp/package.mk
  2804. index fddce60..53eef6c 100644
  2805. --- a/packages/devel/gmp/package.mk
  2806. +++ b/packages/devel/gmp/package.mk
  2807. @@ -1,5 +1,6 @@
  2808. # SPDX-License-Identifier: GPL-2.0-or-later
  2809. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2810. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2811.  
  2812. PKG_NAME="gmp"
  2813. PKG_VERSION="6.1.2"
  2814. @@ -7,7 +8,8 @@ PKG_SHA256="87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912"
  2815. PKG_LICENSE="LGPLv3+"
  2816. PKG_SITE="http://gmplib.org/"
  2817. PKG_URL="https://gmplib.org/download/gmp/$PKG_NAME-$PKG_VERSION.tar.xz"
  2818. -PKG_DEPENDS_HOST="ccache:host"
  2819. +PKG_DEPENDS_HOST="ccache:host m4:host"
  2820. +PKG_DEPENDS_TARGET="toolchain"
  2821. PKG_LONGDESC="A library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers."
  2822. PKG_BUILD_FLAGS="+pic:host"
  2823.  
  2824. diff --git a/packages/lang/Python2/package.mk b/packages/lang/Python2/package.mk
  2825. index a5e17da..edfe51e 100644
  2826. --- a/packages/lang/Python2/package.mk
  2827. +++ b/packages/lang/Python2/package.mk
  2828. @@ -10,7 +10,7 @@ PKG_LICENSE="OSS"
  2829. PKG_SITE="http://www.python.org/"
  2830. PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/${PKG_NAME::-1}-$PKG_VERSION.tar.xz"
  2831. PKG_DEPENDS_HOST="zlib:host bzip2:host sqlite:host"
  2832. -PKG_DEPENDS_TARGET="toolchain sqlite expat zlib bzip2 openssl libffi Python2:host"
  2833. +PKG_DEPENDS_TARGET="toolchain sqlite expat zlib bzip2 openssl libffi Python2:host ncurses readline"
  2834. PKG_LONGDESC="Python2 is an interpreted object-oriented programming language."
  2835.  
  2836. PKG_TOOLCHAIN="autotools"
  2837. --
  2838. 2.14.1
  2839.  
  2840.  
  2841. From 1a8682d89bd3759befac904248a661c847f26909 Mon Sep 17 00:00:00 2001
  2842. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  2843. Date: Sat, 12 Jan 2019 01:25:27 +0000
  2844. Subject: [PATCH 15/26] packages: add thread safety workaround
  2845.  
  2846. Avoids trashing $TOOLCHAIN/lib/python2.7/site-packages/easy-install.pth
  2847. when installing Python host packages (distutilscross:host, setuptools:host,
  2848. MarkupSafe:host etc.).
  2849. ---
  2850. packages/python/devel/Mako/package.mk | 2 +-
  2851. packages/python/devel/MarkupSafe/package.mk | 2 +-
  2852. packages/python/devel/distutilscross/package.mk | 3 ++-
  2853. packages/python/devel/meson/package.mk | 2 +-
  2854. packages/python/devel/pathlib/package.mk | 2 +-
  2855. packages/python/devel/setuptools/package.mk | 4 ++--
  2856. packages/tools/dtc/package.mk | 2 +-
  2857. 7 files changed, 9 insertions(+), 8 deletions(-)
  2858.  
  2859. diff --git a/packages/python/devel/Mako/package.mk b/packages/python/devel/Mako/package.mk
  2860. index 45007cf..41217f6 100644
  2861. --- a/packages/python/devel/Mako/package.mk
  2862. +++ b/packages/python/devel/Mako/package.mk
  2863. @@ -13,5 +13,5 @@ PKG_LONGDESC="Mako is a super-fast templating language that borrows the best ide
  2864. PKG_TOOLCHAIN="manual"
  2865.  
  2866. makeinstall_host() {
  2867. - python3 setup.py install --prefix=$TOOLCHAIN
  2868. + exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN
  2869. }
  2870. diff --git a/packages/python/devel/MarkupSafe/package.mk b/packages/python/devel/MarkupSafe/package.mk
  2871. index 3780381..20c090e 100644
  2872. --- a/packages/python/devel/MarkupSafe/package.mk
  2873. +++ b/packages/python/devel/MarkupSafe/package.mk
  2874. @@ -13,5 +13,5 @@ PKG_LONGDESC="MarkupSafe implements a XML/HTML/XHTML Markup safe string for Pyth
  2875. PKG_TOOLCHAIN="manual"
  2876.  
  2877. makeinstall_host() {
  2878. - python3 setup.py install --prefix=$TOOLCHAIN
  2879. + exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN
  2880. }
  2881. diff --git a/packages/python/devel/distutilscross/package.mk b/packages/python/devel/distutilscross/package.mk
  2882. index 367e35a..4c767be 100644
  2883. --- a/packages/python/devel/distutilscross/package.mk
  2884. +++ b/packages/python/devel/distutilscross/package.mk
  2885. @@ -1,5 +1,6 @@
  2886. # SPDX-License-Identifier: GPL-2.0-or-later
  2887. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2888. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2889.  
  2890. PKG_NAME="distutilscross"
  2891. PKG_VERSION="0.1"
  2892. @@ -12,5 +13,5 @@ PKG_LONGDESC="distutilscross enhances distutils to support Cross Compile of Pyth
  2893. PKG_TOOLCHAIN="manual"
  2894.  
  2895. makeinstall_host() {
  2896. - python setup.py install --prefix=$TOOLCHAIN
  2897. + exec_thread_safe python setup.py install --prefix=$TOOLCHAIN
  2898. }
  2899. diff --git a/packages/python/devel/meson/package.mk b/packages/python/devel/meson/package.mk
  2900. index 0e34988..ff0820d 100644
  2901. --- a/packages/python/devel/meson/package.mk
  2902. +++ b/packages/python/devel/meson/package.mk
  2903. @@ -16,7 +16,7 @@ make_host() {
  2904. }
  2905.  
  2906. makeinstall_host() {
  2907. - python3 setup.py install --prefix=$TOOLCHAIN --skip-build
  2908. + exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN --skip-build
  2909.  
  2910. # Avoid using full path to python3 that may exceed 128 byte limit.
  2911. # Instead use PATH as we know our toolchain is first.
  2912. diff --git a/packages/python/devel/pathlib/package.mk b/packages/python/devel/pathlib/package.mk
  2913. index 30c9bea..61f8e55 100644
  2914. --- a/packages/python/devel/pathlib/package.mk
  2915. +++ b/packages/python/devel/pathlib/package.mk
  2916. @@ -12,5 +12,5 @@ PKG_LONGDESC="This module offers a set of classes featuring all the common opera
  2917. PKG_TOOLCHAIN="manual"
  2918.  
  2919. makeinstall_host() {
  2920. - python3 setup.py install --prefix=$TOOLCHAIN
  2921. + exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN
  2922. }
  2923. diff --git a/packages/python/devel/setuptools/package.mk b/packages/python/devel/setuptools/package.mk
  2924. index 8a21964..531e6d7 100644
  2925. --- a/packages/python/devel/setuptools/package.mk
  2926. +++ b/packages/python/devel/setuptools/package.mk
  2927. @@ -18,6 +18,6 @@ make_host() {
  2928. }
  2929.  
  2930. makeinstall_host() {
  2931. - python2 setup.py install --prefix=$TOOLCHAIN
  2932. - python3 setup.py install --prefix=$TOOLCHAIN
  2933. + exec_thread_safe python2 setup.py install --prefix=$TOOLCHAIN
  2934. + exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN
  2935. }
  2936. diff --git a/packages/tools/dtc/package.mk b/packages/tools/dtc/package.mk
  2937. index 4fe132c..c5a005a 100644
  2938. --- a/packages/tools/dtc/package.mk
  2939. +++ b/packages/tools/dtc/package.mk
  2940. @@ -22,7 +22,7 @@ makeinstall_host() {
  2941.  
  2942. post_makeinstall_host() {
  2943. python ./pylibfdt/setup.py build_ext --inplace
  2944. - python ./pylibfdt/setup.py install --prefix=$TOOLCHAIN
  2945. + exec_thread_safe python ./pylibfdt/setup.py install --prefix=$TOOLCHAIN
  2946.  
  2947. touch $TOOLCHAIN/lib/$PKG_PYTHON_VERSION/site-packages/pylibfdt/__init__.py
  2948. }
  2949. --
  2950. 2.14.1
  2951.  
  2952.  
  2953. From 635b1064dc1242976f9abdb66d97765d3434bb19 Mon Sep 17 00:00:00 2001
  2954. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  2955. Date: Sun, 6 Jan 2019 10:48:46 +0000
  2956. Subject: [PATCH 16/26] flex: work around realloc/malloc build failures with
  2957. flex:target
  2958.  
  2959. ---
  2960. packages/devel/flex/package.mk | 4 ++++
  2961. 1 file changed, 4 insertions(+)
  2962.  
  2963. diff --git a/packages/devel/flex/package.mk b/packages/devel/flex/package.mk
  2964. index dc68458..42bdc27 100644
  2965. --- a/packages/devel/flex/package.mk
  2966. +++ b/packages/devel/flex/package.mk
  2967. @@ -1,5 +1,6 @@
  2968. # SPDX-License-Identifier: GPL-2.0-or-later
  2969. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2970. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2971.  
  2972. PKG_NAME="flex"
  2973. PKG_VERSION="2.5.39"
  2974. @@ -14,6 +15,9 @@ PKG_TOOLCHAIN="autotools"
  2975.  
  2976. PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared --disable-rpath --with-gnu-ld"
  2977.  
  2978. +PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_realloc_0_nonnull=yes \
  2979. + ac_cv_func_malloc_0_nonnull=yes"
  2980. +
  2981. post_makeinstall_host() {
  2982. cat > $TOOLCHAIN/bin/lex << "EOF"
  2983. #!/bin/sh
  2984. --
  2985. 2.14.1
  2986.  
  2987.  
  2988. From 41cd5b4e0821a08b74fcf87f2ee4c47db449b479 Mon Sep 17 00:00:00 2001
  2989. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  2990. Date: Sun, 13 Jan 2019 04:30:32 +0000
  2991. Subject: [PATCH 17/26] libcec: remove useless demo script
  2992.  
  2993. ---
  2994. packages/devel/libcec/package.mk | 3 +++
  2995. 1 file changed, 3 insertions(+)
  2996.  
  2997. diff --git a/packages/devel/libcec/package.mk b/packages/devel/libcec/package.mk
  2998. index ef45e2a..53b143e 100644
  2999. --- a/packages/devel/libcec/package.mk
  3000. +++ b/packages/devel/libcec/package.mk
  3001. @@ -49,6 +49,9 @@ pre_configure_target() {
  3002. }
  3003.  
  3004. post_makeinstall_target() {
  3005. + # Remove the Python3 demo - useless for us
  3006. + rm -f $INSTALL/usr/bin/pyCecClient
  3007. +
  3008. PYTHON_DIR=$INSTALL/usr/lib/$PKG_PYTHON_VERSION
  3009. if [ -d $PYTHON_DIR/dist-packages ]; then
  3010. mv $PYTHON_DIR/dist-packages $PYTHON_DIR/site-packages
  3011. --
  3012. 2.14.1
  3013.  
  3014.  
  3015. From 7a46670482009f2959d4fff8b0e4d86c6c84896e Mon Sep 17 00:00:00 2001
  3016. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  3017. Date: Sat, 5 Jan 2019 22:42:12 +0000
  3018. Subject: [PATCH 18/26] initramfs: use ln -sfn when LINK_NAME is a directory
  3019.  
  3020. INSTALL initramfs (target)
  3021. ln: failed to create symbolic link '/home/ubuntu/projects/LibreELEC.tv/build.LibreELEC-RPi2.arm-9.0-devel-mt/initramfs/lib/lib': Permission denied
  3022. ln: failed to create symbolic link '/home/ubuntu/projects/LibreELEC.tv/build.LibreELEC-RPi2.arm-9.0-devel-mt/initramfs/bin/bin': Permission denied
  3023. ln: failed to create symbolic link '/home/ubuntu/projects/LibreELEC.tv/build.LibreELEC-RPi2.arm-9.0-devel-mt/initramfs/sbin/sbin': Permission denied
  3024.  
  3025. If the directory sym link already exists, we try to
  3026. create a directory within the dereferenced sym link. So...
  3027.  
  3028. ln -sf /usr/lib $BUILD/initramfs/lib
  3029.  
  3030. means we attempt to create a sym link within the existing
  3031. $BUILD/initramfs/lib which is derefernced to /usr/lib/lib,
  3032. resulting in "permission denied".
  3033. ---
  3034. packages/virtual/initramfs/package.mk | 10 +++++-----
  3035. 1 file changed, 5 insertions(+), 5 deletions(-)
  3036.  
  3037. diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk
  3038. index ef17f19..b278804 100644
  3039. --- a/packages/virtual/initramfs/package.mk
  3040. +++ b/packages/virtual/initramfs/package.mk
  3041. @@ -22,14 +22,14 @@ fi
  3042. post_install() {
  3043. ( cd $BUILD/initramfs
  3044. if [ "$TARGET_ARCH" = "x86_64" ]; then
  3045. - ln -sf /usr/lib $BUILD/initramfs/lib64
  3046. + ln -sfn /usr/lib $BUILD/initramfs/lib64
  3047. mkdir -p $BUILD/initramfs/usr
  3048. - ln -sf /usr/lib $BUILD/initramfs/usr/lib64
  3049. + ln -sfn /usr/lib $BUILD/initramfs/usr/lib64
  3050. fi
  3051.  
  3052. - ln -sf /usr/lib $BUILD/initramfs/lib
  3053. - ln -sf /usr/bin $BUILD/initramfs/bin
  3054. - ln -sf /usr/sbin $BUILD/initramfs/sbin
  3055. + ln -sfn /usr/lib $BUILD/initramfs/lib
  3056. + ln -sfn /usr/bin $BUILD/initramfs/bin
  3057. + ln -sfn /usr/sbin $BUILD/initramfs/sbin
  3058.  
  3059. mkdir -p $BUILD/image/
  3060. fakeroot -- sh -c \
  3061. --
  3062. 2.14.1
  3063.  
  3064.  
  3065. From 6e63030bed05f7b090077ac1aaa6cb72d3b9c512 Mon Sep 17 00:00:00 2001
  3066. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  3067. Date: Wed, 16 Jan 2019 06:35:00 +0000
  3068. Subject: [PATCH 19/26] alsa-utils: depends on systemd otherwise udev rules
  3069. installed incorrectly
  3070.  
  3071. udev rules will be installed to /lib/udev/rules.d and not /usr/lib/udev/rules.d
  3072. if udev (via systemd) is not already installed.
  3073.  
  3074. if test "${with_udev_rules_dir+set}" = set; then :
  3075. withval=$with_udev_rules_dir; udevrulesdir="$withval"
  3076. else
  3077. udevdir=$($PKG_CONFIG udev --variable=udevdir)
  3078. if test "x$udevdir" = "x"; then
  3079. udevrulesdir="/lib/udev/rules.d"
  3080. else
  3081. udevrulesdir="$udevdir/rules.d"
  3082. fi
  3083. fi
  3084. ---
  3085. packages/audio/alsa-utils/package.mk | 2 +-
  3086. 1 file changed, 1 insertion(+), 1 deletion(-)
  3087.  
  3088. diff --git a/packages/audio/alsa-utils/package.mk b/packages/audio/alsa-utils/package.mk
  3089. index 0416893..c123f21 100644
  3090. --- a/packages/audio/alsa-utils/package.mk
  3091. +++ b/packages/audio/alsa-utils/package.mk
  3092. @@ -8,7 +8,7 @@ PKG_SHA256="fd9bf528922b3829a91913b89a1858c58a0b24271a7b5f529923aa9ea12fa4cf"
  3093. PKG_LICENSE="GPL"
  3094. PKG_SITE="http://www.alsa-project.org/"
  3095. PKG_URL="ftp://ftp.alsa-project.org/pub/utils/alsa-utils-$PKG_VERSION.tar.bz2"
  3096. -PKG_DEPENDS_TARGET="toolchain alsa-lib ncurses"
  3097. +PKG_DEPENDS_TARGET="toolchain alsa-lib ncurses systemd"
  3098. PKG_LONGDESC="This package includes the utilities for ALSA, like alsamixer, aplay, arecord, alsactl, iecset and speaker-test."
  3099.  
  3100. PKG_CONFIGURE_OPTS_TARGET="--disable-alsaconf \
  3101. --
  3102. 2.14.1
  3103.  
  3104.  
  3105. From 8e4d72c19ce7513766bd3049bcba73d1224c0a16 Mon Sep 17 00:00:00 2001
  3106. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  3107. Date: Wed, 16 Jan 2019 06:48:17 +0000
  3108. Subject: [PATCH 20/26] lirc: detects alsa automagically - we don't want the
  3109. alsa libs
  3110.  
  3111. When building lirc after alsa-utils, the following unwanted alsa libraries are built by lirc:
  3112.  
  3113. NEW FILE Delta: 10,536 devel-20190115185543-5767941: 10,536 devel-20190115133317-5767941: n/a /usr/lib/lirc/plugins/alsa_usb.so
  3114. NEW FILE Delta: 19,176 devel-20190115185543-5767941: 19,176 devel-20190115133317-5767941: n/a /usr/lib/lirc/plugins/audio_alsa.so
  3115. ---
  3116. packages/sysutils/lirc/package.mk | 5 ++++-
  3117. 1 file changed, 4 insertions(+), 1 deletion(-)
  3118.  
  3119. diff --git a/packages/sysutils/lirc/package.mk b/packages/sysutils/lirc/package.mk
  3120. index 5358c9e..c273a59 100644
  3121. --- a/packages/sysutils/lirc/package.mk
  3122. +++ b/packages/sysutils/lirc/package.mk
  3123. @@ -1,5 +1,6 @@
  3124. # SPDX-License-Identifier: GPL-2.0-or-later
  3125. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  3126. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  3127.  
  3128. PKG_NAME="lirc"
  3129. PKG_VERSION="0.10.0"
  3130. @@ -13,7 +14,9 @@ PKG_TOOLCHAIN="autotools"
  3131.  
  3132. PKG_PYTHON_WANTED=Python2
  3133.  
  3134. -PKG_CONFIGURE_OPTS_TARGET="--enable-devinput \
  3135. +PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_alsa_asoundlib_h=no \
  3136. + ac_cv_lib_asound_snd_async_del_handler=no \
  3137. + --enable-devinput \
  3138. --with-gnu-ld \
  3139. --without-x \
  3140. --runstatedir=/run"
  3141. --
  3142. 2.14.1
  3143.  
  3144.  
  3145. From 56849d9e7d822962db7e55da858e9b6f59086237 Mon Sep 17 00:00:00 2001
  3146. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  3147. Date: Wed, 16 Jan 2019 11:30:13 +0000
  3148. Subject: [PATCH 21/26] libcec: add libX11/libXrandr depends (optional, but
  3149. needed for reproducible build)
  3150.  
  3151. "libX11 and xrandr to read the sink's EDID, used to determine the PC's HDMI physical address"
  3152. ---
  3153. packages/devel/libcec/package.mk | 5 +++++
  3154. 1 file changed, 5 insertions(+)
  3155.  
  3156. diff --git a/packages/devel/libcec/package.mk b/packages/devel/libcec/package.mk
  3157. index 53b143e..b9706ad 100644
  3158. --- a/packages/devel/libcec/package.mk
  3159. +++ b/packages/devel/libcec/package.mk
  3160. @@ -32,6 +32,11 @@ else
  3161. PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_AOCEC_API=0 -DHAVE_AMLOGIC_API=0"
  3162. fi
  3163.  
  3164. +# libX11 and xrandr to read the sink's EDID, used to determine the PC's HDMI physical address
  3165. +if [ "$DISPLAYSERVER" = "x11" ]; then
  3166. + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXrandr"
  3167. +fi
  3168. +
  3169. if [ "$CEC_FRAMEWORK_SUPPORT" = "yes" ]; then
  3170. PKG_PATCH_DIRS="cec-framework"
  3171. PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_LINUX_API=1"
  3172. --
  3173. 2.14.1
  3174.  
  3175.  
  3176. From b946123e4295ef7d0667d64c67b20513d8c47084 Mon Sep 17 00:00:00 2001
  3177. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  3178. Date: Wed, 16 Jan 2019 12:53:44 +0000
  3179. Subject: [PATCH 22/26] flex: host depends on autotools
  3180.  
  3181. ---
  3182. packages/devel/flex/package.mk | 2 +-
  3183. 1 file changed, 1 insertion(+), 1 deletion(-)
  3184.  
  3185. diff --git a/packages/devel/flex/package.mk b/packages/devel/flex/package.mk
  3186. index 42bdc27..2594643 100644
  3187. --- a/packages/devel/flex/package.mk
  3188. +++ b/packages/devel/flex/package.mk
  3189. @@ -8,7 +8,7 @@ PKG_SHA256="add2b55f3bc38cb512b48fad7d72f43b11ef244487ff25fc00aabec1e32b617f"
  3190. PKG_LICENSE="GPL"
  3191. PKG_SITE="http://flex.sourceforge.net/"
  3192. PKG_URL="$SOURCEFORGE_SRC/flex/$PKG_NAME-$PKG_VERSION.tar.bz2"
  3193. -PKG_DEPENDS_HOST="ccache:host m4:host"
  3194. +PKG_DEPENDS_HOST="ccache:host m4:host autotools:host"
  3195. PKG_DEPENDS_TARGET="toolchain"
  3196. PKG_LONGDESC="A tool for generating programs that perform pattern-matching on text."
  3197. PKG_TOOLCHAIN="autotools"
  3198. --
  3199. 2.14.1
  3200.  
  3201.  
  3202. From cce44234d1aeeb5cbe6668793525ff58f9d1c4c7 Mon Sep 17 00:00:00 2001
  3203. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  3204. Date: Thu, 17 Jan 2019 19:07:28 +0000
  3205. Subject: [PATCH 23/26] font-bitstream-type1: add font-xfree86-type1 dependency
  3206. to avoid install race condition
  3207.  
  3208. Both packages update the same fonts.dir, but font-xfree86-type1 trashes it so build this first.
  3209. ---
  3210. packages/x11/font/font-bitstream-type1/package.mk | 3 ++-
  3211. 1 file changed, 2 insertions(+), 1 deletion(-)
  3212.  
  3213. diff --git a/packages/x11/font/font-bitstream-type1/package.mk b/packages/x11/font/font-bitstream-type1/package.mk
  3214. index 276cd58..a0e4695 100644
  3215. --- a/packages/x11/font/font-bitstream-type1/package.mk
  3216. +++ b/packages/x11/font/font-bitstream-type1/package.mk
  3217. @@ -1,5 +1,6 @@
  3218. # SPDX-License-Identifier: GPL-2.0-or-later
  3219. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  3220. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  3221.  
  3222. PKG_NAME="font-bitstream-type1"
  3223. PKG_VERSION="1.0.3"
  3224. @@ -7,7 +8,7 @@ PKG_SHA256="c6ea0569adad2c577f140328dc3302e729cb1b1ea90cd0025caf380625f8a688"
  3225. PKG_LICENSE="OSS"
  3226. PKG_SITE="http://www.X.org"
  3227. PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2"
  3228. -PKG_DEPENDS_TARGET="toolchain util-macros"
  3229. +PKG_DEPENDS_TARGET="toolchain util-macros font-xfree86-type1"
  3230. PKG_LONGDESC="Bitstream font family."
  3231.  
  3232. PKG_CONFIGURE_OPTS_TARGET="--with-fontrootdir=/usr/share/fonts"
  3233. --
  3234. 2.14.1
  3235.  
  3236.  
  3237. From c93808236b57cbc1c74c211f27e97a38ba949096 Mon Sep 17 00:00:00 2001
  3238. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  3239. Date: Fri, 18 Jan 2019 23:55:21 +0000
  3240. Subject: [PATCH 24/26] autoconf: add yoctoproject/poky performance patch
  3241.  
  3242. Source: http://git.yoctoproject.org/cgit.cgi/poky/tree/meta/recipes-devtools/autoconf/autoconf
  3243. ---
  3244. .../patches/autoconf-0200-performance.patch | 60 ++++++++++++++++++++++
  3245. 1 file changed, 60 insertions(+)
  3246. create mode 100644 packages/devel/autoconf/patches/autoconf-0200-performance.patch
  3247.  
  3248. diff --git a/packages/devel/autoconf/patches/autoconf-0200-performance.patch b/packages/devel/autoconf/patches/autoconf-0200-performance.patch
  3249. new file mode 100644
  3250. index 0000000..1842fe9
  3251. --- /dev/null
  3252. +++ b/packages/devel/autoconf/patches/autoconf-0200-performance.patch
  3253. @@ -0,0 +1,60 @@
  3254. +The check for solaris 'print' causes significant problems on a linux machine
  3255. +with dash as /bin/sh since it triggers the execution of "print" which on some
  3256. +linux systems is a perl script which is part of mailcap. Worse, this perl
  3257. +script calls "which file" and if successful ignores the path file was found
  3258. +in and just runs "file" without a path. Each exection causes PATH to be searched.
  3259. +
  3260. +Simply assuming the shell's printf function works cuts out all the fork overhead
  3261. +and when parallel tasks are running, this overhead appears to be significant.
  3262. +
  3263. +RP
  3264. +2015/11/28
  3265. +Upstream-Status: Inappropriate
  3266. +
  3267. +Index: autoconf-2.69/lib/m4sugar/m4sh.m4
  3268. +===================================================================
  3269. +--- autoconf-2.69.orig/lib/m4sugar/m4sh.m4
  3270. ++++ autoconf-2.69/lib/m4sugar/m4sh.m4
  3271. +@@ -1045,40 +1045,8 @@ m4_defun([_AS_ECHO_PREPARE],
  3272. + [[as_nl='
  3273. + '
  3274. + export as_nl
  3275. +-# Printing a long string crashes Solaris 7 /usr/bin/printf.
  3276. +-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  3277. +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  3278. +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
  3279. +-# Prefer a ksh shell builtin over an external printf program on Solaris,
  3280. +-# but without wasting forks for bash or zsh.
  3281. +-if test -z "$BASH_VERSION$ZSH_VERSION" \
  3282. +- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
  3283. +- as_echo='print -r --'
  3284. +- as_echo_n='print -rn --'
  3285. +-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
  3286. +- as_echo='printf %s\n'
  3287. +- as_echo_n='printf %s'
  3288. +-else
  3289. +- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
  3290. +- as_echo_body='eval /usr/ucb/echo -n "$][1$as_nl"'
  3291. +- as_echo_n='/usr/ucb/echo -n'
  3292. +- else
  3293. +- as_echo_body='eval expr "X$][1" : "X\\(.*\\)"'
  3294. +- as_echo_n_body='eval
  3295. +- arg=$][1;
  3296. +- case $arg in @%:@(
  3297. +- *"$as_nl"*)
  3298. +- expr "X$arg" : "X\\(.*\\)$as_nl";
  3299. +- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
  3300. +- esac;
  3301. +- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
  3302. +- '
  3303. +- export as_echo_n_body
  3304. +- as_echo_n='sh -c $as_echo_n_body as_echo'
  3305. +- fi
  3306. +- export as_echo_body
  3307. +- as_echo='sh -c $as_echo_body as_echo'
  3308. +-fi
  3309. ++as_echo='printf %s\n'
  3310. ++as_echo_n='printf %s'
  3311. + ]])# _AS_ECHO_PREPARE
  3312. +
  3313. +
  3314. --
  3315. 2.14.1
  3316.  
  3317.  
  3318. From 1373507063049f9c0c6b6b467707b2ecd0937baf Mon Sep 17 00:00:00 2001
  3319. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  3320. Date: Tue, 15 Jan 2019 11:36:33 +0000
  3321. Subject: [PATCH 25/26] scripts/image: enable multithreaded builds when
  3322. THREADCOUNT is defined
  3323.  
  3324. Temporary solution until scripts/image_mt replaces scripts/image.
  3325. ---
  3326. scripts/image | 7 +++++++
  3327. 1 file changed, 7 insertions(+)
  3328.  
  3329. diff --git a/scripts/image b/scripts/image
  3330. index ea126e8..4e8d189 100755
  3331. --- a/scripts/image
  3332. +++ b/scripts/image
  3333. @@ -7,6 +7,13 @@
  3334. unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACKAGE_LIST
  3335.  
  3336. . config/options ""
  3337. +
  3338. +# Temporary hack solution to enable multithreaded building when THREADCOUNT is defined
  3339. +if [ -n "${THREADCOUNT}" ]; then
  3340. + scripts/image_mt $@
  3341. + exit
  3342. +fi
  3343. +
  3344. . config/show_config
  3345.  
  3346. show_config
  3347. --
  3348. 2.14.1
  3349.  
  3350.  
  3351. From 9e3194cf452f77903e19418839eea795f208ab11 Mon Sep 17 00:00:00 2001
  3352. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  3353. Date: Tue, 22 Jan 2019 11:04:29 +0000
  3354. Subject: [PATCH 26/26] scripts/create_addon: enable multithreaded builds when
  3355. THREADCOUNT is defined
  3356.  
  3357. ---
  3358. scripts/create_addon | 20 +++++++++++++++++---
  3359. 1 file changed, 17 insertions(+), 3 deletions(-)
  3360.  
  3361. diff --git a/scripts/create_addon b/scripts/create_addon
  3362. index 6458869..8245971 100755
  3363. --- a/scripts/create_addon
  3364. +++ b/scripts/create_addon
  3365. @@ -6,6 +6,11 @@
  3366.  
  3367. . config/options ""
  3368.  
  3369. +# Temporary hack solution to enable multithreaded building when THREADCOUNT is defined
  3370. +if [ -n "${THREADCOUNT}" ]; then
  3371. + . config/multithread
  3372. +fi
  3373. +
  3374. # usage
  3375. usage() {
  3376. cat - >&2 <<EOUSAGE
  3377. @@ -202,7 +207,11 @@ build_addon() {
  3378. fi
  3379.  
  3380. # build addon
  3381. - $SCRIPTS/build $1
  3382. + if [ -n "${THREADCOUNT}" ]; then
  3383. + start_multithread_build $1 || die "Parallel build failure - see log for details. Time of failure: $(date)"
  3384. + else
  3385. + $SCRIPTS/build $1
  3386. + fi
  3387.  
  3388. # cleanup old install path
  3389. rm -rf $ADDON_BUILD
  3390. @@ -269,9 +278,14 @@ if [ -n "$log_path" ]; then
  3391. rm -f $summary_file
  3392. fi
  3393.  
  3394. -# check environment and create toolchain
  3395. +# check environment
  3396. $SCRIPTS/checkdeps
  3397. -setup_toolchain target
  3398. +
  3399. +# Setup both toolchain cmake configs to avoid potentially racy behaviour later,
  3400. +# using a fork as we don't want the exports at this stage.
  3401. +for t in host target; do
  3402. + ( setup_toolchain ${t} )
  3403. +done
  3404.  
  3405. # build addons, by calling function build_addon with one addon, after another
  3406. # (do not abort on build failure)
  3407. --
  3408. 2.14.1
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!