From patchwork Wed Feb 15 18:14:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 141361 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 717801007D6 for ; Thu, 16 Feb 2012 05:14:59 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RxjNV-0002TF-4i; Wed, 15 Feb 2012 18:14:53 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RxjNH-0002Qo-BI for kernel-team@lists.ubuntu.com; Wed, 15 Feb 2012 18:14:39 +0000 Received: from 79-78-220-96.dynamic.dsl.as9105.com ([79.78.220.96] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RxjNH-0000kq-55; Wed, 15 Feb 2012 18:14:39 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/3] UBUNTU: [Config] fix generic flavour description Date: Wed, 15 Feb 2012 18:14:33 +0000 Message-Id: <1329329674-15470-3-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1329329674-15470-1-git-send-email-apw@canonical.com> References: <1329329674-15470-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com The current description is a hangover from when generic was only a 64 bit flavour. Fix this up and also take into account that generic is used on servers too now. Signed-off-by: Andy Whitcroft --- debian.master/control.d/vars.generic | 2 +- debian.master/control.d/vars.generic-pae | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic index 5c6adb6..b4b4234 100644 --- 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 x86_64 systems." +target="Geared toward desktop and server systems." desc="=HUMAN= SMP" 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.generic-pae b/debian.master/control.d/vars.generic-pae index 5bc0af2..e0c07af 100644 --- a/debian.master/control.d/vars.generic-pae +++ b/debian.master/control.d/vars.generic-pae @@ -1,6 +1,6 @@ arch="i386" supported="Generic" -target="Geared toward 32 bit desktop systems with more than 4GB RAM." +target="Geared toward 32 bit desktop or server systems with more than 4GB RAM." desc="=HUMAN= SMP" bootloader="grub-pc | grub | lilo (>= 19.1)" provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, ndiswrapper-modules-1.9"