wok-current rev 25694

Fix cifs-utils, up grub2-efi-x64 stuff for iso EFI
author Stanislas Leduc <shann@slitaz.org>
date Sat Mar 30 18:05:22 2024 +0000 (8 months ago)
parents bfd1d974e88e
children db14014acdba
files cifs-utils/receipt grub2-efi-x64/receipt grub2-efi-x64/stuff/grub-embed.cfg grub2-efi-x64/stuff/grub-live.cfg
line diff
     1.1 --- a/cifs-utils/receipt	Sun Mar 24 15:17:37 2024 +0000
     1.2 +++ b/cifs-utils/receipt	Sat Mar 30 18:05:22 2024 +0000
     1.3 @@ -28,6 +28,7 @@
     1.4  	autoreconf -i &&
     1.5  	./configure			\
     1.6  		--prefix=/usr		\
     1.7 +		--sbindir=/sbin		\
     1.8  		$CONFIGURE_ARGS &&
     1.9  	make &&
    1.10  	make DESTDIR=$DESTDIR install
    1.11 @@ -40,7 +41,7 @@
    1.12  	mkdir -p $fs/usr/sbin
    1.13  
    1.14  	cp -a $install/sbin		$fs
    1.15 -	cp -a $install/usr/bin/smbinfo	$fs/usr
    1.16 +	cp -a $install/usr/bin/smbinfo	$fs/usr/bin
    1.17  	ln -s ../../sbin/mount.cifs	$fs/usr/sbin/mount.cifs
    1.18  	ln $fs/usr/sbin/mount.cifs	$fs/usr/sbin/umount.cifs
    1.19  }
     2.1 --- a/grub2-efi-x64/receipt	Sun Mar 24 15:17:37 2024 +0000
     2.2 +++ b/grub2-efi-x64/receipt	Sat Mar 30 18:05:22 2024 +0000
     2.3 @@ -13,13 +13,12 @@
     2.4  WGET_URL="http://ftp.gnu.org/gnu/grub/$TARBALL"
     2.5  
     2.6  DEPENDS="freetype grep libdevmapper libusb libusb-compat ncurses zlib"
     2.7 -BUILD_DEPENDS="bison flex freetype-dev fuse2-dev libdevmapper-dev 
     2.8 -	libusb-compat-dev libusb-dev ncurses-dev 
     2.9 -	uclibc-cross-compiler-x86_64 xz-dev zlib-dev"
    2.10 +BUILD_DEPENDS="bison flex freetype-dev fuse2-dev libdevmapper-dev \
    2.11 +libusb-compat-dev libusb-dev ncurses-dev xz-dev zlib-dev"
    2.12  
    2.13  CONFIG_FILES="/etc/default/grub /etc/grub.d/40_custom"
    2.14  
    2.15 -AUFS_NOT_RAMFS="uclibc-cross-compiler-x86_64 is not compatible with aufs+tmpfs 8("
    2.16 +#AUFS_NOT_RAMFS="uclibc-cross-compiler-x86_64 is not compatible with aufs+tmpfs 8("
    2.17  
    2.18  # What is the latest version available today?
    2.19  current_version()
    2.20 @@ -51,19 +50,22 @@
    2.21  	sed -i 's|.*add fixup entry for R_X86_64_32|// &|' \
    2.22  		util/grub-mkimage*.c*
    2.23  
    2.24 -	./configure					\
    2.25 -		BUILD_CC=gcc				\
    2.26 -		CFLAGS="${CFLAGS/-march=i486/-g0}"	\
    2.27 -		TARGET_CC=uclibc-x86_64-gcc		\
    2.28 -		TARGET_OBJCOPY=uclibc-x86_64-objcopy	\
    2.29 -		TARGET_NM=uclibc-x86_64-nm		\
    2.30 -		TARGET_STRIP=uclibc-x86_64-strip	\
    2.31 -		TARGET_RANLIB='uclibc-x86_64-ranlib'	\
    2.32 -		--prefix=/usr				\
    2.33 -		--sysconfdir=/etc			\
    2.34 -		--with-platform=efi			\
    2.35 -		--target=${EFI_ARCH}			\
    2.36 -		--program-prefix=""			\
    2.37 +	# Use cross toolchain x86_64
    2.38 +	export PATH=$PATH:/cross/x86_64/tools/bin
    2.39 +
    2.40 +	./configure						\
    2.41 +		BUILD_CC=gcc					\
    2.42 +		CFLAGS="${CFLAGS/-march=i486/-g0}"		\
    2.43 +		TARGET_CC=x86_64-slitaz-linux-gcc		\
    2.44 +		TARGET_OBJCOPY=x86_64-slitaz-linux-objcopy	\
    2.45 +		TARGET_NM=x86_64-slitaz-linux-nm		\
    2.46 +		TARGET_STRIP=x86_64-slitaz-linux-strip		\
    2.47 +		TARGET_RANLIB='x86_64-slitaz-linux-ranlib'	\
    2.48 +		--prefix=/usr					\
    2.49 +		--sysconfdir=/etc				\
    2.50 +		--with-platform=efi				\
    2.51 +		--target=${EFI_ARCH}				\
    2.52 +		--program-prefix=""				\
    2.53  		--mandir=/usr/share/man $CONFIGURE_ARGS &&
    2.54  
    2.55  	sed -i 's| -Werror||;s|-Wl,--copy-dt-needed-entries||' \
    2.56 @@ -80,6 +82,17 @@
    2.57  		loadbios loadenv lvm minix minix2 reiserfs memrw mmap msdospart \
    2.58  		scsi loopback normal configfile gzio all_video efi_gop efi_uga \
    2.59  		gfxterm gettext echo boot chain
    2.60 +
    2.61 +	# Build grub bootloader for livecd
    2.62 +        ../grub-mkimage -d . -o ../bootx64-live.efi -O x86_64-efi -p /boot/grub \
    2.63 +                -c $stuff/grub-embed.cfg \
    2.64 +                lsefisystab lssal lsefimmap lsacpi ls \
    2.65 +                ntfs hfs appleldr boot cat efi_gop efi_uga elf fat hfsplus \
    2.66 +                iso9660 linux keylayouts memdisk minicmd part_apple ext2 extcmd \
    2.67 +                xfs xnu part_bsd part_gpt search search_fs_file chain btrfs \
    2.68 +                loadbios loadenv lvm minix minix2 reiserfs memrw mmap msdospart \
    2.69 +                scsi loopback normal configfile gzio all_video efi_gop efi_uga \
    2.70 +                gfxterm gettext echo boot chain
    2.71  }
    2.72  
    2.73  # Rules to gen a SliTaz package suitable for Tazpkg.
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/grub2-efi-x64/stuff/grub-embed.cfg	Sat Mar 30 18:05:22 2024 +0000
     3.3 @@ -0,0 +1,9 @@
     3.4 +if ! [ -d "$cmdpath" ]; then
     3.5 +    # On some firmware, GRUB has a wrong cmdpath when booted from an optical disc.
     3.6 +    # https://gitlab.archlinux.org/archlinux/archiso/-/issues/183
     3.7 +    if regexp --set=1:isodevice '^(\([^)]+\))\/?[Ee][Ff][Ii]\/[Bb][Oo][Oo][Tt]\/?$' "$cmdpath"; then
     3.8 +        cmdpath="${isodevice}/EFI/BOOT"
     3.9 +    fi
    3.10 +fi
    3.11 +
    3.12 +configfile "${cmdpath}/grub.cfg"
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/grub2-efi-x64/stuff/grub-live.cfg	Sat Mar 30 18:05:22 2024 +0000
     4.3 @@ -0,0 +1,9 @@
     4.4 +set timeout=5
     4.5 +set delay=5
     4.6 +
     4.7 +menuentry "SliTaz" {
     4.8 +	echo 'Loading Linux ...'
     4.9 +	linux /EFI/BOOT/vmlinuz rw root=/dev/null video=-32 autologin
    4.10 +	echo 'Loading initrd ...'
    4.11 +	initrd /EFI/BOOT/rootfs.gz
    4.12 +}