API tools faq
paste
Guest User

Untitled

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