diff --git a/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk b/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk index 4ac9a214ee..0e0b608184 100644 --- a/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk @@ -10,6 +10,7 @@ PKG_URL="https://github.com/vgropp/bwm-ng/archive/v$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses libstatgrab" PKG_LONGDESC="A small and simple console-based live network and disk io bandwidth monitor." PKG_TOOLCHAIN="autotools" +PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--with-libstatgrab \ --with-time \ @@ -18,7 +19,3 @@ PKG_CONFIGURE_OPTS_TARGET="--with-libstatgrab \ --with-sysctldisk \ --with-procnetdev \ --with-partitions" - -makeinstall_target() { - : # nop -} diff --git a/packages/addons/addon-depends/network-tools-depends/iftop/package.mk b/packages/addons/addon-depends/network-tools-depends/iftop/package.mk index 1a12be6aac..8890ce47e3 100644 --- a/packages/addons/addon-depends/network-tools-depends/iftop/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/iftop/package.mk @@ -10,6 +10,7 @@ PKG_URL="http://www.ex-parrot.com/pdw/iftop/download/$PKG_NAME-$PKG_VERSION.tar. PKG_DEPENDS_TARGET="toolchain ncurses libpcap libnl" PKG_LONGDESC="A tool to display bandwidth usage on an interface." PKG_TOOLCHAIN="autotools" +PKG_BUILD_FLAGS="-sysroot" pre_build_target() { mkdir -p $PKG_BUILD/.$TARGET_NAME @@ -19,7 +20,3 @@ pre_build_target() { pre_configure_target() { export LIBS="-lpcap -lnl-3 -lnl-genl-3 -lncurses" } - -makeinstall_target() { - : # nop -} diff --git a/packages/addons/addon-depends/network-tools-depends/iperf/package.mk b/packages/addons/addon-depends/network-tools-depends/iperf/package.mk index 5225257f4a..86e4bdea53 100644 --- a/packages/addons/addon-depends/network-tools-depends/iperf/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/iperf/package.mk @@ -10,10 +10,7 @@ PKG_URL="https://github.com/esnet/iperf/archive/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain openssl" PKG_LONGDESC="A tool to measuring maximum TCP and UDP bandwidth performance." PKG_TOOLCHAIN="autotools" +PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-shared" - -makeinstall_target() { - : -} diff --git a/packages/addons/addon-depends/network-tools-depends/irssi/package.mk b/packages/addons/addon-depends/network-tools-depends/irssi/package.mk index 1dc952e4e0..512961de77 100644 --- a/packages/addons/addon-depends/network-tools-depends/irssi/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/irssi/package.mk @@ -9,6 +9,7 @@ PKG_SITE="http://www.irssi.org/" PKG_URL="https://github.com/irssi/irssi/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS_TARGET="toolchain glib ncurses openssl" PKG_LONGDESC="Irssi is a terminal based IRC client for UNIX systems." +PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=$SYSROOT_PREFIX \ --disable-glibtest \ @@ -21,7 +22,3 @@ PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=$SYSROOT_PREFIX \ pre_configure_target() { export CFLAGS="$CFLAGS -I$PKG_BUILD" } - -makeinstall_target() { - : -} diff --git a/packages/addons/addon-depends/network-tools-depends/lftp/package.mk b/packages/addons/addon-depends/network-tools-depends/lftp/package.mk index 0b1d5c90c9..f944e56027 100644 --- a/packages/addons/addon-depends/network-tools-depends/lftp/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/lftp/package.mk @@ -9,13 +9,10 @@ PKG_SITE="http://lftp.yar.ru/" PKG_URL="http://lftp.yar.ru/ftp/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain readline openssl zlib libidn2" PKG_LONGDESC="A sophisticated ftp/http client, and a file transfer program supporting a number of network protocols." +PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--disable-nls \ --without-gnutls \ --with-openssl \ --with-readline=$SYSROOT_PREFIX/usr \ --with-zlib=$SYSROOT_PREFIX/usr" - -makeinstall_target() { - : -} diff --git a/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk b/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk index d6482fa415..9379f547ee 100644 --- a/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk @@ -9,6 +9,7 @@ PKG_SITE="http://www.ncftp.com/ncftp/" PKG_URL="ftp://ftp.ncftp.com/ncftp/ncftp-${PKG_VERSION}-src.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="NcFTP is a set of application programs implementing the File Transfer Protocol." +PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_librtmp_rtmp_h=yes \ --enable-readline \ @@ -24,7 +25,3 @@ pre_build_target() { mkdir -p $PKG_BUILD/.$TARGET_NAME cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME } - -makeinstall_target() { - : -} diff --git a/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk b/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk index 02ce92aaa8..b9566dc3f2 100644 --- a/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk @@ -10,6 +10,7 @@ PKG_URL="https://github.com/jpr5/ngrep/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libpcap" PKG_LONGDESC="A tool like GNU grep applied to the network layer." PKG_TOOLCHAIN="autotools" +PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--with-pcap-includes=$SYSROOT_PREFIX/usr/include \ --enable-ipv6 \ @@ -19,7 +20,3 @@ pre_build_target() { mkdir -p $PKG_BUILD/.$TARGET_NAME cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME } - -makeinstall_target() { - : -} diff --git a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk index 9a6e85d33e..cc5b6d7a57 100644 --- a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk @@ -9,6 +9,7 @@ PKG_SITE="http://nmap.org/" PKG_URL="http://nmap.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain openssl" PKG_LONGDESC="Free Security Scanned for Network." +PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --with-pcap=linux \ @@ -26,7 +27,3 @@ pre_configure_target() { export CPPFLAGS="$CPPFLAGS -Iliblua" } - -makeinstall_target() { - : -} diff --git a/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk b/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk index 5f5174b5cd..45eba78181 100644 --- a/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk @@ -9,11 +9,12 @@ PKG_SITE="https://github.com/hasse69/rar2fs" PKG_URL="https://github.com/hasse69/rar2fs/releases/download/v$PKG_VERSION/rar2fs-$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain fuse unrar" PKG_LONGDESC="FUSE file system for reading RAR archives" +PKG_BUILD_FLAGS="-sysroot" -PKG_CONFIGURE_OPTS_TARGET="--with-unrar=$(get_build_dir unrar) \ - --with-unrar-lib=$(get_build_dir unrar) \ - --disable-static-unrar" - -makeinstall_target() { - : +pre_configure_target() { + PKG_CONFIGURE_OPTS_TARGET="--with-unrar=$PKG_BUILD/unrar \ + --with-unrar-lib=$PKG_BUILD/unrar \ + --disable-static-unrar" + cp -a $(get_install_dir unrar)/usr/include/unrar $PKG_BUILD/ + cp -p $(get_install_dir unrar)/usr/lib/libunrar.a $PKG_BUILD/unrar/ } diff --git a/packages/addons/addon-depends/network-tools-depends/rsyncx/package.mk b/packages/addons/addon-depends/network-tools-depends/rsyncx/package.mk deleted file mode 100644 index 277ab8edf2..0000000000 --- a/packages/addons/addon-depends/network-tools-depends/rsyncx/package.mk +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -. $(get_pkg_directory rsync)/package.mk - -PKG_NAME="rsyncx" -PKG_DEPENDS_TARGET="toolchain" - -PKG_CONFIGURE_OPTS_TARGET="--disable-acl-support \ - --disable-xattr-support \ - --with-included-popt" - -makeinstall_target() { - : -} diff --git a/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk b/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk index fc0c58d78b..c21b1d97a1 100644 --- a/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk @@ -9,7 +9,4 @@ PKG_SITE="https://github.com/libfuse/sshfs" PKG_URL="https://github.com/libfuse/sshfs/releases/download/sshfs-$PKG_VERSION/sshfs-$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain fuse glib" PKG_LONGDESC="A filesystem client based on the SSH File Transfer Protocol." - -makeinstall_target() { - : -} +PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk b/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk index 1573ab9350..82f13b046e 100644 --- a/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk @@ -8,6 +8,7 @@ PKG_SITE="http://www.tcpdump.org/" PKG_URL="http://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libpcap libtirpc" PKG_LONGDESC="A program that allows you to dump the traffic on a network." +PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--with-crypto=no" @@ -23,7 +24,3 @@ post_configure_target() { # discard native system includes sed -i "s%-I/usr/include%%g" Makefile } - -makeinstall_target() { - : -} diff --git a/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk b/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk index a8ed4de2ee..8742eae844 100644 --- a/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk @@ -9,11 +9,10 @@ PKG_SITE="http://www.udpxy.com" PKG_URL="http://www.udpxy.com/download/1_23/${PKG_NAME}.${PKG_VERSION}-prod.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A UDP-to-HTTP multicast traffic relay daemon." +PKG_BUILD_FLAGS="-sysroot" + +PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr" configure_target() { export CFLAGS+=" -Wno-stringop-truncation" } - -makeinstall_target() { - : -} diff --git a/packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk b/packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk index f3f4eb15fe..adb26db864 100644 --- a/packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk @@ -9,6 +9,7 @@ PKG_SITE="https://github.com/HewlettPackard/wireless-tools" PKG_URL="https://hewlettpackard.github.io/wireless-tools/$PKG_NAME.$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The Wireless Tools (WT) is a set of tools allowing to manipulate the Wireless Extensions." +PKG_BUILD_FLAGS="-sysroot" make_target() { make PREFIX=/usr CC="$CC" AR="$AR" \ @@ -16,5 +17,5 @@ make_target() { } makeinstall_target() { - : + make PREFIX=$INSTALL/usr install-iwmulticall } diff --git a/packages/addons/tools/network-tools/package.mk b/packages/addons/tools/network-tools/package.mk index 3bcbcf6f4b..0e7576139a 100644 --- a/packages/addons/tools/network-tools/package.mk +++ b/packages/addons/tools/network-tools/package.mk @@ -27,7 +27,7 @@ PKG_DEPENDS_TARGET="toolchain \ ngrep \ nmap \ rar2fs \ - rsyncx \ + rsync \ sshfs \ tcpdump \ udpxy \ @@ -36,55 +36,54 @@ PKG_DEPENDS_TARGET="toolchain \ addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin # bwm-ng - cp -P $(get_build_dir bwm-ng)/.$TARGET_NAME/src/bwm-ng $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir bwm-ng)/usr/bin/bwm-ng $ADDON_BUILD/$PKG_ADDON_ID/bin # iftop - cp -P $(get_build_dir iftop)/.$TARGET_NAME/iftop $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir iftop)/usr/sbin/iftop $ADDON_BUILD/$PKG_ADDON_ID/bin # iperf - cp -P $(get_build_dir iperf)/.$TARGET_NAME/src/iperf3 $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir iperf)/usr/bin/iperf3 $ADDON_BUILD/$PKG_ADDON_ID/bin ln -s iperf3 $ADDON_BUILD/$PKG_ADDON_ID/bin/iperf # irssi - cp -P $(get_build_dir irssi)/.$TARGET_NAME/src/fe-text/irssi $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir irssi)/usr/bin/irssi $ADDON_BUILD/$PKG_ADDON_ID/bin # lftp - cp -P $(get_build_dir lftp)/.$TARGET_NAME/src/lftp $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir lftp)/usr/bin/lftp $ADDON_BUILD/$PKG_ADDON_ID/bin # ncftp - cp -P $(get_build_dir ncftp)/.$TARGET_NAME/bin/ncftp $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir ncftp)/.$TARGET_NAME/bin/ncftpbatch $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir ncftp)/.$TARGET_NAME/bin/ncftpget $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir ncftp)/.$TARGET_NAME/bin/ncftpls $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir ncftp)/.$TARGET_NAME/bin/ncftpput $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir ncftp)/usr/bin/ncftp $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir ncftp)/usr/bin/ncftpbatch $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir ncftp)/usr/bin/ncftpget $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir ncftp)/usr/bin/ncftpls $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir ncftp)/usr/bin/ncftpput $ADDON_BUILD/$PKG_ADDON_ID/bin # ngrep - cp -P $(get_build_dir ngrep)/.$TARGET_NAME/ngrep $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir ngrep)/usr/bin/ngrep $ADDON_BUILD/$PKG_ADDON_ID/bin # nmap - cp -P $(get_build_dir nmap)/nmap $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir nmap)/usr/bin/nmap $ADDON_BUILD/$PKG_ADDON_ID/bin # rar2fs - cp -P $(get_build_dir rar2fs)/.$TARGET_NAME/mkr2i $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir rar2fs)/.$TARGET_NAME/rar2fs $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir rar2fs)/usr/bin/mkr2i $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir rar2fs)/usr/bin/rar2fs $ADDON_BUILD/$PKG_ADDON_ID/bin - # rsyncx - cp -P $(get_build_dir rsyncx)/.$TARGET_NAME/rsync $ADDON_BUILD/$PKG_ADDON_ID/bin + # rsync + cp -P $(get_install_dir rsync)/usr/bin/rsync $ADDON_BUILD/$PKG_ADDON_ID/bin # sshfs - cp -P $(get_build_dir sshfs)/.$TARGET_NAME/sshfs $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir sshfs)/usr/bin/sshfs $ADDON_BUILD/$PKG_ADDON_ID/bin # tcpdump - cp -P $(get_build_dir tcpdump)/.$TARGET_NAME/tcpdump $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir tcpdump)/usr/sbin/tcpdump $ADDON_BUILD/$PKG_ADDON_ID/bin # udpxy - cp -P $(get_build_dir udpxy)/udpxy $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir udpxy)/usr/bin/udpxy $ADDON_BUILD/$PKG_ADDON_ID/bin # wireless_tools - cp -P $(get_build_dir wireless_tools)/iwmulticall $ADDON_BUILD/$PKG_ADDON_ID/bin - ln -s iwmulticall $ADDON_BUILD/$PKG_ADDON_ID/bin/iwconfig - ln -s iwmulticall $ADDON_BUILD/$PKG_ADDON_ID/bin/iwgetid - ln -s iwmulticall $ADDON_BUILD/$PKG_ADDON_ID/bin/iwlist - ln -s iwmulticall $ADDON_BUILD/$PKG_ADDON_ID/bin/iwspy - ln -s iwmulticall $ADDON_BUILD/$PKG_ADDON_ID/bin/iwpriv + cp -P $(get_install_dir wireless_tools)/usr/sbin/iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin + ln -s iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin/iwgetid + ln -s iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin/iwlist + ln -s iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin/iwspy + ln -s iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin/iwpriv } diff --git a/packages/network/rsync/package.mk b/packages/network/rsync/package.mk index 64abf9e677..01c76b233d 100644 --- a/packages/network/rsync/package.mk +++ b/packages/network/rsync/package.mk @@ -10,7 +10,11 @@ PKG_URL="https://download.samba.org/pub/rsync/src/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_HOST="autotools:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A very fast method for bringing remote files into sync." +PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_HOST="--with-included-popt \ --with-included-zlib" +PKG_CONFIGURE_OPTS_TARGET="--disable-acl-support \ + --disable-xattr-support \ + --with-included-popt"