Create docker-image.yml

.github/workflows/Openwrt-AutoBuild.yml

@@ -118,7 +118,7 @@ jobs:
         ( sudo -E apt-get -qq update
         sudo -E apt-get -qq install build-essential clang flex g++ gawk gcc-multilib gettext \
         git libncurses5-dev libssl-dev python3-distutils rsync unzip zlib1g-dev swig libpython3-dev aria2 jq subversion qemu-utils ccache rename libelf-dev device-tree-compiler
-        sudo -E apt-get -qq purge azure-cli ghc* zulu* hhvm llvm* firefox powershell openjdk* dotnet* google* mysql* php* android*
+        sudo -E apt-get -qq purge azure-cli ghc* zulu* llvm* firefox powershell openjdk* dotnet* google* mysql* php* android*
         sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean ) &
@@ -203,6 +203,15 @@ jobs:
           find "devices/${{matrix.target}}/patches" -maxdepth 1 -type f -name '*.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -B --merge -p1 -E --forward"
           #git apply devices/${{matrix.target}}/patches/*.patch
         fi
+        sed -i '$a  \
+        CONFIG_CPU_FREQ_GOV_POWERSAVE=y \
+        CONFIG_CPU_FREQ_GOV_USERSPACE=y \
+        CONFIG_CPU_FREQ_GOV_ONDEMAND=y \
+        CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y \
+        CONFIG_CRYPTO_CHACHA20_NEON=y \
+        CONFIG_CRYPTO_CHACHA20POLY1305=y \
+        CONFIG_FAT_DEFAULT_IOCHARSET="utf8" \
+        ' `find target/linux -path "target/linux/*/config-*"`
 
     - name: Default PPPOE Setting
       if: env.PPPOE_USERNAME && env.PPPOE_PASSWD

.github/workflows/docker-image.yml

@@ -0,0 +1,18 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)

README.md

@@ -1,6 +1,6 @@
 #### 一分钟在线编译定制专属固件: [supes.top](https://supes.top)
 #### 支持200+设备:
-X86/64, 友善 NanoPi、R2S、R4S、R4SE、R5S、R2C、NEO3, 斐讯 N1、K2P、K3, 树莓派 4B、3B/3B+、2B, 电犀牛r68s、r66s, 香橙派 R1 Plus、R1 Plus LTS, 红米AX6, 小米AX3600, 小米AX9000, 红米AX6S/小米AX3200, 红米AC2100, 小米AC2100, 斐讯K3,  360V6, 玩客云, 极路由 HIWIFI HC5962(极路由4、B70)、HC5661A、HC5761A、HC5861B, 小米4, 小米 R3G, 小米 R3P, newifi-d2 (新路由3), 小娱XY-C5, 竞斗云2.0(P&W R619AC), GL.iNet GL-MT1300、GL-AX1800、GL-AXT1800、GL-microuter-N300、GL-MT300N V2, 小米CR660X(CR6606/CR6608/CR6609), 小米4A千兆版, 小米 R3G-v2, 小米青春版Nano, 迅雷下载宝 timecloud, 优酷 yk-l2, 有华 wr1200js, 向日葵 X3A, 华硕 ASUS RT-ACRH17、RT-AC58u/RT-ACRH13、RT-ac85p、RT-n56u-b1、RT-AC88U、RT-AC1200、RT-AC1200 V2, 网件 NETGEAR R6220、R6260、R6120、R6700-v2、R6800、R6850、R6900-v2、R7450、wndr3700-v5, H1 Box, 贝壳云P1, 我家云lL Pro, x96 Max, 微加云V-Plus, 章鱼星球ZYXQ, GT-King, Odroid N2, MXQ Pro+, 京东无线宝JDCloud RE-SP-01B, Linksys WRT1200AC、WRT1900AC v1、WRT1900AC v2、WRT3200ACM、WRT1900ACS v1、WRT1900ACS v2、WRT32X、EA7500 v2 等
+X86/64, 友善 NanoPi、R2S、R4S、R4SE、R5S、R2C、R5C、R6S、NEO3, 斐讯 N1、K2P、K3, 树莓派 4B、3B/3B+、2B, 电犀牛r68s、r66s, 香橙派 R1 Plus、R1 Plus LTS, 红米AX6, 小米AX3600, 小米AX9000, 红米AX6000, 红米AX6S/小米AX3200, 红米AC2100, 小米AC2100, 斐讯K3,  360V6, 玩客云, 极路由 HIWIFI HC5962(极路由4、B70)、HC5661A、HC5761A、HC5861B, 小米4, 小米 R3G, 小米 R3P, newifi-d2 (新路由3), 小娱XY-C5, 竞斗云2.0(P&W R619AC), GL.iNet GL-MT1300、GL-AX1800、GL-AXT1800、GL-microuter-N300、GL-MT300N V2, 小米CR660X(CR6606/CR6608/CR6609), 小米4A千兆版, 小米 R3G-v2, 小米青春版Nano, 迅雷下载宝 timecloud, 优酷 yk-l2, 有华 wr1200js, 向日葵 X3A, 华硕 ASUS RT-ACRH17、RT-AC58u/RT-ACRH13、RT-ac85p、RT-n56u-b1、RT-AC88U、RT-AC1200、RT-AC1200 V2, 网件 NETGEAR R6220、R6260、R6120、R6700-v2、R6800、R6850、R6900-v2、R7450、wndr3700-v5, H1 Box, 贝壳云P1, 我家云lL Pro, x96 Max, 微加云V-Plus, 章鱼星球ZYXQ, GT-King, Odroid N2, MXQ Pro+, 京东无线宝JDCloud RE-SP-01B, Linksys WRT1200AC、WRT1900AC v1、WRT1900AC v2、WRT3200ACM、WRT1900ACS v1、WRT1900ACS v2、WRT32X、EA7500 v2 等
 
 [1]: https://img.shields.io/badge/license-GPLV2-brightgreen.svg
 [2]: /LICENSE
@@ -31,22 +31,18 @@ X86/64, 友善 NanoPi、R2S、R4S、R4SE、R5S、R2C、NEO3, 斐讯 N1、K2P、K
 
 + 自建插件仓库囊括了市面上几乎所有开源插件,插件库日更,系统自动更新所有已安装插件.
 
-+ 通过[supes.top](https://supes.top)在线定制专属固件, 无需任何专业知识, 一分钟生成. 同时支持github云编译和本地一键编译.
++ 通过[supes.top](https://supes.top)在线定制专属固件, 无需任何专业知识, 一分钟生成. 同时支持github云编译.
 
 + 后台一键OTA更新固件,省去了每次固件升级都需要找固件,下载固件,上传固件等繁琐操作.
 
 + 后台一键设置旁路由,一键开关IPv6.
 
-+ 支持在线安装Kmod内核模块.
-
-+ 重构版SSR-PLUS,国内外智能DNS解析,支持DOH,Trojan-Go等
++ 支持在线安装全部Kmod内核模块.
 
 + 替换 Uhttpd 为 Nginx, 支持 反向代理; WebDAV等诸多玩法.
 
 + 性能,友好度,易用性,插件,以及针对国内特殊环境等的自定义优化, 开箱即用
 
-+ 自定制清爽Material风格新主题Edge
-
 ## 2. **固件**
 
 固件生成有3种方式：在线定制化生成、GitHub编译、本地化编译。
@@ -67,31 +63,6 @@ X86/64, 友善 NanoPi、R2S、R4S、R4SE、R5S、R2C、NEO3, 斐讯 N1、K2P、K
 ### 2.3 **GitHub结合浏览器插件编译**
 请在支持油猴的浏览器中安装 [脚本](https://greasyfork.org/scripts/407616-github-actions-trigger/code/Github%20Actions%20Trigger.user.js) ,仓库右上角会出现 x86_64 Actions,K2P Actions等按钮,点击对应按钮即可.更多玩法 [repo-dispatcher](https://github.com/tete1030/github-repo-dispatcher)
 
-### 2.4 **本地化编译**
-
-#### 注意：
-
-1. **不**要用 **root** 用户 git 和编译！！！
-
-2. 国内用户编译前请准备好梯子,使用大陆白名单或全局模式
-
-3. 请使用Ubuntu 64bit，推荐  Ubuntu 18 或 Ubuntu 20
-
-#### 首次编译:
-
-```
-screen -S openwrt
-bash -c "$(curl -fsSL https://git.io/opbuild.sh)"
-```
-
-#### 二次编译:
-
-```
-screen -S openwrt
-bash -c "$(curl -fsSL https://git.io/rebuild.sh)"
-```
-
-
 ## 3. **使用**
 
 ### 3.1 **后台**

devices/common/diy.sh

@@ -30,7 +30,7 @@ while [ "$status" == "in_progress" ];do
 	status=$(curl -H "Authorization: token $REPO_TOKEN" -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].status')
 done
 
-mv -f feeds/kiddin9/{r81*,igb-intel} tmp/
+mv -f feeds/kiddin9/r81* tmp/
 
 sed -i "s/192.168.1/10.0.0/" package/feeds/kiddin9/base-files/files/bin/config_generate
 sed -i "s/192.168.1/10.0.0/" package/base-files/files/bin/config_generate
@@ -51,16 +51,6 @@ sed -i 's/max_requests 3/max_requests 20/g' package/network/services/uhttpd/file
 #rm -rf ./feeds/packages/lang/{golang,node}
 sed -i "s/tty\(0\|1\)::askfirst/tty\1::respawn/g" target/linux/*/base-files/etc/inittab
 
-sed -i '$a  \
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y \
-CONFIG_CPU_FREQ_GOV_USERSPACE=y \
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y \
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y \
-CONFIG_CRYPTO_CHACHA20_NEON=y \
-CONFIG_CRYPTO_CHACHA20POLY1305=y \
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8" \
-' `find target/linux -path "target/linux/*/config-*"`
-
 date=`date +%m.%d.%Y`
 sed -i -e "/\(# \)\?REVISION:=/c\REVISION:=$date" -e '/VERSION_CODE:=/c\VERSION_CODE:=$(REVISION)' include/version.mk
 

devices/common/patches/fix.patch

@@ -53,7 +53,23 @@
    KERNEL_PREFIX = $$(DEVICE_IMG_PREFIX)
    KERNEL_SUFFIX := -kernel.bin
    KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX)
-@@ -567,7 +606,7 @@ define Device/Build/kernel
+@@ -472,7 +511,6 @@ define Device/Check
+   endif
+ endef
+
+-ifndef IB
+ define Device/Build/initramfs
+   $(call Device/Export,$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE),$(1))
+   $$(_TARGET): $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE) \
+@@ -519,7 +557,6 @@ define Device/Build/initramfs
+ 	SUPPORTED_DEVICES="$$(SUPPORTED_DEVICES)" \
+ 	$(TOPDIR)/scripts/json_add_image_info.py $$@
+ endef
+-endif
+
+ define Device/Build/compile
+   $$(_COMPILE_TARGET): $(KDIR)/$(1)
+@@ -568,7 +605,7 @@ define Device/Build/kernel
  endef
 
  define Device/Build/image
@@ -62,7 +78,7 @@
    $$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
  	  $(BUILD_DIR)/json_info_files/$(call DEVICE_IMG_NAME,$(1),$(2)).json, \
  	  $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX))
-@@ -677,6 +716,8 @@ define Device/Build
+@@ -678,6 +715,8 @@ define Device/Build
    $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Device/Build/initramfs,$(1)))
    $(call Device/Build/kernel,$(1))
 
@@ -79,28 +95,15 @@
 
  if output:
 -    default_packages, output["arch_packages"] = run(
-+    default_packages, output["arch_packages"], output["kernel_version"], output["initramfs"] = run(
++    default_packages, output["arch_packages"], output["kernel_version"] = run(
          [
              "make",
              "--no-print-directory",
-@@ -55,6 +55,8 @@ def get_initial_output(image_info):
+@@ -55,6 +55,7 @@ def get_initial_output(image_info):
              "target/linux/",
              "val.DEFAULT_PACKAGES",
              "val.ARCH_PACKAGES",
 +            "val.LINUX_VERSION",
-+            "val.KERNEL_INITRAMFS",
          ],
          stdout=PIPE,
-         stderr=PIPE,
-
-
---- a/rules.mk
-+++ b/rules.mk
-@@ -59,6 +59,7 @@ _SINGLE=export MAKEFLAGS=$(space);
- CFLAGS:=
- ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(call qstrip,$(CONFIG_ARCH)))))
- ARCH_PACKAGES:=$(call qstrip,$(CONFIG_TARGET_ARCH_PACKAGES))
-+KERNEL_INITRAMFS:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_INITRAMFS))
- BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD))
- SUBTARGET:=$(call qstrip,$(CONFIG_TARGET_SUBTARGET))
- TARGET_OPTIMIZATION:=$(call qstrip,$(CONFIG_TARGET_OPTIMIZATION))
+         stderr=PIPE,

devices/common/patches/imagebuilder.patch

@@ -1,6 +1,6 @@
 --- a/target/imagebuilder/Makefile
 +++ b/target/imagebuilder/Makefile
-@@ -38,13 +38,15 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
+@@ -38,13 +38,16 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
  		./files/repositories.conf \
  		$(TMP_DIR)/.targetinfo \
  		$(TMP_DIR)/.packageinfo \
@@ -16,6 +16,7 @@
 +	$(SED) 's/^src\/gz \(.*\) https.*top\/\(packages.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/\2/' $(PKG_BUILD_DIR)/repositories.conf
 +	$(SED) 's/^src\/gz \(.*\) https.*top\/\(targets.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/releases\/\2/' $(PKG_BUILD_DIR)/repositories.conf
 +	$(SED) 's/\/kiddin9//' $(PKG_BUILD_DIR)/repositories.conf
++	$(SED) '/openwrt_core/d' $(PKG_BUILD_DIR)/repositories.conf
 
  	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
  	# create an empty package index so `opkg` doesn't report an error

devices/ipq60xx_generic/.config

@@ -3,11 +3,61 @@ CONFIG_TARGET_ipq60xx=y
 CONFIG_TARGET_ipq60xx_generic=y
 CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_ALL_PROFILES=y
+CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_glinet_gl-ax1800=n
+CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_glinet_gl-axt1800=n
 
 CONFIG_PACKAGE_dockerd=n
 
+CONFIG_GCC_USE_VERSION_7=y
+CONFIG_PACKAGE_kmod-dm-raid=n
+CONFIG_PACKAGE_kmod-dm=n
+CONFIG_PACKAGE_kmod-fs-xfs=n
+CONFIG_PACKAGE_kmod-fs-btrfs=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-bridge-mgr=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-vlan-mgr=n
+CONFIG_PACKAGE_kmod-drm-ttm=n
+CONFIG_PACKAGE_kmod-drm-kms-helper=n
+CONFIG_PACKAGE_kmod-gigaset=n
+CONFIG_PACKAGE_kmod-isdn4linux=n
+CONFIG_PACKAGE_kmod-video-pwc=n
+CONFIG_PACKAGE_kmod-mmc-spi=n
+CONFIG_PACKAGE_kmod-scsi-cdrom=n
+CONFIG_PACKAGE_kmod-scsi-generic=n
+CONFIG_PACKAGE_kmod-scsi-tape=n
+CONFIG_PACKAGE_kmod-sound-core=n
+CONFIG_PACKAGE_kmod-iio-hmc5843=n
+CONFIG_PACKAGE_kmod-ledtrig-netdev=n
+CONFIG_PACKAGE_kmod-tg3=n
+CONFIG_PACKAGE_kmod-be2net=n
+CONFIG_PACKAGE_kmod-bmp085-spi=n
+CONFIG_PACKAGE_kmod-mac80211-hwsim=n
+CONFIG_PACKAGE_kmod-ath3k=n
+CONFIG_PACKAGE_kmod-ath5k=n
+CONFIG_PACKAGE_kmod-ath6kl-sdio=n
+CONFIG_PACKAGE_kmod-ath6kl-usb=n
+CONFIG_PACKAGE_kmod-ath9k=n
+CONFIG_PACKAGE_kmod-ath10k=n
+CONFIG_PACKAGE_kmod-ath10k-ct=n
+CONFIG_PACKAGE_kmod-ath10k-ct-smallbuffers=n
+CONFIG_PACKAGE_kmod-crypto-qcrypto=n
+CONFIG_PACKAGE_kmod-gl-mifi-mcu=n
+CONFIG_PACKAGE_kmod-mdio-netlink=n
+CONFIG_PACKAGE_kmod-nf-nathelper-extra=n
+CONFIG_PACKAGE_kmod-nf-ipvs-sip=n
+CONFIG_PACKAGE_kmod-nf-nathelper-extra=n
+CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=n
+CONFIG_PACKAGE_kmod-ovpn-dco=n
+CONFIG_PACKAGE_spidev-test=n
+CONFIG_PACKAGE_kmod-lib80211=n
+CONFIG_PACKAGE_kmod-carl9170=n
+CONFIG_PACKAGE_kmod-batman-adv=n
+CONFIG_PACKAGE_kmod-rtl8812au-ct=n
+CONFIG_PACKAGE_kmod-rtl8821cu=n
+CONFIG_PACKAGE_kmod-rtl88x2bu=n
 
 
+CONFIG_SECCOMP=n
+
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务