From 8829d5e72510e6577fda7f9c223a5a77ecdcd6a2 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Mon, 27 Jan 2020 11:39:01 +0100
Subject: [PATCH] wireless-regdb: install via network instead of linux package

wireless-regdb is no longer needed to build current linux kernels so
drop it from linux depends and let wireless-regdb install the regdb
files to the firmware directory.

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 packages/linux/package.mk                  | 14 +-------------
 packages/network/wireless-regdb/package.mk |  7 +++++++
 packages/virtual/network/package.mk        |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 196dd57c32..8b69cb8bf6 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -6,7 +6,7 @@ PKG_NAME="linux"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kernel.org"
 PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"
-PKG_DEPENDS_TARGET="toolchain linux:host cpio:host kmod:host xz:host wireless-regdb keyutils $KERNEL_EXTRA_DEPENDS_TARGET"
+PKG_DEPENDS_TARGET="toolchain linux:host cpio:host kmod:host xz:host keyutils $KERNEL_EXTRA_DEPENDS_TARGET"
 PKG_NEED_UNPACK="$LINUX_DEPENDS $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)"
 PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
 PKG_IS_KERNEL_PKG="yes"
@@ -148,11 +148,6 @@ pre_make_target() {
   fi
 
   kernel_make oldconfig
-
-  # regdb (backward compatability with pre-4.15 kernels)
-  if grep -q ^CONFIG_CFG80211_INTERNAL_REGDB= $PKG_BUILD/.config ; then
-    cp $(get_build_dir wireless-regdb)/db.txt $PKG_BUILD/net/wireless/db.txt
-  fi
 }
 
 make_target() {
@@ -260,11 +255,4 @@ makeinstall_target() {
     done
     cp -p arch/$TARGET_KERNEL_ARCH/boot/dts/overlays/README $INSTALL/usr/share/bootloader/overlays
   fi
-
-  mkdir -p $INSTALL/$(get_full_firmware_dir)/
-
-  # regdb and signature is now loaded as firmware by 4.15+
-    if grep -q ^CONFIG_CFG80211_REQUIRE_SIGNED_REGDB= $PKG_BUILD/.config; then
-      cp $(get_build_dir wireless-regdb)/regulatory.db{,.p7s} $INSTALL/$(get_full_firmware_dir)
-    fi
 }
diff --git a/packages/network/wireless-regdb/package.mk b/packages/network/wireless-regdb/package.mk
index 5e9dd1da3e..1bb0d9f4c8 100644
--- a/packages/network/wireless-regdb/package.mk
+++ b/packages/network/wireless-regdb/package.mk
@@ -10,3 +10,10 @@ PKG_SITE="http://wireless.kernel.org/en/developers/Regulatory"
 PKG_URL="https://www.kernel.org/pub/software/network/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_LONGDESC="wireless-regdb is a regulatory database"
 PKG_TOOLCHAIN="manual"
+
+makeinstall_target() {
+  FW_TARGET_DIR=$INSTALL/$(get_full_firmware_dir)
+
+  mkdir -p ${FW_TARGET_DIR}
+    cp ${PKG_BUILD}/regulatory.db ${PKG_BUILD}/regulatory.db.p7s ${FW_TARGET_DIR}
+}
diff --git a/packages/virtual/network/package.mk b/packages/virtual/network/package.mk
index 010e68ec92..f0b2aa7859 100644
--- a/packages/virtual/network/package.mk
+++ b/packages/virtual/network/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION=""
 PKG_LICENSE="various"
 PKG_SITE="https://libreelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain connman netbase ethtool openssh iw"
+PKG_DEPENDS_TARGET="toolchain connman netbase ethtool openssh iw wireless-regdb"
 PKG_SECTION="virtual"
 PKG_LONGDESC="Metapackage for various packages to install network support"