Re: [OE-core] [PATCH 2/8] os-release: fix to install in the expected location

2018-09-05 Thread richard . purdie 
On Wed, 2018-09-05 at 10:16 -0700, Andre McCurdy wrote:
> On Wed, Sep 5, 2018 at 9:52 AM, Richard Purdie
>  wrote:
> > From: Joshua Lock 
> > 
> > os-release (5) recommends that the os-release file be installed in
> > /usr/lib/os-release and that /etc/os-release be a relative symlink
> > to it.
> > 
> > Signed-off-by: Joshua Lock 
> > Signed-off-by: Ross Burton 
> > Signed-off-by: Richard Purdie 
> > ---
> >  meta/recipes-core/os-release/os-release.bb | 9 ++---
> >  1 file changed, 6 insertions(+), 3 deletions(-)
> > 
> > diff --git a/meta/recipes-core/os-release/os-release.bb
> > b/meta/recipes-core/os-release/os-release.bb
> > index f9887047561..dae5748ba7a 100644
> > --- a/meta/recipes-core/os-release/os-release.bb
> > +++ b/meta/recipes-core/os-release/os-release.bb
> > @@ -1,7 +1,7 @@
> >  inherit allarch
> > 
> >  SUMMARY = "Operating system identification"
> > -DESCRIPTION = "The /etc/os-release file contains operating system
> > identification data."
> > +DESCRIPTION = "The /usr/lib/os-release file contains operating
> > system identification data."
> >  LICENSE = "MIT"
> >  INHIBIT_DEFAULT_DEPS = "1"
> > 
> > @@ -42,6 +42,9 @@ python do_compile () {
> >  do_compile[vardeps] += "${OS_RELEASE_FIELDS}"
> > 
> >  do_install () {
> > -install -d ${D}${sysconfdir}
> > -install -m 0644 os-release ${D}${sysconfdir}/
> > +install -d ${D}${libdir} ${D}${sysconfdir}
> > +install -m 0644 os-release ${D}${libdir}/
> > +lnr ${D}${libdir}/os-release ${D}${sysconfdir}/os-relea
> 
> Typo.
> 
> Please add the rm too when you fix that.

Too late, was already spotted and fixed. I'm not adding the rm since
we're not going through all the do_installs adding rm statements in for
things, I am totally against doing that.

Cheers,

Richard
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 2/8] os-release: fix to install in the expected location

2018-09-05 Thread Andre McCurdy 
On Wed, Sep 5, 2018 at 9:52 AM, Richard Purdie
 wrote:
> From: Joshua Lock 
>
> os-release (5) recommends that the os-release file be installed in
> /usr/lib/os-release and that /etc/os-release be a relative symlink to it.
>
> Signed-off-by: Joshua Lock 
> Signed-off-by: Ross Burton 
> Signed-off-by: Richard Purdie 
> ---
>  meta/recipes-core/os-release/os-release.bb | 9 ++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-core/os-release/os-release.bb 
> b/meta/recipes-core/os-release/os-release.bb
> index f9887047561..dae5748ba7a 100644
> --- a/meta/recipes-core/os-release/os-release.bb
> +++ b/meta/recipes-core/os-release/os-release.bb
> @@ -1,7 +1,7 @@
>  inherit allarch
>
>  SUMMARY = "Operating system identification"
> -DESCRIPTION = "The /etc/os-release file contains operating system 
> identification data."
> +DESCRIPTION = "The /usr/lib/os-release file contains operating system 
> identification data."
>  LICENSE = "MIT"
>  INHIBIT_DEFAULT_DEPS = "1"
>
> @@ -42,6 +42,9 @@ python do_compile () {
>  do_compile[vardeps] += "${OS_RELEASE_FIELDS}"
>
>  do_install () {
> -install -d ${D}${sysconfdir}
> -install -m 0644 os-release ${D}${sysconfdir}/
> +install -d ${D}${libdir} ${D}${sysconfdir}
> +install -m 0644 os-release ${D}${libdir}/
> +lnr ${D}${libdir}/os-release ${D}${sysconfdir}/os-relea

Typo.

Please add the rm too when you fix that.

>  }
> +
> +FILES_${PN} += "${libdir}/os-release"
> --
> 2.17.1
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core