update

.github/workflows/Openwrt-AutoBuild.yml

@@ -276,12 +276,9 @@ jobs:
         cd openwrt; kernel_v="$(make --file=info.mk kernel_version)"; cd -
         cp -rf openwrt/bin/targets/*/*/*{combined,sysupgrade}* ./firmware/${{matrix.target}}/ || true
         cd openwrt/bin/targets/*/*/
-        tar -cf targets.tar .*
         mv -f profiles.json profiles.json.b || true
         cp $GITHUB_WORKSPACE/openwrt/.config ${{matrix.target}}.config || true
         cp $GITHUB_WORKSPACE/openwrt/build_dir/target-*/linux-*/linux-*/.config ${{matrix.target}}_kernel.config || true
-        mv -f packages $kernel_v
-        ln -sf $kernel_v packages
         cd -
         rename -v "s/openwrt-/${{ env.VERSION }}-openwrt-/" ./firmware/*/* || true
         rename -v "s/friendlyarm_//" ./firmware/*/*gz || true
@@ -314,7 +311,7 @@ jobs:
       with:
         name: ${{ env.VERSION }}_${{matrix.target}}
         path: |
-          openwrt/bin/targets/*/*/targets.tar
+          openwrt/bin/targets/
 
     - name: Upload firmware to cowtransfer
       if: env.UPLOAD_FIRMWARE_TO_COWTRANSFER == 'true'

devices/armsr_armv8/.config

@@ -1,11 +1,11 @@
 CONFIG_TARGET_armsr=y
 CONFIG_TARGET_armsr_armv8=y
-CONFIG_TARGET_DEVICE_armsr_armv8_DEVICE_box=y
+CONFIG_TARGET_armsr_armv8_DEVICE_generic=y
 CONFIG_PACKAGE_kmod-brcmfmac=y
 CONFIG_BRCMFMAC_SDIO=y
 CONFIG_TARGET_ROOTFS_TARGZ=y
 
-CONFIG_TARGET_ROOTFS_EXT4FS=n
+CONFIG_TARGET_ROOTFS_EXT4FS=y
 CONFIG_TARGET_ROOTFS_SQUASHFS=n
 
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务

devices/armsr_armv8/diy.sh

@@ -4,6 +4,3 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
 
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += -luci-app-attendedsysupgrade -luci-app-gpsysupgrade/' target/linux/armsr/Makefile
-
-

devices/armsr_armv8/patches/rootfs.patch

@@ -11,38 +11,38 @@
    $(call Device/Check,$(1))
    $(call Device/$(if $(DUMP),Dump,Build),$(1))
  
+--- a/include/image.mk
++++ b/include/image.mk
+@@ -599,7 +599,7 @@ define Device/Build/kernel
+   $$(_TARGET): $$(if $$(KERNEL_INSTALL),$(BIN_DIR)/$$(KERNEL_IMAGE))
+   $(call Device/Export,$$(KDIR_KERNEL_IMAGE),$(1))
+   $(BIN_DIR)/$$(KERNEL_IMAGE): $$(KDIR_KERNEL_IMAGE)
+-	cp $$^ $$@
++	cp generic-kernel.bin $$@
+   ifndef IB
+     ifdef CONFIG_IB
+       install: $$(KDIR_KERNEL_IMAGE)
 
 --- a/target/linux/armsr/image/Makefile
 +++ b/target/linux/armsr/image/Makefile
-@@ -74,7 +74,8 @@ define Build/grub-install
- endef
- 
- DEVICE_VARS += GRUB2_VARIANT UBOOT
--define Device/efi-default
-+
-+define Device/generic
-   IMAGE/rootfs.img := append-rootfs | pad-to $(ROOTFS_PARTSIZE)
-   IMAGE/rootfs.img.gz := append-rootfs | pad-to $(ROOTFS_PARTSIZE) | gzip
-   IMAGE/combined.img := grub-config efi | combined efi | grub-install efi | append-metadata
-@@ -98,10 +99,6 @@ define Device/efi-default
-  ifeq ($(CONFIG_arm),y)
-   KERNEL_NAME = zImage
-  endif
--endef
--
--define Device/generic
--  $(call Device/efi-default)
-   DEVICE_TITLE := Generic EFI Boot
-   GRUB2_VARIANT := generic
-   FILESYSTEMS := ext4 squashfs
-@@ -115,4 +112,21 @@ define Device/generic
+@@ -81,10 +81,8 @@ define Device/efi-default
+   IMAGE/combined.img.gz := grub-config efi | combined efi | grub-install efi | gzip | append-metadata
+   IMAGE/combined.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk
+  ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y)
+-    IMAGES-y := rootfs.img.gz
+     IMAGES-y += combined.img.gz
+   else
+-    IMAGES-y := rootfs.img
+     IMAGES-y += combined.img
+   endif
+   ifeq ($(CONFIG_VMDK_IMAGES),y)
+@@ -115,4 +113,20 @@ define Device/generic
  endef
  TARGET_DEVICES += generic
  
 +define Device/box
-+  DEVICE_VENDOR := 
-+  DEVICE_MODEL := 电视盒子全系列 / N1
-+  DEVICE_PACKAGES := perlbase-base btrfs-progs luci-app-amlogic kmod-brcmfmac wpad-basic-mbedtls iw fdisk lsblk
++  DEVICE_TITLE := 电视盒子全系列 / N1
++  DEVICE_PACKAGES := perlbase-base btrfs-progs luci-app-amlogic kmod-brcmfmac wpad-basic-mbedtls iw fdisk lsblk -luci-app-attendedsysupgrade -luci-app-gpsysupgrade
 +endef
 +TARGET_DEVICES += box
 +
@@ -50,7 +50,7 @@
 +  if [ "$(PROFILE_SANITIZED)" == "box" ]; then \
 +  	export BIN_DIR=$(BIN_DIR); \
 +  	export DATE=$(DATE); \
-+  	cd /www/wwwroot/op.supes.top/bcache/armvirt/64/amlogic-s9xxx-openwrt; \
++  	cd /www/wwwroot/op.supes.top/bcache/armsr/armv8/amlogic-s9xxx-openwrt; \
 +  	. ../modify_amlogic.sh; \
 +  	./make -k 5.15.100 -b $(MORE) -s $(shell echo $$(($(ROOTFS_PARTSIZE)/1024/1024))) || true; \
 +  fi

devices/common/patches/targets.patch

@@ -1,3 +1,23 @@
+--- a/Makefile
++++ b/Makefile
+@@ -40,6 +40,7 @@ else
+   include tools/Makefile
+   include toolchain/Makefile
+ 
++include $(INCLUDE_DIR)/target.mk
+ $(toolchain/stamp-compile): $(tools/stamp-compile) $(if $(CONFIG_BUILDBOT),toolchain_rebuild_check)
+ $(target/stamp-compile): $(toolchain/stamp-compile) $(tools/stamp-compile) $(BUILD_DIR)/.prepared
+ $(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup)
+@@ -131,6 +132,8 @@ world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-
+ 	$(_SINGLE)$(SUBMAKE) -r package/index
+ 	$(_SINGLE)$(SUBMAKE) -r json_overview_image_info
+ 	$(_SINGLE)$(SUBMAKE) -r checksum
++	cp $(BIN_DIR)/packages/Packages.manifest $(BIN_DIR)/
++	mv $(BIN_DIR)/packages $(BIN_DIR)/$(LINUX_VERSION) 2>/dev/null
+ ifneq ($(CONFIG_CCACHE),)
+ 	$(STAGING_DIR_HOST)/bin/ccache -s
+ endif
+
 --- a/include/target.mk
 +++ b/include/target.mk
 @@ -53,10 +53,10 @@ DEFAULT_PACKAGES.nas:=\