Patchwork [1/3] lsb: Add DISTRO Info to the lsb-release

login
register
mail settings
Submitter Saul Wold
Date April 17, 2012, 9:46 p.m.
Message ID <cad24a8ebe31104e0521b419a32b06b4cec3f93f.1334699033.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/26079/
State Accepted
Commit eddb1d6f458bcf8b0473a360fad3f4a259a57d28
Headers show

Comments

Saul Wold - April 17, 2012, 9:46 p.m.
This is needed for distro checking code in the self-hosted-image

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/lsb/lsb_1.4.bb |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
Koen Kooi - April 18, 2012, 6:45 a.m.
Op 17 apr. 2012, om 23:46 heeft Saul Wold het volgende geschreven:

> This is needed for distro checking code in the self-hosted-image
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-extended/lsb/lsb_1.4.bb |    5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
> index f2f25ba..e414d93 100644
> --- a/meta/recipes-extended/lsb/lsb_1.4.bb
> +++ b/meta/recipes-extended/lsb/lsb_1.4.bb
> @@ -4,6 +4,8 @@ HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
> LICENSE = "GPLv2+"
> PR = "r2"
> 
> +DEPENDS="util-linux"
> +
> LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"
> 
> SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/${PV}/lsb-release-${PV}.tar.gz \
> @@ -31,6 +33,9 @@ do_install(){
> 		echo -n "core-4.1-${TARGET_ARCH}" >>  ${D}/etc/lsb-release
> 	fi
> 	echo "\"" >> ${D}/etc/lsb-release
> +	echo "DISTRIB_ID=${DISTRO}" >> ${D}/etc/lsb-release
> +	echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}/etc/lsb-release
> +	echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}/etc/lsb-release

MIssing PR bump
Martin Jansa - April 18, 2012, 6:50 a.m.
On Wed, Apr 18, 2012 at 08:45:23AM +0200, Koen Kooi wrote:
> 
> Op 17 apr. 2012, om 23:46 heeft Saul Wold het volgende geschreven:
> 
> > This is needed for distro checking code in the self-hosted-image
> > 
> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
> > ---
> > meta/recipes-extended/lsb/lsb_1.4.bb |    5 +++++
> > 1 files changed, 5 insertions(+), 0 deletions(-)
> > 
> > diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
> > index f2f25ba..e414d93 100644
> > --- a/meta/recipes-extended/lsb/lsb_1.4.bb
> > +++ b/meta/recipes-extended/lsb/lsb_1.4.bb
> > @@ -4,6 +4,8 @@ HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
> > LICENSE = "GPLv2+"
> > PR = "r2"
> > 
> > +DEPENDS="util-linux"
> > +
> > LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"
> > 
> > SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/${PV}/lsb-release-${PV}.tar.gz \
> > @@ -31,6 +33,9 @@ do_install(){
> > 		echo -n "core-4.1-${TARGET_ARCH}" >>  ${D}/etc/lsb-release
> > 	fi
> > 	echo "\"" >> ${D}/etc/lsb-release
> > +	echo "DISTRIB_ID=${DISTRO}" >> ${D}/etc/lsb-release
> > +	echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}/etc/lsb-release
> > +	echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}/etc/lsb-release
> 
> MIssing PR bump

And spaces around = in added DEPENDS
Richard Purdie - April 18, 2012, 11:08 a.m.
On Wed, 2012-04-18 at 08:45 +0200, Koen Kooi wrote:
> Op 17 apr. 2012, om 23:46 heeft Saul Wold het volgende geschreven:
> 
> > This is needed for distro checking code in the self-hosted-image
> > 
> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
> > ---
> > meta/recipes-extended/lsb/lsb_1.4.bb |    5 +++++
> > 1 files changed, 5 insertions(+), 0 deletions(-)
> > 
> > diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
> > index f2f25ba..e414d93 100644
> > --- a/meta/recipes-extended/lsb/lsb_1.4.bb
> > +++ b/meta/recipes-extended/lsb/lsb_1.4.bb
> > @@ -4,6 +4,8 @@ HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
> > LICENSE = "GPLv2+"
> > PR = "r2"
> > 
> > +DEPENDS="util-linux"
> > +
> > LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"
> > 
> > SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/${PV}/lsb-release-${PV}.tar.gz \
> > @@ -31,6 +33,9 @@ do_install(){
> > 		echo -n "core-4.1-${TARGET_ARCH}" >>  ${D}/etc/lsb-release
> > 	fi
> > 	echo "\"" >> ${D}/etc/lsb-release
> > +	echo "DISTRIB_ID=${DISTRO}" >> ${D}/etc/lsb-release
> > +	echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}/etc/lsb-release
> > +	echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}/etc/lsb-release
> 
> MIssing PR bump

I've added one and fixes some other problems I noticed whilst testing
it :(.

Cheers,

Richard

Patch

diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
index f2f25ba..e414d93 100644
--- a/meta/recipes-extended/lsb/lsb_1.4.bb
+++ b/meta/recipes-extended/lsb/lsb_1.4.bb
@@ -4,6 +4,8 @@  HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
 LICENSE = "GPLv2+"
 PR = "r2"
 
+DEPENDS="util-linux"
+
 LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/${PV}/lsb-release-${PV}.tar.gz \
@@ -31,6 +33,9 @@  do_install(){
 		echo -n "core-4.1-${TARGET_ARCH}" >>  ${D}/etc/lsb-release
 	fi
 	echo "\"" >> ${D}/etc/lsb-release
+	echo "DISTRIB_ID=${DISTRO}" >> ${D}/etc/lsb-release
+	echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}/etc/lsb-release
+	echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}/etc/lsb-release
 	
 	if [ "${TARGET_ARCH}" == "i586" ];then
 		mkdir -p ${D}/etc/lsb-release.d