msm: consistency for equally ranked keys

[platform/upstream/rpm.git] / installplatform

diff --git a/installplatform b/installplatform
index f7ae241..7852881 100755 (executable)
--- a/installplatform
+++ b/installplatform
@@ -101,10 +101,16 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
        CANONARCH=alpha
        CANONCOLOR=0
        ;;
+    aarch64)
+       ISANAME=aarch
+       ISABITS=64
+       CANONARCH=aarch64
+       CANONCOLOR=3
+       ;;
     noarch)
        CANONARCH=noarch
        CANONCOLOR=0
-       FILTER="grep -v -E '^(%optflag|%__isa)'"
+       FILTER="grep -v -E ^(%optflag|%__isa)"
        ;;
   esac
 
@@ -119,7 +125,7 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
   [ -d $PPD ] || mkdir -p $PPD
 
   cat $PLATFORM \
-  | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
+  | sed -e "s#@RPMRC_OPTFLAGS@#$RPMRC_OPTFLAGS#" \
        -e "s,@RPMCANONARCH@,$CANONARCH,g" \
        -e "s,@RPMCANONCOLOR@,$CANONCOLOR," \
        -e "s,@RPMRC_GNU@,$RPMRC_GNU," \