API tools faq
paste
Guest User

Untitled

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