Merge pull request #4307 from MilhouseVH/le10_drop_intel_led

intel_nuc_led: remove package
This commit is contained in:
Matthias Reichl 2020-04-09 20:51:04 +02:00 committed by GitHub
commit 5f24de0bf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 69 deletions

View File

@ -1,25 +0,0 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="intel_nuc_led"
PKG_VERSION="6a3850eadff554053ca7d95e830a624b28c53670"
PKG_SHA256="14313183b1ef547dcc43cf943695f227bb456b8acd634fe12b4345e471b53b36"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/milesp20/intel_nuc_led/"
PKG_URL="https://github.com/milesp20/intel_nuc_led/archive/$PKG_VERSION.tar.gz"
PKG_LONGDESC="Intel NUC7i[x]BN and NUC6CAY LED Control for Linux"
PKG_IS_KERNEL_PKG="yes"
pre_make_target() {
unset LDFLAGS
}
make_target() {
kernel_make KDIR=$(kernel_path) default
}
makeinstall_target() {
mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
}

View File

@ -1,43 +0,0 @@
From d8ceac3c27e55c39af6d6956479564682b466980 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 10 Feb 2020 11:01:39 +0000
Subject: [PATCH] fix build with kernel 5.6-rc1
---
nuc_led.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/nuc_led.c b/nuc_led.c
index c975f22..1d9a272 100644
--- a/nuc_led.c
+++ b/nuc_led.c
@@ -37,6 +37,7 @@
#include <linux/acpi.h>
#include <linux/vmalloc.h>
#include <linux/uaccess.h>
+#include <linux/version.h>
MODULE_AUTHOR("Miles Peterson");
MODULE_DESCRIPTION("Intel NUC LED Control WMI Driver");
@@ -443,11 +444,18 @@ static ssize_t acpi_proc_read(struct file *filp, char __user *buff,
return ret;
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
+static struct proc_ops proc_acpi_operations = {
+ .proc_read = acpi_proc_read,
+ .proc_write = acpi_proc_write,
+};
+#else
static struct file_operations proc_acpi_operations = {
.owner = THIS_MODULE,
.read = acpi_proc_read,
.write = acpi_proc_write,
};
+#endif
/* Init & unload */
static int __init init_nuc_led(void)
--
2.20.1

View File

@ -71,7 +71,7 @@
# for a list of additional drivers see packages/linux-drivers
# Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS bcm_sta intel_nuc_led"
ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS bcm_sta"
# build and install driver addons (yes / no)
DRIVER_ADDONS_SUPPORT="yes"