teknoraver / rpms / rpm

Forked from rpms/rpm 4 months ago
Clone

Blame rpm-4.9.90-canonarch.patch

Panu Matilainen f097c8
commit 2e5d83e3d1a27044ee59f13f66b06e9011d1ac9f
Panu Matilainen f097c8
Author: Panu Matilainen <pmatilai@redhat.com>
Panu Matilainen f097c8
Date:   Fri Mar 30 09:56:43 2012 +0300
Panu Matilainen f097c8
Panu Matilainen f097c8
    Axe leftover CANONARCH assignment messing up our "base" archs (RhBug:808250)
Panu Matilainen f097c8
    
Panu Matilainen f097c8
    - This should've been in commit 2a8d03669732f68f02fa7b21ec87ee3f65d11e5b,
Panu Matilainen f097c8
      the leftover CANONARCH resets the "base arch" we just set to a wrong
Panu Matilainen f097c8
      value.
Panu Matilainen f097c8
    (cherry picked from commit 7c39c65da4b1b012061ffbac179a650643d00ba9)
Panu Matilainen f097c8
Panu Matilainen f097c8
diff --git a/installplatform b/installplatform
Panu Matilainen f097c8
index c56d5665..f7ae241 100755
Panu Matilainen f097c8
--- a/installplatform
Panu Matilainen f097c8
+++ b/installplatform
Panu Matilainen f097c8
@@ -111,8 +111,6 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
Panu Matilainen f097c8
   # skip architectures for which we dont have full config parameters
Panu Matilainen f097c8
   [ -z "$CANONARCH" ] && continue
Panu Matilainen f097c8
 
Panu Matilainen f097c8
-  CANONARCH="`echo $ARCH|sed -e "$canonarch_sed"`"
Panu Matilainen f097c8
-
Panu Matilainen f097c8
   if [ "$OS" = "linux" ] && [ "$CANONCOLOR" = 3 ]; then
Panu Matilainen f097c8
       LIB=${LIB}64
Panu Matilainen f097c8
   fi