| Message ID | 20190812090535.29978-1-mail@aparcar.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [OpenWrt-Devel] image.mk: remove device_ from manifest filename | expand |
diff --git a/include/image.mk b/include/image.mk index e55ac22d0d..cc333052a2 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, \ @@ -298,6 +298,7 @@ endef define Image/Manifest $(call opkg,$(TARGET_DIR_ORIG)) list-installed > \ $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest + endef define Image/gzip-ext4-padded-squashfs
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 <mail@aparcar.org> --- include/image.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)