diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2019-10-28 09:41:15 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2019-10-28 14:12:24 +0200 |
| commit | 601171a9bc7ca6e4acb932895a07c0ca9aedfdac (patch) | |
| tree | b94c0210070e1ee3c121471ab744bd6e2bff90ca /gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch | |
| parent | e927823c06f86aee5eb15369ae063257c743bde2 (diff) | |
| download | guix-601171a9bc7ca6e4acb932895a07c0ca9aedfdac.tar guix-601171a9bc7ca6e4acb932895a07c0ca9aedfdac.tar.gz | |
gnu: xorriso: Update to 1.5.2.
* gnu/packages/cdrom.scm (xorriso): Update to 1.5.2.
[source]: Remove patches.
* gnu/packages/patches/xorriso-no-partition-table-in-inner-efi.patch,
* gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch')
| -rw-r--r-- | gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch b/gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch deleted file mode 100644 index a43889d2c6..0000000000 --- a/gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://dev.lovelyhq.com/libburnia/libisoburn/commit/1eb51f44dadb8b6c5f87533ca357186cdc1ac625 -diff --git a/frontend/grub-mkrescue-sed.sh b/frontend/grub-mkrescue-sed.sh -index b3948c99..dcd9d696 100755 ---- a/frontend/grub-mkrescue-sed.sh -+++ b/frontend/grub-mkrescue-sed.sh -@@ -120,6 +120,7 @@ fi - # "yes" overwrites the MBR partition table area in the EFI boot image by zeros. - # Some EFI implementations get stuck when seeing in the EFI partition a - # partition table entry which begins at LBA 0. -+# "extra" not only zeros the partition table but also the MBR signature. - efi_zero_inner_pt=no - if test -n "$MKRESCUE_SED_IN_EFI_NO_PT" - then -@@ -192,24 +193,31 @@ then - find "$dir" - fi - --if test "$efi_zero_inner_pt" = yes -+if test "$efi_zero_inner_pt" = yes -o "$efi_zero_inner_pt" = extra - then - did_dd=0 - if test -e "$dir"/efi.img - then -+ # Look for 0x55 0xAA in bytes 510 and 511 - magic=$(dd bs=1 skip=510 count=2 if="$dir"/efi.img 2>/dev/null | \ - od -c | head -1 | awk '{print $2 " " $3}') - if test "$magic" = "U 252" - then -+ echo "Performing actions for MKRESCUE_SED_IN_EFI_NO_PT=$efi_zero_inner_pt" >&2 - dd if=/dev/zero bs=1 seek=446 count=64 conv=notrunc of="$dir"/efi.img - did_dd=1 -+ if test "$efi_zero_inner_pt" = extra -+ then -+ dd if=/dev/zero bs=1 seek=510 count=2 conv=notrunc of="$dir"/efi.img -+ fi -+ echo >&2 - fi - fi - if test "$did_dd" = 0 - then - echo >&2 - echo "$0 : NOTE : No EFI image found or no MBR signature in it." >&2 -- echo "$0 : NOTE : Will not obey MKRESCUE_SED_IN_EFI_NO_PT=yes" >&2 -+ echo "$0 : NOTE : Will not obey MKRESCUE_SED_IN_EFI_NO_PT=$efi_zero_inner_pt" >&2 - echo >&2 - fi - fi |