mdadm: use absolute paths
We also correct paths in udev rules. This is cleaner and allows for less unexpected behaviour. We still check for self-references, however we do it manually now and only for binaries as udev rules can have them. Rather, we patch them out during initrd generation now.
This commit is contained in:
parent
5636fe572b
commit
88d5b40d40
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, groff, system-sendmail }:
|
{ stdenv, utillinux, coreutils, fetchurl, groff, system-sendmail }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "mdadm-4.1";
|
name = "mdadm-4.1";
|
||||||
@ -8,26 +8,34 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0jjgjgqijpdp7ijh8slzzjjw690kydb1jjadf0x5ilq85628hxmb";
|
sha256 = "0jjgjgqijpdp7ijh8slzzjjw690kydb1jjadf0x5ilq85628hxmb";
|
||||||
};
|
};
|
||||||
|
|
||||||
# This is to avoid self-references, which causes the initrd to explode
|
|
||||||
# in size and in turn prevents mdraid systems from booting.
|
|
||||||
allowedReferences = [ stdenv.cc.libc.out system-sendmail ];
|
|
||||||
|
|
||||||
patches = [ ./no-self-references.patch ];
|
patches = [ ./no-self-references.patch ];
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin"
|
"NIXOS=1" "INSTALL=install" "BINDIR=$(out)/sbin"
|
||||||
"MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
|
"MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
|
||||||
"STRIP="
|
"STRIP="
|
||||||
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||||
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
|
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
nativeBuildInputs = [ groff ];
|
nativeBuildInputs = [ groff ];
|
||||||
|
|
||||||
preConfigure = ''
|
postPatch = ''
|
||||||
sed -e 's@/lib/udev@''${out}/lib/udev@' \
|
sed -e 's@/lib/udev@''${out}/lib/udev@' \
|
||||||
-e 's@ -Werror @ @' \
|
-e 's@ -Werror @ @' \
|
||||||
-e 's@/usr/sbin/sendmail@${system-sendmail}@' -i Makefile
|
-e 's@/usr/sbin/sendmail@${system-sendmail}@' -i Makefile
|
||||||
|
sed -i \
|
||||||
|
-e 's@/usr/bin/basename@${coreutils}/bin/basename@g' \
|
||||||
|
-e 's@BINDIR/blkid@${utillinux}/bin/blkid@g' \
|
||||||
|
*.rules
|
||||||
|
'';
|
||||||
|
|
||||||
|
# This is to avoid self-references, which causes the initrd to explode
|
||||||
|
# in size and in turn prevents mdraid systems from booting.
|
||||||
|
postFixup = ''
|
||||||
|
grep -r $out $out/bin && false || true
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user