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,10 @@
--- jfsutils-1.1.15/configure.in.orig 2018-11-27 20:46:55.830242385 +0300
+++ jfsutils-1.1.15/configure.in 2018-11-27 20:47:00.596307630 +0300
@@ -15,6 +15,7 @@
AC_PATH_PROG(LN, ln, ln)
AC_PROG_LN_S
AC_PROG_RANLIB
+AM_PROG_AR
dnl Checks for header files.
AC_HEADER_STDC

View file

@ -0,0 +1,40 @@
{ lib, stdenv, fetchurl, fetchpatch, libuuid, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "jfsutils";
version = "1.1.15";
src = fetchurl {
url = "http://jfs.sourceforge.net/project/pub/jfsutils-${version}.tar.gz";
sha256 = "0kbsy2sk1jv4m82rxyl25gwrlkzvl3hzdga9gshkxkhm83v1aji4";
};
patches = [
./types.patch
./hardening-format.patch
# required for cross-compilation
./ar-fix.patch
# fix for glibc>=2.28
(fetchpatch {
name = "add_sysmacros.patch";
url = "https://sources.debian.org/data/main/j/jfsutils/1.1.15-4/debian/patches/add_sysmacros.patch";
sha256 = "1qcwvxs4d0d24w5x98z59arqfx2n7f0d9xaqhjcg6w8n34vkhnyc";
})
];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libuuid ];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: extract.o:/build/jfsutils-1.1.15/fscklog/extract.c:67: multiple definition of
# `xchklog_buffer'; display.o:/build/jfsutils-1.1.15/fscklog/display.c:57: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
meta = with lib; {
description = "IBM JFS utilities";
homepage = "http://jfs.sourceforge.net";
license = licenses.gpl3;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,37 @@
--- a/fscklog/fscklog.c 2016-01-29 04:59:54.102223291 +0000
+++ b/fscklog/fscklog.c 2016-01-29 05:00:10.707552565 +0000
@@ -252,8 +252,8 @@
sprintf(debug_detail, " [%s:%d]\n", basename(file_name), line_number);
- printf(msg_string);
- printf(debug_detail);
+ printf("%s", msg_string);
+ printf("%s", debug_detail);
return 0;
}
--- a/fscklog/display.c 2016-01-29 05:05:42.582133444 +0000
+++ b/fscklog/display.c 2016-01-29 05:05:47.541231780 +0000
@@ -182,7 +182,7 @@
} else {
/* the record looks ok */
msg_txt = &log_entry[log_entry_pos];
- printf(msg_txt);
+ printf("%s", msg_txt);
/*
* set up for the next record
*/
--- a/logdump/helpers.c 2016-01-29 05:06:26.081996021 +0000
+++ b/logdump/helpers.c 2016-01-29 05:06:43.097333425 +0000
@@ -95,8 +95,8 @@
sprintf(debug_detail, " [%s:%d]\n", file_name, line_number);
- printf(msg_string);
- printf(debug_detail);
+ printf("%s", msg_string);
+ printf("%s", debug_detail);
return 0;
}

View file

@ -0,0 +1,12 @@
diff -ru -x '*~' jfsutils-1.1.15-orig/libfs/devices.h jfsutils-1.1.15/libfs/devices.h
--- jfsutils-1.1.15-orig/libfs/devices.h 2005-11-22 21:43:55.000000000 +0100
+++ jfsutils-1.1.15/libfs/devices.h 2013-01-28 13:58:56.888630278 +0100
@@ -18,6 +18,8 @@
#ifndef H_DEVICES
#define H_DEVICES
+#include <inttypes.h>
+
#define GET 0
#define PUT 1
#define VRFY 2