From 24420bf535cd5a2201ac21c0f379d7f9bf31968c Mon Sep 17 00:00:00 2001 From: Mario Domenech Goulart Date: Thu, 3 Apr 2014 15:52:45 -0300 Subject: linux-imx.inc: move SUMMARY and DESCRIPTION from .inc to .bb's SUMMARY and DESCRIPTION should really go into recipes (.bb). Setting SUMMARY and DESCRIPTION in include files can easily cause recipes' to be clobbered by the ones set in included files, since they are usually set before including common files. A typical example: $ cat some-common-file.inc DESCRIPTION = "I'll clobber your description" $ cat some-recipe.bb DESCRIPTION = "I'll get clobbered" include some-common-file.inc Another problematic case is with regard to recipes that include multiple common files that set SUMMARY and DESCRIPTION (the last included ones will clobber the previous ones). That's actually the expected behavior when we include files, but it's slightly surprising in case of variables like SUMMARY and DESCRIPTION, which usually are the first ones defined in recipe files (before `include'). Signed-off-by: Mario Domenech Goulart Signed-off-by: Otavio Salvador --- recipes-kernel/linux/linux-imx.inc | 3 --- recipes-kernel/linux/linux-imx_2.6.35.3.bb | 4 ++++ recipes-kernel/linux/linux-imx_3.10.17.bb | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc index f1f89b2..47566b0 100644 --- a/recipes-kernel/linux/linux-imx.inc +++ b/recipes-kernel/linux/linux-imx.inc @@ -1,9 +1,6 @@ # Copyright (C) 2012, 2014 O.S. Systems Software LTDA. # Released under the MIT license (see COPYING.MIT for the terms) -SUMMARY = "Linux Kernel provided and supported by Freescale" -DESCRIPTION = "Linux Kernel provided and supported by Freescale with focus on \ -i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb index f42c2c2..be39179 100644 --- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb +++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb @@ -1,6 +1,10 @@ # Copyright (C) 2011-2013 Freescale Semiconductor # Released under the MIT license (see COPYING.MIT for the terms) +SUMMARY = "Linux Kernel provided and supported by Freescale" +DESCRIPTION = "Linux Kernel provided and supported by Freescale with focus on \ +i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU." + PR = "r45" include linux-imx.inc diff --git a/recipes-kernel/linux/linux-imx_3.10.17.bb b/recipes-kernel/linux/linux-imx_3.10.17.bb index 03f8f7a..f9a2969 100644 --- a/recipes-kernel/linux/linux-imx_3.10.17.bb +++ b/recipes-kernel/linux/linux-imx_3.10.17.bb @@ -1,6 +1,10 @@ # Copyright (C) 2013, 2014 Freescale Semiconductor # Released under the MIT license (see COPYING.MIT for the terms) +SUMMARY = "Linux Kernel provided and supported by Freescale" +DESCRIPTION = "Linux Kernel provided and supported by Freescale with focus on \ +i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU." + require recipes-kernel/linux/linux-imx.inc require recipes-kernel/linux/linux-dtb.inc -- cgit v1.2.3-54-g00ecf