[yocto] [PATCH 05/10] meta/common-pc: factor out policy-related options

[Darren Hart]

On 05/10/2012 06:00 PM, tom.zanussi at intel.com wrote:
> From: Tom Zanussi <tom.zanussi at intel.com>
> 
> Refactor bsp/common-pc/common-pc* to keep hardware-related options in
> the base common-pc-64.scc while moving the more 'policy'-related
> options into the files that include the base common-pc-64.scc
> fragment.
> 
> This allows the different kernel types to make use of the basic
> machine support without dragging along possibly unwanted options that
> fall under the heading of 'policy' for a specific kernel type.
> 
> Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>

Same comments as for common-pc (5/10)

> ---
>  .../bsp/common-pc-64/common-pc-64-preempt-rt.scc   |    6 ++++++
>  .../bsp/common-pc-64/common-pc-64-standard.scc     |    6 ++++++
>  .../kernel-cache/bsp/common-pc-64/common-pc-64.scc |    6 ------
>  3 files changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-preempt-rt.scc b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-preempt-rt.scc
> index ea13b44..8a79dd1 100644
> --- a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-preempt-rt.scc
> +++ b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-preempt-rt.scc
> @@ -4,5 +4,11 @@ define KARCH x86_64
>  
>  # no new branch required, re-use the ktypes/preempt-rt branch
>  include ktypes/preempt-rt
> +
>  include bsp/common-pc-64/common-pc-64.scc
>  
> +# default policy for preempt-rt kernels
> +include cfg/boot-live.scc
> +include features/latencytop/latencytop.scc
> +include features/profiling/profiling.scc
> +include cfg/virtio.scc
> diff --git a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-standard.scc b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-standard.scc
> index aa690cd..dcb1949 100644
> --- a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-standard.scc
> +++ b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-standard.scc
> @@ -6,3 +6,9 @@ include ktypes/standard
>  branch common-pc-64
>  
>  include common-pc-64.scc
> +
> +# default policy for standard kernels
> +include cfg/boot-live.scc
> +include features/latencytop/latencytop.scc
> +include features/profiling/profiling.scc
> +include cfg/virtio.scc
> diff --git a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc
> index d0327c5..c2efc88 100644
> --- a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc
> +++ b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc
> @@ -1,14 +1,8 @@
>  kconf hardware common-pc-64.cfg
>  kconf hardware common-pc-64-graphics.cfg
>  
> -include cfg/boot-live.scc
> -
>  include features/hpet/hpet.scc
>  include features/usb/ehci-hcd.scc
>  include features/usb/uhci-hcd.scc
>  include features/intel-e1xxxx/intel-e100.scc
>  include features/intel-e1xxxx/intel-e1xxxx.scc
> -
> -include features/latencytop/latencytop.scc
> -include features/profiling/profiling.scc
> -include cfg/virtio.scc

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel