[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH] make a call to rpmutils to get the basearch works on arches that dont have anaconda built on the basearch



---
 scripts/buildinstall |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/buildinstall b/scripts/buildinstall
index 34f5904..9bfdcf7 100755
--- a/scripts/buildinstall
+++ b/scripts/buildinstall
@@ -190,10 +190,8 @@ if [ "$LOCALSCRIPTS" = "yes" ]; then
     BUILDINSTALL="$CWD/buildinstall"
 else
     pushd $BUILDINSTDIR
-    BUILDARCH=`repoquery -c $yumconf --qf "%{ARCH}\n" anaconda`
-    # This is a crappy implementation but x86 is the only place we currently see
-    # BUILDARCH != BASEARCH (e.g. i586 != i386) so it'll suffice.
-    BASEARCH=`echo $BUILDARCH | sed -e 's/i.86/i386/'`
+    BUILDARCH=`python -c "import rpmUtils.arch; \
+      print rpmUtils.arch.getBaseArch(myarch=rpmUtils.arch.getCanonArch(skipRpmPlatform = True));"`
     yumdownloader -c $yumconf anaconda || exit 1
     rpm2cpio anaconda*rpm | cpio --quiet -iumd './usr*'
     rm -f anaconda*rpm
-- 
1.6.2.5


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]