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:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
30
pkgs/tools/security/nsjail/001-fix-bison-link-error.patch
Normal file
30
pkgs/tools/security/nsjail/001-fix-bison-link-error.patch
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
From 8e309a0af0851ab54ca7c6d51b6f3d19ee42c8ee Mon Sep 17 00:00:00 2001
|
||||
From: Evangelos Foutras <evangelos@foutrelis.com>
|
||||
Date: Wed, 17 Mar 2021 16:36:40 +0200
|
||||
Subject: [PATCH] Replace YYUSE call with void cast in src/parser.y
|
||||
|
||||
The YYUSE macro was renamed to YY_USE in bison 3.7.5; we might as well
|
||||
avoid using it altogether and cast the unused variable to void instead.
|
||||
|
||||
Fixes the following linker error:
|
||||
|
||||
/usr/bin/ld: kafel/libkafel.a(libkafel.o): in function `kafel_yyerror':
|
||||
arm_syscalls.c:(.text+0x6984): undefined reference to `YYUSE'
|
||||
---
|
||||
src/parser.y | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/parser.y b/src/parser.y
|
||||
index e0f109c..0e01373 100644
|
||||
--- a/kafel/src/parser.y
|
||||
+++ b/kafel/src/parser.y
|
||||
@@ -420,8 +420,8 @@ const_def
|
||||
|
||||
void yyerror(YYLTYPE * loc, struct kafel_ctxt* ctxt, yyscan_t scanner,
|
||||
const char *msg) {
|
||||
+ (void)scanner; /* suppress unused-parameter warning */
|
||||
if (!ctxt->lexical_error) {
|
||||
- YYUSE(scanner);
|
||||
if (loc->filename != NULL) {
|
||||
append_error(ctxt, "%s:%d:%d: %s", loc->filename, loc->first_line, loc->first_column, msg);
|
||||
} else {
|
||||
43
pkgs/tools/security/nsjail/default.nix
Normal file
43
pkgs/tools/security/nsjail/default.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkg-config, which
|
||||
, libnl, protobuf, protobufc, shadow
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nsjail";
|
||||
version = "3.0"; # Bumping? Remove the bison patch.
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "nsjail";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1w6x8xcrs0i1y3q41gyq8z3cq9x24qablklc4jiydf855lhqn4dh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf bison flex libtool pkg-config which ];
|
||||
buildInputs = [ libnl protobuf protobufc ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [
|
||||
# To remove after bumping 3.0
|
||||
./001-fix-bison-link-error.patch
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(USER_DEFINES='-DNEWUIDMAP_PATH=${shadow}/bin/newuidmap -DNEWGIDMAP_PATH=${shadow}/bin/newgidmap')
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/man/man1
|
||||
install nsjail $out/bin/
|
||||
install nsjail.1 $out/share/man/man1/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A light-weight process isolation tool, making use of Linux namespaces and seccomp-bpf syscall filters";
|
||||
homepage = "http://nsjail.com/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ arturcygan bosu c0bw3b ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue