diff --git a/.github/workflows/bcm27xx-bcm2708.yml b/.github/workflows/bcm27xx-bcm2708.yml
index 33e77babb..504faa651 100644
--- a/.github/workflows/bcm27xx-bcm2708.yml
+++ b/.github/workflows/bcm27xx-bcm2708.yml
@@ -349,6 +349,11 @@ jobs:
make json_overview_image_info
make checksum
+ - name: Print Sha256sums
+ run: |
+ cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
+ cat sha256sums
+
- name: Compress Bin Folder
run: |
cd $OPENWRT_ROOT_PATH
@@ -448,7 +453,7 @@ jobs:
b2 authorize-account $B2_APPLICATION_KEY_ID $B2_APPLICATION_KEY
b2 sync --noProgress --threads 32 --keepDays 7 --replaceNewer $SOURCE_TARGETS $DEST_TARGETS
- - name: Delete Old Toolchain Assets
+ - name: Delete Old Firmware Assets
if: steps.hash.outputs.REBUILD_TOOLCHAIN == 'true'
uses: mknejp/delete-release-assets@v1
with:
diff --git a/.github/workflows/bcm27xx-bcm2709.yml b/.github/workflows/bcm27xx-bcm2709.yml
index a9f4021bb..bdca11281 100644
--- a/.github/workflows/bcm27xx-bcm2709.yml
+++ b/.github/workflows/bcm27xx-bcm2709.yml
@@ -349,6 +349,11 @@ jobs:
make json_overview_image_info
make checksum
+ - name: Print Sha256sums
+ run: |
+ cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
+ cat sha256sums
+
- name: Compress Bin Folder
run: |
cd $OPENWRT_ROOT_PATH
@@ -448,7 +453,7 @@ jobs:
b2 authorize-account $B2_APPLICATION_KEY_ID $B2_APPLICATION_KEY
b2 sync --noProgress --threads 32 --keepDays 7 --replaceNewer $SOURCE_TARGETS $DEST_TARGETS
- - name: Delete Old Toolchain Assets
+ - name: Delete Old Firmware Assets
if: steps.hash.outputs.REBUILD_TOOLCHAIN == 'true'
uses: mknejp/delete-release-assets@v1
with:
diff --git a/.github/workflows/bcm27xx-bcm2710.yml b/.github/workflows/bcm27xx-bcm2710.yml
index 45b6de18c..5940d9dc1 100644
--- a/.github/workflows/bcm27xx-bcm2710.yml
+++ b/.github/workflows/bcm27xx-bcm2710.yml
@@ -349,6 +349,11 @@ jobs:
make json_overview_image_info
make checksum
+ - name: Print Sha256sums
+ run: |
+ cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
+ cat sha256sums
+
- name: Compress Bin Folder
run: |
cd $OPENWRT_ROOT_PATH
@@ -448,7 +453,7 @@ jobs:
b2 authorize-account $B2_APPLICATION_KEY_ID $B2_APPLICATION_KEY
b2 sync --noProgress --threads 32 --keepDays 7 --replaceNewer $SOURCE_TARGETS $DEST_TARGETS
- - name: Delete Old Toolchain Assets
+ - name: Delete Old Firmware Assets
if: steps.hash.outputs.REBUILD_TOOLCHAIN == 'true'
uses: mknejp/delete-release-assets@v1
with:
diff --git a/.github/workflows/bcm27xx-bcm2711.yml b/.github/workflows/bcm27xx-bcm2711.yml
index 2de389597..edd6f9a3d 100644
--- a/.github/workflows/bcm27xx-bcm2711.yml
+++ b/.github/workflows/bcm27xx-bcm2711.yml
@@ -351,6 +351,11 @@ jobs:
make json_overview_image_info
make checksum
+ - name: Print Sha256sums
+ run: |
+ cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
+ cat sha256sums
+
- name: Compress Bin Folder
run: |
cd $OPENWRT_ROOT_PATH
@@ -450,7 +455,7 @@ jobs:
b2 authorize-account $B2_APPLICATION_KEY_ID $B2_APPLICATION_KEY
b2 sync --noProgress --threads 32 --keepDays 7 --replaceNewer $SOURCE_TARGETS $DEST_TARGETS
- - name: Delete Old Toolchain Assets
+ - name: Delete Old Firmware Assets
if: steps.hash.outputs.REBUILD_TOOLCHAIN == 'true'
uses: mknejp/delete-release-assets@v1
with:
diff --git a/.github/workflows/ipq40xx-generic.yml b/.github/workflows/ipq40xx-generic.yml
index 7fb0a89b2..29b4fd7cd 100644
--- a/.github/workflows/ipq40xx-generic.yml
+++ b/.github/workflows/ipq40xx-generic.yml
@@ -345,6 +345,11 @@ jobs:
make json_overview_image_info
make checksum
+ - name: Print Sha256sums
+ run: |
+ cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
+ cat sha256sums
+
- name: Compress Bin Folder
run: |
cd $OPENWRT_ROOT_PATH
@@ -444,7 +449,7 @@ jobs:
b2 authorize-account $B2_APPLICATION_KEY_ID $B2_APPLICATION_KEY
b2 sync --noProgress --threads 32 --keepDays 7 --replaceNewer $SOURCE_TARGETS $DEST_TARGETS
- - name: Delete Old Toolchain Assets
+ - name: Delete Old Firmware Assets
if: steps.hash.outputs.REBUILD_TOOLCHAIN == 'true'
uses: mknejp/delete-release-assets@v1
with:
diff --git a/.github/workflows/rockchip-armv8.yml b/.github/workflows/rockchip-armv8.yml
index 51d0a87ee..2fd61664f 100644
--- a/.github/workflows/rockchip-armv8.yml
+++ b/.github/workflows/rockchip-armv8.yml
@@ -348,6 +348,11 @@ jobs:
make json_overview_image_info
make checksum
+ - name: Print Sha256sums
+ run: |
+ cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
+ cat sha256sums
+
- name: Compress Bin Folder
run: |
cd $OPENWRT_ROOT_PATH
@@ -447,7 +452,7 @@ jobs:
b2 authorize-account $B2_APPLICATION_KEY_ID $B2_APPLICATION_KEY
b2 sync --noProgress --threads 32 --keepDays 7 --replaceNewer $SOURCE_TARGETS $DEST_TARGETS
- - name: Delete Old Toolchain Assets
+ - name: Delete Old Firmware Assets
if: steps.hash.outputs.REBUILD_TOOLCHAIN == 'true'
uses: mknejp/delete-release-assets@v1
with:
diff --git a/.github/workflows/x86-64.yml b/.github/workflows/x86-64.yml
index e2bb57923..af17aefca 100644
--- a/.github/workflows/x86-64.yml
+++ b/.github/workflows/x86-64.yml
@@ -348,6 +348,11 @@ jobs:
make json_overview_image_info
make checksum
+ - name: Print Sha256sums
+ run: |
+ cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
+ cat sha256sums
+
- name: Compress Bin Folder
run: |
cd $OPENWRT_ROOT_PATH
@@ -447,7 +452,7 @@ jobs:
b2 authorize-account $B2_APPLICATION_KEY_ID $B2_APPLICATION_KEY
b2 sync --noProgress --threads 32 --keepDays 7 --replaceNewer $SOURCE_TARGETS $DEST_TARGETS
- - name: Delete Old Toolchain Assets
+ - name: Delete Old Firmware Assets
if: steps.hash.outputs.REBUILD_TOOLCHAIN == 'true'
uses: mknejp/delete-release-assets@v1
with:
diff --git a/FUNDING.md b/FUNDING.md
index d67015907..5a85bdde1 100644
--- a/FUNDING.md
+++ b/FUNDING.md
@@ -18,6 +18,4 @@
**4. 未满 18 岁及尚无独立经济收入来源者不建议捐赠本项目。**
-**5. 【即使你真的想捐赠,捐赠数额也不建议大于 10 RMB...】**
-
diff --git a/README.md b/README.md
index 133c21498..b5d451f09 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,19 @@
# [OpenWrt-Rpi](https://github.com/SuLingGG/OpenWrt-Rpi)
+## 仓库存档说明
+
+由于 18.06 版本已结束支持周期,且上游分支 [immortalwrt:openwrt-18.06-k5.4](https://github.com/immortalwrt/immortalwrt/tree/openwrt-18.06-k5.4) 已停止更新,
+
+故本仓库转为存档 (Archive) 状态,终止所有无意义的编译任务。
+
+现有软件源和固件不会被删除,你可以继续在 访问和下载到它们。
+
+欢迎使用 immortalwrt 项目的官方固件:
+
+
+
+感谢大家的支持和陪伴~
+
## 项目介绍
1. 提供适配于 树莓派全系、Rockchip 平台、ipq40xx 平台以及 x86 平台设备的 OpenWrt 固件
diff --git a/config/bcm27xx/bcm2708.config b/config/bcm27xx/bcm2708.config
index 8302db6c5..66ea9036b 100644
--- a/config/bcm27xx/bcm2708.config
+++ b/config/bcm27xx/bcm2708.config
@@ -5,9 +5,10 @@ CONFIG_TARGET_bcm27xx_bcm2708_DEVICE_rpi=y
# Image Config
CONFIG_TARGET_KERNEL_PARTSIZE=50
-CONFIG_TARGET_ROOTFS_PARTSIZE=750
+CONFIG_TARGET_ROOTFS_PARTSIZE=900
CONFIG_TARGET_ROOTFS_TARGZ=y
CONFIG_TARGET_ROOTFS_EXT4FS=y
+CONFIG_TARGET_EXT4_JOURNAL=y
CONFIG_TARGET_ROOTFS_SQUASHFS=y
# Extra LuCI APP
diff --git a/config/bcm27xx/bcm2709.config b/config/bcm27xx/bcm2709.config
index 74113c383..fef718360 100644
--- a/config/bcm27xx/bcm2709.config
+++ b/config/bcm27xx/bcm2709.config
@@ -5,9 +5,10 @@ CONFIG_TARGET_bcm27xx_bcm2709_DEVICE_rpi-2=y
# Image Config
CONFIG_TARGET_KERNEL_PARTSIZE=50
-CONFIG_TARGET_ROOTFS_PARTSIZE=750
+CONFIG_TARGET_ROOTFS_PARTSIZE=900
CONFIG_TARGET_ROOTFS_TARGZ=y
CONFIG_TARGET_ROOTFS_EXT4FS=y
+CONFIG_TARGET_EXT4_JOURNAL=y
CONFIG_TARGET_ROOTFS_SQUASHFS=y
# Extra LuCI APP
diff --git a/config/bcm27xx/bcm2710.config b/config/bcm27xx/bcm2710.config
index f6ac88394..7499478b3 100644
--- a/config/bcm27xx/bcm2710.config
+++ b/config/bcm27xx/bcm2710.config
@@ -5,9 +5,10 @@ CONFIG_TARGET_bcm27xx_bcm2710_DEVICE_rpi-3=y
# Image Config
CONFIG_TARGET_KERNEL_PARTSIZE=50
-CONFIG_TARGET_ROOTFS_PARTSIZE=750
+CONFIG_TARGET_ROOTFS_PARTSIZE=900
CONFIG_TARGET_ROOTFS_TARGZ=y
CONFIG_TARGET_ROOTFS_EXT4FS=y
+CONFIG_TARGET_EXT4_JOURNAL=y
CONFIG_TARGET_ROOTFS_SQUASHFS=y
# Kmods
diff --git a/config/bcm27xx/bcm2711.config b/config/bcm27xx/bcm2711.config
index 03b10ec26..6f02a3dd9 100644
--- a/config/bcm27xx/bcm2711.config
+++ b/config/bcm27xx/bcm2711.config
@@ -5,9 +5,10 @@ CONFIG_TARGET_bcm27xx_bcm2711_DEVICE_rpi-4=y
# Image Config
CONFIG_TARGET_KERNEL_PARTSIZE=50
-CONFIG_TARGET_ROOTFS_PARTSIZE=750
+CONFIG_TARGET_ROOTFS_PARTSIZE=900
CONFIG_TARGET_ROOTFS_TARGZ=y
CONFIG_TARGET_ROOTFS_EXT4FS=y
+CONFIG_TARGET_EXT4_JOURNAL=y
CONFIG_TARGET_ROOTFS_SQUASHFS=y
# Kmods
diff --git a/config/extra-drivers.config b/config/extra-drivers.config
index a187a9dfc..7f93e495d 100644
--- a/config/extra-drivers.config
+++ b/config/extra-drivers.config
@@ -18,6 +18,11 @@ CONFIG_PACKAGE_kmod-fs-xfs=y
## I2C Drivers
CONFIG_PACKAGE_kmod-i2c-core=y
+## Network Support
+
+### Dependence for OpenClash
+CONFIG_PACKAGE_kmod-inet-diag=y
+
## USB Drivers
### USB Audio
diff --git a/config/general-packages.config b/config/general-packages.config
index 3641ad712..712f0383e 100644
--- a/config/general-packages.config
+++ b/config/general-packages.config
@@ -158,6 +158,10 @@ CONFIG_DOCKER_NET_TFTP=y
CONFIG_DOCKER_OPTIONAL_FEATURES=y
CONFIG_DOCKER_STO_BTRFS=y
CONFIG_DOCKER_STO_EXT4=y
+CONFIG_LXC_BUSYBOX_OPTIONS=y
+CONFIG_LXC_KERNEL_OPTIONS=y
+CONFIG_LXC_NETWORKING=y
+CONFIG_LXC_SECCOMP=y
CONFIG_PACKAGE_alpine-keys=y
CONFIG_PACKAGE_alpine-repositories=y
CONFIG_PACKAGE_apk=y
@@ -178,6 +182,7 @@ CONFIG_PACKAGE_libcap=y
CONFIG_PACKAGE_libcap-bin=y
CONFIG_PACKAGE_lsblk=y
CONFIG_PACKAGE_lscpu=y
+CONFIG_PACKAGE_lxc=m
CONFIG_PACKAGE_nano=y
CONFIG_PACKAGE_resize2fs=y
CONFIG_PACKAGE_screen=y
diff --git a/config/ipq40xx/generic.config b/config/ipq40xx/generic.config
index b63047444..dd51b72aa 100644
--- a/config/ipq40xx/generic.config
+++ b/config/ipq40xx/generic.config
@@ -3,8 +3,6 @@ CONFIG_TARGET_ipq40xx_generic=y
CONFIG_TARGET_MULTI_PROFILE=y
CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_asus_rt-ac58u=y
CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_asus_rt-acrh17=y
-CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_hiwifi_c526a=y
-CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_hiwifi_c526a-128m=y
CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_netgear_ex6100v2=y
CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_netgear_ex6150v2=y
CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_netgear_ex6200v2=y
diff --git a/config/rockchip/armv8.config b/config/rockchip/armv8.config
index 4ba25b0bc..8566f1a7c 100644
--- a/config/rockchip/armv8.config
+++ b/config/rockchip/armv8.config
@@ -12,9 +12,10 @@ CONFIG_TARGET_ALL_PROFILES=y
# Image Config
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
CONFIG_TARGET_KERNEL_PARTSIZE=50
-CONFIG_TARGET_ROOTFS_PARTSIZE=750
+CONFIG_TARGET_ROOTFS_PARTSIZE=900
CONFIG_TARGET_ROOTFS_TARGZ=y
CONFIG_TARGET_ROOTFS_EXT4FS=y
+CONFIG_TARGET_EXT4_JOURNAL=y
CONFIG_TARGET_ROOTFS_SQUASHFS=y
# Kmod
diff --git a/config/x86/64.config b/config/x86/64.config
index a63837503..7dbe580ac 100644
--- a/config/x86/64.config
+++ b/config/x86/64.config
@@ -5,8 +5,9 @@ CONFIG_TARGET_x86_64_DEVICE_generic=y
CONFIG_TARGET_ROOTFS_TARGZ=y
CONFIG_TARGET_ROOTFS_SQUASHFS=y
CONFIG_TARGET_ROOTFS_EXT4FS=y
+CONFIG_TARGET_EXT4_JOURNAL=y
CONFIG_TARGET_KERNEL_PARTSIZE=50
-CONFIG_TARGET_ROOTFS_PARTSIZE=750
+CONFIG_TARGET_ROOTFS_PARTSIZE=900
CONFIG_TARGET_IMAGES_GZIP=y
CONFIG_GRUB_IMAGES=y
CONFIG_GRUB_EFI_IMAGES=y
@@ -197,8 +198,6 @@ CONFIG_PACKAGE_e2fsprogs=y
CONFIG_PACKAGE_htop=y
CONFIG_PACKAGE_mkf2fs=y
CONFIG_PACKAGE_nfs-utils-libs=y
-CONFIG_PACKAGE_NTFS-3G_HAS_PROBE=y
-CONFIG_PACKAGE_ntfs-3g=y
CONFIG_PACKAGE_pciutils=y
CONFIG_PACKAGE_squashfs-tools-mksquashfs=y
CONFIG_PACKAGE_squashfs-tools-unsquashfs=y
diff --git a/scripts/custom.sh b/scripts/custom.sh
index 7eb385a08..4a77b9e2b 100644
--- a/scripts/custom.sh
+++ b/scripts/custom.sh
@@ -8,24 +8,10 @@
# Modify default IP
#sed -i 's/192.168.1.1/192.168.50.5/g' package/base-files/files/bin/config_generate
-# Mod zzz-default-settings
-pushd package/emortal/default-settings/files
-sed -i '/http/d' zzz-default-settings
-sed -i '/openwrt_luci/d' zzz-default-settings
-popd
-
# Add date version
export DATE_VERSION=$(date -d "$(rdate -n -4 -p pool.ntp.org)" +'%Y-%m-%d')
sed -i "s/%C/%C (${DATE_VERSION})/g" package/base-files/files/etc/openwrt_release
-# Clone community packages to package/community
-mkdir package/community
-pushd package/community
-
-# Add luci-app-oaf
-git clone --depth=1 https://github.com/destan19/OpenAppFilter -b oaf-3.0.1
-popd
-
# Fix mt76 wireless driver
pushd package/kernel/mt76
sed -i '/mt7662u_rom_patch.bin/a\\techo mt76-usb disable_usb_sg=1 > $\(1\)\/etc\/modules.d\/mt76-usb' Makefile
diff --git a/scripts/preset-clash-core.sh b/scripts/preset-clash-core.sh
index a53018db5..99219dfa5 100644
--- a/scripts/preset-clash-core.sh
+++ b/scripts/preset-clash-core.sh
@@ -11,14 +11,16 @@
mkdir -p files/etc/openclash/core
-OPENCLASH_MAIN_URL=$( curl -sL https://api.github.com/repos/vernesong/OpenClash/releases/tags/Clash | grep /clash-linux-armv8 | awk -F '"' '{print $4}')
-# OFFICAL_OPENCLASH_MAIN_URL=$(curl -sL https://api.github.com/repos/Dreamacro/clash/releases/tags/v1.3.5 | grep /clash-linux-$1 | awk -F '"' '{print $4}')
-CLASH_TUN_URL=$(curl -sL https://api.github.com/repos/vernesong/OpenClash/releases/tags/TUN-Premium | grep /clash-linux-$1 | awk -F '"' '{print $4}')
-CLASH_GAME_URL=$(curl -sL https://api.github.com/repos/vernesong/OpenClash/releases/tags/TUN | grep /clash-linux-$1 | awk -F '"' '{print $4}')
+CLASH_DEV_URL="https://raw.githubusercontent.com/vernesong/OpenClash/master/core-lateset/dev/clash-linux-${1}.tar.gz"
+CLASH_TUN_URL=$(curl -fsSL https://api.github.com/repos/vernesong/OpenClash/contents/core-lateset/premium | grep download_url | grep $1 | awk -F '"' '{print $4}')
+CLASH_META_URL="https://raw.githubusercontent.com/vernesong/OpenClash/master/core-lateset/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- $OPENCLASH_MAIN_URL | tar xOvz > files/etc/openclash/core/clash
-# wget -qO- $OFFICAL_OPENCLASH_MAIN_URL | gunzip -c > files/etc/openclash/core/clash
+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_GAME_URL | tar xOvz > files/etc/openclash/core/clash_game
+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*