Merge pull request #4290 from edit4ever/regdom

Backport iw/regdom changes from master

packages/addons/tools/network-tools/changelog.txt

@@ -1,3 +1,6 @@
+104
+- drop iw
+
 103
 - added rar2fs
 - updated iperf to 3.6

packages/addons/tools/network-tools/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="network-tools"
 PKG_VERSION="1.0"
-PKG_REV="103"
+PKG_REV="104"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
@@ -11,7 +11,7 @@ PKG_URL=""
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="A bundle of network tools and programs"
-PKG_LONGDESC="This bundle currently includes bwm-ng, iftop, iperf, irssi, iw, lftp, ncftp, ngrep, nmap, rar2fs, rsync, sshfs, tcpdump, udpxy and wireless_tools."
+PKG_LONGDESC="This bundle currently includes bwm-ng, iftop, iperf, irssi, lftp, ncftp, ngrep, nmap, rar2fs, rsync, sshfs, tcpdump, udpxy and wireless_tools."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Network Tools"
@@ -22,7 +22,6 @@ PKG_DEPENDS_TARGET="toolchain \
                     iftop \
                     iperf \
                     irssi \
-                    iw \
                     lftp \
                     ncftp \
                     ngrep \
@@ -49,9 +48,6 @@ addon() {
     # irssi
     cp -P $(get_build_dir irssi)/.$TARGET_NAME/src/fe-text/irssi $ADDON_BUILD/$PKG_ADDON_ID/bin
 
-    # iw
-    cp -P $(get_build_dir iw)/iw $ADDON_BUILD/$PKG_ADDON_ID/bin
-
     # lftp
     cp -P $(get_build_dir lftp)/.$TARGET_NAME/src/lftp $ADDON_BUILD/$PKG_ADDON_ID/bin
 

packages/network/iw/package.mk

@@ -2,10 +2,10 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="iw"
-PKG_VERSION="4.14"
-PKG_SHA256="f01671c0074bfdec082a884057edba1b9efd35c89eda554638496f03b769ad89"
+PKG_VERSION="5.4"
+PKG_SHA256="a2469f677088d7b1070a7fbb28f3c747041697e8f6ec70783339cb1bc27a395f"
 PKG_LICENSE="PUBLIC_DOMAIN"
-PKG_SITE="http://wireless.kernel.org/en/users/Documentation/iw"
+PKG_SITE="https://wireless.wiki.kernel.org/en/users/documentation/iw"
 PKG_URL="https://www.kernel.org/pub/software/network/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libnl"
 PKG_LONGDESC="A new nl80211 based CLI configuration utility for wireless devices."
@@ -15,6 +15,7 @@ pre_configure_target() {
   export LDFLAGS="$LDFLAGS -pthread"
 }
 
-makeinstall_target() {
-  : # meh
+post_makeinstall_target() {
+  mkdir -p $INSTALL/usr/lib/iw
+    cp $PKG_DIR/scripts/setregdomain $INSTALL/usr/lib/iw
 }

packages/network/iw/scripts/setregdomain

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+REGDOMAIN=
+REGDOMAIN_CONF="/storage/.cache/regdomain.conf"
+[ -r "$REGDOMAIN_CONF" ] && . "$REGDOMAIN_CONF"
+[ -z "$REGDOMAIN" ] && exit 0
+
+exec /usr/sbin/iw reg set "$REGDOMAIN"

packages/network/iw/udev.d/60-iw-regdomain.rules

@@ -0,0 +1 @@
+SUBSYSTEM=="ieee80211", ACTION=="add", RUN+="/usr/lib/iw/setregdomain"

packages/virtual/network/package.mk

@@ -4,9 +4,9 @@
 PKG_NAME="network"
 PKG_VERSION=""
 PKG_LICENSE="various"
-PKG_SITE="http://www.openelec.tv"
+PKG_SITE="https://libreelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain connman netbase ethtool openssh"
+PKG_DEPENDS_TARGET="toolchain connman netbase ethtool openssh iw"
 PKG_SECTION="virtual"
 PKG_LONGDESC="Metapackage for various packages to install network support"