X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fimage.mk;h=9bb2daaaafb7680d74e76ca25c199cfb8fe8712f;hp=7fe149fee4057bd16e65a1e3ecc5147ccb971a1f;hb=b47f438d98cd4b731d7f4431448dde973eae4739;hpb=160913f9debcc0193b2a481f2c63c489058d243d;ds=sidebyside diff --git a/include/image.mk b/include/image.mk index 7fe149fee4..9bb2daaaaf 100644 --- a/include/image.mk +++ b/include/image.mk @@ -11,10 +11,15 @@ include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/image-commands.mk +include $(INCLUDE_DIR)/image-legacy.mk override MAKE:=$(_SINGLE)$(SUBMAKE) override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE) +param_get = $(patsubst $(1)=%,%,$(filter $(1)=%,$(2))) +param_mangle = $(subst $(space),_,$(strip $(1))) +param_unmangle = $(subst _,$(space),$(1)) + KDIR=$(KERNEL_BUILD_DIR) KDIR_TMP=$(KDIR)/tmp DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts @@ -73,8 +78,6 @@ fs-types-$(CONFIG_TARGET_ROOTFS_EXT4FS) += ext4 fs-types-$(CONFIG_TARGET_ROOTFS_ISO) += iso fs-types-$(CONFIG_TARGET_ROOTFS_UBIFS) += ubifs fs-subtypes-$(CONFIG_TARGET_ROOTFS_JFFS2) += $(addsuffix -raw,$(addprefix jffs2-,$(JFFS2_BLOCKSIZE))) -fs-subtypes-$(CONFIG_TARGET_ROOTFS_CPIOGZ) += cpiogz -fs-subtypes-$(CONFIG_TARGET_ROOTFS_TARGZ) += targz TARGET_FILESYSTEMS := $(fs-types-y) @@ -200,55 +203,16 @@ ifneq ($(CONFIG_NAND_SUPPORT),) endif -ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),) - define Image/mkfs/ubifs/generate - $(CP) ./ubinize$(1).cfg $(KDIR) - ( cd $(KDIR); \ - $(STAGING_DIR_HOST)/bin/ubinize \ - $(if $($(PROFILE)_UBI_OPTS), \ - $(shell echo $($(PROFILE)_UBI_OPTS)), \ - $(shell echo $(UBI_OPTS)) \ - ) \ - -o $(KDIR)/root$(1).ubi \ - ubinize$(1).cfg \ - ) - endef - - define Image/mkfs/ubifs - - ifneq ($($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),) - $(STAGING_DIR_HOST)/bin/mkfs.ubifs \ - $(if $($(PROFILE)_UBIFS_OPTS), \ - $(shell echo $($(PROFILE)_UBIFS_OPTS)), \ - $(shell echo $(UBIFS_OPTS)) \ - ) \ - $(if $(CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP),--space-fixup) \ - $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--force-compr=none) \ - $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--force-compr=lzo) \ - $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--force-compr=zlib) \ - $(if $(shell echo $(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)),--jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)) \ - --squash-uids \ - -o $(KDIR)/root.ubifs \ - -d $(TARGET_DIR) - endif - $(call Image/Build,ubifs) - - ifneq ($($(PROFILE)_UBI_OPTS)$(UBI_OPTS),) - $(if $(wildcard ./ubinize.cfg),$(call Image/mkfs/ubifs/generate,)) - $(if $(wildcard ./ubinize-overlay.cfg),$(call Image/mkfs/ubifs/generate,-overlay)) - endif - $(if $(wildcard ./ubinize.cfg),$(call Image/Build,ubi)) - endef -endif - -define Image/mkfs/cpiogz - ( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9n >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz ) -endef - -define Image/mkfs/targz - $(TAR) -cp --numeric-owner --owner=0 --group=0 --sort=name \ - $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \ - -C $(TARGET_DIR)/ . | gzip -9n > $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))-rootfs.tar.gz +define Image/mkfs/ubifs + $(STAGING_DIR_HOST)/bin/mkfs.ubifs \ + $(UBIFS_OPTS) $(call param_unmangle,$(call param_get,fs,$(1))) \ + $(if $(CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP),--space-fixup) \ + $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--force-compr=none) \ + $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--force-compr=lzo) \ + $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--force-compr=zlib) \ + $(if $(shell echo $(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)),--jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)) \ + --squash-uids \ + -o $@ -d $(TARGET_DIR) endef E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024*1024))) @@ -283,16 +247,22 @@ define Image/Checksum ) endef -define BuildImage/mkfs - install-images: mkfs-$(1) - .PHONY: mkfs-$(1) - mkfs-$(1): kernel_prepare - $(Image/mkfs/$(1)) - $(call Build/mkfs/default,$(1)) - $(call Build/mkfs/$(1),$(1)) - $(KDIR)/root.$(1): mkfs-$(1) +ifdef CONFIG_TARGET_ROOTFS_TARGZ + define Image/Build/targz + $(TAR) -cp --numeric-owner --owner=0 --group=0 --sort=name \ + $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \ + -C $(TARGET_DIR)/ . | gzip -9n > $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))-rootfs.tar.gz + endef +endif -endef +ifdef CONFIG_TARGET_ROOTFS_CPIOGZ + define Image/Build/cpiogz + ( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9n >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz ) + endef +endif + +$(KDIR)/root.%: kernel_prepare + $(call Image/mkfs/$(word 1,$(subst +,$(space),$*)),$(subst +,$(space),$*)) define Device/InitProfile PROFILES := $(PROFILE) @@ -308,6 +278,7 @@ define Device/Init KERNEL_SIZE:= CMDLINE:= + IMAGES := IMAGE_PREFIX := $(IMG_PREFIX)-$(1) IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1)-$$(2) KERNEL_PREFIX = $$(IMAGE_PREFIX) @@ -322,25 +293,49 @@ define Device/Init KERNEL_DEPENDS := KERNEL_SIZE := + UBOOTENV_IN_UBI := + KERNEL_IN_UBI := + BLOCKSIZE := + PAGESIZE := + SUBPAGESIZE := + VID_HDR_OFFSET := + UBINIZE_OPTS := -E 5 + MKUBIFS_OPTS := + + FS_OPTIONS/ubifs = $$(MKUBIFS_OPTS) + + DEVICE_DTS := + DEVICE_DTS_DIR := + + BOARD_NAME := + FILESYSTEMS := $(TARGET_FILESYSTEMS) endef +DEFAULT_DEVICE_VARS := \ + DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE \ + DEVICE_DTS DEVICE_DTS_DIR BOARD_NAME \ + UBOOTENV_IN_UBI KERNEL_IN_UBI \ + BLOCKSIZE PAGESIZE SUBPAGESIZE VID_HDR_OFFSET \ + UBINIZE_OPTS + define Device/ExportVar $(1) : $(2):=$$($(2)) endef define Device/Export - $(foreach var,$(DEVICE_VARS) DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE,$(call Device/ExportVar,$(1),$(var))) + $(foreach var,$(DEVICE_VARS) $(DEFAULT_DEVICE_VARS),$(call Device/ExportVar,$(1),$(var))) $(1) : FILESYSTEM:=$(2) endef ifdef IB - DEVICE_CHECK_PROFILE = $(filter $(1),$(PROFILE)) + DEVICE_CHECK_PROFILE = $(filter $(1),DEVICE_$(PROFILE) $(PROFILE)) else DEVICE_CHECK_PROFILE = $(CONFIG_TARGET_$(if $(CONFIG_TARGET_MULTI_PROFILE),DEVICE_)$(call target_conf,$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)))_$(1)) endif define Device/Check + KDIR_KERNEL_IMAGE := $(KDIR)/$(1)$$(KERNEL_SUFFIX) _PROFILE_SET = $$(strip $$(foreach profile,$$(PROFILES) DEVICE_$(1),$$(call DEVICE_CHECK_PROFILE,$$(profile)))) _TARGET := $$(if $$(_PROFILE_SET),install-images,install-disabled) ifndef IB @@ -351,7 +346,7 @@ endef ifndef IB define Device/Build/initramfs $(call Device/Export,$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE),$(1)) - $$(_TARGET): $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE) + $$(_TARGET): $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE)) $(KDIR)/$$(KERNEL_INITRAMFS_NAME):: image_prepare $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE) @@ -379,17 +374,17 @@ define Device/Build/compile endef define Device/Build/kernel - _KERNEL_IMAGES += $(KDIR)/$$(KERNEL_NAME) + _KERNEL_IMAGES += $$(KDIR_KERNEL_NAME) $(KDIR)/$$(KERNEL_NAME):: image_prepare $$(_TARGET): $$(if $$(KERNEL_INSTALL),$(BIN_DIR)/$$(KERNEL_IMAGE)) - $(call Device/Export,$(KDIR)/$$(KERNEL_IMAGE),$(1)) - $(BIN_DIR)/$$(KERNEL_IMAGE): $(KDIR)/$$(KERNEL_IMAGE) + $(call Device/Export,$$(KDIR_KERNEL_IMAGE),$(1)) + $(BIN_DIR)/$$(KERNEL_IMAGE): $$(KDIR_KERNEL_IMAGE) cp $$^ $$@ ifndef IB ifdef CONFIG_IB - install: $(KDIR)/$$(KERNEL_IMAGE) + install: $$(KDIR_KERNEL_IMAGE) endif - $(KDIR)/$$(KERNEL_IMAGE): $(KDIR)/$$(KERNEL_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS) + $$(KDIR_KERNEL_IMAGE): $(KDIR)/$$(KERNEL_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS) @rm -f $$@ $$(call concat_cmd,$$(KERNEL)) $$(if $$(KERNEL_SIZE),$$(call Device/Build/check_size,$$(KERNEL_SIZE))) @@ -399,7 +394,7 @@ endef define Device/Build/image $$(_TARGET): $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)) $(eval $(call Device/Export,$(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)),$(1))) - $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/$$(KERNEL_IMAGE) $(KDIR)/root.$(1) + $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $$(KDIR_KERNEL_IMAGE) $(KDIR)/root.$(1)$$(if $$(FS_OPTIONS/$(1)),+fs=$$(call param_mangle,$$(FS_OPTIONS/$(1)))) @rm -f $$@ [ -f $$(word 1,$$^) -a -f $$(word 2,$$^) ] $$(call concat_cmd,$(if $(IMAGE/$(2)/$(1)),$(IMAGE/$(2)/$(1)),$(IMAGE/$(2)))) @@ -435,7 +430,6 @@ endef define Device/Dump $$(eval $$(if $$(DEVICE_TITLE),$$(info $$(call Device/DumpInfo,$(1))))) endef -LegacyDevice/Dump = $(Device/Dump) define Device $(call Device/InitProfile,$(1)) @@ -447,42 +441,6 @@ define Device endef -define LegacyDevice/Check - _PROFILE_SET = $$(strip $$(foreach profile,$$(PROFILES) DEVICE_$(1),$$(call DEVICE_CHECK_PROFILE,$$(profile)))) - _TARGET_PREPARE := $$(if $$(_PROFILE_SET),legacy-images-prepare,prepare-disabled) - _TARGET := $$(if $$(_PROFILE_SET),legacy-images,install-disabled) - $$(if $$(_PROFILE_SET),install: legacy-images-make) - ifndef IB - $$(if $$(_PROFILE_SET),compile: legacy-images-prepare-make) - endif -endef - -define LegacyDevice/Build - $$(_TARGET): legacy-image-$(1) - $$(_TARGET_PREPARE): legacy-image-prepare-$(1) - .PHONY: legacy-image-prepare-$(1) legacy-image-$(1) - - legacy-image-prepare-$(1): - $(foreach fs,$(TARGET_FILESYSTEMS), - $$(call Image/Prepare/Profile,$(1),$(fs)) - ) - - legacy-image-$(1): - $(foreach fs,$(TARGET_FILESYSTEMS), - $$(call Image/Build/Profile,$(1),$(fs)) - ) - -endef - -define LegacyDevice - $(call Device/InitProfile,$(1)) - $(call Device/Default,$(1)) - $(call LegacyDevice/Default,$(1)) - $(call LegacyDevice/$(1),$(1)) - $(call LegacyDevice/Check,$(1)) - $(call LegacyDevice/$(if $(DUMP),Dump,Build),$(1)) -endef - define BuildImage ifneq ($(DUMP),) @@ -523,21 +481,22 @@ define BuildImage $(call Image/mkfs/prepare) kernel_prepare: mkfs_prepare + $(call Image/Build/targz) + $(call Image/Build/cpiogz) $(call Image/BuildKernel) $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(if $(IB),,$(call Image/BuildKernel/Initramfs))) $(call Image/InstallKernel) $(foreach device,$(TARGET_DEVICES),$(call Device,$(device))) $(foreach device,$(LEGACY_DEVICES),$(call LegacyDevice,$(device))) - $(foreach fs,$(TARGET_FILESYSTEMS) $(fs-subtypes-y),$(call BuildImage/mkfs,$(fs))) - install-images: kernel_prepare + install-images: kernel_prepare $(foreach fs,$(filter-out $(if $(UBIFS_OPTS),,ubifs),$(TARGET_FILESYSTEMS) $(fs-subtypes-y)),$(KDIR)/root.$(fs)) $(foreach fs,$(TARGET_FILESYSTEMS), $(call Image/Build,$(fs)) ) - $(call Image/mkfs/ubifs) legacy-images-make: install-images + $(call Image/mkfs/ubifs/legacy) $(MAKE) legacy-images install: install-images