diff --git a/configs/rpi3.config b/configs/rpi3.config index 2e1df46f45..3780e63ea2 100644 --- a/configs/rpi3.config +++ b/configs/rpi3.config @@ -11,3 +11,5 @@ CONFIG_TARGET_ROOTFS_PARTSIZE=960 CONFIG_TARGET_ROOTFS_TARGZ=y # CONFIG_TARGET_ROOTFS_EXT4FS is not set CONFIG_TARGET_ROOTFS_SQUASHFS=y + +CONFIG_GPIOLIB=y diff --git a/configs/rpi4.config b/configs/rpi4.config index 3144a26a1c..9629ab9d4e 100644 --- a/configs/rpi4.config +++ b/configs/rpi4.config @@ -11,3 +11,5 @@ CONFIG_TARGET_ROOTFS_PARTSIZE=960 CONFIG_TARGET_ROOTFS_TARGZ=y # CONFIG_TARGET_ROOTFS_EXT4FS is not set CONFIG_TARGET_ROOTFS_SQUASHFS=y + +CONFIG_GPIOLIB=y diff --git a/diy-mini.sh b/diy-mini.sh index 502f08c6aa..91c7d7a354 100644 --- a/diy-mini.sh +++ b/diy-mini.sh @@ -26,19 +26,19 @@ rm -rf feeds/luci/applications/luci-app-mosdns rm -rf feeds/luci/applications/luci-app-netdata # 添加额外插件 -git clone --depth=1 https://github.com/kongfl888/luci-app-adguardhome package/luci-app-adguardhome +#git clone --depth=1 https://github.com/kongfl888/luci-app-adguardhome package/luci-app-adguardhome git clone --depth=1 https://github.com/Jason6111/luci-app-netdata package/luci-app-netdata # svn export https://github.com/lisaac/luci-app-dockerman/trunk/applications/luci-app-dockerman package/luci-app-dockerman # svn export https://github.com/syb999/openwrt-19.07.1/trunk/package/network/services/msd_lite package/msd_lite # 科学上网插件 -git clone --depth=1 https://github.com/fw876/helloworld package/luci-app-ssr-plus -git clone --depth=1 https://github.com/jerrykuku/luci-app-vssr package/luci-app-vssr -git clone --depth=1 https://github.com/jerrykuku/lua-maxminddb package/lua-maxminddb -git clone --depth=1 https://github.com/xiaorouji/openwrt-passwall-packages package/openwrt-passwall -svn export https://github.com/xiaorouji/openwrt-passwall/trunk/luci-app-passwall package/luci-app-passwall -svn export https://github.com/xiaorouji/openwrt-passwall2/trunk/luci-app-passwall2 package/luci-app-passwall2 -svn export https://github.com/vernesong/OpenClash/trunk/luci-app-openclash package/luci-app-openclash +#git clone --depth=1 https://github.com/fw876/helloworld package/luci-app-ssr-plus +#git clone --depth=1 https://github.com/jerrykuku/luci-app-vssr package/luci-app-vssr +#git clone --depth=1 https://github.com/jerrykuku/lua-maxminddb package/lua-maxminddb +#git clone --depth=1 https://github.com/xiaorouji/openwrt-passwall-packages package/openwrt-passwall +#svn export https://github.com/xiaorouji/openwrt-passwall/trunk/luci-app-passwall package/luci-app-passwall +#svn export https://github.com/xiaorouji/openwrt-passwall2/trunk/luci-app-passwall2 package/luci-app-passwall2 +#svn export https://github.com/vernesong/OpenClash/trunk/luci-app-openclash package/luci-app-openclash # Themes git clone --depth=1 -b 18.06 https://github.com/kiddin9/luci-theme-edge package/luci-theme-edge @@ -91,7 +91,7 @@ sed -i 's/os.date()/os.date("%a %Y-%m-%d %H:%M:%S")/g' package/lean/autocore/fil # 修改版本为编译日期 date_version=$(date +"%y.%m.%d") orig_version=$(cat "package/lean/default-settings/files/zzz-default-settings" | grep DISTRIB_REVISION= | awk -F "'" '{print $2}') -sed -i "s/${orig_version}/R${date_version} by Haiibo/g" package/lean/default-settings/files/zzz-default-settings +sed -i "s/${orig_version}/R${date_version} by sndnvaps/g" package/lean/default-settings/files/zzz-default-settings # 修复 hostapd 报错 cp -f $GITHUB_WORKSPACE/scripts/011-fix-mbo-modules-build.patch package/network/services/hostapd/patches/011-fix-mbo-modules-build.patch diff --git a/diy-script.sh b/diy-script.sh index 03a2f78f7d..0ecb1bac04 100644 --- a/diy-script.sh +++ b/diy-script.sh @@ -8,7 +8,7 @@ #=============================================== # 修改默认IP -# sed -i 's/192.168.1.1/10.0.0.1/g' package/base-files/files/bin/config_generate + sed -i 's/192.168.1.1/192.168.13.111/g' package/base-files/files/bin/config_generate # 更改默认 Shell 为 zsh # sed -i 's/\/bin\/ash/\/usr\/bin\/zsh/g' package/base-files/files/etc/passwd @@ -41,13 +41,13 @@ svn export https://github.com/immortalwrt/luci/branches/openwrt-18.06/applicatio # svn export https://github.com/syb999/openwrt-19.07.1/trunk/package/network/services/msd_lite package/msd_lite # 科学上网插件 -git clone --depth=1 https://github.com/fw876/helloworld package/luci-app-ssr-plus -git clone --depth=1 https://github.com/jerrykuku/luci-app-vssr package/luci-app-vssr -git clone --depth=1 https://github.com/jerrykuku/lua-maxminddb package/lua-maxminddb -git clone --depth=1 https://github.com/xiaorouji/openwrt-passwall-packages package/openwrt-passwall -svn export https://github.com/xiaorouji/openwrt-passwall/trunk/luci-app-passwall package/luci-app-passwall -svn export https://github.com/xiaorouji/openwrt-passwall2/trunk/luci-app-passwall2 package/luci-app-passwall2 -svn export https://github.com/vernesong/OpenClash/trunk/luci-app-openclash package/luci-app-openclash +#git clone --depth=1 https://github.com/fw876/helloworld package/luci-app-ssr-plus +#git clone --depth=1 https://github.com/jerrykuku/luci-app-vssr package/luci-app-vssr +#git clone --depth=1 https://github.com/jerrykuku/lua-maxminddb package/lua-maxminddb +#git clone --depth=1 https://github.com/xiaorouji/openwrt-passwall-packages package/openwrt-passwall +#svn export https://github.com/xiaorouji/openwrt-passwall/trunk/luci-app-passwall package/luci-app-passwall +#svn export https://github.com/xiaorouji/openwrt-passwall2/trunk/luci-app-passwall2 package/luci-app-passwall2 +#svn export https://github.com/vernesong/OpenClash/trunk/luci-app-openclash package/luci-app-openclash # Themes git clone --depth=1 -b 18.06 https://github.com/kiddin9/luci-theme-edge package/luci-theme-edge @@ -106,7 +106,7 @@ sed -i 's/os.date()/os.date("%a %Y-%m-%d %H:%M:%S")/g' package/lean/autocore/fil # 修改版本为编译日期 date_version=$(date +"%y.%m.%d") orig_version=$(cat "package/lean/default-settings/files/zzz-default-settings" | grep DISTRIB_REVISION= | awk -F "'" '{print $2}') -sed -i "s/${orig_version}/R${date_version} by Haiibo/g" package/lean/default-settings/files/zzz-default-settings +sed -i "s/${orig_version}/R${date_version} by sndnvaps/g" package/lean/default-settings/files/zzz-default-settings # 修复 hostapd 报错 cp -f $GITHUB_WORKSPACE/scripts/011-fix-mbo-modules-build.patch package/network/services/hostapd/patches/011-fix-mbo-modules-build.patch diff --git a/scripts/preset-clash-core.sh b/scripts/preset-clash-core.sh deleted file mode 100644 index e88e7253d1..0000000000 --- a/scripts/preset-clash-core.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -#================================================= -# File name: preset-clash-core.sh -# Usage: | example: -# System Required: Linux -# Version: 1.0 -# Lisence: MIT -# Author: SuLingGG -# Blog: https://mlapp.cn -#================================================= - -mkdir -p files/etc/openclash/core - -CLASH_DEV_URL="https://raw.githubusercontent.com/vernesong/OpenClash/core/master/dev/clash-linux-${1}.tar.gz" -CLASH_TUN_URL=$(curl -fsSL https://api.github.com/repos/vernesong/OpenClash/contents/master/premium\?ref\=core | grep download_url | grep $1 | awk -F '"' '{print $4}') -CLASH_META_URL="https://raw.githubusercontent.com/vernesong/OpenClash/core/master/meta/clash-linux-${1}.tar.gz" -GEOIP_URL="https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat" -GEOSITE_URL="https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat" - -wget -qO- $CLASH_DEV_URL | tar xOvz > files/etc/openclash/core/clash -wget -qO- $CLASH_TUN_URL | gunzip -c > files/etc/openclash/core/clash_tun -wget -qO- $CLASH_META_URL | tar xOvz > files/etc/openclash/core/clash_meta -wget -qO- $GEOIP_URL > files/etc/openclash/GeoIP.dat -wget -qO- $GEOSITE_URL > files/etc/openclash/GeoSite.dat - -chmod +x files/etc/openclash/core/clash*