Try even harder to get the concatenation and quoting right for GRUB_MODULES

Oy.  It looks right in rpmspec -P anyway...

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-06-19 12:08:17 -04:00
parent 257c8083c6
commit 499c3e9702

View file

@ -84,9 +84,9 @@
### fixme
%global efi_modules_base http lsefimmap
%ifarch aarch64 %{arm}
%global efi_modules "%{efi_modules_base} linux "
%global efi_modules %{efi_modules_base} linux
%else
%global efi_modules "%{efi_modules_base} backtrace linuxefi usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug "
%global efi_modules %{efi_modules_base} backtrace linuxefi usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug
%endif
%ifarch aarch64
@ -349,7 +349,7 @@ GRUB_MODULES=" all_video boot blscfg btrfs \\\
search search_fs_uuid search_fs_file \\\
search_label serial sleep syslinuxcfg test tftp \\\
video xfs" \
GRUB_MODULES+=" %{efi_modules}" \
GRUB_MODULES+=" %{efi_modules} " \
%{expand:%%{mkimage %{1} %{2} %{3} %{4}}} \
%{nil}