wok rev 20334

Do not use efi shell (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Jun 02 16:13:06 2018 +0200 (17 months ago)
parents 99a7a1e955d4
children 778f9dcc153c
files linux/stuff/linux-efi.u syslinux/stuff/tools/isohybrid.sh tazlito/receipt
line diff
     1.1 --- a/linux/stuff/linux-efi.u	Sat Jun 02 13:53:27 2018 +0200
     1.2 +++ b/linux/stuff/linux-efi.u	Sat Jun 02 16:13:06 2018 +0200
     1.3 @@ -103,20 +103,9 @@
     1.4   		if (status != EFI_SUCCESS)
     1.5   			goto close_handles;
     1.6   
     1.7 -@@ -433,8 +500,6 @@
     1.8 - 	}
     1.9 +@@ -456,28 +523,11 @@
    1.10   
    1.11 - 	if (file_size_total) {
    1.12 --		unsigned long addr;
    1.13 --
    1.14 - 		/*
    1.15 - 		 * Multiple files need to be at consecutive addresses in memory,
    1.16 - 		 * so allocate enough memory for all the files.  This is used
    1.17 -@@ -454,30 +519,10 @@
    1.18 - 			goto free_file_total;
    1.19 - 		}
    1.20 - 
    1.21 --		addr = file_addr;
    1.22 + 		addr = file_addr;
    1.23   		for (j = 0; j < nr_files; j++) {
    1.24  -			unsigned long size;
    1.25  -
    1.26 @@ -140,13 +129,15 @@
    1.27  -			}
    1.28  -
    1.29  -			efi_file_close(files[j].handle);
    1.30 -+			status = read_efi_file(sys_table_arg, &files[j], file_addr, files[j].size);
    1.31 ++			status = read_efi_file(sys_table_arg, &files[j], addr, files[j].size);
    1.32  +			if (status != EFI_SUCCESS)
    1.33  +				goto free_file_total;
    1.34 ++			addr += files[j].size + 3;
    1.35 ++			addr &= 0xFFFFFFFCUL;
    1.36   		}
    1.37   
    1.38   	}
    1.39 -@@ -649,6 +694,30 @@
    1.40 +@@ -649,6 +699,30 @@
    1.41   	}
    1.42   
    1.43   	if (!options_chars) {
    1.44 @@ -177,7 +168,7 @@
    1.45   		/* No command line options, so return empty string*/
    1.46   		options = &zero;
    1.47   	}
    1.48 -@@ -665,6 +734,7 @@
    1.49 +@@ -665,6 +739,7 @@
    1.50   	s1 = efi_utf16_to_utf8(s1, s2, options_chars);
    1.51   	*s1 = '\0';
    1.52   
     2.1 --- a/syslinux/stuff/tools/isohybrid.sh	Sat Jun 02 13:53:27 2018 +0200
     2.2 +++ b/syslinux/stuff/tools/isohybrid.sh	Sat Jun 02 16:13:06 2018 +0200
     2.3 @@ -187,16 +187,17 @@
     2.4  	store32 440 $id
     2.5  	store32 508 0xAA550000
     2.6  	e=$(( ((${entry:-1} -1) % 4) *16 +446))
     2.7 -	store32 $e 0x10080
     2.8  	esect=$(( ($sectors + ((($cylinders -1) & 0x300) >>2)) <<16))
     2.9  	ecyl=$(( (($cylinders -1) & 0xff) <<24))
    2.10  	epart=$(((($heads - 1) <<8) +$esect +$ecyl))
    2.11 -	store32 $(($e + 4)) $(($partype + $epart))
    2.12 -	store32 $(($e + 8)) $offset
    2.13  	sectorcount=$(($cylinders * $heads * $sectors))
    2.14 -	store32 $(($e + 12)) $sectorcount
    2.15 -	if [ -n "$efi_ofs" ]; then
    2.16 -		lastlba=$(($sectorcount -1))
    2.17 +	lastlba=$(($sectorcount -1))
    2.18 +	if [ -z "$efi_ofs" ]; then
    2.19 +		store32 $e 0x10080
    2.20 +		store32 $(($e + 4)) $(($partype + $epart))
    2.21 +		store32 $(($e + 8)) $offset
    2.22 +		store32 $(($e + 12)) $sectorcount
    2.23 +	else
    2.24  		[ $(read16 0 1024) -eq 35615 -a $(read16 11 0) -ne 35615 ] &&
    2.25  		ddq bs=512 conv=notrunc skip=2 seek=44 count=20 if=$iso of=$iso
    2.26  		store32 $((446)) $((0x10000))
    2.27 @@ -244,8 +245,8 @@
    2.28  	abort "invalid boot catalog."
    2.29  efi_ofs=
    2.30  if [ $(read8 $cat 65) -eq 239 ]; then
    2.31 -	[ ${entry:-2} != 2 ] && echo "$iso: efi boot ignore --entry $entry"
    2.32 -	entry=2
    2.33 +	[ ${entry:-1} != 1 ] && echo "$iso: efi boot ignore --entry $entry"
    2.34 +	entry=1
    2.35  	partype=0
    2.36  	efi_ofs=$((4*$(read32 $cat 104)))
    2.37  	efi_len=$(($(read16 $(($efi_ofs/4)) 19)))
     3.1 --- a/tazlito/receipt	Sat Jun 02 13:53:27 2018 +0200
     3.2 +++ b/tazlito/receipt	Sat Jun 02 16:13:06 2018 +0200
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="tazlito"
     3.7 -VERSION="504"
     3.8 +VERSION="507"
     3.9  CATEGORY="base-system"
    3.10  SHORT_DESC="SliTaz Live Tool."
    3.11  MAINTAINER="pascal.bellard@slitaz.org"