uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,80 @@
{ stdenv, lib, fetchurl, ncurses, perl, help2man
, apparmorRulesFromClosure
}:
stdenv.mkDerivation rec {
pname = "inetutils";
version = "2.2";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-1Uf2kXLfc6/vaRoPeIYoD9eBrOoo3vT/S0shIIaonYA";
};
outputs = ["out" "apparmor"];
patches = [
# https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3
./inetutils-1_9-PATH_PROCNET_DEV.patch
];
nativeBuildInputs = [ help2man perl /* for `whois' */ ];
buildInputs = [ ncurses /* for `talk' */ ];
# Don't use help2man if cross-compiling
# https://lists.gnu.org/archive/html/bug-sed/2017-01/msg00001.html
# https://git.congatec.com/yocto/meta-openembedded/blob/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb#L44
preConfigure = let
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
in lib.optionalString isCross ''
export HELP2MAN=true
'';
configureFlags = [ "--with-ncurses-include-dir=${ncurses.dev}/include" ]
++ lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd
"--disable-rcp"
"--disable-rsh"
"--disable-rlogin"
"--disable-rexec"
] ++ lib.optional stdenv.isDarwin "--disable-servers";
# Test fails with "UNIX socket name too long", probably because our
# $TMPDIR is too long.
doCheck = false;
installFlags = [ "SUIDMODE=" ];
postInstall = ''
mkdir $apparmor
cat >$apparmor/bin.ping <<EOF
$out/bin/ping {
include <abstractions/base>
include <abstractions/consoles>
include <abstractions/nameservice>
include "${apparmorRulesFromClosure { name = "ping"; } [stdenv.cc.libc]}"
include <local/bin.ping>
capability net_raw,
network inet raw,
network inet6 raw,
mr $out/bin/ping,
}
EOF
'';
meta = with lib; {
description = "Collection of common network programs";
longDescription =
'' The GNU network utilities suite provides the
following tools: ftp(d), hostname, ifconfig, inetd, logger, ping, rcp,
rexec(d), rlogin(d), rsh(d), syslogd, talk(d), telnet(d), tftp(d),
traceroute, uucpd, and whois.
'';
homepage = "https://www.gnu.org/software/inetutils/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ matthewbauer ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,26 @@
inetutils: define PATH_PROCNET_DEV if not already defined
this prevents the following compilation error :
system/linux.c:401:15: error: 'PATH_PROCNET_DEV' undeclared (first use in this function)
this patch comes from :
http://repository.timesys.com/buildsources/i/inetutils/inetutils-1.9/
Upstream-Status: Inappropriate [not author]
Signed-of-by: Eric Bénard <eric@eukrea.com>
---
diff -Naur inetutils-1.9.orig/ifconfig/system/linux.c inetutils-1.9/ifconfig/system/linux.c
--- inetutils-1.9.orig/ifconfig/system/linux.c 2012-01-04 16:31:36.000000000 -0500
+++ inetutils-1.9/ifconfig/system/linux.c 2012-01-04 16:40:53.000000000 -0500
@@ -49,6 +49,10 @@
#include "../ifconfig.h"
+#ifndef PATH_PROCNET_DEV
+ #define PATH_PROCNET_DEV "/proc/net/dev"
+#endif
+
/* ARPHRD stuff. */
static void