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

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

 



> 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

Note that BASEARCH is used later on in the calls to mktreeinfo, etc.  So
we either need to still set it to something early on or use BUILDARCH
everywhere instead.

- Chris

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux