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,28 @@
From 59d91e57d103fb4686d2f45ee3c688878244367a Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Tue, 24 Nov 2020 22:12:40 +0100
Subject: [PATCH] Remove unused function 'after_eq'
---
keyctl_watch.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/keyctl_watch.c b/keyctl_watch.c
index a70a19a..c4ca7f7 100644
--- a/keyctl_watch.c
+++ b/keyctl_watch.c
@@ -47,11 +47,6 @@ static struct watch_notification_filter filter = {
},
};
-static inline bool after_eq(unsigned int a, unsigned int b)
-{
- return (signed int)(a - b) >= 0;
-}
-
static void consumer_term(int sig)
{
consumer_stop = 1;
--
2.28.0

View file

@ -0,0 +1,13 @@
diff --git a/request-key.c b/request-key.c
index bf47c0a..105fee8 100644
--- a/request-key.c
+++ b/request-key.c
@@ -313,7 +313,7 @@ static void scan_conf_dir(struct parameters *params, const char *confdir)
while ((d = readdir(dir))) {
if (d->d_name[0] == '.')
continue;
- if (d->d_type != DT_UNKNOWN && d->d_type != DT_REG)
+ if (d->d_type != DT_UNKNOWN && d->d_type != DT_REG && d->d_type != DT_LNK)
continue;
l = strlen(d->d_name);
if (l < 5)

View file

@ -0,0 +1,56 @@
{ lib, stdenv, fetchurl }:
# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
# cgit) that are needed here should be included directly in Nixpkgs as
# files.
stdenv.mkDerivation rec {
pname = "keyutils";
version = "1.6.3";
src = fetchurl {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/${pname}-${version}.tar.gz";
sha256 = "sha256-ph1XBhNq5MBb1I+GGGvP29iN2L1RB+Phlckkz8Gzm7Q=";
};
patches = [
./conf-symlink.patch
# This patch solves a duplicate symbol error when building with a clang stdenv
# Before removing this patch, please ensure the package still builds by running eg.
# nix-build -E 'with import ./. {}; pkgs.keyutils.override { stdenv = pkgs.llvmPackages_latest.stdenv; }'
./0001-Remove-unused-function-after_eq.patch
];
makeFlags = lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1";
outputs = [ "out" "lib" "dev" ];
postPatch = ''
# https://github.com/archlinux/svntogit-packages/blob/packages/keyutils/trunk/reproducible.patch
substituteInPlace Makefile \
--replace \
'VCPPFLAGS := -DPKGBUILD="\"$(shell date -u +%F)\""' \
'VCPPFLAGS := -DPKGBUILD="\"$(date -ud "@$SOURCE_DATE_EPOCH" +%F)\""'
'';
enableParallelBuilding = true;
installFlags = [
"ETCDIR=$(out)/etc"
"BINDIR=$(out)/bin"
"SBINDIR=$(out)/sbin"
"SHAREDIR=$(out)/share/keyutils"
"MANDIR=$(out)/share/man"
"INCLUDEDIR=$(dev)/include"
"LIBDIR=$(lib)/lib"
"USRLIBDIR=$(lib)/lib"
];
meta = with lib; {
homepage = "https://people.redhat.com/dhowells/keyutils/";
description = "Tools used to control the Linux kernel key management system";
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}