3 Commits

Author SHA1 Message Date
remittor
f0703a0e7a xmake: Fix compile libutp 2026-02-21 08:40:51 +03:00
remittor
050e11496a build: Use separated tools cache for TRX builds 2026-02-09 12:46:44 +03:00
remittor
c516910a95 base: Add ip-full and tc-full 2026-02-09 12:39:48 +03:00
3 changed files with 14 additions and 0 deletions

View File

@@ -307,6 +307,7 @@ jobs:
TARGET: ${{ matrix.target }} TARGET: ${{ matrix.target }}
USE_CACHE: ${{ github.event.inputs.use_cache }} USE_CACHE: ${{ github.event.inputs.use_cache }}
CACHE_VER: ${{ github.event.inputs.cache_ver }} CACHE_VER: ${{ github.event.inputs.cache_ver }}
INP_TRX_BUILD: ${{ github.event.inputs.trx_build == 'true' }}
run: | run: |
echo USE_CACHE = $USE_CACHE echo USE_CACHE = $USE_CACHE
HOST_TOOLS_STG_DIR=staging_dir/host HOST_TOOLS_STG_DIR=staging_dir/host
@@ -387,6 +388,9 @@ jobs:
if [ "$USE_CACHE" = "true" ]; then if [ "$USE_CACHE" = "true" ]; then
echo USE_CACHE = $USE_CACHE echo USE_CACHE = $USE_CACHE
fi fi
if [ "$INP_TRX_BUILD" = true ]; then
CACHE_VER=$CACHE_VER-trx
fi
echo "USE_CACHE=$USE_CACHE" >> $GITHUB_ENV echo "USE_CACHE=$USE_CACHE" >> $GITHUB_ENV
echo "CACHE_VER=$CACHE_VER" >> $GITHUB_ENV echo "CACHE_VER=$CACHE_VER" >> $GITHUB_ENV
echo "HOST_TOOLS_STG_DIR=$HOST_TOOLS_STG_DIR" >> $GITHUB_ENV echo "HOST_TOOLS_STG_DIR=$HOST_TOOLS_STG_DIR" >> $GITHUB_ENV

View File

@@ -46,6 +46,8 @@ CONFIG_PACKAGE_luci-i18n-filemanager-ru=y
#CONFIG_PACKAGE_atftp=y #CONFIG_PACKAGE_atftp=y
#CONFIG_PACKAGE_atftpd=y #CONFIG_PACKAGE_atftpd=y
CONFIG_PACKAGE_lscpu=y CONFIG_PACKAGE_lscpu=y
CONFIG_PACKAGE_ip-full=y
CONFIG_PACKAGE_tc-full=y
CONFIG_PACKAGE_bind-tools=y CONFIG_PACKAGE_bind-tools=y
CONFIG_PACKAGE_facinstall=y CONFIG_PACKAGE_facinstall=y

View File

@@ -167,6 +167,14 @@ function build_target {
fi fi
fi fi
LIBUTP_MK=$XDIR/package/feeds/packages/libutp/Makefile
if [ -f $LIBUTP_MK ]; then
if grep -q 'DLIBUTP_ENABLE_WERROR:BOOL=YES' $LIBUTP_MK ; then
sed -i 's/-DLIBUTP_ENABLE_WERROR:BOOL=YES/-DLIBUTP_ENABLE_WERROR:BOOL=NO/' $LIBUTP_MK
echo ">>> libutp patched !!! (disable Werror)"
fi
fi
RAB_LUCI_MK=$XDIR/package/feeds/_ruantiblock/luci-app-ruantiblock/Makefile RAB_LUCI_MK=$XDIR/package/feeds/_ruantiblock/luci-app-ruantiblock/Makefile
if [ -f $RAB_LUCI_MK ]; then if [ -f $RAB_LUCI_MK ]; then
if ! grep "PKG_PROVIDES" $RAB_LUCI_MK >/dev/null ; then if ! grep "PKG_PROVIDES" $RAB_LUCI_MK >/dev/null ; then