# HG changeset patch
# User Stanislas Leduc <shann@slitaz.org>
# Date 1711821922 0
# Node ID c6a7d1307ceb8bb12cc3e9bbd1229c06b7d99f95
# Parent  bfd1d974e88ec47413ef04c658d5159a629858dc
Fix cifs-utils, up grub2-efi-x64 stuff for iso EFI

diff -r bfd1d974e88e -r c6a7d1307ceb cifs-utils/receipt
--- a/cifs-utils/receipt	Sun Mar 24 15:17:37 2024 +0000
+++ b/cifs-utils/receipt	Sat Mar 30 18:05:22 2024 +0000
@@ -28,6 +28,7 @@
 	autoreconf -i &&
 	./configure			\
 		--prefix=/usr		\
+		--sbindir=/sbin		\
 		$CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install
@@ -40,7 +41,7 @@
 	mkdir -p $fs/usr/sbin
 
 	cp -a $install/sbin		$fs
-	cp -a $install/usr/bin/smbinfo	$fs/usr
+	cp -a $install/usr/bin/smbinfo	$fs/usr/bin
 	ln -s ../../sbin/mount.cifs	$fs/usr/sbin/mount.cifs
 	ln $fs/usr/sbin/mount.cifs	$fs/usr/sbin/umount.cifs
 }
diff -r bfd1d974e88e -r c6a7d1307ceb grub2-efi-x64/receipt
--- a/grub2-efi-x64/receipt	Sun Mar 24 15:17:37 2024 +0000
+++ b/grub2-efi-x64/receipt	Sat Mar 30 18:05:22 2024 +0000
@@ -13,13 +13,12 @@
 WGET_URL="http://ftp.gnu.org/gnu/grub/$TARBALL"
 
 DEPENDS="freetype grep libdevmapper libusb libusb-compat ncurses zlib"
-BUILD_DEPENDS="bison flex freetype-dev fuse2-dev libdevmapper-dev 
-	libusb-compat-dev libusb-dev ncurses-dev 
-	uclibc-cross-compiler-x86_64 xz-dev zlib-dev"
+BUILD_DEPENDS="bison flex freetype-dev fuse2-dev libdevmapper-dev \
+libusb-compat-dev libusb-dev ncurses-dev xz-dev zlib-dev"
 
 CONFIG_FILES="/etc/default/grub /etc/grub.d/40_custom"
 
-AUFS_NOT_RAMFS="uclibc-cross-compiler-x86_64 is not compatible with aufs+tmpfs 8("
+#AUFS_NOT_RAMFS="uclibc-cross-compiler-x86_64 is not compatible with aufs+tmpfs 8("
 
 # What is the latest version available today?
 current_version()
@@ -51,19 +50,22 @@
 	sed -i 's|.*add fixup entry for R_X86_64_32|// &|' \
 		util/grub-mkimage*.c*
 
-	./configure					\
-		BUILD_CC=gcc				\
-		CFLAGS="${CFLAGS/-march=i486/-g0}"	\
-		TARGET_CC=uclibc-x86_64-gcc		\
-		TARGET_OBJCOPY=uclibc-x86_64-objcopy	\
-		TARGET_NM=uclibc-x86_64-nm		\
-		TARGET_STRIP=uclibc-x86_64-strip	\
-		TARGET_RANLIB='uclibc-x86_64-ranlib'	\
-		--prefix=/usr				\
-		--sysconfdir=/etc			\
-		--with-platform=efi			\
-		--target=${EFI_ARCH}			\
-		--program-prefix=""			\
+	# Use cross toolchain x86_64
+	export PATH=$PATH:/cross/x86_64/tools/bin
+
+	./configure						\
+		BUILD_CC=gcc					\
+		CFLAGS="${CFLAGS/-march=i486/-g0}"		\
+		TARGET_CC=x86_64-slitaz-linux-gcc		\
+		TARGET_OBJCOPY=x86_64-slitaz-linux-objcopy	\
+		TARGET_NM=x86_64-slitaz-linux-nm		\
+		TARGET_STRIP=x86_64-slitaz-linux-strip		\
+		TARGET_RANLIB='x86_64-slitaz-linux-ranlib'	\
+		--prefix=/usr					\
+		--sysconfdir=/etc				\
+		--with-platform=efi				\
+		--target=${EFI_ARCH}				\
+		--program-prefix=""				\
 		--mandir=/usr/share/man $CONFIGURE_ARGS &&
 
 	sed -i 's| -Werror||;s|-Wl,--copy-dt-needed-entries||' \
@@ -80,6 +82,17 @@
 		loadbios loadenv lvm minix minix2 reiserfs memrw mmap msdospart \
 		scsi loopback normal configfile gzio all_video efi_gop efi_uga \
 		gfxterm gettext echo boot chain
+
+	# Build grub bootloader for livecd
+        ../grub-mkimage -d . -o ../bootx64-live.efi -O x86_64-efi -p /boot/grub \
+                -c $stuff/grub-embed.cfg \
+                lsefisystab lssal lsefimmap lsacpi ls \
+                ntfs hfs appleldr boot cat efi_gop efi_uga elf fat hfsplus \
+                iso9660 linux keylayouts memdisk minicmd part_apple ext2 extcmd \
+                xfs xnu part_bsd part_gpt search search_fs_file chain btrfs \
+                loadbios loadenv lvm minix minix2 reiserfs memrw mmap msdospart \
+                scsi loopback normal configfile gzio all_video efi_gop efi_uga \
+                gfxterm gettext echo boot chain
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r bfd1d974e88e -r c6a7d1307ceb grub2-efi-x64/stuff/grub-embed.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/grub2-efi-x64/stuff/grub-embed.cfg	Sat Mar 30 18:05:22 2024 +0000
@@ -0,0 +1,9 @@
+if ! [ -d "$cmdpath" ]; then
+    # On some firmware, GRUB has a wrong cmdpath when booted from an optical disc.
+    # https://gitlab.archlinux.org/archlinux/archiso/-/issues/183
+    if regexp --set=1:isodevice '^(\([^)]+\))\/?[Ee][Ff][Ii]\/[Bb][Oo][Oo][Tt]\/?$' "$cmdpath"; then
+        cmdpath="${isodevice}/EFI/BOOT"
+    fi
+fi
+
+configfile "${cmdpath}/grub.cfg"
diff -r bfd1d974e88e -r c6a7d1307ceb grub2-efi-x64/stuff/grub-live.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/grub2-efi-x64/stuff/grub-live.cfg	Sat Mar 30 18:05:22 2024 +0000
@@ -0,0 +1,9 @@
+set timeout=5
+set delay=5
+
+menuentry "SliTaz" {
+	echo 'Loading Linux ...'
+	linux /EFI/BOOT/vmlinuz rw root=/dev/null video=-32 autologin
+	echo 'Loading initrd ...'
+	initrd /EFI/BOOT/rootfs.gz
+}