mirror of
https://github.com/openwrt-xiaomi/builder.git
synced 2025-12-31 11:03:36 +05:00
Compare commits
20 Commits
v24-250506
...
v25
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef5e7155b5 | ||
|
|
b788e7e165 | ||
|
|
a775b82e5b | ||
|
|
f9ab8e3841 | ||
|
|
4e7389f304 | ||
|
|
887d928a4b | ||
|
|
5167d394e1 | ||
|
|
dd3a9395f2 | ||
|
|
2f112defb4 | ||
|
|
9104838c9b | ||
|
|
4e60cabc73 | ||
|
|
295d495e81 | ||
|
|
d147c0c72d | ||
|
|
8a003ba248 | ||
|
|
d42e48d53e | ||
|
|
8d3762e7b3 | ||
|
|
8d5dcda073 | ||
|
|
d46b05352f | ||
|
|
e723da8e08 | ||
|
|
1ecab03a91 |
181
.github/workflows/build.yml
vendored
181
.github/workflows/build.yml
vendored
@@ -3,6 +3,24 @@ name: build
|
|||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
|
test_build:
|
||||||
|
description: 'Test build'
|
||||||
|
required: true
|
||||||
|
default: 'false'
|
||||||
|
type: choice
|
||||||
|
options:
|
||||||
|
- true
|
||||||
|
- false
|
||||||
|
target_name:
|
||||||
|
description: 'Target Name'
|
||||||
|
required: false
|
||||||
|
default: 'r3d'
|
||||||
|
type: string
|
||||||
|
package_dir:
|
||||||
|
description: 'Package Dir'
|
||||||
|
required: false
|
||||||
|
default: ''
|
||||||
|
type: string
|
||||||
fake_build:
|
fake_build:
|
||||||
description: 'Fake build'
|
description: 'Fake build'
|
||||||
required: true
|
required: true
|
||||||
@@ -18,11 +36,15 @@ on:
|
|||||||
type: string
|
type: string
|
||||||
|
|
||||||
env:
|
env:
|
||||||
FAKE_BUILD: ${{ github.event.inputs.fake_build }}
|
TEST_BUILD: ${{ github.event.inputs.test_build == 'true' }}
|
||||||
|
FAKE_BUILD: ${{ github.event.inputs.fake_build == 'true' }}
|
||||||
|
TAG_SUFFIX: ${{ github.event.inputs.fake_build == 'true' && '-fake' || github.event.inputs.test_build == 'true' && '-test' || '' }}
|
||||||
|
TARGET_NAME: ${{ github.event.inputs.target_name }}
|
||||||
|
PACKAGE_DIR: ${{ github.event.inputs.package_dir }}
|
||||||
REPO_URL: https://github.com/openwrt-xiaomi/openwrt
|
REPO_URL: https://github.com/openwrt-xiaomi/openwrt
|
||||||
REPO_LNK: openwrt-xiaomi/openwrt
|
REPO_LNK: openwrt-xiaomi/openwrt
|
||||||
REPO_BRANCH: xq-24.10
|
REPO_BRANCH: xq-25.12
|
||||||
TAG_PREFIX: v24-
|
TAG_PREFIX: v25-
|
||||||
BUILD_ROOT: ${{ github.workspace }}/openwrt
|
BUILD_ROOT: ${{ github.workspace }}/openwrt
|
||||||
DEPENDENCIES: ${{ github.workspace }}/dependencies-ubuntu.txt
|
DEPENDENCIES: ${{ github.workspace }}/dependencies-ubuntu.txt
|
||||||
TZ: UTC
|
TZ: UTC
|
||||||
@@ -45,6 +67,9 @@ jobs:
|
|||||||
fw_date: ${{ steps.gh.outputs.fw_date }}
|
fw_date: ${{ steps.gh.outputs.fw_date }}
|
||||||
fw_ver: ${{ steps.gh.outputs.fw_ver }}
|
fw_ver: ${{ steps.gh.outputs.fw_ver }}
|
||||||
is_active: ${{ steps.activity.outputs.is_active }}
|
is_active: ${{ steps.activity.outputs.is_active }}
|
||||||
|
test_build: ${{ env.TEST_BUILD }}
|
||||||
|
target_name: ${{ env.TARGET_NAME }}
|
||||||
|
fake_build: ${{ env.FAKE_BUILD }}
|
||||||
steps:
|
steps:
|
||||||
- name: Get repo data via GH API
|
- name: Get repo data via GH API
|
||||||
id: gh
|
id: gh
|
||||||
@@ -124,6 +149,12 @@ jobs:
|
|||||||
- tuf_ax4200
|
- tuf_ax4200
|
||||||
- tuf_ax6000
|
- tuf_ax6000
|
||||||
- zen-bt8
|
- zen-bt8
|
||||||
|
isTest:
|
||||||
|
- ${{ needs.check.outputs.test_build == 'true' }}
|
||||||
|
exclude:
|
||||||
|
- { isTest: true }
|
||||||
|
include:
|
||||||
|
- target: ${{ github.event.inputs.target_name }}
|
||||||
steps:
|
steps:
|
||||||
- name: Initialization environment
|
- name: Initialization environment
|
||||||
env:
|
env:
|
||||||
@@ -131,7 +162,10 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
sudo apt-get -qq update
|
sudo apt-get -qq update
|
||||||
#sudo apt-get -qq update && sudo apt-get -qq upgrade
|
#sudo apt-get -qq update && sudo apt-get -qq upgrade
|
||||||
sudo apt-get -qq install $(cat $DEPENDENCIES)
|
sudo apt-get -qq install build-essential gawk flex rsync swig unzip zlib1g-dev file wget
|
||||||
|
sudo apt-get -qq install libc6-dev clang flex bison g++ gcc-multilib g++-multilib
|
||||||
|
sudo apt-get -qq install gettext git libncurses5-dev libssl-dev python3-setuptools
|
||||||
|
sudo apt-get -qq install libc6-dev pkg-config
|
||||||
sudo apt-get -qq autoremove --purge
|
sudo apt-get -qq autoremove --purge
|
||||||
sudo apt-get -qq clean
|
sudo apt-get -qq clean
|
||||||
sudo timedatectl set-timezone "$TZ"
|
sudo timedatectl set-timezone "$TZ"
|
||||||
@@ -159,7 +193,7 @@ jobs:
|
|||||||
rsync -avq --exclude=".*" --exclude="$(basename $BUILD_ROOT)" $BLDROOT/ $BUILD_ROOT/
|
rsync -avq --exclude=".*" --exclude="$(basename $BUILD_ROOT)" $BLDROOT/ $BUILD_ROOT/
|
||||||
cd $BUILD_ROOT
|
cd $BUILD_ROOT
|
||||||
chmod +x *.sh
|
chmod +x *.sh
|
||||||
wget https://github.com/fantastic-packages/packages/raw/refs/heads/24.10/keys/usign/53FF2B6672243D28.pub
|
wget https://github.com/fantastic-packages/packages/raw/refs/heads/25.12/keys/usign/53FF2B6672243D28.pub
|
||||||
|
|
||||||
- name: Update OpenWrt packages
|
- name: Update OpenWrt packages
|
||||||
id: update
|
id: update
|
||||||
@@ -167,17 +201,15 @@ jobs:
|
|||||||
cd $BUILD_ROOT && ./xupdate.sh -f
|
cd $BUILD_ROOT && ./xupdate.sh -f
|
||||||
echo "status=success" >> $GITHUB_OUTPUT
|
echo "status=success" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Build the firmware image
|
- name: Configure
|
||||||
id: compile
|
id: configure
|
||||||
if: steps.update.outputs.status == 'success'
|
if: steps.update.outputs.status == 'success'
|
||||||
env:
|
env:
|
||||||
TARGET: ${{ matrix.target }}
|
TARGET: ${{ matrix.target }}
|
||||||
FW_VER: ${{ needs.check.outputs.fw_ver }}
|
FW_VER: ${{ needs.check.outputs.fw_ver }}
|
||||||
run: |
|
run: |
|
||||||
cd $BUILD_ROOT
|
cd $BUILD_ROOT && echo "init build config"
|
||||||
MAKE_JOBS=$(($(nproc)+1))
|
FILE_DATE=$(date --utc +'%y%m%d')
|
||||||
echo "$MAKE_JOBS thread compile"
|
|
||||||
# init build config
|
|
||||||
./xmake.sh -I -t $TARGET
|
./xmake.sh -I -t $TARGET
|
||||||
G_DEVICE_NAME=$( grep -so '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' )
|
G_DEVICE_NAME=$( grep -so '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' )
|
||||||
[ -z "$G_DEVICE_NAME" ] && exit 31
|
[ -z "$G_DEVICE_NAME" ] && exit 31
|
||||||
@@ -192,10 +224,126 @@ jobs:
|
|||||||
if [ $(find . -maxdepth 1 -name "$VERMAGIC_LIST" | wc -l) = "0" ]; then
|
if [ $(find . -maxdepth 1 -name "$VERMAGIC_LIST" | wc -l) = "0" ]; then
|
||||||
exit 41
|
exit 41
|
||||||
fi
|
fi
|
||||||
# run build
|
echo "status=success" >> $GITHUB_OUTPUT
|
||||||
[ "$FAKE_BUILD" != "true" ] && make -j $MAKE_JOBS download world
|
echo "FW_VER=$FW_VER" >> $GITHUB_ENV
|
||||||
|
echo "G_DEVICE_NAME=$G_DEVICE_NAME" >> $GITHUB_ENV
|
||||||
|
echo "G_BOARD_NAME=$G_BOARD_NAME" >> $GITHUB_ENV
|
||||||
|
echo "G_SUBTARGET_NAME=$G_SUBTARGET_NAME" >> $GITHUB_ENV
|
||||||
|
echo "FILE_DATE=$FILE_DATE" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Dump .config file
|
||||||
|
run: |
|
||||||
|
echo "====== .config ========="
|
||||||
|
cat $BUILD_ROOT/.config
|
||||||
|
echo "========================"
|
||||||
|
|
||||||
|
- name: Download tools and toolchain
|
||||||
|
id: tools_download
|
||||||
|
if: false # steps.configure.outputs.status == 'success'
|
||||||
|
run: |
|
||||||
|
cd $BUILD_ROOT
|
||||||
|
G_TARGET_ARCH=$( grep -so '^CONFIG_TARGET_ARCH_PACKAGES=' .config | cut -d'"' -f2 )
|
||||||
|
echo "G_TARGET_ARCH=$G_TARGET_ARCH" >> $GITHUB_ENV
|
||||||
|
echo "OpenWrt version: $FW_VER"
|
||||||
|
SDK_URL_BASE="https://downloads.openwrt.org/releases/${FW_VER}/targets/${G_BOARD_NAME}/${G_SUBTARGET_NAME}"
|
||||||
|
echo "Searching SDK at $SDK_URL_BASE"
|
||||||
|
SDK_TARBALL=$( curl -s "$SDK_URL_BASE/" | grep -oE 'openwrt-sdk-[^"]+Linux-x86_64\.tar\.(xz|zst)' | head -n1 )
|
||||||
|
if [ -z "$SDK_TARBALL" ]; then
|
||||||
|
echo "ERROR: SDK not found for ${G_BOARD_NAME}/${G_SUBTARGET_NAME}"
|
||||||
|
exit 81
|
||||||
|
fi
|
||||||
|
echo "Found SDK: $SDK_TARBALL"
|
||||||
|
#curl -L --fail --retry 5 --retry-delay 5 --progress-bar -o "$SDK_TARBALL" "$SDK_URL_BASE/$SDK_TARBALL"
|
||||||
|
wget --progress=dot:mega "$SDK_URL_BASE/$SDK_TARBALL"
|
||||||
|
if [[ "$SDK_TARBALL" == *.tar.xz ]]; then
|
||||||
|
tar -xf "$SDK_TARBALL"
|
||||||
|
elif [[ "$SDK_TARBALL" == *.tar.zst ]]; then
|
||||||
|
tar -I zstd -xf "$SDK_TARBALL"
|
||||||
|
else
|
||||||
|
echo "Unknown archive format: $SDK_TARBALL"
|
||||||
|
exit 82
|
||||||
|
fi
|
||||||
|
SDK_DIR=$(tar -tf "$SDK_TARBALL" | head -n1 | cut -d/ -f1)
|
||||||
|
echo "Using SDK dir: $SDK_DIR"
|
||||||
|
rm -rf staging_dir
|
||||||
|
mv "$SDK_DIR/staging_dir" .
|
||||||
|
echo "========= staging_dir =========="
|
||||||
|
ls -l staging_dir
|
||||||
|
echo "================================"
|
||||||
|
#cp -a "$SDK_DIR"/toolchain/* toolchain/ 2>/dev/null || true
|
||||||
|
TOOLS_DIR=staging_dir/host
|
||||||
|
touch $TOOLS_DIR/.prepared
|
||||||
|
TOOLS_STAMP_DIR=$TOOLS_DIR/stamp
|
||||||
|
TOOLS_PKGS=$(
|
||||||
|
find tools/ -maxdepth 1 -mindepth 1 -type d | while read -r d; do
|
||||||
|
mk="$d/Makefile"
|
||||||
|
[ -f "$mk" ] || continue
|
||||||
|
awk -F':=' '
|
||||||
|
/^[[:space:]]*PKG_NAME[[:space:]]*:=/ {
|
||||||
|
v=$2
|
||||||
|
gsub(/\r/, "", v)
|
||||||
|
gsub(/^[[:space:]]+/, "", v)
|
||||||
|
gsub(/[[:space:]]+$/, "", v)
|
||||||
|
if (v != "") print v
|
||||||
|
}
|
||||||
|
' "$mk"
|
||||||
|
done | sort -u
|
||||||
|
)
|
||||||
|
mkdir -p "$TOOLS_STAMP_DIR"
|
||||||
|
echo "Found host tools packages: $TOOLS_PKGS"
|
||||||
|
for pkg in $TOOLS_PKGS; do
|
||||||
|
touch "$TOOLS_STAMP_DIR/.$pkg"_installed
|
||||||
|
done
|
||||||
|
TOOLCHAIN_DIR=$( find staging_dir -maxdepth 1 -type d -name "toolchain-*" )
|
||||||
|
echo "Found toolchain directory: $TOOLCHAIN_DIR"
|
||||||
|
#touch $TOOLCHAIN_DIR/.prepared
|
||||||
|
mkdir -p "$TOOLCHAIN_DIR/stamp"
|
||||||
|
touch $TOOLCHAIN_DIR/stamp/.binutils_installed
|
||||||
|
#touch $TOOLCHAIN_DIR/stamp/.fortify-headers_installed
|
||||||
|
touch $TOOLCHAIN_DIR/stamp/.gcc_final_installed
|
||||||
|
touch $TOOLCHAIN_DIR/stamp/.gcc_initial_installed
|
||||||
|
touch $TOOLCHAIN_DIR/stamp/.gdb_installed
|
||||||
|
#touch $TOOLCHAIN_DIR/stamp/.linux_installed
|
||||||
|
touch $TOOLCHAIN_DIR/stamp/.musl_installed
|
||||||
|
touch $TOOLCHAIN_DIR/stamp/.toolchain_compile
|
||||||
|
echo "Checking cross-compiler..."
|
||||||
|
find staging_dir -name '*gcc' | head -n 10
|
||||||
|
echo "status=success" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Build tools and toolchain
|
||||||
|
id: tools
|
||||||
|
if: steps.configure.outputs.status == 'success'
|
||||||
|
run: |
|
||||||
|
cd $BUILD_ROOT
|
||||||
|
MAKE_JOBS=$(nproc)
|
||||||
|
echo "$MAKE_JOBS thread compile"
|
||||||
|
export CCACHE=1
|
||||||
|
make tools/install -j$MAKE_JOBS
|
||||||
|
make toolchain/install -j$MAKE_JOBS
|
||||||
|
echo "status=success" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Build the firmware image
|
||||||
|
id: compile
|
||||||
|
if: steps.tools.outputs.status == 'success'
|
||||||
|
env:
|
||||||
|
TARGET: ${{ matrix.target }}
|
||||||
|
run: |
|
||||||
|
cd $BUILD_ROOT
|
||||||
|
MAKE_JOBS=$(nproc)
|
||||||
|
echo "$MAKE_JOBS thread compile"
|
||||||
|
export CCACHE=1
|
||||||
|
if [ "$FAKE_BUILD" != "true" -a "$TEST_BUILD" = "true" -a "$PACKAGE_DIR" != "" ]; then
|
||||||
|
make $PACKAGE_DIR/compile V=sc BUILD_LOG=1
|
||||||
|
exit 99
|
||||||
|
fi
|
||||||
|
if [ "$FAKE_BUILD" != "true" ]; then
|
||||||
|
if [ "$TEST_BUILD" != "true" ]; then
|
||||||
|
make -j $MAKE_JOBS download world
|
||||||
|
else
|
||||||
|
make V=sc download world
|
||||||
|
fi
|
||||||
|
fi
|
||||||
# process results
|
# process results
|
||||||
FILE_DATE=$(date --utc +'%y%m%d')
|
|
||||||
OUT_DIR=$BUILD_ROOT/bin/targets/$G_BOARD_NAME/$G_SUBTARGET_NAME
|
OUT_DIR=$BUILD_ROOT/bin/targets/$G_BOARD_NAME/$G_SUBTARGET_NAME
|
||||||
if [ "$FAKE_BUILD" = "true" ]; then
|
if [ "$FAKE_BUILD" = "true" ]; then
|
||||||
mkdir -p logs
|
mkdir -p logs
|
||||||
@@ -218,7 +366,6 @@ jobs:
|
|||||||
echo "SUBTARGET_NAME=$G_SUBTARGET_NAME" >> $GITHUB_ENV
|
echo "SUBTARGET_NAME=$G_SUBTARGET_NAME" >> $GITHUB_ENV
|
||||||
echo "BLD_VER=$BLD_VER" >> $GITHUB_ENV
|
echo "BLD_VER=$BLD_VER" >> $GITHUB_ENV
|
||||||
echo "OUT_DIR=$OUT_DIR" >> $GITHUB_ENV
|
echo "OUT_DIR=$OUT_DIR" >> $GITHUB_ENV
|
||||||
echo "FILE_DATE=$FILE_DATE" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Check space usage
|
- name: Check space usage
|
||||||
run: df -hT
|
run: df -hT
|
||||||
@@ -291,8 +438,8 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
TAG: ${{ needs.check.outputs.tag }}
|
TAG: ${{ needs.check.outputs.tag }}
|
||||||
with:
|
with:
|
||||||
prerelease: false
|
prerelease: ${{ env.TEST_BUILD == 'true' || env.FAKE_BUILD == 'true' }}
|
||||||
tag_name: ${{ needs.check.outputs.tag }}
|
tag_name: ${{ needs.check.outputs.tag }}${{ env.TAG_SUFFIX }}
|
||||||
name: '${{ needs.check.outputs.tag }}'
|
name: '${{ needs.check.outputs.tag }}'
|
||||||
body: |
|
body: |
|
||||||
OpenWrt ${{ needs.check.outputs.fw_ver }} [${{ needs.check.outputs.fw_date }}]
|
OpenWrt ${{ needs.check.outputs.fw_ver }} [${{ needs.check.outputs.fw_date }}]
|
||||||
|
|||||||
@@ -13,16 +13,16 @@ CONFIG_FEED__alpine_fan_control=m
|
|||||||
#GIT_PACKAGE luci-app-temp-status=https://github.com/openwrt-xiaomi/luci-app-temp-status.git master
|
#GIT_PACKAGE luci-app-temp-status=https://github.com/openwrt-xiaomi/luci-app-temp-status.git master
|
||||||
|
|
||||||
### luci-app-disks-info
|
### luci-app-disks-info
|
||||||
#GIT_PACKAGE luci-app-disks-info=https://github.com/openwrt-xiaomi/luci-app-disks-info.git master
|
#GIT_PACKAGE luci-app-disks-info=https://github.com/gSpotx2f/luci-app-disks-info.git master
|
||||||
|
|
||||||
### luci-app-diskman
|
### luci-app-diskman
|
||||||
#GIT_PACKAGE luci-app-diskman=https://github.com/openwrt-xiaomi/luci-app-diskman.git master
|
#GIT_PACKAGE luci-app-diskman=https://github.com/lisaac/luci-app-diskman.git master
|
||||||
|
|
||||||
### luci-theme-argon
|
### luci-theme-argon
|
||||||
#GIT_PACKAGE luci-theme-argon=https://github.com/openwrt-xiaomi/luci-theme-argon.git master
|
#GIT_PACKAGE luci-theme-argon=https://github.com/jerrykuku/luci-theme-argon.git master
|
||||||
|
|
||||||
### luci-app-argon-config
|
### luci-app-argon-config
|
||||||
#GIT_PACKAGE luci-app-argon-config=https://github.com/openwrt-xiaomi/luci-app-argon-config.git master
|
#GIT_PACKAGE luci-app-argon-config=https://github.com/jerrykuku/luci-app-argon-config.git master
|
||||||
|
|
||||||
### luci-app-tn-netports
|
### luci-app-tn-netports
|
||||||
#GIT_PACKAGE luci-app-tn-netports=https://github.com/openwrt-xiaomi/luci-app-tn-netports.git master
|
#GIT_PACKAGE luci-app-tn-netports=https://github.com/openwrt-xiaomi/luci-app-tn-netports.git master
|
||||||
@@ -42,12 +42,14 @@ CONFIG_FEED__alpine_fan_control=m
|
|||||||
|
|
||||||
|
|
||||||
### AmneziaWG
|
### AmneziaWG
|
||||||
#GIT_FEED _amneziawg=https://github.com/lolo6oT/awg-openwrt.git dev-24.10
|
#GIT_FEED _amneziawg=https://github.com/Slava-Shchipunov/awg-openwrt.git
|
||||||
CONFIG_FEED__amneziawg=m
|
CONFIG_FEED__amneziawg=m
|
||||||
|
|
||||||
### Zapret
|
### Zapret
|
||||||
#GIT_FEED _zapret=https://github.com/remittor/zapret-openwrt.git
|
#GIT_FEED _zapret=https://github.com/remittor/zapret-openwrt.git;zap1
|
||||||
CONFIG_FEED__zapret=m
|
CONFIG_FEED__zapret=m
|
||||||
|
#GIT_FEED _zapret2=https://github.com/remittor/zapret-openwrt.git;master
|
||||||
|
CONFIG_FEED__zapret2=m
|
||||||
|
|
||||||
### ruantiblock
|
### ruantiblock
|
||||||
#GIT_FEED _ruantiblock=https://github.com/gSpotx2f/ruantiblock_openwrt.git
|
#GIT_FEED _ruantiblock=https://github.com/gSpotx2f/ruantiblock_openwrt.git
|
||||||
|
|||||||
27
_base.config
27
_base.config
@@ -162,6 +162,7 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED=y
|
|||||||
CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y
|
CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y
|
||||||
#CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED=y
|
#CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED=y
|
||||||
#CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED=y
|
#CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED=y
|
||||||
|
CONFIG_PACKAGE_px5g-mbedtls=y
|
||||||
|
|
||||||
### OpenSSL lib
|
### OpenSSL lib
|
||||||
CONFIG_PACKAGE_libopenssl=y
|
CONFIG_PACKAGE_libopenssl=y
|
||||||
@@ -204,8 +205,8 @@ CONFIG_PACKAGE_luci-app-ddns=y
|
|||||||
CONFIG_PACKAGE_luci-i18n-ddns-ru=y
|
CONFIG_PACKAGE_luci-i18n-ddns-ru=y
|
||||||
CONFIG_PACKAGE_luci-app-firewall=y
|
CONFIG_PACKAGE_luci-app-firewall=y
|
||||||
CONFIG_PACKAGE_luci-i18n-firewall-ru=y
|
CONFIG_PACKAGE_luci-i18n-firewall-ru=y
|
||||||
CONFIG_PACKAGE_luci-app-opkg=y
|
CONFIG_PACKAGE_luci-app-package-manager=y
|
||||||
CONFIG_PACKAGE_luci-i18n-opkg-ru=y
|
CONFIG_PACKAGE_luci-i18n-package-manager-ru=y
|
||||||
CONFIG_PACKAGE_luci-app-uhttpd=y
|
CONFIG_PACKAGE_luci-app-uhttpd=y
|
||||||
CONFIG_PACKAGE_luci-i18n-uhttpd-ru=y
|
CONFIG_PACKAGE_luci-i18n-uhttpd-ru=y
|
||||||
CONFIG_PACKAGE_luci-app-upnp=y
|
CONFIG_PACKAGE_luci-app-upnp=y
|
||||||
@@ -217,6 +218,28 @@ CONFIG_PACKAGE_luci-theme-material=y
|
|||||||
CONFIG_PACKAGE_luci-theme-openwrt=y
|
CONFIG_PACKAGE_luci-theme-openwrt=y
|
||||||
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
|
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
|
||||||
|
|
||||||
|
### Luci extensions
|
||||||
|
CONFIG_PACKAGE_luci-full=y
|
||||||
|
CONFIG_PACKAGE_luci-lib-uqr=y
|
||||||
|
CONFIG_PACKAGE_luci-ssl=y
|
||||||
|
CONFIG_PACKAGE_cgi-io=y
|
||||||
|
CONFIG_PACKAGE_libiwinfo=y
|
||||||
|
CONFIG_PACKAGE_libiwinfo-data=y
|
||||||
|
CONFIG_PACKAGE_liblucihttp=y
|
||||||
|
CONFIG_PACKAGE_liblucihttp-ucode=y
|
||||||
|
CONFIG_PACKAGE_rpcd=y
|
||||||
|
CONFIG_PACKAGE_rpcd-mod-file=y
|
||||||
|
CONFIG_PACKAGE_rpcd-mod-iwinfo=y
|
||||||
|
CONFIG_PACKAGE_rpcd-mod-luci=y
|
||||||
|
CONFIG_PACKAGE_rpcd-mod-rpcsys=y
|
||||||
|
CONFIG_PACKAGE_rpcd-mod-rrdns=y
|
||||||
|
CONFIG_PACKAGE_rpcd-mod-ucode=y
|
||||||
|
CONFIG_PACKAGE_ucode-mod-html=y
|
||||||
|
CONFIG_PACKAGE_ucode-mod-log=y
|
||||||
|
CONFIG_PACKAGE_ucode-mod-math=y
|
||||||
|
CONFIG_PACKAGE_uhttpd=y
|
||||||
|
CONFIG_PACKAGE_uhttpd-mod-ubus=y
|
||||||
|
|
||||||
### Luci menu customizer
|
### Luci menu customizer
|
||||||
CONFIG_PACKAGE_cozymenu=y
|
CONFIG_PACKAGE_cozymenu=y
|
||||||
|
|
||||||
|
|||||||
@@ -77,8 +77,8 @@ CONFIG_PACKAGE_luci-mod-status=y
|
|||||||
CONFIG_PACKAGE_luci-mod-system=y
|
CONFIG_PACKAGE_luci-mod-system=y
|
||||||
CONFIG_PACKAGE_luci-app-commands=y
|
CONFIG_PACKAGE_luci-app-commands=y
|
||||||
CONFIG_PACKAGE_luci-i18n-commands-ru=y
|
CONFIG_PACKAGE_luci-i18n-commands-ru=y
|
||||||
CONFIG_PACKAGE_luci-app-opkg=y
|
CONFIG_PACKAGE_luci-app-package-manager=y
|
||||||
CONFIG_PACKAGE_luci-i18n-opkg-ru=y
|
CONFIG_PACKAGE_luci-i18n-package-manager-ru=y
|
||||||
|
|
||||||
### Luci themes
|
### Luci themes
|
||||||
CONFIG_PACKAGE_luci-theme-bootstrap=y
|
CONFIG_PACKAGE_luci-theme-bootstrap=y
|
||||||
|
|||||||
@@ -13,3 +13,8 @@ CONFIG_PACKAGE_zapret-tpws=y
|
|||||||
CONFIG_PACKAGE_zapret-mdig=y
|
CONFIG_PACKAGE_zapret-mdig=y
|
||||||
CONFIG_PACKAGE_zapret-ip2net=y
|
CONFIG_PACKAGE_zapret-ip2net=y
|
||||||
CONFIG_PACKAGE_luci-app-zapret=y
|
CONFIG_PACKAGE_luci-app-zapret=y
|
||||||
|
|
||||||
|
CONFIG_PACKAGE_zapret2=y
|
||||||
|
CONFIG_PACKAGE_zapret2-mdig=y
|
||||||
|
CONFIG_PACKAGE_zapret2-ip2net=y
|
||||||
|
CONFIG_PACKAGE_luci-app-zapret2=y
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ CONFIG_PACKAGE_luci-proto-wireguard=y
|
|||||||
CONFIG_PACKAGE_kmod-amneziawg=y
|
CONFIG_PACKAGE_kmod-amneziawg=y
|
||||||
CONFIG_PACKAGE_amneziawg-tools=y
|
CONFIG_PACKAGE_amneziawg-tools=y
|
||||||
CONFIG_PACKAGE_luci-proto-amneziawg=y
|
CONFIG_PACKAGE_luci-proto-amneziawg=y
|
||||||
|
CONFIG_PACKAGE_luci-i18n-amneziawg-ru=y
|
||||||
|
|
||||||
CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
|
CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
|
||||||
CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
|
CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
|
||||||
|
|||||||
@@ -24,10 +24,6 @@ CONFIG_PACKAGE_hdparm=y
|
|||||||
CONFIG_PACKAGE_luci-app-tn-netports=y
|
CONFIG_PACKAGE_luci-app-tn-netports=y
|
||||||
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
|
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
|
||||||
|
|
||||||
### Network traffic
|
|
||||||
CONFIG_PACKAGE_luci-app-sqm=y
|
|
||||||
CONFIG_PACKAGE_luci-i18n-sqm-ru=y
|
|
||||||
|
|
||||||
### TimeControl
|
### TimeControl
|
||||||
CONFIG_PACKAGE_luci-app-timecontrol=m
|
CONFIG_PACKAGE_luci-app-timecontrol=m
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ CONFIG_TARGET_ipq806x_generic_DEVICE_xiaomi_r3d=y
|
|||||||
#include _argon.config
|
#include _argon.config
|
||||||
#include _vpn.config
|
#include _vpn.config
|
||||||
|
|
||||||
CONFIG_KERNEL_KALLSYMS=y
|
#CONFIG_KERNEL_KALLSYMS=y
|
||||||
|
|
||||||
### Temp and sensors
|
### Temp and sensors
|
||||||
CONFIG_PACKAGE_lm-sensors=y
|
CONFIG_PACKAGE_lm-sensors=y
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ CONFIG_TARGET_qualcommax_ipq807x_DEVICE_asus_rt-ax89x=y
|
|||||||
#include _argon.config
|
#include _argon.config
|
||||||
#include _vpn.config
|
#include _vpn.config
|
||||||
|
|
||||||
CONFIG_KERNEL_KALLSYMS=y
|
#CONFIG_KERNEL_KALLSYMS=y
|
||||||
|
|
||||||
### Temp and sensors
|
### Temp and sensors
|
||||||
CONFIG_PACKAGE_lm-sensors=y
|
CONFIG_PACKAGE_lm-sensors=y
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ CONFIG_TARGET_qualcommax_ipq807x_DEVICE_asus_rt-ax89x=y
|
|||||||
#include _addons.config
|
#include _addons.config
|
||||||
#include _base_initrd.config
|
#include _base_initrd.config
|
||||||
|
|
||||||
CONFIG_KERNEL_KALLSYMS=y
|
#CONFIG_KERNEL_KALLSYMS=y
|
||||||
|
|
||||||
CONFIG_TARGET_INITRAMFS_FORCE=y
|
CONFIG_TARGET_INITRAMFS_FORCE=y
|
||||||
CONFIG_TARGET_ROOTFS_INITRAMFS=y
|
CONFIG_TARGET_ROOTFS_INITRAMFS=y
|
||||||
|
|||||||
34
xmake.sh
34
xmake.sh
@@ -127,6 +127,13 @@ function build_target {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AWG_KMOD_MK=$XDIR/package/feeds/_amneziawg/kmod-amneziawg/Makefile
|
||||||
|
if [ -f $AWG_KMOD_MK ]; then
|
||||||
|
if grep "876bf7571e47e349d0e86b70c244330b470d9642" $AWG_KMOD_MK >/dev/null ; then
|
||||||
|
sed -i 's/PKG_SOURCE_VERSION:=876bf7571e47e349d0e86b70c244330b470d9642/PKG_SOURCE_VERSION:=b96e12d00112dbee9d51d18d8438aa991cec0f6a/g' $AWG_KMOD_MK
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
PODKOP_MK=$XDIR/package/feeds/_podkop/podkop/Makefile
|
PODKOP_MK=$XDIR/package/feeds/_podkop/podkop/Makefile
|
||||||
if [ -f $PODKOP_MK ]; then
|
if [ -f $PODKOP_MK ]; then
|
||||||
sed -i 's/+sing-box / /g' $PODKOP_MK
|
sed -i 's/+sing-box / /g' $PODKOP_MK
|
||||||
@@ -137,8 +144,29 @@ function build_target {
|
|||||||
sed -i '/,\\"dns_configured\\":/i [ -z "$(which sing-box)" ] && status="not installed"' $PODKOP_SH
|
sed -i '/,\\"dns_configured\\":/i [ -z "$(which sing-box)" ] && status="not installed"' $PODKOP_SH
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DROPBEAR_MK=$XDIR/package/network/services/dropbear/Makefile
|
DROPBEAR_DIR=$XDIR/package/network/services/dropbear
|
||||||
|
TMP_DROPBEAR_DIR=$XDIR/_dropbear2024
|
||||||
if [ -f $DROPBEAR_MK ]; then
|
if [ -f $DROPBEAR_MK ]; then
|
||||||
|
# download dropbear 2024.86 (OpenWrt v24.10)
|
||||||
|
if [ ! -f $TMP_DROPBEAR_DIR/Makefile ]; then
|
||||||
|
rm -rf $TMP_DROPBEAR_DIR
|
||||||
|
git clone --depth 1 --filter=blob:none --sparse https://github.com/openwrt/openwrt.git $TMP_DROPBEAR_DIR && (
|
||||||
|
cd $TMP_DROPBEAR_DIR
|
||||||
|
git sparse-checkout set package/network/services/dropbear
|
||||||
|
git checkout a2f0cd35ac1d15e69f4897b35c049e175dd06825 # commit 2024-12-12 https://github.com/openwrt/openwrt/commits/openwrt-25.12/package/network/services/dropbear
|
||||||
|
mv package/network/services/dropbear/* .
|
||||||
|
)
|
||||||
|
rm -rf $TMP_DROPBEAR_DIR/package
|
||||||
|
rm -rf $TMP_DROPBEAR_DIR/.git
|
||||||
|
fi
|
||||||
|
rm -rf $DROPBEAR_DIR/files
|
||||||
|
rm -rf $DROPBEAR_DIR/patches
|
||||||
|
fi
|
||||||
|
DROPBEAR_MK=$DROPBEAR_DIR/Makefile
|
||||||
|
if [ -f $DROPBEAR_MK ]; then
|
||||||
|
# downgrade dropbear to 2024.86 (OpenWrt v24.10)
|
||||||
|
cp -a $TMP_DROPBEAR_DIR/. $DROPBEAR_DIR/
|
||||||
|
# patch: Disable MODERN and enable RSA/DH-SHA1
|
||||||
sed -i 's/^PKG_RELEASE:=.*/PKG_RELEASE:=0/g' $DROPBEAR_MK
|
sed -i 's/^PKG_RELEASE:=.*/PKG_RELEASE:=0/g' $DROPBEAR_MK
|
||||||
sed -i '/,CONFIG_DROPBEAR_MODERN_ONLY,/d' $DROPBEAR_MK
|
sed -i '/,CONFIG_DROPBEAR_MODERN_ONLY,/d' $DROPBEAR_MK
|
||||||
sed -i 's/\tCONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
|
sed -i 's/\tCONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
|
||||||
@@ -273,7 +301,7 @@ function build_target {
|
|||||||
echo "src/gz fantastic_packages_special $PKG_LINK/special" >> $OPKG_CFEED_FN
|
echo "src/gz fantastic_packages_special $PKG_LINK/special" >> $OPKG_CFEED_FN
|
||||||
TARGET_ARCH_PACKAGES=$( get_cfg_opt_value $CFG TARGET_ARCH_PACKAGES )
|
TARGET_ARCH_PACKAGES=$( get_cfg_opt_value $CFG TARGET_ARCH_PACKAGES )
|
||||||
[ -z "$TARGET_ARCH_PACKAGES" ] && die "Cannot find TARGET ARCH"
|
[ -z "$TARGET_ARCH_PACKAGES" ] && die "Cannot find TARGET ARCH"
|
||||||
sed -i "s/<<VER>>/24.10/g" $OPKG_CFEED_FN
|
sed -i "s/<<VER>>/25.12/g" $OPKG_CFEED_FN
|
||||||
sed -i "s/<<ARCH>>/$TARGET_ARCH_PACKAGES/g" $OPKG_CFEED_FN
|
sed -i "s/<<ARCH>>/$TARGET_ARCH_PACKAGES/g" $OPKG_CFEED_FN
|
||||||
logmsg "Added support of Fantastic packages [https://fantastic-packages.github.io/packages]"
|
logmsg "Added support of Fantastic packages [https://fantastic-packages.github.io/packages]"
|
||||||
fi
|
fi
|
||||||
@@ -294,6 +322,8 @@ function build_target {
|
|||||||
make_jobs=$( grep processor /proc/cpuinfo | tail -n 1 | awk '{print $3}' )
|
make_jobs=$( grep processor /proc/cpuinfo | tail -n 1 | awk '{print $3}' )
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cp -af $XDIR/.config $XDIR/tmp/.config
|
||||||
|
|
||||||
#make tools/install -j$make_jobs
|
#make tools/install -j$make_jobs
|
||||||
#make toolchain/install -j$make_jobs
|
#make toolchain/install -j$make_jobs
|
||||||
|
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ if [ "$OPT_FULL_UPDATE" = "true" ]; then
|
|||||||
#rm -rf feeds
|
#rm -rf feeds
|
||||||
#rm -rf package/feeds
|
#rm -rf package/feeds
|
||||||
rm -rf staging_dir/packages
|
rm -rf staging_dir/packages
|
||||||
|
rm -rf feeds/_*
|
||||||
rm -rf $XADDONSDIR
|
rm -rf $XADDONSDIR
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_zenwifi-bt8=y
|
|||||||
#include _argon.config
|
#include _argon.config
|
||||||
#include _vpn.config
|
#include _vpn.config
|
||||||
|
|
||||||
CONFIG_KERNEL_KALLSYMS=y
|
#CONFIG_KERNEL_KALLSYMS=y
|
||||||
|
|
||||||
### Temp and sensors
|
### Temp and sensors
|
||||||
CONFIG_PACKAGE_lm-sensors=y
|
CONFIG_PACKAGE_lm-sensors=y
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ CONFIG_TARGET_mediatek=y
|
|||||||
CONFIG_TARGET_mediatek_filogic=y
|
CONFIG_TARGET_mediatek_filogic=y
|
||||||
CONFIG_TARGET_mediatek_filogic_DEVICE_asus_zenwifi-bt8=y
|
CONFIG_TARGET_mediatek_filogic_DEVICE_asus_zenwifi-bt8=y
|
||||||
|
|
||||||
CONFIG_KERNEL_KALLSYMS=y
|
#CONFIG_KERNEL_KALLSYMS=y
|
||||||
|
|
||||||
#include _addons.config
|
#include _addons.config
|
||||||
#include _base_initrd.config
|
#include _base_initrd.config
|
||||||
|
|||||||
Reference in New Issue
Block a user