ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-14 00:22:44 +03:00
Code Issues Projects Releases Wiki Activity

linux: don't try to mass clean paths

Browse Source 
This whole thing is utterly broken, but let's start here.
Should fix intermittent build failures with patchShebangs.
This commit is contained in:
K900 2022-08-17 21:08:06 +03:00
parent d4dbaadce5
commit 846d001fb8
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -60,7 +60,7 @@ let
++ optional (lib.versionAtLeast version "5.13") zstd; ++ optional (lib.versionAtLeast version "5.13") zstd;
installkernel = buildPackages.writeShellScript "installkernel" '' installkernel = buildPackages.writeShellScriptBin "installkernel" ''
set -e set -e
mkdir -p $4 mkdir -p $4
cp -av $2 $4 cp -av $2 $4
@ -114,10 +114,6 @@ let
++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch; ++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch;
prePatch = '' prePatch = ''
for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do
echo "stripping FHS paths in \`$mf'..."
sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g'
done
sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|' sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|'
# Don't include a (random) NT_GNU_BUILD_ID, to make the build more deterministic. # Don't include a (random) NT_GNU_BUILD_ID, to make the build more deterministic.
@ -146,6 +142,11 @@ let
fi fi
patchShebangs scripts patchShebangs scripts
# also patch arch-specific install scripts
for i in $(find arch -name install.sh); do
patchShebangs "$i"
done
''; '';
configurePhase = '' configurePhase = ''
@ -189,7 +190,6 @@ let
++ extraMakeFlags; ++ extraMakeFlags;
installFlags = [ installFlags = [
"INSTALLKERNEL=${installkernel}"
"INSTALL_PATH=$(out)" "INSTALL_PATH=$(out)"
] ++ (optional isModular "INSTALL_MOD_PATH=$(out)") ] ++ (optional isModular "INSTALL_MOD_PATH=$(out)")
++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware" ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"
@ -197,6 +197,9 @@ let
preInstall = '' preInstall = ''
installFlagsArray+=("-j$NIX_BUILD_CORES") installFlagsArray+=("-j$NIX_BUILD_CORES")
# the install scripts expect to find installkernel in ~/bin/installkernel
export HOME=${installkernel}
''; '';
# Some image types need special install targets (e.g. uImage is installed with make uinstall) # Some image types need special install targets (e.g. uImage is installed with make uinstall)