API tools faq
paste
Guest User

Untitled

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