Merge pull request #4315 from MilhouseVH/le10_drop_sapphire

sapphire: remove package

packages/addons/driver/sapphire/changelog.txt

@@ -1,14 +0,0 @@
-104
-- Update to 6.9
-
-103
-- Rebuild driver against 4.14 kernel
-
-102
-- Rebuild driver against 4.8 kernel
-
-101
-- Rebuild driver against 4.7 kernel
-
-100
-- Initial add-on

packages/addons/driver/sapphire/package.mk

@@ -1,64 +1,25 @@
 # SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="sapphire"
-PKG_VERSION="7.1"
+PKG_VERSION="1.0"
-PKG_SHA256="24c662c45c581f8fe395d1cdcd6e1dca3db9e0eb590433f39de6037b2d4c5764"
+PKG_REV="100"
-PKG_REV="105"
 PKG_ARCH="any"
-PKG_LICENSE="OSS"
+PKG_LICENSE="GPL"
-PKG_SITE="https://libreelec.tv"
+PKG_SITE=""
-PKG_URL="http://www.rtr.ca/sapphire_remote/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL=""
-PKG_DEPENDS_TARGET="bash"
+PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="driver.remote"
-PKG_SHORTDESC="A Linux driver to add support for sapphire remotes"
+PKG_SHORTDESC="Add-on removed"
-PKG_LONGDESC="A Linux driver to add support for sapphire remotes"
+PKG_LONGDESC="Add-on removed"
 PKG_TOOLCHAIN="manual"
 
+PKG_ADDON_BROKEN="Sapphire Remote Driver was removed."
+
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Sapphire Remote Driver"
-PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_TYPE="xbmc.broken"
-PKG_IS_KERNEL_PKG="yes"
-
-if [ -f $SYSROOT_PREFIX/usr/include/linux/input-event-codes.h ]; then
-  INPUT_H="$SYSROOT_PREFIX/usr/include/linux/input-event-codes.h"
-else
-  INPUT_H="$SYSROOT_PREFIX/usr/include/linux/input.h"
-fi
-
-pre_make_target() {
-  unset LDFLAGS
-}
-
-make_target() {
-  kernel_make -C $(kernel_path) M=$(pwd) modules
-
-  make INPUT_H=$INPUT_H \
-       sapphire_keymap.sh
-}
-
-post_make_target() {
-  sed -i -e 's|modprobe sapphire|insmod /storage/.kodi/addons/driver.remote.sapphire/lib/sapphire.ko|' \
-         -e 's|/etc/sapphire.keymap|/storage/.kodi/userdata/addon_data/driver.remote.sapphire/sapphire.keymap|' \
-         -e 's|/usr/local/bin/sapphire_keymap.sh|/storage/.kodi/addons/driver.remote.sapphire/bin/sapphire_keymap.sh|' \
-         -e 's|\&\& /usr/local/bin/sapphire_keymap.sh|\&\& /storage/.kodi/addons/driver.remote.sapphire/bin/sapphire_keymap.sh /storage/.kodi/userdata/addon_data/driver.remote.sapphire/sapphire.keymap|' \
-         sapphire_startup.sh
-
-  sed -i -e 's|\#\!/bin/bash|\#\!/storage/.kodi/addons/driver.remote.sapphire/bin/bash|' \
-         sapphire_startup.sh sapphire_keymap.sh
-}
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/
+  :
-    cp $PKG_BUILD/*.ko $ADDON_BUILD/$PKG_ADDON_ID/lib
-
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/etc
-    cp $PKG_BUILD/keymap.default $ADDON_BUILD/$PKG_ADDON_ID/etc
-
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
-    cp $PKG_BUILD/sapphire_startup.sh $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp $PKG_BUILD/sapphire_keymap.sh $ADDON_BUILD/$PKG_ADDON_ID/bin
-
-  # bash
-    cp $(get_install_dir bash)/usr/bin/bash $ADDON_BUILD/$PKG_ADDON_ID/bin
 }

packages/addons/driver/sapphire/patches/sapphire-0001-fix-makefile.patch

@@ -1,29 +0,0 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2016-04-24 18:28:49.000000000 -0700
-+++ b/Makefile	2016-07-09 13:39:17.008211023 -0700
-@@ -8,14 +8,14 @@
- BLACKLIST=/etc/modprobe.d/blacklist-$(CONFLICTS).conf
- KEYMAP_SCRIPT=sapphire_keymap.sh
- EXTRACT_KEYDEFS=extract_keydefs.sh
--INPUT_H=$(shell [ -e /usr/include/linux/input-event-codes.h ] && echo /usr/include/linux/input-event-codes.h || echo /usr/include/linux/input.h)
-+INPUT_H ?= $(shell [ -e /usr/include/linux/input-event-codes.h ] && echo /usr/include/linux/input-event-codes.h || echo /usr/include/linux/input.h)
- 
- ## MODPARMS is not used any more, but we have to nuke old copies to prevent issues:
- MODPARMS=/etc/modprobe.d/$(MODNAME).conf
- 
- CWD    = $(shell pwd -P)
- KVER  ?= $(shell uname -r)
--KDIR  = /lib/modules/$(KVER)
-+KDIR  ?= /lib/modules/$(KVER)
- obj-m += $(MODNAME).o
- 
- #EXTRA_CFLAGS += -Werror
-@@ -31,7 +31,7 @@
- 	@exit 1
- 
- kmod:
--	$(MAKE) -C $(KDIR)/build M=$(CWD) modules
-+	$(MAKE) -C $(KDIR) M=$(CWD) modules
- 
- $(MODNAME).ko: $(MODSOURCE) $(MODNAME).h
- 	$(MAKE) kmod

packages/addons/driver/sapphire/source/bin/sapphire-config

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-. /etc/profile
-oe_setup_addon driver.remote.sapphire
-
-if [ ! -f $ADDON_HOME/sapphire.keymap ]; then
-  cp $ADDON_DIR/etc/keymap.default $ADDON_HOME/sapphire.keymap
-fi

packages/addons/driver/sapphire/source/default.py

@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-

packages/addons/driver/sapphire/source/system.d/driver.remote.sapphire.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=Sapphire remote start script
-Before=kodi.service
-
-[Service]
-Type=oneshot
-Environment=HOME=/storage
-ExecStartPre=/storage/.kodi/addons/driver.remote.sapphire/bin/sapphire-config
-ExecStart=/storage/.kodi/addons/driver.remote.sapphire/bin/sapphire_startup.sh
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target