From c3171725258cac402a52ddfbe2c404fc1ef6b358 Mon Sep 17 00:00:00 2001 From: Albert Hopkins Date: Wed, 21 Jul 2010 23:08:35 -0400 Subject: [PATCH] New teamplayer vm and kernel config update. --- Makefile | 12 ++++++------ kernel.config | 21 ++++++++++++++++----- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index ddcc26d..1d82efc 100644 --- a/Makefile +++ b/Makefile @@ -40,9 +40,9 @@ partitions: parted $(RAW_IMAGE) $(PARTED) -s -a optimal $(RAW_IMAGE) mkpart primary ext4 0 $(DISK_SIZE) $(PARTED) -s -a optimal $(RAW_IMAGE) set 1 boot on - qemu-nbd -c /dev/nbd1 $(RAW_IMAGE) + qemu-nbd -c /dev/nbd0 $(RAW_IMAGE) sleep 3 - mkfs.ext4 /dev/nbd1p1 + mkfs.ext4 /dev/nbd0p1 touch partitions parted: @@ -137,7 +137,7 @@ grub: systools grub.conf kernel touch grub software: systools issue etc-update.conf $(CRITICAL) $(WORLD) $(PREINSTALL) $(POSTINSTALL) - ./$(PREINSTALL) "$(CHROOT)" + ./$(PREINSTALL) "$(CHROOT)" $(HOSTNAME) chroot $(CHROOT) emerge -DN $(USEPKG) system cp etc-update.conf $(CHROOT)/etc/ chroot $(CHROOT) etc-update @@ -147,9 +147,9 @@ software: systools issue etc-update.conf $(CRITICAL) $(WORLD) $(PREINSTALL) $(PO cp issue $(CHROOT)/etc/issue chroot $(CHROOT) emerge --depclean --with-bdeps=n chroot $(CHROOT) gcc-config 1 + ./$(POSTINSTALL) "$(CHROOT)" $(HOSTNAME) chroot $(CHROOT) passwd -d root chroot $(CHROOT) passwd -e root - ./$(POSTINSTALL) "$(CHROOT)" if [ "$(PRUNE_CRITICAL)" = "YES" ] ; then \ chroot $(CHROOT) emerge -C `cat $(CRITICAL)` ; \ fi @@ -160,7 +160,7 @@ device-map: $(RAW_IMAGE) image: $(RAW_IMAGE) grub partitions device-map grub.shell systools software mkdir -p loop - mount /dev/nbd1p1 loop/ + mount /dev/nbd0p1 loop/ mkdir -p gentoo mount -o bind $(CHROOT) gentoo rm -rf gentoo/usr/src/linux-* @@ -179,7 +179,7 @@ image: $(RAW_IMAGE) grub partitions device-map grub.shell systools software sleep 3 rmdir loop rm -rf gentoo - qemu-nbd -d /dev/nbd1 + qemu-nbd -d /dev/nbd0 touch image $(QCOW_IMAGE): $(RAW_IMAGE) image diff --git a/kernel.config b/kernel.config index 0af9531..4c8a9b5 100644 --- a/kernel.config +++ b/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.33-gentoo-r2 -# Fri Jul 9 02:47:49 2010 +# Linux kernel version: 2.6.34-gentoo-r1 +# Tue Jul 20 03:25:48 2010 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -19,6 +19,7 @@ CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_MMU=y CONFIG_ZONE_DMA=y +CONFIG_NEED_DMA_MAP_STATE=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_BUG=y @@ -44,6 +45,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_AUDIT_ARCH=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_EARLY_RES=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_GENERIC_IRQ_PROBE=y @@ -87,7 +89,6 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -# CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set @@ -140,8 +141,10 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y @@ -224,6 +227,7 @@ CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y +CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set # CONFIG_M386 is not set # CONFIG_M486 is not set @@ -301,6 +305,7 @@ CONFIG_SPARSEMEM=y CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y CONFIG_SPARSEMEM_VMEMMAP=y # CONFIG_MEMORY_HOTPLUG is not set CONFIG_PAGEFLAGS_EXTENDED=y @@ -362,7 +367,6 @@ CONFIG_PCI_DOMAINS=y # CONFIG_PCIEPORTBUS is not set CONFIG_ARCH_SUPPORTS_MSI=y # CONFIG_PCI_MSI is not set -CONFIG_PCI_LEGACY=y # CONFIG_PCI_STUB is not set CONFIG_HT_IRQ=y # CONFIG_PCI_IOV is not set @@ -390,7 +394,6 @@ CONFIG_NET=y # Networking options # CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y CONFIG_UNIX=y # CONFIG_NET_KEY is not set CONFIG_INET=y @@ -496,6 +499,7 @@ CONFIG_HAVE_IDE=y # # SCSI device support # +CONFIG_SCSI_MOD=y # CONFIG_RAID_ATTRS is not set CONFIG_SCSI=y CONFIG_SCSI_DMA=y @@ -572,6 +576,7 @@ CONFIG_PATA_HPT3X3=y CONFIG_PATA_IT821X=y CONFIG_PATA_IT8213=y CONFIG_PATA_JMICRON=y +# CONFIG_PATA_LEGACY is not set CONFIG_PATA_TRIFLEX=y CONFIG_PATA_MARVELL=y CONFIG_PATA_MPIIX=y @@ -639,6 +644,7 @@ CONFIG_PHYLIB=y # CONFIG_NATIONAL_PHY is not set # CONFIG_STE10XP is not set # CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_MICREL_PHY is not set # CONFIG_FIXED_PHY is not set # CONFIG_MDIO_BITBANG is not set CONFIG_NET_ETHERNET=y @@ -662,6 +668,7 @@ CONFIG_NET_PCI=y CONFIG_PCNET32=y # CONFIG_AMD8111_ETH is not set # CONFIG_ADAPTEC_STARFIRE is not set +# CONFIG_KSZ884X_PCI is not set # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set # CONFIG_E100 is not set @@ -850,6 +857,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set +# CONFIG_SERIAL_TIMBERDALE is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set @@ -899,6 +907,7 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_PASIC3 is not set # CONFIG_MFD_TMIO is not set +# CONFIG_LPC_SCH is not set # CONFIG_REGULATOR is not set # CONFIG_MEDIA_SUPPORT is not set @@ -911,6 +920,7 @@ CONFIG_AGP_AMD64=y # CONFIG_AGP_SIS is not set # CONFIG_AGP_VIA is not set CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 # CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set @@ -1159,6 +1169,7 @@ CONFIG_DEFAULT_SECURITY="" CONFIG_HAVE_KVM=y CONFIG_VIRTUALIZATION=y # CONFIG_KVM is not set +# CONFIG_VHOST_NET is not set CONFIG_VIRTIO=y CONFIG_VIRTIO_RING=y CONFIG_VIRTIO_PCI=y