# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1526815556 -7200
# Node ID 42bc92a7487a0d894637ed0927a7970c6939123b
# Parent  35f0bc818f6a89c391ecbcce913327f414c0e07d
Clean efi/boot to build loram

diff -r 35f0bc818f6a -r 42bc92a7487a tazlito
--- a/tazlito	Fri May 18 11:51:11 2018 +0200
+++ b/tazlito	Sun May 20 13:25:56 2018 +0200
@@ -1258,6 +1258,20 @@
 }
 
 
+# Remove duplicated files in $1/efi/boot from $1/boot
+
+cleanup_efi_boot() {
+	for i in $1/efi/boot/* ; do
+		[ -f $i ] || continue
+		cmp $i ${i/\/efi\//\/} 2> /dev/null || continue
+		rm -f $i
+		case "$i" in
+		*vmlinuz*) sed -i '$d' $(dirname $i)/startup.nsh
+		esac
+	done
+}
+
+
 # Build initial rootfs for loram ISO ram/cdrom/http
 
 build_initfs() {
@@ -1561,6 +1575,7 @@
 build_loram_cdrom() {
 	build_initfs cdrom || return 1
 	cp -a $TMP_DIR/iso $TMP_DIR/loramiso
+	cleanup_efi_boot $TMP_DIR/loramiso
 	mkdir $TMP_DIR/loramiso/fs
 	cd $TMP_DIR/loramiso/fs
 	for i in $( ls ../boot/root* | sort -r ) ; do
@@ -1586,6 +1601,7 @@
 build_loram_http() {
 	build_initfs http || return 1
 	cp -a $TMP_DIR/iso $TMP_DIR/loramiso
+	cleanup_efi_boot $TMP_DIR/loramiso
 	rm -f $TMP_DIR/loramiso/boot/rootfs*
 	mv $TMP_DIR/initfs.gz $TMP_DIR/loramiso/boot/rootfs.gz
 	unmeta_boot
@@ -1636,6 +1652,7 @@
 	build_initfs ram || return 1
 	build_loram_rootfs    "$1"
 	cp -a $TMP_DIR/iso    $TMP_DIR/loramiso
+	cleanup_efi_boot      $TMP_DIR/loramiso
 	mv $TMP_DIR/initfs.gz $TMP_DIR/loramiso/boot/rootfs.gz
 	cp $TMP_DIR/rootfs*   $TMP_DIR/loramiso/boot
 	update_metaiso_sizes