Merge branch 'libreelec-11.0' of github.com:LibreELEC/LibreELEC.tv into Lakka-v5.x

2024-06-16 03:16:58 -04:00 · 2024-03-20 01:05:52 +02:00 · 2024-03-20 01:05:52 +02:00 · f285677776
parent edac26dce2 bc4bd9d64e
commit f285677776
24 changed files with 71 additions and 59 deletions
--- a/packages/addons/service/proftpd/changelog.txt
+++ b/packages/addons/service/proftpd/changelog.txt
@ -1 +1,6 @@
+1
+- proftpd bumped to 1.3.8b
+  use TLS protocols v1.2 and v1.3
+  use 2048-bit key length for certificate
+
 initial release
--- a/packages/addons/service/proftpd/package.mk
+++ b/packages/addons/service/proftpd/package.mk
@ -3,9 +3,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="proftpd"
-PKG_VERSION="1.3.8"
-PKG_SHA256="f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748"
-PKG_REV="0"
+PKG_VERSION="1.3.8b"
+PKG_SHA256="183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.proftpd.org/"
--- a/packages/addons/service/proftpd/source/bin/proftpd.start
+++ b/packages/addons/service/proftpd/source/bin/proftpd.start
@ -24,7 +24,7 @@ fi
 [ -z "$Debuglevel" ] && Debuglevel=0

 if [ ! -f "$ADDON_HOME/proftpd.cert.pem" -o ! -f "$ADDON_HOME/proftpd.key.pem" ]; then
-  openssl req -newkey rsa:1024 -config $ADDON_HOME/openssl.cnf -new -x509 -days "$CertTTL" -nodes -out "$ADDON_HOME/proftpd.cert.pem" -keyout "$ADDON_HOME/proftpd.key.pem"
+  openssl req -newkey rsa:${CertBitStrength} -config $ADDON_HOME/openssl.cnf -new -x509 -days "$CertTTL" -nodes -out "$ADDON_HOME/proftpd.cert.pem" -keyout "$ADDON_HOME/proftpd.key.pem"
 fi

 # Edit proftpd.conf with user settings
@ -98,7 +98,6 @@ touch /var/config/proftpd.passwd
 chmod 700 /var/config/proftpd.passwd

 for NUM in $(seq 1 100); do
-
  USERNAME=$(eval echo \$Username${NUM})
  USERPASS=$(eval echo \$Userpass${NUM})
  USERPATH=$(eval echo \$Userpath${NUM})
--- a/packages/addons/service/proftpd/source/etc/proftpd.conf
+++ b/packages/addons/service/proftpd/source/etc/proftpd.conf
@ -46,8 +46,7 @@ PersistentPasswd off

 <IfModule mod_tls.c>
  TLSEngine on
-  # Support both SSLv3 and TLSv1
-  TLSProtocol SSLv3 TLSv1
+  TLSProtocol TLSv1.2 TLSv1.3
  TLSRequired off
  TLSVerifyClient off
  TLSOptions NoSessionReuseRequired
--- a/packages/addons/service/proftpd/source/system.d/service.proftpd.service
+++ b/packages/addons/service/proftpd/source/system.d/service.proftpd.service
@ -11,4 +11,4 @@ RestartSec=2
 StartLimitInterval=0

 [Install]
-WantedBy=kodi.target
+WantedBy=multi-user.target
--- a/packages/graphics/libheif/package.mk
+++ b/packages/graphics/libheif/package.mk
@ -12,7 +12,9 @@ PKG_LONGDESC="A HEIF file format decoder and encoder."
 PKG_BUILD_FLAGS="+pic"

 PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF \
-                       -DWITH_EXAMPLES=OFF"
+                       -DWITH_EXAMPLES=OFF \
+                       -DWITH_AOM_DECODER=OFF \
+                       -DWITH_AOM_ENCODER=OFF"

 pre_configure_target() {
  export CXXFLAGS="${CXXFLAGS} -Wno-unused-variable"
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@ -23,8 +23,8 @@ case "${LINUX}" in
    PKG_PATCH_DIRS="default"
    ;;
  raspberrypi)
-    PKG_VERSION="e41b05a8fc73f95425aceaf15a68fc25da1d1fe5" # 6.1.68
-    PKG_SHA256="5fe1431f895940007f99ddef0594308f164173e131c9f7dfa573b12d99d4fcd2"
+    PKG_VERSION="14c373b069031f01031e113f62d65c7518f0f084" # 6.1.77
+    PKG_SHA256="1af26cc6cc5dfdf1df874f7f86bbaf0fc48fc7a1af03a3da15c9202da5f6d3cd"
    PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
    PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
    ;;
@ -45,8 +45,8 @@ case "${LINUX}" in
   PKG_GIT_CLONE_BRANCH="sdm845-5.19.16"
   ;;
  *)
-    PKG_VERSION="6.1.68"
-    PKG_SHA256="365ff26a30e206de9b18489f45d38582a0a61b7c5919f8ab89295a47316784e1"
+    PKG_VERSION="6.1.80"
+    PKG_SHA256="568ecaaebb8b87c7c8246bba67bc83402972bf34f5811651a2d3cd548ff7b671"
    PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
    PKG_PATCH_DIRS="default"
    ;;
--- a/packages/mediacenter/kodi-binary-addons/imagedecoder.heif/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/imagedecoder.heif/package.mk
@ -4,7 +4,7 @@
 PKG_NAME="imagedecoder.heif"
 PKG_VERSION="20.1.0-Nexus"
 PKG_SHA256="17f50aada11528c02db2ff3871a355c89709ab7e2a5e6b5e33957b790cf207ff"
-PKG_REV="5"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/xbmc/imagedecoder.heif"
--- a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="inputstream.adaptive"
-PKG_VERSION="20.3.14-Nexus"
-PKG_SHA256="59573a0d97bb665e0ada35b44f77e9bf9232adc669d0d44beccf727145d36aff"
+PKG_VERSION="20.3.18-Nexus"
+PKG_SHA256="0755b27612d44d372bfe2b9fa32e47af616008287998d4b77ae70bcfb782cef9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="peripheral.joystick"
-PKG_VERSION="20.1.13-Nexus"
-PKG_SHA256="9fabd0cbb54f6f4acfa16a5fa2c13e37d121bb0774e0b62ad3604a72c99b95e5"
+PKG_VERSION="20.1.15-Nexus"
+PKG_SHA256="7292431b26e3ea969967a02f42ce48cae7742398b148ca041470c17934d06272"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="pvr.hts"
-PKG_VERSION="20.6.5-Nexus"
-PKG_SHA256="bd58fc85543447f918ee567192c87a3beb3f6e2c3fc116abe1f584514d202ada"
+PKG_VERSION="20.7.2-Nexus"
+PKG_SHA256="244cfc1488aa0c51465af411f3df8884b4a571a08acfa20ac9defdb8ef49022e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk
@ -3,14 +3,14 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="pvr.mythtv"
-PKG_VERSION="20.5.8-Nexus"
-PKG_SHA256="c3eefdb9e12c4ca517709378bfe0b985b808d3dbd2ce75f234c78a88c3a1e411"
+PKG_VERSION="20.6.9-Nexus"
+PKG_SHA256="32196265ee5b78bb97e0bd8e633778f4566e95d54df96e4577764e5d3681fcf1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/janbar/pvr.mythtv"
 PKG_URL="https://github.com/janbar/pvr.mythtv/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_DEPENDS_TARGET="toolchain kodi-platform zlib"
 PKG_SECTION=""
 PKG_SHORTDESC="pvr.mythtv"
 PKG_LONGDESC="pvr.mythtv"
--- a/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="pvr.sledovanitv.cz"
-PKG_VERSION="20.6.0-Nexus"
-PKG_SHA256="677f9893187ce14b18f4984b7175f59bb1d2354f3b6a153a58a33d166d5eac28"
+PKG_VERSION="20.7.0-Nexus"
+PKG_SHA256="de582551019b6659909d1ba7dd623070d7290c4c8f90d30282e2ec4c39b9b0be"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="pvr.waipu"
-PKG_VERSION="20.10.2-Nexus"
-PKG_SHA256="2326c3ed0e57ef8020c1041ea6f25fa325c619588c24c71b5963d8dda1c97604"
+PKG_VERSION="20.11.0-Nexus"
+PKG_SHA256="f43a7ac762b2c8bb7c2a66dc7d2a577fad92119bb4418867ce22369b96b18f8c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="kodi"
-PKG_VERSION="0f4ed67345a277d46a00e8090f5d4f026759ba31"
-PKG_SHA256="325a554fec47d29cc35978b230d2c96185fff56128b4766f6916cbdbfc45bc89"
+PKG_VERSION="20.5-Nexus"
+PKG_SHA256="9bf3257ebf251d20f276b7f90681985a270779150af2fb395d4b593c04002deb"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"
--- a/packages/sysutils/systemd/config/hosts.conf
+++ b/packages/sysutils/systemd/config/hosts.conf
@ -3,8 +3,8 @@
 # This configuration file allows you to manually map hostnames to
 # IP addresses

-# Format:  <ipaddress> <hostname1> <hostname2>
-# Example: 192.168.0.3 libreelec libreelec.mynetwork
+# Format:  <ipaddress> <fqdn> <alias1> <alias2>
+# Example: 192.168.0.3 libreelec.mynetwork libreelec

 # NOTE: do not edit /etc/hosts directly
 # edit /storage/.config/hosts.conf then reboot
--- a/packages/sysutils/systemd/scripts/network-base-setup
+++ b/packages/sysutils/systemd/scripts/network-base-setup
@ -1,4 +1,11 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
+
+check_hosts() {
+  grep -v "^#" /run/libreelec/hosts | grep "${1}"
+}
+

 # setup hostname
 if [ -f /storage/.cache/hostname ]; then
@ -9,13 +16,27 @@ fi
 rm -f /run/libreelec/hosts
 if [ -f /storage/.config/hosts.conf ]; then
  cat /storage/.config/hosts.conf > /run/libreelec/hosts
+  # add localhost to hosts if not present
+  LOCALHOST_HOSTS=$(check_hosts "localhost")
+  if [ -z "${LOCALHOST_HOSTS}" ]; then
+    {
+      echo "127.0.0.1 localhost"
+      echo "::1 localhost ip6-localhost ip6-loopback"
+    } >> /run/libreelec/hosts
+  fi
+  # add HOSTNAME to hosts if not present
+  HOSTNAME=$(cat /proc/sys/kernel/hostname)
+  HOSTNAME_HOSTS=$(check_hosts "${HOSTNAME}")
+  if [ -z "${HOSTNAME_HOSTS}" ]; then
+    echo "127.0.1.1 ${HOSTNAME}" >> /run/libreelec/hosts
+  fi
 fi

 # setup /etc/resolv.conf
 rm -f /run/libreelec/resolv.conf
 if [ -f /storage/.config/resolv.conf ]; then
  cat /storage/.config/resolv.conf > /run/libreelec/resolv.conf
-elif [ -f /dev/.kernel_ipconfig -a -f /proc/net/pnp ]; then
+elif [ -f /dev/.kernel_ipconfig ] && [ -f /proc/net/pnp ]; then
  cat /proc/net/pnp > /run/libreelec/resolv.conf
 else
  cat << EOF > /run/libreelec/resolv.conf
--- a/packages/sysutils/tz/package.mk
+++ b/packages/sysutils/tz/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="tz"
-PKG_VERSION="2023c"
-PKG_SHA256="9aa20ef838183e58f09acca92098cf6aa6d8e229aecf24e098c3af2a38e596f8"
+PKG_VERSION="2023d"
+PKG_SHA256="487df6ff5f4a577fd96568d0fd0a22e8062b0ec59af7ad3e66b5dd23a85cfc1c"
 PKG_LICENSE="Public Domain"
 PKG_SITE="http://www.iana.org/time-zones"
 PKG_URL="https://github.com/eggert/tz/archive/${PKG_VERSION}.tar.gz"
@ -12,7 +12,7 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Time zone and daylight-saving time data."

 pre_configure_target() {
-  PKG_MAKE_OPTS_TARGET="CC=${HOST_CC} LDFLAGS="
+  PKG_MAKE_OPTS_TARGET="CC=${HOST_CC} CFLAGS= LDFLAGS="
 }

 makeinstall_target() {
--- a/packages/tools/rpi-eeprom/package.mk
+++ b/packages/tools/rpi-eeprom/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="rpi-eeprom"
-PKG_VERSION="77402b6527906d6608204877d6dc40d547be4653"
-PKG_SHA256="93b2f71fa683523f640ca6ed2be7f08b9d5a1e25cf5539c004bcc4546539fa7a"
+PKG_VERSION="8855da988935f0c09ed4cc772103d4c5408a1afb"
+PKG_SHA256="8e41bd0b9d01526a38882a6a73fe78a5460a5dfa5d89ba98f9ed61ab14bdad1d"
 PKG_LICENSE="BSD-3/custom"
 PKG_SITE="https://github.com/raspberrypi/rpi-eeprom"
 PKG_URL="https://github.com/raspberrypi/rpi-eeprom/archive/${PKG_VERSION}.tar.gz"
--- a/projects/RPi/devices/RPi/linux/linux.arm.conf
+++ b/projects/RPi/devices/RPi/linux/linux.arm.conf
@ -5917,7 +5917,6 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_SCF_TORTURE_TEST is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)

-CONFIG_TRACE_IRQFLAGS=y
 # CONFIG_DEBUG_IRQFLAGS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
@ -5964,7 +5963,6 @@ CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_PREEMPTIRQ_TRACEPOINTS=y
 CONFIG_TRACING=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
@ -5976,8 +5974,8 @@ CONFIG_DYNAMIC_FTRACE=y
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 # CONFIG_FUNCTION_PROFILER is not set
 CONFIG_STACK_TRACER=y
-CONFIG_IRQSOFF_TRACER=y
-CONFIG_SCHED_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
 # CONFIG_HWLAT_TRACER is not set
 # CONFIG_OSNOISE_TRACER is not set
 # CONFIG_TIMERLAT_TRACER is not set
--- a/projects/RPi/devices/RPi2/linux/linux.arm.conf
+++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf
@ -6182,7 +6182,6 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_SCF_TORTURE_TEST is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)

-CONFIG_TRACE_IRQFLAGS=y
 # CONFIG_DEBUG_IRQFLAGS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
@ -6231,7 +6230,6 @@ CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_PREEMPTIRQ_TRACEPOINTS=y
 CONFIG_TRACING=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
@ -6243,8 +6241,8 @@ CONFIG_DYNAMIC_FTRACE=y
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 # CONFIG_FUNCTION_PROFILER is not set
 CONFIG_STACK_TRACER=y
-CONFIG_IRQSOFF_TRACER=y
-CONFIG_SCHED_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
 # CONFIG_HWLAT_TRACER is not set
 # CONFIG_OSNOISE_TRACER is not set
 # CONFIG_TIMERLAT_TRACER is not set
--- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf
+++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf
@ -6961,8 +6961,6 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_CSD_LOCK_WAIT_DEBUG is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)

-CONFIG_TRACE_IRQFLAGS=y
-CONFIG_TRACE_IRQFLAGS_NMI=y
 # CONFIG_DEBUG_IRQFLAGS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
@ -7009,7 +7007,6 @@ CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_PREEMPTIRQ_TRACEPOINTS=y
 CONFIG_TRACING=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
@ -7021,8 +7018,8 @@ CONFIG_DYNAMIC_FTRACE=y
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 # CONFIG_FUNCTION_PROFILER is not set
 CONFIG_STACK_TRACER=y
-CONFIG_IRQSOFF_TRACER=y
-CONFIG_SCHED_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
 # CONFIG_HWLAT_TRACER is not set
 # CONFIG_OSNOISE_TRACER is not set
 # CONFIG_TIMERLAT_TRACER is not set
--- a/projects/RPi/devices/RPi5/linux/linux.aarch64.conf
+++ b/projects/RPi/devices/RPi5/linux/linux.aarch64.conf
@ -7019,8 +7019,6 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_CSD_LOCK_WAIT_DEBUG is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)

-CONFIG_TRACE_IRQFLAGS=y
-CONFIG_TRACE_IRQFLAGS_NMI=y
 # CONFIG_DEBUG_IRQFLAGS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
@ -7067,7 +7065,6 @@ CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_PREEMPTIRQ_TRACEPOINTS=y
 CONFIG_TRACING=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
@ -7079,8 +7076,8 @@ CONFIG_DYNAMIC_FTRACE=y
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 # CONFIG_FUNCTION_PROFILER is not set
 CONFIG_STACK_TRACER=y
-CONFIG_IRQSOFF_TRACER=y
-CONFIG_SCHED_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
 # CONFIG_HWLAT_TRACER is not set
 # CONFIG_OSNOISE_TRACER is not set
 # CONFIG_TIMERLAT_TRACER is not set
--- a/scripts/image
+++ b/scripts/image
@ -529,10 +529,6 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
      fi
    done

-    cp -PR ${INSTALL}/usr/share/bootloader/bootcode.bin ${RELEASE_DIR}/${NOOBS_DISTRO}/System/
-    cp -PR ${INSTALL}/usr/share/bootloader/fixup.dat ${RELEASE_DIR}/${NOOBS_DISTRO}/System/
-    cp -PR ${INSTALL}/usr/share/bootloader/start.elf ${RELEASE_DIR}/${NOOBS_DISTRO}/System/
-
    # Copy system files
    cp ${TARGET_IMG}/${IMAGE_NAME}.system ${RELEASE_DIR}/${NOOBS_DISTRO}/System/SYSTEM
    cp ${TARGET_IMG}/${IMAGE_NAME}.kernel ${RELEASE_DIR}/${NOOBS_DISTRO}/System/kernel.img