From 1f82e6b10831ac2d3c737e208a26525aaba7022f Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 19 Jan 2020 22:47:58 +0100 Subject: [PATCH 1/4] iw: include in image builds Signed-off-by: Matthias Reichl --- .../network-tools-depends => network}/iw/package.mk | 4 ---- packages/virtual/network/package.mk | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) rename packages/{addons/addon-depends/network-tools-depends => network}/iw/package.mk (94%) diff --git a/packages/addons/addon-depends/network-tools-depends/iw/package.mk b/packages/network/iw/package.mk similarity index 94% rename from packages/addons/addon-depends/network-tools-depends/iw/package.mk rename to packages/network/iw/package.mk index 54dee4164e..f6d8db521b 100644 --- a/packages/addons/addon-depends/network-tools-depends/iw/package.mk +++ b/packages/network/iw/package.mk @@ -14,7 +14,3 @@ PKG_LONGDESC="A new nl80211 based CLI configuration utility for wireless devices pre_configure_target() { export LDFLAGS="$LDFLAGS -pthread" } - -makeinstall_target() { - : # meh -} diff --git a/packages/virtual/network/package.mk b/packages/virtual/network/package.mk index 76a14503a3..2d6da9ec50 100644 --- a/packages/virtual/network/package.mk +++ b/packages/virtual/network/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="" PKG_LICENSE="various" PKG_SITE="http://www.openelec.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" From 76a3dcb991371fcc276e08a372da434624bd0aac Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 19 Jan 2020 22:49:17 +0100 Subject: [PATCH 2/4] network-tools: drop iw Signed-off-by: Matthias Reichl --- packages/addons/tools/network-tools/changelog.txt | 3 +++ packages/addons/tools/network-tools/package.mk | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/addons/tools/network-tools/changelog.txt b/packages/addons/tools/network-tools/changelog.txt index b50fd4f032..d6a931f8a1 100644 --- a/packages/addons/tools/network-tools/changelog.txt +++ b/packages/addons/tools/network-tools/changelog.txt @@ -1,3 +1,6 @@ +104 +- drop iw + 103 - added rar2fs - updated iperf to 3.6 diff --git a/packages/addons/tools/network-tools/package.mk b/packages/addons/tools/network-tools/package.mk index 37403335cb..3bcbcf6f4b 100644 --- a/packages/addons/tools/network-tools/package.mk +++ b/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 From f7146be3adeadc3d5bc3e77446de82cad9ca39e6 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 19 Jan 2020 22:59:20 +0100 Subject: [PATCH 3/4] iw: configure regulatory domain from .cache/regdomain.conf Signed-off-by: Matthias Reichl --- packages/network/iw/package.mk | 5 +++++ packages/network/iw/scripts/setregdomain | 8 ++++++++ packages/network/iw/udev.d/60-iw-regdomain.rules | 1 + 3 files changed, 14 insertions(+) create mode 100755 packages/network/iw/scripts/setregdomain create mode 100644 packages/network/iw/udev.d/60-iw-regdomain.rules diff --git a/packages/network/iw/package.mk b/packages/network/iw/package.mk index f6d8db521b..e1245e97f6 100644 --- a/packages/network/iw/package.mk +++ b/packages/network/iw/package.mk @@ -14,3 +14,8 @@ PKG_LONGDESC="A new nl80211 based CLI configuration utility for wireless devices pre_configure_target() { export LDFLAGS="$LDFLAGS -pthread" } + +post_makeinstall_target() { + mkdir -p $INSTALL/usr/lib/iw + cp $PKG_DIR/scripts/setregdomain $INSTALL/usr/lib/iw +} diff --git a/packages/network/iw/scripts/setregdomain b/packages/network/iw/scripts/setregdomain new file mode 100755 index 0000000000..538bfddb51 --- /dev/null +++ b/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" diff --git a/packages/network/iw/udev.d/60-iw-regdomain.rules b/packages/network/iw/udev.d/60-iw-regdomain.rules new file mode 100644 index 0000000000..a9f929c45b --- /dev/null +++ b/packages/network/iw/udev.d/60-iw-regdomain.rules @@ -0,0 +1 @@ +SUBSYSTEM=="ieee80211", ACTION=="add", RUN+="/usr/lib/iw/setregdomain" From cf7fa1f5f9cf4c4a966b8a70b6e170fb5d05bda4 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 22 Jan 2020 13:47:27 +0100 Subject: [PATCH 4/4] virtual/network: fix PKG_SITE Signed-off-by: Matthias Reichl --- packages/virtual/network/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/virtual/network/package.mk b/packages/virtual/network/package.mk index 2d6da9ec50..010e68ec92 100644 --- a/packages/virtual/network/package.mk +++ b/packages/virtual/network/package.mk @@ -4,7 +4,7 @@ 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 iw" PKG_SECTION="virtual"