wok rev 19418
cdrkit: add efi boot support
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Sep 29 13:47:18 2016 +0200 (2016-09-29) |
parents | 013013d65816 |
children | f9a0022df0b9 |
files | cdrkit/receipt syslinux/stuff/iso2exe/bootiso.S |
line diff
1.1 --- a/cdrkit/receipt Mon Sep 26 14:50:44 2016 +0200 1.2 +++ b/cdrkit/receipt Thu Sep 29 13:47:18 2016 +0200 1.3 @@ -9,6 +9,7 @@ 1.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.5 WEB_SITE="http://www.cdrkit.org/" 1.6 WGET_URL="http://cdrkit.org/releases/$TARBALL" 1.7 +EXTRA_SOURCE_FILES="cdrkit-1.1.9-efi-boot.patch" 1.8 1.9 DEPENDS="libcap zlib bzlib attr" 1.10 BUILD_DEPENDS="cmake libcap-dev zlib-dev bzip2-dev attr-dev" 1.11 @@ -16,12 +17,11 @@ 1.12 # Rules to configure and make the package. 1.13 compile_rules() 1.14 { 1.15 - cd $src 1.16 sed -i -e '/USE_MAGIC/d' -e '/(MAGICLIBS magic)/d' \ 1.17 genisoimage/CMakeLists.txt 1.18 - #patch -p1 < $stuff/$PACKAGE-1.1.9-glibc-2.10.patch || return 1 1.19 - #grep -qs 'define u8' libusal/scsi-linux-sg.c || 1.20 - #sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' libusal/scsi-linux-sg.c 1.21 + [ -s $SOURCES_REPOSITORY/cdrkit-1.1.9-efi-boot.patch ] || 1.22 + wget -P $SOURCES_REPOSITORY https://github.com/NixOS/nixpkgs/raw/master/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch 1.23 + patch -p1 < $SOURCES_REPOSITORY/cdrkit-1.1.9-efi-boot.patch 1.24 make PREFIX=/usr && make install PREFIX=/usr 1.25 } 1.26
2.1 --- a/syslinux/stuff/iso2exe/bootiso.S Mon Sep 26 14:50:44 2016 +0200 2.2 +++ b/syslinux/stuff/iso2exe/bootiso.S Thu Sep 29 13:47:18 2016 +0200 2.3 @@ -137,6 +137,7 @@ 2.4 movw $0x1000+EXESTR(noDOS3), %ax 2.5 jc tst386 2.6 abort: 2.7 +jputs: 2.8 jmp puts 2.9 2.10 tst386: 2.11 @@ -165,7 +166,7 @@ 2.12 inc %ax 2.13 //movb $EXESTR(realmodemsg), %al 2.14 realmode: 2.15 - call puts 2.16 + call jputs 2.17 is86: 2.18 movw comstart-end_header(%di), %si // .com address 2.19 pushw %di