[PATCH 0/2] ports FTBFS due to configs

[Tim Gardner]

Andy Whitcroft wrote:
> We are currently failing to build all ports kernels.  This is due to the
> way in which the configs were merged.  Currently we have unsplit configs
> for ports kernels and partly separated config update mechanisms.  However
> the build system is expecting to find and use the config.common.ubuntu,
> config.common.<arch> and config.flavour.<flavour> when building the
> configuration for the architecture.  These being missing lead to
> binary-<arch> not existing and the build to fail.
> 
> There are two obvious solutions to this problem.  The first is to
> simply not keep the ports configs separate, and merging them with the
> main configs.  This is trivial to do but does put maintenance of the
> ports configs on the distro, it also vastly reduces the options which
> trivially merge up to the top level.
> 
> The second is to more fully split the configs pushing all ports kernels
> into their own configuration hierachy.  This patch set implements this
> split.  It introduces the concept of a 'family' which is either ubuntu
> or ports currently.  Configs for these sets are merged independantly.
> 
> Following this are two emails, the first implements the new split.
> The second is the result of applying that split.  Note that you cannot
> simply apply the first patch and then run update configs.  I envision
> these would be committed as a single commit as previously, but the patch
> is enormous and likely will be held for moderation!
> 
> Which option do people prefer?  Comments?
> 
> -apw
> 
> Andy Whitcroft (2):
>   UBUNTU: split out the ports configs into their own family
>   UBUNTU: [Config] update configs following introduction of ports
>     family
> 
>  debian/config/config.common.ports                  | 3076 ++++++++++++++
>  debian/config/ia64/config.common.ia64              |  698 ++++
>  debian/config/ia64/config.flavour.ia64             | 2672 +-------------
>  debian/config/powerpc/config.common.powerpc        |  715 ++++
>  debian/config/powerpc/config.flavour.powerpc       | 4164 +-------------------
>  debian/config/powerpc/config.flavour.powerpc-smp   | 4151 +-------------------
>  debian/config/powerpc/config.flavour.powerpc64-smp | 4195 +-------------------
>  debian/config/sparc/config.common.sparc            |  690 ++++
>  debian/config/sparc/config.flavour.sparc64         | 3097 +--------------
>  debian/config/sparc/config.flavour.sparc64-smp     | 3099 +--------------
>  debian/rules.d/0-common-vars.mk                    |    2 +
>  debian/rules.d/2-binary-arch.mk                    |    2 +-
>  debian/rules.d/ia64.mk                             |    2 +
>  debian/rules.d/powerpc.mk                          |    2 +
>  debian/rules.d/sparc.mk                            |    2 +
>  debian/scripts/misc/kernelconfig                   |   13 +-
>  16 files changed, 5400 insertions(+), 21180 deletions(-)
>  create mode 100644 debian/config/config.common.ports
>  create mode 100644 debian/config/ia64/config.common.ia64
>  create mode 100644 debian/config/powerpc/config.common.powerpc
>  create mode 100644 debian/config/sparc/config.common.sparc
> 
> 

I like option 2 - applied and pushed.

-- 
Tim Gardner tim.gardner at canonical.com