API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jan 9th, 2019
148
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 75.17 KB | None | 0 0
raw download clone embed print report
  1. From 7a41595fd89aa1b5891aff16b60c13fccf16db69 Mon Sep 17 00:00:00 2001
  2. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  3. Date: Sat, 5 Jan 2019 02:31:32 +0000
  4. Subject: [PATCH 01/16] config/functions: allow package to be sourced using
  5. path
  6.  
  7. ---
  8. config/functions | 2 +-
  9. 1 file changed, 1 insertion(+), 1 deletion(-)
  10.  
  11. diff --git a/config/functions b/config/functions
  12. index d65763f..e9ef799 100644
  13. --- a/config/functions
  14. +++ b/config/functions
  15. @@ -845,7 +845,7 @@ source_package() {
  16. unset_functions
  17.  
  18. if [ -n "${1}" ]; then
  19. - PKG_DIR="$(get_pkg_directory ${1})"
  20. + [ -f "${1}" ] && PKG_DIR="$(dirname "${1}")" || PKG_DIR="$(get_pkg_directory "${1}")"
  21.  
  22. [ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ] || die "FAILURE: unable to source package - ${1}/package.mk does not exist"
  23.  
  24. --
  25. 2.14.1
  26.  
  27.  
  28. From ff6ca106c6469649e16518fe542a9bb02596b5c9 Mon Sep 17 00:00:00 2001
  29. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  30. Date: Sat, 5 Jan 2019 02:34:45 +0000
  31. Subject: [PATCH 02/16] config/functions: add pkg_lock helpers
  32.  
  33. ---
  34. config/functions | 46 +++++++++++++++++++++++++++++++++++++++++++++-
  35. 1 file changed, 45 insertions(+), 1 deletion(-)
  36.  
  37. diff --git a/config/functions b/config/functions
  38. index e9ef799..594a2c2 100644
  39. --- a/config/functions
  40. +++ b/config/functions
  41. @@ -1155,7 +1155,7 @@ add_group() {
  42. }
  43.  
  44. # Usage: enable_service <unit> [target]
  45. -enable_service () {
  46. +enable_service() {
  47. local unit="$1"
  48. local unit_dir="/usr/lib/systemd/system"
  49. local target="$2"
  50. @@ -1177,6 +1177,50 @@ enable_service () {
  51. done
  52. }
  53.  
  54. +# Prevent concurrent modifications to a package (unpack) or
  55. +# package:target (install/build).
  56. +#
  57. +# If a package is already locked and the owner is ourselves
  58. +# then assume we already have the required lock.
  59. +pkg_lock() {
  60. + [ -z ${MTJOBID} ] && return 0
  61. +
  62. + local pkg="$1" mode="$2"
  63. + local this_job="${MTJOBID:-0}"
  64. + local lock_job lock_mode lock_pkg
  65. +
  66. + mkdir -p "${THREAD_CONTROL}/locks"
  67. + exec 99>"${THREAD_CONTROL}/locks/${pkg}.${mode}"
  68. + if ! flock --nonblock --exclusive 99; then
  69. + while [ : ]; do
  70. + read -r lock_job lock_mode lock_pkg <<<$(cat "${THREAD_CONTROL}/locks/${pkg}.${mode}.owner" 2>/dev/null)
  71. + [ -n "${lock_job}" ] && break || sleep 1
  72. + done
  73. +
  74. + if [ ${lock_job} != ${this_job} ]; then
  75. + pkg_lock_msg "${pkg}" "${mode}" "STALLED" "$(printf "waiting on [%02d] %s %s" ${lock_job} "${lock_mode}" "${lock_pkg}")"
  76. + flock --exclusive 99
  77. + fi
  78. + fi
  79. +
  80. + pkg_lock_msg "${pkg}" "${mode}" "LOCKED"
  81. + echo "${this_job} ${mode} ${pkg}" >"${THREAD_CONTROL}/locks/${pkg}.${mode}.owner"
  82. +}
  83. +
  84. +# Log additional information for a locked package.
  85. +pkg_lock_msg() {
  86. + [ -z ${MTJOBID} ] && return 0
  87. +
  88. + local pkg="$1" mode="$2" status="$3" msg="$4"
  89. + local this_job="${MTJOBID:-0}"
  90. +
  91. + if [ -n "${msg}" ]; then
  92. + 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"
  93. + else
  94. + 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"
  95. + fi
  96. +}
  97. +
  98. # Use distribution functions if any
  99. if [ -f "distributions/$DISTRO/config/functions" ]; then
  100. . distributions/$DISTRO/config/functions
  101. --
  102. 2.14.1
  103.  
  104.  
  105. From 0c83a7bc550c356e56f69ea41d6d5a544792a027 Mon Sep 17 00:00:00 2001
  106. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  107. Date: Sat, 5 Jan 2019 02:35:53 +0000
  108. Subject: [PATCH 03/16] config/path: add THREAD_CONTROL directory
  109.  
  110. ---
  111. config/path | 2 ++
  112. 1 file changed, 2 insertions(+)
  113.  
  114. diff --git a/config/path b/config/path
  115. index 1f1080b..c5c116f 100644
  116. --- a/config/path
  117. +++ b/config/path
  118. @@ -29,6 +29,8 @@ if [ -n "$BUILD_SUFFIX" ]; then
  119. BUILD=$BUILD-$BUILD_SUFFIX
  120. fi
  121.  
  122. +THREAD_CONTROL=${BUILD}/.threads
  123. +
  124. TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH"
  125. ADDON_BUILD="$BUILD/$ADDONS/$1"
  126. STAMPS_NOARCH=.stamps
  127. --
  128. 2.14.1
  129.  
  130.  
  131. From cdd81f60d265bee1385ee1b85e53e5522521673b Mon Sep 17 00:00:00 2001
  132. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  133. Date: Sun, 6 Jan 2019 04:55:48 +0000
  134. Subject: [PATCH 04/16] config/path: stop logging patch progress to stderr when
  135. stdout is fine
  136.  
  137. ---
  138. config/path | 2 +-
  139. 1 file changed, 1 insertion(+), 1 deletion(-)
  140.  
  141. diff --git a/config/path b/config/path
  142. index c5c116f..98b8e91 100644
  143. --- a/config/path
  144. +++ b/config/path
  145. @@ -91,7 +91,7 @@ if [ -z "${SILENT_OUT}" -a -z "${VERBOSE_OUT}" ]; then
  146.  
  147. if [ "$VERBOSE" = yes ]; then
  148. exec 3>&1
  149. - exec 4>&2
  150. + exec 4>&1
  151. else
  152. exec 3>&2
  153. exec 4>/dev/null
  154. --
  155. 2.14.1
  156.  
  157.  
  158. From 7e3c7e21d50e7620dfd0725cf1d2e6944c876468 Mon Sep 17 00:00:00 2001
  159. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  160. Date: Sun, 6 Jan 2019 05:43:26 +0000
  161. Subject: [PATCH 05/16] config/path: VERBOSE_OUT/SILENT_OUT - drop export, need
  162. to exec for every parallel process
  163.  
  164. ---
  165. config/path | 22 ++++++++++------------
  166. 1 file changed, 10 insertions(+), 12 deletions(-)
  167.  
  168. diff --git a/config/path b/config/path
  169. index 98b8e91..134f7ca 100644
  170. --- a/config/path
  171. +++ b/config/path
  172. @@ -84,18 +84,16 @@ fi
  173. VERSION_SUFFIX=$TARGET_ARCH
  174.  
  175. # redirect formatted output
  176. -if [ -z "${SILENT_OUT}" -a -z "${VERBOSE_OUT}" ]; then
  177. - export BUILD_INDENT_SIZE=4
  178. - export SILENT_OUT=3
  179. - export VERBOSE_OUT=4
  180. -
  181. - if [ "$VERBOSE" = yes ]; then
  182. - exec 3>&1
  183. - exec 4>&1
  184. - else
  185. - exec 3>&2
  186. - exec 4>/dev/null
  187. - fi
  188. +export BUILD_INDENT_SIZE=4
  189. +SILENT_OUT=3
  190. +VERBOSE_OUT=4
  191. +
  192. +if [ "$VERBOSE" = yes ]; then
  193. + exec 3>&1
  194. + exec 4>&1
  195. +else
  196. + exec 3>&2
  197. + exec 4>/dev/null
  198. fi
  199.  
  200. unset LD_LIBRARY_PATH
  201. --
  202. 2.14.1
  203.  
  204.  
  205. From 6242ae1933ef29e0d681ce2ad9b685c2868ea519 Mon Sep 17 00:00:00 2001
  206. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  207. Date: Sat, 5 Jan 2019 02:37:33 +0000
  208. Subject: [PATCH 06/16] build system: add parallel build support
  209.  
  210. ---
  211. config/multithread | 119 ++++++++
  212. packages/devel/parallel/package.mk | 11 +
  213. scripts/build | 30 +-
  214. scripts/genpkglist.py | 287 +++++++++++++++++++
  215. scripts/image_mt | 561 +++++++++++++++++++++++++++++++++++++
  216. scripts/install | 9 +-
  217. scripts/unpack | 25 +-
  218. 7 files changed, 1021 insertions(+), 21 deletions(-)
  219. create mode 100644 config/multithread
  220. create mode 100644 packages/devel/parallel/package.mk
  221. create mode 100755 scripts/genpkglist.py
  222. create mode 100755 scripts/image_mt
  223.  
  224. diff --git a/config/multithread b/config/multithread
  225. new file mode 100644
  226. index 0000000..ed809d3
  227. --- /dev/null
  228. +++ b/config/multithread
  229. @@ -0,0 +1,119 @@
  230. +# SPDX-License-Identifier: GPL-2.0-or-later
  231. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  232. +
  233. +THREADCOUNT=${THREADCOUNT:-100%}
  234. +
  235. +BUILD_STEPS=()
  236. +
  237. +add_pkg_step() {
  238. + BUILD_STEPS+=( $1/$2 )
  239. +}
  240. +
  241. +get_pkg_steps() {
  242. + local filter="$1"
  243. + local step package
  244. + local steps=()
  245. +
  246. + for step in "${BUILD_STEPS[@]}"; do
  247. + [[ ${step} =~ ^${filter}/ ]] && steps+=( "${step#*/}" )
  248. + done
  249. + echo "${steps[@]}"
  250. +}
  251. +
  252. +# This function is passed a list of package.mk paths to be processed.
  253. +# Each package.mk is sourced with relevant variables output in JSON format.
  254. +json_worker() {
  255. + local packages="$@"
  256. + local pkgpath hierarchy
  257. +
  258. + exit() { :; }
  259. +
  260. + . config/options ""
  261. +
  262. + for pkgpath in ${packages}; do
  263. + pkgpath="${pkgpath%%@*}"
  264. + source_package "${pkgpath}/package.mk" &>/dev/null
  265. + [[ ${pkgpath} =~ ^${ROOT}/${PACKAGES}/ ]] && hierarchy="global" || hierarchy="local"
  266. +
  267. + if [ -n "$PKG_ARCH" ]; then
  268. + listcontains "$PKG_ARCH" "!$TARGET_ARCH" && continue
  269. + listcontains "$PKG_ARCH" "$TARGET_ARCH" || listcontains "$PKG_ARCH" "any" || continue
  270. + fi
  271. +
  272. + cat <<EOF
  273. + {
  274. + "name": "${PKG_NAME}",
  275. + "hierarchy": "${hierarchy}",
  276. + "bootstrap": "${PKG_DEPENDS_BOOTSTRAP}",
  277. + "init": "${PKG_DEPENDS_INIT}",
  278. + "host": "${PKG_DEPENDS_HOST}",
  279. + "target": "${PKG_DEPENDS_TARGET}"
  280. + },
  281. +EOF
  282. + done
  283. +}
  284. +export -f json_worker
  285. +
  286. +# This function is passed the build instruction for a single job.
  287. +# The function will run either "build <package>" or "install <package>".
  288. +# ${slot} is the job slot number, ie. 1-8 when THREADCOUNT=8.
  289. +# ${job} is the sequence within the total number of ${jobs}.
  290. +package_worker() {
  291. + local slot=$1 job=$2 jobs=$3 args="$4"
  292. + local task pkgname result status
  293. +
  294. + echo "${job} ${args}" >>${THREAD_CONTROL}/steps
  295. +
  296. + read -r task pkgname <<<$(echo "${args}")
  297. +
  298. + MTJOBID=${slot} MTMAXJOBS=${jobs} $SCRIPTS/${task} ${pkgname} 2>&1
  299. +
  300. + result=$?
  301. +
  302. + [ ${result} -eq 0 ] && status="DONE" || status="FAIL"
  303. +
  304. + (
  305. + flock --exclusive 99
  306. + num=$(($(cat "${THREAD_CONTROL}/progress") + 1))
  307. + echo "${num}" >"${THREAD_CONTROL}/progress"
  308. + printf "[%0*d/%0*d] [%-4s] %-7s %s\n" ${#jobs} ${num} ${#jobs} ${jobs} "${status}" "${task}" "${pkgname}" >&2
  309. + ) 99<"${THREAD_CONTROL}/progress"
  310. +
  311. + if [ ${result} -ne 0 -a -d "${THREAD_CONTROL}/logs" ]; then
  312. + (
  313. + . config/options ""
  314. + cat >&2 <<EOF
  315. +$(print_color CLR_ERROR "FAILURE: $SCRIPTS/${task} ${pkgname} has failed!\n")
  316. +The following logs for this failure are available:
  317. + stdout: ${THREAD_CONTROL}/logs/${job}/stdout
  318. + stderr: ${THREAD_CONTROL}/logs/${job}/stderr
  319. +EOF
  320. + )
  321. + fi
  322. +
  323. + return ${result}
  324. +}
  325. +export -f package_worker
  326. +
  327. +start_multithread_build() {
  328. + local logbuffer
  329. +
  330. + # init thread control folder
  331. + rm -fr "${THREAD_CONTROL}"
  332. + mkdir -p "${THREAD_CONTROL}"
  333. + echo 0 >"${THREAD_CONTROL}/progress"
  334. +
  335. + [ "${THREADCOUNT}" = "0" ] && THREADCOUNT=1
  336. + if [ "${THREADCOUNT}" = "1" -a "${ONELOG,,}" != "no" ] || [ "${ONELOG,,}" = "yes" ]; then
  337. + logbuffer="--ungroup"
  338. + else
  339. + mkdir -p "${THREAD_CONTROL}/logs"
  340. + logbuffer="--group --results ${THREAD_CONTROL}/logs/{#}/"
  341. + fi
  342. +
  343. + cat ${_CACHE_PACKAGE_GLOBAL} ${_CACHE_PACKAGE_LOCAL} | \
  344. + ${TOOLCHAIN}/bin/parallel --plain --no-notice --max-procs ${THREADCOUNT} --max-args 30 json_worker | \
  345. + ${SCRIPTS}/genpkglist.py "$(get_pkg_steps build)" "$(get_pkg_steps install)" | \
  346. + SCRIPTS="${SCRIPTS}" THREAD_CONTROL="${THREAD_CONTROL}" ${TOOLCHAIN}/bin/parallel \
  347. + --plain --no-notice --max-procs ${THREADCOUNT} ${logbuffer} --halt now,fail=1 --plus package_worker {%} {#} {##} {}
  348. +}
  349. diff --git a/packages/devel/parallel/package.mk b/packages/devel/parallel/package.mk
  350. new file mode 100644
  351. index 0000000..99e28ea
  352. --- /dev/null
  353. +++ b/packages/devel/parallel/package.mk
  354. @@ -0,0 +1,11 @@
  355. +# SPDX-License-Identifier: GPL-2.0-or-later
  356. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  357. +
  358. +PKG_NAME="parallel"
  359. +PKG_VERSION="20181222"
  360. +PKG_SHA256="058c9f7cf599652aef5b54cf5c95c9a5b6d57d59ce4deebebf7938f7be4da369"
  361. +PKG_LICENSE="GPLv3"
  362. +PKG_SITE="https://www.gnu.org/software/parallel/"
  363. +PKG_URL="http://ftpmirror.gnu.org/parallel/$PKG_NAME-$PKG_VERSION.tar.bz2"
  364. +PKG_DEPENDS_HOST=""
  365. +PKG_LONGDESC="GNU parallel is a shell tool for executing jobs in parallel using one or more computers."
  366. diff --git a/scripts/build b/scripts/build
  367. index 9032474..46a3927 100755
  368. --- a/scripts/build
  369. +++ b/scripts/build
  370. @@ -32,11 +32,14 @@ if [ "${1//:/}" != "${1}" ]; then
  371. PACKAGE_NAME="${1%:*}"
  372. TARGET="${1#*:}"
  373. else
  374. - PACKAGE_NAME=$1
  375. + PACKAGE_NAME="${1}"
  376. TARGET=
  377. fi
  378. TARGET="${TARGET:-target}"
  379.  
  380. +# virtual packages are not built, so no need to lock
  381. +[ "$PKG_SECTION" != "virtual" ] && pkg_lock "${PACKAGE_NAME}:${TARGET}" build
  382. +
  383. mkdir -p $STAMPS/$PACKAGE_NAME
  384. STAMP=$STAMPS/$PACKAGE_NAME/build_$TARGET
  385. if [ -f $STAMP ]; then
  386. @@ -46,10 +49,11 @@ if [ -f $STAMP ]; then
  387. rm -f $STAMP
  388. elif [ ! "$BUILD_WITH_DEBUG" = "$STAMP_BUILD_WITH_DEBUG" ]; then
  389. rm -f $STAMP
  390. - elif [ "$1" = "u-boot" -a ! "$UBOOT_SYSTEM" = "$STAMP_UBOOT_SYSTEM" ]; then
  391. + elif [ "${PKG_NAME}" = "u-boot" -a ! "$UBOOT_SYSTEM" = "$STAMP_UBOOT_SYSTEM" ]; then
  392. rm -f $STAMP
  393. else
  394. # stamp matched: already built, do nothing
  395. + [ "$PKG_SECTION" != "virtual" ] && pkg_lock_msg "${PKG_NAME}:${TARGET}" "build" "UNLOCK" "already built"
  396. exit 0
  397. fi
  398. fi
  399. @@ -68,13 +72,6 @@ for p in $_pkg_depends; do
  400. $SCRIPTS/build $p
  401. done
  402.  
  403. -# build this package
  404. -if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then
  405. - build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})") [DEBUG]" "indent"
  406. -else
  407. - build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})")" "indent"
  408. -fi
  409. -
  410. # virtual packages are not built as they only contain dependencies, so dont go further here
  411. if [ "$PKG_SECTION" = "virtual" ]; then
  412. PKG_DEEPHASH=$(calculate_stamp)
  413. @@ -85,6 +82,15 @@ if [ "$PKG_SECTION" = "virtual" ]; then
  414. exit 0
  415. fi
  416.  
  417. +# build this package
  418. +if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then
  419. + build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})") [DEBUG]" "indent"
  420. +else
  421. + build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})")" "indent"
  422. +fi
  423. +
  424. +pkg_lock_msg "${PKG_NAME}:${TARGET}" "build" "RUNNING"
  425. +
  426. setup_toolchain $TARGET
  427.  
  428. # configure install directory
  429. @@ -224,7 +230,7 @@ if [ -f "$PKG_CONFIGURE_SCRIPT" -o -f "$PKG_CMAKE_SCRIPT" -o -f "$PKG_MESON_SCRI
  430. mkdir -p "$PKG_REAL_BUILD"
  431. cd "$PKG_REAL_BUILD"
  432.  
  433. - MESON_CONF="$PKG_REAL_BUILD/meson.conf"
  434. + MESON_CONF="$PKG_REAL_BUILD/${TARGET}.meson.conf"
  435. fi
  436.  
  437. # configure
  438. @@ -449,6 +455,8 @@ PKG_DEEPHASH=$(calculate_stamp)
  439. for i in PKG_NAME PKG_DEEPHASH BUILD_WITH_DEBUG; do
  440. echo "STAMP_$i=\"${!i}\"" >> $STAMP
  441. done
  442. -if [ "$1" = "u-boot" ]; then
  443. +if [ "${PKG_NAME}" = "u-boot" ]; then
  444. echo "STAMP_UBOOT_SYSTEM=\"${UBOOT_SYSTEM}\"" >> $STAMP
  445. fi
  446. +
  447. +pkg_lock_msg "${PACKAGE_NAME}:${TARGET}" "build" "UNLOCK" "built"
  448. diff --git a/scripts/genpkglist.py b/scripts/genpkglist.py
  449. new file mode 100755
  450. index 0000000..e74c222
  451. --- /dev/null
  452. +++ b/scripts/genpkglist.py
  453. @@ -0,0 +1,287 @@
  454. +#!/usr/bin/env python
  455. +# -*- coding: utf-8 -*-
  456. +
  457. +# SPDX-License-Identifier: GPL-2.0-or-later
  458. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  459. +
  460. +from __future__ import print_function
  461. +import sys, os, codecs, json, argparse, re
  462. +
  463. +class LibreELEC_Package:
  464. + def __init__(self, name):
  465. + self.name = name
  466. + self.deps = {"bootstrap": [],
  467. + "init": [],
  468. + "host": [],
  469. + "target": []}
  470. + self.wants = []
  471. + self.wantedby = []
  472. +
  473. + def __repr__(self):
  474. + s = "%-9s: %s" % ("name", self.name)
  475. +
  476. + for t in self.deps:
  477. + s = "%s\n%-9s: %s" % (s, t, self.deps[t])
  478. +
  479. + s = "%s\n%-9s: %s" % (s, "NEEDS", self.wants)
  480. + s = "%s\n%-9s: %s" % (s, "WANTED BY", self.wantedby)
  481. +
  482. + return s
  483. +
  484. + def addDependencies(self, target, packages):
  485. + for d in " ".join(packages.split()).split():
  486. + self.deps[target].append(d)
  487. + name = d.split(":")[0]
  488. + if name not in self.wants and name != self.name:
  489. + self.wants.append(name)
  490. +
  491. + def delDependency(self, target, package):
  492. + if package in self.deps[target]:
  493. + self.deps[target].remove(package)
  494. + name = package.split(":")[0]
  495. + if name in self.wants:
  496. + self.wants.remove(name)
  497. +
  498. + def addReference(self, package):
  499. + name = package.split(":")[0]
  500. + if name not in self.wantedby:
  501. + self.wantedby.append(name)
  502. +
  503. + def delReference(self, package):
  504. + name = package.split(":")[0]
  505. + if name in self.wantedby:
  506. + self.wantedby.remove(name)
  507. +
  508. + def isReferenced(self):
  509. + return False if self.wants == [] else True
  510. +
  511. + def isWanted(self):
  512. + return False if self.wantedby == [] else True
  513. +
  514. + def references(self, package):
  515. + return package in self.wants
  516. +
  517. +# Reference material:
  518. +# https://www.electricmonk.nl/docs/dependency_resolving_algorithm/dependency_resolving_algorithm.html
  519. +class Node:
  520. + def __init__(self, name, target):
  521. + self.name = name
  522. + self.target = target
  523. + self.fqname = "%s:%s" % (name, target)
  524. + self.edges = []
  525. +
  526. + def __repr__(self):
  527. + s = "%-9s: %s" % ("name", self.name)
  528. + s = "%s\n%-9s: %s" % (s, "target", self.target)
  529. + s = "%s\n%-9s: %s" % (s, "fqname", self.fqname)
  530. + s = "%s\n%-9s: %s" % (s, "common", self.commonName())
  531. +
  532. + for e in self.edges:
  533. + s = "%s\n%s" % (s, e)
  534. +
  535. + return s
  536. +
  537. + def commonName(self):
  538. + return self.name if self.target == "target" else "%s:%s" % (self.name, self.target)
  539. +
  540. + def addEdge(self, node):
  541. + self.edges.append(node)
  542. +
  543. +def eprint(*args, **kwargs):
  544. + print(*args, file=sys.stderr, **kwargs)
  545. +
  546. +# Read a JSON list of all possible packages from stdin
  547. +def loadPackages():
  548. + jdata = json.loads("[%s]" % sys.stdin.read().replace('\n','')[:-1])
  549. +
  550. + map = {}
  551. +
  552. + # Load "global" packages first
  553. + for pkg in jdata:
  554. + if pkg["hierarchy"] == "global":
  555. + map[pkg["name"]] = initPackage(pkg)
  556. +
  557. + # Then the "local" packages, as these will replace any matching "global" packages
  558. + for pkg in jdata:
  559. + if pkg["hierarchy"] == "local":
  560. + map[pkg["name"]] = initPackage(pkg)
  561. +
  562. + return map
  563. +
  564. +# Create a fully formed LibreELEC_Package object
  565. +def initPackage(package):
  566. + pkg = LibreELEC_Package(package["name"])
  567. +
  568. + for t in ["bootstrap", "init", "host", "target"]:
  569. + pkg.addDependencies(t, package[t])
  570. +
  571. + return pkg
  572. +
  573. +# Split name:target into components
  574. +def split_package(name):
  575. + parts = name.split(":")
  576. + pn = parts[0]
  577. + pt = parts[1] if len(parts) != 1 else "target"
  578. + return (pn, pt)
  579. +
  580. +# Resolve dependencies for a node
  581. +def dep_resolve(node, resolved, unresolved):
  582. + unresolved.append(node)
  583. + for edge in node.edges:
  584. + if edge not in resolved:
  585. + if edge in unresolved:
  586. + raise Exception('Circular reference detected: %s -> %s\nRemove %s from %s package.mk::PKG_DEPENDS_%s' % \
  587. + (node.fqname, edge.commonName(), edge.commonName(), node.name, node.target.upper()))
  588. + dep_resolve(edge, resolved, unresolved)
  589. + if node not in resolved:
  590. + resolved.append(node)
  591. + unresolved.remove(node)
  592. +
  593. +# Return a list of build steps for the trigger packages
  594. +def get_build_steps(nodes, trigger_pkgs, built_pkgs):
  595. + for pkg in trigger_pkgs:
  596. + if pkg.find(":") == -1:
  597. + pkg = "%s:target" % pkg
  598. +
  599. + resolved = []
  600. + unresolved = []
  601. +
  602. + if pkg not in nodes:
  603. + raise Exception("Not a valid package: %s" % pkg)
  604. +
  605. + dep_resolve(nodes[pkg], resolved, unresolved)
  606. +
  607. + # Abort if any references remain unresolved
  608. + if unresolved != []:
  609. + eprint("The following dependencies have not been resolved:")
  610. + for dep in unresolved:
  611. + eprint(" %s" % dep)
  612. + raise("Unresolved references")
  613. +
  614. + # Output list of resolved dependencies
  615. + for pkgname in resolved:
  616. + if pkgname not in built_pkgs:
  617. + built_pkgs.append(pkgname)
  618. + task = "build" if pkgname.fqname.endswith(":host") else "install"
  619. + yield("%s %s" % (task, pkgname.fqname))
  620. +
  621. +# Reduce the complete list of packages to a map of those packages that will
  622. +# be needed for the build.
  623. +def processPackages(packages, build, install):
  624. +
  625. + # Add dummy "image" package to ensure build/install dependencies are not culled
  626. + pkg = {
  627. + "name": "image",
  628. + "hierarchy": "global",
  629. + "bootstrap": "",
  630. + "init": "",
  631. + "host": " ".join(build),
  632. + "target": "toolchain %s" % " ".join(install)
  633. + }
  634. + packages[pkg["name"]] = initPackage(pkg)
  635. +
  636. + # Resolve reverse references that we can use to ignore unreferenced packages
  637. + for pkgname in packages:
  638. + for opkgname in packages:
  639. + opkg = packages[opkgname]
  640. + if opkg.references(pkgname):
  641. + if pkgname in packages:
  642. + packages[pkgname].addReference(opkgname)
  643. +
  644. + # Identify unused packages
  645. + while True:
  646. + changed = False
  647. + for pkgname in packages:
  648. + pkg = packages[pkgname]
  649. + if pkg.isWanted():
  650. + for opkgname in pkg.wantedby:
  651. + if opkgname != "image":
  652. + if not packages[opkgname].isWanted():
  653. + pkg.delReference(opkgname)
  654. + changed = True
  655. + if not changed:
  656. + break
  657. +
  658. + # Create a new map of "needed" packages
  659. + needed_map = {}
  660. + for pkgname in packages:
  661. + pkg = packages[pkgname]
  662. + if pkg.isWanted():
  663. + needed_map[pkgname] = pkg
  664. +
  665. + # Validate package dependency references
  666. + for pkgname in needed_map:
  667. + pkg = needed_map[pkgname]
  668. + for t in pkg.deps:
  669. + for d in pkg.deps[t]:
  670. + if split_package(d)[0] not in needed_map:
  671. + raise Exception('Invalid package reference: dependency %s in package %s::PKG_DEPENDS_%s is not valid' % (d, pkgname, t.upper()))
  672. +
  673. + node_map = {}
  674. +
  675. + # Convert all packages to target-specific nodes
  676. + for pkgname in needed_map:
  677. + pkg = needed_map[pkgname]
  678. + for target in pkg.deps:
  679. + if pkg.deps[target]:
  680. + node = Node(pkgname, target)
  681. + node_map[node.fqname] = node
  682. +
  683. + # Ensure all referenced dependencies exist as a basic node
  684. + for pkgname in needed_map:
  685. + pkg = needed_map[pkgname]
  686. + for target in pkg.deps:
  687. + for dep in pkg.deps[target]:
  688. + dfq = dep if dep.find(":") != -1 else "%s:target" % dep
  689. + if dfq not in node_map:
  690. + node_map[dfq] = Node(split_package(dfq)[0], split_package(dfq)[1])
  691. +
  692. + # To each target-specific node, add the correspnding
  693. + # target-specific dependency nodes ("edges")
  694. + for name in node_map:
  695. + node = node_map[name]
  696. + if node.name not in needed_map:
  697. + raise Exception("Invalid package, package name cannot found: %s" % node.name)
  698. + for dep in needed_map[node.name].deps[node.target]:
  699. + dfq = dep if dep.find(":") != -1 else "%s:target" % dep
  700. + node.addEdge(node_map[dfq])
  701. +
  702. + return node_map
  703. +
  704. +#---------------------------------------------
  705. +
  706. +if len(sys.argv) == 2:
  707. + BUILD_PKGS = sys.argv[1].split(" ")
  708. + INSTALL_PKGS = BUILD_PKGS
  709. +elif len(sys.argv) == 3:
  710. + BUILD_PKGS = sys.argv[1].split(" ")
  711. + if sys.argv[2]:
  712. + INSTALL_PKGS = sys.argv[2].split(" ")
  713. + else:
  714. + INSTALL_PKGS = BUILD_PKGS
  715. +else:
  716. + eprint('ERROR: usage %s "<build pkgs>" ["<install pkgs>"]', sys.argv[0])
  717. + sys.exit(1)
  718. +
  719. +ALL_PACKAGES = loadPackages()
  720. +
  721. +loaded = len(ALL_PACKAGES)
  722. +
  723. +REQUIRED_PKGS = processPackages(ALL_PACKAGES, BUILD_PKGS, INSTALL_PKGS)
  724. +
  725. +# Output list of packages to build/install
  726. +built_pkgs = []
  727. +build_step = []
  728. +for step in get_build_steps(REQUIRED_PKGS, BUILD_PKGS, built_pkgs):
  729. + build_step.append(step)
  730. +for step in get_build_steps(REQUIRED_PKGS, INSTALL_PKGS, built_pkgs):
  731. + build_step.append(step)
  732. +
  733. +eprint("Packages loaded : %d" % loaded)
  734. +eprint("Build triggers : %2d [%s]" % (len(BUILD_PKGS), " ".join(BUILD_PKGS)))
  735. +eprint("Install triggers : %2d [%s]" % (len(INSTALL_PKGS), " ".join(INSTALL_PKGS)))
  736. +eprint("Packages to build : %d" % len(build_step))
  737. +eprint("")
  738. +
  739. +for step in build_step:
  740. + print(step)
  741. diff --git a/scripts/image_mt b/scripts/image_mt
  742. new file mode 100755
  743. index 0000000..f0a0b9c
  744. --- /dev/null
  745. +++ b/scripts/image_mt
  746. @@ -0,0 +1,561 @@
  747. +#!/bin/bash
  748. +
  749. +# SPDX-License-Identifier: GPL-2.0-or-later
  750. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  751. +
  752. +unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACKAGE_LIST
  753. +
  754. +. config/options ""
  755. +. config/multithread
  756. +. config/show_config
  757. +
  758. +show_config
  759. +save_build_config
  760. +
  761. +# Setup both toolchain cmake configs to avoid potentially racy behaviour later,
  762. +# using a fork as we don't want the exports at this stage.
  763. +for t in host target; do
  764. + ( setup_toolchain ${t} )
  765. +done
  766. +
  767. +if [ -n "$CUSTOM_GIT_HASH" ]; then
  768. + GIT_HASH="$CUSTOM_GIT_HASH"
  769. +else
  770. + GIT_HASH=$(git rev-parse HEAD)
  771. +fi
  772. +
  773. +if [ "$LIBREELEC_VERSION" = "devel" ]; then
  774. + GIT_ABBREV=${GIT_HASH:0:7}
  775. + DEVEL_VERSION=$LIBREELEC_VERSION
  776. + case "$BUILD_PERIODIC" in
  777. + nightly) LIBREELEC_VERSION=nightly-$(date +%Y%m%d)-$GIT_ABBREV;;
  778. + daily) LIBREELEC_VERSION=daily-$(date +%Y%j)-$GIT_ABBREV;;
  779. + weekly) LIBREELEC_VERSION=weekly-$(date +%G%V)-$GIT_ABBREV;;
  780. + monthly) LIBREELEC_VERSION=monthly-$(date +%Y%m)-$GIT_ABBREV;;
  781. + *) LIBREELEC_VERSION=devel-$(date +%Y%m%d%H%M%S)-$GIT_ABBREV;;
  782. + esac
  783. +fi
  784. +
  785. +# Get origin url, fix git:// and git@github.com: urls if necessary
  786. +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/#')"
  787. +
  788. +[ "${BUILDER_NAME,,}" = "official" ] && BUILDER_NAME=
  789. +if [ "$OFFICIAL" = "yes" ]; then
  790. + LIBREELEC_BUILD="official"
  791. +else
  792. + if [ -n "$BUILDER_NAME" ]; then
  793. + LIBREELEC_BUILD="$BUILDER_NAME"
  794. + else
  795. + LIBREELEC_BUILD="community"
  796. + fi
  797. +fi
  798. +
  799. +if [ -n "$CUSTOM_VERSION" ]; then
  800. + LIBREELEC_VERSION="$CUSTOM_VERSION"
  801. +fi
  802. +
  803. +LIBREELEC_ARCH="${DEVICE:-$PROJECT}.$TARGET_ARCH"
  804. +TARGET_VERSION="$LIBREELEC_ARCH-$LIBREELEC_VERSION"
  805. +
  806. +if [ -n "$CUSTOM_IMAGE_NAME" ]; then
  807. + IMAGE_NAME="$CUSTOM_IMAGE_NAME"
  808. +else
  809. + if [ "$DEVEL_VERSION" = "devel" ]; then
  810. + IMAGE_NAME="$DISTRONAME-$LIBREELEC_ARCH-$OS_VERSION-$LIBREELEC_VERSION"
  811. + else
  812. + IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
  813. + fi
  814. +
  815. + if [ -n "$UBOOT_SYSTEM" ] && [ "$UBOOT_SYSTEM" != "${DEVICE:-$PROJECT}" ]; then
  816. + IMAGE_NAME="$IMAGE_NAME-$UBOOT_SYSTEM"
  817. + fi
  818. +fi
  819. +
  820. +if [ -n "$IMAGE_SUFFIX" ]; then
  821. + IMAGE_NAME="$IMAGE_NAME-$IMAGE_SUFFIX"
  822. +fi
  823. +
  824. +echo "$IMAGE_NAME" > $BUILD/BUILD_FILENAME
  825. +
  826. +# setup fakeroot
  827. +rm -rf $FAKEROOT_SCRIPT # remove $FAKEROOT_SCRIPT if it exist
  828. +touch $FAKEROOT_SCRIPT # create an empty $FAKEROOT_SCRIPT
  829. +chmod +x $FAKEROOT_SCRIPT # make $FAKEROOT_SCRIPT executable
  830. +echo "chown -R 0:0 $INSTALL" >> $FAKEROOT_SCRIPT
  831. +
  832. +# clean old install dirs
  833. +rm -rf $INSTALL
  834. +rm -rf $STAMPS_INSTALL
  835. +mkdir -p $INSTALL
  836. +
  837. +# create baselayout
  838. +for directory in etc dev proc run sys tmp usr var flash storage; do
  839. + mkdir -p $INSTALL/$directory
  840. +done
  841. +ln -sf /var/media $INSTALL/media
  842. +ln -sf /usr/lib $INSTALL/lib
  843. +ln -sf /usr/bin $INSTALL/bin
  844. +ln -sf /usr/sbin $INSTALL/sbin
  845. +
  846. +if [ "$TARGET_ARCH" = "x86_64" ]; then
  847. + ln -s /usr/lib $INSTALL/lib64
  848. + ln -s /usr/lib $INSTALL/usr/lib64
  849. +fi
  850. +
  851. +echo "$TARGET_VERSION" > $INSTALL/etc/release
  852. +
  853. +# create /etc/os-release
  854. +echo -e "NAME=\"$DISTRONAME\"" > $INSTALL/etc/os-release
  855. +echo -e "VERSION=\"$LIBREELEC_VERSION\"" >> $INSTALL/etc/os-release
  856. +echo -e "ID=\"libreelec\"" >> $INSTALL/etc/os-release
  857. +echo -e "VERSION_ID=\"$OS_VERSION\"" >> $INSTALL/etc/os-release
  858. +echo -e "PRETTY_NAME=\"$DISTRONAME ($LIBREELEC_BUILD): $LIBREELEC_VERSION\"" >> $INSTALL/etc/os-release
  859. +echo -e "HOME_URL=\"https://libreelec.tv\"" >> $INSTALL/etc/os-release
  860. +echo -e "BUG_REPORT_URL=\"$ORIGIN_URL\"" >> $INSTALL/etc/os-release
  861. +echo -e "BUILD_ID=\"$GIT_HASH\"" >> $INSTALL/etc/os-release
  862. +echo -e "OPENELEC_ARCH=\"$LIBREELEC_ARCH\"" >> $INSTALL/etc/os-release
  863. +echo -e "LIBREELEC_ARCH=\"$LIBREELEC_ARCH\"" >> $INSTALL/etc/os-release
  864. +echo -e "LIBREELEC_BUILD=\"$LIBREELEC_BUILD\"" >> $INSTALL/etc/os-release
  865. +echo -e "LIBREELEC_PROJECT=\"$PROJECT\"" >> $INSTALL/etc/os-release
  866. +[ -n "$DEVICE" ] && echo -e "LIBREELEC_DEVICE=\"$DEVICE\"" >> $INSTALL/etc/os-release
  867. +[ -n "$BUILDER_NAME" ] && echo -e "BUILDER_NAME=\"$BUILDER_NAME\"" >> $INSTALL/etc/os-release
  868. +[ -n "$BUILDER_VERSION" ] && echo -e "BUILDER_VERSION=\"$BUILDER_VERSION\"" >> $INSTALL/etc/os-release
  869. +
  870. +# create /etc/issue
  871. +echo "$GREETING0" > $INSTALL/etc/issue
  872. +echo "$GREETING1" >> $INSTALL/etc/issue
  873. +echo "$GREETING2" >> $INSTALL/etc/issue
  874. +echo "$GREETING3" >> $INSTALL/etc/issue
  875. +echo "$GREETING4" >> $INSTALL/etc/issue
  876. +echo "$DISTRONAME ($LIBREELEC_BUILD): $LIBREELEC_VERSION ($LIBREELEC_ARCH)" >> $INSTALL/etc/issue
  877. +
  878. +ln -sf /etc/issue $INSTALL/etc/motd
  879. +
  880. +#export _CACHED_KERNEL_MODULE_DIR="$(get_module_dir)"
  881. +
  882. +add_pkg_step build toolchain
  883. +add_pkg_step build squashfs:host
  884. +add_pkg_step build dosfstools:host
  885. +add_pkg_step build fakeroot:host
  886. +add_pkg_step build kmod:host
  887. +add_pkg_step build mtools:host
  888. +add_pkg_step build populatefs:host
  889. +
  890. +# populate base system...
  891. +add_pkg_step install libc
  892. +add_pkg_step install gcc
  893. +
  894. +add_pkg_step install linux
  895. +
  896. +add_pkg_step install linux-drivers
  897. +add_pkg_step install linux-firmware
  898. +add_pkg_step install $BOOTLOADER
  899. +add_pkg_step install busybox
  900. +add_pkg_step install util-linux
  901. +add_pkg_step install corefonts
  902. +add_pkg_step install network
  903. +
  904. +# Graphic support
  905. +[ ! "$DISPLAYSERVER" = "no" ] && add_pkg_step install $DISPLAYSERVER
  906. +
  907. +# Multimedia support
  908. +[ ! "$MEDIACENTER" = "no" ] && add_pkg_step install mediacenter
  909. +
  910. +# Sound support
  911. +[ "$ALSA_SUPPORT" = "yes" ] && add_pkg_step install alsa
  912. +
  913. +# Automounter support
  914. +[ "$UDEVIL" = "yes" ] && add_pkg_step install udevil
  915. +
  916. +# EXFAT support
  917. +[ "$EXFAT" = "yes" ] && add_pkg_step install fuse-exfat
  918. +
  919. +# NTFS 3G support
  920. +[ "$NTFS3G" = "yes" ] && add_pkg_step install ntfs-3g_ntfsprogs
  921. +
  922. +# Remote support
  923. +[ "$REMOTE_SUPPORT" = "yes" ] && add_pkg_step install remote
  924. +
  925. +# Install miscellaneous packages
  926. +add_pkg_step install misc-packages
  927. +
  928. +# Virtual image creation support
  929. +[ "$PROJECT" = "Generic" ] && add_pkg_step install virtual
  930. +
  931. +# Installer support
  932. +[ "$INSTALLER_SUPPORT" = "yes" ] && add_pkg_step install installer
  933. +
  934. +# Devtools... (not for Release)
  935. +[ "$TESTING" = "yes" ] && add_pkg_step install testing
  936. +
  937. +# Install gdb in all builds, including releases
  938. +add_pkg_step install debug
  939. +
  940. +# OEM packages
  941. +[ "$OEM_SUPPORT" = "yes" ] && add_pkg_step install oem
  942. +
  943. +# Bootstrap the parallel package
  944. +$SCRIPTS/build parallel:host 2>&1
  945. +
  946. +start_multithread_build || die "Parallel build failure - see log for details."
  947. +
  948. +echo "Successful build, creating image..." >&2
  949. +
  950. +# copy PROJECT related files to filesystem
  951. +if [ -d "$PROJECT_DIR/$PROJECT/filesystem" ]; then
  952. + cp -PR $PROJECT_DIR/$PROJECT/filesystem/* $INSTALL
  953. + # install project specific systemd services
  954. + for service in $PROJECT_DIR/$PROJECT/filesystem/usr/lib/systemd/system/*.service; do
  955. + if [ -f "$service" ]; then
  956. + enable_service $(basename $service)
  957. + fi
  958. + done
  959. +fi
  960. +
  961. +# copy DEVICE related files to filesystem
  962. +if [ -n "$DEVICE" -a -d "$PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem" ]; then
  963. + cp -PR $PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem/* $INSTALL
  964. + # install device specific systemd services
  965. + for service in $PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem/usr/lib/systemd/system/*.service; do
  966. + if [ -f "$service" ]; then
  967. + enable_service $(basename $service)
  968. + fi
  969. + done
  970. +fi
  971. +
  972. +# run depmod for base overlay modules
  973. +MODVER=$(basename $(ls -d $INSTALL/usr/lib/kernel-overlays/base/lib/modules/*))
  974. +find $INSTALL/usr/lib/kernel-overlays/base/lib/modules/$MODVER/ -name *.ko | \
  975. + sed -e "s,$INSTALL/usr/lib/kernel-overlays/base/lib/modules/$MODVER/,," \
  976. + > $INSTALL/usr/lib/kernel-overlays/base/lib/modules/$MODVER/modules.order
  977. +$TOOLCHAIN/bin/depmod -b $INSTALL/usr/lib/kernel-overlays/base -a -e -F "$BUILD/linux-$(kernel_version)/System.map" $MODVER 2>&1
  978. +
  979. +# strip kernel modules
  980. +for MOD in $(find $INSTALL/usr/lib/kernel-overlays/ -type f -name *.ko); do
  981. + ${TARGET_KERNEL_PREFIX}strip --strip-debug $MOD
  982. +done
  983. +
  984. +# symlink overlayed modules to /usr/lib/modules
  985. +ln -sT /var/lib/modules $INSTALL/usr/lib/modules
  986. +
  987. +# symlink overlayed firmware to /usr/lib/firmware
  988. +ln -sT /var/lib/firmware $INSTALL/usr/lib/firmware
  989. +
  990. +# make target dir
  991. +mkdir -p $TARGET_IMG
  992. +rm -rf $TARGET_IMG/$IMAGE_NAME.kernel
  993. +
  994. +# copy kernel to target dir
  995. +cp -PR $BUILD/linux-$(kernel_version)/arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET $TARGET_IMG/$IMAGE_NAME.kernel
  996. +chmod 0644 $TARGET_IMG/$IMAGE_NAME.kernel
  997. +
  998. +# Set mksquashfs options for each compression method
  999. +if [ -z "$SQUASHFS_COMPRESSION_OPTION" ]; then
  1000. + if [ "${SQUASHFS_COMPRESSION:-gzip}" = "gzip" ]; then
  1001. + SQUASHFS_COMPRESSION_OPTION="-Xcompression-level 9 -b 262144"
  1002. + elif [ "$SQUASHFS_COMPRESSION" = "lzo" ]; then
  1003. + SQUASHFS_COMPRESSION_OPTION="-Xcompression-level 9 -b 524288"
  1004. + elif [ "$SQUASHFS_COMPRESSION" = "zstd" ]; then
  1005. + SQUASHFS_COMPRESSION_OPTION="-Xcompression-level 22 -b 262144"
  1006. + fi
  1007. +fi
  1008. +
  1009. +# create squashfs file, default to gzip if no compression configured
  1010. +echo "rm -rf \"$TARGET_IMG/$IMAGE_NAME.system\"" >> $FAKEROOT_SCRIPT
  1011. +echo "$TOOLCHAIN/bin/mksquashfs \"$BUILD/image/system\" \"$TARGET_IMG/$IMAGE_NAME.system\" -noappend -comp ${SQUASHFS_COMPRESSION:-gzip} ${SQUASHFS_COMPRESSION_OPTION}" >> $FAKEROOT_SCRIPT
  1012. +
  1013. +# run fakeroot
  1014. +$TOOLCHAIN/bin/fakeroot -- $FAKEROOT_SCRIPT
  1015. +rm -rf $FAKEROOT_SCRIPT
  1016. +
  1017. +# set permissions
  1018. +chmod 0644 $TARGET_IMG/$IMAGE_NAME.system
  1019. +
  1020. +if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]; then
  1021. +
  1022. + RELEASE_DIR="target/$IMAGE_NAME"
  1023. +
  1024. + # cleanup
  1025. + rm -rf $RELEASE_DIR
  1026. +
  1027. + # create release dir
  1028. + mkdir -p $RELEASE_DIR
  1029. +
  1030. + # remove n previous created release image
  1031. + rm -rf $TARGET_IMG/$IMAGE_NAME.img.gz
  1032. +
  1033. + if [ -n "$BOOTLOADER" ]; then
  1034. +
  1035. + BOOTLOADER_DIR="$(get_pkg_directory "$BOOTLOADER")"
  1036. +
  1037. + if [ -d $BOOTLOADER_DIR/files ]; then
  1038. + cp -R $BOOTLOADER_DIR/files/* $RELEASE_DIR
  1039. + fi
  1040. +
  1041. + if find_file_path bootloader/release $BOOTLOADER_DIR/release; then
  1042. + echo "Running $FOUND_PATH"
  1043. + . $FOUND_PATH
  1044. + fi
  1045. + fi
  1046. +
  1047. + cp $ROOT/README* $RELEASE_DIR
  1048. + cp $ROOT/CHANGELOG* $RELEASE_DIR
  1049. + echo "$TARGET_VERSION" > $RELEASE_DIR/RELEASE
  1050. +
  1051. + if [ ! "$MEDIACENTER" = "no" ]; then
  1052. + echo "Kodi commit: $(get_pkg_version $MEDIACENTER)" >> $RELEASE_DIR/RELEASE
  1053. + fi
  1054. +
  1055. + mkdir -p $RELEASE_DIR/licenses
  1056. + cp $ROOT/licenses/* $RELEASE_DIR/licenses
  1057. +
  1058. + mkdir -p $RELEASE_DIR/target
  1059. + cp $TARGET_IMG/$IMAGE_NAME.system $RELEASE_DIR/target/SYSTEM
  1060. + cp $TARGET_IMG/$IMAGE_NAME.kernel $RELEASE_DIR/target/KERNEL
  1061. +
  1062. + # create md5sum's
  1063. + ( cd $RELEASE_DIR;
  1064. + md5sum -t target/SYSTEM > target/SYSTEM.md5;
  1065. + md5sum -t target/KERNEL > target/KERNEL.md5;
  1066. + )
  1067. +
  1068. + # create target directory
  1069. + mkdir -p $TARGET_IMG
  1070. +
  1071. + # remove an previous created release tarball
  1072. + rm -rf $TARGET_IMG/$IMAGE_NAME.tar
  1073. +
  1074. + # create release tarball
  1075. + tar cf $TARGET_IMG/$IMAGE_NAME.tar -C target $IMAGE_NAME
  1076. +
  1077. + # create sha256 checksum of tarball
  1078. + ( cd $TARGET_IMG
  1079. + sha256sum ${IMAGE_NAME}.tar > ${IMAGE_NAME}.tar.sha256
  1080. + )
  1081. +
  1082. + # create image files if requested
  1083. + if [[ ( "$1" = "amlpkg" || "$1" = "noobs" || "$1" = "mkimage" ) && -n "$BOOTLOADER" ]]; then
  1084. + # INSTALL_SRC_DIR can be board specific
  1085. + if [ -n "$DEVICE" -a -d "$PROJECT_DIR/$PROJECT/devices/$DEVICE/install" ]; then
  1086. + INSTALL_SRC_DIR="$PROJECT_DIR/$PROJECT/devices/$DEVICE/install"
  1087. + else
  1088. + INSTALL_SRC_DIR="$PROJECT_DIR/$PROJECT/install"
  1089. + fi
  1090. +
  1091. + # variables used in image script must be passed
  1092. + env \
  1093. + PATH="$PATH:/sbin" \
  1094. + ROOT="$ROOT" \
  1095. + SCRIPTS="$SCRIPTS" \
  1096. + TOOLCHAIN="$TOOLCHAIN" \
  1097. + PROJECT_DIR="$PROJECT_DIR" \
  1098. + PROJECT="$PROJECT" \
  1099. + DEVICE="$DEVICE" \
  1100. + DISTRO="$DISTRO" \
  1101. + TARGET_IMG="$TARGET_IMG" \
  1102. + IMAGE_NAME="$IMAGE_NAME" \
  1103. + INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
  1104. + BOOTLOADER="$BOOTLOADER" \
  1105. + KERNEL_NAME="$KERNEL_NAME" \
  1106. + TARGET_KERNEL_ARCH="$TARGET_KERNEL_ARCH" \
  1107. + RELEASE_DIR=$RELEASE_DIR \
  1108. + UUID_STORAGE="$(uuidgen)" \
  1109. + DISTRO_BOOTLABEL="$DISTRO_BOOTLABEL" \
  1110. + DISTRO_DISKLABEL="$DISTRO_DISKLABEL" \
  1111. + UBOOT_SYSTEM="$UBOOT_SYSTEM" \
  1112. + UBOOT_VERSION="$UBOOT_VERSION" \
  1113. + EXTRA_CMDLINE="$EXTRA_CMDLINE" \
  1114. + SYSTEM_SIZE="$SYSTEM_SIZE" \
  1115. + SYSTEM_PART_START="$SYSTEM_PART_START" \
  1116. + $SCRIPTS/mkimage
  1117. + fi
  1118. +
  1119. + # cleanup release dir
  1120. + rm -rf $RELEASE_DIR
  1121. +
  1122. + # create WeTek Play (Amlogic) ZIP update and auto-install packages if requested
  1123. + if [ "$1" = "amlpkg" ]; then
  1124. + echo "Creating Amlogic ZIP update package"
  1125. +
  1126. + AML_PKG_DIR="$RELEASE_DIR/ampl-pkg"
  1127. +
  1128. + # create package directory
  1129. + mkdir -p "$AML_PKG_DIR"
  1130. +
  1131. + # copy system and kernel images
  1132. + mkdir -p "$AML_PKG_DIR/system"
  1133. + cp $TARGET_IMG/$IMAGE_NAME.system $AML_PKG_DIR/system/SYSTEM
  1134. + cp $TARGET_IMG/$IMAGE_NAME.kernel $AML_PKG_DIR/KERNEL
  1135. +
  1136. + # copy update-binary and updater-script
  1137. + META_INF_DIR="$AML_PKG_DIR/META-INF/com/google/android"
  1138. + mkdir -p "$META_INF_DIR"
  1139. + cp $INSTALL_SRC_DIR/update-binary $META_INF_DIR
  1140. + cp $INSTALL_SRC_DIR/updater-script $META_INF_DIR
  1141. +
  1142. + # copy other files if any
  1143. + if [ -d "$INSTALL_SRC_DIR/files" ]; then
  1144. + cp -PR $INSTALL_SRC_DIR/files/* $AML_PKG_DIR
  1145. + fi
  1146. +
  1147. + # copy device tree image if any
  1148. + if [ -f "$INSTALL/usr/share/bootloader/dtb.img" ]; then
  1149. + cp "$INSTALL/usr/share/bootloader/dtb.img" $AML_PKG_DIR/dtb.img
  1150. + fi
  1151. +
  1152. + # create the update package
  1153. + pushd "$AML_PKG_DIR" > /dev/null
  1154. + zip -rq update.zip *
  1155. +
  1156. + # sign the update package
  1157. + echo "Signing the update package"
  1158. + mkdir -p sign
  1159. + SIGNAPK_DIR="$ROOT/tools/signapk"
  1160. + java -Xmx1024m -jar $SIGNAPK_DIR/signapk.jar -w $SIGNAPK_DIR/testkey.x509.pem $SIGNAPK_DIR/testkey.pk8 update.zip sign/$IMAGE_NAME-update.zip
  1161. +
  1162. + # create the auto-install package
  1163. + echo "Creating Amlogic ZIP auto-install package"
  1164. + pushd sign > /dev/null
  1165. + echo --update_package=/sdcard/$IMAGE_NAME-update.zip > factory_update_param.aml
  1166. + echo --wipe_data >> factory_update_param.aml
  1167. + echo --wipe_cache >> factory_update_param.aml
  1168. + if [ -f "$INSTALL_SRC_DIR/files/recovery.img" ]; then
  1169. + cp $INSTALL_SRC_DIR/files/recovery.img .
  1170. + fi
  1171. +
  1172. + if [ -f $INSTALL_SRC_DIR/files/aml_autoscript ]; then
  1173. + cp $INSTALL_SRC_DIR/files/aml_autoscript .
  1174. + fi
  1175. +
  1176. + # copy device tree image if any
  1177. + if [ -f "$INSTALL/usr/share/bootloader/dtb.img" ]; then
  1178. + cp "$INSTALL/usr/share/bootloader/dtb.img" .
  1179. + fi
  1180. +
  1181. + zip -q $TARGET_IMG/$IMAGE_NAME.zip *
  1182. +
  1183. + # create sha256 checksum of zip
  1184. + ( cd $TARGET_IMG
  1185. + sha256sum ${IMAGE_NAME}.zip > ${IMAGE_NAME}.zip.sha256
  1186. + )
  1187. +
  1188. + popd > /dev/null
  1189. + popd > /dev/null
  1190. +
  1191. + elif [ "$1" = "noobs" ]; then
  1192. + echo "Creating \"$1\" release tarball..."
  1193. +
  1194. + RELEASE_DIR="$TARGET_IMG/${IMAGE_NAME}-$1"
  1195. +
  1196. + # eg. LibreELEC_RPi, LibreELEC_RPi2 etc.
  1197. + NOOBS_DISTRO="${DISTRONAME}_${DEVICE:-$PROJECT}"
  1198. +
  1199. + # create release dir
  1200. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}
  1201. +
  1202. + if [ -f $DISTRO_DIR/$DISTRO/${DISTRONAME}_40x40.png ]; then
  1203. + cp -PR $DISTRO_DIR/$DISTRO/${DISTRONAME}_40x40.png $RELEASE_DIR/${NOOBS_DISTRO}/${NOOBS_DISTRO}.png
  1204. + else
  1205. + cp -PR $DISTRO_DIR/$DISTRO/${DISTRONAME}.png $RELEASE_DIR/${NOOBS_DISTRO}/${NOOBS_DISTRO}.png
  1206. + fi
  1207. + cp -PR $ROOT/config/noobs/os.json $RELEASE_DIR/${NOOBS_DISTRO}
  1208. + cp -PR $ROOT/config/noobs/partition_setup.sh $RELEASE_DIR/${NOOBS_DISTRO}
  1209. + cp -PR $ROOT/config/noobs/partitions.json $RELEASE_DIR/${NOOBS_DISTRO}
  1210. + if [ -d $DISTRO_DIR/$DISTRO/noobs/marketing ]; then
  1211. + tar cf $RELEASE_DIR/${NOOBS_DISTRO}/marketing.tar -C $DISTRO_DIR/$DISTRO/noobs/marketing .
  1212. + else
  1213. + tar cf $RELEASE_DIR/${NOOBS_DISTRO}/marketing.tar -C $ROOT/config/noobs/marketing .
  1214. + fi
  1215. + cp $ROOT/README* $RELEASE_DIR/${NOOBS_DISTRO}
  1216. + cp $ROOT/CHANGELOG $RELEASE_DIR/${NOOBS_DISTRO}/release_notes.txt
  1217. +
  1218. + sed -e "s%@DISTRONAME@%$DISTRONAME%g" \
  1219. + -e "s%@PROJECT@%${DEVICE:-$PROJECT}%g" \
  1220. + -e "s%@LIBREELEC_VERSION@%$LIBREELEC_VERSION%g" \
  1221. + -e "s%@RELEASE_DATE@%$(date +%F)%g" \
  1222. + -e "s%@KERNEL_VERSION@%$(kernel_version)%g" \
  1223. + -e "s%@DESCRIPTION@%$DESCRIPTION%g" \
  1224. + -e "s%@ROOT_PASSWORD@%$ROOT_PASSWORD%g" \
  1225. + -e "s%@NOOBS_SUPPORTED_MODELS@%$NOOBS_SUPPORTED_MODELS%g" \
  1226. + -e "s%@NOOBS_HEX@%$NOOBS_HEX%g" \
  1227. + -i $RELEASE_DIR/${NOOBS_DISTRO}/os.json
  1228. +
  1229. + sed -e "s%@DISTRONAME@%$DISTRONAME%g" \
  1230. + -e "s%@PROJECT@%${DEVICE:-$PROJECT}%g" \
  1231. + -e "s%@SYSTEM_SIZE@%$SYSTEM_SIZE%g" \
  1232. + -i $RELEASE_DIR/${NOOBS_DISTRO}/partitions.json
  1233. +
  1234. + # create System dir
  1235. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}/System
  1236. +
  1237. + BOOTLOADER_DIR="$(get_pkg_directory "$BOOTLOADER")"
  1238. + if [ -d $BOOTLOADER_DIR/files/3rdparty/bootloader/ ]; then
  1239. + cp -PR $BOOTLOADER_DIR/files/3rdparty/bootloader/* $RELEASE_DIR/${NOOBS_DISTRO}/System
  1240. + fi
  1241. +
  1242. + # copy Bootloader
  1243. + cp -PR $BUILD/bcm2835-bootloader-*/LICENCE* $RELEASE_DIR/${NOOBS_DISTRO}/System/
  1244. + cp -PR $BUILD/bcm2835-bootloader-*/bootcode.bin $RELEASE_DIR/${NOOBS_DISTRO}/System/
  1245. + cp -PR $BUILD/bcm2835-bootloader-*/fixup_x.dat $RELEASE_DIR/${NOOBS_DISTRO}/System/fixup.dat
  1246. + cp -PR $BUILD/bcm2835-bootloader-*/start_x.elf $RELEASE_DIR/${NOOBS_DISTRO}/System/start.elf
  1247. + [ -f $BUILD/bcm2835-bootloader-*/dt-blob.bin ] && cp -PR $BUILD/bcm2835-bootloader-*/dt-blob.bin $RELEASE_DIR/${NOOBS_DISTRO}/System/dt-blob.bin
  1248. +
  1249. + # copy system files
  1250. + cp $TARGET_IMG/$IMAGE_NAME.system $RELEASE_DIR/${NOOBS_DISTRO}/System/SYSTEM
  1251. + cp $TARGET_IMG/$IMAGE_NAME.kernel $RELEASE_DIR/${NOOBS_DISTRO}/System/kernel.img
  1252. +
  1253. + for dtb in $INSTALL/usr/share/bootloader/*.dtb; do
  1254. + if [ -f $dtb ]; then
  1255. + cp -PR $dtb $RELEASE_DIR/${NOOBS_DISTRO}/System
  1256. + fi
  1257. + done
  1258. +
  1259. + for overlay in $INSTALL/usr/share/bootloader/overlays/*; do
  1260. + if [ -f $overlay ]; then
  1261. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}/System/overlays
  1262. + cp -PR $overlay $RELEASE_DIR/${NOOBS_DISTRO}/System/overlays
  1263. + fi
  1264. + done
  1265. +
  1266. + # create md5sum's
  1267. + ( cd $RELEASE_DIR/${NOOBS_DISTRO}/System;
  1268. + md5sum -t SYSTEM > SYSTEM.md5;
  1269. + md5sum -t kernel.img > kernel.img.md5;
  1270. + )
  1271. +
  1272. + # copy additional files
  1273. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}/System/licenses
  1274. + cp $ROOT/licenses/* $RELEASE_DIR/${NOOBS_DISTRO}/System/licenses
  1275. +
  1276. + # create Storage dir
  1277. + mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}/Storage
  1278. +
  1279. + # remove any previously created release tarball
  1280. + rm -rf $RELEASE_DIR/${NOOBS_DISTRO}/System.tar.xz
  1281. + rm -rf $RELEASE_DIR/${NOOBS_DISTRO}/Storage.tar.xz
  1282. +
  1283. + # create filesystem tarballs
  1284. + tar cJf $RELEASE_DIR/${NOOBS_DISTRO}/System.tar.xz -C $RELEASE_DIR/${NOOBS_DISTRO}/System/ .
  1285. + tar cJf $RELEASE_DIR/${NOOBS_DISTRO}/Storage.tar.xz -C $RELEASE_DIR/${NOOBS_DISTRO}/Storage/ .
  1286. +
  1287. + # remove filesystem dirs
  1288. + rm -rf $RELEASE_DIR/${NOOBS_DISTRO}/System
  1289. + rm -rf $RELEASE_DIR/${NOOBS_DISTRO}/Storage
  1290. +
  1291. + # remove any previously created release tarball
  1292. + rm -rf $TARGET_IMG/${IMAGE_NAME}-$1.tar
  1293. +
  1294. + # create release tarball
  1295. + tar cf $TARGET_IMG/${IMAGE_NAME}-$1.tar -C $TARGET_IMG ${IMAGE_NAME}-$1
  1296. +
  1297. + # create sha256 checksum of tarball
  1298. + ( cd $TARGET_IMG
  1299. + sha256sum ${IMAGE_NAME}-$1.tar > ${IMAGE_NAME}-$1.tar.sha256
  1300. + )
  1301. + fi
  1302. +
  1303. + if [ -d $RELEASE_DIR ]; then
  1304. + # cleanup release dir
  1305. + rm -rf $RELEASE_DIR
  1306. + fi
  1307. +fi
  1308. diff --git a/scripts/install b/scripts/install
  1309. index d9e0bfa..d7b55ab 100755
  1310. --- a/scripts/install
  1311. +++ b/scripts/install
  1312. @@ -29,12 +29,15 @@ if [ "${1//:/}" != "${1}" ]; then
  1313. PACKAGE_NAME="${1%:*}"
  1314. TARGET="${1#*:}"
  1315. else
  1316. - PACKAGE_NAME=$1
  1317. + PACKAGE_NAME="${1}"
  1318. TARGET=
  1319. fi
  1320. [ -z "$TARGET" ] && TARGET="target"
  1321.  
  1322. +[ "$PKG_SECTION" != "virtual" ] && pkg_lock "${PACKAGE_NAME}:${TARGET}" install
  1323. +
  1324. STAMP=$STAMPS_INSTALL/$PACKAGE_NAME/install_$TARGET
  1325. +[ -f $STAMP ] && pkg_lock_msg "${PACKAGE_NAME}:${TARGET}" install "UNLOCK" "already installed"
  1326. [ -f $STAMP ] && exit 0
  1327.  
  1328. mkdir -p $STAMPS_INSTALL/$PACKAGE_NAME
  1329. @@ -52,6 +55,8 @@ elif [ "$TARGET" = init ] ; then
  1330. INSTALL=$BUILD/initramfs
  1331. fi
  1332.  
  1333. +pkg_lock_msg "${PACKAGE_NAME}:${TARGET}" install "RUNNING"
  1334. +
  1335. build_msg "CLR_INSTALL" "INSTALL" "${PACKAGE_NAME} $(print_color CLR_TARGET "(${TARGET})")" "indent"
  1336.  
  1337. mkdir -p $INSTALL
  1338. @@ -137,3 +142,5 @@ if [ "$TARGET" = target ] ; then
  1339. fi
  1340.  
  1341. touch $STAMP
  1342. +
  1343. +pkg_lock_msg "${PACKAGE_NAME}:${TARGET}" install "UNLOCK" "installed"
  1344. diff --git a/scripts/unpack b/scripts/unpack
  1345. index 3dce2c4..bfcd849 100755
  1346. --- a/scripts/unpack
  1347. +++ b/scripts/unpack
  1348. @@ -14,7 +14,11 @@ if [ -z "${PKG_NAME}" ]; then
  1349. die "$(print_color CLR_ERROR "${1}: no package.mk file found")"
  1350. fi
  1351.  
  1352. -$SCRIPTS/get $1
  1353. +pkg_lock "${PKG_NAME}" "unpack"
  1354. +
  1355. +pkg_lock_msg "${PKG_NAME}" "unpack" "RUNNING"
  1356. +
  1357. +$SCRIPTS/get "${PKG_NAME}"
  1358.  
  1359. STAMP="$PKG_BUILD/.libreelec-unpack"
  1360.  
  1361. @@ -22,13 +26,13 @@ mkdir -p $BUILD
  1362.  
  1363. # Perform a wildcard match on the package to ensure old versions are cleaned too
  1364. PKG_DEEPHASH=
  1365. -for i in $BUILD/$1-*; do
  1366. +for i in $BUILD/${PKG_NAME}-*; do
  1367. if [ -d $i -a -f "$i/.libreelec-unpack" ] ; then
  1368. . "$i/.libreelec-unpack"
  1369. - if [ "$STAMP_PKG_NAME" = "$1" ]; then
  1370. + if [ "$STAMP_PKG_NAME" = "${PKG_NAME}" ]; then
  1371. [ -z "${PKG_DEEPHASH}" ] && PKG_DEEPHASH=$(calculate_stamp)
  1372. if [ ! "$PKG_DEEPHASH" = "$STAMP_PKG_DEEPHASH" ] ; then
  1373. - $SCRIPTS/clean $1
  1374. + $SCRIPTS/clean "${PKG_NAME}"
  1375. fi
  1376. fi
  1377. fi
  1378. @@ -36,19 +40,20 @@ done
  1379.  
  1380. if [ -d "$PKG_BUILD" -a ! -f "$STAMP" ]; then
  1381. # stale pkg build dir
  1382. - $SCRIPTS/clean $1
  1383. + $SCRIPTS/clean "${PKG_NAME}"
  1384. fi
  1385.  
  1386. +[ -f "$STAMP" ] && pkg_lock_msg "${PKG_NAME}" "unpack" "UNLOCK" "already unpacked"
  1387. [ -f "$STAMP" ] && exit 0
  1388.  
  1389. -if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
  1390. - build_msg "CLR_UNPACK" "UNPACK" "${1}" "indent"
  1391. +if [ -d "$SOURCES/${PKG_NAME}" -o -d "$PKG_DIR/sources" ]; then
  1392. + build_msg "CLR_UNPACK" "UNPACK" "${PKG_NAME}" "indent"
  1393.  
  1394. pkg_call_optional pre_unpack
  1395.  
  1396. if ! pkg_call unpack; then
  1397. if [ -n "$PKG_URL" ]; then
  1398. - $SCRIPTS/extract $1 $BUILD
  1399. + $SCRIPTS/extract "${PKG_NAME}" $BUILD
  1400. fi
  1401. fi
  1402.  
  1403. @@ -159,10 +164,12 @@ fi
  1404. if [ "$PKG_SECTION" != "virtual" ]; then
  1405. mkdir -p "$PKG_BUILD"
  1406.  
  1407. - rm -f $STAMPS/$1/build_*
  1408. + rm -f $STAMPS/${PKG_NAME}/build_*
  1409.  
  1410. PKG_DEEPHASH=$(calculate_stamp)
  1411. for i in PKG_NAME PKG_DEEPHASH; do
  1412. echo "STAMP_$i=\"${!i}\"" >> $STAMP
  1413. done
  1414. fi
  1415. +
  1416. +pkg_lock_msg "${PKG_NAME}" "unpack" "UNLOCK" "unpacked"
  1417. --
  1418. 2.14.1
  1419.  
  1420.  
  1421. From d24315d789cb1e74b8c10b71c6b98d0f2cfc2a43 Mon Sep 17 00:00:00 2001
  1422. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1423. Date: Sat, 5 Jan 2019 02:48:53 +0000
  1424. Subject: [PATCH 07/16] PKG_DEPENDS_UNPACK: solution for packages using source
  1425. code of another
  1426.  
  1427. ---
  1428. packages/mediacenter/JsonSchemaBuilder/package.mk | 3 ++-
  1429. packages/mediacenter/TexturePacker/package.mk | 3 ++-
  1430. packages/security/nspr/package.mk | 2 ++
  1431. scripts/build | 8 +++++++-
  1432. 4 files changed, 13 insertions(+), 3 deletions(-)
  1433.  
  1434. diff --git a/packages/mediacenter/JsonSchemaBuilder/package.mk b/packages/mediacenter/JsonSchemaBuilder/package.mk
  1435. index b61af9f..b62b79a 100644
  1436. --- a/packages/mediacenter/JsonSchemaBuilder/package.mk
  1437. +++ b/packages/mediacenter/JsonSchemaBuilder/package.mk
  1438. @@ -1,11 +1,12 @@
  1439. # SPDX-License-Identifier: GPL-2.0-or-later
  1440. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  1441. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1442.  
  1443. PKG_NAME="JsonSchemaBuilder"
  1444. PKG_VERSION="0"
  1445. PKG_LICENSE="GPL"
  1446. PKG_SITE="http://www.kodi.tv"
  1447. -PKG_URL=""
  1448. +PKG_DEPENDS_UNPACK="kodi"
  1449. PKG_NEED_UNPACK="$(get_pkg_directory $MEDIACENTER)"
  1450. PKG_LONGDESC="kodi-platform:"
  1451.  
  1452. diff --git a/packages/mediacenter/TexturePacker/package.mk b/packages/mediacenter/TexturePacker/package.mk
  1453. index 8faa689..ed8ee07 100644
  1454. --- a/packages/mediacenter/TexturePacker/package.mk
  1455. +++ b/packages/mediacenter/TexturePacker/package.mk
  1456. @@ -1,12 +1,13 @@
  1457. # SPDX-License-Identifier: GPL-2.0-or-later
  1458. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  1459. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1460.  
  1461. PKG_NAME="TexturePacker"
  1462. PKG_VERSION="0"
  1463. PKG_LICENSE="GPL"
  1464. PKG_SITE="http://www.kodi.tv"
  1465. -PKG_URL=""
  1466. PKG_DEPENDS_HOST="lzo:host libpng:host libjpeg-turbo:host giflib:host"
  1467. +PKG_DEPENDS_UNPACK="kodi"
  1468. PKG_NEED_UNPACK="$(get_pkg_directory $MEDIACENTER)"
  1469. PKG_LONGDESC="kodi-platform:"
  1470.  
  1471. diff --git a/packages/security/nspr/package.mk b/packages/security/nspr/package.mk
  1472. index 7d16ac8..fd63908 100644
  1473. --- a/packages/security/nspr/package.mk
  1474. +++ b/packages/security/nspr/package.mk
  1475. @@ -1,5 +1,6 @@
  1476. # SPDX-License-Identifier: GPL-2.0-or-later
  1477. # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
  1478. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1479.  
  1480. PKG_NAME="nspr"
  1481. PKG_VERSION="4.19"
  1482. @@ -7,6 +8,7 @@ PKG_LICENSE="Mozilla Public License"
  1483. PKG_SITE="http://www.linuxfromscratch.org/blfs/view/svn/general/nspr.html"
  1484. PKG_DEPENDS_HOST="ccache:host"
  1485. PKG_DEPENDS_TARGET="toolchain nss:host"
  1486. +PKG_DEPENDS_UNPACK="nss"
  1487. PKG_LONGDESC="Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions"
  1488. PKG_TOOLCHAIN="configure"
  1489. PKG_BUILD_FLAGS="-parallel"
  1490. diff --git a/scripts/build b/scripts/build
  1491. index 46a3927..3afd72f 100755
  1492. --- a/scripts/build
  1493. +++ b/scripts/build
  1494. @@ -58,7 +58,13 @@ if [ -f $STAMP ]; then
  1495. fi
  1496. fi
  1497.  
  1498. -$SCRIPTS/unpack $PACKAGE_NAME
  1499. +if [ -n "${PKG_DEPENDS_UNPACK}" ]; then
  1500. + for p in ${PKG_DEPENDS_UNPACK}; do
  1501. + $SCRIPTS/unpack ${p}
  1502. + done
  1503. +else
  1504. + $SCRIPTS/unpack $PACKAGE_NAME
  1505. +fi
  1506.  
  1507. # build dependencies, only when PKG_DEPENDS_? is filled
  1508. unset _pkg_depends
  1509. --
  1510. 2.14.1
  1511.  
  1512.  
  1513. From 2f6644c22d791ba59a148b553e5cec7eb82c7b97 Mon Sep 17 00:00:00 2001
  1514. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1515. Date: Wed, 9 Jan 2019 03:27:04 +0000
  1516. Subject: [PATCH 08/16] PKG_DEPENDS_UNPACK: add source package to
  1517. PKG_NEED_UNPACK
  1518.  
  1519. If the source package changes then we need to rebuild too.
  1520. ---
  1521. config/functions | 6 ++++++
  1522. 1 file changed, 6 insertions(+)
  1523.  
  1524. diff --git a/config/functions b/config/functions
  1525. index 594a2c2..ad7d8cb 100644
  1526. --- a/config/functions
  1527. +++ b/config/functions
  1528. @@ -861,6 +861,12 @@ source_package() {
  1529. [ "$PKG_ADDON_IS_STANDALONE" != "yes" ] && PKG_NEED_UNPACK="${PKG_NEED_UNPACK} $(get_pkg_directory $MEDIACENTER)"
  1530. fi
  1531.  
  1532. + if [ -n "${PKG_DEPENDS_UNPACK}" ]; then
  1533. + for _p in ${PKG_DEPENDS_UNPACK}; do
  1534. + PKG_NNED_UNPACK+=" $(get_pkg_directory ${_p})"
  1535. + done
  1536. + fi
  1537. +
  1538. # Automatically set PKG_SOURCE_NAME unless it is already defined.
  1539. # PKG_SOURCE_NAME will be automatically set to a name based on
  1540. # the $PKG_NAME-$PKG_VERSION convention.
  1541. --
  1542. 2.14.1
  1543.  
  1544.  
  1545. From 7f3c4cf34562737c0f986aa0fabc260790b70465 Mon Sep 17 00:00:00 2001
  1546. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1547. Date: Sat, 5 Jan 2019 22:42:12 +0000
  1548. Subject: [PATCH 09/16] initramfs: use ln -sfn when LINK_NAME is a directory
  1549.  
  1550. INSTALL initramfs (target)
  1551. ln: failed to create symbolic link '/home/ubuntu/projects/LibreELEC.tv/build.LibreELEC-RPi2.arm-9.0-devel-mt/initramfs/lib/lib': Permission denied
  1552. ln: failed to create symbolic link '/home/ubuntu/projects/LibreELEC.tv/build.LibreELEC-RPi2.arm-9.0-devel-mt/initramfs/bin/bin': Permission denied
  1553. ln: failed to create symbolic link '/home/ubuntu/projects/LibreELEC.tv/build.LibreELEC-RPi2.arm-9.0-devel-mt/initramfs/sbin/sbin': Permission denied
  1554.  
  1555. If the directory sym link already exists, we try to
  1556. create a directory within the dereferenced sym link. So...
  1557.  
  1558. ln -sf /usr/lib $BUILD/initramfs/lib
  1559.  
  1560. means we attempt to create a sym link within the existing
  1561. $BUILD/initramfs/lib which is derefernced to /usr/lib/lib,
  1562. resulting in "permission denied".
  1563. ---
  1564. packages/virtual/initramfs/package.mk | 10 +++++-----
  1565. 1 file changed, 5 insertions(+), 5 deletions(-)
  1566.  
  1567. diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk
  1568. index ef17f19..b278804 100644
  1569. --- a/packages/virtual/initramfs/package.mk
  1570. +++ b/packages/virtual/initramfs/package.mk
  1571. @@ -22,14 +22,14 @@ fi
  1572. post_install() {
  1573. ( cd $BUILD/initramfs
  1574. if [ "$TARGET_ARCH" = "x86_64" ]; then
  1575. - ln -sf /usr/lib $BUILD/initramfs/lib64
  1576. + ln -sfn /usr/lib $BUILD/initramfs/lib64
  1577. mkdir -p $BUILD/initramfs/usr
  1578. - ln -sf /usr/lib $BUILD/initramfs/usr/lib64
  1579. + ln -sfn /usr/lib $BUILD/initramfs/usr/lib64
  1580. fi
  1581.  
  1582. - ln -sf /usr/lib $BUILD/initramfs/lib
  1583. - ln -sf /usr/bin $BUILD/initramfs/bin
  1584. - ln -sf /usr/sbin $BUILD/initramfs/sbin
  1585. + ln -sfn /usr/lib $BUILD/initramfs/lib
  1586. + ln -sfn /usr/bin $BUILD/initramfs/bin
  1587. + ln -sfn /usr/sbin $BUILD/initramfs/sbin
  1588.  
  1589. mkdir -p $BUILD/image/
  1590. fakeroot -- sh -c \
  1591. --
  1592. 2.14.1
  1593.  
  1594.  
  1595. From 30f2343734a9582ae431299313708ff1786419ee Mon Sep 17 00:00:00 2001
  1596. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1597. Date: Sat, 5 Jan 2019 02:44:12 +0000
  1598. Subject: [PATCH 10/16] packages: pciutils, nasm: build only for x86_64
  1599.  
  1600. ---
  1601. packages/linux/package.mk | 4 ++--
  1602. packages/mediacenter/kodi/package.mk | 6 +++++-
  1603. packages/multimedia/dav1d/package.mk | 6 +++++-
  1604. packages/sysutils/busybox/package.mk | 6 +++++-
  1605. 4 files changed, 17 insertions(+), 5 deletions(-)
  1606.  
  1607. diff --git a/packages/linux/package.mk b/packages/linux/package.mk
  1608. index 3233cb5..3bd5a13 100644
  1609. --- a/packages/linux/package.mk
  1610. +++ b/packages/linux/package.mk
  1611. @@ -6,7 +6,7 @@ PKG_NAME="linux"
  1612. PKG_LICENSE="GPL"
  1613. PKG_SITE="http://www.kernel.org"
  1614. PKG_DEPENDS_HOST="ccache:host"
  1615. -PKG_DEPENDS_TARGET="toolchain cpio:host kmod:host pciutils xz:host wireless-regdb keyutils $KERNEL_EXTRA_DEPENDS_TARGET"
  1616. +PKG_DEPENDS_TARGET="toolchain cpio:host kmod:host xz:host wireless-regdb keyutils $KERNEL_EXTRA_DEPENDS_TARGET"
  1617. PKG_DEPENDS_INIT="toolchain"
  1618. PKG_NEED_UNPACK="$LINUX_DEPENDS"
  1619. PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
  1620. @@ -65,7 +65,7 @@ if [ "$PKG_BUILD_PERF" != "no" ] && grep -q ^CONFIG_PERF_EVENTS= $PKG_KERNEL_CFG
  1621. fi
  1622.  
  1623. if [ "$TARGET_ARCH" = "x86_64" ]; then
  1624. - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-ucode:host kernel-firmware elfutils:host"
  1625. + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-ucode:host kernel-firmware elfutils:host pciutils"
  1626. fi
  1627.  
  1628. if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
  1629. diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
  1630. index a02ea76..3bcec2c 100644
  1631. --- a/packages/mediacenter/kodi/package.mk
  1632. +++ b/packages/mediacenter/kodi/package.mk
  1633. @@ -5,7 +5,7 @@
  1634. PKG_NAME="kodi"
  1635. PKG_LICENSE="GPL"
  1636. PKG_SITE="http://www.kodi.tv"
  1637. -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"
  1638. +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"
  1639. PKG_LONGDESC="A free and open source cross-platform media player."
  1640.  
  1641. PKG_PATCH_DIRS="$KODI_VENDOR"
  1642. @@ -39,6 +39,10 @@ configure_package() {
  1643.  
  1644. get_graphicdrivers
  1645.  
  1646. + if [ "$TARGET_ARCH" = "x86_64" ]; then
  1647. + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pciutils"
  1648. + fi
  1649. +
  1650. PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET dbus"
  1651.  
  1652. if [ "$DISPLAYSERVER" = "x11" ]; then
  1653. diff --git a/packages/multimedia/dav1d/package.mk b/packages/multimedia/dav1d/package.mk
  1654. index 275aca4..ab20356 100644
  1655. --- a/packages/multimedia/dav1d/package.mk
  1656. +++ b/packages/multimedia/dav1d/package.mk
  1657. @@ -7,5 +7,9 @@ PKG_SHA256="3662184809fa29af39c920877cedec3724dc5c3cf71d94bec424f2a7ee4825cf"
  1658. PKG_LICENSE="BSD"
  1659. PKG_SITE="http://www.jbkempf.com/blog/post/2018/Introducing-dav1d"
  1660. PKG_URL="https://code.videolan.org/videolan/dav1d/-/archive/${PKG_VERSION}/dav1d-${PKG_VERSION}.tar.bz2"
  1661. -PKG_DEPENDS_TARGET="toolchain nasm:host"
  1662. +PKG_DEPENDS_TARGET="toolchain"
  1663. PKG_LONGDESC="dav1d is an AV1 decoder :)"
  1664. +
  1665. +if [ "$TARGET_ARCH" = "x86_64" ]; then
  1666. + PKG_DEPENDS_TARGET+=" nasm:host"
  1667. +fi
  1668. diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk
  1669. index 4d8b2fb..4aa977c 100644
  1670. --- a/packages/sysutils/busybox/package.mk
  1671. +++ b/packages/sysutils/busybox/package.mk
  1672. @@ -9,7 +9,7 @@ PKG_LICENSE="GPL"
  1673. PKG_SITE="http://www.busybox.net"
  1674. PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
  1675. PKG_DEPENDS_HOST=""
  1676. -PKG_DEPENDS_TARGET="toolchain busybox:host hdparm dosfstools e2fsprogs zip unzip pciutils usbutils parted procps-ng gptfdisk libtirpc"
  1677. +PKG_DEPENDS_TARGET="toolchain busybox:host hdparm dosfstools e2fsprogs zip unzip usbutils parted procps-ng gptfdisk libtirpc"
  1678. PKG_DEPENDS_INIT="toolchain libtirpc"
  1679. PKG_LONGDESC="BusyBox combines tiny versions of many common UNIX utilities into a single small executable."
  1680. # busybox fails to build with GOLD support enabled with binutils-2.25
  1681. @@ -25,6 +25,10 @@ if [ "$NFS_SUPPORT" = yes ]; then
  1682. PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET rpcbind"
  1683. fi
  1684.  
  1685. +if [ "$TARGET_ARCH" = "x86_64" ]; then
  1686. + PKG_DEPENDS_TARGET+=" pciutils"
  1687. +fi
  1688. +
  1689. pre_build_target() {
  1690. PKG_MAKE_OPTS_TARGET="ARCH=$TARGET_ARCH \
  1691. HOSTCC=$HOST_CC \
  1692. --
  1693. 2.14.1
  1694.  
  1695.  
  1696. From 45f3549a9763ff9f1cb56a9f7f354aad42819854 Mon Sep 17 00:00:00 2001
  1697. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1698. Date: Sat, 5 Jan 2019 02:50:57 +0000
  1699. Subject: [PATCH 11/16] packages: add missing dependencies
  1700.  
  1701. ---
  1702. packages/addons/addon-depends/system-tools-depends/p7zip/package.mk | 1 +
  1703. packages/compress/bzip2/package.mk | 2 +-
  1704. packages/compress/zstd/package.mk | 1 +
  1705. packages/databases/sqlite/package.mk | 1 +
  1706. packages/devel/ncurses/package.mk | 1 +
  1707. packages/devel/pcre/package.mk | 2 +-
  1708. packages/lang/gcc/package.mk | 1 +
  1709. packages/security/nspr/package.mk | 2 +-
  1710. packages/sysutils/dosfstools/package.mk | 2 ++
  1711. packages/sysutils/e2fsprogs/package.mk | 1 +
  1712. packages/tools/aml-dtbtools/package.mk | 1 +
  1713. packages/tools/dtc/package.mk | 2 +-
  1714. packages/tools/mkbootimg/package.mk | 3 ++-
  1715. packages/tools/mtools/package.mk | 3 ++-
  1716. 14 files changed, 17 insertions(+), 6 deletions(-)
  1717.  
  1718. diff --git a/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk b/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
  1719. index 4db0399..50860cc 100644
  1720. --- a/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
  1721. +++ b/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
  1722. @@ -7,6 +7,7 @@ PKG_SHA256="5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f"
  1723. PKG_LICENSE="GPL"
  1724. PKG_SITE="http://p7zip.sourceforge.net/"
  1725. PKG_URL="http://downloads.sourceforge.net/project/p7zip/p7zip/${PKG_VERSION}/p7zip_${PKG_VERSION}_src_all.tar.bz2"
  1726. +#PKG_DEPENDS_HOST="gcc:host"
  1727. PKG_DEPENDS_TARGET="toolchain"
  1728. PKG_LONGDESC="p7zip is a port of 7za.exe for POSIX systems like Unix."
  1729. PKG_TOOLCHAIN="manual"
  1730. diff --git a/packages/compress/bzip2/package.mk b/packages/compress/bzip2/package.mk
  1731. index 610406b..dbc921d 100644
  1732. --- a/packages/compress/bzip2/package.mk
  1733. +++ b/packages/compress/bzip2/package.mk
  1734. @@ -8,7 +8,7 @@ PKG_SHA256="a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
  1735. PKG_LICENSE="GPL"
  1736. PKG_SITE="http://www.bzip.org"
  1737. PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
  1738. -PKG_DEPENDS_HOST=""
  1739. +#PKG_DEPENDS_HOST="gcc:host"
  1740. PKG_DEPENDS_TARGET="toolchain"
  1741. PKG_LONGDESC="A high-quality bzip2 data compressor."
  1742. PKG_BUILD_FLAGS="+pic +pic:host"
  1743. diff --git a/packages/compress/zstd/package.mk b/packages/compress/zstd/package.mk
  1744. index 60120e9..2988df7 100644
  1745. --- a/packages/compress/zstd/package.mk
  1746. +++ b/packages/compress/zstd/package.mk
  1747. @@ -8,6 +8,7 @@ PKG_LICENSE="BSD/GPLv2"
  1748. PKG_SITE="http://www.zstd.net"
  1749. PKG_URL="https://github.com/facebook/zstd/archive/v${PKG_VERSION}.tar.gz"
  1750. PKG_SOURCE_DIR=$PKG_NAME-$PKG_VERSION
  1751. +PKG_DEPENDS_HOST="gcc:host"
  1752. PKG_DEPENDS_TARGET="toolchain"
  1753. PKG_LONGDESC="A fast real-time compression algorithm."
  1754.  
  1755. diff --git a/packages/databases/sqlite/package.mk b/packages/databases/sqlite/package.mk
  1756. index 66af712..007d5b7 100644
  1757. --- a/packages/databases/sqlite/package.mk
  1758. +++ b/packages/databases/sqlite/package.mk
  1759. @@ -8,6 +8,7 @@ PKG_SHA256="5daa6a3fb7d1e8c767cd59c4ded8da6e4b00c61d3b466d0685e35c4dd6d7bf5d"
  1760. PKG_LICENSE="PublicDomain"
  1761. PKG_SITE="https://www.sqlite.org/"
  1762. PKG_URL="https://www.sqlite.org/2018/$PKG_NAME-$PKG_VERSION.tar.gz"
  1763. +#PKG_DEPENDS_HOST="gcc:host"
  1764. PKG_DEPENDS_TARGET="toolchain"
  1765. PKG_LONGDESC="An Embeddable SQL Database Engine."
  1766. # libsqlite3.a(sqlite3.o): requires dynamic R_X86_64_PC32 reloc against 'sqlite3_stricmp' which may overflow at runtime
  1767. diff --git a/packages/devel/ncurses/package.mk b/packages/devel/ncurses/package.mk
  1768. index c04d685..e579734 100644
  1769. --- a/packages/devel/ncurses/package.mk
  1770. +++ b/packages/devel/ncurses/package.mk
  1771. @@ -7,6 +7,7 @@ PKG_SHA256="08b07c3e792961f300829512c283d5fefc0b1c421a57b76922c3d13303ed677d"
  1772. PKG_LICENSE="MIT"
  1773. PKG_SITE="http://www.gnu.org/software/ncurses/"
  1774. PKG_URL="http://invisible-mirror.net/archives/ncurses/current/ncurses-$PKG_VERSION.tgz"
  1775. +PKG_DEPENDS_HOST="gcc:host"
  1776. PKG_DEPENDS_TARGET="toolchain zlib ncurses:host"
  1777. PKG_LONGDESC="A library is a free software emulation of curses in System V Release 4.0, and more."
  1778. # causes some segmentation fault's (dialog) when compiled with gcc's link time optimization.
  1779. diff --git a/packages/devel/pcre/package.mk b/packages/devel/pcre/package.mk
  1780. index 0518214..3148324 100644
  1781. --- a/packages/devel/pcre/package.mk
  1782. +++ b/packages/devel/pcre/package.mk
  1783. @@ -8,7 +8,7 @@ PKG_SHA256="2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301"
  1784. PKG_LICENSE="OSS"
  1785. PKG_SITE="http://www.pcre.org/"
  1786. PKG_URL="https://ftp.pcre.org/pub/pcre/$PKG_NAME-$PKG_VERSION.tar.bz2"
  1787. -PKG_DEPENDS_HOST=""
  1788. +PKG_DEPENDS_HOST="gcc:host"
  1789. PKG_DEPENDS_TARGET="toolchain"
  1790. PKG_LONGDESC="A set of functions that implement regular expression pattern matching."
  1791. PKG_TOOLCHAIN="configure"
  1792. diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
  1793. index f899aeb..a7d1d87 100644
  1794. --- a/packages/lang/gcc/package.mk
  1795. +++ b/packages/lang/gcc/package.mk
  1796. @@ -11,6 +11,7 @@ PKG_URL="http://ftpmirror.gnu.org/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERS
  1797. PKG_DEPENDS_BOOTSTRAP="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host"
  1798. PKG_DEPENDS_TARGET="gcc:host"
  1799. PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host glibc"
  1800. +PKG_DEPENDS_INIT="toolchain"
  1801. PKG_LONGDESC="This package contains the GNU Compiler Collection."
  1802.  
  1803. GCC_COMMON_CONFIGURE_OPTS="--target=$TARGET_NAME \
  1804. diff --git a/packages/security/nspr/package.mk b/packages/security/nspr/package.mk
  1805. index fd63908..58f4f22 100644
  1806. --- a/packages/security/nspr/package.mk
  1807. +++ b/packages/security/nspr/package.mk
  1808. @@ -7,7 +7,7 @@ PKG_VERSION="4.19"
  1809. PKG_LICENSE="Mozilla Public License"
  1810. PKG_SITE="http://www.linuxfromscratch.org/blfs/view/svn/general/nspr.html"
  1811. PKG_DEPENDS_HOST="ccache:host"
  1812. -PKG_DEPENDS_TARGET="toolchain nss:host"
  1813. +PKG_DEPENDS_TARGET="toolchain nss:host nspr:host"
  1814. PKG_DEPENDS_UNPACK="nss"
  1815. PKG_LONGDESC="Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions"
  1816. PKG_TOOLCHAIN="configure"
  1817. diff --git a/packages/sysutils/dosfstools/package.mk b/packages/sysutils/dosfstools/package.mk
  1818. index 6f8c72b..ffaf5f7 100644
  1819. --- a/packages/sysutils/dosfstools/package.mk
  1820. +++ b/packages/sysutils/dosfstools/package.mk
  1821. @@ -1,5 +1,6 @@
  1822. # SPDX-License-Identifier: GPL-2.0-or-later
  1823. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  1824. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1825.  
  1826. PKG_NAME="dosfstools"
  1827. PKG_VERSION="3.0.28"
  1828. @@ -8,6 +9,7 @@ PKG_LICENSE="GPLv3"
  1829. PKG_SITE="https://github.com/dosfstools/dosfstools"
  1830. PKG_URL="https://github.com/dosfstools/dosfstools/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
  1831. PKG_DEPENDS_TARGET="toolchain"
  1832. +PKG_DEPENDS_HOST="gcc:host"
  1833. PKG_DEPENDS_INIT="toolchain dosfstools"
  1834. PKG_LONGDESC="dosfstools contains utilities for making and checking MS-DOS FAT filesystems."
  1835.  
  1836. diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk
  1837. index 0daafc5..260315e 100644
  1838. --- a/packages/sysutils/e2fsprogs/package.mk
  1839. +++ b/packages/sysutils/e2fsprogs/package.mk
  1840. @@ -8,6 +8,7 @@ PKG_SHA256="926f8e8de1ffba55d791f21b71334e8a32b5227257ad370f2bf7e4396629e97f"
  1841. PKG_LICENSE="GPL"
  1842. PKG_SITE="http://e2fsprogs.sourceforge.net/"
  1843. PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/$PKG_NAME/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
  1844. +PKG_DEPENDS_HOST="gcc:host"
  1845. PKG_DEPENDS_TARGET="toolchain"
  1846. PKG_DEPENDS_INIT="toolchain"
  1847. PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs, dumpe2fs, fsck, and others."
  1848. diff --git a/packages/tools/aml-dtbtools/package.mk b/packages/tools/aml-dtbtools/package.mk
  1849. index 8e21b9b..93a0d28 100644
  1850. --- a/packages/tools/aml-dtbtools/package.mk
  1851. +++ b/packages/tools/aml-dtbtools/package.mk
  1852. @@ -7,6 +7,7 @@ PKG_SHA256="8bcaa83fcc9e85c9c04930e7411447d96a97da0809c5ecd9af91c8b554133c41"
  1853. PKG_LICENSE="free"
  1854. PKG_SITE="https://github.com/Wilhansen/aml-dtbtools"
  1855. PKG_URL="https://github.com/Wilhansen/aml-dtbtools/archive/${PKG_VERSION}.tar.gz"
  1856. +PKG_DEPENDS_HOST="gcc:host"
  1857. PKG_LONGDESC="AML DTB Tools"
  1858.  
  1859. PKG_MAKE_OPTS_HOST="dtbTool"
  1860. diff --git a/packages/tools/dtc/package.mk b/packages/tools/dtc/package.mk
  1861. index e943d3e..4fe132c 100644
  1862. --- a/packages/tools/dtc/package.mk
  1863. +++ b/packages/tools/dtc/package.mk
  1864. @@ -8,7 +8,7 @@ PKG_LICENSE="GPL"
  1865. PKG_SITE="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/"
  1866. PKG_URL="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$PKG_VERSION.tar.gz"
  1867. PKG_DEPENDS_HOST="Python2:host swig:host"
  1868. -PKG_DEPENDS_TARGET="toolchain"
  1869. +PKG_DEPENDS_TARGET="toolchain dtc:host"
  1870. PKG_LONGDESC="The Device Tree Compiler"
  1871.  
  1872. PKG_MAKE_OPTS_HOST="dtc libfdt"
  1873. diff --git a/packages/tools/mkbootimg/package.mk b/packages/tools/mkbootimg/package.mk
  1874. index 0b9d83a..adc1d3a 100644
  1875. --- a/packages/tools/mkbootimg/package.mk
  1876. +++ b/packages/tools/mkbootimg/package.mk
  1877. @@ -1,5 +1,6 @@
  1878. # SPDX-License-Identifier: GPL-2.0-or-later
  1879. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  1880. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1881.  
  1882. PKG_NAME="mkbootimg"
  1883. PKG_VERSION="6668fc2"
  1884. @@ -7,7 +8,7 @@ PKG_SHA256="d84870e055414d638a3e7eb4b7a3ebf415899841218f24cb3647d06ecf6ddb17"
  1885. PKG_LICENSE="GPL"
  1886. PKG_SITE="https://android.googlesource.com/platform/system/core/+/master/mkbootimg/"
  1887. PKG_URL="https://github.com/codesnake/mkbootimg/archive/$PKG_VERSION.tar.gz"
  1888. -PKG_DEPENDS_HOST=""
  1889. +PKG_DEPENDS_HOST="gcc:host"
  1890. PKG_LONGDESC="mkbootimg: Creates kernel boot images for Android"
  1891.  
  1892. makeinstall_host() {
  1893. diff --git a/packages/tools/mtools/package.mk b/packages/tools/mtools/package.mk
  1894. index 099488f..e0dd42e 100644
  1895. --- a/packages/tools/mtools/package.mk
  1896. +++ b/packages/tools/mtools/package.mk
  1897. @@ -1,5 +1,6 @@
  1898. # SPDX-License-Identifier: GPL-2.0-or-later
  1899. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  1900. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  1901.  
  1902. PKG_NAME="mtools"
  1903. PKG_VERSION="4.0.18"
  1904. @@ -7,6 +8,6 @@ PKG_SHA256="59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85"
  1905. PKG_LICENSE="GPL"
  1906. PKG_SITE="http://www.gnu.org/software/mtools/"
  1907. PKG_URL="http://ftpmirror.gnu.org/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
  1908. -PKG_DEPENDS_HOST=""
  1909. +PKG_DEPENDS_HOST="gcc:host"
  1910. PKG_LONGDESC="mtools: A collection of utilities to access MS-DOS disks"
  1911. PKG_TOOLCHAIN="autotools"
  1912. --
  1913. 2.14.1
  1914.  
  1915.  
  1916. From e06422dec8cd26408ed39da7c0587147c8855ab8 Mon Sep 17 00:00:00 2001
  1917. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1918. Date: Sun, 6 Jan 2019 10:22:10 +0000
  1919. Subject: [PATCH 12/16] packages: add missing xorg-server dependencies
  1920.  
  1921. ---
  1922. packages/x11/driver/xf86-input-evdev/package.mk | 2 +-
  1923. packages/x11/driver/xf86-input-synaptics/package.mk | 2 +-
  1924. 2 files changed, 2 insertions(+), 2 deletions(-)
  1925.  
  1926. diff --git a/packages/x11/driver/xf86-input-evdev/package.mk b/packages/x11/driver/xf86-input-evdev/package.mk
  1927. index e83dd81..c015cfc 100644
  1928. --- a/packages/x11/driver/xf86-input-evdev/package.mk
  1929. +++ b/packages/x11/driver/xf86-input-evdev/package.mk
  1930. @@ -8,7 +8,7 @@ PKG_SHA256="9edaa6205baf6d2922cc4db3d8e54a7e7773b5f733b0ae90f6be7725f983b70d"
  1931. PKG_LICENSE="OSS"
  1932. PKG_SITE="http://www.X.org"
  1933. PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
  1934. -PKG_DEPENDS_TARGET="toolchain util-macros libevdev mtdev systemd"
  1935. +PKG_DEPENDS_TARGET="toolchain xorg-server util-macros libevdev mtdev systemd"
  1936. PKG_LONGDESC="Evdev is an Xorg input driver for Linux's generic event devices."
  1937. PKG_TOOLCHAIN="autotools"
  1938.  
  1939. diff --git a/packages/x11/driver/xf86-input-synaptics/package.mk b/packages/x11/driver/xf86-input-synaptics/package.mk
  1940. index abbdf17..8cb9b74 100644
  1941. --- a/packages/x11/driver/xf86-input-synaptics/package.mk
  1942. +++ b/packages/x11/driver/xf86-input-synaptics/package.mk
  1943. @@ -7,7 +7,7 @@ PKG_SHA256="afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a"
  1944. PKG_LICENSE="GPL"
  1945. PKG_SITE="http://lists.freedesktop.org/mailman/listinfo/xorg"
  1946. PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
  1947. -PKG_DEPENDS_TARGET="toolchain libXi"
  1948. +PKG_DEPENDS_TARGET="toolchain xorg-server libXi"
  1949. PKG_LONGDESC="Synaptics touchpad driver for X.Org."
  1950. PKG_TOOLCHAIN="autotools"
  1951.  
  1952. --
  1953. 2.14.1
  1954.  
  1955.  
  1956. From 2d507930f9a5396d45e03dbdb260dc430a01febb Mon Sep 17 00:00:00 2001
  1957. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1958. Date: Sun, 6 Jan 2019 05:43:49 +0000
  1959. Subject: [PATCH 13/16] packages: elfutils: needs elfutils:host
  1960.  
  1961. ---
  1962. packages/devel/elfutils/package.mk | 2 +-
  1963. 1 file changed, 1 insertion(+), 1 deletion(-)
  1964.  
  1965. diff --git a/packages/devel/elfutils/package.mk b/packages/devel/elfutils/package.mk
  1966. index 6a2cedb..3534b60 100644
  1967. --- a/packages/devel/elfutils/package.mk
  1968. +++ b/packages/devel/elfutils/package.mk
  1969. @@ -9,7 +9,7 @@ PKG_LICENSE="GPL"
  1970. PKG_SITE="https://sourceware.org/elfutils/"
  1971. PKG_URL="https://sourceware.org/elfutils/ftp/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
  1972. PKG_DEPENDS_HOST="make:host zlib:host"
  1973. -PKG_DEPENDS_TARGET="toolchain zlib"
  1974. +PKG_DEPENDS_TARGET="toolchain zlib elfutils:host"
  1975. PKG_LONGDESC="A collection of utilities to handle ELF objects."
  1976. PKG_TOOLCHAIN="autotools"
  1977. PKG_BUILD_FLAGS="+pic"
  1978. --
  1979. 2.14.1
  1980.  
  1981.  
  1982. From e2a74cc15a27ff41e909c372c0387bfad714697d Mon Sep 17 00:00:00 2001
  1983. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  1984. Date: Sun, 6 Jan 2019 10:48:46 +0000
  1985. Subject: [PATCH 14/16] flex: work around realloc/malloc build failures with
  1986. flex:target
  1987.  
  1988. ---
  1989. packages/devel/flex/package.mk | 4 ++++
  1990. 1 file changed, 4 insertions(+)
  1991.  
  1992. diff --git a/packages/devel/flex/package.mk b/packages/devel/flex/package.mk
  1993. index 091e4c2..f59cc28 100644
  1994. --- a/packages/devel/flex/package.mk
  1995. +++ b/packages/devel/flex/package.mk
  1996. @@ -1,5 +1,6 @@
  1997. # SPDX-License-Identifier: GPL-2.0-or-later
  1998. # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
  1999. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2000.  
  2001. PKG_NAME="flex"
  2002. PKG_VERSION="2.5.39"
  2003. @@ -13,6 +14,9 @@ PKG_TOOLCHAIN="autotools"
  2004.  
  2005. PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared --disable-rpath --with-gnu-ld"
  2006.  
  2007. +PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_realloc_0_nonnull=yes \
  2008. + ac_cv_func_malloc_0_nonnull=yes"
  2009. +
  2010. post_makeinstall_host() {
  2011. cat > $TOOLCHAIN/bin/lex << "EOF"
  2012. #!/bin/sh
  2013. --
  2014. 2.14.1
  2015.  
  2016.  
  2017. From b660172123bd7b156544e5c117b2d6d52cd363e9 Mon Sep 17 00:00:00 2001
  2018. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  2019. Date: Sat, 5 Jan 2019 19:32:50 +0000
  2020. Subject: [PATCH 15/16] Makefile: switch to using multi-threaded builds
  2021.  
  2022. ---
  2023. Makefile | 6 +++---
  2024. 1 file changed, 3 insertions(+), 3 deletions(-)
  2025.  
  2026. diff --git a/Makefile b/Makefile
  2027. index a26a9e2..bf85107 100644
  2028. --- a/Makefile
  2029. +++ b/Makefile
  2030. @@ -3,13 +3,13 @@ BUILD_DIRS=build.*
  2031. all: release
  2032.  
  2033. system:
  2034. - ./scripts/image
  2035. + ./scripts/image_mt
  2036.  
  2037. release:
  2038. - ./scripts/image release
  2039. + ./scripts/image_mt release
  2040.  
  2041. image:
  2042. - ./scripts/image mkimage
  2043. + ./scripts/image_mt mkimage
  2044.  
  2045. noobs:
  2046. ./scripts/image noobs
  2047. --
  2048. 2.14.1
  2049.  
  2050.  
  2051. From 034acfacaf4e739496496a59486309c0d55659d0 Mon Sep 17 00:00:00 2001
  2052. From: MilhouseVH <milhouseVH.github@nmacleod.com>
  2053. Date: Sun, 6 Jan 2019 04:03:29 +0000
  2054. Subject: [PATCH 16/16] TEMP: scripts/mttest: testing package
  2055.  
  2056. ---
  2057. scripts/mttest | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  2058. 1 file changed, 83 insertions(+)
  2059. create mode 100755 scripts/mttest
  2060.  
  2061. diff --git a/scripts/mttest b/scripts/mttest
  2062. new file mode 100755
  2063. index 0000000..8e6c840
  2064. --- /dev/null
  2065. +++ b/scripts/mttest
  2066. @@ -0,0 +1,83 @@
  2067. +#!/bin/bash
  2068. +
  2069. +# SPDX-License-Identifier: GPL-2.0-or-later
  2070. +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
  2071. +
  2072. +unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACKAGE_LIST
  2073. +
  2074. +. config/options ""
  2075. +. config/multithread
  2076. +
  2077. +add_pkg_step build toolchain
  2078. +add_pkg_step build squashfs:host
  2079. +add_pkg_step build dosfstools:host
  2080. +add_pkg_step build fakeroot:host
  2081. +add_pkg_step build kmod:host
  2082. +add_pkg_step build mtools:host
  2083. +add_pkg_step build populatefs:host
  2084. +
  2085. +# populate base system...
  2086. +add_pkg_step install libc
  2087. +add_pkg_step install gcc
  2088. +
  2089. +add_pkg_step install linux
  2090. +
  2091. +add_pkg_step install linux-drivers
  2092. +add_pkg_step install linux-firmware
  2093. +add_pkg_step install $BOOTLOADER
  2094. +add_pkg_step install busybox
  2095. +add_pkg_step install util-linux
  2096. +add_pkg_step install corefonts
  2097. +add_pkg_step install network
  2098. +
  2099. +# Graphic support
  2100. +[ ! "$DISPLAYSERVER" = "no" ] && add_pkg_step install $DISPLAYSERVER
  2101. +
  2102. +# Multimedia support
  2103. +[ ! "$MEDIACENTER" = "no" ] && add_pkg_step install mediacenter
  2104. +
  2105. +# Sound support
  2106. +[ "$ALSA_SUPPORT" = "yes" ] && add_pkg_step install alsa
  2107. +
  2108. +# Automounter support
  2109. +[ "$UDEVIL" = "yes" ] && add_pkg_step install udevil
  2110. +
  2111. +# EXFAT support
  2112. +[ "$EXFAT" = "yes" ] && add_pkg_step install fuse-exfat
  2113. +
  2114. +# NTFS 3G support
  2115. +[ "$NTFS3G" = "yes" ] && add_pkg_step install ntfs-3g_ntfsprogs
  2116. +
  2117. +# Remote support
  2118. +[ "$REMOTE_SUPPORT" = "yes" ] && add_pkg_step install remote
  2119. +
  2120. +# Install miscellaneous packages
  2121. +add_pkg_step install misc-packages
  2122. +
  2123. +# Virtual image creation support
  2124. +[ "$PROJECT" = "Generic" ] && add_pkg_step install virtual
  2125. +
  2126. +# Installer support
  2127. +[ "$INSTALLER_SUPPORT" = "yes" ] && add_pkg_step install installer
  2128. +
  2129. +# Devtools... (not for Release)
  2130. +[ "$TESTING" = "yes" ] && add_pkg_step install testing
  2131. +
  2132. +# Install gdb in all builds, including releases
  2133. +add_pkg_step install debug
  2134. +
  2135. +# OEM packages
  2136. +[ "$OEM_SUPPORT" = "yes" ] && add_pkg_step install oem
  2137. +
  2138. +start_multithread_build() {
  2139. + PARALLEL_BIN=${TOOLCHAIN}/bin/parallel
  2140. +
  2141. + [ -x ${PARALLEL_BIN} ] || PARALLEL_BIN=parallel
  2142. + [ -d $(dirname "${OUTPUT}") ] || OUTPUT=/tmp/z1
  2143. +
  2144. + cat ${_CACHE_PACKAGE_GLOBAL} ${_CACHE_PACKAGE_LOCAL} | \
  2145. + ${PARALLEL_BIN} --plain --no-notice --max-procs ${THREADCOUNT} --max-args 30 json_worker | \
  2146. + ${SCRIPTS}/genpkglist.py "$(get_pkg_steps build)" "$(get_pkg_steps install)"
  2147. +}
  2148. +
  2149. +start_multithread_build || die "Parallel build/install failure"
  2150. --
  2151. 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!