Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkgs/build-support/kernel/make-initrd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ storePaths=$(perl $pathsFromGraph closure-*)
# Put the closure in a gzipped cpio archive.
mkdir -p $out
(cd root && find * -print0 | cpio -o -H newc --null | $compressor > $out/initrd)
mkdir $out/depends
ln -s $storePaths -t $out/depends

if [ -n "$makeUInitrd" ]; then
mv $out/initrd $out/initrd.gz
Expand Down
4 changes: 2 additions & 2 deletions pkgs/build-support/release/rpm-build.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ vmTools.buildRPM (
done

echo "installing ''${rpms[*]}..."
rpm -Up ''${rpms[*]} --excludepath /nix/store
rpm -Up ''${rpms[*]} --excludepath /nix/store || touch $out/nix-support/failed

eval "$postRPMInstall"

echo "uninstalling ''${rpmNames[*]}..."
rpm -e ''${rpmNames[*]} --nodeps
rpm -e ''${rpmNames[*]} --nodeps || touch $out/nix-support/failed

for i in $out/rpms/*/*.src.rpm; do
echo "file srpm $i" >> $out/nix-support/hydra-build-products
Expand Down
Loading