mirror of
https://github.com/xopenwrt/X-OpenWrt-New.git
synced 2026-09-27 23:34:37 +00:00
Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
71e6f55a4e | ||
|
|
6c7873d959 | ||
|
|
f9b26dbad4 | ||
|
|
dfc88ebf8a | ||
|
|
696b8de1e8 | ||
|
|
b6a5ac592d | ||
|
|
b317947b55 | ||
|
|
68ae53cdc7 | ||
|
|
7612a90e97 | ||
|
|
3e51857c93 | ||
|
|
99725eccb2 |
@@ -157,7 +157,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
@@ -157,7 +157,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
@@ -157,7 +157,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
@@ -156,7 +156,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
@@ -157,7 +157,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
@@ -157,7 +157,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
@@ -157,7 +157,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
@@ -157,7 +157,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
@@ -172,7 +172,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
@@ -72,7 +72,6 @@ jobs:
|
||||
echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
|
||||
if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
|
||||
then
|
||||
docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
|
||||
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
|
||||
sudo -E apt-get -y autoremove --purge
|
||||
sudo -E apt-get clean
|
||||
@@ -191,7 +190,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
@@ -180,7 +180,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
@@ -149,7 +149,6 @@ jobs:
|
||||
sudo chown $USER:$GROUPS /workdir
|
||||
if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
|
||||
then
|
||||
docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
|
||||
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
|
||||
sudo -E apt-get -y autoremove --purge
|
||||
sudo -E apt-get clean
|
||||
@@ -188,7 +187,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
@@ -147,7 +147,6 @@ jobs:
|
||||
if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
|
||||
then
|
||||
docker images
|
||||
docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
|
||||
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
|
||||
sudo -E apt-get -y autoremove --purge
|
||||
sudo -E apt-get clean
|
||||
@@ -186,7 +185,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
@@ -176,7 +176,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
@@ -176,7 +176,7 @@ jobs:
|
||||
cd openwrt
|
||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||
then
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
||||
fi
|
||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||
|
||||
+3
-3
@@ -18,11 +18,11 @@ CONFIG_PACKAGE_hostapd-common=y
|
||||
CONFIG_PACKAGE_wpa-supplicant=y
|
||||
|
||||
# Theme
|
||||
CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
|
||||
# CONFIG_PACKAGE_luci-theme-edge=y
|
||||
|
||||
#
|
||||
# # CONFIG_PACKAGE_luci-theme-argon is not set
|
||||
# CONFIG_PACKAGE_luci-theme-argon-mod=y
|
||||
# CONFIG_PACKAGE_luci-theme-neobird=y
|
||||
# # CONFIG_PACKAGE_luci-theme-neobird is not set
|
||||
# passwall
|
||||
# CONFIG_PACKAGE_luci-app-passwall=y
|
||||
# # Adguard Home
|
||||
|
||||
+6
-6
@@ -13,14 +13,14 @@ CONFIG_PACKAGE_luci-lib-docker=y
|
||||
# Hello World
|
||||
# CONFIG_PACKAGE_luci-app-vssr=y
|
||||
# KERNEL_PATCHVER:=6.6
|
||||
# KERNEL_TESTING_PATCHVER:=6.1
|
||||
CONFIG_TESTING_KERNEL=y
|
||||
# KERNEL_TESTING_PATCHVER:=6.12
|
||||
# CONFIG_TESTING_KERNEL=y
|
||||
# Theme
|
||||
CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
|
||||
|
||||
CONFIG_PACKAGE_luci-theme-bootstrap=y
|
||||
CONFIG_PACKAGE_luci-theme-material=y
|
||||
CONFIG_PACKAGE_luci-theme-neobird=y
|
||||
CONFIG_PACKAGE_luci-theme-edge=y
|
||||
# CONFIG_PACKAGE_luci-theme-neobird is not set
|
||||
|
||||
|
||||
# wifi
|
||||
# 7625d Adapter
|
||||
@@ -124,7 +124,7 @@ CONFIG_PACKAGE_luci-app-nfs=y
|
||||
CONFIG_PACKAGE_luci-app-npc=y
|
||||
CONFIG_PACKAGE_luci-app-openclash=y
|
||||
CONFIG_PACKAGE_luci-app-onliner=y
|
||||
CONFIG_PACKAGE_luci-app-passwall2=y
|
||||
CONFIG_PACKAGE_luci-app-passwall=y
|
||||
CONFIG_PACKAGE_luci-app-pptp-server=y
|
||||
CONFIG_PACKAGE_luci-app-qbittorrent=y
|
||||
# CONFIG_PACKAGE_luci-app-qbittorrent_dynamic is not set
|
||||
|
||||
+6
-6
@@ -5,16 +5,16 @@ CONFIG_PACKAGE_smartdns=y
|
||||
CONFIG_PACKAGE_luci-app-smartdns=y
|
||||
CONFIG_PACKAGE_luci-i18n-smartdns-zh-cn=y
|
||||
# KERNEL_PATCHVER:=6.6
|
||||
# KERNEL_TESTING_PATCHVER:=6.1
|
||||
CONFIG_TESTING_KERNEL=y
|
||||
# KERNEL_TESTING_PATCHVER:=6.12
|
||||
# CONFIG_TESTING_KERNEL=y
|
||||
# Theme
|
||||
CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
|
||||
|
||||
# CONFIG_PACKAGE_luci-theme-argon is not set
|
||||
CONFIG_PACKAGE_luci-theme-argon-mod=y
|
||||
CONFIG_PACKAGE_luci-theme-neobird=y
|
||||
CONFIG_PACKAGE_luci-theme-edge=y
|
||||
# CONFIG_PACKAGE_luci-theme-neobird is not set
|
||||
|
||||
# passwall
|
||||
CONFIG_PACKAGE_luci-app-passwall2=y
|
||||
CONFIG_PACKAGE_luci-app-passwall=y
|
||||
# Adguard Home
|
||||
CONFIG_PACKAGE_luci-app-adguardhome=y
|
||||
CONFIG_PACKAGE_adguardhome=y
|
||||
|
||||
+6
-6
@@ -10,16 +10,16 @@ CONFIG_IB=y
|
||||
CONFIG_IB_STANDALONE=y
|
||||
|
||||
# KERNEL_PATCHVER:=6.6
|
||||
# KERNEL_TESTING_PATCHVER:=6.1
|
||||
CONFIG_TESTING_KERNEL=y
|
||||
# KERNEL_TESTING_PATCHVER:=6.12
|
||||
# CONFIG_TESTING_KERNEL=y
|
||||
# Theme
|
||||
CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
|
||||
CONFIG_PACKAGE_luci-theme-edge=y
|
||||
|
||||
|
||||
# CONFIG_PACKAGE_luci-theme-argon is not set
|
||||
CONFIG_PACKAGE_luci-theme-argon-mod=y
|
||||
CONFIG_PACKAGE_luci-theme-neobird=y
|
||||
# CONFIG_PACKAGE_luci-theme-neobird is not set
|
||||
# passwall
|
||||
CONFIG_PACKAGE_luci-app-passwall2=y
|
||||
CONFIG_PACKAGE_luci-app-passwall=y
|
||||
# Adguard Home
|
||||
CONFIG_PACKAGE_luci-app-adguardhome=y
|
||||
CONFIG_PACKAGE_adguardhome=y
|
||||
|
||||
@@ -13,11 +13,11 @@ CONFIG_IB_STANDALONE=y
|
||||
# KERNEL_TESTING_PATCHVER:=6.1
|
||||
CONFIG_TESTING_KERNEL=y
|
||||
# Theme
|
||||
CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
|
||||
CONFIG_PACKAGE_luci-theme-edge=y
|
||||
|
||||
|
||||
# CONFIG_PACKAGE_luci-theme-argon is not set
|
||||
CONFIG_PACKAGE_luci-theme-argon-mod=y
|
||||
CONFIG_PACKAGE_luci-theme-neobird=y
|
||||
# CONFIG_PACKAGE_luci-theme-neobird is not set
|
||||
# passwall
|
||||
CONFIG_PACKAGE_luci-app-passwall2=y
|
||||
# Adguard Home
|
||||
|
||||
@@ -78,7 +78,7 @@ EOF
|
||||
done ; unset i
|
||||
|
||||
AddPackage svn apps minieap immortalwrt openwrt-18.06 packages net
|
||||
AddPackage git other luci-theme-atmaterial-ColorIcon esirplayground master
|
||||
# AddPackage git other luci-theme-atmaterial-ColorIcon esirplayground master
|
||||
AddPackage git lean luci-app-argon-config jerrykuku master
|
||||
AddPackage git other OpenClash vernesong master
|
||||
# AddPackage git other luci-app-vssr jerrykuku master
|
||||
@@ -123,7 +123,7 @@ EOF
|
||||
sed -i -- 's:/bin/ash:'/bin/bash':g' ${BASE_FILES}/etc/passwd
|
||||
#sed -i "s?6.0?5.19?g" ${WORK}/target/linux/x86/Makefile
|
||||
# patch < ${CustomFiles}/Patches/upgrade_intel_igpu_drv.patch -p1 -d ${WORK}
|
||||
patch < ${CustomFiles}/Patches/fix_mac80211.patch -p1 -d ${WORK}
|
||||
# patch < ${CustomFiles}/Patches/fix_mac80211.patch -p1 -d ${WORK}
|
||||
#fix hostapd
|
||||
sed -i "s/\#CONFIG_AP/CONFIG_AP/g" ${WORK}/package/network/services/hostapd/files/wpa*
|
||||
;;
|
||||
|
||||
@@ -23,8 +23,11 @@ Firmware_Diy_Before() {
|
||||
fi
|
||||
case "${OP_AUTHOR}/${OP_REPO}" in
|
||||
coolsnowwolf/lede)
|
||||
# Version_File=package/lean/default-settings/files/zzz-default-settings
|
||||
# zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
|
||||
Version_File=package/lean/default-settings/files/zzz-default-settings
|
||||
zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
|
||||
Version_Raw=$(cat package/lean/default-settings/files/zzz-default-settings | grep DISTRIB_REVISION)
|
||||
zzz_Default_Version="$(echo $Version_Raw | egrep -o "R[0-9]+\.[0-9]+\.[0-9]+")"
|
||||
OP_VERSION="${zzz_Default_Version}-${Compile_Date}"
|
||||
;;
|
||||
immortalwrt/immortalwrt)
|
||||
|
||||
@@ -17,7 +17,8 @@ df -h
|
||||
echo "------------------------------- IP Address Info ------------------------------"
|
||||
IP=`curl ip.115115.xyz -s`
|
||||
curl ip.115115.xyz -s
|
||||
curl -s https://searchplugin.csdn.net/api/v1/ip/get?ip=${IP} | jq -r .data.address
|
||||
# curl -s https://searchplugin.csdn.net/api/v1/ip/get?ip=${IP} | jq -r .data.address
|
||||
curl -s https://api.vore.top/api/IPdata?ip=${IP} | jq -r .adcode.o
|
||||
}
|
||||
|
||||
Get_Release_Info() {
|
||||
|
||||
Reference in New Issue
Block a user