From: Paul Spooren Date: Mon, 12 Aug 2019 09:08:33 +0000 (-1000) Subject: image.mk: remove device_ from manifest filename X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=dfe99645dbdd4460f394beaa3a05091cd40b5942;p=openwrt%2Fstaging%2Fldir.git image.mk: remove device_ from manifest filename The manifest file is based on IMG_PREFIX and PROFILE_SANITIZED, whereas the latter takes a string like DEVICE_8dev_carambola2 and sanitizes it. This behaviour results in a useless "device_" profile-prefix in the device manifest filename. Now uses *subst* to remove that. Therefore this patch results more consistent device file names: openwrt-ath79-generic-8dev_carambola2-initramfs-kernel.bin openwrt-ath79-generic-8dev-carambola2.manifest openwrt-ath79-generic-8dev_carambola2-squashfs-sysupgrade.bin instead of a single file being called openwrt-ath79-generic-device_8dev-carambola2.manifest Signed-off-by: Paul Spooren --- diff --git a/include/image.mk b/include/image.mk index e55ac22d0d..c6a6ab7993 100644 --- a/include/image.mk +++ b/include/image.mk @@ -106,7 +106,7 @@ define add_jffs2_mark echo -ne '\xde\xad\xc0\xde' >> $(1) endef -PROFILE_SANITIZED := $(call sanitize,$(PROFILE)) +PROFILE_SANITIZED := $(call sanitize,$(subst DEVICE_,,$(PROFILE))) define split_args $(foreach data, \