Bug#317007: patch - need help with build system
retitle 317007 please recommend linux-sound-base
tag 317007 + patch
thanks
This patch against 2.6.18 that adds a recommends on linux-sound-base
for all image packages that have CONFIG_SOUND enabled.
The only issue of which I'm aware is that it also adds this recommends
for the xen-amd64 and xen-vserver-amd64 packages. These 2 packages
inherit their recommends from the generic amd64 image definition. I
tried overridding the generic definition with an empty "recommends:"
field, but the build system does not like empty package relationship
values.
This is not an issue for the i386 subarchs or the 'vserver' package
because they override the generic recommends with non-null values.
I'd appreciate suggestions on how to handle this - should the build
system support null values? Is there another way to add a recommends
that won't be inherited by the subarchs?
Index: debian/arch/arm/defines
===================================================================
--- debian/arch/arm/defines (revision 8186)
+++ debian/arch/arm/defines (working copy)
@@ -12,6 +12,7 @@
suggests: fdutils
[footbridge_image]
+recommends: linux-sound-base
suggests: nwutil
[footbridge]
@@ -21,14 +22,17 @@
[iop32x]
class: IOP32x
longclass: IOP32x based (Thecus N2100, etc)
+recommends: linux-sound-base
[ixp4xx]
class: IXP4xx
longclass: IXP4xx based (Linksys NSLU2, etc)
+recommends: linux-sound-base
[rpc]
class: RiscPC
longclass: Arcon RiscPC
+recommends: linux-sound-base
[s3c2410]
class: Samsung S3C2410
Index: debian/arch/powerpc/defines
===================================================================
--- debian/arch/powerpc/defines (revision 8186)
+++ debian/arch/powerpc/defines (working copy)
@@ -12,6 +12,9 @@
subarches:
vserver
+[image]
+recommends: linux-sound-base
+
[apus]
depends: mkvmlinuz (>= 24)
kernel-arch: ppc
Index: debian/arch/alpha/defines
===================================================================
--- debian/arch/alpha/defines (revision 8186)
+++ debian/arch/alpha/defines (working copy)
@@ -5,6 +5,7 @@
subarches: vserver
[image]
+recommends: linux-sound-base
suggests: aboot, fdutils
[alpha-generic]
Index: debian/arch/m68k/defines
===================================================================
--- debian/arch/m68k/defines (revision 8186)
+++ debian/arch/m68k/defines (working copy)
@@ -19,9 +19,11 @@
[amiga]
class: Amiga
+recommends: linux-sound-base
[atari]
class: Atari
+recommends: linux-sound-base
[bvme6000]
class: BVM BVME4000 and BVME6000
@@ -40,6 +42,7 @@
[q40]
class: Q40 and Q60
+recommends: linux-sound-base
[sun3]
class: sun3
Index: debian/arch/hppa/defines
===================================================================
--- debian/arch/hppa/defines (revision 8186)
+++ debian/arch/hppa/defines (working copy)
@@ -8,6 +8,7 @@
kernel-header-dirs: parisc
[image]
+recommends: linux-sound-base
suggests: palo
[parisc]
Index: debian/arch/i386/defines
===================================================================
--- debian/arch/i386/defines (revision 8186)
+++ debian/arch/i386/defines (working copy)
@@ -13,6 +13,7 @@
[image]
conflicts: grub (<= 0.95+cvs20040624-17)
+recommends: linux-sound-base
suggests: grub (>= 0.97-3) | lilo (>= 19.1)
[486]
Index: debian/arch/mipsel/defines
===================================================================
--- debian/arch/mipsel/defines (revision 8186)
+++ debian/arch/mipsel/defines (working copy)
@@ -15,23 +15,28 @@
[r5k-cobalt]
class: Cobalt
longclass: Cobalt (Qube, RaQ, Qube2, RaQ2)
+recommends: linux-sound-base
[sb1-bcm91250a]
class: BCM91250A
longclass: Broadcom BCM91250A (aka SWARM)
+recommends: linux-sound-base
[sb1a-bcm91480b]
class: BCM91480B
longclass: Broadcom BCM91480B (aka BigSur)
+recommends: linux-sound-base
[r3k-kn02]
class: R3000 based DECstation
longclass: R3000 based DECstations with KN02 mainboard, such as the DECstation 5000/1xx series with xx=20,25,33 and the DECstation 5000/240
+recommends: linux-sound-base
[r4k-kn04]
class: R4x00 based DECstation
longclass: R4x00 based DECstations with KN04 mainboard, such as the DECstation 5000/150, the
Personal DECstation 5000/50 and the DECstation 5000/260
+recommends: linux-sound-base
[qemu]
class: QEMU
Index: debian/arch/ia64/defines
===================================================================
--- debian/arch/ia64/defines (revision 8186)
+++ debian/arch/ia64/defines (working copy)
@@ -6,6 +6,7 @@
kernel-header-dirs: ia64
[image]
+recommends: linux-sound-base
suggests: elilo, fdutils
[itanium]
Index: debian/arch/mips/defines
===================================================================
--- debian/arch/mips/defines (revision 8186)
+++ debian/arch/mips/defines (working copy)
@@ -14,18 +14,22 @@
[r4k-ip22]
class: SGI IP22
longclass: SGI IP22 (Indy, Indigo2)
+recommends: linux-sound-base
[r5k-ip32]
class: SGI IP32
longclass: SGI IP32 (O2)
+recommends: linux-sound-base
[sb1-bcm91250a]
class: BCM91250A
longclass: Broadcom BCM91250A (aka SWARM)
+recommends: linux-sound-base
[sb1a-bcm91480b]
class: BCM91480B
longclass: Broadcom BCM91480B (aka BigSur)
+recommends: linux-sound-base
[qemu]
class: QEMU
Index: debian/arch/sparc/defines
===================================================================
--- debian/arch/sparc/defines (revision 8186)
+++ debian/arch/sparc/defines (working copy)
@@ -8,6 +8,7 @@
vserver
[image]
+recommends: linux-sound-base
suggests: silo, fdutils
[sparc32]
Index: debian/arch/amd64/defines
===================================================================
--- debian/arch/amd64/defines (revision 8186)
+++ debian/arch/amd64/defines (working copy)
@@ -12,6 +12,7 @@
conflicts: grub (<= 0.95+cvs20040624-17)
depends: e2fsprogs (>= 1.35-7)
suggests: grub (>= 0.97-3) | lilo (>= 19.1)
+recommends: linux-sound-base
[amd64]
class: AMD64
--
dann frazier
Reply to: