diff --git a/README.md b/README.md index ecec835..35752f4 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,11 @@ sudo apt-get install build-essential subversion libncurses5-dev zlib1g-dev gawk ``` git clone https://github.com/openwrt-xiaomi/builder -b v21 openwrt-v21 cd openwrt-v21 -./xcreate.sh -v xq-21.02.1 -cd xq-21.02.1 + +./xcreate.sh -v xq-21.02.3 +cd xq-21.02.3 + ./xupdate.sh -f + ./xmake.sh -f -t r3d ``` diff --git a/_addons.config b/_addons.config index 7601169..9e22e33 100644 --- a/_addons.config +++ b/_addons.config @@ -3,10 +3,6 @@ #GIT_FEED _alpine_fan_control=https://github.com/openwrt-xiaomi/openwrt-alpine-fan-control.git CONFIG_FEED__alpine_fan_control=m -### qBittorrent -##GIT_FEED _qBittorrent=https://github.com/openwrt-xiaomi/qBittorrent-openwrt-package.git^887ebfb9f255f78926cc6c643580f897803619f3 -#CONFIG_FEED__qBittorrent=m - ### luci-app-temp-status #GIT_PACKAGE luci-app-temp-status=https://github.com/openwrt-xiaomi/luci-app-temp-status.git master @@ -25,6 +21,12 @@ CONFIG_FEED__alpine_fan_control=m ### luci-app-timecontrol #GIT_PACKAGE luci-app-timecontrol=https://github.com/openwrt-xiaomi/luci-app-timecontrol.git main -### qBittorrent -##GIT_PACKAGE qBittorrent=https://github.com/openwrt-xiaomi/qBittorrent-openwrt-package.git for-openwrt-21.02 +### luci-app-cpufreq +#GIT_PACKAGE luci-app-cpufreq=https://github.com/openwrt-xiaomi/luci-app-cpufreq.git master + +### qBittorrent +#GIT_PACKAGE qBittorrent=https://github.com/openwrt-xiaomi/qBittorrent-openwrt-package.git master + +### luci-app-filebrowser +#GIT_PACKAGE luci-app-filebrowser=https://github.com/openwrt-xiaomi/luci-app-filebrowser.git master diff --git a/_torrents.config b/_torrents.config index bc085fc..e7d24dc 100644 --- a/_torrents.config +++ b/_torrents.config @@ -1,6 +1,7 @@ ### Torrent clients +CONFIG_PACKAGE_transmission-daemon=y CONFIG_PACKAGE_transmission-web=y -#CONFIG_PACKAGE_transmission-web-control=y +CONFIG_PACKAGE_transmission-remote=y CONFIG_PACKAGE_luci-app-transmission=y CONFIG_PACKAGE_luci-i18n-transmission-ru=y diff --git a/r3d.config b/r3d.config index 5848580..ec9850a 100644 --- a/r3d.config +++ b/r3d.config @@ -2,10 +2,6 @@ CONFIG_TARGET_ipq806x=y CONFIG_TARGET_ipq806x_generic=y CONFIG_TARGET_ipq806x_generic_DEVICE_xiaomi_r3d=y -#CONFIG_TARGET_MULTI_PROFILE=y -#CONFIG_TARGET_DEVICE_PACKAGES_ipq806x_generic_DEVICE_xiaomi_r3d="-dnsmasq" -#CONFIG_TARGET_PER_DEVICE_ROOTFS=y - #include _addons.config #include _base.config #include _wifi_en.config @@ -45,12 +41,13 @@ CONFIG_PACKAGE_luci-i18n-sqm-ru=y CONFIG_PACKAGE_luci-app-timecontrol=y ### qBittorrent -#CONFIG_PACKAGE_boost=y -#CONFIG_PACKAGE_boost-system=y -#CONFIG_PACKAGE_rblibtorrent=y -#CONFIG_PACKAGE_qBittorrent=y +CONFIG_PACKAGE_boost=y +CONFIG_PACKAGE_boost-system=y +CONFIG_PACKAGE_rblibtorrent=y +CONFIG_PACKAGE_qbittorrent=y ### FileBrowser +CONFIG_PACKAGE_wget-ssl=y CONFIG_PACKAGE_luci-app-filebrowser=y ### DNSMasq diff --git a/xcommon.sh b/xcommon.sh index 8f8fb56..2b0a1eb 100755 --- a/xcommon.sh +++ b/xcommon.sh @@ -2,7 +2,7 @@ XSUPPORTEDVER=21 XREPOADDR=https://github.com/openwrt-xiaomi -XDEFBRANCH=xq-21.02.1 +XDEFBRANCH=xq-21.02.3 logmsg() { echo "$@" @@ -83,28 +83,3 @@ get_cfg_pkg_flag() { } - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xcreate.sh b/xcreate.sh index aa2aeee..3334113 100755 --- a/xcreate.sh +++ b/xcreate.sh @@ -5,8 +5,9 @@ export XDIR=$SCRIPT_DIR . ./xcommon.sh -[ -z "$*" ] && die "No options found!" +#[ -z "$*" ] && die "No options found!" +TARGET_BRANCH= while getopts "v:" opt; do case $opt in v ) TARGET_BRANCH=$OPTARG;; diff --git a/xmake.sh b/xmake.sh index 6bb0165..cfeb63b 100755 --- a/xmake.sh +++ b/xmake.sh @@ -5,10 +5,12 @@ export XDIR=$SCRIPT_DIR . ./xcommon.sh +MAKE_JOBS= XTARGET= OPT_FULL_REBUILD=false -while getopts "t:f" opt; do +while getopts "j:t:f" opt; do case $opt in + j) MAKE_JOBS=$OPTARG;; t) XTARGET=$OPTARG;; f) OPT_FULL_REBUILD=true;; esac @@ -19,7 +21,7 @@ CFG=$XDIR/$XTARGET.config [ ! -f "$CFG" ] && die "File '$XTARGET.config' not found!" if [ "$OPT_FULL_REBUILD" = "true" ]; then - make clean + [ -f .config ] && make clean rm -rf tmp #rm -rf feeds/luci.tmp #rm -rf feeds/packages.tmp @@ -44,7 +46,9 @@ if [ $( get_cfg_pkg_flag "$XDIR/.config" "dnsmasq-full" ) = "y" ]; then sed -i '/CONFIG_PACKAGE_dnsmasq=y/d' $XDIR/.config fi -MAKE_JOBS=$( grep processor /proc/cpuinfo | tail -n 1 | awk '{print $3}' ) +if [ -z "$MAKE_JOBS" ]; then + MAKE_JOBS=$( grep processor /proc/cpuinfo | tail -n 1 | awk '{print $3}' ) +fi #make tools/install -j$MAKE_JOBS #make toolchain/install -j$MAKE_JOBS diff --git a/xupdate.sh b/xupdate.sh index c43ddeb..d38da84 100755 --- a/xupdate.sh +++ b/xupdate.sh @@ -15,7 +15,7 @@ while getopts "f" opt; do esac done -[ ! -d "$FEEDSDIR/package" ] && OPT_FULL_UPDATE=true +[ ! -d "$FEEDSDIR" ] && OPT_FULL_UPDATE=true rm -rf tmp if [ "$OPT_FULL_UPDATE" = "true" ]; then