Merge pull request #4565 from OpenELEC/oe6-update

Oe6 update
This commit is contained in:
Lukas Rusak 2016-01-02 23:46:48 -08:00
commit 1ac9b43dfd
3 changed files with 15 additions and 29 deletions

View File

@ -0,0 +1,14 @@
diff -Naur libgcrypt-1.6.4/Makefile.am libgcrypt-1.6.4.patch/Makefile.am
--- libgcrypt-1.6.4/Makefile.am 2015-09-07 14:05:57.000000000 +0200
+++ libgcrypt-1.6.4.patch/Makefile.am 2016-01-03 00:00:27.392411468 +0100
@@ -24,8 +24,8 @@
# (A suitable gitlog-to-changelog script can be found in GnuPG master.)
GITLOG_TO_CHANGELOG=gitlog-to-changelog
-DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
-SUBDIRS = compat mpi cipher random src doc tests
+DIST_SUBDIRS = m4 compat mpi cipher random src
+SUBDIRS = compat mpi cipher random src
EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES \
ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011 \

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="libgpg-error"
PKG_VERSION="1.20"
PKG_VERSION="1.21"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"

View File

@ -1,28 +0,0 @@
--- a/kernel/nv-procfs.c 2015-10-18 04:32:24.214891836 +0100
+++ b/kernel/nv-procfs.c 2015-10-18 04:33:01.611081468 +0100
@@ -607,7 +607,12 @@
registry_keys = ((nvl != NULL) ?
nvl->registry_keys : nv_registry_keys);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
return seq_printf(s, "Binary: \"%s\"\n", registry_keys);
+#else
+ seq_printf(s, "Binary: \"%s\"\n", registry_keys);
+ return 0;
+#endif
}
static ssize_t
@@ -674,7 +679,12 @@
void *v
)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
return seq_puts(s, s->private);
+#else
+ seq_puts(s, s->private);
+ return 0;
+#endif
}
NV_DEFINE_PROCFS_SINGLE_FILE(text_file);