pyrox.dev
lol
* Syslinux updated to 4.02.
svn path=/nixpkgs/trunk/; revision=23017
+95
-17
+14
-17
pkgs/os-specific/linux/syslinux/default.nix
+14
-17
pkgs/os-specific/linux/syslinux/default.nix
···
1
-
{stdenv, fetchurl, nasm, perl}:
1
+
{ stdenv, fetchurl, nasm, perl }:
2
2
3
-
stdenv.mkDerivation {
4
-
name = "syslinux-3.35";
3
+
stdenv.mkDerivation rec {
4
+
name = "syslinux-4.02";
5
+
5
6
src = fetchurl {
6
-
url = mirror://kernel/linux/utils/boot/syslinux/Old/syslinux-3.35.tar.bz2;
7
-
sha256 = "16kf2zhd0c4m3ai9xcls2y0ggvajhmzk1g6mv6jrv8nskkg6w0l6";
7
+
url = "mirror://kernel/linux/utils/boot/syslinux/4.xx/${name}.tar.bz2";
8
+
sha256 = "0zrk6magnrfa7nmdk2rll7xaym9rapwqqgy0wdh3cfscjmcw9kwm";
8
9
};
9
-
buildInputs = [nasm perl];
10
10
11
-
preBuild = "
12
-
makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin LIBDIR=$out/lib INCDIR=$out/include)
11
+
patches = [ ./perl-deps.patch ];
12
+
13
+
buildInputs = [ nasm perl ];
13
14
14
-
# Really dirty hack to get syslinux to build without needing a GCC
15
-
# with 32-bit libraries and headers.
16
-
if test \"$system\" = x86_64-linux; then
17
-
substituteInPlace memdisk/Makefile \\
18
-
--replace 'all: memdisk e820test' 'all: memdisk'
19
-
mkdir gnu
20
-
touch gnu/stubs-32.h
21
-
fi
22
-
";
15
+
preBuild =
16
+
''
17
+
substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo)
18
+
makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin LIBDIR=$out/lib INCDIR=$out/include DATADIR=$out/share MANDIR=$out/share/man PERL=perl)
19
+
'';
23
20
}
+81
pkgs/os-specific/linux/syslinux/perl-deps.patch
+81
pkgs/os-specific/linux/syslinux/perl-deps.patch
···
1
+
http://git.ipxe.org/ipxe.git/commitdiff/719b498
2
+
3
+
diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/arch/i386/Makefile.pcbios syslinux-4.02/gpxe/src/arch/i386/Makefile.pcbios
4
+
--- syslinux-4.02-orig/gpxe/src/arch/i386/Makefile.pcbios 2010-07-21 21:33:13.000000000 +0200
5
+
+++ syslinux-4.02/gpxe/src/arch/i386/Makefile.pcbios 2010-08-06 23:32:57.000000000 +0200
6
+
@@ -24,11 +24,11 @@
7
+
8
+
# Padding rules
9
+
#
10
+
-PAD_rom = $(PADIMG) --blksize=512 --byte=0xff $@
11
+
+PAD_rom = $(PERL) $(PADIMG) --blksize=512 --byte=0xff $@
12
+
PAD_hrom = $(PAD_rom)
13
+
PAD_xrom = $(PAD_rom)
14
+
-PAD_dsk = $(PADIMG) --blksize=512 $@
15
+
-PAD_hd = $(PADIMG) --blksize=32768 $@
16
+
+PAD_dsk = $(PERL) $(PADIMG) --blksize=512 $@
17
+
+PAD_hd = $(PERL) $(PADIMG) --blksize=32768 $@
18
+
19
+
# rule to make a non-emulation ISO boot image
20
+
NON_AUTO_MEDIA += iso
21
+
diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/Makefile syslinux-4.02/gpxe/src/Makefile
22
+
--- syslinux-4.02-orig/gpxe/src/Makefile 2010-07-21 21:33:13.000000000 +0200
23
+
+++ syslinux-4.02/gpxe/src/Makefile 2010-08-06 23:31:15.000000000 +0200
24
+
@@ -31,12 +31,12 @@
25
+
OBJCOPY := $(CROSS_COMPILE)objcopy
26
+
NM := $(CROSS_COMPILE)nm
27
+
OBJDUMP := $(CROSS_COMPILE)objdump
28
+
-PARSEROM := $(PERL) ./util/parserom.pl
29
+
-MAKEROM := $(PERL) ./util/makerom.pl
30
+
-SYMCHECK := $(PERL) ./util/symcheck.pl
31
+
-SORTOBJDUMP := $(PERL) ./util/sortobjdump.pl
32
+
-PADIMG := $(PERL) ./util/padimg.pl
33
+
-LICENCE := $(PERL) ./util/licence.pl
34
+
+PARSEROM := ./util/parserom.pl
35
+
+MAKEROM := ./util/makerom.pl
36
+
+SYMCHECK := ./util/symcheck.pl
37
+
+SORTOBJDUMP := ./util/sortobjdump.pl
38
+
+PADIMG := ./util/padimg.pl
39
+
+LICENCE := ./util/licence.pl
40
+
NRV2B := ./util/nrv2b
41
+
ZBIN := ./util/zbin
42
+
ELF2EFI32 := ./util/elf2efi32
43
+
diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/Makefile.housekeeping syslinux-4.02/gpxe/src/Makefile.housekeeping
44
+
--- syslinux-4.02-orig/gpxe/src/Makefile.housekeeping 2010-07-21 21:33:13.000000000 +0200
45
+
+++ syslinux-4.02/gpxe/src/Makefile.housekeeping 2010-08-06 23:31:49.000000000 +0200
46
+
@@ -456,7 +456,7 @@
47
+
'\n$(2) : $$($(4)_DEPS)\n' \
48
+
'\nTAGS : $$($(4)_DEPS)\n' \
49
+
>> $(2)
50
+
- @$(PARSEROM) $(1) >> $(2)
51
+
+ @$(PERL) $(PARSEROM) $(1) >> $(2)
52
+
53
+
endef
54
+
55
+
@@ -657,7 +657,7 @@
56
+
$(QM)$(ECHO) " [LD] $@"
57
+
$(Q)$(LD) $(LDFLAGS) -T $(LDSCRIPT) $(TGT_LD_FLAGS) $(BLIB) -o $@ \
58
+
-Map $(BIN)/$*.tmp.map
59
+
- $(Q)$(OBJDUMP) -ht $@ | $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
60
+
+ $(Q)$(OBJDUMP) -ht $@ | $(PERL) $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
61
+
62
+
# Keep intermediate object file (useful for debugging)
63
+
.PRECIOUS : $(BIN)/%.tmp
64
+
@@ -714,7 +714,7 @@
65
+
echo "files are missing a licence declaration:" ;\
66
+
echo $(call unlicensed_deps_list,$<);\
67
+
exit 1,\
68
+
- $(LICENCE) $(call licence_list,$<))
69
+
+ $(PERL) $(LICENCE) $(call licence_list,$<))
70
+
71
+
# Extract compression information from intermediate object file
72
+
#
73
+
@@ -941,7 +941,7 @@
74
+
CLEANUP += $(BIN)/symtab
75
+
76
+
symcheck : $(SYMTAB)
77
+
- $(SYMCHECK) $<
78
+
+ $(PERL) $(SYMCHECK) $<
79
+
80
+
endif # defined(BIN)
81
+