Merge pull request #8793 from antonlacon/rpi-flash-firmware

busybox: init: remove rpi firmware upgrade handling

packages/sysutils/busybox/package.mk

@@ -131,10 +131,6 @@ makeinstall_target() {
     sed -e "s/@DISTRONAME@/${DISTRONAME}/g" \
         -i ${INSTALL}/usr/lib/libreelec/fs-resize
 
-    if listcontains "${FIRMWARE}" "rpi-eeprom"; then
-      cp ${PKG_DIR}/scripts/rpi-flash-firmware ${INSTALL}/usr/lib/libreelec
-    fi
-
   mkdir -p ${INSTALL}/usr/lib/systemd/system-generators/
     cp ${PKG_DIR}/scripts/libreelec-target-generator ${INSTALL}/usr/lib/systemd/system-generators/
 
@@ -174,7 +170,6 @@ post_install() {
   enable_service vfd-clock.service
   enable_service var.mount
   enable_service locale.service
-  listcontains "${FIRMWARE}" "rpi-eeprom" && enable_service rpi-flash-firmware.service
 
   # cron support
   if [ "${CRON_SUPPORT}" = "yes" ]; then

packages/sysutils/busybox/scripts/libreelec-target-generator

@@ -40,8 +40,6 @@ elif [ -f /storage/.cache/reset_hard -o -f /storage/.cache/reset_soft ]; then
   TARGET="factory-reset.target"
 elif [ -f "$BACKUP_FILE" ]; then
   TARGET="backup-restore.target"
-elif [ -f /storage/.rpi_flash_firmware ]; then
-  TARGET="rpi-flash-firmware.target"
 fi
 
 if [ -n "$TARGET" ]; then

packages/sysutils/busybox/scripts/rpi-flash-firmware

@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
-
-FLAG_FILE="/storage/.rpi_flash_firmware"
-
-. /usr/lib/libreelec/functions
-
-hidecursor
-
-if [ -f "${FLAG_FILE}" ]; then
-  . ${FLAG_FILE}
-  rm -f "${FLAG_FILE}"
-
-  if ! mount -o remount,rw /flash 2>/dev/null; then
-    echo "ERROR: Unable to mount /flash as a read/write file system."
-    echo
-    echo "Aborting Flash update process - please proceed with a manual update."
-    echo
-
-    StartProgress countdown "Rebooting in 15s... " 15 "NOW"
-    reboot -f &>/dev/null
-  fi
-
-  # Install new bootloader and/or USB3 firmware files to /flash
-  # Firmware flashing will occur during the next boot, after
-  # which the system will again reboot.
-  # Old firmware files will be automatically removed by init.
-  CMD_ARGS=""
-  [ "${BOOTLOADER}" = "yes" ] && CMD_ARGS="${CMD_ARGS} -A bootloader"
-  [ "${VL805}" = "yes" ] && CMD_ARGS="${CMD_ARGS} -A vl805"
-
-  if [ -n "${CMD_ARGS}" ]; then
-    USE_FLASHROM=0 /usr/bin/.rpi-eeprom-update.real ${CMD_ARGS}
-  fi
-
-  sync
-  mount -o remount,ro /flash
-fi
-
-reboot -f &>/dev/null

packages/sysutils/busybox/system.d/rpi-flash-firmware.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=RPi Flash Firmware
-Requires=tmp.mount var.mount sys-kernel-config.mount
-After=tmp.mount var.mount sys-kernel-config.mount
-DefaultDependencies=no
-
-[Service]
-Type=idle
-ExecStart=/usr/lib/libreelec/rpi-flash-firmware
-StandardInput=tty-force
-StandardOutput=inherit
-StandardError=inherit

packages/sysutils/busybox/system.d/rpi-flash-firmware.target

@@ -1,5 +0,0 @@
-[Unit]
-Description=RPi Flash Firmware target
-Requires=rpi-flash-firmware.service
-After=rpi-flash-firmware.service
-AllowIsolate=yes