UBUNTU: [Config] Consolidated amd64 server flavour into generic

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/amd64/config.flavour.server b/debian.master/config/amd64/config.flavour.server
deleted file mode 100644 (file)
index dcba56b..0000000
--- a/debian.master/config/amd64/config.flavour.server
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Config options for config.flavour.server automatically generated by splitconfig.pl
-#
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_INTEL_IDLE=y
-CONFIG_NR_CPUS=256
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_RING=m
-CONFIG_XEN_BLKDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_XENBUS_FRONTEND=m

diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic
index fd5220f..aaf3299 100644 (file)
--- a/debian.master/control.d/vars.generic
+++ b/debian.master/control.d/vars.generic
@@ -1,6 +1,6 @@
 arch="i386 amd64"
 supported="Generic"
-target="Geared toward desktop systems."
+target="Geared toward x86_64 systems."
 desc="x86/x86_64"
 bootloader="grub-pc | grub-efi-amd64 | grub-efi-ia32 | grub | lilo (>= 19.1)"
 provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, ndiswrapper-modules-1.9"

diff --git a/debian.master/control.d/vars.server b/debian.master/control.d/vars.server
deleted file mode 100644 (file)
index b8a53a4..0000000
--- a/debian.master/control.d/vars.server
+++ /dev/null
@@ -1,6 +0,0 @@
-arch="amd64"
-supported="Server"
-target="Geared toward 64 bit server systems."
-desc="x86_64"
-bootloader="grub-pc | grub-efi-amd64 | grub | lilo (>= 19.1)"
-provides="redhat-cluster-modules, kvm-api-4, ivtv-modules, ndiswrapper-modules-1.9"

diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk
index 286e4fb..34ef2f3 100644 (file)
--- a/debian.master/rules.d/amd64.mk
+++ b/debian.master/rules.d/amd64.mk
@@ -2,7 +2,7 @@ build_arch      = x86_64
 header_arch    = $(build_arch)
 asm_link       = x86
 defconfig      = defconfig
-flavours       = generic server virtual
+flavours       = generic virtual
 build_image    = bzImage
 kernel_file    = arch/$(build_arch)/boot/bzImage
 install_file   = vmlinuz