Fixes.

packages/network/iptables/package.mk

@@ -4,7 +4,6 @@
 # Copyright (C) 2018-present Team CoreELEC (https://coreelec.org)
 
 PKG_NAME="iptables"
-PKG_VERSION="1.8.3"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.netfilter.org/"
 PKG_URL="http://www.netfilter.org/projects/iptables/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
@@ -12,8 +11,18 @@ PKG_DEPENDS_TARGET="toolchain linux libmnl libnftnl"
 PKG_LONGDESC="IP packet filter administration."
 PKG_TOOLCHAIN="autotools"
 
-PKG_CONFIGURE_OPTS_TARGET="--with-kernel=$(kernel_path)
+## Workaround until I can fix this correctly, or we get to mainline.
+if [[ "$(kernel_version)" =~ ^5. ]]
+then
+  PKG_VERSION="1.8.8"
+  PKG_PATCH_DIRS+="5.x"
+else
+  PKG_VERSION="1.8.3"
+  PKG_PATCH_DIRS+="4.x"
+  PKG_CONFIGURE_OPTS_TARGET="--with-kernel=$(kernel_path)
                            CPPFLAGS=-I${SYSROOT_PREFIX}/usr/include"
+fi
+
 
 post_makeinstall_target() {
   mkdir -p ${INSTALL}/usr/config/iptables/

projects/Rockchip/packages/linux/package.mk

@@ -29,7 +29,7 @@ then
 elif [[ "${DEVICE}" =~ RG503 ]] || [[ "${DEVICE}" =~ RG353P ]]
 then
   PKG_URL="https://github.com/JustEnoughLinuxOS/rk356x-kernel.git"
-  PKG_VERSION="042850fbc"
+  PKG_VERSION="e75a81b17"
 fi
 
 PKG_KERNEL_CFG_FILE=$(kernel_config_path) || die