update

.github/workflows/Openwrt-AutoBuild.yml

@@ -78,7 +78,7 @@ jobs:
       run: |
         gitdate=$(curl -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].created_at')
         gitdate=$(date -d "$gitdate" +%s)
-        now=$(date -d "$(date '+%Y-%m-%d %H:%M:%S')" +%s)
+        now=$(date -d "$(date)" +%s)
         if [[ $(expr $gitdate + 300) < $now ]]; then
           curl -X POST https://api.github.com/repos/kiddin9/openwrt-packages/dispatches \
             -H "Accept: application/vnd.github.everest-preview+json" \

devices/common/patches/imagebuilder.patch

@@ -31,18 +31,19 @@
  	echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))'
  	echo 'Packages: $(BUILD_PACKAGES)'
  	echo
-@@ -164,7 +174,14 @@ package_install: FORCE
+@@ -164,7 +173,15 @@ 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 luci-i18n-base-en"; \
++	packages="luci-i18n-base-zh-cn luci-i18n-base-en"; \
 +	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"; \
++			packages="luci-i18n-`echo $$p | cut -d - -f 3-`-zh-cn $$packages"; \
 +		fi \
 +	done; \
-+	$(OPKG) install --force-overwrite --force-checksum --force-depends --force-maintainer $$packages
++	$(OPKG) install --force-overwrite $$packages
++	$(OPKG) install --force-overwrite --force-checksum --force-depends --force-maintainer $(BUILD_PACKAGES)
 +	$(OPKG) install --force-overwrite --force-checksum --force-depends --force-maintainer --force-reinstall my-default-settings
  
  prepare_rootfs: FORCE
@@ -53,14 +54,14 @@
  	rm -rf $(BUILD_DIR)/json_info_files/
 -	$(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
 +	[ "$(PARTSIZE)" -ge 100 2>/dev/null ] && [ "$(PARTSIZE)" -le 3072 2>/dev/null ] && ROOT_PARTSIZE="$(PARTSIZE)"; \
-+	nice $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" PARTSIZE="$$ROOT_PARTSIZE" FILESYSTEMS="$(FILESYSTEMS)" \
++	nice $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" PARTSIZE="$$ROOT_PARTSIZE" FILESYSTEMS="$(FILESYSTEMS)" ROOTFS="$(ROOTFS)" VMDK="$(VMDK)" EFI="$(EFI)" \
  		$(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")
  
  $(BIN_DIR)/profiles.json: FORCE
 
 --- a/include/image.mk
 +++ b/include/image.mk
-@@ -33,6 +33,13 @@ KDIR=$(KERNEL_BUILD_DIR)
+@@ -33,6 +33,16 @@ KDIR=$(KERNEL_BUILD_DIR)
  KDIR_TMP=$(KDIR)/tmp
  DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts
  
@@ -70,11 +71,14 @@
 +ifeq ($(FILESYSTEMS),ext4)
 +  CONFIG_TARGET_ROOTFS_EXT4FS := y
 +  CONFIG_TARGET_ROOTFS_SQUASHFS := n
++endif
++ifeq ($(ROOTFS),0)
++  CONFIG_TARGET_ROOTFS_TARGZ := n
 +endif
  IMG_PREFIX_EXTRA:=$(if $(EXTRA_IMAGE_NAME),$(call sanitize,$(EXTRA_IMAGE_NAME))-)
  IMG_PREFIX_VERNUM:=$(if $(CONFIG_VERSION_FILENAMES),$(call sanitize,$(VERSION_NUMBER))-)
  IMG_PREFIX_VERCODE:=$(if $(CONFIG_VERSION_CODE_FILENAMES),$(call sanitize,$(VERSION_CODE))-)
-@@ -225,7 +232,8 @@ $(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
+@@ -225,7 +235,8 @@ $(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
  $(eval $(foreach S,$(NAND_BLOCKSIZE),$(call Image/mkfs/jffs2-nand/template,$(S))))
  
  define Image/mkfs/squashfs-common
@@ -84,3 +88,30 @@
  		-nopad -noappend -root-owned \
  		-comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
  		-processors 1
+@@ -291,7 +302,7 @@ define Image/gzip-ext4-padded-squashfs
+ 
+ endef
+ 
+-ifdef CONFIG_TARGET_ROOTFS_TARGZ
++ifeq ($(CONFIG_TARGET_ROOTFS_TARGZ),y)
+   define Image/Build/targz
+ 	$(TAR) -cp --numeric-owner --owner=0 --group=0 --mode=a-s --sort=name \
+ 		$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
+
+--- a/target/linux/x86/image/Makefile
++++ b/target/linux/x86/image/Makefile
+@@ -11,6 +11,14 @@ GRUB_SERIAL_CONFIG =
+ GRUB_TERMINAL_CONFIG =
+ GRUB_CONSOLE_CMDLINE =
+ 
++ifeq ($(VMDK),1)
++  CONFIG_VMDK_IMAGES := y
++endif
++
++ifeq ($(EFI),0)
++  CONFIG_GRUB_EFI_IMAGES := n
++endif
++
+ ifneq ($(CONFIG_GRUB_CONSOLE),)
+   GRUB_CONSOLE_CMDLINE += console=tty0
+   GRUB_TERMINALS += console

devices/x86_64/.config

@@ -4,7 +4,7 @@ CONFIG_TARGET_x86_64=y
 
 # EFI支持:
 CONFIG_GRUB_IMAGES=y
-CONFIG_EFI_IMAGES=y
+CONFIG_GRUB_EFI_IMAGES=y
 CONFIG_VMDK_IMAGES=n
 
 # 其他需要安装的软件包: