# HG changeset patch
# User Stanislas Leduc <shann@slitaz.org>
# Date 1712233852 0
# Node ID ab0fd296633e71b5164d182b0f39ceb30facaf01
# Parent  db14014acdba9a73f58ba21200286e2a52505a08
Update tazlito to use grub2-efi-x64 for EFI boot

diff -r db14014acdba -r ab0fd296633e grub2-efi-x64/stuff/grub-live.cfg
--- a/grub2-efi-x64/stuff/grub-live.cfg	Thu Apr 04 08:53:51 2024 +0000
+++ b/grub2-efi-x64/stuff/grub-live.cfg	Thu Apr 04 12:30:52 2024 +0000
@@ -1,7 +1,7 @@
 set timeout=5
 set delay=5
 
-menuentry "SliTaz" {
+menuentry "SliTaz Live [EFI]" {
 	echo 'Loading Linux ...'
 	linux /EFI/BOOT/vmlinuz rw root=/dev/null video=-32 autologin
 	echo 'Loading initrd ...'
diff -r db14014acdba -r ab0fd296633e tazlito/receipt
--- a/tazlito/receipt	Thu Apr 04 08:53:51 2024 +0000
+++ b/tazlito/receipt	Thu Apr 04 12:30:52 2024 +0000
@@ -33,6 +33,9 @@
 	# Fix mount iso image bug
 	patch -p1 < $stuff/fix-mountiso.patch
 
+	# Patch for support efi livecd
+	patch -p1 < $stuff/support-efi.patch
+
 	sed -i "s/^VERSION=.*/VERSION=$VERSION/" tazlito
 	make DESTDIR=$DESTDIR VERSION=$VERSION install
 }
diff -r db14014acdba -r ab0fd296633e tazlito/stuff/support-efi.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tazlito/stuff/support-efi.patch	Thu Apr 04 12:30:52 2024 +0000
@@ -0,0 +1,39 @@
+---a/tazlito
++++ b/tazlito
+@@ -509,21 +509,18 @@
+ 		if [ ! -s $basedir/EFI/boot/$efifile ] &&
+ 		   [ $(get $((0x82)) "$1") = $((0x4550)) ]; then
+ 			mkdir -p $basedir/EFI/boot 2> /dev/null
+-			ln "$1" "$basedir/EFI/boot/$efifile"
++			ln "$1" "$basedir/EFI/boot/vmlinuz"
++			## Add grub bootloader stuff
++			for i in "source/grub2-efi-x64-2.04/bootx64-live.efi,$efifile" "stuff/grub-live.cfg,grub.cfg"; do
++				ln "/home/slitaz/wok/grub2-efi-x64/${i%,*}" "$basedir/EFI/boot/${i#*,}" &&
++					stat -c "%s %n" "/home/slitaz/wok/grub2-efi-x64/${i%,*}"
++			done 2> /dev/null	
+ 			stat -c "%s %n" "$1"
+ 			for i in $basedir/boot/rootfs* ; do
+ 				ln "$i" $basedir/EFI/boot/ &&
+ 				stat -c "%s %n" "$i"
+ 			done 2> /dev/null
+-			if [ ! -s $basedir/EFI/boot/linux.cmdline ]; then
+-				sed 's|/|\\|g' > $basedir/EFI/boot/linux.cmdline <<EOT
+-rw root=0x100$(sed '/bzImage/!d;s|.*root=[^ ]*||;q' $basedir/boot/isolinux/isolinux.cfg)\
+-$( ( cd $basedir/EFI/boot ; ls -r rootfs*gz ) | while read f ; do \
+-echo -n " initrd=/EFI/boot/$f";done)
+-EOT
+-				stat -c "%s %n" $basedir/EFI/boot/linux.cmdline
+ 			fi
+-		fi
+ 		shift
+ 	done; } | sort | uniq | awk '{ n+=int(($1+2047)/2048) } END { print n }')
+ 	[ ${fclust:-0} -eq 0 ] && return
+@@ -666,7 +663,7 @@
+ 	deduplicate
+ 	sed -i "s|20[1-9][0-9]|$(date +%Y)|" $2/README $2/index.html
+ 
+-	[ $(ls $2/boot/grub* 2> /dev/null | wc -l) -lt 2 ] && rm -rf $2/boot/grub*
++#	[ $(ls $2/boot/grub* 2> /dev/null | wc -l) -lt 2 ] && rm -rf $2/boot/grub*
+ 	make_bzImage_hardlink $2/boot
+ 	alloc_uefi_part $(ls -r $2/boot/vmlinuz*slitaz*)
+