From 3baf91e87d93471e6030f73a7908630f4e278dc4 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:12 +0000 Subject: [PATCH] network: automated code cleanup Signed-off-by: Ian Leonard --- packages/network/avahi/package.mk | 38 ++++---- packages/network/bluez/package.mk | 30 +++---- packages/network/connman/package.mk | 30 +++---- packages/network/ethtool/package.mk | 2 +- packages/network/iptables/package.mk | 14 +-- packages/network/iw/package.mk | 8 +- packages/network/iwd/package.mk | 2 +- packages/network/libdnet/package.mk | 8 +- packages/network/libmnl/package.mk | 2 +- packages/network/libnfs/package.mk | 4 +- packages/network/libnftnl/package.mk | 2 +- packages/network/libnl/package.mk | 2 +- packages/network/libshairplay/package.mk | 8 +- packages/network/libssh/package.mk | 18 ++-- packages/network/libtirpc/package.mk | 2 +- packages/network/netbase/package.mk | 8 +- packages/network/nss-mdns/package.mk | 6 +- packages/network/openssh/package.mk | 24 +++--- packages/network/openvpn/package.mk | 6 +- packages/network/rpcbind/package.mk | 2 +- packages/network/rsync/package.mk | 2 +- packages/network/samba/package.mk | 96 ++++++++++----------- packages/network/wireguard-tools/package.mk | 14 +-- packages/network/wireless-regdb/package.mk | 4 +- packages/network/wpa_supplicant/package.mk | 20 ++--- 25 files changed, 176 insertions(+), 176 deletions(-) diff --git a/packages/network/avahi/package.mk b/packages/network/avahi/package.mk index dfcd11e2ab..d47b7340e2 100644 --- a/packages/network/avahi/package.mk +++ b/packages/network/avahi/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.8" PKG_SHA256="c15e750ef7c6df595fb5f2ce10cac0fee2353649600e6919ad08ae8871e4945f" PKG_LICENSE="GPL" PKG_SITE="http://avahi.org/" -PKG_URL="https://github.com/lathiat/avahi/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/lathiat/avahi/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain expat libdaemon dbus connman gettext" PKG_LONGDESC="Service Discovery for Linux using mDNS/DNS-SD, compatible with Bonjour." PKG_TOOLCHAIN="configure" @@ -60,31 +60,31 @@ pre_configure_target() { post_makeinstall_target() { # disable wide-area - sed -e "s,^.*enable-wide-area=.*$,enable-wide-area=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf + sed -e "s,^.*enable-wide-area=.*$,enable-wide-area=no,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf # publish-hinfo - sed -e "s,^.*publish-hinfo=.*$,publish-hinfo=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf + sed -e "s,^.*publish-hinfo=.*$,publish-hinfo=no,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf # publish-workstation - sed -e "s,^.*publish-workstation=.*$,publish-workstation=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf + sed -e "s,^.*publish-workstation=.*$,publish-workstation=no,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf # browse domains? - sed -e "s,^.*browse-domains=.*$,# browse-domains=,g" -i $INSTALL/etc/avahi/avahi-daemon.conf + sed -e "s,^.*browse-domains=.*$,# browse-domains=,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf # set root user as default - sed -e "s,22,22\n path=/storage\n u=root,g" -i $INSTALL/etc/avahi/services/sftp-ssh.service + sed -e "s,22,22\n path=/storage\n u=root,g" -i ${INSTALL}/etc/avahi/services/sftp-ssh.service - rm -rf $INSTALL/etc/avahi/avahi-dnsconfd.action - rm -rf $INSTALL/etc/avahi/services/ssh.service - if [ ! $SFTP_SERVER = "yes" ]; then - rm -rf $INSTALL/etc/avahi/services/sftp-ssh.service + rm -rf ${INSTALL}/etc/avahi/avahi-dnsconfd.action + rm -rf ${INSTALL}/etc/avahi/services/ssh.service + if [ ! ${SFTP_SERVER} = "yes" ]; then + rm -rf ${INSTALL}/etc/avahi/services/sftp-ssh.service fi - rm -rf $INSTALL/usr/lib/systemd - rm -f $INSTALL/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service - rm -f $INSTALL/usr/sbin/avahi-dnsconfd - rm -f $INSTALL/usr/bin/avahi-bookmarks - rm -f $INSTALL/usr/bin/avahi-publish* - rm -f $INSTALL/usr/bin/avahi-resolve* - rm -f $INSTALL/usr/lib/libdns_sd* + rm -rf ${INSTALL}/usr/lib/systemd + rm -f ${INSTALL}/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service + rm -f ${INSTALL}/usr/sbin/avahi-dnsconfd + rm -f ${INSTALL}/usr/bin/avahi-bookmarks + rm -f ${INSTALL}/usr/bin/avahi-publish* + rm -f ${INSTALL}/usr/bin/avahi-resolve* + rm -f ${INSTALL}/usr/lib/libdns_sd* - mkdir -p $INSTALL/usr/share/services - cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services + mkdir -p ${INSTALL}/usr/share/services + cp -P ${PKG_DIR}/default.d/*.conf ${INSTALL}/usr/share/services } post_install() { diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk index 0bc8afa131..35c24bae3c 100644 --- a/packages/network/bluez/package.mk +++ b/packages/network/bluez/package.mk @@ -19,7 +19,7 @@ else BLUEZ_CONFIG="--disable-debug" fi -BLUEZ_CONFIG="$BLUEZ_CONFIG --enable-monitor --enable-test" +BLUEZ_CONFIG+=" --enable-monitor --enable-test" PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \ --disable-silent-rules \ @@ -34,35 +34,35 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \ --disable-experimental \ --enable-sixaxis \ --with-gnu-ld \ - $BLUEZ_CONFIG \ + ${BLUEZ_CONFIG} \ storagedir=/storage/.cache/bluetooth" pre_configure_target() { # bluez fails to build in subdirs - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} export LIBS="-lncurses" } post_makeinstall_target() { - rm -rf $INSTALL/usr/lib/systemd - rm -rf $INSTALL/usr/bin/bccmd - rm -rf $INSTALL/usr/bin/bluemoon - rm -rf $INSTALL/usr/bin/ciptool - rm -rf $INSTALL/usr/share/dbus-1 + rm -rf ${INSTALL}/usr/lib/systemd + rm -rf ${INSTALL}/usr/bin/bccmd + rm -rf ${INSTALL}/usr/bin/bluemoon + rm -rf ${INSTALL}/usr/bin/ciptool + rm -rf ${INSTALL}/usr/share/dbus-1 - mkdir -p $INSTALL/etc/bluetooth - cp src/main.conf $INSTALL/etc/bluetooth - sed -i $INSTALL/etc/bluetooth/main.conf \ + mkdir -p ${INSTALL}/etc/bluetooth + cp src/main.conf ${INSTALL}/etc/bluetooth + sed -i ${INSTALL}/etc/bluetooth/main.conf \ -e "s|^#\[Policy\]|\[Policy\]|g" \ -e "s|^#AutoEnable.*|AutoEnable=true|g" - mkdir -p $INSTALL/usr/share/services - cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services + mkdir -p ${INSTALL}/usr/share/services + cp -P ${PKG_DIR}/default.d/*.conf ${INSTALL}/usr/share/services # bluez looks in /etc/firmware/ - ln -sf /usr/lib/firmware $INSTALL/etc/firmware + ln -sf /usr/lib/firmware ${INSTALL}/etc/firmware } post_install() { diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk index 0390ec7843..7c8a3cf9e0 100644 --- a/packages/network/connman/package.mk +++ b/packages/network/connman/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="40947be3848b0a864a366f8d67ce347265ea98c4" # 1.38 + HEAD 12/12/20 PKG_SHA256="d59e93caf297f0ad8d2034fcf956747ba879266e2ad9b7e42abcce86867083e6" PKG_LICENSE="GPL" PKG_SITE="http://www.connman.net" -PKG_URL="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-$PKG_VERSION.tar.gz" +PKG_URL="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain glib readline dbus iptables" PKG_LONGDESC="A modular network connection manager." PKG_TOOLCHAIN="autotools" @@ -44,13 +44,13 @@ PKG_CONFIGURE_OPTS_TARGET="--srcdir=.. \ --with-systemdunitdir=/usr/lib/systemd/system \ --disable-silent-rules" -if [ "$WIREGUARD_SUPPORT" = "yes" ]; then +if [ "${WIREGUARD_SUPPORT}" = "yes" ]; then PKG_CONFIGURE_OPTS_TARGET+=" --enable-wireguard=builtin" else PKG_CONFIGURE_OPTS_TARGET+=" --disable-wireguard" fi -case "$WIRELESS_DAEMON" in +case "${WIRELESS_DAEMON}" in wpa_supplicant) PKG_DEPENDS_TARGET+=" wpa_supplicant" PKG_CONFIGURE_OPTS_TARGET+=" WPASUPPLICANT=/usr/bin/wpa_supplicant \ @@ -69,18 +69,18 @@ PKG_MAKE_OPTS_TARGET="storagedir=/storage/.cache/connman \ statedir=/run/connman" post_makeinstall_target() { - rm -rf $INSTALL/usr/lib/systemd - rm -rf $INSTALL/usr/lib/tmpfiles.d/connman_resolvconf.conf + rm -rf ${INSTALL}/usr/lib/systemd + rm -rf ${INSTALL}/usr/lib/tmpfiles.d/connman_resolvconf.conf - mkdir -p $INSTALL/usr/bin - cp -P client/connmanctl $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -P client/connmanctl ${INSTALL}/usr/bin - mkdir -p $INSTALL/usr/lib/connman - cp -P $PKG_DIR/scripts/connman-setup $INSTALL/usr/lib/connman + mkdir -p ${INSTALL}/usr/lib/connman + cp -P ${PKG_DIR}/scripts/connman-setup ${INSTALL}/usr/lib/connman - mkdir -p $INSTALL/etc/connman - cp ../src/main.conf $INSTALL/etc/connman - sed -i $INSTALL/etc/connman/main.conf \ + mkdir -p ${INSTALL}/etc/connman + cp ../src/main.conf ${INSTALL}/etc/connman + sed -i ${INSTALL}/etc/connman/main.conf \ -e "s|^# BackgroundScanning.*|BackgroundScanning = true|g" \ -e "s|^# UseGatewaysAsTimeservers.*|UseGatewaysAsTimeservers = false|g" \ -e "s|^# FallbackNameservers.*|FallbackNameservers = 8.8.8.8,8.8.4.4|g" \ @@ -91,8 +91,8 @@ post_makeinstall_target() { -e "s|^# PersistentTetheringMode.*|PersistentTetheringMode = true|g" \ -e "s|^# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb|NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb,docker,veth,zt|g" - mkdir -p $INSTALL/usr/share/connman/ - cp $PKG_DIR/config/settings $INSTALL/usr/share/connman/ + mkdir -p ${INSTALL}/usr/share/connman/ + cp ${PKG_DIR}/config/settings ${INSTALL}/usr/share/connman/ } post_install() { @@ -100,7 +100,7 @@ post_install() { add_group system 430 enable_service connman.service - if [ "$WIREGUARD_SUPPORT" = "yes" ]; then + if [ "${WIREGUARD_SUPPORT}" = "yes" ]; then enable_service connman-vpn.service fi } diff --git a/packages/network/ethtool/package.mk b/packages/network/ethtool/package.mk index 7f47f03280..f9a28bc629 100644 --- a/packages/network/ethtool/package.mk +++ b/packages/network/ethtool/package.mk @@ -7,6 +7,6 @@ PKG_VERSION="5.10" PKG_SHA256="817d5396a9307b4c637b435d4c558b8f5f964a1464a035ca3c0180f4cc93cfcf" PKG_LICENSE="GPL" PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/" -PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://www.kernel.org/pub/software/network/ethtool/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libmnl" PKG_LONGDESC="Ethtool is used for querying settings of an ethernet device and changing them." diff --git a/packages/network/iptables/package.mk b/packages/network/iptables/package.mk index 59ab8fe4e7..450e839e88 100644 --- a/packages/network/iptables/package.mk +++ b/packages/network/iptables/package.mk @@ -7,20 +7,20 @@ PKG_VERSION="1.8.6" PKG_SHA256="a0f4fe0c3eb8faa5bd9c8376d132f340b9558e750c91deb2d5028aa3d0047767" PKG_LICENSE="GPL" PKG_SITE="http://www.netfilter.org/" -PKG_URL="http://www.netfilter.org/projects/iptables/files/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.netfilter.org/projects/iptables/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain linux:host libmnl libnftnl" PKG_LONGDESC="IP packet filter administration." PKG_TOOLCHAIN="autotools" post_makeinstall_target() { - mkdir -p $INSTALL/usr/config/iptables/ - cp -PR $PKG_DIR/config/README $INSTALL/usr/config/iptables/ + mkdir -p ${INSTALL}/usr/config/iptables/ + cp -PR ${PKG_DIR}/config/README ${INSTALL}/usr/config/iptables/ - mkdir -p $INSTALL/etc/iptables/ - cp -PR $PKG_DIR/config/* $INSTALL/etc/iptables/ + mkdir -p ${INSTALL}/etc/iptables/ + cp -PR ${PKG_DIR}/config/* ${INSTALL}/etc/iptables/ - mkdir -p $INSTALL/usr/lib/libreelec - cp $PKG_DIR/scripts/iptables_helper $INSTALL/usr/lib/libreelec + mkdir -p ${INSTALL}/usr/lib/libreelec + cp ${PKG_DIR}/scripts/iptables_helper ${INSTALL}/usr/lib/libreelec } post_install() { diff --git a/packages/network/iw/package.mk b/packages/network/iw/package.mk index 223c7257b5..600179dc59 100644 --- a/packages/network/iw/package.mk +++ b/packages/network/iw/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="5.9" PKG_SHA256="293a07109aeb7e36267cf59e3ce52857e9ffae3a6666eb8ac77894b1839fe1f2" PKG_LICENSE="PUBLIC_DOMAIN" PKG_SITE="http://wireless.kernel.org/en/users/Documentation/iw" -PKG_URL="https://www.kernel.org/pub/software/network/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz" +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." # iw fails at runtime with lto enabled pre_configure_target() { - export LDFLAGS="$LDFLAGS -pthread" + export LDFLAGS="${LDFLAGS} -pthread" } post_makeinstall_target() { - mkdir -p $INSTALL/usr/lib/iw - cp $PKG_DIR/scripts/setregdomain $INSTALL/usr/lib/iw + mkdir -p ${INSTALL}/usr/lib/iw + cp ${PKG_DIR}/scripts/setregdomain ${INSTALL}/usr/lib/iw } diff --git a/packages/network/iwd/package.mk b/packages/network/iwd/package.mk index b060b1ddaf..505d7e8baa 100644 --- a/packages/network/iwd/package.mk +++ b/packages/network/iwd/package.mk @@ -33,7 +33,7 @@ post_makeinstall_target() { -e 's|^\(ProtectControlGroups=.*\)$|#\1|g' \ -e 's|^\(ProtectKernelModules=.*\)$|#\1|g' \ -e 's|^\(ConfigurationDirectory=.*\)$|#\1|g' \ - -i $INSTALL/usr/lib/systemd/system/iwd.service + -i ${INSTALL}/usr/lib/systemd/system/iwd.service } post_install() { diff --git a/packages/network/libdnet/package.mk b/packages/network/libdnet/package.mk index 6e14fdb52c..aaae711a08 100644 --- a/packages/network/libdnet/package.mk +++ b/packages/network/libdnet/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.14" PKG_SHA256="592599c54a57102a177270f3a2caabda2c2ac7768b977d7458feba97da923dfe" PKG_LICENSE="BSD" PKG_SITE="https://github.com/ofalk/libdnet" -PKG_URL="https://github.com/ofalk/libdnet/archive/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/ofalk/libdnet/archive/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A simplified, portable interface to several low-level networking routines" PKG_TOOLCHAIN="autotools" @@ -20,10 +20,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_strlcat=no \ --disable-python" pre_configure_target() { - export CFLAGS+=" -I$PKG_BUILD/include" + export CFLAGS+=" -I${PKG_BUILD}/include" } post_makeinstall_target() { - cp $SYSROOT_PREFIX/usr/bin/dnet-config \ - $TOOLCHAIN/bin/dnet-config + cp ${SYSROOT_PREFIX}/usr/bin/dnet-config \ + ${TOOLCHAIN}/bin/dnet-config } diff --git a/packages/network/libmnl/package.mk b/packages/network/libmnl/package.mk index ec2eb2b51d..a7cee1dfbb 100644 --- a/packages/network/libmnl/package.mk +++ b/packages/network/libmnl/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="1.0.4" PKG_SHA256="171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81" PKG_LICENSE="GPL" PKG_SITE="http://netfilter.org/projects/libmnl" -PKG_URL="http://netfilter.org/projects/libmnl/files/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://netfilter.org/projects/libmnl/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A minimalistic user-space library oriented to Netlink developers." diff --git a/packages/network/libnfs/package.mk b/packages/network/libnfs/package.mk index 6dacdd2415..b723ae318e 100644 --- a/packages/network/libnfs/package.mk +++ b/packages/network/libnfs/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="4.0.0" PKG_SHA256="6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d" PKG_LICENSE="LGPL2.1+" PKG_SITE="https://github.com/sahlberg/libnfs" -PKG_URL="https://github.com/sahlberg/libnfs/archive/libnfs-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/sahlberg/libnfs/archive/libnfs-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A client library for accessing NFS shares over a network." PKG_TOOLCHAIN="autotools" @@ -15,5 +15,5 @@ PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--disable-examples" pre_configure_target() { - export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64" + export CFLAGS="${CFLAGS} -D_FILE_OFFSET_BITS=64" } diff --git a/packages/network/libnftnl/package.mk b/packages/network/libnftnl/package.mk index 3f1d15b7b8..079387dbcd 100644 --- a/packages/network/libnftnl/package.mk +++ b/packages/network/libnftnl/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.8" PKG_SHA256="04a3fa5b08b736268f7e65836b9f05d9d5f438181467bee3c76c3c4a4f3ab711" PKG_LICENSE="GPL" PKG_SITE="http://netfilter.org/projects/libnftnl" -PKG_URL="http://netfilter.org/projects/libnftnl/files/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://netfilter.org/projects/libnftnl/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libmnl" PKG_LONGDESC="A userspace library providing a low-level netlink programming interface (API) to the in-kernel nf_tables subsystem." diff --git a/packages/network/libnl/package.mk b/packages/network/libnl/package.mk index ef2a455bb4..251d958ed1 100644 --- a/packages/network/libnl/package.mk +++ b/packages/network/libnl/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="3.5.0" PKG_SHA256="352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa" PKG_LICENSE="LGPL" PKG_SITE="https://github.com/thom311/libnl" -PKG_URL="https://github.com/thom311/libnl/releases/download/libnl${PKG_VERSION//./_}/libnl-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/thom311/libnl/releases/download/libnl${PKG_VERSION//./_}/libnl-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A library for applications dealing with netlink socket." diff --git a/packages/network/libshairplay/package.mk b/packages/network/libshairplay/package.mk index c0969a18d9..78d51a5eb3 100644 --- a/packages/network/libshairplay/package.mk +++ b/packages/network/libshairplay/package.mk @@ -7,16 +7,16 @@ PKG_VERSION="096b61ad14c90169f438e690d096e3fcf87e504e" PKG_SHA256="7e2b013ffe75ea2f13fb12b1aa38b8e2e8b1899ac292d57f05d7b352a3a181cf" PKG_LICENSE="MIT" PKG_SITE="https://github.com/juhovh/shairplay" -PKG_URL="https://github.com/juhovh/shairplay/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/juhovh/shairplay/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain avahi" PKG_LONGDESC="Apple airplay and raop protocol server" PKG_TOOLCHAIN="autotools" pre_configure_target() { - CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/avahi-compat-libdns_sd" + CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/avahi-compat-libdns_sd" } post_makeinstall_target() { - mkdir -p $INSTALL/etc/shairplay - cp -P ../airport.key $INSTALL/etc/shairplay + mkdir -p ${INSTALL}/etc/shairplay + cp -P ../airport.key ${INSTALL}/etc/shairplay } diff --git a/packages/network/libssh/package.mk b/packages/network/libssh/package.mk index 621a039110..4f7eed7125 100644 --- a/packages/network/libssh/package.mk +++ b/packages/network/libssh/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.9.5" PKG_SHA256="acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718" PKG_LICENSE="LGPL" PKG_SITE="http://www.libssh.org/" -PKG_URL="https://www.libssh.org/files/$(get_pkg_version_maj_min)/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://www.libssh.org/files/$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain zlib openssl" PKG_LONGDESC="Library for accessing ssh client services through C libraries." @@ -20,14 +20,14 @@ PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF \ makeinstall_target() { # install static library only - mkdir -p $SYSROOT_PREFIX/usr/lib - cp $PKG_BUILD/.$TARGET_NAME/src/libssh.a $SYSROOT_PREFIX/usr/lib + mkdir -p ${SYSROOT_PREFIX}/usr/lib + cp ${PKG_BUILD}/.${TARGET_NAME}/src/libssh.a ${SYSROOT_PREFIX}/usr/lib - mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig - cp $PKG_BUILD/.$TARGET_NAME/libssh.pc $SYSROOT_PREFIX/usr/lib/pkgconfig + mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig + cp ${PKG_BUILD}/.${TARGET_NAME}/libssh.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig - mkdir -p $SYSROOT_PREFIX/usr/include/libssh - cp $PKG_BUILD/include/libssh/{callbacks.h,legacy.h,libssh.h,server.h,sftp.h,ssh2.h} \ - $PKG_BUILD/.$TARGET_NAME/include/libssh/libssh_version.h \ - $SYSROOT_PREFIX/usr/include/libssh + mkdir -p ${SYSROOT_PREFIX}/usr/include/libssh + cp ${PKG_BUILD}/include/libssh/{callbacks.h,legacy.h,libssh.h,server.h,sftp.h,ssh2.h} \ + ${PKG_BUILD}/.${TARGET_NAME}/include/libssh/libssh_version.h \ + ${SYSROOT_PREFIX}/usr/include/libssh } diff --git a/packages/network/libtirpc/package.mk b/packages/network/libtirpc/package.mk index 7a6d85a800..8f6ca5de86 100644 --- a/packages/network/libtirpc/package.mk +++ b/packages/network/libtirpc/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3.1" PKG_SHA256="245895caf066bec5e3d4375942c8cb4366adad184c29c618d97f724ea309ee17" PKG_LICENSE="GPL" PKG_SITE="https://sourceforge.net/projects/libtirpc/" -PKG_URL="https://downloads.sourceforge.net/project/libtirpc/libtirpc/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="https://downloads.sourceforge.net/project/libtirpc/libtirpc/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A port of Suns Transport-Independent RPC library to Linux." PKG_BUILD_FLAGS="+pic" diff --git a/packages/network/netbase/package.mk b/packages/network/netbase/package.mk index 6ea7b2a2a8..000bcd35f0 100644 --- a/packages/network/netbase/package.mk +++ b/packages/network/netbase/package.mk @@ -6,13 +6,13 @@ PKG_VERSION="6.2" PKG_SHA256="309a24146a06347d654b261e9e07a82fab844b173674a42e223803dd8258541e" PKG_LICENSE="GPL" PKG_SITE="https://salsa.debian.org/md/netbase" -PKG_URL="http://ftp.debian.org/debian/pool/main/n/netbase/netbase_$PKG_VERSION.tar.xz" +PKG_URL="http://ftp.debian.org/debian/pool/main/n/netbase/netbase_${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The netbase package provides data for network services and protocols from the iana db." PKG_TOOLCHAIN="manual" makeinstall_target() { - mkdir -p $INSTALL/etc - cp etc/protocols $INSTALL/etc - cp etc/services $INSTALL/etc + mkdir -p ${INSTALL}/etc + cp etc/protocols ${INSTALL}/etc + cp etc/services ${INSTALL}/etc } diff --git a/packages/network/nss-mdns/package.mk b/packages/network/nss-mdns/package.mk index 53aa3b3f74..baa64e18b1 100644 --- a/packages/network/nss-mdns/package.mk +++ b/packages/network/nss-mdns/package.mk @@ -7,12 +7,12 @@ PKG_VERSION="0.14.1" PKG_SHA256="4fe54bffd20e410fc41382dc6c4708cdfa3a65f50c3753f262dc4c78fd864a6e" PKG_LICENSE="GPL" PKG_SITE="https://github.com/lathiat/nss-mdns" -PKG_URL="https://github.com/lathiat/nss-mdns/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/lathiat/nss-mdns/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain avahi" PKG_LONGDESC="A plugin for nss to allow name resolution via Multicast DNS." PKG_TOOLCHAIN="autotools" post_makeinstall_target() { - mkdir -p $INSTALL/etc - cp $PKG_DIR/config/nsswitch.conf $INSTALL/etc/nsswitch.conf + mkdir -p ${INSTALL}/etc + cp ${PKG_DIR}/config/nsswitch.conf ${INSTALL}/etc/nsswitch.conf } diff --git a/packages/network/openssh/package.mk b/packages/network/openssh/package.mk index 66f864061f..2bc77c3282 100644 --- a/packages/network/openssh/package.mk +++ b/packages/network/openssh/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="8.4p1" PKG_SHA256="5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24" PKG_LICENSE="OSS" PKG_SITE="https://www.openssh.com/" -PKG_URL="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain openssl zlib" PKG_LONGDESC="An open re-implementation of the SSH package." PKG_TOOLCHAIN="autotools" @@ -33,25 +33,25 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_rpc_types_h=no \ --without-pam" pre_configure_target() { - export LD="$CC" - export LDFLAGS="$TARGET_CFLAGS $TARGET_LDFLAGS" + export LD="${CC}" + export LDFLAGS="${TARGET_CFLAGS} ${TARGET_LDFLAGS}" } post_makeinstall_target() { - rm -rf $INSTALL/usr/lib/openssh/ssh-keysign - rm -rf $INSTALL/usr/lib/openssh/ssh-pkcs11-helper - if [ ! $SFTP_SERVER = "yes" ]; then - rm -rf $INSTALL/usr/lib/openssh/sftp-server + rm -rf ${INSTALL}/usr/lib/openssh/ssh-keysign + rm -rf ${INSTALL}/usr/lib/openssh/ssh-pkcs11-helper + if [ ! ${SFTP_SERVER} = "yes" ]; then + rm -rf ${INSTALL}/usr/lib/openssh/sftp-server fi - rm -rf $INSTALL/usr/bin/ssh-add - rm -rf $INSTALL/usr/bin/ssh-agent - rm -rf $INSTALL/usr/bin/ssh-keyscan + rm -rf ${INSTALL}/usr/bin/ssh-add + rm -rf ${INSTALL}/usr/bin/ssh-agent + rm -rf ${INSTALL}/usr/bin/ssh-keyscan sed -e "s|^#PermitRootLogin.*|PermitRootLogin yes|g" \ -e "s|^#StrictModes.*|StrictModes no|g" \ - -i $INSTALL/etc/ssh/sshd_config + -i ${INSTALL}/etc/ssh/sshd_config - debug_strip $INSTALL/usr + debug_strip ${INSTALL}/usr } post_install() { diff --git a/packages/network/openvpn/package.mk b/packages/network/openvpn/package.mk index cdc18f009d..8a2d74cbeb 100644 --- a/packages/network/openvpn/package.mk +++ b/packages/network/openvpn/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.4.10" PKG_SHA256="cf285395a679f0b68c0acde2cb2480e8ead6ca07ff14c1bc52ae65a1243aa377" PKG_LICENSE="GPL" PKG_SITE="https://openvpn.net" -PKG_URL="https://swupdate.openvpn.org/community/releases/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://swupdate.openvpn.org/community/releases/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain lzo openssl" PKG_LONGDESC="A full featured SSL VPN software solution that integrates OpenVPN server capabilities." @@ -22,6 +22,6 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_have_decl_TUNSETPERSIST=no \ --disable-debug" post_makeinstall_target() { - mkdir -p $INSTALL/usr/bin - ln -sf ../sbin/openvpn $INSTALL/usr/bin/openvpn + mkdir -p ${INSTALL}/usr/bin + ln -sf ../sbin/openvpn ${INSTALL}/usr/bin/openvpn } diff --git a/packages/network/rpcbind/package.mk b/packages/network/rpcbind/package.mk index 4d9a667ae8..9733908577 100644 --- a/packages/network/rpcbind/package.mk +++ b/packages/network/rpcbind/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.2.5" PKG_SHA256="2ce360683963b35c19c43f0ee2c7f18aa5b81ef41c3fdbd15ffcb00b8bffda7a" PKG_LICENSE="OSS" PKG_SITE="http://rpcbind.sourceforge.net/" -PKG_URL="$SOURCEFORGE_SRC/rpcbind/rpcbind/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="${SOURCEFORGE_SRC}/rpcbind/rpcbind/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libtirpc systemd" PKG_LONGDESC="The rpcbind utility is a server that converts RPC program numbers into universal addresses." diff --git a/packages/network/rsync/package.mk b/packages/network/rsync/package.mk index eb6076068f..dad8087252 100644 --- a/packages/network/rsync/package.mk +++ b/packages/network/rsync/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="3.2.3" PKG_SHA256="becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e" PKG_LICENSE="GPLv3" PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html" -PKG_URL="https://download.samba.org/pub/rsync/src/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://download.samba.org/pub/rsync/src/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="autotools:host zlib:host zstd:host" PKG_DEPENDS_TARGET="toolchain zlib openssl" PKG_LONGDESC="A very fast method for bringing remote files into sync." diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index de75766c7a..5b03116bc6 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="4.13.3" PKG_SHA256="c10585d43f33656fe4e1f9ff8bf40ea57d8d5b653521c1cc198fbf4922756541" PKG_LICENSE="GPLv3+" PKG_SITE="https://www.samba.org" -PKG_URL="https://download.samba.org/pub/samba/stable/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://download.samba.org/pub/samba/stable/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain attr heimdal:host e2fsprogs Python3 zlib readline popt libaio connman gnutls" PKG_NEED_UNPACK="$(get_pkg_directory heimdal) $(get_pkg_directory e2fsprogs)" PKG_LONGDESC="A free SMB / CIFS fileserver and client." @@ -16,14 +16,14 @@ PKG_BUILD_FLAGS="-gold" configure_package() { #PKG_WAF_VERBOSE="-v" - if [ "$AVAHI_DAEMON" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi" + if [ "${AVAHI_DAEMON}" = yes ]; then + PKG_DEPENDS_TARGET+=" avahi" SMB_AVAHI="--enable-avahi" else SMB_AVAHI="--disable-avahi" fi - if [ "$TARGET_ARCH" = x86_64 ]; then + if [ "${TARGET_ARCH}" = x86_64 ]; then SMB_AESNI="--accel-aes=intelaesni" else SMB_AESNI="--accel-aes=none" @@ -40,9 +40,9 @@ configure_package() { --with-privatelibdir=/usr/lib \ --with-sockets-dir=/run/samba \ --with-configdir=/run/samba \ - --with-libiconv=$SYSROOT_PREFIX/usr \ + --with-libiconv=${SYSROOT_PREFIX}/usr \ --cross-compile \ - --cross-answers=$PKG_BUILD/cache.txt \ + --cross-answers=${PKG_BUILD}/cache.txt \ --hostcc=gcc \ --enable-fhs \ --without-dmapi \ @@ -50,8 +50,8 @@ configure_package() { --disable-rpath \ --disable-rpath-install \ --disable-rpath-private-install \ - $SMB_AVAHI \ - $SMB_AESNI \ + ${SMB_AVAHI} \ + ${SMB_AESNI} \ --disable-cups \ --disable-iprint \ --with-relro \ @@ -84,35 +84,35 @@ configure_package() { PKG_SAMBA_TARGET="smbclient,client/smbclient,smbtree,nmblookup,testparm" - if [ "$SAMBA_SERVER" = "yes" ]; then + if [ "${SAMBA_SERVER}" = "yes" ]; then PKG_SAMBA_TARGET+=",smbd/smbd,nmbd,smbpasswd" fi } pre_configure_target() { # samba uses its own build directory - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} # work around link issues - export LDFLAGS="$LDFLAGS -lreadline -lncurses" + export LDFLAGS="${LDFLAGS} -lreadline -lncurses" # support 64-bit offsets and seeks on 32-bit platforms - if [ "$TARGET_ARCH" = "arm" ]; then + if [ "${TARGET_ARCH}" = "arm" ]; then export CFLAGS+=" -D_FILE_OFFSET_BITS=64 -D_OFF_T_DEFINED_ -Doff_t=off64_t -Dlseek=lseek64" fi } configure_target() { - cp $PKG_DIR/config/samba4-cache.txt $PKG_BUILD/cache.txt - echo "Checking uname machine type: \"$TARGET_ARCH\"" >> $PKG_BUILD/cache.txt + cp ${PKG_DIR}/config/samba4-cache.txt ${PKG_BUILD}/cache.txt + echo "Checking uname machine type: \"${TARGET_ARCH}\"" >> ${PKG_BUILD}/cache.txt - export COMPILE_ET=$TOOLCHAIN/bin/heimdal_compile_et - export ASN1_COMPILE=$TOOLCHAIN/bin/heimdal_asn1_compile + export COMPILE_ET=${TOOLCHAIN}/bin/heimdal_compile_et + export ASN1_COMPILE=${TOOLCHAIN}/bin/heimdal_asn1_compile - PYTHON_CONFIG="$SYSROOT_PREFIX/usr/bin/python3-config" \ + PYTHON_CONFIG="${SYSROOT_PREFIX}/usr/bin/python3-config" \ python_LDFLAGS="" python_LIBDIR="" \ - PYTHON=${TOOLCHAIN}/bin/python3 ./configure $PKG_CONFIGURE_OPTS + PYTHON=${TOOLCHAIN}/bin/python3 ./configure ${PKG_CONFIGURE_OPTS} } # disable icu, there is no buildswitch to disable @@ -123,12 +123,12 @@ pre_make_target() { } make_target() { - ./buildtools/bin/waf build ${PKG_WAF_VERBOSE} --targets=$PKG_SAMBA_TARGET -j$CONCURRENCY_MAKE_LEVEL + ./buildtools/bin/waf build ${PKG_WAF_VERBOSE} --targets=${PKG_SAMBA_TARGET} -j${CONCURRENCY_MAKE_LEVEL} } makeinstall_target() { - ./buildtools/bin/waf install ${PKG_WAF_VERBOSE} --destdir=$SYSROOT_PREFIX --targets=smbclient -j$CONCURRENCY_MAKE_LEVEL - ./buildtools/bin/waf install ${PKG_WAF_VERBOSE} --destdir=$INSTALL --targets=$PKG_SAMBA_TARGET -j$CONCURRENCY_MAKE_LEVEL + ./buildtools/bin/waf install ${PKG_WAF_VERBOSE} --destdir=${SYSROOT_PREFIX} --targets=smbclient -j${CONCURRENCY_MAKE_LEVEL} + ./buildtools/bin/waf install ${PKG_WAF_VERBOSE} --destdir=${INSTALL} --targets=${PKG_SAMBA_TARGET} -j${CONCURRENCY_MAKE_LEVEL} } copy_directory_of_links() { @@ -152,7 +152,7 @@ perform_manual_install() { copy_directory_of_links ${PKG_BUILD}/bin/shared ${INSTALL}/usr/lib copy_directory_of_links ${PKG_BUILD}/bin/shared/private ${INSTALL}/usr/lib - if [ "$SAMBA_SERVER" = "yes" ]; then + if [ "${SAMBA_SERVER}" = "yes" ]; then mkdir -p ${INSTALL}/usr/sbin cp -L ${PKG_BUILD}/bin/smbd ${INSTALL}/usr/sbin cp -L ${PKG_BUILD}/bin/nmbd ${INSTALL}/usr/sbin @@ -162,45 +162,45 @@ perform_manual_install() { post_makeinstall_target() { perform_manual_install - rm -rf $INSTALL/usr/bin - rm -rf $INSTALL/usr/lib/python* - rm -rf $INSTALL/usr/share/perl* - rm -rf $INSTALL/usr/lib64 + rm -rf ${INSTALL}/usr/bin + rm -rf ${INSTALL}/usr/lib/python* + rm -rf ${INSTALL}/usr/share/perl* + rm -rf ${INSTALL}/usr/lib64 - mkdir -p $INSTALL/usr/lib/samba - cp $PKG_DIR/scripts/samba-config $INSTALL/usr/lib/samba - cp $PKG_DIR/scripts/smbd-config $INSTALL/usr/lib/samba - cp $PKG_DIR/scripts/samba-autoshare $INSTALL/usr/lib/samba + mkdir -p ${INSTALL}/usr/lib/samba + cp ${PKG_DIR}/scripts/samba-config ${INSTALL}/usr/lib/samba + cp ${PKG_DIR}/scripts/smbd-config ${INSTALL}/usr/lib/samba + cp ${PKG_DIR}/scripts/samba-autoshare ${INSTALL}/usr/lib/samba if find_file_path config/smb.conf; then - mkdir -p $INSTALL/etc/samba - cp ${FOUND_PATH} $INSTALL/etc/samba - mkdir -p $INSTALL/usr/config - cp $INSTALL/etc/samba/smb.conf $INSTALL/usr/config/samba.conf.sample + mkdir -p ${INSTALL}/etc/samba + cp ${FOUND_PATH} ${INSTALL}/etc/samba + mkdir -p ${INSTALL}/usr/config + cp ${INSTALL}/etc/samba/smb.conf ${INSTALL}/usr/config/samba.conf.sample fi - mkdir -p $INSTALL/usr/bin - cp -PR bin/default/source3/client/smbclient $INSTALL/usr/bin - cp -PR bin/default/source3/utils/smbtree $INSTALL/usr/bin - cp -PR bin/default/source3/utils/nmblookup $INSTALL/usr/bin - cp -PR bin/default/source3/utils/testparm $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -PR bin/default/source3/client/smbclient ${INSTALL}/usr/bin + cp -PR bin/default/source3/utils/smbtree ${INSTALL}/usr/bin + cp -PR bin/default/source3/utils/nmblookup ${INSTALL}/usr/bin + cp -PR bin/default/source3/utils/testparm ${INSTALL}/usr/bin - if [ "$SAMBA_SERVER" = "yes" ]; then - mkdir -p $INSTALL/usr/bin - cp -PR bin/default/source3/utils/smbpasswd $INSTALL/usr/bin + if [ "${SAMBA_SERVER}" = "yes" ]; then + mkdir -p ${INSTALL}/usr/bin + cp -PR bin/default/source3/utils/smbpasswd ${INSTALL}/usr/bin - mkdir -p $INSTALL/usr/lib/systemd/system - cp $PKG_DIR/system.d.opt/* $INSTALL/usr/lib/systemd/system + mkdir -p ${INSTALL}/usr/lib/systemd/system + cp ${PKG_DIR}/system.d.opt/* ${INSTALL}/usr/lib/systemd/system - mkdir -p $INSTALL/usr/share/services - cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services + mkdir -p ${INSTALL}/usr/share/services + cp -P ${PKG_DIR}/default.d/*.conf ${INSTALL}/usr/share/services fi } post_install() { enable_service samba-config.service - if [ "$SAMBA_SERVER" = "yes" ]; then + if [ "${SAMBA_SERVER}" = "yes" ]; then enable_service nmbd.service enable_service smbd.service fi diff --git a/packages/network/wireguard-tools/package.mk b/packages/network/wireguard-tools/package.mk index 33af9026fe..c5ea288c6c 100644 --- a/packages/network/wireguard-tools/package.mk +++ b/packages/network/wireguard-tools/package.mk @@ -6,9 +6,9 @@ PKG_VERSION="1.0.20200827" PKG_SHA256="ec08772216da73a2f6a925927ce794fe9686ba169bb774e451d34199db19795c" PKG_LICENSE="GPLv2" PKG_SITE="https://www.wireguard.com" -PKG_URL="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-v$PKG_VERSION.tar.xz" +PKG_URL="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-v${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain linux" -PKG_NEED_UNPACK="$LINUX_DEPENDS" +PKG_NEED_UNPACK="${LINUX_DEPENDS}" PKG_LONGDESC="WireGuard VPN userspace tools" PKG_TOOLCHAIN="manual" PKG_IS_KERNEL_PKG="yes" @@ -22,10 +22,10 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp $PKG_DIR/scripts/wg-keygen $INSTALL/usr/bin - cp $PKG_BUILD/src/wg $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp ${PKG_DIR}/scripts/wg-keygen ${INSTALL}/usr/bin + cp ${PKG_BUILD}/src/wg ${INSTALL}/usr/bin - mkdir -p $INSTALL/usr - cp -R $PKG_DIR/config $INSTALL/usr + mkdir -p ${INSTALL}/usr + cp -R ${PKG_DIR}/config ${INSTALL}/usr } diff --git a/packages/network/wireless-regdb/package.mk b/packages/network/wireless-regdb/package.mk index 1623c00abb..4ff18cd8e9 100644 --- a/packages/network/wireless-regdb/package.mk +++ b/packages/network/wireless-regdb/package.mk @@ -7,12 +7,12 @@ PKG_VERSION="2020.11.20" PKG_SHA256="b4164490d82ff7b0086e812ac42ab27baf57be24324d4c0ee1c5dd6ba27f2a52" PKG_LICENSE="GPL" 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_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) + 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/network/wpa_supplicant/package.mk b/packages/network/wpa_supplicant/package.mk index 09bdbd4b3f..409df694a2 100644 --- a/packages/network/wpa_supplicant/package.mk +++ b/packages/network/wpa_supplicant/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.9" PKG_SHA256="fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17" PKG_LICENSE="GPL" PKG_SITE="https://w1.fi/wpa_supplicant/" -PKG_URL="https://w1.fi/releases/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://w1.fi/releases/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain dbus libnl openssl" PKG_LONGDESC="A free software implementation of an IEEE 802.11i supplicant." PKG_TOOLCHAIN="make" @@ -17,20 +17,20 @@ PKG_MAKE_OPTS_TARGET="-C wpa_supplicant V=1 LIBDIR=/usr/lib BINDIR=/usr/bin" PKG_MAKEINSTALL_OPTS_TARGET="-C wpa_supplicant V=1 LIBDIR=/usr/lib BINDIR=/usr/bin" configure_target() { - LDFLAGS="$LDFLAGS -lpthread -lm" + LDFLAGS+=" -lpthread -lm" - cp $PKG_DIR/config/makefile.config wpa_supplicant/.config + cp ${PKG_DIR}/config/makefile.config wpa_supplicant/.config } post_makeinstall_target() { - rm -r $INSTALL/usr/bin/wpa_cli + rm -r ${INSTALL}/usr/bin/wpa_cli - mkdir -p $INSTALL/etc/dbus-1/system.d - cp wpa_supplicant/dbus/dbus-wpa_supplicant.conf $INSTALL/etc/dbus-1/system.d + mkdir -p ${INSTALL}/etc/dbus-1/system.d + cp wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${INSTALL}/etc/dbus-1/system.d - mkdir -p $INSTALL/usr/lib/systemd/system - cp wpa_supplicant/systemd/wpa_supplicant.service $INSTALL/usr/lib/systemd/system + mkdir -p ${INSTALL}/usr/lib/systemd/system + cp wpa_supplicant/systemd/wpa_supplicant.service ${INSTALL}/usr/lib/systemd/system - mkdir -p $INSTALL/usr/share/dbus-1/system-services - cp wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service $INSTALL/usr/share/dbus-1/system-services + mkdir -p ${INSTALL}/usr/share/dbus-1/system-services + cp wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service ${INSTALL}/usr/share/dbus-1/system-services }