tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #55500 from samueldr/update/syslinux

syslinux: 2015-11-09 -> 2019-02-07

authored by

Graham Christensen and committed by
GitHub ccb3fdbf b7947a01

+8 -100
unified split
+8 -19
pkgs/os-specific/linux/syslinux/default.nix
··· 1 - { stdenv, fetchFromGitHub, fetchurl, nasm, perl, python, libuuid, mtools, makeWrapper }: 1 + { stdenv, fetchFromRepoOrCz, fetchpatch, nasm, perl, python, libuuid, mtools, makeWrapper }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "syslinux-2015-11-09"; 4 + # This is syslinux-6.04-pre3^1; syslinux-6.04-pre3 fails to run. 5 + # Same issue here https://www.syslinux.org/archives/2019-February/026330.html 6 + name = "syslinux-2019-02-07"; 5 7 6 - src = fetchFromGitHub { 7 - owner = "geneC"; 8 + src = fetchFromRepoOrCz { 8 9 repo = "syslinux"; 9 - rev = "0cc9a99e560a2f52bcf052fd85b1efae35ee812f"; 10 - sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw"; 10 + rev = "b40487005223a78c3bb4c300ef6c436b3f6ec1f7"; 11 + sha256 = "1qrxl1114sr2i2791z9rf8v53g200aq30f08808d7i8qnmgvxl2w"; 11 12 }; 12 13 13 - patches = [ 14 - ./perl-deps.patch 15 - (fetchurl { 16 - # ldlinux.elf: Not enough room for program headers, try linking with -N 17 - name = "not-enough-room.patch"; 18 - url = "https://anonscm.debian.org/cgit/collab-maint/syslinux.git/plain/" 19 - + "debian/patches/0014_fix_ftbfs_no_dynamic_linker.patch?id=a556ad7"; 20 - sha256 = "0ijqjsjmnphmvsx0z6ppnajsfv6xh6crshy44i2a5klxw4nlvrsw"; 21 - }) 22 - ]; 23 - 24 14 postPatch = '' 25 15 substituteInPlace Makefile --replace /bin/pwd $(type -P pwd) 26 - substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo) 27 16 substituteInPlace utils/ppmtolss16 --replace /usr/bin/perl $(type -P perl) 28 - substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) 29 17 30 18 # fix tests 31 19 substituteInPlace tests/unittest/include/unittest/unittest.h \ ··· 65 53 homepage = http://www.syslinux.org/; 66 54 description = "A lightweight bootloader"; 67 55 license = licenses.gpl2; 56 + maintainers = [ maintainers.samueldr ]; 68 57 platforms = [ "i686-linux" "x86_64-linux" ]; 69 58 }; 70 59 }
-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 -