From 2b92adc6d6a3358b4569f1ee198b19b15a6957bb Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 13 Nov 2021 14:28:19 +0100 Subject: [PATCH] core/show-info: 'name' only applies to packages Commit 0cfa1659487f (package/pkg-utils.mk: introduce "name" field in show-info output) did what it said, but did so in the generic show-info part, thus it was also added to filesystems (rootfs), the other kind of entity that show-info reports on. Only packages have a "name"; filesystems do not. Instead, they already have an 'image_name'. Move the 'name' field to the package-related part of show-info. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit 471ecea5eeb053d7bd956c8ff7605bd015b24b51) Signed-off-by: Peter Korsgaard --- package/pkg-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 5f9a5739e4..3d87f4851b 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -96,7 +96,6 @@ endef # $(1): upper-case package or filesystem name define json-info "$($(1)_NAME)": { - "name": "$($(1)_RAWNAME)", "type": "$($(1)_TYPE)", $(if $(filter rootfs,$($(1)_TYPE)), \ $(call _json-info-fs,$(1)), \ @@ -108,6 +107,7 @@ endef # _json-info-pkg, _json-info-pkg-details, _json-info-fs: private helpers # for json-info, above define _json-info-pkg + "name": "$($(1)_RAWNAME)", $(if $($(1)_IS_VIRTUAL), \ "virtual": true$(comma), "virtual": false$(comma)