API tools faq
paste
Guest User

Untitled

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