API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jan 12th, 2019
131
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 100.61 KB | None | 0 0
raw download clone embed print report
  1. From c0c0d9911222702da399b6fb2f260cb2337d379f Mon Sep 17 00:00:00 2001
  2. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  3. Date: Sat, 5 Jan 2019 02:35:53 +0000
  4. Subject: [PATCH 01/16] config/path: add THREAD_CONTROL directory
  5.  
  6. ---
  7. config/path | 2 ++
  8. 1 file changed, 2 insertions(+)
  9.  
  10. diff --git a/config/path b/config/path
  11. index 1f1080b..c5c116f 100644
  12. --- a/config/path
  13. +++ b/config/path
  14. @@ -29,6 +29,8 @@ if [ -n "$BUILD_SUFFIX" ]; then
  15. BUILD=$BUILD-$BUILD_SUFFIX
  16. fi
  17.  
  18. +THREAD_CONTROL=${BUILD}/.threads
  19. +
  20. TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH"
  21. ADDON_BUILD="$BUILD/$ADDONS/$1"
  22. STAMPS_NOARCH=.stamps
  23. --
  24. 2.14.1
  25.  
  26.  
  27. From d9107ea985c01299d9dd07f5b9a4e7b5c713b885 Mon Sep 17 00:00:00 2001
  28. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  29. Date: Sun, 6 Jan 2019 04:55:48 +0000
  30. Subject: [PATCH 02/16] config/path: stop logging patch progress to stderr when
  31. stdout is fine
  32.  
  33. ---
  34. config/path | 2 +-
  35. 1 file changed, 1 insertion(+), 1 deletion(-)
  36.  
  37. diff --git a/config/path b/config/path
  38. index c5c116f..98b8e91 100644
  39. --- a/config/path
  40. +++ b/config/path
  41. @@ -91,7 +91,7 @@ if [ -z "${SILENT_OUT}" -a -z "${VERBOSE_OUT}" ]; then
  42.  
  43. if [ "$VERBOSE" = yes ]; then
  44. exec 3>&1
  45. - exec 4>&2
  46. + exec 4>&1
  47. else
  48. exec 3>&2
  49. exec 4>/dev/null
  50. --
  51. 2.14.1
  52.  
  53.  
  54. From 4cd732d602d8633d525a4b322f7341c2b1fd9cd9 Mon Sep 17 00:00:00 2001
  55. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  56. Date: Sun, 6 Jan 2019 05:43:26 +0000
  57. Subject: [PATCH 03/16] config/path: VERBOSE_OUT/SILENT_OUT - drop export, need
  58. to exec for every parallel process
  59.  
  60. ---
  61. config/path | 22 ++++++++++------------
  62. 1 file changed, 10 insertions(+), 12 deletions(-)
  63.  
  64. diff --git a/config/path b/config/path
  65. index 98b8e91..134f7ca 100644
  66. --- a/config/path
  67. +++ b/config/path
  68. @@ -84,18 +84,16 @@ fi
  69. VERSION_SUFFIX=$TARGET_ARCH
  70.  
  71. # redirect formatted output
  72. -if [ -z "${SILENT_OUT}" -a -z "${VERBOSE_OUT}" ]; then
  73. - export BUILD_INDENT_SIZE=4
  74. - export SILENT_OUT=3
  75. - export VERBOSE_OUT=4
  76. -
  77. - if [ "$VERBOSE" = yes ]; then
  78. - exec 3>&1
  79. - exec 4>&1
  80. - else
  81. - exec 3>&2
  82. - exec 4>/dev/null
  83. - fi
  84. +export BUILD_INDENT_SIZE=4
  85. +SILENT_OUT=3
  86. +VERBOSE_OUT=4
  87. +
  88. +if [ "$VERBOSE" = yes ]; then
  89. + exec 3>&1
  90. + exec 4>&1
  91. +else
  92. + exec 3>&2
  93. + exec 4>/dev/null
  94. fi
  95.  
  96. unset LD_LIBRARY_PATH
  97. --
  98. 2.14.1
  99.  
  100.  
  101. From 88edeee1979c664d10373da254ac31c857169ee7 Mon Sep 17 00:00:00 2001
  102. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  103. Date: Sat, 5 Jan 2019 02:31:32 +0000
  104. Subject: [PATCH 04/16] config/functions: allow package to be sourced using
  105. path
  106.  
  107. ---
  108. config/functions | 2 +-
  109. 1 file changed, 1 insertion(+), 1 deletion(-)
  110.  
  111. diff --git a/config/functions b/config/functions
  112. index fd3e678..f8d64c1 100644
  113. --- a/config/functions
  114. +++ b/config/functions
  115. @@ -845,7 +845,7 @@ source_package() {
  116. unset_functions
  117.  
  118. if [ -n "${1}" ]; then
  119. - PKG_DIR="$(get_pkg_directory ${1})"
  120. + [ -f "${1}" ] && PKG_DIR="$(dirname "${1}")" || PKG_DIR="$(get_pkg_directory "${1}")"
  121.  
  122. [ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ] || die "FAILURE: unable to source package - ${1}/package.mk does not exist"
  123.  
  124. --
  125. 2.14.1
  126.  
  127.  
  128. From ff457ee2010552d8b3de30bb37bfa0a732d86e1b Mon Sep 17 00:00:00 2001
  129. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  130. Date: Sat, 5 Jan 2019 02:34:45 +0000
  131. Subject: [PATCH 05/16] config/functions: add pkg_lock helpers
  132.  
  133. ---
  134. config/functions | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
  135. 1 file changed, 115 insertions(+), 1 deletion(-)
  136.  
  137. diff --git a/config/functions b/config/functions
  138. index f8d64c1..f71ea47 100644
  139. --- a/config/functions
  140. +++ b/config/functions
  141. @@ -1159,7 +1159,7 @@ add_group() {
  142. }
  143.  
  144. # Usage: enable_service <unit> [target]
  145. -enable_service () {
  146. +enable_service() {
  147. local unit="$1"
  148. local unit_dir="/usr/lib/systemd/system"
  149. local target="$2"
  150. @@ -1181,6 +1181,120 @@ enable_service () {
  151. done
  152. }
  153.  
  154. +# Prevent concurrent modifications to a package (unpack) or
  155. +# package:target (install/build).
  156. +#
  157. +# If a package is already locked and the owner is ourselves
  158. +# then assume we already have the required lock.
  159. +pkg_lock() {
  160. + [ -z ${MTJOBID} ] && return 0
  161. +
  162. + local pkg="$1" mode="$2" parent_pkg="$3"
  163. + local this_job="${MTJOBID}"
  164. + local lock_job lock_mode lock_pkg
  165. +
  166. + mkdir -p "${THREAD_CONTROL}/locks"
  167. + exec 99>"${THREAD_CONTROL}/locks/${pkg}.${mode}"
  168. + if ! flock --nonblock --exclusive 99; then
  169. + while [ : ]; do
  170. + read -r lock_job lock_mode lock_pkg <<<$(cat "${THREAD_CONTROL}/locks/${pkg}.${mode}.owner" 2>/dev/null)
  171. + [ -n "${lock_job}" ] && break || sleep 1
  172. + done
  173. +
  174. + if [ ${lock_job} != ${this_job} ]; then
  175. + pkg_lock_status "STALLED" "${parent_pkg}" "${mode}" "$(printf "waiting on [%02d] %s %s" ${lock_job} "${lock_mode}" "${lock_pkg}")"
  176. + flock --exclusive 99
  177. + fi
  178. + fi
  179. +
  180. + pkg_lock_status "LOCKED" "${pkg}" "${mode}"
  181. + echo "${this_job} ${mode} ${pkg}" >"${THREAD_CONTROL}/locks/${pkg}.${mode}.owner"
  182. +}
  183. +
  184. +# Log additional information for a locked package.
  185. +pkg_lock_status() {
  186. + [ -z ${MTJOBID} ] && return 0
  187. +
  188. + local status="$1" pkg="$2" mode="$3" msg="$4"
  189. + local this_job="${MTJOBID}"
  190. +
  191. + if [ -n "${msg}" ]; then
  192. + printf "%s: <%05d> [%02d/%0*d] %-7s %-7s %s (%s)\n" "$(date +%Y-%m-%d\ %H:%M:%S.%N)" $$ ${this_job} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${status}" "${mode}" "${pkg}" "${msg}" >>"${THREAD_CONTROL}/history"
  193. + else
  194. + printf "%s: <%05d> [%02d/%0*d] %-7s %-7s %s\n" "$(date +%Y-%m-%d\ %H:%M:%S.%N)" $$ ${this_job} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${status}" "${mode}" "${pkg}" >>"${THREAD_CONTROL}/history"
  195. + fi
  196. +
  197. + update_scoreboard "${status}" "${pkg}" "${mode}" "${msg}"
  198. +}
  199. +
  200. +update_scoreboard() {
  201. + local status="$1" pkg="$2" mode="$3" msg="$4"
  202. + local line sedline preamble num elapsed projdevarch
  203. + local boldred boldgreen boldyellow endcolor
  204. +
  205. + (
  206. + flock --exclusive 99
  207. +
  208. + [ -n "${MTJOBID}" ] && sedline=$((MTJOBID + 2)) || sedline=1
  209. +
  210. + num=$(cat "${THREAD_CONTROL}/status" | wc -l)
  211. + while [ ${num} -lt ${sedline} ]; do echo "" >>"${THREAD_CONTROL}/status"; num=$((num + 1)); done
  212. +
  213. + num=$(($(cat "${THREAD_CONTROL}/progress.prev") + 1))
  214. + projdevarch="${PROJECT}\/"
  215. + [ -n "${DEVICE}" ] && projdevarch+="${DEVICE}\/"
  216. + projdevarch+="${TARGET_ARCH}"
  217. + TZ=UTC0 printf -v elapsed "%(%H:%M:%S)T" $(($(date +%s) - MTBUILDSTART))
  218. + printf -v preamble "%b%s Dashboard (%s) - %d of %d jobs completed, %s elapsed" "\e[2J\e[0;0H" "${DISTRONAME}" "${projdevarch}" ${num} ${MTMAXJOBS} "${elapsed}"
  219. + printf -v preamble "%-120s %s" "${preamble}" "$(date "+%Y-%m-%d %H:%M:%S")"
  220. +
  221. + # Only update the header if not being called from a worker thread
  222. + if [ -z "${MTJOBID}" ]; then
  223. + sed -e "1s/.*/${preamble}/" -i "${THREAD_CONTROL}/status"
  224. + else
  225. + if [ "${DISABLE_COLORS}" != "yes" ]; then
  226. + boldred="\e[1;31m"
  227. + boldgreen="\e[1;32m"
  228. + boldyellow="\e[1;33m"
  229. + endcolor="\e[0m"
  230. +
  231. + case "${status}" in
  232. + STALLED) color="${boldyellow}";;
  233. + FAILED ) color="${boldred}";;
  234. + *) color="${boldgreen}";;
  235. + esac
  236. + fi
  237. +
  238. + printf -v line "[%02d\/%0*d]: %b%-7s%b %-7s %-30s" ${MTJOBID} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${color}" "${status}" "${endcolor}" "${mode}" "${pkg}"
  239. + [ -n "${msg}" ] && line+=" ${msg//\//\\/}"
  240. + sed -e "1s/.*/${preamble}/;${sedline}s/.*/${line}/" -i "${THREAD_CONTROL}/status"
  241. + fi
  242. + ) 99<"${THREAD_CONTROL}/status"
  243. +}
  244. +
  245. +# Thread concurrency helpers to avoid concurrency issues with some code,
  246. +# eg. when Python installs directly into $TOOLCHAIN.
  247. +# Test MTJOBID so that these are a noop during non-multithreaded builds.
  248. +acquire_exclusive_lock() {
  249. + if [ -n "${MTJOBID}" ]; then
  250. + exec 100>"${THREAD_CONTROL}/locks/.global"
  251. + flock --exclusive 100
  252. + fi
  253. +}
  254. +
  255. +release_exclusive_lock() {
  256. + if [ -n "${MTJOBID}" ]; then
  257. + flock --unlock 100
  258. + fi
  259. +}
  260. +
  261. +# Execute single command using mutex
  262. +exec_thread_safe() {
  263. + acquire_exclusive_lock
  264. + $@
  265. + release_exclusive_lock
  266. +}
  267. +
  268. # Use distribution functions if any
  269. if [ -f "distributions/$DISTRO/config/functions" ]; then
  270. . distributions/$DISTRO/config/functions
  271. --
  272. 2.14.1
  273.  
  274.  
  275. From de9146a8ff1ef89ee7356e2b1774d38891a6c293 Mon Sep 17 00:00:00 2001
  276. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  277. Date: Sat, 5 Jan 2019 02:37:33 +0000
  278. Subject: [PATCH 06/16] build system: add parallel build support; use new
  279. "image" package
  280.  
  281. ---
  282. config/multithread | 122 +++++++++
  283. packages/devel/parallel/package.mk | 11 +
  284. packages/virtual/image/package.mk | 44 ++++
  285. scripts/build | 35 ++-
  286. scripts/genbuildplan.py | 363 +++++++++++++++++++++++++++
  287. scripts/image | 12 +-
  288. scripts/image_mt | 498 +++++++++++++++++++++++++++++++++++++
  289. scripts/install | 18 +-
  290. scripts/unpack | 28 ++-
  291. scripts/viewplan | 17 ++
  292. 10 files changed, 1114 insertions(+), 34 deletions(-)
  293. create mode 100644 config/multithread
  294. create mode 100644 packages/devel/parallel/package.mk
  295. create mode 100644 packages/virtual/image/package.mk
  296. create mode 100755 scripts/genbuildplan.py
  297. create mode 100755 scripts/image_mt
  298. create mode 100755 scripts/viewplan
  299.  
  300. diff --git a/config/multithread b/config/multithread
  301. new file mode 100644
  302. index 0000000..33731e0
  303. --- /dev/null
  304. +++ b/config/multithread
  305. @@ -0,0 +1,122 @@
  306. +# SPDX-License-Identifier: GPL-2.0-or-later
  307. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  308. +
  309. +THREADCOUNT=${THREADCOUNT:-100%}
  310. +
  311. +# This function is passed a list of package.mk paths to be processed.
  312. +# Each package.mk is sourced with relevant variables output in JSON format.
  313. +json_worker() {
  314. + local packages="$@"
  315. + local pkgpath hierarchy
  316. +
  317. + exit() { :; }
  318. +
  319. + . config/options ""
  320. +
  321. + for pkgpath in ${packages}; do
  322. + pkgpath="${pkgpath%%@*}"
  323. + source_package "${pkgpath}/package.mk" &>/dev/null
  324. + [[ ${pkgpath} =~ ^${ROOT}/${PACKAGES}/ ]] && hierarchy="global" || hierarchy="local"
  325. +
  326. + if [ -n "$PKG_ARCH" ]; then
  327. + listcontains "$PKG_ARCH" "!$TARGET_ARCH" && continue
  328. + listcontains "$PKG_ARCH" "$TARGET_ARCH" || listcontains "$PKG_ARCH" "any" || continue
  329. + fi
  330. +
  331. + cat <<EOF
  332. + {
  333. + "name": "${PKG_NAME}",
  334. + "hierarchy": "${hierarchy}",
  335. + "section": "${PKG_SECTION}",
  336. + "bootstrap": "${PKG_DEPENDS_BOOTSTRAP}",
  337. + "init": "${PKG_DEPENDS_INIT}",
  338. + "host": "${PKG_DEPENDS_HOST}",
  339. + "target": "${PKG_DEPENDS_TARGET}"
  340. + },
  341. +EOF
  342. + done
  343. +}
  344. +export -f json_worker
  345. +
  346. +# This function is passed the build instruction for a single job.
  347. +# The function will run either "build <package>" or "install <package>".
  348. +# ${slot} is the job slot number, ie. 1-8 when THREADCOUNT=8.
  349. +# ${job} is the sequence within the total number of ${jobs}.
  350. +package_worker() {
  351. + local slot=$1 job=$2 jobs=$3 args="$4"
  352. + local task pkgname result status
  353. +
  354. + . config/options ""
  355. +
  356. + export MTJOBID=${slot} MTMAXJOBS=${jobs}
  357. +
  358. + read -r task pkgname <<<$(echo "${args}")
  359. +
  360. + ${SCRIPTS}/${task} ${pkgname} 2>&1 && result=0 || result=1
  361. +
  362. + [ ${result} -eq 0 ] && status="DONE" || status="FAIL"
  363. +
  364. + (
  365. + flock --exclusive 99
  366. + num=$(($(cat "${THREAD_CONTROL}/progress") + 1))
  367. + cp "${THREAD_CONTROL}/progress" "${THREAD_CONTROL}/progress.prev"
  368. + echo "${num}" >"${THREAD_CONTROL}/progress"
  369. + printf "[%0*d/%0*d] [%-4s] %-7s %s\n" ${#jobs} ${num} ${#jobs} ${jobs} "${status}" "${task}" "${pkgname}" >&2
  370. + ) 99<"${THREAD_CONTROL}/progress"
  371. +
  372. + if [ ${result} -eq 0 ]; then
  373. + pkg_lock_status "IDLE"
  374. + else
  375. + pkg_lock_status "FAILED" "${pkgname}" "${task}"
  376. +
  377. + if [ -d "${THREAD_CONTROL}/logs" ]; then
  378. + cat >&2 <<EOF
  379. +$(print_color CLR_ERROR "FAILURE: $SCRIPTS/${task} ${pkgname} has failed!\n")
  380. +The following logs for this failure are available:
  381. + stdout: ${THREAD_CONTROL}/logs/${job}/stdout
  382. + stderr: ${THREAD_CONTROL}/logs/${job}/stderr
  383. +EOF
  384. + fi
  385. + fi
  386. +
  387. + return ${result}
  388. +}
  389. +export -f package_worker
  390. +
  391. +start_multithread_build() {
  392. + local logbuffer maxjobs now
  393. +
  394. + now=$(date +%s)
  395. +
  396. + # init thread control folder
  397. + rm -fr "${THREAD_CONTROL}"
  398. + mkdir -p "${THREAD_CONTROL}"
  399. + echo -1 >"${THREAD_CONTROL}/progress.prev"
  400. + echo 0 >"${THREAD_CONTROL}/progress"
  401. + touch "${THREAD_CONTROL}/status"
  402. +
  403. + [ "${THREADCOUNT}" = "0" ] && THREADCOUNT=1
  404. + if [ "${THREADCOUNT}" = "1" -a "${ONELOG,,}" != "no" ] || [ "${ONELOG,,}" = "yes" ]; then
  405. + logbuffer="--ungroup"
  406. + else
  407. + mkdir -p "${THREAD_CONTROL}/logs"
  408. + logbuffer="--group --results ${THREAD_CONTROL}/logs/{#}/"
  409. + fi
  410. +
  411. + # Bootstrap the parallel package
  412. + $SCRIPTS/build parallel:host 2>&1 || die "Unable to bootstrap parallel package"
  413. +
  414. + cat ${_CACHE_PACKAGE_GLOBAL} ${_CACHE_PACKAGE_LOCAL} | \
  415. + ${TOOLCHAIN}/bin/parallel --plain --no-notice --max-args 30 json_worker | \
  416. + ${SCRIPTS}/genbuildplan.py --show-wants --build ${@} > "${THREAD_CONTROL}"/plan
  417. +
  418. + maxjobs=$(cat "${THREAD_CONTROL}"/plan | wc -l)
  419. +
  420. + cat "${THREAD_CONTROL}"/plan | awk '{print $1 " " $2}' | \
  421. + MTBUILDSTART=${now} ${TOOLCHAIN}/bin/parallel \
  422. + --plain --no-notice --max-procs ${THREADCOUNT} --joblog="${THREAD_CONTROL}/joblog" ${logbuffer} --halt now,fail=1 --plus \
  423. + package_worker {%} {#} {##} {}
  424. + result=$?
  425. +
  426. + return ${result}
  427. +}
  428. diff --git a/packages/devel/parallel/package.mk b/packages/devel/parallel/package.mk
  429. new file mode 100644
  430. index 0000000..99e28ea
  431. --- /dev/null
  432. +++ b/packages/devel/parallel/package.mk
  433. @@ -0,0 +1,11 @@
  434. +# SPDX-License-Identifier: GPL-2.0-or-later
  435. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  436. +
  437. +PKG_NAME="parallel"
  438. +PKG_VERSION="20181222"
  439. +PKG_SHA256="058c9f7cf599652aef5b54cf5c95c9a5b6d57d59ce4deebebf7938f7be4da369"
  440. +PKG_LICENSE="GPLv3"
  441. +PKG_SITE="https://www.gnu.org/software/parallel/"
  442. +PKG_URL="http://ftpmirror.gnu.org/parallel/$PKG_NAME-$PKG_VERSION.tar.bz2"
  443. +PKG_DEPENDS_HOST=""
  444. +PKG_LONGDESC="GNU parallel is a shell tool for executing jobs in parallel using one or more computers."
  445. diff --git a/packages/virtual/image/package.mk b/packages/virtual/image/package.mk
  446. new file mode 100644
  447. index 0000000..0ccc00b
  448. --- /dev/null
  449. +++ b/packages/virtual/image/package.mk
  450. @@ -0,0 +1,44 @@
  451. +# SPDX-License-Identifier: GPL-2.0-or-later
  452. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  453. +
  454. +PKG_NAME="image"
  455. +PKG_LICENSE="GPL"
  456. +PKG_SITE="https://libreelec.tv"
  457. +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"
  458. +PKG_SECTION="virtual"
  459. +PKG_LONGDESC="Root package used to build cnd create complete image"
  460. +
  461. +# Graphic support
  462. +[ ! "$DISPLAYSERVER" = "no" ] && PKG_DEPENDS_TARGET+=" $DISPLAYSERVER"
  463. +
  464. +# Multimedia support
  465. +[ ! "$MEDIACENTER" = "no" ] && PKG_DEPENDS_TARGET+=" mediacenter"
  466. +
  467. +# Sound support
  468. +[ "$ALSA_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" alsa"
  469. +
  470. +# Automounter support
  471. +[ "$UDEVIL" = "yes" ] && PKG_DEPENDS_TARGET+=" udevil"
  472. +
  473. +# EXFAT support
  474. +[ "$EXFAT" = "yes" ] && PKG_DEPENDS_TARGET+=" fuse-exfat"
  475. +
  476. +# NTFS 3G support
  477. +[ "$NTFS3G" = "yes" ] && PKG_DEPENDS_TARGET+=" ntfs-3g_ntfsprogs"
  478. +
  479. +# Remote support
  480. +[ "$REMOTE_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" remote"
  481. +
  482. +# Virtual image creation support
  483. +[ "$PROJECT" = "Generic" ] && PKG_DEPENDS_TARGET+=" virtual"
  484. +
  485. +# Installer support
  486. +[ "$INSTALLER_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" installer"
  487. +
  488. +# Devtools... (not for Release)
  489. +[ "$TESTING" = "yes" ] && PKG_DEPENDS_TARGET+=" testing"
  490. +
  491. +# OEM packages
  492. +[ "$OEM_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" oem"
  493. +
  494. +true
  495. diff --git a/scripts/build b/scripts/build
  496. index 9032474..7c74262 100755
  497. --- a/scripts/build
  498. +++ b/scripts/build
  499. @@ -7,7 +7,7 @@
  500. . config/options "$1"
  501.  
  502. if [ -z "$1" ]; then
  503. - die "usage: $0 package_name[:<host|target|init|bootstrap>]"
  504. + die "usage: $0 package_name[:<host|target|init|bootstrap>] [parent_pkg]"
  505. fi
  506.  
  507. if [ "$1" = "--all" ]; then
  508. @@ -32,10 +32,14 @@ if [ "${1//:/}" != "${1}" ]; then
  509. PACKAGE_NAME="${1%:*}"
  510. TARGET="${1#*:}"
  511. else
  512. - PACKAGE_NAME=$1
  513. + PACKAGE_NAME="${1}"
  514. TARGET=
  515. fi
  516. TARGET="${TARGET:-target}"
  517. +PARENT_PKG="${2:-${PKG_NAME}:${TARGET}}"
  518. +
  519. +# virtual packages are not built, so no need to lock
  520. +[ "$PKG_SECTION" != "virtual" ] && pkg_lock "${PACKAGE_NAME}:${TARGET}" "build" "${PARENT_PKG}"
  521.  
  522. mkdir -p $STAMPS/$PACKAGE_NAME
  523. STAMP=$STAMPS/$PACKAGE_NAME/build_$TARGET
  524. @@ -46,10 +50,11 @@ if [ -f $STAMP ]; then
  525. rm -f $STAMP
  526. elif [ ! "$BUILD_WITH_DEBUG" = "$STAMP_BUILD_WITH_DEBUG" ]; then
  527. rm -f $STAMP
  528. - elif [ "$1" = "u-boot" -a ! "$UBOOT_SYSTEM" = "$STAMP_UBOOT_SYSTEM" ]; then
  529. + elif [ "${PKG_NAME}" = "u-boot" -a ! "$UBOOT_SYSTEM" = "$STAMP_UBOOT_SYSTEM" ]; then
  530. rm -f $STAMP
  531. else
  532. # stamp matched: already built, do nothing
  533. + [ "$PKG_SECTION" != "virtual" ] && pkg_lock_status "UNLOCK" "${PKG_NAME}:${TARGET}" "build" "already built"
  534. exit 0
  535. fi
  536. fi
  537. @@ -65,16 +70,9 @@ case "$TARGET" in
  538. "bootstrap") _pkg_depends="$PKG_DEPENDS_BOOTSTRAP";;
  539. esac
  540. for p in $_pkg_depends; do
  541. - $SCRIPTS/build $p
  542. + $SCRIPTS/build "${p}" "${PARENT_PKG}"
  543. done
  544.  
  545. -# build this package
  546. -if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then
  547. - build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})") [DEBUG]" "indent"
  548. -else
  549. - build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})")" "indent"
  550. -fi
  551. -
  552. # virtual packages are not built as they only contain dependencies, so dont go further here
  553. if [ "$PKG_SECTION" = "virtual" ]; then
  554. PKG_DEEPHASH=$(calculate_stamp)
  555. @@ -85,6 +83,15 @@ if [ "$PKG_SECTION" = "virtual" ]; then
  556. exit 0
  557. fi
  558.  
  559. +# build this package
  560. +if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then
  561. + build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})") [DEBUG]" "indent"
  562. +else
  563. + build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})")" "indent"
  564. +fi
  565. +
  566. +pkg_lock_status "ACTIVE" "${PKG_NAME}:${TARGET}" "build"
  567. +
  568. setup_toolchain $TARGET
  569.  
  570. # configure install directory
  571. @@ -224,7 +231,7 @@ if [ -f "$PKG_CONFIGURE_SCRIPT" -o -f "$PKG_CMAKE_SCRIPT" -o -f "$PKG_MESON_SCRI
  572. mkdir -p "$PKG_REAL_BUILD"
  573. cd "$PKG_REAL_BUILD"
  574.  
  575. - MESON_CONF="$PKG_REAL_BUILD/meson.conf"
  576. + MESON_CONF="$PKG_REAL_BUILD/${TARGET}.meson.conf"
  577. fi
  578.  
  579. # configure
  580. @@ -449,6 +456,8 @@ PKG_DEEPHASH=$(calculate_stamp)
  581. for i in PKG_NAME PKG_DEEPHASH BUILD_WITH_DEBUG; do
  582. echo "STAMP_$i=\"${!i}\"" >> $STAMP
  583. done
  584. -if [ "$1" = "u-boot" ]; then
  585. +if [ "${PKG_NAME}" = "u-boot" ]; then
  586. echo "STAMP_UBOOT_SYSTEM=\"${UBOOT_SYSTEM}\"" >> $STAMP
  587. fi
  588. +
  589. +pkg_lock_status "UNLOCK" "${PACKAGE_NAME}:${TARGET}" "build" "built"
  590. diff --git a/scripts/genbuildplan.py b/scripts/genbuildplan.py
  591. new file mode 100755
  592. index 0000000..7be8035
  593. --- /dev/null
  594. +++ b/scripts/genbuildplan.py
  595. @@ -0,0 +1,363 @@
  596. +#!/usr/bin/env python
  597. +# -*- coding: utf-8 -*-
  598. +
  599. +# SPDX-License-Identifier: GPL-2.0-or-later
  600. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  601. +
  602. +from __future__ import print_function
  603. +import sys, os, codecs, json, argparse, re
  604. +
  605. +ROOT_PKG = "__root__"
  606. +
  607. +class LibreELEC_Package:
  608. + def __init__(self, name, section):
  609. + self.name = name
  610. + self.section = section
  611. + self.deps = {"bootstrap": [],
  612. + "init": [],
  613. + "host": [],
  614. + "target": []}
  615. + self.wants = []
  616. + self.wantedby = []
  617. +
  618. + def __repr__(self):
  619. + s = "%-9s: %s" % ("name", self.name)
  620. + s = "%s\n%-9s: %s" % (s, "section", self.section)
  621. +
  622. + for t in self.deps:
  623. + s = "%s\n%-9s: %s" % (s, t, self.deps[t])
  624. +
  625. + s = "%s\n%-9s: %s" % (s, "NEEDS", self.wants)
  626. + s = "%s\n%-9s: %s" % (s, "WANTED BY", self.wantedby)
  627. +
  628. + return s
  629. +
  630. + def addDependencies(self, target, packages):
  631. + for d in " ".join(packages.split()).split():
  632. + self.deps[target].append(d)
  633. + name = d.split(":")[0]
  634. + if name not in self.wants and name != self.name:
  635. + self.wants.append(name)
  636. +
  637. + def delDependency(self, target, package):
  638. + if package in self.deps[target]:
  639. + self.deps[target].remove(package)
  640. + name = package.split(":")[0]
  641. + if name in self.wants:
  642. + self.wants.remove(name)
  643. +
  644. + def addReference(self, package):
  645. + name = package.split(":")[0]
  646. + if name not in self.wantedby:
  647. + self.wantedby.append(name)
  648. +
  649. + def delReference(self, package):
  650. + name = package.split(":")[0]
  651. + if name in self.wantedby:
  652. + self.wantedby.remove(name)
  653. +
  654. + def isReferenced(self):
  655. + return False if self.wants == [] else True
  656. +
  657. + def isWanted(self):
  658. + return False if self.wantedby == [] else True
  659. +
  660. + def references(self, package):
  661. + return package in self.wants
  662. +
  663. +# Reference material:
  664. +# https://www.electricmonk.nl/docs/dependency_resolving_algorithm/dependency_resolving_algorithm.html
  665. +class Node:
  666. + def __init__(self, name, target, section):
  667. + self.name = name
  668. + self.target = target
  669. + self.section = section
  670. + self.fqname = "%s:%s" % (name, target)
  671. + self.edges = []
  672. +
  673. + def appendEdges(self, node):
  674. + # Add the node itself...
  675. + if node not in self.edges:
  676. + self.edges.append(node)
  677. + # as well as it's edges
  678. + for e in node.edges:
  679. + if e not in self.edges:
  680. + self.edges.append(e)
  681. +
  682. + # Return True if the dependencies of the specified node are met by this node
  683. + def satisfies(self, node):
  684. + for e in node.edges:
  685. + if e not in self.edges:
  686. + return False
  687. + return True
  688. +
  689. + def __repr__(self):
  690. + s = "%-9s: %s" % ("name", self.name)
  691. + s = "%s\n%-9s: %s" % (s, "target", self.target)
  692. + s = "%s\n%-9s: %s" % (s, "fqname", self.fqname)
  693. + s = "%s\n%-9s: %s" % (s, "common", self.commonName())
  694. + s = "%s\n%-9s: %s" % (s, "section", self.section)
  695. +
  696. + for e in self.edges:
  697. + s = "%s\nEDGE: %s" % (s, e.fqname)
  698. +
  699. + return s
  700. +
  701. + def commonName(self):
  702. + return self.name if self.target == "target" else "%s:%s" % (self.name, self.target)
  703. +
  704. + def addEdge(self, node):
  705. + self.edges.append(node)
  706. +
  707. +def eprint(*args, **kwargs):
  708. + print(*args, file=sys.stderr, **kwargs)
  709. +
  710. +# Read a JSON list of all possible packages from stdin
  711. +def loadPackages():
  712. + jdata = json.loads("[%s]" % sys.stdin.read().replace('\n','')[:-1])
  713. +
  714. + map = {}
  715. +
  716. + # Load "global" packages first
  717. + for pkg in jdata:
  718. + if pkg["hierarchy"] == "global":
  719. + map[pkg["name"]] = initPackage(pkg)
  720. +
  721. + # Then the "local" packages, as these will replace any matching "global" packages
  722. + for pkg in jdata:
  723. + if pkg["hierarchy"] == "local":
  724. + map[pkg["name"]] = initPackage(pkg)
  725. +
  726. + return map
  727. +
  728. +# Create a fully formed LibreELEC_Package object
  729. +def initPackage(package):
  730. + pkg = LibreELEC_Package(package["name"], package["section"])
  731. +
  732. + for target in ["bootstrap", "init", "host", "target"]:
  733. + pkg.addDependencies(target, package[target])
  734. +
  735. + return pkg
  736. +
  737. +# Split name:target into components
  738. +def split_package(name):
  739. + parts = name.split(":")
  740. + pn = parts[0]
  741. + pt = parts[1] if len(parts) != 1 else "target"
  742. + return (pn, pt)
  743. +
  744. +# Return a list of packages of the specified type
  745. +def get_packages_by_target(target, list):
  746. + newlist = []
  747. +
  748. + for p in list:
  749. + (pn, pt) = split_package(p)
  750. + if target in ["target", "init"] and pt in ["target", "init"]:
  751. + newlist.append(p)
  752. + elif target in ["bootstrap", "host"] and pt in ["bootstrap", "host"]:
  753. + newlist.append(p)
  754. +
  755. + return newlist
  756. +
  757. +# For the specified node iterate over the list and return the first position where
  758. +# we could possibly build this node with all dependencies satisfied.
  759. +def findearliestpos(node, list):
  760. + # Keep a running total of all dependencies as we progress
  761. + # through the list (ie. build).
  762. + alldeps = Node("", "", "")
  763. +
  764. + for n in list:
  765. + alldeps.appendEdges(n)
  766. + if alldeps.satisfies(node):
  767. + return list.index(n) + 1
  768. +
  769. + return -1
  770. +
  771. +# Resolve dependencies for a node
  772. +def dep_resolve(node, resolved, unresolved, noreorder):
  773. + unresolved.append(node)
  774. + for edge in node.edges:
  775. + if edge not in resolved:
  776. + if edge in unresolved:
  777. + raise Exception('Circular reference detected: %s -> %s\nRemove %s from %s package.mk::PKG_DEPENDS_%s' % \
  778. + (node.fqname, edge.commonName(), edge.commonName(), node.name, node.target.upper()))
  779. + dep_resolve(edge, resolved, unresolved, noreorder)
  780. + if node not in resolved:
  781. + pos = -1 if noreorder else findearliestpos(node, resolved)
  782. + if pos != -1:
  783. + resolved.insert(pos, node)
  784. + else:
  785. + resolved.append(node)
  786. + unresolved.remove(node)
  787. +
  788. +# Return a list of build steps for the trigger packages
  789. +def get_build_steps(args, nodes, trigger_pkgs, built_pkgs):
  790. + resolved = []
  791. + unresolved = []
  792. +
  793. + for pkg in [x for x in trigger_pkgs if x]:
  794. + if pkg.find(":") == -1:
  795. + pkg = "%s:target" % pkg
  796. +
  797. + if pkg not in nodes:
  798. + raise Exception("Not a valid build trigger package: %s" % pkg)
  799. +
  800. + dep_resolve(nodes[pkg], resolved, unresolved, args.no_reorder)
  801. +
  802. + # Abort if any references remain unresolved
  803. + if unresolved != []:
  804. + eprint("The following dependencies have not been resolved:")
  805. + for dep in unresolved:
  806. + eprint(" %s" % dep)
  807. + raise("Unresolved references")
  808. +
  809. + # Output list of resolved dependencies
  810. + for pkg in resolved:
  811. + if pkg.fqname not in built_pkgs:
  812. + built_pkgs.append(pkg.fqname)
  813. + task = "build" if pkg.fqname.endswith(":host") else "install"
  814. + yield(task, pkg.fqname)
  815. +
  816. +# Reduce the complete list of packages to a map of those packages that will
  817. +# be needed for the build.
  818. +def processPackages(args, packages, build):
  819. + # Add dummy package to ensure build/install dependencies are not culled
  820. + pkg = {
  821. + "name": ROOT_PKG,
  822. + "section": "virtual",
  823. + "hierarchy": "global",
  824. + "bootstrap": "",
  825. + "init": "",
  826. + "host": " ".join(get_packages_by_target("host", build)),
  827. + "target": " ".join(get_packages_by_target("target", build))
  828. + }
  829. +
  830. + packages[pkg["name"]] = initPackage(pkg)
  831. +
  832. + # Resolve reverse references that we can use to ignore unreferenced packages
  833. + for pkgname in packages:
  834. + for opkgname in packages:
  835. + opkg = packages[opkgname]
  836. + if opkg.references(pkgname):
  837. + if pkgname in packages:
  838. + packages[pkgname].addReference(opkgname)
  839. +
  840. + # Identify unused packages
  841. + while True:
  842. + changed = False
  843. + for pkgname in packages:
  844. + pkg = packages[pkgname]
  845. + if pkg.isWanted():
  846. + for opkgname in pkg.wantedby:
  847. + if opkgname != ROOT_PKG:
  848. + if not packages[opkgname].isWanted():
  849. + pkg.delReference(opkgname)
  850. + changed = True
  851. + if not changed:
  852. + break
  853. +
  854. + # Create a new map of "needed" packages
  855. + needed_map = {}
  856. + for pkgname in packages:
  857. + pkg = packages[pkgname]
  858. + if pkg.isWanted() or pkgname == ROOT_PKG:
  859. + needed_map[pkgname] = pkg
  860. +
  861. + # Validate package dependency references
  862. + for pkgname in needed_map:
  863. + pkg = needed_map[pkgname]
  864. + for t in pkg.deps:
  865. + for d in pkg.deps[t]:
  866. + if split_package(d)[0] not in needed_map:
  867. + msg = 'Invalid package reference: dependency %s in package %s::PKG_DEPENDS_%s is not valid' % (d, pkgname, t.upper())
  868. + if args.warn_invalid:
  869. + eprint("WARNING: %s" % msg)
  870. + else:
  871. + raise Exception(msg)
  872. +
  873. + node_map = {}
  874. +
  875. + # Convert all packages to target-specific nodes
  876. + for pkgname in needed_map:
  877. + pkg = needed_map[pkgname]
  878. + for target in pkg.deps:
  879. + if pkg.deps[target]:
  880. + node = Node(pkgname, target, pkg.section)
  881. + node_map[node.fqname] = node
  882. +
  883. + # Ensure all referenced dependencies exist as a basic node
  884. + for pkgname in needed_map:
  885. + pkg = needed_map[pkgname]
  886. + for target in pkg.deps:
  887. + for dep in pkg.deps[target]:
  888. + dfq = dep if dep.find(":") != -1 else "%s:target" % dep
  889. + if dfq not in node_map:
  890. + (dfq_p, dfq_t) = split_package(dfq)
  891. + if dfq_p not in packages:
  892. + raise Exception("Invalid package! Package %s cannot be found for this PROJECT/DEVICE/ARCH" % dfq_p)
  893. + dpkg = packages[dfq_p]
  894. + node_map[dfq] = Node(dfq_p, dfq_t, dpkg.section)
  895. +
  896. + # To each target-specific node, add the correspnding
  897. + # target-specific dependency nodes ("edges")
  898. + for name in node_map:
  899. + node = node_map[name]
  900. + if node.name not in needed_map:
  901. + if args.warn_invalid:
  902. + continue
  903. + else:
  904. + raise Exception("Invalid package! Package %s cannot be found for this PROJECT/DEVICE/ARCH" % node.name)
  905. + for dep in needed_map[node.name].deps[node.target]:
  906. + dfq = dep if dep.find(":") != -1 else "%s:target" % dep
  907. + node.addEdge(node_map[dfq])
  908. +
  909. + return node_map
  910. +
  911. +#---------------------------------------------
  912. +parser = argparse.ArgumentParser(description="Generate package dependency list for the requested build/install packages. \
  913. + Package data will be read from stdin in JSON format.", \
  914. + formatter_class=lambda prog: argparse.HelpFormatter(prog,max_help_position=25,width=90))
  915. +
  916. +parser.add_argument("-b", "--build", nargs="+", metavar="PACKAGE", required=True, \
  917. + help="Space-separated list of build trigger packages, either for host or target. Required property - specify at least one package.")
  918. +
  919. +parser.add_argument("--warn-invalid", action="store_true", \
  920. + help="Warn about invalid/missing dependency packages, perhaps excluded by a PKG_ARCH incompatability. Default is to abort.")
  921. +
  922. +parser.add_argument("--no-reorder", action="store_true", \
  923. + help="Do not resequence steps based on dependencies. Default is to resequence.")
  924. +
  925. +parser.add_argument("--show-wants", action="store_true", \
  926. + help="Output \"wants\" dependencies for each step.")
  927. +
  928. +args = parser.parse_args()
  929. +
  930. +ALL_PACKAGES = loadPackages()
  931. +
  932. +loaded = len(ALL_PACKAGES)
  933. +
  934. +REQUIRED_PKGS = processPackages(args, ALL_PACKAGES, args.build)
  935. +
  936. +# Output list of packages to build/install
  937. +built_pkgs = []
  938. +steps = []
  939. +
  940. +for step in get_build_steps(args, REQUIRED_PKGS, args.build, built_pkgs):
  941. + steps.append(step)
  942. +
  943. +eprint("Packages loaded : %d" % loaded)
  944. +eprint("Build trigger(s): %d [%s]" % (len(args.build), " ".join(args.build)))
  945. +eprint("Package steps : %d" % len(steps))
  946. +eprint("")
  947. +
  948. +# Output build/install steps
  949. +if args.show_wants:
  950. + for step in steps:
  951. + wants = []
  952. + node = (REQUIRED_PKGS[step[1]])
  953. + for e in node.edges:
  954. + wants.append(e.fqname)
  955. + print("%-7s %-25s (wants: %s)" % (step[0], step[1], ", ".join(wants)))
  956. +else:
  957. + for step in steps:
  958. + print("%-7s %s" % (step[0], step[1]))
  959. diff --git a/scripts/image b/scripts/image
  960. index c164aa0..ea126e8 100755
  961. --- a/scripts/image
  962. +++ b/scripts/image
  963. @@ -97,14 +97,14 @@ mkdir -p $INSTALL
  964. for directory in etc dev proc run sys tmp usr var flash storage; do
  965. mkdir -p $INSTALL/$directory
  966. done
  967. -ln -sf /var/media $INSTALL/media
  968. -ln -sf /usr/lib $INSTALL/lib
  969. -ln -sf /usr/bin $INSTALL/bin
  970. -ln -sf /usr/sbin $INSTALL/sbin
  971. +ln -sfn /var/media $INSTALL/media
  972. +ln -sfn /usr/lib $INSTALL/lib
  973. +ln -sfn /usr/bin $INSTALL/bin
  974. +ln -sfn /usr/sbin $INSTALL/sbin
  975.  
  976. if [ "$TARGET_ARCH" = "x86_64" ]; then
  977. - ln -s /usr/lib $INSTALL/lib64
  978. - ln -s /usr/lib $INSTALL/usr/lib64
  979. + ln -sfn /usr/lib $INSTALL/lib64
  980. + ln -sfn /usr/lib $INSTALL/usr/lib64
  981. fi
  982.  
  983. echo "$TARGET_VERSION" > $INSTALL/etc/release
  984. diff --git a/scripts/image_mt b/scripts/image_mt
  985. new file mode 100755
  986. index 0000000..14bcdc0
  987. --- /dev/null
  988. +++ b/scripts/image_mt
  989. @@ -0,0 +1,498 @@
  990. +#!/bin/bash
  991. +
  992. +# SPDX-License-Identifier: GPL-2.0-or-later
  993. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  994. +
  995. +unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACKAGE_LIST
  996. +
  997. +. config/options ""
  998. +. config/multithread
  999. +. config/show_config
  1000. +
  1001. +show_config
  1002. +save_build_config
  1003. +
  1004. +# Setup both toolchain cmake configs to avoid potentially racy behaviour later,
  1005. +# using a fork as we don't want the exports at this stage.
  1006. +for t in host target; do
  1007. + ( setup_toolchain ${t} )
  1008. +done
  1009. +
  1010. +if [ -n "$CUSTOM_GIT_HASH" ]; then
  1011. + GIT_HASH="$CUSTOM_GIT_HASH"
  1012. +else
  1013. + GIT_HASH=$(git rev-parse HEAD)
  1014. +fi
  1015. +
  1016. +if [ "$LIBREELEC_VERSION" = "devel" ]; then
  1017. + GIT_ABBREV=${GIT_HASH:0:7}
  1018. + DEVEL_VERSION=$LIBREELEC_VERSION
  1019. + case "$BUILD_PERIODIC" in
  1020. + nightly) LIBREELEC_VERSION=nightly-$(date +%Y%m%d)-$GIT_ABBREV;;
  1021. + daily) LIBREELEC_VERSION=daily-$(date +%Y%j)-$GIT_ABBREV;;
  1022. + weekly) LIBREELEC_VERSION=weekly-$(date +%G%V)-$GIT_ABBREV;;
  1023. + monthly) LIBREELEC_VERSION=monthly-$(date +%Y%m)-$GIT_ABBREV;;
  1024. + *) LIBREELEC_VERSION=devel-$(date +%Y%m%d%H%M%S)-$GIT_ABBREV;;
  1025. + esac
  1026. +fi
  1027. +
  1028. +# Get origin url, fix git:// and git@github.com: urls if necessary
  1029. +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/#')"
  1030. +
  1031. +[ "${BUILDER_NAME,,}" = "official" ] && BUILDER_NAME=
  1032. +if [ "$OFFICIAL" = "yes" ]; then
  1033. + LIBREELEC_BUILD="official"
  1034. +else
  1035. + if [ -n "$BUILDER_NAME" ]; then
  1036. + LIBREELEC_BUILD="$BUILDER_NAME"
  1037. + else
  1038. + LIBREELEC_BUILD="community"
  1039. + fi
  1040. +fi
  1041. +
  1042. +if [ -n "$CUSTOM_VERSION" ]; then
  1043. + LIBREELEC_VERSION="$CUSTOM_VERSION"
  1044. +fi
  1045. +
  1046. +LIBREELEC_ARCH="${DEVICE:-$PROJECT}.$TARGET_ARCH"
  1047. +TARGET_VERSION="$LIBREELEC_ARCH-$LIBREELEC_VERSION"
  1048. +
  1049. +if [ -n "$CUSTOM_IMAGE_NAME" ]; then
  1050. + IMAGE_NAME="$CUSTOM_IMAGE_NAME"
  1051. +else
  1052. + if [ "$DEVEL_VERSION" = "devel" ]; then
  1053. + IMAGE_NAME="$DISTRONAME-$LIBREELEC_ARCH-$OS_VERSION-$LIBREELEC_VERSION"
  1054. + else
  1055. + IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
  1056. + fi
  1057. +
  1058. + if [ -n "$UBOOT_SYSTEM" ] && [ "$UBOOT_SYSTEM" != "${DEVICE:-$PROJECT}" ]; then
  1059. + IMAGE_NAME="$IMAGE_NAME-$UBOOT_SYSTEM"
  1060. + fi
  1061. +fi
  1062. +
  1063. +if [ -n "$IMAGE_SUFFIX" ]; then
  1064. + IMAGE_NAME="$IMAGE_NAME-$IMAGE_SUFFIX"
  1065. +fi
  1066. +
  1067. +echo "$IMAGE_NAME" > $BUILD/BUILD_FILENAME
  1068. +
  1069. +# Setup fakeroot
  1070. +rm -rf $FAKEROOT_SCRIPT # remove $FAKEROOT_SCRIPT if it exist
  1071. +touch $FAKEROOT_SCRIPT # create an empty $FAKEROOT_SCRIPT
  1072. +chmod +x $FAKEROOT_SCRIPT # make $FAKEROOT_SCRIPT executable
  1073. +echo "chown -R 0:0 $INSTALL" >> $FAKEROOT_SCRIPT
  1074. +
  1075. +# Clean old install dirs
  1076. +rm -rf $INSTALL
  1077. +rm -rf $STAMPS_INSTALL
  1078. +mkdir -p $INSTALL
  1079. +
  1080. +# Create base layout of LibreELEC read-only file system
  1081. +for directory in etc dev proc run sys tmp usr var flash storage; do
  1082. + mkdir -p $INSTALL/$directory
  1083. +done
  1084. +
  1085. +# Build image contents
  1086. +start_multithread_build image || die "Parallel build failure - see log for details. Time of failure: $(date)"
  1087. +
  1088. +echo "Successful build, creating image..." >&2
  1089. +
  1090. +# Create legacy sym links
  1091. +ln -sfn /var/media $INSTALL/media
  1092. +ln -sfn /usr/lib $INSTALL/lib
  1093. +ln -sfn /usr/bin $INSTALL/bin
  1094. +ln -sfn /usr/sbin $INSTALL/sbin
  1095. +
  1096. +if [ "$TARGET_ARCH" = "x86_64" ]; then
  1097. + ln -sfn /usr/lib $INSTALL/lib64
  1098. + ln -sfn /usr/lib $INSTALL/usr/lib64
  1099. +fi
  1100. +
  1101. +echo "$TARGET_VERSION" > $INSTALL/etc/release
  1102. +
  1103. +# Create /etc/os-release
  1104. +echo -e "NAME=\"$DISTRONAME\"" > $INSTALL/etc/os-release
  1105. +echo -e "VERSION=\"$LIBREELEC_VERSION\"" >> $INSTALL/etc/os-release
  1106. +echo -e "ID=\"libreelec\"" >> $INSTALL/etc/os-release
  1107. +echo -e "VERSION_ID=\"$OS_VERSION\"" >> $INSTALL/etc/os-release
  1108. +echo -e "PRETTY_NAME=\"$DISTRONAME ($LIBREELEC_BUILD): $LIBREELEC_VERSION\"" >> $INSTALL/etc/os-release
  1109. +echo -e "HOME_URL=\"https://libreelec.tv\"" >> $INSTALL/etc/os-release
  1110. +echo -e "BUG_REPORT_URL=\"$ORIGIN_URL\"" >> $INSTALL/etc/os-release
  1111. +echo -e "BUILD_ID=\"$GIT_HASH\"" >> $INSTALL/etc/os-release
  1112. +echo -e "OPENELEC_ARCH=\"$LIBREELEC_ARCH\"" >> $INSTALL/etc/os-release
  1113. +echo -e "LIBREELEC_ARCH=\"$LIBREELEC_ARCH\"" >> $INSTALL/etc/os-release
  1114. +echo -e "LIBREELEC_BUILD=\"$LIBREELEC_BUILD\"" >> $INSTALL/etc/os-release
  1115. +echo -e "LIBREELEC_PROJECT=\"$PROJECT\"" >> $INSTALL/etc/os-release
  1116. +[ -n "$DEVICE" ] && echo -e "LIBREELEC_DEVICE=\"$DEVICE\"" >> $INSTALL/etc/os-release
  1117. +[ -n "$BUILDER_NAME" ] && echo -e "BUILDER_NAME=\"$BUILDER_NAME\"" >> $INSTALL/etc/os-release
  1118. +[ -n "$BUILDER_VERSION" ] && echo -e "BUILDER_VERSION=\"$BUILDER_VERSION\"" >> $INSTALL/etc/os-release
  1119. +
  1120. +# Create /etc/issue
  1121. +echo "$GREETING0" > $INSTALL/etc/issue
  1122. +echo "$GREETING1" >> $INSTALL/etc/issue
  1123. +echo "$GREETING2" >> $INSTALL/etc/issue
  1124. +echo "$GREETING3" >> $INSTALL/etc/issue
  1125. +echo "$GREETING4" >> $INSTALL/etc/issue
  1126. +echo "$DISTRONAME ($LIBREELEC_BUILD): $LIBREELEC_VERSION ($LIBREELEC_ARCH)" >> $INSTALL/etc/issue
  1127. +
  1128. +ln -sf /etc/issue $INSTALL/etc/motd
  1129. +
  1130. +# Copy PROJECT related files to filesystem
  1131. +if [ -d "$PROJECT_DIR/$PROJECT/filesystem" ]; then
  1132. + cp -PR $PROJECT_DIR/$PROJECT/filesystem/* $INSTALL
  1133. + # Install project specific systemd services
  1134. + for service in $PROJECT_DIR/$PROJECT/filesystem/usr/lib/systemd/system/*.service; do
  1135. + if [ -f "$service" ]; then
  1136. + enable_service $(basename $service)
  1137. + fi
  1138. + done
  1139. +fi
  1140. +
  1141. +# Copy DEVICE related files to filesystem
  1142. +if [ -n "$DEVICE" -a -d "$PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem" ]; then
  1143. + cp -PR $PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem/* $INSTALL
  1144. + # Install device specific systemd services
  1145. + for service in $PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem/usr/lib/systemd/system/*.service; do
  1146. + if [ -f "$service" ]; then
  1147. + enable_service $(basename $service)
  1148. + fi
  1149. + done
  1150. +fi
  1151. +
  1152. +# Run depmod for base overlay modules
  1153. +MODVER=$(basename $(ls -d $INSTALL/usr/lib/kernel-overlays/base/lib/modules/*))
  1154. +find $INSTALL/usr/lib/kernel-overlays/base/lib/modules/$MODVER/ -name *.ko | \
  1155. + sed -e "s,$INSTALL/usr/lib/kernel-overlays/base/lib/modules/$MODVER/,," \
  1156. + > $INSTALL/usr/lib/kernel-overlays/base/lib/modules/$MODVER/modules.order
  1157. +$TOOLCHAIN/bin/depmod -b $INSTALL/usr/lib/kernel-overlays/base -a -e -F "$BUILD/linux-$(kernel_version)/System.map" $MODVER 2>&1
  1158. +
  1159. +# Strip kernel modules
  1160. +for MOD in $(find $INSTALL/usr/lib/kernel-overlays/ -type f -name *.ko); do
  1161. + ${TARGET_KERNEL_PREFIX}strip --strip-debug $MOD
  1162. +done
  1163. +
  1164. +# Symlink overlayed modules to /usr/lib/modules
  1165. +ln -sT /var/lib/modules $INSTALL/usr/lib/modules
  1166. +
  1167. +# Symlink overlayed firmware to /usr/lib/firmware
  1168. +ln -sT /var/lib/firmware $INSTALL/usr/lib/firmware
  1169. +
  1170. +# Make target dir
  1171. +mkdir -p $TARGET_IMG
  1172. +rm -rf $TARGET_IMG/$IMAGE_NAME.kernel
  1173. +
  1174. +# Copy kernel to target dir
  1175. +cp -PR $BUILD/linux-$(kernel_version)/arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET $TARGET_IMG/$IMAGE_NAME.kernel
  1176. +chmod 0644 $TARGET_IMG/$IMAGE_NAME.kernel
  1177. +
  1178. +# Set mksquashfs options for each compression method
  1179. +if [ -z "$SQUASHFS_COMPRESSION_OPTION" ]; then
  1180. + if [ "${SQUASHFS_COMPRESSION:-gzip}" = "gzip" ]; then
  1181. + SQUASHFS_COMPRESSION_OPTION="-Xcompression-level 9 -b 262144"
  1182. + elif [ "$SQUASHFS_COMPRESSION" = "lzo" ]; then
  1183. + SQUASHFS_COMPRESSION_OPTION="-Xcompression-level 9 -b 524288"
  1184. + elif [ "$SQUASHFS_COMPRESSION" = "zstd" ]; then
  1185. + SQUASHFS_COMPRESSION_OPTION="-Xcompression-level 22 -b 262144"
  1186. + fi
  1187. +fi
  1188. +
  1189. +# Create squashfs file, default to gzip if no compression configured
  1190. +echo "rm -rf \"$TARGET_IMG/$IMAGE_NAME.system\"" >> $FAKEROOT_SCRIPT
  1191. +echo "$TOOLCHAIN/bin/mksquashfs \"$BUILD/image/system\" \"$TARGET_IMG/$IMAGE_NAME.system\" -noappend -comp ${SQUASHFS_COMPRESSION:-gzip} ${SQUASHFS_COMPRESSION_OPTION}" >> $FAKEROOT_SCRIPT
  1192. +
  1193. +# Run fakeroot
  1194. +$TOOLCHAIN/bin/fakeroot -- $FAKEROOT_SCRIPT
  1195. +rm -rf $FAKEROOT_SCRIPT
  1196. +
  1197. +# Set permissions
  1198. +chmod 0644 $TARGET_IMG/$IMAGE_NAME.system
  1199. +
  1200. +if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]; then
  1201. +
  1202. + RELEASE_DIR="target/$IMAGE_NAME"
  1203. +
  1204. + # Cleanup
  1205. + rm -rf $RELEASE_DIR
  1206. +
  1207. + # Create release dir
  1208. + mkdir -p $RELEASE_DIR
  1209. +
  1210. + # Remove any previously created release images
  1211. + rm -rf $TARGET_IMG/$IMAGE_NAME.img.gz
  1212. +
  1213. + if [ -n "$BOOTLOADER" ]; then
  1214. +
  1215. + BOOTLOADER_DIR="$(get_pkg_directory "$BOOTLOADER")"
  1216. +
  1217. + if [ -d $BOOTLOADER_DIR/files ]; then
  1218. + cp -R $BOOTLOADER_DIR/files/* $RELEASE_DIR
  1219. + fi
  1220. +
  1221. + if find_file_path bootloader/release $BOOTLOADER_DIR/release; then
  1222. + echo "Running $FOUND_PATH"
  1223. + . $FOUND_PATH
  1224. + fi
  1225. + fi
  1226. +
  1227. + cp $ROOT/README* $RELEASE_DIR
  1228. + cp $ROOT/CHANGELOG* $RELEASE_DIR
  1229. + echo "$TARGET_VERSION" > $RELEASE_DIR/RELEASE
  1230. +
  1231. + if [ ! "$MEDIACENTER" = "no" ]; then
  1232. + echo "Kodi commit: $(get_pkg_version $MEDIACENTER)" >> $RELEASE_DIR/RELEASE
  1233. + fi
  1234. +
  1235. + mkdir -p $RELEASE_DIR/licenses
  1236. + cp $ROOT/licenses/* $RELEASE_DIR/licenses
  1237. +
  1238. + mkdir -p $RELEASE_DIR/target
  1239. + cp $TARGET_IMG/$IMAGE_NAME.system $RELEASE_DIR/target/SYSTEM
  1240. + cp $TARGET_IMG/$IMAGE_NAME.kernel $RELEASE_DIR/target/KERNEL
  1241. +
  1242. + # Create md5sum's
  1243. + ( cd $RELEASE_DIR;
  1244. + md5sum -t target/SYSTEM > target/SYSTEM.md5;
  1245. + md5sum -t target/KERNEL > target/KERNEL.md5;
  1246. + )
  1247. +
  1248. + # Create target directory
  1249. + mkdir -p $TARGET_IMG
  1250. +
  1251. + # Remove any previously created release tarballs
  1252. + rm -rf $TARGET_IMG/$IMAGE_NAME.tar
  1253. +
  1254. + # Create release tarball
  1255. + tar cf $TARGET_IMG/$IMAGE_NAME.tar -C target $IMAGE_NAME
  1256. +
  1257. + # Create sha256 checksum of tarball
  1258. + ( cd $TARGET_IMG
  1259. + sha256sum ${IMAGE_NAME}.tar > ${IMAGE_NAME}.tar.sha256
  1260. + )
  1261. +
  1262. + # Create image files if requested
  1263. + if [[ ( "$1" = "amlpkg" || "$1" = "noobs" || "$1" = "mkimage" ) && -n "$BOOTLOADER" ]]; then
  1264. + # INSTALL_SRC_DIR can be board specific
  1265. + if [ -n "$DEVICE" -a -d "$PROJECT_DIR/$PROJECT/devices/$DEVICE/install" ]; then
  1266. + INSTALL_SRC_DIR="$PROJECT_DIR/$PROJECT/devices/$DEVICE/install"
  1267. + else
  1268. + INSTALL_SRC_DIR="$PROJECT_DIR/$PROJECT/install"
  1269. + fi
  1270. +
  1271. + # Variables used in image script must be passed
  1272. + env \
  1273. + PATH="$PATH:/sbin" \
  1274. + ROOT="$ROOT" \
  1275. + SCRIPTS="$SCRIPTS" \
  1276. + TOOLCHAIN="$TOOLCHAIN" \
  1277. + PROJECT_DIR="$PROJECT_DIR" \
  1278. + PROJECT="$PROJECT" \
  1279. + DEVICE="$DEVICE" \
  1280. + DISTRO="$DISTRO" \
  1281. + TARGET_IMG="$TARGET_IMG" \
  1282. + IMAGE_NAME="$IMAGE_NAME" \
  1283. + INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
  1284. + BOOTLOADER="$BOOTLOADER" \
  1285. + KERNEL_NAME="$KERNEL_NAME" \
  1286. + TARGET_KERNEL_ARCH="$TARGET_KERNEL_ARCH" \
  1287. + RELEASE_DIR=$RELEASE_DIR \
  1288. + UUID_STORAGE="$(uuidgen)" \
  1289. + DISTRO_BOOTLABEL="$DISTRO_BOOTLABEL" \
  1290. + DISTRO_DISKLABEL="$DISTRO_DISKLABEL" \
  1291. + UBOOT_SYSTEM="$UBOOT_SYSTEM" \
  1292. + UBOOT_VERSION="$UBOOT_VERSION" \
  1293. + EXTRA_CMDLINE="$EXTRA_CMDLINE" \
  1294. + SYSTEM_SIZE="$SYSTEM_SIZE" \
  1295. + SYSTEM_PART_START="$SYSTEM_PART_START" \
  1296. + $SCRIPTS/mkimage
  1297. + fi
  1298. +
  1299. + # Cleanup release dir
  1300. + rm -rf $RELEASE_DIR
  1301. +
  1302. + # Create WeTek Play (Amlogic) ZIP update and auto-install packages if requested
  1303. + if [ "$1" = "amlpkg" ]; then
  1304. + echo "Creating Amlogic ZIP update package"
  1305. +
  1306. + AML_PKG_DIR="$RELEASE_DIR/ampl-pkg"
  1307. +
  1308. + # Create package directory
  1309. + mkdir -p "$AML_PKG_DIR"
  1310. +
  1311. + # Copy system and kernel images
  1312. + mkdir -p "$AML_PKG_DIR/system"
  1313. + cp $TARGET_IMG/$IMAGE_NAME.system $AML_PKG_DIR/system/SYSTEM
  1314. + cp $TARGET_IMG/$IMAGE_NAME.kernel $AML_PKG_DIR/KERNEL
  1315. +
  1316. + # Copy update-binary and updater-script
  1317. + META_INF_DIR="$AML_PKG_DIR/META-INF/com/google/android"
  1318. + mkdir -p "$META_INF_DIR"
  1319. + cp $INSTALL_SRC_DIR/update-binary $META_INF_DIR
  1320. + cp $INSTALL_SRC_DIR/updater-script $META_INF_DIR
  1321. +
  1322. + # Copy other files if any
  1323. + if [ -d "$INSTALL_SRC_DIR/files" ]; then
  1324. + cp -PR $INSTALL_SRC_DIR/files/* $AML_PKG_DIR
  1325. + fi
  1326. +
  1327. + # Copy device tree image if any
  1328. + if [ -f "$INSTALL/usr/share/bootloader/dtb.img" ]; then
  1329. + cp "$INSTALL/usr/share/bootloader/dtb.img" $AML_PKG_DIR/dtb.img
  1330. + fi
  1331. +
  1332. + # Create the update package
  1333. + pushd "$AML_PKG_DIR" > /dev/null
  1334. + zip -rq update.zip *
  1335. +
  1336. + # Sign the update package
  1337. + echo "Signing the update package"
  1338. + mkdir -p sign
  1339. + SIGNAPK_DIR="$ROOT/tools/signapk"
  1340. + java -Xmx1024m -jar $SIGNAPK_DIR/signapk.jar -w $SIGNAPK_DIR/testkey.x509.pem $SIGNAPK_DIR/testkey.pk8 update.zip sign/$IMAGE_NAME-update.zip
  1341. +
  1342. + # Create the auto-install package
  1343. + echo "Creating Amlogic ZIP auto-install package"
  1344. + pushd sign > /dev/null
  1345. + echo --update_package=/sdcard/$IMAGE_NAME-update.zip > factory_update_param.aml
  1346. + echo --wipe_data >> factory_update_param.aml
  1347. + echo --wipe_cache >> factory_update_param.aml
  1348. + if [ -f "$INSTALL_SRC_DIR/files/recovery.img" ]; then
  1349. + cp $INSTALL_SRC_DIR/files/recovery.img .
  1350. + fi
  1351. +
  1352. + if [ -f $INSTALL_SRC_DIR/files/aml_autoscript ]; then
  1353. + cp $INSTALL_SRC_DIR/files/aml_autoscript .
  1354. + fi
  1355. +
  1356. + # Copy device tree image if any
  1357. + if [ -f "$INSTALL/usr/share/bootloader/dtb.img" ]; then
  1358. + cp "$INSTALL/usr/share/bootloader/dtb.img" .
  1359. + fi
  1360. +
  1361. + zip -q $TARGET_IMG/$IMAGE_NAME.zip *
  1362. +
  1363. + # Create sha256 checksum of zip
  1364. + ( cd $TARGET_IMG
  1365. + sha256sum ${IMAGE_NAME}.zip > ${IMAGE_NAME}.zip.sha256
  1366. + )
  1367. +
  1368. + popd > /dev/null
  1369. + popd > /dev/null
  1370. +
  1371. + elif [ "$1" = "noobs" ]; then
  1372. + echo "Creating \"$1\" release tarball..."
  1373. +
  1374. + RELEASE_DIR="$TARGET_IMG/${IMAGE_NAME}-$1"
  1375. +
  1376. + # eg. LibreELEC_RPi, LibreELEC_RPi2 etc.
  1377. + NOOBS_DISTRO="${DISTRONAME}_${DEVICE:-$PROJECT}"
  1378. +
  1379. + # Create release dir
  1380. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}
  1381. +
  1382. + if [ -f $DISTRO_DIR/$DISTRO/${DISTRONAME}_40x40.png ]; then
  1383. + cp -PR $DISTRO_DIR/$DISTRO/${DISTRONAME}_40x40.png $RELEASE_DIR/${NOOBS_DISTRO}/${NOOBS_DISTRO}.png
  1384. + else
  1385. + cp -PR $DISTRO_DIR/$DISTRO/${DISTRONAME}.png $RELEASE_DIR/${NOOBS_DISTRO}/${NOOBS_DISTRO}.png
  1386. + fi
  1387. + cp -PR $ROOT/config/noobs/os.json $RELEASE_DIR/${NOOBS_DISTRO}
  1388. + cp -PR $ROOT/config/noobs/partition_setup.sh $RELEASE_DIR/${NOOBS_DISTRO}
  1389. + cp -PR $ROOT/config/noobs/partitions.json $RELEASE_DIR/${NOOBS_DISTRO}
  1390. + if [ -d $DISTRO_DIR/$DISTRO/noobs/marketing ]; then
  1391. + tar cf $RELEASE_DIR/${NOOBS_DISTRO}/marketing.tar -C $DISTRO_DIR/$DISTRO/noobs/marketing .
  1392. + else
  1393. + tar cf $RELEASE_DIR/${NOOBS_DISTRO}/marketing.tar -C $ROOT/config/noobs/marketing .
  1394. + fi
  1395. + cp $ROOT/README* $RELEASE_DIR/${NOOBS_DISTRO}
  1396. + cp $ROOT/CHANGELOG $RELEASE_DIR/${NOOBS_DISTRO}/release_notes.txt
  1397. +
  1398. + sed -e "s%@DISTRONAME@%$DISTRONAME%g" \
  1399. + -e "s%@PROJECT@%${DEVICE:-$PROJECT}%g" \
  1400. + -e "s%@LIBREELEC_VERSION@%$LIBREELEC_VERSION%g" \
  1401. + -e "s%@RELEASE_DATE@%$(date +%F)%g" \
  1402. + -e "s%@KERNEL_VERSION@%$(kernel_version)%g" \
  1403. + -e "s%@DESCRIPTION@%$DESCRIPTION%g" \
  1404. + -e "s%@ROOT_PASSWORD@%$ROOT_PASSWORD%g" \
  1405. + -e "s%@NOOBS_SUPPORTED_MODELS@%$NOOBS_SUPPORTED_MODELS%g" \
  1406. + -e "s%@NOOBS_HEX@%$NOOBS_HEX%g" \
  1407. + -i $RELEASE_DIR/${NOOBS_DISTRO}/os.json
  1408. +
  1409. + sed -e "s%@DISTRONAME@%$DISTRONAME%g" \
  1410. + -e "s%@PROJECT@%${DEVICE:-$PROJECT}%g" \
  1411. + -e "s%@SYSTEM_SIZE@%$SYSTEM_SIZE%g" \
  1412. + -i $RELEASE_DIR/${NOOBS_DISTRO}/partitions.json
  1413. +
  1414. + # Create System dir
  1415. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}/System
  1416. +
  1417. + BOOTLOADER_DIR="$(get_pkg_directory "$BOOTLOADER")"
  1418. + if [ -d $BOOTLOADER_DIR/files/3rdparty/bootloader/ ]; then
  1419. + cp -PR $BOOTLOADER_DIR/files/3rdparty/bootloader/* $RELEASE_DIR/${NOOBS_DISTRO}/System
  1420. + fi
  1421. +
  1422. + # Copy Bootloader
  1423. + cp -PR $BUILD/bcm2835-bootloader-*/LICENCE* $RELEASE_DIR/${NOOBS_DISTRO}/System/
  1424. + cp -PR $BUILD/bcm2835-bootloader-*/bootcode.bin $RELEASE_DIR/${NOOBS_DISTRO}/System/
  1425. + cp -PR $BUILD/bcm2835-bootloader-*/fixup_x.dat $RELEASE_DIR/${NOOBS_DISTRO}/System/fixup.dat
  1426. + cp -PR $BUILD/bcm2835-bootloader-*/start_x.elf $RELEASE_DIR/${NOOBS_DISTRO}/System/start.elf
  1427. + [ -f $BUILD/bcm2835-bootloader-*/dt-blob.bin ] && cp -PR $BUILD/bcm2835-bootloader-*/dt-blob.bin $RELEASE_DIR/${NOOBS_DISTRO}/System/dt-blob.bin
  1428. +
  1429. + # Copy system files
  1430. + cp $TARGET_IMG/$IMAGE_NAME.system $RELEASE_DIR/${NOOBS_DISTRO}/System/SYSTEM
  1431. + cp $TARGET_IMG/$IMAGE_NAME.kernel $RELEASE_DIR/${NOOBS_DISTRO}/System/kernel.img
  1432. +
  1433. + for dtb in $INSTALL/usr/share/bootloader/*.dtb; do
  1434. + if [ -f $dtb ]; then
  1435. + cp -PR $dtb $RELEASE_DIR/${NOOBS_DISTRO}/System
  1436. + fi
  1437. + done
  1438. +
  1439. + for overlay in $INSTALL/usr/share/bootloader/overlays/*; do
  1440. + if [ -f $overlay ]; then
  1441. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}/System/overlays
  1442. + cp -PR $overlay $RELEASE_DIR/${NOOBS_DISTRO}/System/overlays
  1443. + fi
  1444. + done
  1445. +
  1446. + # Create md5sum's
  1447. + ( cd $RELEASE_DIR/${NOOBS_DISTRO}/System;
  1448. + md5sum -t SYSTEM > SYSTEM.md5;
  1449. + md5sum -t kernel.img > kernel.img.md5;
  1450. + )
  1451. +
  1452. + # Copy additional files
  1453. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}/System/licenses
  1454. + cp $ROOT/licenses/* $RELEASE_DIR/${NOOBS_DISTRO}/System/licenses
  1455. +
  1456. + # Create Storage dir
  1457. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}/Storage
  1458. +
  1459. + # Remove any previously created release tarball
  1460. + rm -rf $RELEASE_DIR/${NOOBS_DISTRO}/System.tar.xz
  1461. + rm -rf $RELEASE_DIR/${NOOBS_DISTRO}/Storage.tar.xz
  1462. +
  1463. + # Create filesystem tarballs
  1464. + tar cJf $RELEASE_DIR/${NOOBS_DISTRO}/System.tar.xz -C $RELEASE_DIR/${NOOBS_DISTRO}/System/ .
  1465. + tar cJf $RELEASE_DIR/${NOOBS_DISTRO}/Storage.tar.xz -C $RELEASE_DIR/${NOOBS_DISTRO}/Storage/ .
  1466. +
  1467. + # Remove filesystem dirs
  1468. + rm -rf $RELEASE_DIR/${NOOBS_DISTRO}/System
  1469. + rm -rf $RELEASE_DIR/${NOOBS_DISTRO}/Storage
  1470. +
  1471. + # Remove any previously created release tarball
  1472. + rm -rf $TARGET_IMG/${IMAGE_NAME}-$1.tar
  1473. +
  1474. + # Create release tarball
  1475. + tar cf $TARGET_IMG/${IMAGE_NAME}-$1.tar -C $TARGET_IMG ${IMAGE_NAME}-$1
  1476. +
  1477. + # Create sha256 checksum of tarball
  1478. + ( cd $TARGET_IMG
  1479. + sha256sum ${IMAGE_NAME}-$1.tar > ${IMAGE_NAME}-$1.tar.sha256
  1480. + )
  1481. + fi
  1482. +
  1483. + if [ -d $RELEASE_DIR ]; then
  1484. + # Cleanup release dir
  1485. + rm -rf $RELEASE_DIR
  1486. + fi
  1487. +fi
  1488. diff --git a/scripts/install b/scripts/install
  1489. index d9e0bfa..ea39c7e 100755
  1490. --- a/scripts/install
  1491. +++ b/scripts/install
  1492. @@ -8,7 +8,7 @@
  1493. . config/options "$1"
  1494.  
  1495. if [ -z "$1" ]; then
  1496. - die "usage: $0 package_name"
  1497. + die "usage: $0 package_name [parent_pkg]"
  1498. fi
  1499.  
  1500. if [ -z "${PKG_NAME}" ]; then
  1501. @@ -29,29 +29,35 @@ if [ "${1//:/}" != "${1}" ]; then
  1502. PACKAGE_NAME="${1%:*}"
  1503. TARGET="${1#*:}"
  1504. else
  1505. - PACKAGE_NAME=$1
  1506. + PACKAGE_NAME="${1}"
  1507. TARGET=
  1508. fi
  1509. [ -z "$TARGET" ] && TARGET="target"
  1510. +PARENT_PKG="${2:-${PKG_NAME}:${TARGET}}"
  1511. +
  1512. +[ "$PKG_SECTION" != "virtual" ] && pkg_lock "${PACKAGE_NAME}:${TARGET}" "install" "${PARENT_PKG}"
  1513.  
  1514. STAMP=$STAMPS_INSTALL/$PACKAGE_NAME/install_$TARGET
  1515. +[ -f $STAMP ] && pkg_lock_status "UNLOCK" "${PACKAGE_NAME}:${TARGET}" "install" "already installed"
  1516. [ -f $STAMP ] && exit 0
  1517.  
  1518. mkdir -p $STAMPS_INSTALL/$PACKAGE_NAME
  1519.  
  1520. -$SCRIPTS/build $@
  1521. +$SCRIPTS/build "${1}" "${PARENT_PKG}"
  1522.  
  1523. if [ "$TARGET" = target ] ; then
  1524. for p in $PKG_DEPENDS_TARGET; do
  1525. - $SCRIPTS/install $p
  1526. + $SCRIPTS/install "${p}" "${PARENT_PKG}"
  1527. done
  1528. elif [ "$TARGET" = init ] ; then
  1529. for p in $PKG_DEPENDS_INIT; do
  1530. - $SCRIPTS/install $p
  1531. + $SCRIPTS/install "${p}" "${PARENT_PKG}"
  1532. done
  1533. INSTALL=$BUILD/initramfs
  1534. fi
  1535.  
  1536. +pkg_lock_status "ACTIVE" "${PACKAGE_NAME}:${TARGET}" "install"
  1537. +
  1538. build_msg "CLR_INSTALL" "INSTALL" "${PACKAGE_NAME} $(print_color CLR_TARGET "(${TARGET})")" "indent"
  1539.  
  1540. mkdir -p $INSTALL
  1541. @@ -137,3 +143,5 @@ if [ "$TARGET" = target ] ; then
  1542. fi
  1543.  
  1544. touch $STAMP
  1545. +
  1546. +pkg_lock_status "UNLOCK" "${PACKAGE_NAME}:${TARGET}" "install" "installed"
  1547. diff --git a/scripts/unpack b/scripts/unpack
  1548. index 3dce2c4..81a2c06 100755
  1549. --- a/scripts/unpack
  1550. +++ b/scripts/unpack
  1551. @@ -7,14 +7,19 @@
  1552. . config/options "$1"
  1553.  
  1554. if [ -z "$1" ]; then
  1555. - die "usage: $0 package_name"
  1556. + die "usage: $0 package_name [parent_pkg]"
  1557. fi
  1558.  
  1559. if [ -z "${PKG_NAME}" ]; then
  1560. die "$(print_color CLR_ERROR "${1}: no package.mk file found")"
  1561. fi
  1562. +PARENT_PKG="${2:-${PKG_NAME}}"
  1563.  
  1564. -$SCRIPTS/get $1
  1565. +pkg_lock "${PKG_NAME}" "unpack" "${PARENT_PKG}"
  1566. +
  1567. +pkg_lock_status "ACTIVE" "${PKG_NAME}" "unpack"
  1568. +
  1569. +$SCRIPTS/get "${PKG_NAME}"
  1570.  
  1571. STAMP="$PKG_BUILD/.libreelec-unpack"
  1572.  
  1573. @@ -22,13 +27,13 @@ mkdir -p $BUILD
  1574.  
  1575. # Perform a wildcard match on the package to ensure old versions are cleaned too
  1576. PKG_DEEPHASH=
  1577. -for i in $BUILD/$1-*; do
  1578. +for i in $BUILD/${PKG_NAME}-*; do
  1579. if [ -d $i -a -f "$i/.libreelec-unpack" ] ; then
  1580. . "$i/.libreelec-unpack"
  1581. - if [ "$STAMP_PKG_NAME" = "$1" ]; then
  1582. + if [ "$STAMP_PKG_NAME" = "${PKG_NAME}" ]; then
  1583. [ -z "${PKG_DEEPHASH}" ] && PKG_DEEPHASH=$(calculate_stamp)
  1584. if [ ! "$PKG_DEEPHASH" = "$STAMP_PKG_DEEPHASH" ] ; then
  1585. - $SCRIPTS/clean $1
  1586. + $SCRIPTS/clean "${PKG_NAME}"
  1587. fi
  1588. fi
  1589. fi
  1590. @@ -36,19 +41,20 @@ done
  1591.  
  1592. if [ -d "$PKG_BUILD" -a ! -f "$STAMP" ]; then
  1593. # stale pkg build dir
  1594. - $SCRIPTS/clean $1
  1595. + $SCRIPTS/clean "${PKG_NAME}"
  1596. fi
  1597.  
  1598. +[ -f "$STAMP" ] && pkg_lock_status "UNLOCK" "${PKG_NAME}" "unpack" "already unpacked"
  1599. [ -f "$STAMP" ] && exit 0
  1600.  
  1601. -if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
  1602. - build_msg "CLR_UNPACK" "UNPACK" "${1}" "indent"
  1603. +if [ -d "$SOURCES/${PKG_NAME}" -o -d "$PKG_DIR/sources" ]; then
  1604. + build_msg "CLR_UNPACK" "UNPACK" "${PKG_NAME}" "indent"
  1605.  
  1606. pkg_call_optional pre_unpack
  1607.  
  1608. if ! pkg_call unpack; then
  1609. if [ -n "$PKG_URL" ]; then
  1610. - $SCRIPTS/extract $1 $BUILD
  1611. + $SCRIPTS/extract "${PKG_NAME}" $BUILD
  1612. fi
  1613. fi
  1614.  
  1615. @@ -159,10 +165,12 @@ fi
  1616. if [ "$PKG_SECTION" != "virtual" ]; then
  1617. mkdir -p "$PKG_BUILD"
  1618.  
  1619. - rm -f $STAMPS/$1/build_*
  1620. + rm -f $STAMPS/${PKG_NAME}/build_*
  1621.  
  1622. PKG_DEEPHASH=$(calculate_stamp)
  1623. for i in PKG_NAME PKG_DEEPHASH; do
  1624. echo "STAMP_$i=\"${!i}\"" >> $STAMP
  1625. done
  1626. fi
  1627. +
  1628. +pkg_lock_status "UNLOCK" "${PKG_NAME}" "unpack" "unpacked"
  1629. diff --git a/scripts/viewplan b/scripts/viewplan
  1630. new file mode 100755
  1631. index 0000000..999a41d
  1632. --- /dev/null
  1633. +++ b/scripts/viewplan
  1634. @@ -0,0 +1,17 @@
  1635. +#!/bin/bash
  1636. +
  1637. +# SPDX-License-Identifier: GPL-2.0-or-later
  1638. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1639. +
  1640. +unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACKAGE_LIST
  1641. +
  1642. +. config/options ""
  1643. +. config/multithread
  1644. +
  1645. +PARALLEL_BIN=${TOOLCHAIN}/bin/parallel
  1646. +
  1647. +[ -x ${PARALLEL_BIN} ] || PARALLEL_BIN=parallel
  1648. +
  1649. +cat ${_CACHE_PACKAGE_GLOBAL} ${_CACHE_PACKAGE_LOCAL} | \
  1650. + ${PARALLEL_BIN} --plain --no-notice --max-args 30 json_worker | \
  1651. + ${SCRIPTS}/genbuildplan.py --show-wants --build ${@:-image} --warn-invalid ${GENFLAGS}
  1652. --
  1653. 2.14.1
  1654.  
  1655.  
  1656. From 620ae1c68de158af8118c055856b84c77d9fed5b Mon Sep 17 00:00:00 2001
  1657. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1658. Date: Sat, 5 Jan 2019 02:48:53 +0000
  1659. Subject: [PATCH 07/16] PKG_DEPENDS_UNPACK: solution for packages using source
  1660. code of another
  1661.  
  1662. ---
  1663. packages/mediacenter/JsonSchemaBuilder/package.mk | 3 ++-
  1664. packages/mediacenter/TexturePacker/package.mk | 3 ++-
  1665. packages/security/nspr/package.mk | 2 ++
  1666. scripts/build | 8 +++++++-
  1667. 4 files changed, 13 insertions(+), 3 deletions(-)
  1668.  
  1669. diff --git a/packages/mediacenter/JsonSchemaBuilder/package.mk b/packages/mediacenter/JsonSchemaBuilder/package.mk
  1670. index b61af9f..b62b79a 100644
  1671. --- a/packages/mediacenter/JsonSchemaBuilder/package.mk
  1672. +++ b/packages/mediacenter/JsonSchemaBuilder/package.mk
  1673. @@ -1,11 +1,12 @@
  1674. # SPDX-License-Identifier: GPL-2.0-or-later
  1675. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  1676. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1677.  
  1678. PKG_NAME="JsonSchemaBuilder"
  1679. PKG_VERSION="0"
  1680. PKG_LICENSE="GPL"
  1681. PKG_SITE="http://www.kodi.tv"
  1682. -PKG_URL=""
  1683. +PKG_DEPENDS_UNPACK="kodi"
  1684. PKG_NEED_UNPACK="$(get_pkg_directory $MEDIACENTER)"
  1685. PKG_LONGDESC="kodi-platform:"
  1686.  
  1687. diff --git a/packages/mediacenter/TexturePacker/package.mk b/packages/mediacenter/TexturePacker/package.mk
  1688. index 8faa689..ed8ee07 100644
  1689. --- a/packages/mediacenter/TexturePacker/package.mk
  1690. +++ b/packages/mediacenter/TexturePacker/package.mk
  1691. @@ -1,12 +1,13 @@
  1692. # SPDX-License-Identifier: GPL-2.0-or-later
  1693. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  1694. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1695.  
  1696. PKG_NAME="TexturePacker"
  1697. PKG_VERSION="0"
  1698. PKG_LICENSE="GPL"
  1699. PKG_SITE="http://www.kodi.tv"
  1700. -PKG_URL=""
  1701. PKG_DEPENDS_HOST="lzo:host libpng:host libjpeg-turbo:host giflib:host"
  1702. +PKG_DEPENDS_UNPACK="kodi"
  1703. PKG_NEED_UNPACK="$(get_pkg_directory $MEDIACENTER)"
  1704. PKG_LONGDESC="kodi-platform:"
  1705.  
  1706. diff --git a/packages/security/nspr/package.mk b/packages/security/nspr/package.mk
  1707. index 7d16ac8..fd63908 100644
  1708. --- a/packages/security/nspr/package.mk
  1709. +++ b/packages/security/nspr/package.mk
  1710. @@ -1,5 +1,6 @@
  1711. # SPDX-License-Identifier: GPL-2.0-or-later
  1712. # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
  1713. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1714.  
  1715. PKG_NAME="nspr"
  1716. PKG_VERSION="4.19"
  1717. @@ -7,6 +8,7 @@ PKG_LICENSE="Mozilla Public License"
  1718. PKG_SITE="http://www.linuxfromscratch.org/blfs/view/svn/general/nspr.html"
  1719. PKG_DEPENDS_HOST="ccache:host"
  1720. PKG_DEPENDS_TARGET="toolchain nss:host"
  1721. +PKG_DEPENDS_UNPACK="nss"
  1722. PKG_LONGDESC="Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions"
  1723. PKG_TOOLCHAIN="configure"
  1724. PKG_BUILD_FLAGS="-parallel"
  1725. diff --git a/scripts/build b/scripts/build
  1726. index 7c74262..d42ca5a 100755
  1727. --- a/scripts/build
  1728. +++ b/scripts/build
  1729. @@ -59,7 +59,13 @@ if [ -f $STAMP ]; then
  1730. fi
  1731. fi
  1732.  
  1733. -$SCRIPTS/unpack $PACKAGE_NAME
  1734. +if [ -n "${PKG_DEPENDS_UNPACK}" ]; then
  1735. + for p in ${PKG_DEPENDS_UNPACK}; do
  1736. + $SCRIPTS/unpack "${p}" "${PARENT_PKG}"
  1737. + done
  1738. +else
  1739. + $SCRIPTS/unpack "${PACKAGE_NAME}" "${PARENT_PKG}"
  1740. +fi
  1741.  
  1742. # build dependencies, only when PKG_DEPENDS_? is filled
  1743. unset _pkg_depends
  1744. --
  1745. 2.14.1
  1746.  
  1747.  
  1748. From da94e6ef6c9a6bbd65fccde8a11c458ec08fa07b Mon Sep 17 00:00:00 2001
  1749. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1750. Date: Wed, 9 Jan 2019 03:27:04 +0000
  1751. Subject: [PATCH 08/16] PKG_DEPENDS_UNPACK: add source package to
  1752. PKG_NEED_UNPACK
  1753.  
  1754. If the source package changes then we need to rebuild too.
  1755. ---
  1756. config/functions | 6 ++++++
  1757. 1 file changed, 6 insertions(+)
  1758.  
  1759. diff --git a/config/functions b/config/functions
  1760. index f71ea47..f003211 100644
  1761. --- a/config/functions
  1762. +++ b/config/functions
  1763. @@ -861,6 +861,12 @@ source_package() {
  1764. [ "$PKG_ADDON_IS_STANDALONE" != "yes" ] && PKG_NEED_UNPACK="${PKG_NEED_UNPACK} $(get_pkg_directory $MEDIACENTER)"
  1765. fi
  1766.  
  1767. + if [ -n "${PKG_DEPENDS_UNPACK}" ]; then
  1768. + for _p in ${PKG_DEPENDS_UNPACK}; do
  1769. + PKG_NNED_UNPACK+=" $(get_pkg_directory ${_p})"
  1770. + done
  1771. + fi
  1772. +
  1773. # Automatically set PKG_SOURCE_NAME unless it is already defined.
  1774. # PKG_SOURCE_NAME will be automatically set to a name based on
  1775. # the $PKG_NAME-$PKG_VERSION convention.
  1776. --
  1777. 2.14.1
  1778.  
  1779.  
  1780. From fa0f80c9c8701482e19aba4424d4b78767ea8d90 Mon Sep 17 00:00:00 2001
  1781. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1782. Date: Sat, 5 Jan 2019 02:44:12 +0000
  1783. Subject: [PATCH 09/16] packages: pciutils, nasm: build only for x86_64
  1784.  
  1785. ---
  1786. packages/linux/package.mk | 4 ++--
  1787. packages/mediacenter/kodi/package.mk | 6 +++++-
  1788. packages/multimedia/dav1d/package.mk | 6 +++++-
  1789. packages/sysutils/busybox/package.mk | 6 +++++-
  1790. 4 files changed, 17 insertions(+), 5 deletions(-)
  1791.  
  1792. diff --git a/packages/linux/package.mk b/packages/linux/package.mk
  1793. index 3233cb5..3bd5a13 100644
  1794. --- a/packages/linux/package.mk
  1795. +++ b/packages/linux/package.mk
  1796. @@ -6,7 +6,7 @@ PKG_NAME="linux"
  1797. PKG_LICENSE="GPL"
  1798. PKG_SITE="http://www.kernel.org"
  1799. PKG_DEPENDS_HOST="ccache:host"
  1800. -PKG_DEPENDS_TARGET="toolchain cpio:host kmod:host pciutils xz:host wireless-regdb keyutils $KERNEL_EXTRA_DEPENDS_TARGET"
  1801. +PKG_DEPENDS_TARGET="toolchain cpio:host kmod:host xz:host wireless-regdb keyutils $KERNEL_EXTRA_DEPENDS_TARGET"
  1802. PKG_DEPENDS_INIT="toolchain"
  1803. PKG_NEED_UNPACK="$LINUX_DEPENDS"
  1804. PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
  1805. @@ -65,7 +65,7 @@ if [ "$PKG_BUILD_PERF" != "no" ] && grep -q ^CONFIG_PERF_EVENTS= $PKG_KERNEL_CFG
  1806. fi
  1807.  
  1808. if [ "$TARGET_ARCH" = "x86_64" ]; then
  1809. - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-ucode:host kernel-firmware elfutils:host"
  1810. + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-ucode:host kernel-firmware elfutils:host pciutils"
  1811. fi
  1812.  
  1813. if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
  1814. diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
  1815. index a02ea76..3bcec2c 100644
  1816. --- a/packages/mediacenter/kodi/package.mk
  1817. +++ b/packages/mediacenter/kodi/package.mk
  1818. @@ -5,7 +5,7 @@
  1819. PKG_NAME="kodi"
  1820. PKG_LICENSE="GPL"
  1821. PKG_SITE="http://www.kodi.tv"
  1822. -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"
  1823. +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"
  1824. PKG_LONGDESC="A free and open source cross-platform media player."
  1825.  
  1826. PKG_PATCH_DIRS="$KODI_VENDOR"
  1827. @@ -39,6 +39,10 @@ configure_package() {
  1828.  
  1829. get_graphicdrivers
  1830.  
  1831. + if [ "$TARGET_ARCH" = "x86_64" ]; then
  1832. + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pciutils"
  1833. + fi
  1834. +
  1835. PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET dbus"
  1836.  
  1837. if [ "$DISPLAYSERVER" = "x11" ]; then
  1838. diff --git a/packages/multimedia/dav1d/package.mk b/packages/multimedia/dav1d/package.mk
  1839. index 275aca4..ab20356 100644
  1840. --- a/packages/multimedia/dav1d/package.mk
  1841. +++ b/packages/multimedia/dav1d/package.mk
  1842. @@ -7,5 +7,9 @@ PKG_SHA256="3662184809fa29af39c920877cedec3724dc5c3cf71d94bec424f2a7ee4825cf"
  1843. PKG_LICENSE="BSD"
  1844. PKG_SITE="http://www.jbkempf.com/blog/post/2018/Introducing-dav1d"
  1845. PKG_URL="https://code.videolan.org/videolan/dav1d/-/archive/${PKG_VERSION}/dav1d-${PKG_VERSION}.tar.bz2"
  1846. -PKG_DEPENDS_TARGET="toolchain nasm:host"
  1847. +PKG_DEPENDS_TARGET="toolchain"
  1848. PKG_LONGDESC="dav1d is an AV1 decoder :)"
  1849. +
  1850. +if [ "$TARGET_ARCH" = "x86_64" ]; then
  1851. + PKG_DEPENDS_TARGET+=" nasm:host"
  1852. +fi
  1853. diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk
  1854. index 4d8b2fb..4aa977c 100644
  1855. --- a/packages/sysutils/busybox/package.mk
  1856. +++ b/packages/sysutils/busybox/package.mk
  1857. @@ -9,7 +9,7 @@ PKG_LICENSE="GPL"
  1858. PKG_SITE="http://www.busybox.net"
  1859. PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
  1860. PKG_DEPENDS_HOST=""
  1861. -PKG_DEPENDS_TARGET="toolchain busybox:host hdparm dosfstools e2fsprogs zip unzip pciutils usbutils parted procps-ng gptfdisk libtirpc"
  1862. +PKG_DEPENDS_TARGET="toolchain busybox:host hdparm dosfstools e2fsprogs zip unzip usbutils parted procps-ng gptfdisk libtirpc"
  1863. PKG_DEPENDS_INIT="toolchain libtirpc"
  1864. PKG_LONGDESC="BusyBox combines tiny versions of many common UNIX utilities into a single small executable."
  1865. # busybox fails to build with GOLD support enabled with binutils-2.25
  1866. @@ -25,6 +25,10 @@ if [ "$NFS_SUPPORT" = yes ]; then
  1867. PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET rpcbind"
  1868. fi
  1869.  
  1870. +if [ "$TARGET_ARCH" = "x86_64" ]; then
  1871. + PKG_DEPENDS_TARGET+=" pciutils"
  1872. +fi
  1873. +
  1874. pre_build_target() {
  1875. PKG_MAKE_OPTS_TARGET="ARCH=$TARGET_ARCH \
  1876. HOSTCC=$HOST_CC \
  1877. --
  1878. 2.14.1
  1879.  
  1880.  
  1881. From baf047b5901b834cf3df651fd530c0d6bd6974e5 Mon Sep 17 00:00:00 2001
  1882. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1883. Date: Sat, 5 Jan 2019 02:50:57 +0000
  1884. Subject: [PATCH 10/16] packages: add missing dependencies
  1885.  
  1886. ---
  1887. packages/addons/addon-depends/system-tools-depends/p7zip/package.mk | 1 +
  1888. packages/compress/bzip2/package.mk | 2 +-
  1889. packages/compress/xz/package.mk | 1 +
  1890. packages/compress/zstd/package.mk | 1 +
  1891. packages/databases/sqlite/package.mk | 1 +
  1892. packages/debug/libunwind/package.mk | 1 +
  1893. packages/devel/elfutils/package.mk | 2 +-
  1894. packages/devel/flex/package.mk | 1 +
  1895. packages/devel/glib/package.mk | 2 +-
  1896. packages/devel/libffi/package.mk | 2 ++
  1897. packages/devel/ncurses/package.mk | 1 +
  1898. packages/devel/pcre/package.mk | 2 +-
  1899. packages/lang/gcc/package.mk | 1 +
  1900. packages/linux/package.mk | 2 +-
  1901. packages/mediacenter/JsonSchemaBuilder/package.mk | 1 +
  1902. packages/print/freetype/package.mk | 1 +
  1903. packages/security/nspr/package.mk | 2 +-
  1904. packages/sysutils/busybox/package.mk | 2 +-
  1905. packages/sysutils/dosfstools/package.mk | 2 ++
  1906. packages/sysutils/e2fsprogs/package.mk | 1 +
  1907. packages/sysutils/gptfdisk/package.mk | 2 +-
  1908. packages/sysutils/util-linux/package.mk | 2 +-
  1909. packages/sysutils/v4l-utils/package.mk | 2 +-
  1910. packages/tools/aml-dtbtools/package.mk | 1 +
  1911. packages/tools/dtc/package.mk | 2 +-
  1912. packages/tools/mkbootimg/package.mk | 3 ++-
  1913. packages/tools/mtools/package.mk | 3 ++-
  1914. packages/x11/lib/pixman/package.mk | 2 ++
  1915. 28 files changed, 33 insertions(+), 13 deletions(-)
  1916.  
  1917. diff --git a/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk b/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
  1918. index 4db0399..53ef8ff 100644
  1919. --- a/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
  1920. +++ b/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
  1921. @@ -7,6 +7,7 @@ PKG_SHA256="5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f"
  1922. PKG_LICENSE="GPL"
  1923. PKG_SITE="http://p7zip.sourceforge.net/"
  1924. PKG_URL="http://downloads.sourceforge.net/project/p7zip/p7zip/${PKG_VERSION}/p7zip_${PKG_VERSION}_src_all.tar.bz2"
  1925. +PKG_DEPENDS_HOST="gcc:host"
  1926. PKG_DEPENDS_TARGET="toolchain"
  1927. PKG_LONGDESC="p7zip is a port of 7za.exe for POSIX systems like Unix."
  1928. PKG_TOOLCHAIN="manual"
  1929. diff --git a/packages/compress/bzip2/package.mk b/packages/compress/bzip2/package.mk
  1930. index 610406b..9a12838 100644
  1931. --- a/packages/compress/bzip2/package.mk
  1932. +++ b/packages/compress/bzip2/package.mk
  1933. @@ -8,7 +8,7 @@ PKG_SHA256="a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
  1934. PKG_LICENSE="GPL"
  1935. PKG_SITE="http://www.bzip.org"
  1936. PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
  1937. -PKG_DEPENDS_HOST=""
  1938. +PKG_DEPENDS_HOST="gcc:host"
  1939. PKG_DEPENDS_TARGET="toolchain"
  1940. PKG_LONGDESC="A high-quality bzip2 data compressor."
  1941. PKG_BUILD_FLAGS="+pic +pic:host"
  1942. diff --git a/packages/compress/xz/package.mk b/packages/compress/xz/package.mk
  1943. index 0974846..ab7d013 100644
  1944. --- a/packages/compress/xz/package.mk
  1945. +++ b/packages/compress/xz/package.mk
  1946. @@ -9,6 +9,7 @@ PKG_LICENSE="GPL"
  1947. PKG_SITE="http://tukaani.org/xz/"
  1948. PKG_URL="http://tukaani.org/xz/$PKG_NAME-$PKG_VERSION.tar.bz2"
  1949. PKG_DEPENDS_HOST="ccache:host"
  1950. +PKG_DEPENDS_TARGET="gcc:host"
  1951. PKG_LONGDESC="A free general-purpose data compression software with high compression ratio."
  1952. PKG_BUILD_FLAGS="+pic"
  1953.  
  1954. diff --git a/packages/compress/zstd/package.mk b/packages/compress/zstd/package.mk
  1955. index 3ec5713..2aee9d6 100644
  1956. --- a/packages/compress/zstd/package.mk
  1957. +++ b/packages/compress/zstd/package.mk
  1958. @@ -8,6 +8,7 @@ PKG_LICENSE="BSD/GPLv2"
  1959. PKG_SITE="http://www.zstd.net"
  1960. PKG_URL="https://github.com/facebook/zstd/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
  1961. PKG_SOURCE_DIR=$PKG_NAME-$PKG_VERSION
  1962. +PKG_DEPENDS_HOST="gcc:host ninja:host"
  1963. PKG_DEPENDS_TARGET="toolchain"
  1964. PKG_LONGDESC="A fast real-time compression algorithm."
  1965.  
  1966. diff --git a/packages/databases/sqlite/package.mk b/packages/databases/sqlite/package.mk
  1967. index 66af712..8a793e8 100644
  1968. --- a/packages/databases/sqlite/package.mk
  1969. +++ b/packages/databases/sqlite/package.mk
  1970. @@ -8,6 +8,7 @@ PKG_SHA256="5daa6a3fb7d1e8c767cd59c4ded8da6e4b00c61d3b466d0685e35c4dd6d7bf5d"
  1971. PKG_LICENSE="PublicDomain"
  1972. PKG_SITE="https://www.sqlite.org/"
  1973. PKG_URL="https://www.sqlite.org/2018/$PKG_NAME-$PKG_VERSION.tar.gz"
  1974. +PKG_DEPENDS_HOST="gcc:host"
  1975. PKG_DEPENDS_TARGET="toolchain"
  1976. PKG_LONGDESC="An Embeddable SQL Database Engine."
  1977. # libsqlite3.a(sqlite3.o): requires dynamic R_X86_64_PC32 reloc against 'sqlite3_stricmp' which may overflow at runtime
  1978. diff --git a/packages/debug/libunwind/package.mk b/packages/debug/libunwind/package.mk
  1979. index 47698d3..44b91b6 100644
  1980. --- a/packages/debug/libunwind/package.mk
  1981. +++ b/packages/debug/libunwind/package.mk
  1982. @@ -7,6 +7,7 @@ PKG_SHA256="3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb"
  1983. PKG_LICENSE="GPL"
  1984. PKG_SITE="http://www.nongnu.org/libunwind/"
  1985. PKG_URL="http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PKG_VERSION}.tar.gz"
  1986. +PKG_DEPENDS_TARGET="gcc:host"
  1987. PKG_LONGDESC="library to determine the call-chain of a program"
  1988.  
  1989. PKG_CONFIGURE_OPTS_TARGET="--enable-static \
  1990. diff --git a/packages/devel/elfutils/package.mk b/packages/devel/elfutils/package.mk
  1991. index 6a2cedb..3534b60 100644
  1992. --- a/packages/devel/elfutils/package.mk
  1993. +++ b/packages/devel/elfutils/package.mk
  1994. @@ -9,7 +9,7 @@ PKG_LICENSE="GPL"
  1995. PKG_SITE="https://sourceware.org/elfutils/"
  1996. PKG_URL="https://sourceware.org/elfutils/ftp/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
  1997. PKG_DEPENDS_HOST="make:host zlib:host"
  1998. -PKG_DEPENDS_TARGET="toolchain zlib"
  1999. +PKG_DEPENDS_TARGET="toolchain zlib elfutils:host"
  2000. PKG_LONGDESC="A collection of utilities to handle ELF objects."
  2001. PKG_TOOLCHAIN="autotools"
  2002. PKG_BUILD_FLAGS="+pic"
  2003. diff --git a/packages/devel/flex/package.mk b/packages/devel/flex/package.mk
  2004. index 091e4c2..37e2324 100644
  2005. --- a/packages/devel/flex/package.mk
  2006. +++ b/packages/devel/flex/package.mk
  2007. @@ -8,6 +8,7 @@ PKG_LICENSE="GPL"
  2008. PKG_SITE="http://flex.sourceforge.net/"
  2009. PKG_URL="$SOURCEFORGE_SRC/flex/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2010. PKG_DEPENDS_HOST="ccache:host"
  2011. +PKG_DEPENDS_TARGET="toolchain"
  2012. PKG_LONGDESC="A tool for generating programs that perform pattern-matching on text."
  2013. PKG_TOOLCHAIN="autotools"
  2014.  
  2015. diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk
  2016. index a6ee221..d490da4 100644
  2017. --- a/packages/devel/glib/package.mk
  2018. +++ b/packages/devel/glib/package.mk
  2019. @@ -8,8 +8,8 @@ PKG_SHA256="991421f41a4ed4cc1637e5f9db0d03fd236d2cbd19f3c5b097a343bec5126602"
  2020. PKG_LICENSE="LGPL"
  2021. PKG_SITE="http://www.gtk.org/"
  2022. PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz"
  2023. +PKG_DEPENDS_HOST="libffi:host pcre:host pkg-config:host"
  2024. PKG_DEPENDS_TARGET="toolchain zlib libffi Python2:host util-linux"
  2025. -PKG_DEPENDS_HOST="libffi:host pcre:host"
  2026. PKG_LONGDESC="A library which includes support routines for C such as lists, trees, hashes, memory allocation."
  2027. PKG_TOOLCHAIN="autotools"
  2028.  
  2029. diff --git a/packages/devel/libffi/package.mk b/packages/devel/libffi/package.mk
  2030. index b4e83eb..0cb80e0 100644
  2031. --- a/packages/devel/libffi/package.mk
  2032. +++ b/packages/devel/libffi/package.mk
  2033. @@ -1,5 +1,6 @@
  2034. # SPDX-License-Identifier: GPL-2.0-or-later
  2035. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2036. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2037.  
  2038. PKG_NAME="libffi"
  2039. PKG_VERSION="3.2.1"
  2040. @@ -7,6 +8,7 @@ PKG_SHA256="d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37"
  2041. PKG_LICENSE="GPL"
  2042. PKG_SITE="http://sourceware.org/$PKG_NAME/"
  2043. PKG_URL="ftp://sourceware.org/pub/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
  2044. +PKG_DEPENDS_HOST="gcc:host"
  2045. PKG_DEPENDS_TARGET="toolchain"
  2046. PKG_LONGDESC="Foreign Function Interface Library."
  2047. PKG_TOOLCHAIN="autotools"
  2048. diff --git a/packages/devel/ncurses/package.mk b/packages/devel/ncurses/package.mk
  2049. index c04d685..e579734 100644
  2050. --- a/packages/devel/ncurses/package.mk
  2051. +++ b/packages/devel/ncurses/package.mk
  2052. @@ -7,6 +7,7 @@ PKG_SHA256="08b07c3e792961f300829512c283d5fefc0b1c421a57b76922c3d13303ed677d"
  2053. PKG_LICENSE="MIT"
  2054. PKG_SITE="http://www.gnu.org/software/ncurses/"
  2055. PKG_URL="http://invisible-mirror.net/archives/ncurses/current/ncurses-$PKG_VERSION.tgz"
  2056. +PKG_DEPENDS_HOST="gcc:host"
  2057. PKG_DEPENDS_TARGET="toolchain zlib ncurses:host"
  2058. PKG_LONGDESC="A library is a free software emulation of curses in System V Release 4.0, and more."
  2059. # causes some segmentation fault's (dialog) when compiled with gcc's link time optimization.
  2060. diff --git a/packages/devel/pcre/package.mk b/packages/devel/pcre/package.mk
  2061. index 0518214..3148324 100644
  2062. --- a/packages/devel/pcre/package.mk
  2063. +++ b/packages/devel/pcre/package.mk
  2064. @@ -8,7 +8,7 @@ PKG_SHA256="2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301"
  2065. PKG_LICENSE="OSS"
  2066. PKG_SITE="http://www.pcre.org/"
  2067. PKG_URL="https://ftp.pcre.org/pub/pcre/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2068. -PKG_DEPENDS_HOST=""
  2069. +PKG_DEPENDS_HOST="gcc:host"
  2070. PKG_DEPENDS_TARGET="toolchain"
  2071. PKG_LONGDESC="A set of functions that implement regular expression pattern matching."
  2072. PKG_TOOLCHAIN="configure"
  2073. diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
  2074. index f899aeb..a7d1d87 100644
  2075. --- a/packages/lang/gcc/package.mk
  2076. +++ b/packages/lang/gcc/package.mk
  2077. @@ -11,6 +11,7 @@ PKG_URL="http://ftpmirror.gnu.org/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERS
  2078. PKG_DEPENDS_BOOTSTRAP="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host"
  2079. PKG_DEPENDS_TARGET="gcc:host"
  2080. PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host glibc"
  2081. +PKG_DEPENDS_INIT="toolchain"
  2082. PKG_LONGDESC="This package contains the GNU Compiler Collection."
  2083.  
  2084. GCC_COMMON_CONFIGURE_OPTS="--target=$TARGET_NAME \
  2085. diff --git a/packages/linux/package.mk b/packages/linux/package.mk
  2086. index 3bd5a13..8908e71 100644
  2087. --- a/packages/linux/package.mk
  2088. +++ b/packages/linux/package.mk
  2089. @@ -5,7 +5,7 @@
  2090. PKG_NAME="linux"
  2091. PKG_LICENSE="GPL"
  2092. PKG_SITE="http://www.kernel.org"
  2093. -PKG_DEPENDS_HOST="ccache:host"
  2094. +PKG_DEPENDS_HOST="ccache:host openssl:host"
  2095. PKG_DEPENDS_TARGET="toolchain cpio:host kmod:host xz:host wireless-regdb keyutils $KERNEL_EXTRA_DEPENDS_TARGET"
  2096. PKG_DEPENDS_INIT="toolchain"
  2097. PKG_NEED_UNPACK="$LINUX_DEPENDS"
  2098. diff --git a/packages/mediacenter/JsonSchemaBuilder/package.mk b/packages/mediacenter/JsonSchemaBuilder/package.mk
  2099. index b62b79a..91fefc9 100644
  2100. --- a/packages/mediacenter/JsonSchemaBuilder/package.mk
  2101. +++ b/packages/mediacenter/JsonSchemaBuilder/package.mk
  2102. @@ -6,6 +6,7 @@ PKG_NAME="JsonSchemaBuilder"
  2103. PKG_VERSION="0"
  2104. PKG_LICENSE="GPL"
  2105. PKG_SITE="http://www.kodi.tv"
  2106. +PKG_DEPENDS_HOST="toolchain"
  2107. PKG_DEPENDS_UNPACK="kodi"
  2108. PKG_NEED_UNPACK="$(get_pkg_directory $MEDIACENTER)"
  2109. PKG_LONGDESC="kodi-platform:"
  2110. diff --git a/packages/print/freetype/package.mk b/packages/print/freetype/package.mk
  2111. index 4188f2c..23759c3 100644
  2112. --- a/packages/print/freetype/package.mk
  2113. +++ b/packages/print/freetype/package.mk
  2114. @@ -8,6 +8,7 @@ PKG_SHA256="e20a6e1400798fd5e3d831dd821b61c35b1f9a6465d6b18a53a9df4cf441acf0"
  2115. PKG_LICENSE="GPL"
  2116. PKG_SITE="http://www.freetype.org"
  2117. PKG_URL="http://download.savannah.gnu.org/releases/freetype/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2118. +PKG_DEPENDS_HOST="gcc:host"
  2119. PKG_DEPENDS_TARGET="toolchain zlib libpng"
  2120. PKG_LONGDESC="The FreeType engine is a free and portable TrueType font rendering engine."
  2121. PKG_TOOLCHAIN="configure"
  2122. diff --git a/packages/security/nspr/package.mk b/packages/security/nspr/package.mk
  2123. index fd63908..58f4f22 100644
  2124. --- a/packages/security/nspr/package.mk
  2125. +++ b/packages/security/nspr/package.mk
  2126. @@ -7,7 +7,7 @@ PKG_VERSION="4.19"
  2127. PKG_LICENSE="Mozilla Public License"
  2128. PKG_SITE="http://www.linuxfromscratch.org/blfs/view/svn/general/nspr.html"
  2129. PKG_DEPENDS_HOST="ccache:host"
  2130. -PKG_DEPENDS_TARGET="toolchain nss:host"
  2131. +PKG_DEPENDS_TARGET="toolchain nss:host nspr:host"
  2132. PKG_DEPENDS_UNPACK="nss"
  2133. PKG_LONGDESC="Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions"
  2134. PKG_TOOLCHAIN="configure"
  2135. diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk
  2136. index 4aa977c..dd1fba0 100644
  2137. --- a/packages/sysutils/busybox/package.mk
  2138. +++ b/packages/sysutils/busybox/package.mk
  2139. @@ -8,7 +8,7 @@ PKG_SHA256="97648636e579462296478e0218e65e4bc1e9cd69089a3b1aeb810bff7621efb7"
  2140. PKG_LICENSE="GPL"
  2141. PKG_SITE="http://www.busybox.net"
  2142. PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2143. -PKG_DEPENDS_HOST=""
  2144. +PKG_DEPENDS_HOST="gcc:host"
  2145. PKG_DEPENDS_TARGET="toolchain busybox:host hdparm dosfstools e2fsprogs zip unzip usbutils parted procps-ng gptfdisk libtirpc"
  2146. PKG_DEPENDS_INIT="toolchain libtirpc"
  2147. PKG_LONGDESC="BusyBox combines tiny versions of many common UNIX utilities into a single small executable."
  2148. diff --git a/packages/sysutils/dosfstools/package.mk b/packages/sysutils/dosfstools/package.mk
  2149. index 6f8c72b..ffaf5f7 100644
  2150. --- a/packages/sysutils/dosfstools/package.mk
  2151. +++ b/packages/sysutils/dosfstools/package.mk
  2152. @@ -1,5 +1,6 @@
  2153. # SPDX-License-Identifier: GPL-2.0-or-later
  2154. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2155. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2156.  
  2157. PKG_NAME="dosfstools"
  2158. PKG_VERSION="3.0.28"
  2159. @@ -8,6 +9,7 @@ PKG_LICENSE="GPLv3"
  2160. PKG_SITE="https://github.com/dosfstools/dosfstools"
  2161. PKG_URL="https://github.com/dosfstools/dosfstools/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
  2162. PKG_DEPENDS_TARGET="toolchain"
  2163. +PKG_DEPENDS_HOST="gcc:host"
  2164. PKG_DEPENDS_INIT="toolchain dosfstools"
  2165. PKG_LONGDESC="dosfstools contains utilities for making and checking MS-DOS FAT filesystems."
  2166.  
  2167. diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk
  2168. index 0daafc5..260315e 100644
  2169. --- a/packages/sysutils/e2fsprogs/package.mk
  2170. +++ b/packages/sysutils/e2fsprogs/package.mk
  2171. @@ -8,6 +8,7 @@ PKG_SHA256="926f8e8de1ffba55d791f21b71334e8a32b5227257ad370f2bf7e4396629e97f"
  2172. PKG_LICENSE="GPL"
  2173. PKG_SITE="http://e2fsprogs.sourceforge.net/"
  2174. PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/$PKG_NAME/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
  2175. +PKG_DEPENDS_HOST="gcc:host"
  2176. PKG_DEPENDS_TARGET="toolchain"
  2177. PKG_DEPENDS_INIT="toolchain"
  2178. PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs, dumpe2fs, fsck, and others."
  2179. diff --git a/packages/sysutils/gptfdisk/package.mk b/packages/sysutils/gptfdisk/package.mk
  2180. index 2668ea6..5e59cb0 100644
  2181. --- a/packages/sysutils/gptfdisk/package.mk
  2182. +++ b/packages/sysutils/gptfdisk/package.mk
  2183. @@ -7,7 +7,7 @@ PKG_SHA256="b663391a6876f19a3cd901d862423a16e2b5ceaa2f4a3b9bb681e64b9c7ba78d"
  2184. PKG_LICENSE="GPL"
  2185. PKG_SITE="http://www.rodsbooks.com/gdisk/"
  2186. PKG_URL="https://downloads.sourceforge.net/project/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
  2187. -PKG_DEPENDS_TARGET="toolchain popt"
  2188. +PKG_DEPENDS_TARGET="toolchain popt crossguid"
  2189. PKG_LONGDESC="GPT text-mode partitioning tools"
  2190.  
  2191. make_target() {
  2192. diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk
  2193. index 07e07e8..27a18b8 100644
  2194. --- a/packages/sysutils/util-linux/package.mk
  2195. +++ b/packages/sysutils/util-linux/package.mk
  2196. @@ -7,7 +7,7 @@ PKG_VERSION="2.32.1"
  2197. PKG_SHA256="86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2"
  2198. PKG_LICENSE="GPL"
  2199. PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz"
  2200. -PKG_DEPENDS_HOST=""
  2201. +PKG_DEPENDS_HOST="gcc:host pkg-config:host"
  2202. PKG_DEPENDS_TARGET="toolchain"
  2203. PKG_DEPENDS_INIT="toolchain"
  2204. PKG_LONGDESC="A large variety of low-level system utilities that are necessary for a Linux system to function."
  2205. diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk
  2206. index 6e37014..84495df 100644
  2207. --- a/packages/sysutils/v4l-utils/package.mk
  2208. +++ b/packages/sysutils/v4l-utils/package.mk
  2209. @@ -10,7 +10,7 @@ PKG_SHA256="e6b962c4b1253cf852c31da13fd6b5bb7cbe5aa9e182881aec55123bae680692"
  2210. PKG_LICENSE="GPL"
  2211. PKG_SITE="http://linuxtv.org/"
  2212. PKG_URL="http://linuxtv.org/downloads/v4l-utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2213. -PKG_DEPENDS_TARGET="toolchain"
  2214. +PKG_DEPENDS_TARGET="toolchain alsa-lib systemd"
  2215. PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
  2216.  
  2217. PKG_CONFIGURE_OPTS_TARGET="--without-jpeg \
  2218. diff --git a/packages/tools/aml-dtbtools/package.mk b/packages/tools/aml-dtbtools/package.mk
  2219. index 8e21b9b..93a0d28 100644
  2220. --- a/packages/tools/aml-dtbtools/package.mk
  2221. +++ b/packages/tools/aml-dtbtools/package.mk
  2222. @@ -7,6 +7,7 @@ PKG_SHA256="8bcaa83fcc9e85c9c04930e7411447d96a97da0809c5ecd9af91c8b554133c41"
  2223. PKG_LICENSE="free"
  2224. PKG_SITE="https://github.com/Wilhansen/aml-dtbtools"
  2225. PKG_URL="https://github.com/Wilhansen/aml-dtbtools/archive/${PKG_VERSION}.tar.gz"
  2226. +PKG_DEPENDS_HOST="gcc:host"
  2227. PKG_LONGDESC="AML DTB Tools"
  2228.  
  2229. PKG_MAKE_OPTS_HOST="dtbTool"
  2230. diff --git a/packages/tools/dtc/package.mk b/packages/tools/dtc/package.mk
  2231. index e943d3e..4fe132c 100644
  2232. --- a/packages/tools/dtc/package.mk
  2233. +++ b/packages/tools/dtc/package.mk
  2234. @@ -8,7 +8,7 @@ PKG_LICENSE="GPL"
  2235. PKG_SITE="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/"
  2236. PKG_URL="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$PKG_VERSION.tar.gz"
  2237. PKG_DEPENDS_HOST="Python2:host swig:host"
  2238. -PKG_DEPENDS_TARGET="toolchain"
  2239. +PKG_DEPENDS_TARGET="toolchain dtc:host"
  2240. PKG_LONGDESC="The Device Tree Compiler"
  2241.  
  2242. PKG_MAKE_OPTS_HOST="dtc libfdt"
  2243. diff --git a/packages/tools/mkbootimg/package.mk b/packages/tools/mkbootimg/package.mk
  2244. index 0b9d83a..adc1d3a 100644
  2245. --- a/packages/tools/mkbootimg/package.mk
  2246. +++ b/packages/tools/mkbootimg/package.mk
  2247. @@ -1,5 +1,6 @@
  2248. # SPDX-License-Identifier: GPL-2.0-or-later
  2249. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2250. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2251.  
  2252. PKG_NAME="mkbootimg"
  2253. PKG_VERSION="6668fc2"
  2254. @@ -7,7 +8,7 @@ PKG_SHA256="d84870e055414d638a3e7eb4b7a3ebf415899841218f24cb3647d06ecf6ddb17"
  2255. PKG_LICENSE="GPL"
  2256. PKG_SITE="https://android.googlesource.com/platform/system/core/+/master/mkbootimg/"
  2257. PKG_URL="https://github.com/codesnake/mkbootimg/archive/$PKG_VERSION.tar.gz"
  2258. -PKG_DEPENDS_HOST=""
  2259. +PKG_DEPENDS_HOST="gcc:host"
  2260. PKG_LONGDESC="mkbootimg: Creates kernel boot images for Android"
  2261.  
  2262. makeinstall_host() {
  2263. diff --git a/packages/tools/mtools/package.mk b/packages/tools/mtools/package.mk
  2264. index 099488f..e0dd42e 100644
  2265. --- a/packages/tools/mtools/package.mk
  2266. +++ b/packages/tools/mtools/package.mk
  2267. @@ -1,5 +1,6 @@
  2268. # SPDX-License-Identifier: GPL-2.0-or-later
  2269. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2270. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2271.  
  2272. PKG_NAME="mtools"
  2273. PKG_VERSION="4.0.18"
  2274. @@ -7,6 +8,6 @@ PKG_SHA256="59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85"
  2275. PKG_LICENSE="GPL"
  2276. PKG_SITE="http://www.gnu.org/software/mtools/"
  2277. PKG_URL="http://ftpmirror.gnu.org/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2278. -PKG_DEPENDS_HOST=""
  2279. +PKG_DEPENDS_HOST="gcc:host"
  2280. PKG_LONGDESC="mtools: A collection of utilities to access MS-DOS disks"
  2281. PKG_TOOLCHAIN="autotools"
  2282. diff --git a/packages/x11/lib/pixman/package.mk b/packages/x11/lib/pixman/package.mk
  2283. index 65868f2..631a570 100644
  2284. --- a/packages/x11/lib/pixman/package.mk
  2285. +++ b/packages/x11/lib/pixman/package.mk
  2286. @@ -1,5 +1,6 @@
  2287. # SPDX-License-Identifier: GPL-2.0-or-later
  2288. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2289. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2290.  
  2291. PKG_NAME="pixman"
  2292. PKG_VERSION="0.34.0"
  2293. @@ -7,6 +8,7 @@ PKG_SHA256="39ba3438f3d17c464b0cb8be006dacbca0ab5aee97ebde69fec7ecdbf85794a0"
  2294. PKG_LICENSE="OSS"
  2295. PKG_SITE="http://www.x.org/"
  2296. PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2297. +PKG_DEPENDS_HOST="gcc:host"
  2298. PKG_DEPENDS_TARGET="toolchain util-macros"
  2299. PKG_LONGDESC="Pixman is a generic library for manipulating pixel regions, contains low-level pixel manipulation routines."
  2300.  
  2301. --
  2302. 2.14.1
  2303.  
  2304.  
  2305. From 30262bff5c9911faf90709c6f531e4aa05df2a24 Mon Sep 17 00:00:00 2001
  2306. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  2307. Date: Sun, 6 Jan 2019 10:22:10 +0000
  2308. Subject: [PATCH 11/16] packages: add missing xorg dependencies
  2309.  
  2310. ---
  2311. packages/x11/app/xkbcomp/package.mk | 3 ++-
  2312. packages/x11/driver/xf86-input-evdev/package.mk | 2 +-
  2313. packages/x11/driver/xf86-input-synaptics/package.mk | 2 +-
  2314. packages/x11/lib/libXi/package.mk | 2 +-
  2315. 4 files changed, 5 insertions(+), 4 deletions(-)
  2316.  
  2317. diff --git a/packages/x11/app/xkbcomp/package.mk b/packages/x11/app/xkbcomp/package.mk
  2318. index fdee2ed..cefb1e3 100644
  2319. --- a/packages/x11/app/xkbcomp/package.mk
  2320. +++ b/packages/x11/app/xkbcomp/package.mk
  2321. @@ -1,5 +1,6 @@
  2322. # SPDX-License-Identifier: GPL-2.0-or-later
  2323. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2324. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2325.  
  2326. PKG_NAME="xkbcomp"
  2327. PKG_VERSION="1.4.1"
  2328. @@ -7,7 +8,7 @@ PKG_SHA256="748dc4cf58ac95684106bd9cf163ac6ab7de9a236faec02a6f4d4006d63a5736"
  2329. PKG_LICENSE="OSS"
  2330. PKG_SITE="http://www.X.org"
  2331. PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2332. -PKG_DEPENDS_TARGET="toolchain util-macros libX11"
  2333. +PKG_DEPENDS_TARGET="toolchain util-macros libX11 libxkbfile"
  2334. PKG_LONGDESC="The xkbcomp keymap compiler converts a description of an XKB keymap into one of several output formats."
  2335.  
  2336. PKG_CONFIGURE_OPTS_TARGET="--with-xkb-config-root=$XORG_PATH_XKB"
  2337. diff --git a/packages/x11/driver/xf86-input-evdev/package.mk b/packages/x11/driver/xf86-input-evdev/package.mk
  2338. index e83dd81..c015cfc 100644
  2339. --- a/packages/x11/driver/xf86-input-evdev/package.mk
  2340. +++ b/packages/x11/driver/xf86-input-evdev/package.mk
  2341. @@ -8,7 +8,7 @@ PKG_SHA256="9edaa6205baf6d2922cc4db3d8e54a7e7773b5f733b0ae90f6be7725f983b70d"
  2342. PKG_LICENSE="OSS"
  2343. PKG_SITE="http://www.X.org"
  2344. PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2345. -PKG_DEPENDS_TARGET="toolchain util-macros libevdev mtdev systemd"
  2346. +PKG_DEPENDS_TARGET="toolchain xorg-server util-macros libevdev mtdev systemd"
  2347. PKG_LONGDESC="Evdev is an Xorg input driver for Linux's generic event devices."
  2348. PKG_TOOLCHAIN="autotools"
  2349.  
  2350. diff --git a/packages/x11/driver/xf86-input-synaptics/package.mk b/packages/x11/driver/xf86-input-synaptics/package.mk
  2351. index abbdf17..8cb9b74 100644
  2352. --- a/packages/x11/driver/xf86-input-synaptics/package.mk
  2353. +++ b/packages/x11/driver/xf86-input-synaptics/package.mk
  2354. @@ -7,7 +7,7 @@ PKG_SHA256="afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a"
  2355. PKG_LICENSE="GPL"
  2356. PKG_SITE="http://lists.freedesktop.org/mailman/listinfo/xorg"
  2357. PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2358. -PKG_DEPENDS_TARGET="toolchain libXi"
  2359. +PKG_DEPENDS_TARGET="toolchain xorg-server libXi"
  2360. PKG_LONGDESC="Synaptics touchpad driver for X.Org."
  2361. PKG_TOOLCHAIN="autotools"
  2362.  
  2363. diff --git a/packages/x11/lib/libXi/package.mk b/packages/x11/lib/libXi/package.mk
  2364. index 8f50cc5..ac1707c 100644
  2365. --- a/packages/x11/lib/libXi/package.mk
  2366. +++ b/packages/x11/lib/libXi/package.mk
  2367. @@ -8,7 +8,7 @@ PKG_SHA256="c2e6b8ff84f9448386c1b5510a5cf5a16d788f76db018194dacdc200180faf45"
  2368. PKG_LICENSE="OSS"
  2369. PKG_SITE="http://www.x.org/"
  2370. PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2371. -PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXfixes"
  2372. +PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXfixes libXext"
  2373. PKG_LONGDESC="LibXi provides an X Window System client interface to the XINPUT extension to the X protocol."
  2374. PKG_BUILD_FLAGS="+pic"
  2375.  
  2376. --
  2377. 2.14.1
  2378.  
  2379.  
  2380. From 1e27c2bd0961e0ab51dbdd50bff6f00e60182d96 Mon Sep 17 00:00:00 2001
  2381. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  2382. Date: Sat, 12 Jan 2019 01:25:27 +0000
  2383. Subject: [PATCH 12/16] packages: add thread safety workaround
  2384.  
  2385. Avoids trashing $TOOLCHAIN/lib/python2.7/site-packages/easy-install.pth
  2386. when installing Python host packages (distutilscross:host, setuptools:host,
  2387. MarkupSafe:host etc.).
  2388. ---
  2389. packages/python/devel/Mako/package.mk | 2 +-
  2390. packages/python/devel/MarkupSafe/package.mk | 2 +-
  2391. packages/python/devel/distutilscross/package.mk | 3 ++-
  2392. packages/python/devel/meson/package.mk | 4 ++--
  2393. packages/python/devel/pathlib/package.mk | 2 +-
  2394. packages/python/devel/setuptools/package.mk | 8 ++++----
  2395. packages/tools/dtc/package.mk | 2 +-
  2396. 7 files changed, 12 insertions(+), 11 deletions(-)
  2397.  
  2398. diff --git a/packages/python/devel/Mako/package.mk b/packages/python/devel/Mako/package.mk
  2399. index 45007cf..41217f6 100644
  2400. --- a/packages/python/devel/Mako/package.mk
  2401. +++ b/packages/python/devel/Mako/package.mk
  2402. @@ -13,5 +13,5 @@ PKG_LONGDESC="Mako is a super-fast templating language that borrows the best ide
  2403. PKG_TOOLCHAIN="manual"
  2404.  
  2405. makeinstall_host() {
  2406. - python3 setup.py install --prefix=$TOOLCHAIN
  2407. + exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN
  2408. }
  2409. diff --git a/packages/python/devel/MarkupSafe/package.mk b/packages/python/devel/MarkupSafe/package.mk
  2410. index 3780381..20c090e 100644
  2411. --- a/packages/python/devel/MarkupSafe/package.mk
  2412. +++ b/packages/python/devel/MarkupSafe/package.mk
  2413. @@ -13,5 +13,5 @@ PKG_LONGDESC="MarkupSafe implements a XML/HTML/XHTML Markup safe string for Pyth
  2414. PKG_TOOLCHAIN="manual"
  2415.  
  2416. makeinstall_host() {
  2417. - python3 setup.py install --prefix=$TOOLCHAIN
  2418. + exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN
  2419. }
  2420. diff --git a/packages/python/devel/distutilscross/package.mk b/packages/python/devel/distutilscross/package.mk
  2421. index 367e35a..4c767be 100644
  2422. --- a/packages/python/devel/distutilscross/package.mk
  2423. +++ b/packages/python/devel/distutilscross/package.mk
  2424. @@ -1,5 +1,6 @@
  2425. # SPDX-License-Identifier: GPL-2.0-or-later
  2426. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2427. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2428.  
  2429. PKG_NAME="distutilscross"
  2430. PKG_VERSION="0.1"
  2431. @@ -12,5 +13,5 @@ PKG_LONGDESC="distutilscross enhances distutils to support Cross Compile of Pyth
  2432. PKG_TOOLCHAIN="manual"
  2433.  
  2434. makeinstall_host() {
  2435. - python setup.py install --prefix=$TOOLCHAIN
  2436. + exec_thread_safe python setup.py install --prefix=$TOOLCHAIN
  2437. }
  2438. diff --git a/packages/python/devel/meson/package.mk b/packages/python/devel/meson/package.mk
  2439. index 0e34988..71377ba 100644
  2440. --- a/packages/python/devel/meson/package.mk
  2441. +++ b/packages/python/devel/meson/package.mk
  2442. @@ -12,11 +12,11 @@ PKG_LONGDESC="High productivity build system"
  2443. PKG_TOOLCHAIN="manual"
  2444.  
  2445. make_host() {
  2446. - python3 setup.py build
  2447. + exec_thread_safe python3 setup.py build
  2448. }
  2449.  
  2450. makeinstall_host() {
  2451. - python3 setup.py install --prefix=$TOOLCHAIN --skip-build
  2452. + exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN --skip-build
  2453.  
  2454. # Avoid using full path to python3 that may exceed 128 byte limit.
  2455. # Instead use PATH as we know our toolchain is first.
  2456. diff --git a/packages/python/devel/pathlib/package.mk b/packages/python/devel/pathlib/package.mk
  2457. index 30c9bea..61f8e55 100644
  2458. --- a/packages/python/devel/pathlib/package.mk
  2459. +++ b/packages/python/devel/pathlib/package.mk
  2460. @@ -12,5 +12,5 @@ PKG_LONGDESC="This module offers a set of classes featuring all the common opera
  2461. PKG_TOOLCHAIN="manual"
  2462.  
  2463. makeinstall_host() {
  2464. - python3 setup.py install --prefix=$TOOLCHAIN
  2465. + exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN
  2466. }
  2467. diff --git a/packages/python/devel/setuptools/package.mk b/packages/python/devel/setuptools/package.mk
  2468. index 8a21964..4457c20 100644
  2469. --- a/packages/python/devel/setuptools/package.mk
  2470. +++ b/packages/python/devel/setuptools/package.mk
  2471. @@ -13,11 +13,11 @@ PKG_LONGDESC="Replaces Setuptools as the standard method for working with Python
  2472. PKG_TOOLCHAIN="manual"
  2473.  
  2474. make_host() {
  2475. - python2 bootstrap.py
  2476. - python3 bootstrap.py
  2477. + exec_thread_safe python2 bootstrap.py
  2478. + exec_thread_safe python3 bootstrap.py
  2479. }
  2480.  
  2481. makeinstall_host() {
  2482. - python2 setup.py install --prefix=$TOOLCHAIN
  2483. - python3 setup.py install --prefix=$TOOLCHAIN
  2484. + exec_thread_safe python2 setup.py install --prefix=$TOOLCHAIN
  2485. + exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN
  2486. }
  2487. diff --git a/packages/tools/dtc/package.mk b/packages/tools/dtc/package.mk
  2488. index 4fe132c..c5a005a 100644
  2489. --- a/packages/tools/dtc/package.mk
  2490. +++ b/packages/tools/dtc/package.mk
  2491. @@ -22,7 +22,7 @@ makeinstall_host() {
  2492.  
  2493. post_makeinstall_host() {
  2494. python ./pylibfdt/setup.py build_ext --inplace
  2495. - python ./pylibfdt/setup.py install --prefix=$TOOLCHAIN
  2496. + exec_thread_safe python ./pylibfdt/setup.py install --prefix=$TOOLCHAIN
  2497.  
  2498. touch $TOOLCHAIN/lib/$PKG_PYTHON_VERSION/site-packages/pylibfdt/__init__.py
  2499. }
  2500. --
  2501. 2.14.1
  2502.  
  2503.  
  2504. From aff9a9da59e6b21df9b633c8a7dedfc320d82893 Mon Sep 17 00:00:00 2001
  2505. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  2506. Date: Sun, 6 Jan 2019 10:48:46 +0000
  2507. Subject: [PATCH 13/16] flex: work around realloc/malloc build failures with
  2508. flex:target
  2509.  
  2510. ---
  2511. packages/devel/flex/package.mk | 4 ++++
  2512. 1 file changed, 4 insertions(+)
  2513.  
  2514. diff --git a/packages/devel/flex/package.mk b/packages/devel/flex/package.mk
  2515. index 37e2324..660db3d 100644
  2516. --- a/packages/devel/flex/package.mk
  2517. +++ b/packages/devel/flex/package.mk
  2518. @@ -1,5 +1,6 @@
  2519. # SPDX-License-Identifier: GPL-2.0-or-later
  2520. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2521. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2522.  
  2523. PKG_NAME="flex"
  2524. PKG_VERSION="2.5.39"
  2525. @@ -14,6 +15,9 @@ PKG_TOOLCHAIN="autotools"
  2526.  
  2527. PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared --disable-rpath --with-gnu-ld"
  2528.  
  2529. +PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_realloc_0_nonnull=yes \
  2530. + ac_cv_func_malloc_0_nonnull=yes"
  2531. +
  2532. post_makeinstall_host() {
  2533. cat > $TOOLCHAIN/bin/lex << "EOF"
  2534. #!/bin/sh
  2535. --
  2536. 2.14.1
  2537.  
  2538.  
  2539. From fc62cc6566fc1174a02ec33dd64952b17db68a95 Mon Sep 17 00:00:00 2001
  2540. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  2541. Date: Sat, 5 Jan 2019 22:42:12 +0000
  2542. Subject: [PATCH 14/16] initramfs: use ln -sfn when LINK_NAME is a directory
  2543.  
  2544. INSTALL initramfs (target)
  2545. ln: failed to create symbolic link '/home/ubuntu/projects/LibreELEC.tv/build.LibreELEC-RPi2.arm-9.0-devel-mt/initramfs/lib/lib': Permission denied
  2546. ln: failed to create symbolic link '/home/ubuntu/projects/LibreELEC.tv/build.LibreELEC-RPi2.arm-9.0-devel-mt/initramfs/bin/bin': Permission denied
  2547. ln: failed to create symbolic link '/home/ubuntu/projects/LibreELEC.tv/build.LibreELEC-RPi2.arm-9.0-devel-mt/initramfs/sbin/sbin': Permission denied
  2548.  
  2549. If the directory sym link already exists, we try to
  2550. create a directory within the dereferenced sym link. So...
  2551.  
  2552. ln -sf /usr/lib $BUILD/initramfs/lib
  2553.  
  2554. means we attempt to create a sym link within the existing
  2555. $BUILD/initramfs/lib which is derefernced to /usr/lib/lib,
  2556. resulting in "permission denied".
  2557. ---
  2558. packages/virtual/initramfs/package.mk | 10 +++++-----
  2559. 1 file changed, 5 insertions(+), 5 deletions(-)
  2560.  
  2561. diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk
  2562. index ef17f19..b278804 100644
  2563. --- a/packages/virtual/initramfs/package.mk
  2564. +++ b/packages/virtual/initramfs/package.mk
  2565. @@ -22,14 +22,14 @@ fi
  2566. post_install() {
  2567. ( cd $BUILD/initramfs
  2568. if [ "$TARGET_ARCH" = "x86_64" ]; then
  2569. - ln -sf /usr/lib $BUILD/initramfs/lib64
  2570. + ln -sfn /usr/lib $BUILD/initramfs/lib64
  2571. mkdir -p $BUILD/initramfs/usr
  2572. - ln -sf /usr/lib $BUILD/initramfs/usr/lib64
  2573. + ln -sfn /usr/lib $BUILD/initramfs/usr/lib64
  2574. fi
  2575.  
  2576. - ln -sf /usr/lib $BUILD/initramfs/lib
  2577. - ln -sf /usr/bin $BUILD/initramfs/bin
  2578. - ln -sf /usr/sbin $BUILD/initramfs/sbin
  2579. + ln -sfn /usr/lib $BUILD/initramfs/lib
  2580. + ln -sfn /usr/bin $BUILD/initramfs/bin
  2581. + ln -sfn /usr/sbin $BUILD/initramfs/sbin
  2582.  
  2583. mkdir -p $BUILD/image/
  2584. fakeroot -- sh -c \
  2585. --
  2586. 2.14.1
  2587.  
  2588.  
  2589. From 9151f047977a86239d5b36d5016a3ca2db1c84c6 Mon Sep 17 00:00:00 2001
  2590. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  2591. Date: Sat, 5 Jan 2019 19:32:50 +0000
  2592. Subject: [PATCH 15/16] Makefile: switch to using multi-threaded builds
  2593.  
  2594. ---
  2595. Makefile | 6 +++---
  2596. 1 file changed, 3 insertions(+), 3 deletions(-)
  2597.  
  2598. diff --git a/Makefile b/Makefile
  2599. index a26a9e2..bf85107 100644
  2600. --- a/Makefile
  2601. +++ b/Makefile
  2602. @@ -3,13 +3,13 @@ BUILD_DIRS=build.*
  2603. all: release
  2604.  
  2605. system:
  2606. - ./scripts/image
  2607. + ./scripts/image_mt
  2608.  
  2609. release:
  2610. - ./scripts/image release
  2611. + ./scripts/image_mt release
  2612.  
  2613. image:
  2614. - ./scripts/image mkimage
  2615. + ./scripts/image_mt mkimage
  2616.  
  2617. noobs:
  2618. ./scripts/image noobs
  2619. --
  2620. 2.14.1
  2621.  
  2622.  
  2623. From d63881498a086b80d9da856185407c8ca57d1418 Mon Sep 17 00:00:00 2001
  2624. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  2625. Date: Sat, 12 Jan 2019 14:12:26 +0000
  2626. Subject: [PATCH 16/16] packages: more missing dependencies
  2627.  
  2628. ---
  2629. packages/devel/bison/package.mk | 3 ++-
  2630. packages/devel/flex/package.mk | 2 +-
  2631. packages/devel/gmp/package.mk | 3 ++-
  2632. 3 files changed, 5 insertions(+), 3 deletions(-)
  2633.  
  2634. diff --git a/packages/devel/bison/package.mk b/packages/devel/bison/package.mk
  2635. index 5c15fbc..886e922 100644
  2636. --- a/packages/devel/bison/package.mk
  2637. +++ b/packages/devel/bison/package.mk
  2638. @@ -1,5 +1,6 @@
  2639. # SPDX-License-Identifier: GPL-2.0-or-later
  2640. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2641. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2642.  
  2643. PKG_NAME="bison"
  2644. PKG_VERSION="3.0.5"
  2645. @@ -7,7 +8,7 @@ PKG_SHA256="075cef2e814642e30e10e8155e93022e4a91ca38a65aa1d5467d4e969f97f338"
  2646. PKG_LICENSE="GPL"
  2647. PKG_SITE="http://www.gnu.org/software/bison/"
  2648. PKG_URL="http://ftpmirror.gnu.org/bison/$PKG_NAME-$PKG_VERSION.tar.xz"
  2649. -PKG_DEPENDS_HOST="ccache:host"
  2650. +PKG_DEPENDS_HOST="ccache:host m4:host"
  2651. PKG_LONGDESC="A general-purpose parser generator."
  2652.  
  2653. PKG_CONFIGURE_OPTS_HOST="--disable-rpath --with-gnu-ld"
  2654. diff --git a/packages/devel/flex/package.mk b/packages/devel/flex/package.mk
  2655. index 660db3d..42bdc27 100644
  2656. --- a/packages/devel/flex/package.mk
  2657. +++ b/packages/devel/flex/package.mk
  2658. @@ -8,7 +8,7 @@ PKG_SHA256="add2b55f3bc38cb512b48fad7d72f43b11ef244487ff25fc00aabec1e32b617f"
  2659. PKG_LICENSE="GPL"
  2660. PKG_SITE="http://flex.sourceforge.net/"
  2661. PKG_URL="$SOURCEFORGE_SRC/flex/$PKG_NAME-$PKG_VERSION.tar.bz2"
  2662. -PKG_DEPENDS_HOST="ccache:host"
  2663. +PKG_DEPENDS_HOST="ccache:host m4:host"
  2664. PKG_DEPENDS_TARGET="toolchain"
  2665. PKG_LONGDESC="A tool for generating programs that perform pattern-matching on text."
  2666. PKG_TOOLCHAIN="autotools"
  2667. diff --git a/packages/devel/gmp/package.mk b/packages/devel/gmp/package.mk
  2668. index fddce60..af57dc1 100644
  2669. --- a/packages/devel/gmp/package.mk
  2670. +++ b/packages/devel/gmp/package.mk
  2671. @@ -1,5 +1,6 @@
  2672. # SPDX-License-Identifier: GPL-2.0-or-later
  2673. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  2674. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2675.  
  2676. PKG_NAME="gmp"
  2677. PKG_VERSION="6.1.2"
  2678. @@ -7,7 +8,7 @@ PKG_SHA256="87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912"
  2679. PKG_LICENSE="LGPLv3+"
  2680. PKG_SITE="http://gmplib.org/"
  2681. PKG_URL="https://gmplib.org/download/gmp/$PKG_NAME-$PKG_VERSION.tar.xz"
  2682. -PKG_DEPENDS_HOST="ccache:host"
  2683. +PKG_DEPENDS_HOST="ccache:host m4:host"
  2684. PKG_LONGDESC="A library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers."
  2685. PKG_BUILD_FLAGS="+pic:host"
  2686.  
  2687. --
  2688. 2.14.1
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
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!