JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Making generations-dir consider the pkgs.platform.

Browse Source 
stdenv-updates stuff. Still to be reviewed, but at least an implementation to have
some different armv5tel-linux platforms: qemu versatile and the sheevaplug.


svn path=/nixos/trunk/; revision=18290
This commit is contained in:
Lluís Batlle i Rossell 2009-11-08 17:38:35 +00:00
parent 616c844336
commit 420639a4b1
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/installer/generations-dir/generations-dir-builder.sh
View File

@ -68,18 +68,31 @@ addEntry() {
mkdir -p $outdir mkdir -p $outdir
ln -sf $(readlink -f $path) $outdir/system ln -sf $(readlink -f $path) $outdir/system
ln -sf $(readlink -f $path/init) $outdir/init ln -sf $(readlink -f $path/init) $outdir/init
ln -sf $(readlink -f $path/initrd) $outdir/initrd ln -sf $initrd $outdir/initrd
ln -sf $(readlink -f $path/kernel) $outdir/kernel ln -sf $kernel $outdir/kernel
if test $(readlink -f "$path") = "$default"; then if test $(readlink -f "$path") = "$default"; then
cp "$kernel" /boot/nixos-kernel cp "$kernel" /boot/nixos-kernel
cp "$initrd" /boot/nixos-initrd cp "$initrd" /boot/nixos-initrd
cp "$(readlink -f "$path/init")" /boot/nixos-init cp "$(readlink -f "$path/init")" /boot/nixos-init
mkdir -p /boot/default mkdir -p /boot/default
if [ -e /boot/default/system ];
rm /boot/default/system
fi
ln -sf $(readlink -f $path) /boot/default/system ln -sf $(readlink -f $path) /boot/default/system
if [ -e /boot/default/init ];
rm /boot/default/init
fi
ln -sf $(readlink -f $path/init) /boot/default/init ln -sf $(readlink -f $path/init) /boot/default/init
ln -sf $(readlink -f $path/initrd) /boot/default/initrd if [ -e /boot/default/initrd ];
ln -sf $(readlink -f $path/kernel) /boot/default/kernel rm /boot/default/initrd
fi
ln -sf $initrd /boot/default/initrd
if [ -e /boot/default/kernel ];
rm /boot/default/kernel
fi
ln -sf $kernel /boot/default/kernel
fi fi
} }

8
modules/installer/generations-dir/generations-dir.nix
View File

@ -41,6 +41,9 @@ let
inherit (config.boot.loader.generationsDir) copyKernels; inherit (config.boot.loader.generationsDir) copyKernels;
}; };
# Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
platform = (if pkgs ? platform then pkgs.platform else
{ name = "pc"; uboot = null; });
in in
{ {
require = [ require = [
@ -55,6 +58,9 @@ in
menuBuilder = generationsDirBuilder; menuBuilder = generationsDirBuilder;
}; };
boot.loader.id = "generationsDir"; boot.loader.id = "generationsDir";
boot.loader.kernelFile = "uImage"; boot.loader.kernelFile = (
if (platform.name == "sheevaplug") then "uImage"
else if (platform.name == "versatileARM") then "zImage"
else "vmlinuz");
}; };
} }