From 4ccd8ebc9a81dc3f38e2a81b044788b9f1e6dd6e Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 12 Sep 2018 21:19:38 +0000 Subject: Wed Sep 12 21:19:38 UTC 2018 a/elilo-3.16-x86_64-8.txz: Rebuilt. eliloconfig: this was occasionally failing and the issue was traced to the script's use of tr (not sure why still). Replaced the construct with sed and the issue seems to have gone away. a/openssl-solibs-1.1.1-x86_64-1.txz: Upgraded. d/binutils-2.31.1-x86_64-3.txz: Rebuilt. Do not install the Windows-specific tools. Not only are these useless on Linux, but the presence of windres fools freetype into thinking that it is on a Windows system, leading to a build failure. d/git-2.19.0-x86_64-1.txz: Upgraded. l/freetype-2.9.1-x86_64-1.txz: Upgraded. l/harfbuzz-1.9.0-x86_64-1.txz: Upgraded. l/media-player-info-24-noarch-1.txz: Upgraded. l/pcre2-10.32-x86_64-1.txz: Upgraded. l/sg3_utils-1.43-x86_64-1.txz: Upgraded. n/openssl-1.1.1-x86_64-1.txz: Upgraded. x/fontconfig-2.13.1-x86_64-1.txz: Upgraded. We had problem reports with fontconfig-2.13.0 which led to it being reverted but we'll try it again. Please let me know if the issues (with Wine iirc) persist. x/libinput-1.12.0-x86_64-1.txz: Upgraded. --- source/a/elilo/eliloconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/a/elilo/eliloconfig') diff --git a/source/a/elilo/eliloconfig b/source/a/elilo/eliloconfig index c31d137e..43616d56 100644 --- a/source/a/elilo/eliloconfig +++ b/source/a/elilo/eliloconfig @@ -91,11 +91,11 @@ PARTLEN=9 if mount | grep vfat | grep -wq /boot/efi ; then mount | grep vfat | grep -w /boot/efi | grep -q -e nvme -e mmcblk && DEVLEN=12 && PARTLEN=14 EFI_DEVICE=$(mount | grep vfat | grep -w /boot/efi | cut -b 1-${DEVLEN}) - EFI_PARTITION=$(mount | grep vfat | grep -w /boot/efi | cut -f 1 -d ' ' | cut -b ${PARTLEN}- | tr -d [a-z]) + EFI_PARTITION=$(mount | grep vfat | grep -w /boot/efi | cut -f 1 -d ' ' | cut -b ${PARTLEN}- | sed 's/[^0-9]*//g') else mount | grep vfat | grep -w $T_PX/boot/efi | grep -q -e nvme -e mmcblk && DEVLEN=12 && PARTLEN=14 EFI_DEVICE=$(mount | grep vfat | grep -w $T_PX/boot/efi | cut -b 1-${DEVLEN}) - EFI_PARTITION=$(mount | grep vfat | grep -w $T_PX/boot/efi | cut -f 1 -d ' ' | cut -b ${PARTLEN}- | tr -d [a-z]) + EFI_PARTITION=$(mount | grep vfat | grep -w $T_PX/boot/efi | cut -f 1 -d ' ' | cut -b ${PARTLEN}- | sed 's/[^0-9]*//g') fi # There better be a kernel: -- cgit v1.2.3