API tools faq
paste
Guest User

Untitled

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