MilhouseVH

diff --git a/config/functions b/config/functions
index 18b02f7..7c5ace5 100644
--- a/config/functions
+++ b/config/functions
@@ -34,7 +34,9 @@ setup_toolchain() {
   # parallel
   if ! flag_enabled "parallel" "yes"; then
     export NINJA_OPTS="$NINJA_OPTS -j1"
-    export MAKE_OPTS="$MAKE_OPTS -j1"
+    export MAKEFLAGS="-j1"

MilhouseVH

diff --git a/config/path b/config/path
index 8a0ddc8..4be62db 100644
--- a/config/path
+++ b/config/path
@@ -114,6 +114,7 @@ unset LD_LIBRARY_PATH
   fi
 
   if [ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ]; then
+    unset -f configure_package
     . $PKG_DIR/package.mk

MilhouseVH

From 5e1cb0b78142bf7ed7d348f4a47c236590e72b57 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 27 Nov 2017 20:48:13 +0000
Subject: [PATCH] kernel 4.15 fix

---
 kernel/nv.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/kernel/nv.c b/kernel/nv.c

MilhouseVH

From 070b07f0d41c8a1481a7e40ad5869868aad8c680 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 27 Nov 2017 20:38:14 +0000
Subject: [PATCH 1/2] kernel 4.15 fix

---
 kernel/nvidia-modeset/nvidia-modeset-linux.c |  8 +++-----
 kernel/nvidia-uvm/uvm8_va_block.c            |  2 ++
 kernel/nvidia/nv.c                           | 10 ++++------
 3 files changed, 9 insertions(+), 11 deletions(-)

MilhouseVH

#!/bin/bash

################################################################################
#      This file is part of LibreELEC - http://libreelec.tv
#      Copyright (C) 2016-2017 Christian Hewitt (chewitt@libreelec.tv)
#
#  LibreELEC is free software: you can redistribute it and/or modify
#  it under the terms of the GNU General Public License as published by
#  the Free Software Foundation, either version 2 of the License, or
#  (at your option) any later version.

MilhouseVH

From 08d44c27229cdeb9b5eed1e331ce132913d523b6 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sun, 29 Oct 2017 05:26:49 +0000
Subject: [PATCH] buildsystem: remove grep from PKG_ARCH check

More efficient, slightly more functional.

Can be a space delimited list of architectures.

Architectures to be excluded can be specified with !ARCH.

MilhouseVH

From 2ff7bb555896b6bc8d997d440141216dcac3392c Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sat, 14 Oct 2017 23:34:35 +0100
Subject: [PATCH] libtool: enable autoreconf, build intltool before libtool

---
 packages/devel/libtool/package.mk     | 2 +-
 packages/virtual/autotools/package.mk | 2 +-
 packages/virtual/toolchain/package.mk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

MilhouseVH

/*
 *      Copyright (C) 2005-2013 Team XBMC
 *      http://xbmc.org
 *
 *  This Program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2, or (at your option)
 *  any later version.
 *
 *  This Program is distributed in the hope that it will be useful,

MilhouseVH

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index d95744d..3b75c7e 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1270,9 +1270,9 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 
 	vol->actimeo = CIFS_DEF_ACTIMEO;
 
-	/* FIXME: add autonegotiation -- for now, SMB1 is default */
-	vol->ops = &smb1_operations;

MilhouseVH

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 3411dbd..40a7d7c 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -56,7 +56,7 @@ case "$LINUX" in
     PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan irqbalanced"
     ;;
   *)
-    PKG_VERSION="4.9"
+    PKG_VERSION="4.9.1"