API tools faq
paste
Guest User

Untitled

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