API tools faq
paste
Guest User

Untitled

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