1 files changed, 15 insertions, 3 deletions

diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk
index e61805f2cd011..9aa172b79ddc8 100644
--- a/release/scripts/mtree-to-plist.awk
+++ b/release/scripts/mtree-to-plist.awk
@@ -25,7 +25,7 @@
 	if (length(tags) == 0)
 		next
 	if (tags ~ /package=/) {
-		ext = pkgname = ""
+		ext = pkgname = pkgend = ""
 		split(tags, a, ",");
 		for (i in a) {
 			if (a[i] ~ /^package=/) {
@@ -33,17 +33,29 @@
 				gsub(/package=/, "", pkgname)
 			} else if (a[i] == "config") {
 				type="config"
+			} else if (a[i] == "development" || a[i] == "profile") {
+				pkgend=a[i]
 			} else {
-				ext=a[i]
+				if (ext != "")
+					ext=ext"-"a[i]
+				else
+					ext=a[i]
 			}
 		}
-		if (length(ext) > 0) {
+		if (ext != "") {
 			if (pkgname == "runtime") {
 				pkgname=ext
 			} else {
 				pkgname=pkgname"-"ext
 			}
 		}
+		if (pkgend != "") {
+			if (pkgname == "runtime") {
+				pkgname=pkgend
+			} else {
+				pkgname=pkgname"-"pkgend
+			}
+		}
 	} else {
 		print "No packages specified in line: $0" > 2
 		next