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,85 @@
{ lib, stdenv, fetchurl, pkg-config, zlib, shadow
, capabilitiesSupport ? true
, libcap_ng
, ncursesSupport ? true
, ncurses
, pamSupport ? true
, pam
, systemdSupport ? stdenv.isLinux && !stdenv.hostPlatform.isStatic
, systemd
, nlsSupport ? true
}:
stdenv.mkDerivation rec {
pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal";
version = "2.37.4";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz";
sha256 = "sha256-Y05pFq2RM2bDU2tkaOeER2lUm5mnsr+AMU3nirVlW4M=";
};
patches = [
./rtcwake-search-PATH-for-shutdown.patch
];
outputs = [ "bin" "dev" "out" "lib" "man" ];
separateDebugInfo = true;
postPatch = ''
patchShebangs tests/run.sh
substituteInPlace include/pathnames.h \
--replace "/bin/login" "${shadow}/bin/login"
substituteInPlace sys-utils/eject.c \
--replace "/bin/umount" "$bin/bin/umount"
'';
# !!! It would be better to obtain the path to the mount helpers
# (/sbin/mount.*) through an environment variable, but that's
# somewhat risky because we have to consider that mount can setuid
# root...
configureFlags = [
"--localstatedir=/var"
"--enable-write"
"--disable-use-tty-group"
"--enable-fs-paths-default=/run/wrappers/bin:/run/current-system/sw/bin:/sbin"
"--disable-makeinstall-setuid" "--disable-makeinstall-chown"
"--disable-su" # provided by shadow
(lib.enableFeature nlsSupport "nls")
(lib.withFeature ncursesSupport "ncursesw")
(lib.withFeature systemdSupport "systemd")
(lib.withFeatureAs systemdSupport
"systemdsystemunitdir" "${placeholder "bin"}/lib/systemd/system/")
"SYSCONFSTATICDIR=${placeholder "lib"}/lib"
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"scanf_cv_type_modifier=ms"
;
makeFlags = [
"usrbin_execdir=${placeholder "bin"}/bin"
"usrlib_execdir=${placeholder "lib"}/lib"
"usrsbin_execdir=${placeholder "bin"}/sbin"
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib ]
++ lib.optionals pamSupport [ pam ]
++ lib.optionals capabilitiesSupport [ libcap_ng ]
++ lib.optionals ncursesSupport [ ncurses ]
++ lib.optionals systemdSupport [ systemd ];
doCheck = false; # "For development purpose only. Don't execute on production system!"
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://www.kernel.org/pub/linux/utils/util-linux/";
description = "A set of system utilities for Linux";
changelog = "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${lib.versions.majorMinor version}/v${version}-ReleaseNotes";
# https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/README.licensing
license = with licenses; [ gpl2Only gpl2Plus gpl3Plus lgpl21Plus bsd3 bsdOriginalUC publicDomain ];
platforms = platforms.linux;
priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages
};
}

View file

@ -0,0 +1,69 @@
Search $PATH for the shutdown binary instead of hard-coding /sbin/shutdown,
which isn't valid on NixOS (and a compatibility link on most other modern
distros anyway).
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -50,8 +50,8 @@
#ifndef _PATH_LOGIN
# define _PATH_LOGIN "/bin/login"
#endif
-#define _PATH_SHUTDOWN "/sbin/shutdown"
-#define _PATH_POWEROFF "/sbin/poweroff"
+#define _PATH_SHUTDOWN "shutdown"
+#define _PATH_POWEROFF "poweroff"
#define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d"
#define _PATH_TERMCOLORS_DIR "/etc/" _PATH_TERMCOLORS_DIRNAME
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -587,29 +587,29 @@ int main(int argc, char **argv)
char *arg[5];
int i = 0;
- if (!access(_PATH_SHUTDOWN, X_OK)) {
- arg[i++] = _PATH_SHUTDOWN;
- arg[i++] = "-h";
- arg[i++] = "-P";
- arg[i++] = "now";
- arg[i] = NULL;
- } else if (!access(_PATH_POWEROFF, X_OK)) {
- arg[i++] = _PATH_POWEROFF;
- arg[i] = NULL;
- } else {
- arg[i] = NULL;
- }
+ arg[i++] = _PATH_SHUTDOWN;
+ arg[i++] = "-h";
+ arg[i++] = "-P";
+ arg[i++] = "now";
+ arg[i] = NULL;
- if (arg[0]) {
- if (ctl.verbose)
- printf(_("suspend mode: off; executing %s\n"),
- arg[0]);
- if (!ctl.dryrun) {
- execv(arg[0], arg);
+ if (ctl.verbose)
+ printf(_("suspend mode: off; executing %s\n"),
+ arg[0]);
+
+ if (!ctl.dryrun) {
+ execvp(arg[0], arg);
+ if (ctl.verbose) {
warn(_("failed to execute %s"), arg[0]);
- rc = EX_EXEC_ENOENT;
+ // Reuse translations.
+ printf(_("suspend mode: off; executing %s\n"),
+ _PATH_POWEROFF);
}
- } else {
+
+ i = 0;
+ arg[i++] = _PATH_POWEROFF;
+ arg[i] = NULL;
+ execvp(arg[0], arg);
/* Failed to find shutdown command */
warn(_("failed to find shutdown command"));
rc = EX_EXEC_ENOENT;