API tools faq
paste
Guest User

Untitled

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