aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-10-26 20:41:02 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-10-30 19:23:24 +0100
commit1f4e8d3c9ef64c68a6d364a86505447bd9213412 (patch)
tree6a6a0153d1db30dedd7d1f900d5be5e54f5316c2
parent8af6dfc01c01b2d6b476cd3e87de1604f8e48564 (diff)
downloadupstream-1f4e8d3c9ef64c68a6d364a86505447bd9213412.tar.gz
upstream-1f4e8d3c9ef64c68a6d364a86505447bd9213412.tar.bz2
upstream-1f4e8d3c9ef64c68a6d364a86505447bd9213412.zip
image: drop obsolete legacy image recipes
LegacyDevice is not used anymore in our tree, so let's drop it together with the relevant definitions and recipes. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rw-r--r--include/image-legacy.mk93
-rw-r--r--include/image.mk11
2 files changed, 0 insertions, 104 deletions
diff --git a/include/image-legacy.mk b/include/image-legacy.mk
deleted file mode 100644
index 1ccaec09b0..0000000000
--- a/include/image-legacy.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-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),$($(PROFILE)_UBI_OPTS),$(shell echo $(UBI_OPTS))) \
- -o $(KDIR)/root$(1).ubi \
- ubinize$(1).cfg \
- )
- endef
-
- define Image/mkfs/ubifs/legacy
-
- $(if $($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),
- $(STAGING_DIR_HOST)/bin/mkfs.ubifs \
- $(if $($(PROFILE)_UBIFS_OPTS),$($(PROFILE)_UBIFS_OPTS),$(UBIFS_OPTS)) \
- $(if $(CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP),--space-fixup) \
- $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--compr=none) \
- $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--compr=lzo) \
- $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--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)
- )
- $(call Image/Build,ubifs)
-
- $(if $($(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))
- )
- $(if $(wildcard ./ubinize.cfg),$(call Image/Build,ubi))
- endef
-endif
-
-LegacyDevice/Dump = $(Device/Dump)
-
-define LegacyDevice/Check
- $(Device/Check/Common)
- _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),kernel_prepare: legacy-images-prepare-make)
- endif
-endef
-
-ifdef TARGET_PER_DEVICE_ROOTFS
- define Image/Build/Profile/Filesystem
- cp $(KDIR)/root.$(2)+pkg=$(3) $(KDIR)/root.$(2)
- $(call Image/Build/$(2),$(2))
- $(call Image/Build/Profile,$(1),$(2))
- endef
-else
- Image/Build/Profile/Filesystem = $(Image/Build/Profile)
-endif
-
-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):
- $$(call Image/Prepare/Profile,$(1))
-
- ifndef IB
- ifdef CONFIG_TARGET_PER_DEVICE_ROOTFS
- ROOTFS/$(1) := $(foreach fs,$(TARGET_FILESYSTEMS), \
- $(KDIR)/root.$(fs)$$(strip $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),+pkg=$$(ROOTFS_ID/$(1)))) \
- )
-
- $$(ROOTFS/$(1)): target-dir-$$(ROOTFS_ID/$(1))
- legacy-images-make: $$(if $$(_PROFILE_SET),$$(ROOTFS/$(1)))
- endif
- endif
-
- legacy-image-$(1):
- $$(call Image/BuildKernel/Profile,$(1))
- $(foreach fs,$(TARGET_FILESYSTEMS),
- $$(call Image/Build/Profile/Filesystem,$(1),$(fs),$$(ROOTFS_ID/$(1)))
- )
-
-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
diff --git a/include/image.mk b/include/image.mk
index f01e160a9d..eb047041fc 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -17,7 +17,6 @@ ifndef IB
endif
endif
-include $(INCLUDE_DIR)/image-legacy.mk
include $(INCLUDE_DIR)/feeds.mk
include $(INCLUDE_DIR)/rootfs.mk
@@ -683,8 +682,6 @@ define BuildImage
prepare:
compile:
clean:
- legacy-images-prepare:
- legacy-images:
image_prepare:
ifeq ($(IB),)
@@ -700,9 +697,6 @@ define BuildImage
rm -rf $(BUILD_DIR)/json_info_files
$(call Image/Prepare)
- legacy-images-prepare-make: image_prepare
- $(MAKE) legacy-images-prepare BIN_DIR="$(BIN_DIR)"
-
else
image_prepare:
mkdir -p $(BIN_DIR) $(KDIR)/tmp
@@ -716,17 +710,12 @@ define BuildImage
$(call Image/InstallKernel)
$(foreach device,$(TARGET_DEVICES),$(call Device,$(device)))
- $(foreach device,$(LEGACY_DEVICES),$(call LegacyDevice,$(device)))
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))
)
- legacy-images-make: install-images
- $(call Image/mkfs/ubifs/legacy)
- $(MAKE) legacy-images BIN_DIR="$(BIN_DIR)"
-
install: install-images
$(call Image/Manifest)