Patchwork [3/3] lsb: distro codename info added

login
register
mail settings
Submitter Cristian Iorga
Date March 29, 2013, 2:12 p.m.
Message ID <1364566362-16292-1-git-send-email-cristian.iorga@intel.com>
Download mbox | patch
Permalink /patch/47129/
State New
Headers show

Comments

Cristian Iorga - March 29, 2013, 2:12 p.m.
Poky distro codename info added to /etc/lsb-release file.
lsb_release script will not complain anymore about
the incompleteness of /etc/lsb-release file by
returning an error code.
Increases LSB compliance.

Partial fix for [YOCTO #4071].

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 meta/recipes-extended/lsb/lsb_4.1.bb |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Richard Purdie - March 29, 2013, 4:25 p.m.
On Fri, 2013-03-29 at 16:12 +0200, Cristian Iorga wrote:
> Poky distro codename info added to /etc/lsb-release file.
> lsb_release script will not complain anymore about
> the incompleteness of /etc/lsb-release file by
> returning an error code.
> Increases LSB compliance.
> 
> Partial fix for [YOCTO #4071].
> 
> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
> ---
>  meta/recipes-extended/lsb/lsb_4.1.bb |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

What about people who haven't set DISTRO_CODENAME?

Cheers,

Richard

> diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
> index 01368b3..b28e9b6 100644
> --- a/meta/recipes-extended/lsb/lsb_4.1.bb
> +++ b/meta/recipes-extended/lsb/lsb_4.1.bb
> @@ -2,7 +2,7 @@ DESCRIPTION = "LSB support for OpenEmbedded"
>  SECTION = "console/utils"
>  HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
>  LICENSE = "GPLv2+"
> -PR = "r1"
> +PR = "r2"
>  
>  # lsb_release needs getopt
>  RDEPENDS_${PN} += "util-linux"
> @@ -41,6 +41,7 @@ do_install(){
>  	echo "\"" >> ${D}${sysconfdir}/lsb-release
>  	echo "DISTRIB_ID=${DISTRO}" >> ${D}${sysconfdir}/lsb-release
>  	echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}${sysconfdir}/lsb-release
> +	echo "DISTRIB_CODENAME=${DISTRO_CODENAME}" >> ${D}${sysconfdir}/lsb-release
>  	echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}${sysconfdir}/lsb-release
>  
>  	if [ "${TARGET_ARCH}" = "i586" ];then
Cristian Iorga - March 29, 2013, 4:42 p.m.
Hi Richard,

I guess a check can be done to see if DISTRO_CODENAME is set or not and add it selectively.
Is that ok?

/Cristian

-----Original Message-----
From: Richard Purdie [mailto:richard.purdie@linuxfoundation.org] 
Sent: Friday, March 29, 2013 6:26 PM
To: Iorga, Cristian
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH 3/3] lsb: distro codename info added

On Fri, 2013-03-29 at 16:12 +0200, Cristian Iorga wrote:
> Poky distro codename info added to /etc/lsb-release file.
> lsb_release script will not complain anymore about the incompleteness 
> of /etc/lsb-release file by returning an error code.
> Increases LSB compliance.
> 
> Partial fix for [YOCTO #4071].
> 
> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
> ---
>  meta/recipes-extended/lsb/lsb_4.1.bb |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

What about people who haven't set DISTRO_CODENAME?

Cheers,

Richard

> diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb 
> b/meta/recipes-extended/lsb/lsb_4.1.bb
> index 01368b3..b28e9b6 100644
> --- a/meta/recipes-extended/lsb/lsb_4.1.bb
> +++ b/meta/recipes-extended/lsb/lsb_4.1.bb
> @@ -2,7 +2,7 @@ DESCRIPTION = "LSB support for OpenEmbedded"
>  SECTION = "console/utils"
>  HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
>  LICENSE = "GPLv2+"
> -PR = "r1"
> +PR = "r2"
>  
>  # lsb_release needs getopt
>  RDEPENDS_${PN} += "util-linux"
> @@ -41,6 +41,7 @@ do_install(){
>  	echo "\"" >> ${D}${sysconfdir}/lsb-release
>  	echo "DISTRIB_ID=${DISTRO}" >> ${D}${sysconfdir}/lsb-release
>  	echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> 
> ${D}${sysconfdir}/lsb-release
> +	echo "DISTRIB_CODENAME=${DISTRO_CODENAME}" >> 
> +${D}${sysconfdir}/lsb-release
>  	echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> 
> ${D}${sysconfdir}/lsb-release
>  
>  	if [ "${TARGET_ARCH}" = "i586" ];then
Richard Purdie - March 29, 2013, 5:02 p.m.
On Fri, 2013-03-29 at 16:42 +0000, Iorga, Cristian wrote:
> Hi Richard,
> 
> I guess a check can be done to see if DISTRO_CODENAME is set or not and add it selectively.
> Is that ok?

Yes, that would be much better.

Cheers,

Richard

Patch

diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
index 01368b3..b28e9b6 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -2,7 +2,7 @@  DESCRIPTION = "LSB support for OpenEmbedded"
 SECTION = "console/utils"
 HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
 LICENSE = "GPLv2+"
-PR = "r1"
+PR = "r2"
 
 # lsb_release needs getopt
 RDEPENDS_${PN} += "util-linux"
@@ -41,6 +41,7 @@  do_install(){
 	echo "\"" >> ${D}${sysconfdir}/lsb-release
 	echo "DISTRIB_ID=${DISTRO}" >> ${D}${sysconfdir}/lsb-release
 	echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}${sysconfdir}/lsb-release
+	echo "DISTRIB_CODENAME=${DISTRO_CODENAME}" >> ${D}${sysconfdir}/lsb-release
 	echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}${sysconfdir}/lsb-release
 
 	if [ "${TARGET_ARCH}" = "i586" ];then