Refactored UEFI boot files and removed pregenerated efiboot.img files

This needs the corresponding change to draklive to automatically
generate the efiboot.img files.

21 files changed, 9 insertions, 42 deletions

diff --git a/config/live.cfg b/config/live.cfg
index fbad02e..5a0331c 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -306,14 +306,15 @@ my $_l = {
                 pre => [ 'for i in seq 1 5; do showlabels --removable | grep ' . build_one_label($live) . '; if [ $? -eq 0 ]; then break; fi; sleep 1; done' ],
                 extra_modules => [ qw(vfat sd_mod usb_storage uhci_hcd ohci_hcd ehci_hcd xhci_hcd) ],
                 files => [
-            		 if_($live->{settings}{arch} eq 'x86_64',
-            		    if_($live->{settings}{desktop} eq 'KDE4',
-            			[ 'files/UEFI/KDE4/*', '' ],
-            		    ),
-            		    if_($live->{settings}{desktop} eq 'GNOME',
-            			[ 'files/UEFI/GNOME/*', '' ],
-            		    ),
-            		 ),
+			 if_($live->{settings}{arch} eq 'x86_64',
+			    [ 'files/UEFI/EFI', '' ],
+			    if_($live->{settings}{desktop} eq 'KDE4',
+				[ 'files/UEFI/KDE4/grub.cfg', 'EFI/BOOT/' ],
+			    ),
+			    if_($live->{settings}{desktop} eq 'GNOME',
+				[ 'files/UEFI/GNOME/grub.cfg', 'EFI/BOOT/' ],
+			    ),
+			 ),
 			    # FIXME: add doc and autorun
 			    #[ 'extra/livecd/autorun/*', ''],
 			    #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) 
diff --git a/files/UEFI/GNOME/EFI/BOOT/bootx64.efi b/files/UEFI/EFI/BOOT/bootx64.efi
index bb2352c..bb2352c 100644
--- a/files/UEFI/GNOME/EFI/BOOT/bootx64.efi
+++ b/files/UEFI/EFI/BOOT/bootx64.efi
diff --git a/files/UEFI/GNOME/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/EFI/BOOT/fonts/unicode.pf2
index 57b682a..57b682a 100755
--- a/files/UEFI/GNOME/EFI/BOOT/fonts/unicode.pf2
+++ b/files/UEFI/EFI/BOOT/fonts/unicode.pf2
diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png b/files/UEFI/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png
index 6bdaa67..6bdaa67 100755
--- a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png
+++ b/files/UEFI/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png
diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
index 442e338..442e338 100755
--- a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
+++ b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
index 4a435f7..4a435f7 100755
--- a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
+++ b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
index dee5391..dee5391 100755
--- a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
+++ b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
index f12fa75..f12fa75 100755
--- a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
+++ b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/EFI/BOOT/themes/maggy/theme.txt
index a23dffd..a23dffd 100755
--- a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt
+++ b/files/UEFI/EFI/BOOT/themes/maggy/theme.txt
diff --git a/files/UEFI/GNOME/boot/efiboot.img b/files/UEFI/GNOME/boot/efiboot.img
deleted file mode 100644
index abcf3d1..0000000
--- a/files/UEFI/GNOME/boot/efiboot.img
+++ /dev/null
diff --git a/files/UEFI/GNOME/EFI/BOOT/grub.cfg b/files/UEFI/GNOME/grub.cfg
index e3d4dbb..e3d4dbb 100644
--- a/files/UEFI/GNOME/EFI/BOOT/grub.cfg
+++ b/files/UEFI/GNOME/grub.cfg
diff --git a/files/UEFI/KDE4/EFI/BOOT/bootx64.efi b/files/UEFI/KDE4/EFI/BOOT/bootx64.efi
deleted file mode 100644
index bb2352c..0000000
--- a/files/UEFI/KDE4/EFI/BOOT/bootx64.efi
+++ /dev/null
diff --git a/files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2
deleted file mode 100755
index 57b682a..0000000
--- a/files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2
+++ /dev/null
diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png
deleted file mode 100755
index 6bdaa67..0000000
--- a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png
+++ /dev/null
diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
deleted file mode 100755
index 442e338..0000000
--- a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
+++ /dev/null
diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
deleted file mode 100755
index 4a435f7..0000000
--- a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
+++ /dev/null
diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
deleted file mode 100755
index dee5391..0000000
--- a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
+++ /dev/null
diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
deleted file mode 100755
index f12fa75..0000000
--- a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
+++ /dev/null
diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt
deleted file mode 100755
index a23dffd..0000000
--- a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# GRUB gfxmenu theme "maggy".
-
-title-text: "Mageia 5.1 UEFI"
-title-font: "MageiaLogo Bold 28"
-title-color: "white"
-
-desktop-image: "Mageia5-grub2-1024x768.png"
-terminal-font: "Unknown Regular 16"
-
-+ boot_menu {
-   left = 15%
-   top = 15%
-   width = 70%
-   height = 55%
-   item_font = "MageiaLogo Regular 20"
-   selected_item_font = "MageiaLogo Bold 20"
-   color_normal="black/black"
-   item_color = "#2397d4"
-   selected_item_color = "white"
-   item_height = 24
-   item_spacing = 10
-}
-
-+ progress_bar
-{
-   id = "__timeout__"
-   left = 15%
-   top = 65%
-   width = 70%
-   height = 1%
-   fg_color = "lightskyblue"
-   bg_color = "dodgerblue"
-   border_color = "midnightblue"
-}
diff --git a/files/UEFI/KDE4/boot/efiboot.img b/files/UEFI/KDE4/boot/efiboot.img
deleted file mode 100644
index cb5a4fb..0000000
--- a/files/UEFI/KDE4/boot/efiboot.img
+++ /dev/null
diff --git a/files/UEFI/KDE4/EFI/BOOT/grub.cfg b/files/UEFI/KDE4/grub.cfg
index cf9ae2e..cf9ae2e 100644
--- a/files/UEFI/KDE4/EFI/BOOT/grub.cfg
+++ b/files/UEFI/KDE4/grub.cfg