The EFI shell is now packaged separately

diff --git a/efi-boot-update.spec b/efi-boot-update.spec
index 505ba152dac4751c40641d99b2bc0deac30a7415..add46fe706031ce9743962b571b370b700265c9e 100644 (file)
--- a/efi-boot-update.spec
+++ b/efi-boot-update.spec
@@ -8,15 +8,14 @@ License:      GPL v2
 Group:         Applications
 Source0:       %{name}
 Source1:       update.conf
 Group:         Applications
 Source0:       %{name}
 Source1:       update.conf

-Source2:       shellx64.conf
-Source3:       shellia32.conf
-Source4:       grub.conf
-Source5:       grub-installed.conf
+Source2:       grub.conf
+Source3:       grub-installed.conf

 Source10:      README
 Source11:      TODO
 URL:           http://www.pld-linux.org/
 BuildRequires: help2man
 Suggests:      efibootmgr
 Source10:      README
 Source11:      TODO
 URL:           http://www.pld-linux.org/
 BuildRequires: help2man
 Suggests:      efibootmgr

+Suggests:      efi-shell-x64

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir /sbin
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir /sbin


@@ -41,8 +40,7 @@ install -d $RPM_BUILD_ROOT{/lib/efi/{ia32,x64},%{_sbindir},%{_mandir}/man8}
 install %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/efi-boot
 install %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/efi-boot

-install %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
-                               $RPM_BUILD_ROOT/etc/efi-boot/update.d
+install %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/etc/efi-boot/update.d

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT

diff --git a/shellia32.conf b/shellia32.conf
deleted file mode 100644 (file)
index 49f4c9c..0000000
--- a/shellia32.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Configure a 32-bit EFI Shell as a boot option
-#
-# Note: most UEFI systems are 64-bit, so shellx64 is the right choice
-#
-# The shell can be obtained from: 
-#    https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/ShellBinPkg/UefiShell/Ia32/Shell.efi
-#
-# And should be manually placed at /boot/efi/EFI/SHELLX32.EFI
-#
-ENABLED=no
-LABEL="EFI Shell"
-BINARY=/EFI/SHELLX32.EFI

diff --git a/shellx64.conf b/shellx64.conf
deleted file mode 100644 (file)
index 00b7bfb..0000000
--- a/shellx64.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Configure an EFI Shell as a boot option
-#
-# The shell can be obtained from: 
-#    https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/ShellBinPkg/UefiShell/X64/Shell.efi
-#
-# And should be manually placed at /boot/efi/EFI/SHELLX64.EFI
-#
-ENABLED=yes
-LABEL="EFI Shell"
-BINARY=/EFI/SHELLX64.EFI