From patchwork Wed Feb 15 18:14:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/3] UBUNTU: [Config] clean up the human consumable package descriptions From: Andy Whitcroft X-Patchwork-Id: 141360 Message-Id: <1329329674-15470-2-git-send-email-apw@canonical.com> To: kernel-team@lists.ubuntu.com Cc: Andy Whitcroft Date: Wed, 15 Feb 2012 18:14:32 +0000 Each flavour has a human readable description in its flavour vars. This is intended to describe the system type in words, for example as here for powerpc: desc="32-bit PowerPC" desc="32-bit PowerPC SMP" desc="64-bit PowerPC SMP" On x86 we commonly share flavour names and there this is currently rather unhelp: desc="x86/x86_64" Additionally for these shared flavours is it impossible to have an accurate description as it must include all possible architectures, even though the resultant description is on an architecture specific binary package. Introduce a human_arch configuration at the archtecture level, this can then be used as a component in the flavour description. Use this to add descriptions for the x86 architectures: human_arch = 64 bit x86 human_arch = 32 bit x86 Allowing descriptions as below to be specified: desc="=HUMAN= SMP" Resulting in full descriptions as below: Linux kernel image for version 3.2.0 on 64 bit x86 SMP Signed-off-by: Andy Whitcroft --- debian.master/control.d/vars.generic | 2 +- debian.master/control.d/vars.generic-pae | 2 +- debian.master/control.d/vars.omap | 2 +- debian.master/control.d/vars.virtual | 2 +- debian.master/control.stub.in | 2 +- debian.master/rules.d/amd64.mk | 1 + debian.master/rules.d/armel.mk | 1 + debian.master/rules.d/armhf.mk | 1 + debian.master/rules.d/i386.mk | 1 + debian.master/rules.d/powerpc.mk | 1 + debian.master/rules.d/ppc64.mk | 1 + debian/rules | 2 ++ 12 files changed, 13 insertions(+), 5 deletions(-) diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic index aaf3299..5c6adb6 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." -desc="x86/x86_64" +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 3b0731a..5bc0af2 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." -desc="x86" +desc="=HUMAN= SMP" bootloader="grub-pc | 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.omap b/debian.master/control.d/vars.omap index eaf177b..bc9a17c 100644 --- a/debian.master/control.d/vars.omap +++ b/debian.master/control.d/vars.omap @@ -1,6 +1,6 @@ arch="armel armhf" supported="TI OMAP3" -desc="TI OMAP3-based systems" +desc="TI OMAP3-based =HUMAN= systems" target="Targeted towards boards such as Beagleboard, Gumstix, IGEPv2, etc." bootloader="flash-kernel" provides="" diff --git a/debian.master/control.d/vars.virtual b/debian.master/control.d/vars.virtual index 0b943e6..eb7d795 100644 --- a/debian.master/control.d/vars.virtual +++ b/debian.master/control.d/vars.virtual @@ -1,6 +1,6 @@ arch="i386 amd64" supported="Virtual" target="Geared toward virtual appliances." -desc="x86/x86_64" +desc="=HUMAN= Virtual Guests" bootloader="grub-pc | grub | lilo (>= 19.1)" provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, ndiswrapper-modules-1.9" diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 84dd89b..e589302 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -87,5 +87,5 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common Description: Linux kernel tools for version PKGVER-ABINUM This package provides the architecture dependant parts for kernel version locked tools for version PKGVER-ABINUM on - DESC. + =HUMAN=. diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index 34ef2f3..be03af7 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -1,3 +1,4 @@ +human_arch = 64 bit x86 build_arch = x86_64 header_arch = $(build_arch) asm_link = x86 diff --git a/debian.master/rules.d/armel.mk b/debian.master/rules.d/armel.mk index d10efa3..8aa3b1e 100644 --- a/debian.master/rules.d/armel.mk +++ b/debian.master/rules.d/armel.mk @@ -1,3 +1,4 @@ +human_arch = ARM (soft float) build_arch = arm header_arch = arm asm_link = arm diff --git a/debian.master/rules.d/armhf.mk b/debian.master/rules.d/armhf.mk index d828497..aacc08f 100644 --- a/debian.master/rules.d/armhf.mk +++ b/debian.master/rules.d/armhf.mk @@ -1,3 +1,4 @@ +human_arch = ARM (hard float) build_arch = arm header_arch = arm asm_link = arm diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk index d4e0ed3..6e5d301 100644 --- a/debian.master/rules.d/i386.mk +++ b/debian.master/rules.d/i386.mk @@ -1,3 +1,4 @@ +human_arch = 32 bit x86 build_arch = i386 header_arch = x86_64 asm_link = x86 diff --git a/debian.master/rules.d/powerpc.mk b/debian.master/rules.d/powerpc.mk index 2f8c18e..38ef1b6 100644 --- a/debian.master/rules.d/powerpc.mk +++ b/debian.master/rules.d/powerpc.mk @@ -1,3 +1,4 @@ +human_arch = PowerPC (32 bit userspace) build_arch = powerpc header_arch = $(build_arch) asm_link = $(build_arch) diff --git a/debian.master/rules.d/ppc64.mk b/debian.master/rules.d/ppc64.mk index ad90ae7..1faffd9 100644 --- a/debian.master/rules.d/ppc64.mk +++ b/debian.master/rules.d/ppc64.mk @@ -1,3 +1,4 @@ +human_arch = PowerPC (64 bit userspace) build_arch = powerpc header_arch = $(build_arch) asm_link = $(build_arch) diff --git a/debian/rules b/debian/rules index 92ec033..479b759 100755 --- a/debian/rules +++ b/debian/rules @@ -92,6 +92,7 @@ $(DEBIAN)/control.stub: $(DEBIAN)/d-i/kernel-versions.in \ cat $$i | sed -e 's/PKGVER/$(release)/g' \ -e 's/ABINUM/$(abinum)/g' \ -e 's/SRCPKGNAME/$(src_pkg_name)/g' \ + -e 's/=HUMAN=/$(human_arch)/g' \ > $$new; \ done flavours="$(wildcard $(DEBIAN)/control.d/vars.* $(DEBIAN)/sub-flavours/*.vars)";\ @@ -100,6 +101,7 @@ $(DEBIAN)/control.stub: $(DEBIAN)/d-i/kernel-versions.in \ sed -e 's/PKGVER/$(release)/g' \ -e 's/ABINUM/$(abinum)/g' \ -e 's/SRCPKGNAME/$(src_pkg_name)/g' \ + -e 's/=HUMAN=/$(human_arch)/g' \ >> $(DEBIAN)/control.stub; \ done cp $(DEBIAN)/control.stub $(DEBIAN)/control