From e7f82de654c8fe49b9e3cf83a48b39df9e17fd85 Mon Sep 17 00:00:00 2001 From: Richard Lowe <richlowe@richlowe.net> Date: Sun, 18 Aug 2019 22:33:35 +0200 Subject: [PATCH] Generate more useful sample manifests: --- transforms/generate-cleanup | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/transforms/generate-cleanup b/transforms/generate-cleanup index 70ad01c..fcdd97d 100644 --- a/transforms/generate-cleanup +++ b/transforms/generate-cleanup @@ -53,7 +53,7 @@ <transform dir file link hardlink -> \ edit path "/(sparc|i386)/" "/$!(MACH)/"> <transform dir file link hardlink -> \ - edit path "/(sparc|i386)-(sun|pc)-solaris\d\.\d+" "/$!(MACH)-$!(PLAT)-solaris$!(SOLARIS_RELEASE)"> + edit path "/(sparc|i386)-(sun|pc)-solaris\d\.\d+" "/$!(GNU_TRIPLET)"> <transform dir file link hardlink -> \ edit target "/(sparcv9|amd64)$" "/$!(MACH64)"> @@ -68,7 +68,7 @@ <transform dir file link hardlink -> \ edit target "/(sparc|i386)/" "/$!(MACH)/"> <transform dir file link hardlink -> \ - edit target "/(sparc|i386)-(sun|pc)-solaris\d\.\d+" "/$!(MACH)-$!(PLAT)-solaris$!(SOLARIS_RELEASE)"> + edit target "/(sparc|i386)-(sun|pc)-solaris\d\.\d+" "/$!(GNU_TRIPLET)/"> # <transform dir file link hardlink -> \ # edit path "$(COMPONENT_NAME)" "$!(COMPONENT_NAME)"> @@ -76,14 +76,14 @@ # edit target "$(COMPONENT_NAME)" "$!(COMPONENT_NAME)"> <transform dir file link hardlink -> \ - edit path "$(COMPONENT_VERSION)" "$!(COMPONENT_VERSION)"> + edit path "$(COMPONENT_RE_VERSION)" "$!(COMPONENT_VERSION)"> <transform dir file link hardlink -> \ - edit target "$(COMPONENT_VERSION)" "$!(COMPONENT_VERSION)"> + edit target "$(COMPONENT_RE_VERSION)" "$!(COMPONENT_VERSION)"> <transform dir file link hardlink -> \ - edit path "$(IPS_VERSION)" "$!(IPS_VERSION)"> + edit path "$(IPS_COMPONENT_RE_VERSION)" "$!(IPS_COMPONENT_VERSION)"> <transform dir file link hardlink -> \ - edit target "$(IPS_VERSION)" "$!(IPS_VERSION)"> + edit target "$(IPS_COMPONENT_RE_VERSION)" "$!(IPS_COMPONENT_VERSION)"> # convert temporary macro names to their real name <transform set -> \ -- Gitblit v1.9.3