From f042759967a33892dc3e2f2328b0e4b878bfb5e6 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Thu, 13 Oct 2016 21:37:58 +0200
Subject: [PATCH] data: rm efiboot; packages in manjaro-efi-shell

---
 Makefile                   | 9 ---------
 data/efiboot/loader.conf   | 2 --
 data/efiboot/miso-dvd.conf | 5 -----
 data/efiboot/miso-usb.conf | 5 -----
 4 files changed, 21 deletions(-)
 delete mode 100644 data/efiboot/loader.conf
 delete mode 100755 data/efiboot/miso-dvd.conf
 delete mode 100644 data/efiboot/miso-usb.conf

diff --git a/Makefile b/Makefile
index 02de79e..20f41e3 100644
--- a/Makefile
+++ b/Makefile
@@ -78,11 +78,6 @@ SHARED_ISO = \
 	data/pacman-mhwd.conf \
 	data/profile.conf.example
 
-EFI_ISO = \
-	data/efiboot/loader.conf \
-	data/efiboot/miso-dvd.conf \
-	data/efiboot/miso-usb.conf
-
 CPIOHOOKS = \
 	initcpio/hooks/miso \
 	initcpio/hooks/miso_aufs \
@@ -203,9 +198,6 @@ install_iso:
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools
 	install -m0644 ${SHARED_ISO} $(DESTDIR)$(PREFIX)/share/manjaro-tools
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools/efiboot
-	install -m0644 ${EFI_ISO} $(DESTDIR)$(PREFIX)/share/manjaro-tools/efiboot
-
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/man/man1
 	gzip -c man/buildiso.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildiso.1.gz
 	gzip -c man/deployiso.1 > $(DESTDIR)$(PREFIX)/share/man/man1/deployiso.1.gz
@@ -247,7 +239,6 @@ uninstall_iso:
 	for f in ${LIST_ISO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.list.d/$$f; done
 	for f in ${BIN_ISO}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
 	for f in ${SHARED_ISO}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/$$f; done
-	for f in ${EFI_ISO}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/efiboot/$$f; done
 
 	for f in ${LIBS_ISO}; do rm -f $(DESTDIR)$(PREFIX)/lib/manjaro-tools/$$f; done
 	for f in ${CPIOHOOKS}; do rm -f $(DESTDIR)$(PREFIX)/lib/initcpio/hooks/$$f; done
diff --git a/data/efiboot/loader.conf b/data/efiboot/loader.conf
deleted file mode 100644
index 41ddb4e..0000000
--- a/data/efiboot/loader.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-timeout 3
-default @ISO_NAME@-x86_64
diff --git a/data/efiboot/miso-dvd.conf b/data/efiboot/miso-dvd.conf
deleted file mode 100755
index 8e988f7..0000000
--- a/data/efiboot/miso-dvd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-title   @DIST_NAME@ Linux x86_64 UEFI DVD (@DRV@)
-linux   /EFI/miso/vmlinuz.efi
-initrd  /EFI/miso/intel_ucode.img
-initrd  /EFI/miso/initramfs.img
-options misobasedir=@ISO_NAME@ misolabel=@ISO_LABEL@ nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=@DRV@ nonfree=@SWITCH@ @BOOT_ARGS@
diff --git a/data/efiboot/miso-usb.conf b/data/efiboot/miso-usb.conf
deleted file mode 100644
index b02fc8e..0000000
--- a/data/efiboot/miso-usb.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-title   @DIST_NAME@ Linux x86_64 UEFI USB (@DRV@)
-linux   /@ISO_NAME@/boot/x86_64/vmlinuz
-initrd  /@ISO_NAME@/boot/intel_ucode.img
-initrd  /@ISO_NAME@/boot/x86_64/initramfs.img
-options misobasedir=@ISO_NAME@ misolabel=@ISO_LABEL@ nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=@DRV@ nonfree=@SWITCH@ @BOOT_ARGS@