kiddin9 3 年之前
父节点
当前提交
969b4bfc0a

+ 1 - 1
.github/workflows/Openwrt-AutoBuild.yml

@@ -239,7 +239,7 @@ jobs:
         rm -rf openwrt/bin/targets/*/*/packages/*.ipk
         cp -rf openwrt/bin/targets/*/*/*r4s*sysupgrade* ./firmware/nanopi-r4s/ || true
         cp -rf openwrt/bin/targets/*/*/*r2c*sysupgrade* ./firmware/nanopi-r2c/ || true
-        cp -rf openwrt/bin/targets/*/*/*${{matrix.target}}*{combined,sysupgrade}* ./firmware/${{matrix.target}}/ || true
+        cp -rf openwrt/bin/targets/*/*/*{combined,r2s-s,rpi-4-s}* ./firmware/${{matrix.target}}/ || true
         rename -v "s/openwrt-/${{ env.VERSION }}-openwrt-/" ./firmware/*/* || true
         rename -v "s/friendlyarm_//" ./firmware/*/*gz || true
         for i in $(ls -d firmware/*/); do

+ 3 - 2
README.md

@@ -28,6 +28,8 @@
 
 + 自建插件仓库囊括了市面上几乎所有开源插件,插件库日更,系统自动更新所有已安装插件.
 
++ 在线一键定制固件,可在[bf.supes.top](https://bf.supes.top)也可在后台系统定制升级菜单中一键定制, 同时支持github云编译和本地一键编译.
+
 + 后台一键OTA更新固件,省去了每次固件升级都需要找固件,下载固件,上传固件等繁琐操作.
 
 + 后台一键设置旁路由,一键开关IPv6.
@@ -42,8 +44,6 @@
 
 + 自定制清爽Material风格新主题Edge
 
-+ 无需专业知识,无需linux服务器,人人皆可通过云编译定制编译自己的专属固件.
-
 
 | 设备           | 固件下载                                             | 🐳 Docker |说明                                 |
 |----------------|-----------------------------------------------------|--|--------------------------------------|
@@ -52,6 +52,7 @@
 | NanoPi-R4S    | [📥](https://op.supes.top/firmware/nanopi-r4s/) | [kiddin9/openwrt-nginx:nanopi-r4s](https://hub.docker.com/r/kiddin9/openwrt-nginx)   |
 | Raspberry Pi 4B (树莓派4B)| [📥](https://op.supes.top/firmware/Rpi-4B/)  | [kiddin9/openwrt-nginx:rpi-4b](https://hub.docker.com/r/kiddin9/openwrt-nginx)   |
 
+####  固件下载与定制: [https://bf.supes.top](https://bf.supes.top)
 
 #### 后台入口 op/ 或 10.0.0.1  (若后台无法打开,请插拔交换wan,lan网线顺序.)
 

+ 1 - 1
devices/common/diy.sh

@@ -22,7 +22,7 @@ sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' pac
 
 sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advanced luci-app-firewall luci-app-gpsysupgrade luci-app-opkg luci-app-bypass luci-app-upnp luci-app-autoreboot \
 luci-app-wizard luci-app-attendedsysupgrade luci-theme-edge luci-theme-bootstrap dnsmasq-full luci-ssl-nginx luci-base luci-compat luci-lib-ipkg \
-coremark my-default-settings wget-ssl curl htop nano iptables-mod-fullconenat zram-swap kmod-lib-zstd kmod-ipt-offload kmod-tcp-bbr bash \
+coremark my-default-settings wget-ssl curl htop nano iptables-mod-fullconenat zram-swap kmod-lib-zstd kmod-tcp-bbr bash \
 wpad-basic-wolfssl kmod-usb2 kmod-usb3 automount /" include/target.mk
 sed -i "/dnsmasq \\\/d" include/target.mk
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-cpufreq kmod-hwmon-pwmfan/' target/linux/rockchip/Makefile

+ 9 - 0
devices/common/patches/imagebuilder.patch

@@ -16,6 +16,15 @@
  ifeq ($(CONFIG_BUILDBOT),)
  	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
 
+@@ -31,6 +31,7 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
+ 	-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
+ 	$(SED) 's/^CONFIG_BINARY_FOLDER=.*/# CONFIG_BINARY_FOLDER is not set/' $(PKG_BUILD_DIR)/.config
+ 	$(SED) 's/^CONFIG_DOWNLOAD_FOLDER=.*/# CONFIG_DOWNLOAD_FOLDER is not set/' $(PKG_BUILD_DIR)/.config
++	$(SED) 's/^CONFIG_TARGET_ROOTFS_TARGZ=.*/# CONFIG_TARGET_ROOTFS_TARGZ is not set/' $(PKG_BUILD_DIR)/.config
+ 	$(CP) -L \
+ 		$(INCLUDE_DIR) $(SCRIPT_DIR) \
+ 		$(TOPDIR)/rules.mk \
+
 --- a/target/imagebuilder/files/Makefile
 +++ b/target/imagebuilder/files/Makefile
 @@ -124,6 +124,7 @@ _call_image: staging_dir/host/.prereq-build

+ 1 - 2
devices/nanopi-r2s/diy.sh

@@ -20,8 +20,7 @@ sed -i 's,-mcpu=generic,-march=armv8-a+crypto+crc -mabi=lp64,g' include/target.m
 
 sed -i '/;;/i\ethtool -K eth1 rx off tx off && logger -t disable-offloading "disabed rk3328 ethernet tcp/udp offloading tx/rx"' target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
 
-sed -i -e 's,kmod-usb-net-rtl8152$,kmod-usb-net-rtl8152-vendor,g' \
--e 's,kmod-r8169,kmod-r8168,g' target/linux/rockchip/image/armv8.mk
+sed -i -e 's,kmod-r8169,kmod-r8168,g' target/linux/rockchip/image/armv8.mk
 
 echo '
 CONFIG_ARM64_CRYPTO=y