Compare commits
20 Commits
2025.06.11
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
ef5ad00b3b | ||
|
|
81f6d9758f | ||
|
|
ed106426f3 | ||
|
|
5204e9887b | ||
|
|
035122c9d8 | ||
|
|
810f912815 | ||
|
|
d322cc977f | ||
|
|
77cb27bdd7 | ||
|
|
140c6ee6f1 | ||
|
|
7bc13ac283 | ||
|
|
cd112e53bc | ||
|
|
716cf4bd24 | ||
|
|
e8711e958d | ||
|
|
3fb988bfbf | ||
|
|
4b35a2ca12 | ||
|
|
df662e674c | ||
|
|
861a05f369 | ||
|
|
fdc1eb77fb | ||
|
|
5a0a905b30 | ||
|
|
a78a641708 |
29
.github/workflows/build-istoreos-x86.yml
vendored
29
.github/workflows/build-istoreos-x86.yml
vendored
@@ -41,9 +41,22 @@ jobs:
|
||||
fail-fast: false
|
||||
|
||||
steps:
|
||||
- name: 合并磁盘
|
||||
uses: easimon/maximize-build-space@master
|
||||
with:
|
||||
swap-size-mb: 1024
|
||||
temp-reserve-mb: 100
|
||||
root-reserve-mb: 1024
|
||||
|
||||
- name: 准备完成
|
||||
uses: actions/checkout@main
|
||||
|
||||
- name: 创建工作目录
|
||||
run: |
|
||||
mkdir -p ${GITHUB_WORKSPACE}/workdir
|
||||
chmod 755 ${GITHUB_WORKSPACE}/workdir
|
||||
echo "WORKDIR=$PWD" >> $GITHUB_ENV
|
||||
|
||||
- name: 检查服务器配置
|
||||
run: |
|
||||
echo "若分配的服务器性能不足，务必及时取消，重新运行！"
|
||||
@@ -77,17 +90,15 @@ jobs:
|
||||
sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* adoptopenjdk* mysql* php* mongodb* dotnet* moby* snapd* android* || true
|
||||
sudo -E apt-get -qq autoremove --purge
|
||||
sudo -E apt-get -qq clean
|
||||
echo "------------------------------- 设置工作目录及时区 -------------------------------"
|
||||
echo "------------------------------- 设置时区 -------------------------------"
|
||||
sudo timedatectl set-timezone "$TZ"
|
||||
sudo mkdir -p /mnt/workdir
|
||||
sudo chown $USER:$GROUPS /mnt/workdir
|
||||
|
||||
- name: 克隆源码
|
||||
working-directory: /mnt/workdir
|
||||
working-directory: ${{ env.WORKDIR }}/workdir
|
||||
run: |
|
||||
df -hT $PWD
|
||||
git clone $REPO_URL -b ${{ matrix.REPO_BRANCH }} openwrt
|
||||
ln -sf /mnt/workdir/openwrt $GITHUB_WORKSPACE/openwrt
|
||||
ln -sf ${{ env.WORKDIR }}/workdir/openwrt $GITHUB_WORKSPACE/openwrt
|
||||
|
||||
- name: 缓存构建动作
|
||||
uses: klever1988/cachewrtbuild@main
|
||||
@@ -177,7 +188,7 @@ jobs:
|
||||
id: tag
|
||||
if: steps.compile.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled()
|
||||
run: |
|
||||
echo "release_tag=$(date +"%Y.%m.%d-%H.%M")" >> ${GITHUB_OUTPUT}
|
||||
echo "release_tag=$(date +"%Y.%m.%d-%H.%M")-${{ matrix.ARCHITECTURE }}" >> ${GITHUB_OUTPUT}
|
||||
touch release.txt
|
||||
echo "
|
||||
💻 架构: ${{ matrix.ARCHITECTURE }}
|
||||
@@ -208,13 +219,13 @@ jobs:
|
||||
- name: 删除运行记录
|
||||
uses: xiaomeng9597/delete-workflow-runs@main
|
||||
with:
|
||||
retain_days: 1
|
||||
keep_minimum_runs: 1
|
||||
retain_days: 20
|
||||
keep_minimum_runs: 15
|
||||
token: ${{ env.GITHUB_TOKEN }}
|
||||
|
||||
- name: 删除自动发布的旧固件
|
||||
uses: dev-drprasad/delete-older-releases@v0.3.3
|
||||
if: env.UPLOAD_RELEASE == 'true' && !cancelled()
|
||||
with:
|
||||
keep_latest: 15
|
||||
keep_latest: 60
|
||||
delete_tags: true
|
||||
|
||||
29
.github/workflows/build-istoreos.yml
vendored
29
.github/workflows/build-istoreos.yml
vendored
@@ -41,9 +41,22 @@ jobs:
|
||||
fail-fast: false
|
||||
|
||||
steps:
|
||||
- name: 合并磁盘
|
||||
uses: easimon/maximize-build-space@master
|
||||
with:
|
||||
swap-size-mb: 1024
|
||||
temp-reserve-mb: 100
|
||||
root-reserve-mb: 1024
|
||||
|
||||
- name: 准备完成
|
||||
uses: actions/checkout@main
|
||||
|
||||
- name: 创建工作目录
|
||||
run: |
|
||||
mkdir -p ${GITHUB_WORKSPACE}/workdir
|
||||
chmod 755 ${GITHUB_WORKSPACE}/workdir
|
||||
echo "WORKDIR=$PWD" >> $GITHUB_ENV
|
||||
|
||||
- name: 检查服务器配置
|
||||
run: |
|
||||
echo "若分配的服务器性能不足，务必及时取消，重新运行！"
|
||||
@@ -77,17 +90,15 @@ jobs:
|
||||
sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* adoptopenjdk* mysql* php* mongodb* dotnet* moby* snapd* android* || true
|
||||
sudo -E apt-get -qq autoremove --purge
|
||||
sudo -E apt-get -qq clean
|
||||
echo "------------------------------- 设置工作目录及时区 -------------------------------"
|
||||
echo "------------------------------- 设置时区 -------------------------------"
|
||||
sudo timedatectl set-timezone "$TZ"
|
||||
sudo mkdir -p /mnt/workdir
|
||||
sudo chown $USER:$GROUPS /mnt/workdir
|
||||
|
||||
- name: 克隆源码
|
||||
working-directory: /mnt/workdir
|
||||
working-directory: ${{ env.WORKDIR }}/workdir
|
||||
run: |
|
||||
df -hT $PWD
|
||||
git clone $REPO_URL -b ${{ matrix.REPO_BRANCH }} openwrt
|
||||
ln -sf /mnt/workdir/openwrt $GITHUB_WORKSPACE/openwrt
|
||||
ln -sf ${{ env.WORKDIR }}/workdir/openwrt $GITHUB_WORKSPACE/openwrt
|
||||
|
||||
- name: 缓存构建动作
|
||||
uses: klever1988/cachewrtbuild@main
|
||||
@@ -177,7 +188,7 @@ jobs:
|
||||
id: tag
|
||||
if: steps.compile.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled()
|
||||
run: |
|
||||
echo "release_tag=$(date +"%Y.%m.%d-%H.%M")" >> ${GITHUB_OUTPUT}
|
||||
echo "release_tag=$(date +"%Y.%m.%d-%H.%M")-${{ matrix.ARCHITECTURE }}" >> ${GITHUB_OUTPUT}
|
||||
touch release.txt
|
||||
echo "
|
||||
💻 架构: ${{ matrix.ARCHITECTURE }}
|
||||
@@ -208,13 +219,13 @@ jobs:
|
||||
- name: 删除运行记录
|
||||
uses: xiaomeng9597/delete-workflow-runs@main
|
||||
with:
|
||||
retain_days: 1
|
||||
keep_minimum_runs: 1
|
||||
retain_days: 20
|
||||
keep_minimum_runs: 15
|
||||
token: ${{ env.GITHUB_TOKEN }}
|
||||
|
||||
- name: 删除自动发布的旧固件
|
||||
uses: dev-drprasad/delete-older-releases@v0.3.3
|
||||
if: env.UPLOAD_RELEASE == 'true' && !cancelled()
|
||||
with:
|
||||
keep_latest: 15
|
||||
keep_latest: 60
|
||||
delete_tags: true
|
||||
|
||||
7
.github/workflows/sync-files.yml
vendored
7
.github/workflows/sync-files.yml
vendored
@@ -16,7 +16,6 @@ jobs:
|
||||
- name: 下载架构编译配置文件
|
||||
run: |
|
||||
mkdir -p ./rk35xx
|
||||
rm -f ./rk35xx/.config
|
||||
wget -O ./rk35xx/feeds.conf https://fw0.koolcenter.com/iStoreOS-22.03/station-p2/feeds.conf --no-check-certificate
|
||||
wget -O ./rk35xx/.config https://fw0.koolcenter.com/iStoreOS-22.03/station-p2/config.buildinfo --no-check-certificate
|
||||
|
||||
@@ -37,7 +36,7 @@ jobs:
|
||||
echo -e "\\n$configdata" >> ./rk35xx/.config
|
||||
# 清除.config配置文件里面重复的配置项
|
||||
configdata2=$(cat ./rk35xx/.config)
|
||||
echo "$configdata2" | awk '!seen[$0]++' > ./rk35xx/.config
|
||||
echo "$configdata2" | awk '!seen[$0]++ && NF > 0' > ./rk35xx/.config
|
||||
else
|
||||
echo "不处理数据。"
|
||||
fi
|
||||
@@ -61,6 +60,6 @@ jobs:
|
||||
- name: 删除运行记录
|
||||
uses: xiaomeng9597/delete-workflow-runs@main
|
||||
with:
|
||||
retain_days: 1
|
||||
keep_minimum_runs: 1
|
||||
retain_days: 20
|
||||
keep_minimum_runs: 15
|
||||
token: ${{ secrets.ACCESS_TOKEN }}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
[](https://doc.linkease.com/zh/guide/istoreos) [](../../releases/latest)
|
||||
|
||||
                  
|
||||
                   
|
||||
|
||||
## 默认配置
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
- 如果要修改 `LAN` 口 `IP` , 首页有个内网设置，或者用命令 `quickstart` 修改
|
||||
- 北京时间每天 `0:00` 定时编译, `Release` 中只保留不同架构的最新版本
|
||||
- 历史版本在 `Actions` 中选择一个已经运行完成且成功的 `workflow` 在页面底部可以看到 `Artifacts`, `Artifacts` 需要登录 Github 才能下载
|
||||
- 请把要加入的插件配置项填写在仓库 “configfiles/config_data.txt” 文件里面，假如你直接填写到 “rk35xx/.config” 文件里面绝对会丢你新加的配置项，因为每天会定时执行同步文件工作流会自动更新.config为istoreos官方最新的配置文件。
|
||||
- 请把要加入的插件配置项填写在仓库 “configfiles/config_data.txt” 文件里面，假如你直接填写到 “rk35xx/.config” 文件里面绝对会丢你新加的配置项，因为每天会定时执行同步文件 “Sync Files” 工作流会自动更新.config为istoreos官方最新的配置文件。
|
||||
- 自行定制时需要注意这几点：假如你禁用了 “Sync Files” 工作流的话，那插件配置项就要填写到 “rk35xx/.config” 文件里面才行，反之你没禁用 “Sync Files” 工作流的话，那插件配置项就要填写到 “configfiles/config_data.txt” 文件里面才行。
|
||||
- 使用此仓库必须设置机密token，Actions云编译固件时需要用到，其他人无法看到的（通常在仓库设置里面，严禁在仓库可视代码中填写，否则后果自负），机密键名为 `ACCESS_TOKEN`
|
||||
|
||||
@@ -44,9 +44,10 @@
|
||||
| PANTHER-X2 | istoreos-rockchip-rk35xx-panther_x2-squashfs-sysupgrade.img.gz |
|
||||
| DG-NAS-LITE/IDO3568-CM4 | istoreos-rockchip-rk35xx-dg_nas-lite-squashfs-sysupgrade.img.gz |
|
||||
| EZPRO-Mrkaio-M68S | istoreos-rockchip-rk35xx-ezpro_mrkaio-m68s-squashfs-sysupgrade.img.gz |
|
||||
| EZPRO-Mrkaio-M68S-PLUS | istoreos-rockchip-rk35xx-ezpro_mrkaio-m68s-plus-squashfs-sysupgrade.img.gz |
|
||||
| EZPRO-Mrkaio-M68S-Plus | istoreos-rockchip-rk35xx-ezpro_mrkaio-m68s-plus-squashfs-sysupgrade.img.gz |
|
||||
| DG-TN3568 | istoreos-rockchip-rk35xx-dg_tn3568-squashfs-sysupgrade.img.gz |
|
||||
| YIJIAHE-JM10 | istoreos-rockchip-rk35xx-yijiahe_jm10-squashfs-sysupgrade.img.gz |
|
||||
| Orange-Pi-5-Plus | istoreos-rockchip-rk35xx-xunlong_orangepi-5-plus-squashfs-sysupgrade.img.gz |
|
||||
|
||||
### x86 架构
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@ CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_ezpro_mrkaio-m68s=y
|
||||
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_ezpro_mrkaio-m68s-plus=y
|
||||
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_dg_tn3568=y
|
||||
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_yijiahe_jm10=y
|
||||
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_xunlong_orangepi-5-plus=y
|
||||
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_cyber3588_aib=y
|
||||
|
||||
CONFIG_PACKAGE_brcmfmac-firmware-panther-x2=y
|
||||
@@ -31,11 +32,11 @@ CONFIG_PACKAGE_rkwifi-firmware-ap6275p=y
|
||||
CONFIG_PACKAGE_rkwifi-firmware-ap6275s=y
|
||||
CONFIG_PACKAGE_rkwifi-firmware-ap6398s=y
|
||||
CONFIG_PACKAGE_kmod-rkwifi-bcmdhd-pcie=y
|
||||
CONFIG_PACKAGE_kmod-nft-tproxy=y
|
||||
CONFIG_PACKAGE_kmod-dsa=y
|
||||
CONFIG_PACKAGE_kmod-dsa-mv88e6xxx=y
|
||||
CONFIG_PACKAGE_kmod-dsa-tag-dsa=y
|
||||
CONFIG_PACKAGE_kmod-phy-marvell=y
|
||||
CONFIG_PACKAGE_kmod-nft-tproxy=y
|
||||
|
||||
CONFIG_PACKAGE_kmod-usb-printer=y
|
||||
CONFIG_PACKAGE_luci-app-usb-printer=y
|
||||
@@ -76,6 +77,7 @@ CONFIG_PACKAGE_coreutils-base64=y
|
||||
CONFIG_PACKAGE_coreutils-stat=y
|
||||
CONFIG_PACKAGE_coreutils-stty=y
|
||||
CONFIG_PACKAGE_coreutils-nohup=y
|
||||
CONFIG_PACKAGE_default-settings=y
|
||||
CONFIG_PACKAGE_luci-app-store=y
|
||||
CONFIG_PACKAGE_quickstart=y
|
||||
CONFIG_PACKAGE_luci-app-quickstart=y
|
||||
|
||||
0
configfiles/coremark/coremark → configfiles/coremark/coremark-arm64
Normal file → Executable file
0
configfiles/coremark/coremark → configfiles/coremark/coremark-arm64
Normal file → Executable file
71
configfiles/coremark/coremark-arm64.sh
Executable file
71
configfiles/coremark/coremark-arm64.sh
Executable file
@@ -0,0 +1,71 @@
|
||||
#!/bin/bash
|
||||
|
||||
LOG=/etc/bench.log
|
||||
echo "<div><table>" > $LOG
|
||||
|
||||
GOV="/sys/devices/system/cpu/cpufreq/policy0/scaling_governor"
|
||||
if [ -f "$GOV" ];then
|
||||
CURRENT_GOVERNOR=$(cat $GOV)
|
||||
GOV_FLAG=1
|
||||
else
|
||||
GOV_FLAG=0
|
||||
fi
|
||||
|
||||
trap "echo killed;test $GOV_FLAG -eq 1 && echo ${CURRENT_GOVERNOR} > ${GOV} 2>/dev/null;echo '</table></div>' >> $LOG;rm -f /tmp/*.score;exit" 1 2 3 9 15
|
||||
|
||||
GOV_HOME='/sys/devices/system/cpu/cpufreq/'
|
||||
govs=()
|
||||
if [ $GOV_FLAG -eq 1 ];then
|
||||
POLICIES=$(cd $GOV_HOME && ls -d policy*)
|
||||
i=1
|
||||
for POLICY in $POLICIES;do
|
||||
CUR_GOV="${GOV_HOME}/${POLICY}/scaling_governor"
|
||||
govs[$i]=$(cat $CUR_GOV)
|
||||
echo "performance" > ${CUR_GOV} 2>/dev/null
|
||||
i=$((i+1))
|
||||
done
|
||||
fi
|
||||
|
||||
echo "testing coremark ... "
|
||||
sleep 1
|
||||
COREMARK=$(/bin/coremark-arm64 2>/dev/null | tail -n 1 | awk '{print $4}')
|
||||
if [ -z "$COREMARK" ]; then
|
||||
echo "coremark run failed."
|
||||
exit 1
|
||||
fi
|
||||
# 分数取整
|
||||
# COREMARK=${COREMARK%.*}
|
||||
echo "CPU CoreMark : $COREMARK"
|
||||
echo "<tr><td width=\"38%\">CPU CoreMark</td><td>$COREMARK</td></tr>" >> $LOG
|
||||
|
||||
if [ -x /usr/bin/openssl ];then
|
||||
CORES=$(grep processor /proc/cpuinfo | wc -l)
|
||||
|
||||
PROJS="aes-128-gcm aes-256-gcm chacha20-poly1305"
|
||||
for P in $PROJS;do
|
||||
echo "testing $P ..."
|
||||
sleep 1
|
||||
/usr/bin/openssl speed -multi $CORES -evp $P 1>/tmp/${P}.score 2>/dev/null || echo "NA" >/tmp/${P}.score
|
||||
S=$(tail -n 1 /tmp/${P}.score | awk '{print $5}')
|
||||
echo "${P}(1K) : ${S}"
|
||||
echo "<tr><td>${P}(1K)</td><td>$S</td></tr>" >> $LOG
|
||||
rm -f /tmp/${P}.score
|
||||
done
|
||||
|
||||
fi
|
||||
|
||||
echo "</table></div>" >> $LOG
|
||||
|
||||
if [ $GOV_FLAG -eq 1 ];then
|
||||
i=1
|
||||
for POLICY in $POLICIES;do
|
||||
CUR_GOV="${GOV_HOME}/${POLICY}/scaling_governor"
|
||||
echo "${govs[$i]}" > ${CUR_GOV} 2>/dev/null
|
||||
i=$((i+1))
|
||||
done
|
||||
fi
|
||||
|
||||
if [ -f "$LOG" ]; then
|
||||
sed -i '/coremark/d' /etc/crontabs/root
|
||||
crontab /etc/crontabs/root
|
||||
fi
|
||||
6
configfiles/coremark/coremark.sh → configfiles/coremark/coremark-x86.sh
Normal file → Executable file
6
configfiles/coremark/coremark.sh → configfiles/coremark/coremark-x86.sh
Normal file → Executable file
@@ -28,7 +28,11 @@ fi
|
||||
|
||||
echo "testing coremark ... "
|
||||
sleep 1
|
||||
COREMARK=$(/bin/coremark | tail -n 1 | awk '{print $4}')
|
||||
COREMARK=$(/bin/coremark 2>/dev/null | tail -n 1 | awk '{print $4}')
|
||||
if [ -z "$COREMARK" ]; then
|
||||
echo "coremark run failed."
|
||||
exit 1
|
||||
fi
|
||||
# 分数取整
|
||||
# COREMARK=${COREMARK%.*}
|
||||
echo "CPU CoreMark : $COREMARK"
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <dt-bindings/display/rockchip_vop.h>
|
||||
#include <dt-bindings/sensor-dev.h>
|
||||
#include "rk3568.dtsi"
|
||||
#include "rk3568-linux.dtsi"
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
@@ -45,6 +45,6 @@ stop() {
|
||||
|
||||
restart() {
|
||||
stop
|
||||
sleep 1
|
||||
sleep 2
|
||||
start
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ check_ubus() {
|
||||
fi
|
||||
|
||||
if [[ "$status_code" == 500 || "$status_code" == 502 ]] && echo "$rpcd_status" | grep -q "running"; then
|
||||
echo "$datetime / Ubus服务异常1，正在重启Ubus。"
|
||||
echo "$datetime / Ubus服务异常，正在重启Ubus。"
|
||||
killall rpcd 2>/dev/null
|
||||
sleep 1
|
||||
/sbin/rpcd -s /var/run/ubus/ubus.sock -t 30 &
|
||||
|
||||
19
diy-part2-x86.sh
Normal file → Executable file
19
diy-part2-x86.sh
Normal file → Executable file
@@ -7,9 +7,6 @@
|
||||
# Blog: https://p3terx.com
|
||||
#===============================================
|
||||
|
||||
# 删除引起iproute2依赖编译报错的补丁
|
||||
[ -e package/libs/elfutils/patches/999-fix-odd-build-oot-kmod-fail.patch ] && rm -f package/libs/elfutils/patches/999-fix-odd-build-oot-kmod-fail.patch
|
||||
|
||||
# update ubus git HEAD
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/ubus_Makefile package/system/ubus/Makefile
|
||||
|
||||
@@ -24,13 +21,25 @@ sed -i "s/:80/:81/g" package/network/services/uhttpd/files/uhttpd.config
|
||||
sed -i "s/:443/:4443/g" package/network/services/uhttpd/files/uhttpd.config
|
||||
cp -a $GITHUB_WORKSPACE/configfiles/etc/* package/base-files/files/etc/
|
||||
# ls package/base-files/files/etc/
|
||||
echo "CONFIG_PACKAGE_nginx=y
|
||||
CONFIG_PACKAGE_nginx-ssl=y
|
||||
CONFIG_PACKAGE_nginx-ssl-util=y
|
||||
CONFIG_PACKAGE_nginx-util=y
|
||||
CONFIG_PACKAGE_nginx-mod-luci=y
|
||||
CONFIG_PACKAGE_luci-nginx=y
|
||||
CONFIG_PACKAGE_default-settings=y" >> .config
|
||||
|
||||
|
||||
#集成CPU性能跑分脚本
|
||||
# 集成CPU性能跑分脚本
|
||||
echo "CONFIG_PACKAGE_coremark=y" >> .config
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/coremark/coremark.sh package/base-files/files/bin/coremark.sh
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/coremark/coremark-x86.sh package/base-files/files/bin/coremark.sh
|
||||
chmod 755 package/base-files/files/bin/coremark.sh
|
||||
|
||||
|
||||
# iStoreOS-settings
|
||||
git clone --depth=1 -b main https://github.com/xiaomeng9597/istoreos-settings package/default-settings
|
||||
|
||||
|
||||
# 定时限速插件
|
||||
echo "CONFIG_PACKAGE_luci-app-eqosplus=y
|
||||
CONFIG_PACKAGE_luci-i18n-eqosplus-zh-cn=y" >> .config
|
||||
|
||||
28
diy-part2.sh
Normal file → Executable file
28
diy-part2.sh
Normal file → Executable file
@@ -7,9 +7,6 @@
|
||||
# Blog: https://p3terx.com
|
||||
#===============================================
|
||||
|
||||
# 删除引起iproute2依赖编译报错的补丁
|
||||
[ -e package/libs/elfutils/patches/999-fix-odd-build-oot-kmod-fail.patch ] && rm -f package/libs/elfutils/patches/999-fix-odd-build-oot-kmod-fail.patch
|
||||
|
||||
# enable rk3568 model adc keys
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/adc-keys.txt adc-keys.txt
|
||||
! grep -q 'adc-keys {' package/boot/uboot-rk35xx/src/arch/arm/dts/rk3568-easepi.dts && sed -i '/\"rockchip,rk3568\";/r adc-keys.txt' package/boot/uboot-rk35xx/src/arch/arm/dts/rk3568-easepi.dts
|
||||
@@ -32,16 +29,16 @@ sed -i "/.*CONFIG_ROCKCHIP_RGA2.*/d" target/linux/rockchip/rk35xx/config-5.10
|
||||
|
||||
|
||||
# 替换dts文件
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/rk3566-jp-tvbox.dts target/linux/rockchip/dts/rk3568/rk3566-jp-tvbox.dts
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/dts/rk3566-jp-tvbox.dts target/linux/rockchip/dts/rk3568/rk3566-jp-tvbox.dts
|
||||
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/rk3566-panther-x2.dts target/linux/rockchip/dts/rk3568/rk3566-panther-x2.dts
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/dts/rk3566-panther-x2.dts target/linux/rockchip/dts/rk3568/rk3566-panther-x2.dts
|
||||
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/rk3568-dg-nas-lite-core.dtsi target/linux/rockchip/dts/rk3568/rk3568-dg-nas-lite-core.dtsi
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/rk3568-dg-nas-lite.dts target/linux/rockchip/dts/rk3568/rk3568-dg-nas-lite.dts
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/dts/rk3568-dg-nas-lite-core.dtsi target/linux/rockchip/dts/rk3568/rk3568-dg-nas-lite-core.dtsi
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/dts/rk3568-dg-nas-lite.dts target/linux/rockchip/dts/rk3568/rk3568-dg-nas-lite.dts
|
||||
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/rk3568-mrkaio-m68s-core.dtsi target/linux/rockchip/dts/rk3568/rk3568-mrkaio-m68s-core.dtsi
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/rk3568-mrkaio-m68s.dts target/linux/rockchip/dts/rk3568/rk3568-mrkaio-m68s.dts
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/rk3568-mrkaio-m68s-plus.dts target/linux/rockchip/dts/rk3568/rk3568-mrkaio-m68s-plus.dts
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/dts/rk3568-mrkaio-m68s-core.dtsi target/linux/rockchip/dts/rk3568/rk3568-mrkaio-m68s-core.dtsi
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/dts/rk3568-mrkaio-m68s.dts target/linux/rockchip/dts/rk3568/rk3568-mrkaio-m68s.dts
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/dts/rk3568-mrkaio-m68s-plus.dts target/linux/rockchip/dts/rk3568/rk3568-mrkaio-m68s-plus.dts
|
||||
|
||||
|
||||
|
||||
@@ -66,7 +63,7 @@ chmod 755 package/base-files/files/bin/ubus-examine.sh
|
||||
|
||||
|
||||
# 集成黑豹X2和荐片TV盒子WiFi驱动，默认不启用WiFi
|
||||
cp -a $GITHUB_WORKSPACE/configfiles/firmware/* package/firmware/
|
||||
cp -a $GITHUB_WORKSPACE/configfiles/packages/* package/firmware/
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/opwifi package/base-files/files/etc/init.d/opwifi
|
||||
chmod 755 package/base-files/files/etc/init.d/opwifi
|
||||
# sed -i "s/wireless.radio\${devidx}.disabled=1/wireless.radio\${devidx}.disabled=0/g" package/kernel/mac80211/files/lib/wifi/mac80211.sh
|
||||
@@ -74,10 +71,15 @@ chmod 755 package/base-files/files/etc/init.d/opwifi
|
||||
|
||||
|
||||
# 集成CPU性能跑分脚本
|
||||
cp -a $GITHUB_WORKSPACE/configfiles/coremark/* package/base-files/files/bin/
|
||||
chmod 755 package/base-files/files/bin/coremark
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/coremark/coremark-arm64 package/base-files/files/bin/coremark-arm64
|
||||
cp -f $GITHUB_WORKSPACE/configfiles/coremark/coremark-arm64.sh package/base-files/files/bin/coremark.sh
|
||||
chmod 755 package/base-files/files/bin/coremark-arm64
|
||||
chmod 755 package/base-files/files/bin/coremark.sh
|
||||
|
||||
|
||||
# iStoreOS-settings
|
||||
git clone --depth=1 -b main https://github.com/xiaomeng9597/istoreos-settings package/default-settings
|
||||
|
||||
|
||||
# 定时限速插件
|
||||
git clone --depth=1 https://github.com/sirpdboy/luci-app-eqosplus package/luci-app-eqosplus
|
||||
|
||||
@@ -908,7 +908,6 @@ CONFIG_PACKAGE_libmbedtls=y
|
||||
# CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_yyy_h1 is not set
|
||||
# CONFIG_VERSION_CODE_FILENAMES is not set
|
||||
# CONFIG_VERSION_FILENAMES is not set
|
||||
|
||||
# CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_mangopi_m28k is not set
|
||||
# CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_nlnet_xgp is not set
|
||||
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_easepi_ars4=y
|
||||
@@ -929,6 +928,7 @@ CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_ezpro_mrkaio-m68s=y
|
||||
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_ezpro_mrkaio-m68s-plus=y
|
||||
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_dg_tn3568=y
|
||||
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_yijiahe_jm10=y
|
||||
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_xunlong_orangepi-5-plus=y
|
||||
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_cyber3588_aib=y
|
||||
CONFIG_PACKAGE_brcmfmac-firmware-panther-x2=y
|
||||
CONFIG_PACKAGE_brcmfmac-firmware-jp-tvbox=y
|
||||
@@ -939,11 +939,11 @@ CONFIG_PACKAGE_rkwifi-firmware-ap6275p=y
|
||||
CONFIG_PACKAGE_rkwifi-firmware-ap6275s=y
|
||||
CONFIG_PACKAGE_rkwifi-firmware-ap6398s=y
|
||||
CONFIG_PACKAGE_kmod-rkwifi-bcmdhd-pcie=y
|
||||
CONFIG_PACKAGE_kmod-nft-tproxy=y
|
||||
CONFIG_PACKAGE_kmod-dsa=y
|
||||
CONFIG_PACKAGE_kmod-dsa-mv88e6xxx=y
|
||||
CONFIG_PACKAGE_kmod-dsa-tag-dsa=y
|
||||
CONFIG_PACKAGE_kmod-phy-marvell=y
|
||||
CONFIG_PACKAGE_kmod-nft-tproxy=y
|
||||
CONFIG_PACKAGE_luci-app-usb-printer=y
|
||||
CONFIG_PACKAGE_luci-i18n-usb-printer-zh-cn=y
|
||||
CONFIG_PACKAGE_hd-idle=y
|
||||
@@ -976,6 +976,7 @@ CONFIG_PACKAGE_coreutils=y
|
||||
CONFIG_PACKAGE_coreutils-base64=y
|
||||
CONFIG_PACKAGE_coreutils-stty=y
|
||||
CONFIG_PACKAGE_coreutils-nohup=y
|
||||
CONFIG_PACKAGE_default-settings=y
|
||||
CONFIG_PACKAGE_luci-app-store=y
|
||||
CONFIG_PACKAGE_luci-app-eqosplus=y
|
||||
CONFIG_PACKAGE_luci-i18n-eqosplus-zh-cn=y
|
||||
|
||||
Reference in New Issue
Block a user