From f143d2925abd0821cb246f57401461716e3429a0 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Mon, 27 Nov 2017 09:29:13 +0100 Subject: [PATCH] remove i686 check from setup --- usr/share/archboot/installer/setup | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup index 42993caa0..08820049a 100755 --- a/usr/share/archboot/installer/setup +++ b/usr/share/archboot/installer/setup @@ -2777,7 +2777,7 @@ select_packages() { if [[ "${SELECTALL}" = "yes" ]]; then tag="ON" fi - for i in $(grep "${category}/" ${PKGS} | sed -e 's|^[a-z0-9-]*/||g' -e "s|pkg.tar.*$||g" -e 's/-i686\.//g' -e 's/-x86_64\.//g' -e 's/-any\.//g'); do + for i in $(grep "${category}/" ${PKGS} | sed -e 's|^[a-z0-9-]*/||g' -e "s|pkg.tar.*$||g" -e 's/-x86_64\.//g' -e 's/-any\.//g'); do pkgname=${i%-*-*} pkgdesc $pkgname CHKLIST+=("${pkgname}" "(${category})" ${tag} "${PKGDESC}") @@ -3355,13 +3355,7 @@ do_uefi_setup_env_vars() { export _SPEC_UEFI_ARCH="x64" fi fi - - if [[ "$(uname -m)" == "i686" ]]; then - export _EFI_MIXED="0" - export _UEFI_ARCH="IA32" - export _SPEC_UEFI_ARCH="ia32" - fi - + } do_uefi_common() {