kiddin9 il y a 3 ans
Parent
commit
aa5a31b928

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

@@ -211,8 +211,8 @@ jobs:
             make defconfig
             make -j$(($(nproc)+1)) || make -j1 V=s || (echo "R4S编译失败" && exit 0;)
             mv -f .config nanopi-r4s.config
-            rm -rf bin/targets/*/*/packages/*.ipk
         fi
+        rm -rf bin/targets/*/*/packages/
    
     - name: Check space usage
       run: df -hT

+ 2 - 0
devices/Rpi-4B/diy.sh

@@ -5,6 +5,8 @@ sed -i 's,TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256,TLS_CHACHA20_POLY1
 
 sed -i -e 's/ autocore-arm/ my-autocore-arm/' -e 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-cpufreq/' target/linux/bcm27xx/Makefile
 
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES +=kmod-usb-net-asix-ax88179/' target/linux/bcm27xx/Makefile
+
 echo '
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_AES_ARM64=y

+ 7 - 0
devices/common/default-settings

@@ -13,6 +13,13 @@ if [ "$(uci -q get dhcp.@dnsmasq[0].port)" != "53" ]; then
 	uci commit dhcp
 fi
 
+uci -q batch <<EOF
+set attendedsysupgrade.server.url='https://op.supes.top'
+set attendedsysupgrade.client.auto_search='1'
+set attendedsysupgrade.client.advanced_mode='1'
+commit attendedsysupgrade
+EOF
+
 uci set dockerd.firewall.extra_iptables_args='--match conntrack ! --ctstate RELATED,ESTABLISHED'
 uci commit dockerd
 

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

@@ -15,3 +15,30 @@
  
  ifeq ($(CONFIG_BUILDBOT),)
  	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
+
+--- a/target/imagebuilder/files/Makefile
++++ b/target/imagebuilder/files/Makefile
+@@ -124,6 +124,7 @@ _call_image: staging_dir/host/.prereq-build
+ 	$(MAKE) -s build_image
+ 	$(MAKE) -s json_overview_image_info
+ 	$(MAKE) -s checksum
++	rm -rf $(KERNEL_BUILD_DIR)/tmp/*$(EXTRA_IMAGE_NAME)*
+ 
+ _call_manifest: FORCE
+ 	rm -rf $(TARGET_DIR)
+
+@@ -164,7 +165,13 @@ package_install: FORCE
+ 	@echo Installing packages...
+ 	$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/libc_*.ipk $(PACKAGE_DIR)/libc_*.ipk))
+ 	$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/kernel_*.ipk $(PACKAGE_DIR)/kernel_*.ipk))
+-	$(OPKG) install $(BUILD_PACKAGES)
++	packages="$(BUILD_PACKAGES) luci-i18n-base-zh-cn"; \
++	for p in $(BUILD_PACKAGES); do \
++		if [[ $$p == luci-app-* && "`$(OPKG) list | grep luci-i18n-\`echo $$p | cut -d - -f 3-\`-zh-cn`" ]]; then \
++			packages="$$packages luci-i18n-`echo $$p | cut -d - -f 3-`-zh-cn"; \
++		fi \
++	done; \
++	$(OPKG) install --force-overwrite --force-checksum --force-depends $$packages
+ 
+ prepare_rootfs: FORCE
+ 	@echo