--- a/include/image.mk +++ b/include/image.mk @@ -728,8 +769,10 @@ endef define Device $(call Device/InitProfile,$(1)) $(call Device/Init,$(1)) + $(call Device/Init,$(PROFILE_SANITIZED)) $(call Device/Default,$(1)) $(call Device/$(1),$(1)) + $(call Device/$(PROFILE_SANITIZED),$(1)) $(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 $(KDIR)/generic-kernel.bin $$@ ifndef IB ifdef CONFIG_IB install: $$(KDIR_KERNEL_IMAGE) --- a/target/linux/armsr/image/Makefile +++ b/target/linux/armsr/image/Makefile @@ -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) @@ -116,4 +114,34 @@ define Device/generic endef TARGET_DEVICES += generic +define Device/box + DEVICE_TITLE := 电视盒子全系列 / N1 + DEVICE_PACKAGES := perlbase-base perlbase-utf8 perlbase-time perlbase-xsloader perlbase-file btrfs-progs luci-app-amlogic kmod-brcmfmac wpad-basic-mbedtls iw fdisk lsblk automount +endef +TARGET_DEVICES += box + +define Device/h28k + DEVICE_TITLE := HinLink H28K + DEVICE_PACKAGES := perlbase-base perlbase-utf8 perlbase-time perlbase-xsloader perlbase-file btrfs-progs luci-app-amlogic kmod-brcmfmac wpad-basic-mbedtls iw fdisk lsblk automount +endef +TARGET_DEVICES += h28k + +define Image/Build + if [ "$(PROFILE_SANITIZED)" == "box" ]; then \ + export BIN_DIR=$(BIN_DIR); \ + export DATE=$(DATE); \ + export MORE=$(MORE); \ + export ROOTFS_PARTSIZE=$(shell echo $$(($(ROOTFS_PARTSIZE)/1024/1024))); \ + cd /data/packit/amlogic-s9xxx-openwrt; \ + . ~/packit/packit_amlogic.sh; \ + elif [ "$(PROFILE_SANITIZED)" == "h28k" ]; then \ + export BIN_DIR=$(BIN_DIR); \ + export DATE=$(DATE); \ + export PACKAGE_SOC=$(PROFILE_SANITIZED); \ + export ROOTFS_MB=$(shell echo $$(($(ROOTFS_PARTSIZE)/1024/1024))); \ + cd /data/packit/flippy-openwrt-actions; \ + . ~/packit/packit_flippy.sh; \ + fi +endef + $(eval $(call BuildImage))