From 2df7ee103a01da34c9c82235bc286dde35e0f1ba Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 3 Jun 2014 02:14:02 +0200 Subject: mmrnmhrm: Switch over to "new" (old) hardware. Unfortunately, the main board has died so I needed to quickly assembly a replacement machine. I haven't found a compatible main board for the last set of hardware so the "new" machine is now a Core 2 Duo with only 2 GB of RAM. I'm looking forward to more frustrations during build I already had with the i7 I had previously. Also, all these changes are untested for now, because I'm still shoveling the btrfs filesystems to two new hard disks, because the new mainboard only has 2 SATA ports. At the moment the GRUB bootloader is still on the old disk and as soon as the data is on the new disks, the GRUB install devices will change as well. Signed-off-by: aszlig --- machines/dnyarri.nix | 2 ++ machines/mmrnmhrm-kconf.nix | 50 +++++++++++++++++++++++---------------------- machines/mmrnmhrm.nix | 9 +++++++- 3 files changed, 36 insertions(+), 25 deletions(-) (limited to 'machines') diff --git a/machines/dnyarri.nix b/machines/dnyarri.nix index bfd30995..bda86e1d 100644 --- a/machines/dnyarri.nix +++ b/machines/dnyarri.nix @@ -6,6 +6,8 @@ with import ../lib; { require = singleton ../common.nix; + nix.maxJobs = 8; + boot = let patch51Name = "patch51.fw"; kernelParams = [ "snd-hda-intel.patch=${patch51Name}" ]; diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix index 3e1a329c..ed7e8d9f 100644 --- a/machines/mmrnmhrm-kconf.nix +++ b/machines/mmrnmhrm-kconf.nix @@ -73,7 +73,6 @@ "CONFIG_TICK_ONESHOT" = "y"; "CONFIG_NO_HZ_COMMON" = "y"; "CONFIG_NO_HZ_IDLE" = "y"; - "CONFIG_NO_HZ" = "y"; "CONFIG_HIGH_RES_TIMERS" = "y"; "CONFIG_TICK_CPU_ACCOUNTING" = "y"; "CONFIG_BSD_PROCESS_ACCT" = "y"; @@ -268,10 +267,6 @@ "CONFIG_ARCH_PHYS_ADDR_T_64BIT" = "y"; "CONFIG_ARCH_DMA_ADDR_T_64BIT" = "y"; "CONFIG_DIRECT_GBPAGES" = "y"; - "CONFIG_NUMA" = "y"; - "CONFIG_X86_64_ACPI_NUMA" = "y"; - "CONFIG_NODES_SPAN_OTHER_NODES" = "y"; - "CONFIG_NODES_SHIFT" = "6"; "CONFIG_ARCH_SPARSEMEM_ENABLE" = "y"; "CONFIG_ARCH_SPARSEMEM_DEFAULT" = "y"; "CONFIG_ARCH_SELECT_MEMORY_MODEL" = "y"; @@ -279,7 +274,6 @@ "CONFIG_SELECT_MEMORY_MODEL" = "y"; "CONFIG_SPARSEMEM_MANUAL" = "y"; "CONFIG_SPARSEMEM" = "y"; - "CONFIG_NEED_MULTIPLE_NODES" = "y"; "CONFIG_HAVE_MEMORY_PRESENT" = "y"; "CONFIG_SPARSEMEM_EXTREME" = "y"; "CONFIG_SPARSEMEM_VMEMMAP_ENABLE" = "y"; @@ -328,7 +322,6 @@ "CONFIG_PHYSICAL_START" = "0x1000000"; "CONFIG_PHYSICAL_ALIGN" = "0x1000000"; "CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG" = "y"; - "CONFIG_USE_PERCPU_NUMA_NODE_ID" = "y"; "CONFIG_ACPI" = "y"; "CONFIG_ACPI_BUTTON" = "y"; "CONFIG_ACPI_VIDEO" = "y"; @@ -336,7 +329,6 @@ "CONFIG_ACPI_DOCK" = "y"; "CONFIG_ACPI_PROCESSOR" = "y"; "CONFIG_ACPI_THERMAL" = "y"; - "CONFIG_ACPI_NUMA" = "y"; "CONFIG_ACPI_CUSTOM_DSDT_FILE" = ""; "CONFIG_ACPI_INITRD_TABLE_OVERRIDE" = "y"; "CONFIG_X86_PM_TIMER" = "y"; @@ -399,6 +391,9 @@ "CONFIG_IPV6_TUNNEL" = "m"; "CONFIG_IPV6_GRE" = "m"; "CONFIG_NET_PTP_CLASSIFY" = "y"; + "CONFIG_IP_SCTP" = "m"; + "CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5" = "y"; + "CONFIG_SCTP_COOKIE_HMAC_MD5" = "y"; "CONFIG_HAVE_NET_DSA" = "y"; "CONFIG_NET_SCHED" = "y"; "CONFIG_NET_SCH_CBQ" = "m"; @@ -471,6 +466,7 @@ "CONFIG_DEVTMPFS_MOUNT" = "y"; "CONFIG_FW_LOADER" = "y"; "CONFIG_EXTRA_FIRMWARE" = ""; + "CONFIG_FW_LOADER_USER_HELPER" = "y"; "CONFIG_GENERIC_CPU_AUTOPROBE" = "y"; "CONFIG_DMA_SHARED_BUFFER" = "y"; "CONFIG_CONNECTOR" = "y"; @@ -514,8 +510,9 @@ "CONFIG_VHOST_RING" = "m"; "CONFIG_VHOST" = "m"; "CONFIG_ETHERNET" = "y"; - "CONFIG_NET_VENDOR_INTEL" = "y"; - "CONFIG_E1000E" = "y"; + "CONFIG_NET_VENDOR_BROADCOM" = "y"; + "CONFIG_TIGON3" = "y"; + "CONFIG_PHYLIB" = "y"; "CONFIG_INPUT" = "y"; "CONFIG_INPUT_FF_MEMLESS" = "y"; "CONFIG_INPUT_MATRIXKMAP" = "m"; @@ -651,7 +648,7 @@ "CONFIG_SND_HDA_INPUT_BEEP" = "y"; "CONFIG_SND_HDA_INPUT_BEEP_MODE" = "0"; "CONFIG_SND_HDA_INPUT_JACK" = "y"; - "CONFIG_SND_HDA_CODEC_REALTEK" = "y"; + "CONFIG_SND_HDA_CODEC_SIGMATEL" = "y"; "CONFIG_SND_HDA_GENERIC" = "y"; "CONFIG_SND_USB" = "y"; "CONFIG_SND_USB_AUDIO" = "y"; @@ -820,6 +817,8 @@ "CONFIG_I8253_LOCK" = "y"; "CONFIG_CLKBLD_I8253" = "y"; "CONFIG_FIRMWARE_MEMMAP" = "y"; + "CONFIG_DELL_RBU" = "m"; + "CONFIG_DCDBAS" = "m"; "CONFIG_DMIID" = "y"; "CONFIG_DMI_SYSFS" = "m"; "CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK" = "y"; @@ -841,6 +840,8 @@ "CONFIG_AUTOFS4_FS" = "y"; "CONFIG_FUSE_FS" = "y"; "CONFIG_CUSE" = "m"; + "CONFIG_FSCACHE" = "m"; + "CONFIG_CACHEFILES" = "m"; "CONFIG_ISO9660_FS" = "y"; "CONFIG_JOLIET" = "y"; "CONFIG_ZISOFS" = "y"; @@ -944,6 +945,7 @@ "CONFIG_NLS_MAC_ROMANIAN" = "m"; "CONFIG_NLS_MAC_TURKISH" = "m"; "CONFIG_NLS_UTF8" = "y"; + "CONFIG_DLM" = "m"; "CONFIG_TRACE_IRQFLAGS_SUPPORT" = "y"; "CONFIG_DEFAULT_MESSAGE_LOGLEVEL" = "4"; "CONFIG_FRAME_WARN" = "2048"; @@ -1029,11 +1031,11 @@ "CONFIG_CRYPTO_XCBC" = "y"; "CONFIG_CRYPTO_VMAC" = "y"; "CONFIG_CRYPTO_CRC32C" = "y"; - "CONFIG_CRYPTO_CRC32C_INTEL" = "y"; + "CONFIG_CRYPTO_CRC32C_INTEL" = "m"; "CONFIG_CRYPTO_CRC32" = "y"; - "CONFIG_CRYPTO_CRC32_PCLMUL" = "y"; + "CONFIG_CRYPTO_CRC32_PCLMUL" = "m"; "CONFIG_CRYPTO_CRCT10DIF" = "y"; - "CONFIG_CRYPTO_CRCT10DIF_PCLMUL" = "y"; + "CONFIG_CRYPTO_CRCT10DIF_PCLMUL" = "m"; "CONFIG_CRYPTO_GHASH" = "y"; "CONFIG_CRYPTO_MD4" = "y"; "CONFIG_CRYPTO_MD5" = "y"; @@ -1043,9 +1045,9 @@ "CONFIG_CRYPTO_RMD256" = "m"; "CONFIG_CRYPTO_RMD320" = "m"; "CONFIG_CRYPTO_SHA1" = "y"; - "CONFIG_CRYPTO_SHA1_SSSE3" = "y"; - "CONFIG_CRYPTO_SHA256_SSSE3" = "y"; - "CONFIG_CRYPTO_SHA512_SSSE3" = "y"; + "CONFIG_CRYPTO_SHA1_SSSE3" = "m"; + "CONFIG_CRYPTO_SHA256_SSSE3" = "m"; + "CONFIG_CRYPTO_SHA512_SSSE3" = "m"; "CONFIG_CRYPTO_SHA256" = "y"; "CONFIG_CRYPTO_SHA512" = "y"; "CONFIG_CRYPTO_TGR192" = "m"; @@ -1053,7 +1055,7 @@ "CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL" = "m"; "CONFIG_CRYPTO_AES" = "y"; "CONFIG_CRYPTO_AES_X86_64" = "y"; - "CONFIG_CRYPTO_AES_NI_INTEL" = "y"; + "CONFIG_CRYPTO_AES_NI_INTEL" = "m"; "CONFIG_CRYPTO_ANUBIS" = "m"; "CONFIG_CRYPTO_ARC4" = "y"; "CONFIG_CRYPTO_BLOWFISH" = "y"; @@ -1061,8 +1063,8 @@ "CONFIG_CRYPTO_BLOWFISH_X86_64" = "y"; "CONFIG_CRYPTO_CAMELLIA" = "m"; "CONFIG_CRYPTO_CAMELLIA_X86_64" = "y"; - "CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64" = "y"; - "CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64" = "y"; + "CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64" = "m"; + "CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64" = "m"; "CONFIG_CRYPTO_CAST_COMMON" = "y"; "CONFIG_CRYPTO_CAST5" = "y"; "CONFIG_CRYPTO_CAST5_AVX_X86_64" = "y"; @@ -1076,14 +1078,14 @@ "CONFIG_CRYPTO_SEED" = "m"; "CONFIG_CRYPTO_SERPENT" = "y"; "CONFIG_CRYPTO_SERPENT_SSE2_X86_64" = "y"; - "CONFIG_CRYPTO_SERPENT_AVX_X86_64" = "y"; - "CONFIG_CRYPTO_SERPENT_AVX2_X86_64" = "y"; + "CONFIG_CRYPTO_SERPENT_AVX_X86_64" = "m"; + "CONFIG_CRYPTO_SERPENT_AVX2_X86_64" = "m"; "CONFIG_CRYPTO_TEA" = "m"; "CONFIG_CRYPTO_TWOFISH" = "y"; "CONFIG_CRYPTO_TWOFISH_COMMON" = "y"; "CONFIG_CRYPTO_TWOFISH_X86_64" = "y"; - "CONFIG_CRYPTO_TWOFISH_X86_64_3WAY" = "y"; - "CONFIG_CRYPTO_TWOFISH_AVX_X86_64" = "y"; + "CONFIG_CRYPTO_TWOFISH_X86_64_3WAY" = "m"; + "CONFIG_CRYPTO_TWOFISH_AVX_X86_64" = "m"; "CONFIG_CRYPTO_DEFLATE" = "y"; "CONFIG_CRYPTO_ZLIB" = "y"; "CONFIG_CRYPTO_LZO" = "y"; diff --git a/machines/mmrnmhrm.nix b/machines/mmrnmhrm.nix index 19b1dee0..d75239d0 100644 --- a/machines/mmrnmhrm.nix +++ b/machines/mmrnmhrm.nix @@ -6,7 +6,14 @@ with import ../lib; { require = singleton ../common.nix; + nix.maxJobs = 2; + boot = let + kernelParams = [ + "video=DVI-I-1:1600x1200" + "video=VGA-1:1600x1200@60" + ]; + linuxAszlig = pkgs.buildLinux { inherit (pkgs.kernelSourceAszlig) version src; @@ -46,5 +53,5 @@ with import ../lib; services.synergy.server.configFile = ../cfgfiles/synergy.conf; services.xserver.videoDrivers = [ "nouveau" ]; - services.xserver.xrandrHeads = [ "DVI-I-2" "DVI-I-1" ]; + services.xserver.xrandrHeads = [ "DVI-I-1" "VGA-1" ]; } -- cgit 1.4.1