Skip to content

Commit

Permalink
syslinux: fixup build via a Debian patch
Browse files Browse the repository at this point in the history
It stopped working probably since binutils update.
  • Loading branch information
vcunat committed Mar 13, 2017
1 parent b264486 commit 8bfa9f5
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions pkgs/os-specific/linux/syslinux/default.nix
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, nasm, perl, python, libuuid, mtools, makeWrapper }:
{ stdenv, fetchFromGitHub, fetchurl, nasm, perl, python, libuuid, mtools, makeWrapper }:

stdenv.mkDerivation rec {
name = "syslinux-2015-11-09";
Expand All @@ -10,7 +10,16 @@ stdenv.mkDerivation rec {
sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw";
};

patches = [ ./perl-deps.patch ];
patches = [
./perl-deps.patch
(fetchurl {
# ldlinux.elf: Not enough room for program headers, try linking with -N
name = "not-enough-room.patch";
url = "https://anonscm.debian.org/cgit/collab-maint/syslinux.git/plain/"
+ "debian/patches/0014_fix_ftbfs_no_dynamic_linker.patch?id=a556ad7";
sha256 = "0ijqjsjmnphmvsx0z6ppnajsfv6xh6crshy44i2a5klxw4nlvrsw";
})
];

nativeBuildInputs = [ nasm perl python ];
buildInputs = [ libuuid makeWrapper ];
Expand Down

9 comments on commit 8bfa9f5

@dezgeg
Copy link
Contributor

@dezgeg dezgeg commented on 8bfa9f5 Mar 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it sounds like a binutils thing; the U-Boot mailing list is talking about similar things: https://www.mail-archive.com/u-boot@lists.denx.de/msg241084.html

@vcunat
Copy link
Member Author

@vcunat vcunat commented on 8bfa9f5 Mar 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly also binutils problem – glibc started failing on aarch64: http://hydra.nixos.org/build/49978776 The lines like

shell-init: error retrieving current directory: getcwd: cannot access parent directories: Bad file descriptor

made me first think it was some transient error, but the build has failed twice already in the same way...

@dezgeg
Copy link
Contributor

@dezgeg dezgeg commented on 8bfa9f5 Mar 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have seen the getcwd things in working builds as well. Quite mysterious.

@vcunat
Copy link
Member Author

@vcunat vcunat commented on 8bfa9f5 Mar 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, for now we could use the older binutils on aarch64, if you don't have a better idea (or anyone else). I want neither to block staging nor to break arm binaries.

@dezgeg
Copy link
Contributor

@dezgeg dezgeg commented on 8bfa9f5 Mar 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, it passed for me locally, without the shell-init: ... message if sandboxing isn't enabled. I will try to investigate...

@vcunat
Copy link
Member Author

@vcunat vcunat commented on 8bfa9f5 Mar 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess staging has time, as Hydra is likely to be busy for >24h rebuilding releases and master...

@dezgeg
Copy link
Contributor

@dezgeg dezgeg commented on 8bfa9f5 Mar 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, debugged it, I hope. Fix at dff0ba3 but also the bootstrap tools for aarch64 (and probably all the other ARMs) need to be updated.

I will push them to staging once http://hydra.nixos.org/jobset/nixpkgs/cross-trunk builds.

@dezgeg
Copy link
Contributor

@dezgeg dezgeg commented on 8bfa9f5 Mar 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now pushed: 20d9edf

@dezgeg
Copy link
Contributor

@dezgeg dezgeg commented on 8bfa9f5 Mar 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.