mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Updating the system-tarball work, having just tested that of the fuloong2f.
svn path=/nixos/branches/stdenv-updates/; revision=23689
This commit is contained in:
parent
7fe1c5fe90
commit
ccf7852e11
|
@ -1,7 +1,7 @@
|
||||||
{ stdenv, perl, xz, pathsFromGraph
|
{ stdenv, perl, xz, pathsFromGraph
|
||||||
|
|
||||||
, # The file name of the resulting tarball
|
, # The file name of the resulting tarball
|
||||||
fileName ? "nixos-built.tar.bz2"
|
fileName ? "nixos-system-${stdenv.system}"
|
||||||
|
|
||||||
, # The files and directories to be placed in the tarball.
|
, # The files and directories to be placed in the tarball.
|
||||||
# This is a list of attribute sets {source, target} where `source'
|
# This is a list of attribute sets {source, target} where `source'
|
||||||
|
|
152
modules/installer/cd-dvd/system-tarball-fuloong2f.nix
Normal file
152
modules/installer/cd-dvd/system-tarball-fuloong2f.nix
Normal file
|
@ -0,0 +1,152 @@
|
||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
with pkgs.lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
|
# A dummy /etc/nixos/configuration.nix in the booted CD that
|
||||||
|
# rebuilds the CD's configuration (and allows the configuration to
|
||||||
|
# be modified, of course, providing a true live CD). Problem is
|
||||||
|
# that we don't really know how the CD was built - the Nix
|
||||||
|
# expression language doesn't allow us to query the expression being
|
||||||
|
# evaluated. So we'll just hope for the best.
|
||||||
|
dummyConfiguration = pkgs.writeText "configuration.nix"
|
||||||
|
''
|
||||||
|
{config, pkgs, ...}:
|
||||||
|
|
||||||
|
{
|
||||||
|
require = [ ];
|
||||||
|
|
||||||
|
# Add your own options below and run "nixos-rebuild switch".
|
||||||
|
# E.g.,
|
||||||
|
# services.openssh.enable = true;
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
|
||||||
|
|
||||||
|
pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
|
||||||
|
|
||||||
|
options = {
|
||||||
|
|
||||||
|
system.nixosVersion = mkOption {
|
||||||
|
default = "${builtins.readFile ../../../VERSION}";
|
||||||
|
description = ''
|
||||||
|
NixOS version number.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
in
|
||||||
|
|
||||||
|
{
|
||||||
|
require =
|
||||||
|
[ options
|
||||||
|
./system-tarball.nix
|
||||||
|
../../hardware/network/rt73.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
|
||||||
|
# Disable some other stuff we don't need.
|
||||||
|
security.sudo.enable = false;
|
||||||
|
|
||||||
|
# Include only the en_US locale. This saves 75 MiB or so compared to
|
||||||
|
# the full glibcLocales package.
|
||||||
|
i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
|
||||||
|
|
||||||
|
# Include some utilities that are useful for installing or repairing
|
||||||
|
# the system.
|
||||||
|
environment.systemPackages =
|
||||||
|
[ pkgs.subversion # for nixos-checkout
|
||||||
|
pkgs.w3m # needed for the manual anyway
|
||||||
|
pkgs.testdisk # useful for repairing boot problems
|
||||||
|
pkgs.mssys # for writing Microsoft boot sectors / MBRs
|
||||||
|
pkgs.parted
|
||||||
|
pkgs.ddrescue
|
||||||
|
pkgs.ccrypt
|
||||||
|
pkgs.cryptsetup # needed for dm-crypt volumes
|
||||||
|
|
||||||
|
# Some networking tools.
|
||||||
|
pkgs.sshfsFuse
|
||||||
|
pkgs.socat
|
||||||
|
pkgs.screen
|
||||||
|
pkgs.wpa_supplicant # !!! should use the wpa module
|
||||||
|
|
||||||
|
# Hardware-related tools.
|
||||||
|
pkgs.sdparm
|
||||||
|
pkgs.hdparm
|
||||||
|
pkgs.dmraid
|
||||||
|
|
||||||
|
# Tools to create / manipulate filesystems.
|
||||||
|
pkgs.ntfsprogs # for resizing NTFS partitions
|
||||||
|
pkgs.btrfsProgs
|
||||||
|
pkgs.jfsutils
|
||||||
|
pkgs.jfsrec
|
||||||
|
|
||||||
|
# Some compression/archiver tools.
|
||||||
|
pkgs.unrar
|
||||||
|
pkgs.unzip
|
||||||
|
pkgs.zip
|
||||||
|
pkgs.xz
|
||||||
|
pkgs.dar # disk archiver
|
||||||
|
|
||||||
|
# Some editors.
|
||||||
|
pkgs.nvi
|
||||||
|
pkgs.bvi # binary editor
|
||||||
|
pkgs.joe
|
||||||
|
];
|
||||||
|
|
||||||
|
# The initrd has to contain any module that might be necessary for
|
||||||
|
# mounting the CD/DVD.
|
||||||
|
boot.initrd.availableKernelModules =
|
||||||
|
[ "vfat" "reiserfs" ];
|
||||||
|
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_2_6_35;
|
||||||
|
|
||||||
|
boot.initrd.kernelModules =
|
||||||
|
[ # Wait for SCSI devices to appear.
|
||||||
|
"scsi_wait_scan"
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.postBootCommands =
|
||||||
|
''
|
||||||
|
mkdir -p /mnt
|
||||||
|
|
||||||
|
cp ${dummyConfiguration} /etc/nixos/configuration.nix
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Some more help text.
|
||||||
|
services.mingetty.helpLine =
|
||||||
|
''
|
||||||
|
|
||||||
|
Log in as "root" with an empty password. ${
|
||||||
|
if config.services.xserver.enable then
|
||||||
|
"Type `start xserver' to start\nthe graphical user interface."
|
||||||
|
else ""
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Include the firmware for various wireless cards.
|
||||||
|
networking.enableRT73Firmware = true;
|
||||||
|
networking.enableIntel2200BGFirmware = true;
|
||||||
|
|
||||||
|
# To speed up further installation of packages, include the complete stdenv
|
||||||
|
# in the Nix store of the tarball.
|
||||||
|
tarball.storeContents = pkgs2storeContents [ pkgs.stdenv ];
|
||||||
|
|
||||||
|
# Allow sshd to be started manually through "start sshd". It should
|
||||||
|
# not be started by default on the installation CD because the
|
||||||
|
# default root password is empty.
|
||||||
|
services.openssh.enable = true;
|
||||||
|
|
||||||
|
jobs.openssh.startOn = pkgs.lib.mkOverride 50 {} "";
|
||||||
|
|
||||||
|
services.ttyBackgrounds.enable = false;
|
||||||
|
|
||||||
|
boot.loader.grub.enable = false;
|
||||||
|
boot.loader.generationsDir.enable = false;
|
||||||
|
system.boot.loader.kernelFile = "/vmlinux";
|
||||||
|
|
||||||
|
nixpkgs.config = {
|
||||||
|
platform = (import /etc/nixos/nixpkgs/pkgs/top-level/platforms.nix).fuloong2f_n32;
|
||||||
|
};
|
||||||
|
}
|
|
@ -170,6 +170,12 @@ in
|
||||||
# in the Nix store of the tarball.
|
# in the Nix store of the tarball.
|
||||||
tarball.storeContents = pkgs2storeContents [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
|
tarball.storeContents = pkgs2storeContents [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
|
||||||
|
|
||||||
|
tarball.contents =
|
||||||
|
[ { source = config.boot.kernelPackages.kernel + "/vmlinuz";
|
||||||
|
target = "/boot/vmlinuz";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
# Allow sshd to be started manually through "start sshd". It should
|
# Allow sshd to be started manually through "start sshd". It should
|
||||||
# not be started by default on the installation CD because the
|
# not be started by default on the installation CD because the
|
||||||
# default root password is empty.
|
# default root password is empty.
|
||||||
|
|
|
@ -31,14 +31,6 @@ let
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# A clue for the uboot loading
|
|
||||||
ubootKernelParams = pkgs.writeText "uboot-kernel-params.txt" ''
|
|
||||||
Kernel Parameters:
|
|
||||||
init=${config.system.build.bootStage2}
|
|
||||||
systemConfig=${config.system.build.toplevel}
|
|
||||||
${toString config.boot.kernelParams}
|
|
||||||
'';
|
|
||||||
|
|
||||||
versionFile = pkgs.writeText "nixos-version" config.system.nixosVersion;
|
versionFile = pkgs.writeText "nixos-version" config.system.nixosVersion;
|
||||||
|
|
||||||
in
|
in
|
||||||
|
@ -52,14 +44,12 @@ in
|
||||||
|
|
||||||
# !!! Hack - attributes expected by other modules.
|
# !!! Hack - attributes expected by other modules.
|
||||||
system.build.menuBuilder = "true";
|
system.build.menuBuilder = "true";
|
||||||
system.boot.loader.kernelFile = "bzImage";
|
|
||||||
environment.systemPackages = [ pkgs.grub2 ];
|
|
||||||
|
|
||||||
# In stage 1 of the boot, mount the CD/DVD as the root FS by label
|
# In stage 1 of the boot, mount the CD/DVD as the root FS by label
|
||||||
# so that we don't need to know its device.
|
# so that we don't need to know its device.
|
||||||
fileSystems =
|
fileSystems =
|
||||||
[ { mountPoint = "/";
|
[ { mountPoint = "/";
|
||||||
label = "rootfs";
|
device = "/dev/sda";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -83,23 +73,9 @@ in
|
||||||
# Individual files to be included on the CD, outside of the Nix
|
# Individual files to be included on the CD, outside of the Nix
|
||||||
# store on the CD.
|
# store on the CD.
|
||||||
tarball.contents =
|
tarball.contents =
|
||||||
[ { source = config.boot.kernelPackages.kernel + "/bzImage";
|
[ { source = config.system.build.initialRamdisk + "/initrd";
|
||||||
target = "/boot/bzImage";
|
|
||||||
}
|
|
||||||
{ source = config.system.build.initialRamdisk + "/initrd";
|
|
||||||
target = "/boot/initrd";
|
target = "/boot/initrd";
|
||||||
}
|
}
|
||||||
{ source = "${pkgs.grub2}/share/grub/unicode.pf2";
|
|
||||||
target = "/boot/grub/unicode.pf2";
|
|
||||||
}
|
|
||||||
{ source = config.boot.loader.grub.splashImage;
|
|
||||||
target = "/boot/grub/splash.png";
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
{ source = pkgs.ubootKernelParams;
|
|
||||||
target = "/uboot-kernelparams.txt";
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
{ source = versionFile;
|
{ source = versionFile;
|
||||||
target = "/nixos-version.txt";
|
target = "/nixos-version.txt";
|
||||||
}
|
}
|
||||||
|
@ -116,7 +92,7 @@ in
|
||||||
''
|
''
|
||||||
# After booting, register the contents of the Nix store on the
|
# After booting, register the contents of the Nix store on the
|
||||||
# CD in the Nix database in the tmpfs.
|
# CD in the Nix database in the tmpfs.
|
||||||
${config.environment.nix}/bin/nix-store --load-db < /nix/store/nix-path-registration
|
${config.environment.nix}/bin/nix-store --load-db < /nix-path-registration
|
||||||
|
|
||||||
# nixos-rebuild also requires a "system" profile and an
|
# nixos-rebuild also requires a "system" profile and an
|
||||||
# /etc/NIXOS tag.
|
# /etc/NIXOS tag.
|
||||||
|
|
10
release.nix
10
release.nix
|
@ -49,9 +49,7 @@ let
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with import nixpkgs {inherit system;};
|
with import nixpkgs {inherit system;};
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
|
version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
|
||||||
|
|
||||||
versionModule = { system.nixosVersion = version; };
|
versionModule = { system.nixosVersion = version; };
|
||||||
|
@ -136,6 +134,14 @@ let
|
||||||
module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
|
module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
system_tarball_fuloong2f = makeSystemTarball {
|
||||||
|
module = ./modules/installer/cd-dvd/system-tarball-fuloong2f.nix;
|
||||||
|
} { system = "mips64-linux"; };
|
||||||
|
|
||||||
|
system_tarball_sheevaplug = makeSystemTarball {
|
||||||
|
module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix;
|
||||||
|
} { system = "armv5tel-linux"; };
|
||||||
|
|
||||||
# Hacky: doesn't depend on configuration. Yet configuration is evaluated (TODO)
|
# Hacky: doesn't depend on configuration. Yet configuration is evaluated (TODO)
|
||||||
minimal_install_archive = {system ? "i686-linux"}: (iso_minimal {inherit system;})
|
minimal_install_archive = {system ? "i686-linux"}: (iso_minimal {inherit system;})
|
||||||
.config.system.build.minimalInstallArchive;
|
.config.system.build.minimalInstallArchive;
|
||||||
|
|
Loading…
Reference in a new issue