KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

image.mk: replace some template abstraction with make pattern rules

Browse source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-07-19 11:28:34 +02:00
parent efdf7f6499
commit 1c1244193a
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
include/image.mk
View file

@ -216,7 +216,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
define Image/mkfs/ubifs define Image/mkfs/ubifs
ifneq ($($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),) $(if $($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),
$(STAGING_DIR_HOST)/bin/mkfs.ubifs \ $(STAGING_DIR_HOST)/bin/mkfs.ubifs \
$(if $($(PROFILE)_UBIFS_OPTS), \ $(if $($(PROFILE)_UBIFS_OPTS), \
$(shell echo $($(PROFILE)_UBIFS_OPTS)), \ $(shell echo $($(PROFILE)_UBIFS_OPTS)), \
@ -230,13 +230,13 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
--squash-uids \ --squash-uids \
-o $(KDIR)/root.ubifs \ -o $(KDIR)/root.ubifs \
-d $(TARGET_DIR) -d $(TARGET_DIR)
endif )
$(call Image/Build,ubifs) $(call Image/Build,ubifs)
ifneq ($($(PROFILE)_UBI_OPTS)$(UBI_OPTS),) $(if $($(PROFILE)_UBI_OPTS)$(UBI_OPTS),
$(if $(wildcard ./ubinize.cfg),$(call Image/mkfs/ubifs/generate,)) $(if $(wildcard ./ubinize.cfg),$(call Image/mkfs/ubifs/generate,))
$(if $(wildcard ./ubinize-overlay.cfg),$(call Image/mkfs/ubifs/generate,-overlay)) $(if $(wildcard ./ubinize-overlay.cfg),$(call Image/mkfs/ubifs/generate,-overlay))
endif )
$(if $(wildcard ./ubinize.cfg),$(call Image/Build,ubi)) $(if $(wildcard ./ubinize.cfg),$(call Image/Build,ubi))
endef endef
endif endif
@ -283,14 +283,8 @@ define Image/Checksum
) )
endef endef
define BuildImage/mkfs $(KDIR)/root.%: kernel_prepare
install-images: mkfs-$(1) $(Image/mkfs/$*)
.PHONY: mkfs-$(1)
mkfs-$(1): kernel_prepare
$(Image/mkfs/$(1))
$(KDIR)/root.$(1): mkfs-$(1)
endef
define Device/InitProfile define Device/InitProfile
PROFILES := $(PROFILE) PROFILES := $(PROFILE)
@ -544,9 +538,8 @@ define BuildImage
$(foreach device,$(TARGET_DEVICES),$(call Device,$(device))) $(foreach device,$(TARGET_DEVICES),$(call Device,$(device)))
$(foreach device,$(LEGACY_DEVICES),$(call LegacyDevice,$(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,$(TARGET_FILESYSTEMS) $(fs-subtypes-y),$(KDIR)/root.$(fs))
$(foreach fs,$(TARGET_FILESYSTEMS), $(foreach fs,$(TARGET_FILESYSTEMS),
$(call Image/Build,$(fs)) $(call Image/Build,$(fs))
) )