# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1475149638 -7200
# Node ID 73cdd2cf47c472f52d3b2dc71ff506b4cf4d8a0b
# Parent  013013d658160958aec1128c0888ceba783b330c
cdrkit: add efi boot support

diff -r 013013d65816 -r 73cdd2cf47c4 cdrkit/receipt
--- a/cdrkit/receipt	Mon Sep 26 14:50:44 2016 +0200
+++ b/cdrkit/receipt	Thu Sep 29 13:47:18 2016 +0200
@@ -9,6 +9,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.cdrkit.org/"
 WGET_URL="http://cdrkit.org/releases/$TARBALL"
+EXTRA_SOURCE_FILES="cdrkit-1.1.9-efi-boot.patch"
 
 DEPENDS="libcap zlib bzlib attr"
 BUILD_DEPENDS="cmake libcap-dev zlib-dev bzip2-dev attr-dev"
@@ -16,12 +17,11 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	sed -i -e '/USE_MAGIC/d' -e '/(MAGICLIBS magic)/d' \
 		genisoimage/CMakeLists.txt
-	#patch -p1 < $stuff/$PACKAGE-1.1.9-glibc-2.10.patch || return 1
-	#grep -qs 'define u8' libusal/scsi-linux-sg.c ||
-	#sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' libusal/scsi-linux-sg.c
+	[ -s $SOURCES_REPOSITORY/cdrkit-1.1.9-efi-boot.patch ] ||
+		wget -P $SOURCES_REPOSITORY https://github.com/NixOS/nixpkgs/raw/master/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch
+	patch -p1 < $SOURCES_REPOSITORY/cdrkit-1.1.9-efi-boot.patch
 	make PREFIX=/usr && make install PREFIX=/usr
 }
 
diff -r 013013d65816 -r 73cdd2cf47c4 syslinux/stuff/iso2exe/bootiso.S
--- a/syslinux/stuff/iso2exe/bootiso.S	Mon Sep 26 14:50:44 2016 +0200
+++ b/syslinux/stuff/iso2exe/bootiso.S	Thu Sep 29 13:47:18 2016 +0200
@@ -137,6 +137,7 @@
 	movw	$0x1000+EXESTR(noDOS3), %ax
 	jc	tst386
 abort:
+jputs:
 	jmp	puts
 
 tst386:
@@ -165,7 +166,7 @@
 	inc	%ax
 	//movb	$EXESTR(realmodemsg), %al
 realmode:
-	call	puts
+	call	jputs
 is86:
 	movw	comstart-end_header(%di), %si		// .com address
 	pushw	%di